1、修改报表设计序号可以修改

2、增加动效控制值获取接口

industry-admin/src/views/largeScreen/pageAnimation/index.vue

@@ -59,7 +59,9 @@ export default {
         {key: 'ztzcqlys', name: '整图座舱气流颜色',describe: '时显示蓝色'},
         {key: 'fjzxtzfj', name: '风机子系统左风机',describe: '时转动'},
         {key: 'fjzxtyfj', name: '风机子系统右风机',describe: '时转动'},
-        {key: 'ydgdx', name: '液氮罐动效',describe: '时显示'},
+        {key: 'ydgdx_L', name: '液氮罐动效(左)',describe: '时显示'},
+        {key: 'ydgdx_C', name: '液氮罐动效(中)',describe: '时显示'},
+        {key: 'ydgdx_R', name: '液氮罐动效(右)',describe: '时显示'},
 
       ],
       operatorList:[

industry-admin/src/views/report/runConfig/index.vue

@@ -124,7 +124,7 @@ export default {
                         };
                     },
                     align: "left",
-                    width:"200"
+                    width:"120"
                 },
                 {
                     propName: "runState",

industry-system/industry-da/src/main/java/com/example/opc_da/config/InterceptorConfig.java

@@ -73,6 +73,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/reportSheet/**")
                 .excludePathPatterns("/deviceDataItem/getAllDeviceDataItem")
                 .excludePathPatterns("/pageAnimation/getPageAnimationStatusByType")
+                .excludePathPatterns("/pageAnimation/getPageAnimationValueByType")
                 .excludePathPatterns("/playbackPlan/getAllPlaybackPlan")
                 .excludePathPatterns("/playbackPlan/getPlaybackRecordFileByPlaybackPlanId")
                 .excludePathPatterns("/view/**")

industry-system/industry-da/src/main/java/com/example/opc_da/controller/PageAnimationController.java

@@ -57,10 +57,23 @@ public class PageAnimationController {
 //    @PermissionControl
     @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.PAGEANIMATION, OperationEnum = OperationEnum.SELECT)
     public Result getPageAnimationStatusByType(@RequestParam("type") String type) {
-        Boolean flag = ListUtil.toList(StrUtil.split("ztfj,ztfjqql,ztzcql,ztzcqlys,fjzxtzfj,fjzxtyfj,ydgdx", ",")).contains(type);
+        Boolean flag = ListUtil.toList(StrUtil.split("ztfj,ztfjqql,ztzcql,ztzcqlys,fjzxtzfj,fjzxtyfj,ydgdx_L,ydgdx_C,ydgdx_R", ",")).contains(type);
         if (!flag) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS);
         }
         return pageAnimationService.getPageAnimationStatusByType(type);
     }
+    /**
+     * 查看
+     */
+    @GetMapping("getPageAnimationValueByType")
+//    @PermissionControl
+    @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.PAGEANIMATION, OperationEnum = OperationEnum.SELECT)
+    public Result getPageAnimationValueByType(@RequestParam("type") String type) {
+        Boolean flag = ListUtil.toList(StrUtil.split("ztfj,ztfjqql,ztzcql,ztzcqlys,fjzxtzfj,fjzxtyfj,ydgdx_L,ydgdx_C,ydgdx_R", ",")).contains(type);
+        if (!flag) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS);
+        }
+        return pageAnimationService.getPageAnimationValueByType(type);
+    }
 }

industry-system/industry-da/src/main/java/com/example/opc_da/service/PageAnimationService.java

@@ -13,4 +13,6 @@ public interface PageAnimationService {
     Result getAllPageAnimation();
 
     Result getPageAnimationStatusByType(String type);
+
+    Result getPageAnimationValueByType(String type);
 }

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/PageAnimationServiceImpl.java

@@ -39,8 +39,12 @@ public class PageAnimationServiceImpl implements PageAnimationService {
         savePageAnimation(fjzxtzfj);
         PageAnimation fjzxtyfj = pageAnimationMap.get("fjzxtyfj");
         savePageAnimation(fjzxtyfj);
-        PageAnimation ydgdx = pageAnimationMap.get("ydgdx");
-        savePageAnimation(ydgdx);
+        PageAnimation ydgdx_L = pageAnimationMap.get("ydgdx_L");
+        savePageAnimation(ydgdx_L);
+        PageAnimation ydgdx_C = pageAnimationMap.get("ydgdx_C");
+        savePageAnimation(ydgdx_C);
+        PageAnimation ydgdx_R = pageAnimationMap.get("ydgdx_R");
+        savePageAnimation(ydgdx_R);
         return Result.ok("保存成功");
     }
 
@@ -112,4 +116,23 @@ public class PageAnimationServiceImpl implements PageAnimationService {
         }
         return Result.ok(flag);
     }
+    @Override
+    public Result getPageAnimationValueByType(String type){
+        PageAnimation pageAnimation = pageAnimationDao.getPageAnimationByType(type);
+        List<PageAnimation> pageAnimationList = new ArrayList<>();
+        pageAnimationList.add(pageAnimation);
+        pageAnimationList = (List<PageAnimation>) queryServiceUtil.exchangeRealData(pageAnimationList);
+
+        Boolean flag = false;
+        if(pageAnimationList.size() == 0){
+            return Result.ok(flag);
+        }
+        String dataValue = pageAnimationList.get(0).getDataValue();
+        if(StrUtil.isEmpty(dataValue)){
+            return Result.ok(flag);
+        }
+        Double number = Double.parseDouble(dataValue);
+
+        return Result.ok(number);
+    }
 }

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/item-list-table.js

@@ -57,9 +57,10 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 			layui.itemListw.open({
 				policyId,
 				success: function(data, index) {
-					let itemList = data.map((item) => {
+					let itemList = data.map((item,index) => {
 						const width = sheetUtil.getTextWidth('^.' + item.title)
 						return {
+							orderindex:index+1,
 							uid: uuidv4(),
 							itemId: item.value,
 							itemName: item.title,
@@ -254,6 +255,16 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 			});
 		}
 	})
+	table.on('edit(item-list-table)',function(obj){
+		var value = obj.value,
+		data = obj.data,
+		field = obj.field;
+		fn.data.itemList.sort((a,b)=>a.orderindex-b.orderindex);
+		table.reloadData('item-list-table', {
+			data:fn.data.itemList
+		})
+	})
+	
 	form.on('radio(dataValType)', function(data) {
 		if (data.elem.value == 1) {
 			$('.data-valLine').addClass('layui-hide')
@@ -539,7 +550,8 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 		renderItemHandTable: function() {
 			let cols = [
 					{type: 'checkbox'},
-					{type: 'numbers', title: '序号', align: 'center'},
+					// {type: 'numbers', title: '序号', align: 'center'},
+					{field: 'orderindex',title:'序号',align:'center',edit:'text',width:40},
 					{field: 'policyName', title: '策略', align: 'center'},
 					{field: 'itemName', title: '点位', align: 'center'},
 					{field: 'itemDesc', title: '描述', align: 'center'},
@@ -564,7 +576,8 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 		renderItemDeviceTable: function() {
 			let cols = [
 					{type: 'checkbox'},
-					{type: 'numbers', title: '序号', align: 'center'},
+					// {type: 'numbers', title: '序号', align: 'center'},
+					{field: 'orderindex',title:'序号',align:'center',edit:'text',width:40},
 					{field: 'policyName', title: '策略', align: 'center'},
 					{field: 'itemName', title: '点位', align: 'center'},
 					{field: 'itemDesc', title: '描述', align: 'center'},
@@ -609,7 +622,8 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 		renderItemAutoTable: function() {
 			let cols = [
 				{type: 'checkbox'},
-				{type: 'numbers', title: '序号', align: 'center'},
+				// {type: 'numbers', title: '序号',edit:'text', align: 'center'},
+				{field: 'orderindex',title:'序号',align:'center',edit:'text',width:40},
 				{field: 'policyName', title: '策略', align: 'center'},
 				{field: 'itemName', title: '点位', align: 'center'},
 				{field: 'itemDesc', title: '描述', align: 'center'},
@@ -688,7 +702,7 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 				}
 
 			}
-			//console.log(_this.data.dataSetting)
+			console.log(_this.data.itemList)
 			layer.open({
 				type: 1,
 				title: ['数据域配置', 'text-align: center;padding-left: 81px;'],