1、主要运行参数：未按照后台配置的排序号进行排列

2、风机子系统：风机转速给定中，风机选择后，数据未变化调整
3、监控管理：下载监控播放控件，弹出空页面，没有任何下载文件
4、场景设计：编辑场景图片，提示修改成功，但是并没有生效，系统返回500

industry-system/industry-da/src/main/resources/mapper/SceneDao.xml

@@ -6,14 +6,14 @@
     <select id="getCountSceneByName" resultType="java.lang.Integer">
         select count(*) from f_scene where scene_name = #{sceneName}
         <if test="sceneId != null">
-            id = #{sceneId}
+           and id != #{sceneId}
         </if>
     </select>
 
     <insert id="saveScene" parameterType="java.util.Map" useGeneratedKeys="true" keyProperty="id">
         insert into f_scene(scene_name, directory_ids, monitor_ids) values (#{sceneName}, #{ids}, #{monitors})
     </insert>
-    
+
     <insert id="saveSceneImgs">
         insert into f_scene_img (scene_id, scene_img) values
             <foreach collection="list" item="item" separator=",">

industry-system/industry-da/src/main/resources/static/reportSheet/js/design.js

@@ -234,14 +234,24 @@ const sceneView = {
 				html += `<option value="${pageData.sceneData[i].id}" ${id && id == pageData.sceneData[i].id ? 'selected': ''}>
 				${pageData.sceneData[i].sceneName}</option>`
 				if (id && id == pageData.sceneData[i].id && img) {
-					_this.renderImgView(pageData.sceneData[i].imgs, function(imgJson) {
-						let imgUrl = imgJson.sceneImg
-						if (!imgJson.sceneImg.startsWith('http')) {
-							imgUrl = pageData.path() + imgJson.sceneImg
-						}
-						$('#sceneImg').attr('src', imgUrl)
-						_this.getSceneByIdApi()
-					})
+					let imgJson = {};
+					if(pageData.sceneData[i].imgs.length>0){
+						imgJson = pageData.sceneData[i].imgs[0]
+					}
+					console.log(imgJson);
+					if(imgJson!=null){
+						_this.renderImgView(pageData.sceneData[i].imgs, function(imgJson) {
+							if(imgJson!=undefined){
+								let imgUrl = imgJson.sceneImg
+								if (!imgJson.sceneImg.startsWith('http')) {
+									imgUrl = pageData.path() + imgJson.sceneImg
+								}
+								$('#sceneImg').attr('src', imgUrl)
+								_this.getSceneByIdApi()
+							}
+						})
+					}
+					
 				}
 			}
 			$('#sceneList').empty().append(html)
@@ -253,7 +263,7 @@ const sceneView = {
 	},
 	renderImgView: function(arr, callback) {
 		const img = pageData.getParam('img')
-		let html = '<option value="">请选择</option>'
+		let html = ''//'<option value="">请选择</option>'
 		let data;
 		for (var j = 0; j < arr.length; j++) {
 			if (img && img == arr[j].id) {