1、报表设计模块 选择点位后重新排序待选列表

2、“策略组”文字改为“策略”
3、处理Modbus点位名称回显问题

industry-admin/src/views/alarm/alarmHistory/index.vue

@@ -68,11 +68,7 @@ export default {
                     propName: "itemReadName",
                     labelName: "点位名称",
                     formatter: (row, column, cellValue, index) => {
-                        if (row.modbusConfig) {
-                            return row.itemName
-                        } else {
-                            return row.itemReadName
-                        }
+                      return row.modbusConfig ? row.itemName : row.itemReadName
                     },
                     width: '200'
                 },
@@ -123,10 +119,9 @@ export default {
             for (let i in data) {
                 const a = data[i]
                 arr.push(a.id)
-                if (i == data.length - 1) {
-                    b += a.itemGroupName + "." + a.itemReadName
-                } else {
-                    b += a.itemGroupName + "." + a.itemReadName + ","
+                b += a.itemGroupName + "." + a.label
+                if (i < data.length - 1) {
+                    b += ","
                 }
             }
             this.queryParams.itemIdList = arr

industry-admin/src/views/device/deviceLedger/addItem.vue

@@ -114,8 +114,8 @@ export default {
                 let arr = []
                 for (let i = 0; i < res.data.itemList.length; i++) {
                     let temp = res.data.itemList[i];
-                    temp.label = res.data.itemList[i].itemReadName
-                    temp.value = res.data.itemList[i].id
+                    temp.label = temp.modbusConfig ? temp.itemName : temp.itemReadName
+                    temp.value = temp.id
                     arr.push(temp)
                 }
                 this.groupItemList = arr

industry-admin/src/views/device/deviceLedger/chooseItem.vue

@@ -221,7 +221,7 @@ export default {
                     const b = a;
                     b.checked = false
                     b.value = a.itemId
-                    b.label = a.itemReadName
+                    b.label = a.modbusConfig ? a.itemName : a.itemReadName
                     arr.push(b)
                 }
                 this.ledgerItemList = arr

industry-admin/src/views/largeScreen/deviceDataItem/chooseItem.vue

@@ -221,7 +221,7 @@ export default {
                     const b = a;
                     b.checked = false
                     b.value = a.itemId
-                    b.label = a.itemReadName
+                    b.label = a.modbusConfig ? a.itemName : a.itemReadName
                     arr.push(b)
                 }
                 this.ledgerItemList = arr

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

@@ -113,8 +113,8 @@ export default {
                 let arr = []
                 for (let i = 0; i < res.data.itemList.length; i++) {
                     let temp = res.data.itemList[i];
-                    temp.label = res.data.itemList[i].itemReadName
-                    temp.value = res.data.itemList[i].id
+                    temp.label = temp.modbusConfig ? temp.itemName : temp.itemReadName
+                    temp.value = temp.id
                     arr.push(temp)
                 }
                 this.groupItemList = arr

industry-admin/src/views/report/reportTablePolicy/chooseItem.vue

@@ -88,8 +88,8 @@ export default {
                 let arr = []
                 for (let i = 0; i < res.data.itemList.length; i++) {
                     let temp = res.data.itemList[i];
-                    temp.label = res.data.itemList[i].itemReadName
-                    temp.value = res.data.itemList[i].id
+                    temp.label = temp.modbusConfig ? temp.itemName : temp.itemReadName
+                    temp.value = temp.id
                     arr.push(temp)
                 }
                 this.groupItemList = arr

industry-admin/src/views/report/reportTablePolicy/reportDataPolicy.vue

@@ -445,7 +445,7 @@ export default {
       let brr = []
       for (let a of arr) {
         const b = a
-        b.label = a.itemReadName
+        b.label = a.modbusConfig ? a.itemName : a.itemReadName
         b.value = a.itemId
         brr.push(b)
       }

industry-admin/src/views/source/dataQuery/chooseItem.vue

@@ -113,8 +113,8 @@ export default {
                 let arr = []
                 for (let i = 0; i < res.data.itemList.length; i++) {
                     let temp = res.data.itemList[i];
-                    temp.label = res.data.itemList[i].itemReadName
-                    temp.value = res.data.itemList[i].id
+                    temp.label = temp.modbusConfig ? temp.itemName : temp.itemReadName
+                    temp.value = temp.id
                     arr.push(temp)
                 }
                 this.groupItemList = arr

industry-admin/src/views/source/dataQuery/index.vue

@@ -344,10 +344,9 @@ export default {
             for (let i in data) {
                 const a = data[i]
                 arr.push(a.id)
-                if (i == data.length - 1) {
-                    b += a.itemGroupName + "." + a.itemReadName
-                } else {
-                    b += a.itemGroupName + "." + a.itemReadName + ","
+                b += a.itemGroupName + "." + a.label
+                if (i < data.length - 1) {
+                  b +=  ","
                 }
             }
             this.chartForm.idList = arr
@@ -476,7 +475,7 @@ export default {
                 let yAxisData = []
                 let seriesData = []
                 data.forEach((a, n) => {
-                    let name = a.describe ? a.describe : a.itemReadName
+                    let name = a.modbusConfig ? a.itemName : a.itemReadName
                     legendSelected[name] = true
                     legendData.push(name)
                     let y = {

industry-admin/src/views/source/itemGroup/alarmLog.vue

@@ -60,11 +60,7 @@ export default {
                     propName: "itemReadName",
                     labelName: "点位名称",
                     formatter: (row, column, cellValue, index) => {
-                        if (row.modbusConfig) {
-                            return row.itemName
-                        } else {
-                            return row.itemReadName
-                        }
+                        return row.modbusConfig ? row.itemName : row.itemReadName
                     },
                     width: '200'
                 },

industry-admin/src/views/source/itemGroup/item.vue

@@ -90,12 +90,7 @@ export default {
           labelName: "点位",
           align: "left",
           formatter: (row, column, cellValue, index) => {
-            console.info("row.modbusConfig",row)
-            if (row.modbusConfig) {
-              return row.itemName
-            } else {
-              return row.itemReadName
-            }
+            return row.modbusConfig ? row.itemName : row.itemReadName
           },
           width: '200'
         },
@@ -272,12 +267,7 @@ export default {
           {
             propName: "itemReadName",
             formatter: (row, column, cellValue, index) => {
-              console.info("row.modbusConfig",row)
-              if (row.modbusConfig) {
-                return row.itemName
-              } else {
-                return row.itemReadName
-              }
+              return row.modbusConfig ? row.itemName : row.itemReadName
             },
             labelName: "点位",
           },
@@ -315,12 +305,7 @@ export default {
           {
             propName: "itemReadName",
             formatter: (row, column, cellValue, index) => {
-              console.info("row.modbusConfig",row)
-              if (row.modbusConfig) {
-                return row.itemName
-              } else {
-                return row.itemReadName
-              }
+              return row.modbusConfig ? row.itemName : row.itemReadName
             },
             labelName: "点位",
             align: "left"

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

@@ -548,11 +548,15 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                 List<String> header = CollUtil.newArrayList("时间", "点位名称", "值");
                 rows.add(header);
                 for (Item item : itemList) {
+                    String itemReadName = item.getItemReadName();
+                    if(Blank.isNotEmpty(item.getModbusConfig())){
+                        itemReadName = item.getItemName();
+                    }
                     List<String> dataTimeList = item.getDataTimeList();
                     List<String> dataValueList = item.getDataValueList();
                     if (Blank.isNotEmpty(dataTimeList)) {
                         for (int i = 0; i < dataTimeList.size() - 1; i++) {
-                            List<String> row = CollUtil.newArrayList(dataTimeList.get(i), item.getItemReadName(), dataValueList.get(i));
+                            List<String> row = CollUtil.newArrayList(dataTimeList.get(i), itemReadName, dataValueList.get(i));
                             rows.add(row);
                         }
                     }
@@ -563,6 +567,9 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                 List<String> header = CollUtil.newArrayList("时间");
                 for (Item item : itemList) {
                     String itemReadName = item.getItemReadName();
+                    if(Blank.isNotEmpty(item.getModbusConfig())){
+                        itemReadName = item.getItemName();
+                    }
                     List<String> dataTimeList = item.getDataTimeList();
                     List<String> dataValueList = item.getDataValueList();
                     if (Blank.isNotEmpty(dataTimeList)) {
@@ -586,7 +593,12 @@ public class ItemGroupServiceImpl implements ItemGroupService {
                     Map<String, String> m = map.get(key);
                     List<String> row = CollUtil.newArrayList(key);
                     for (int i = 0; i < itemList.size(); i++) {
-                        row.add(m.get(itemList.get(i).getItemReadName()));
+                        Item item = itemList.get(i);
+                        String itemReadName = item.getItemReadName();
+                        if(Blank.isNotEmpty(item.getModbusConfig())){
+                            itemReadName = item.getItemName();
+                        }
+                        row.add(m.get(itemReadName));
                     }
                     rows.add(row);
                 }

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/chart-right-window.js

@@ -13,7 +13,7 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 		optItem: function() {
 			const policyId = $('select[name="chart-item-group"]').val()
 			if (!policyId) {
-				layer.msg('请选择策略组', {icon: 2})
+				layer.msg('请选择策略', {icon: 2})
 				return
 			}
 			layui.itemListw.open({
@@ -256,7 +256,7 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 				} 
 				let obj = {}
 				json.data.forEach(data => {
-					const name = data.describe || data.modbusConfig == 0 ? data.itemReadName : data.itemName
+					const name = data.modbusConfig ? data.itemName : data.itemReadName
 					obj[name] = data.dataValueList
 				})
 				const elem = chartUtil.getElem(fn.data.chartId)
@@ -276,7 +276,7 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 				let arr = []
 				if (json.data.length > 1) {
 					json.data.forEach(data => {
-						const name = data.describe || data.modbusConfig == 0 ? data.itemReadName : data.itemName
+						const name = data.modbusConfig ? data.itemName : data.itemReadName
 						arr.push({
 							name,
 							value: data.dataValueList[0] || 0
@@ -1270,7 +1270,7 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 			}
 			return `
 				<form class="layui-form" action="" lay-filter="dataForm">
-					<div class="cr-form-label">策略组：</div>
+					<div class="cr-form-label">策略：</div>
 					<div class="layui-form-item layui-row">
 						<div class="layui-col-md9">
 							<select name="chart-item-group">

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

@@ -50,7 +50,7 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 		'data-item-switch-btn': function() {
 			const policyId = $('select[name="data-item-group"]').val()
 			if (!policyId) {
-				layer.msg('请选择策略组', {icon: 2})
+				layer.msg('请选择策略', {icon: 2})
 				return
 			}
 			const policyName = $(`select[name="data-item-group"] option[value="${policyId}"]`).text()
@@ -277,7 +277,7 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 						</div>
 						<div class="layui-form-item">
 							<div class="layui-inline ${fn.data.type == 'edit'? 'layui-hide' : ''}">
-								<label class="layui-form-label" style="width: 60px;padding-left: 0;">策略组：</label>
+								<label class="layui-form-label" style="width: 60px;padding-left: 0;">策略：</label>
 								<div class="layui-input-inline">
 									<select name="data-item-group" lay-filter="data-item-group">
 										<option value=""></option>
@@ -481,7 +481,7 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 			let cols = [
 					{type: 'checkbox'},
 					{type: 'numbers', title: '序号', align: 'center'},
-					{field: 'policyName', title: '策略组', align: 'center'},
+					{field: 'policyName', title: '策略', align: 'center'},
 					{field: 'itemName', title: '点位', align: 'center'},
 					{field: 'itemDesc', title: '描述', align: 'center'},
 					{field: 'valueType', title: '取值类型', align: 'center', templet: function(d) {
@@ -506,7 +506,7 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 			let cols = [
 				{type: 'checkbox'},
 				{type: 'numbers', title: '序号', align: 'center'},
-				{field: 'policyName', title: '策略组', align: 'center'},
+				{field: 'policyName', title: '策略', align: 'center'},
 				{field: 'itemName', title: '点位', align: 'center'},
 				{field: 'itemDesc', title: '描述', align: 'center'},
 				{field: 'valueType', title: '取值类型', align: 'center', templet: function(d) {

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

@@ -3,7 +3,6 @@ layui.define(['layer', 'form', 'transfer'], function(exports) {
 	const form = layui.form
 	const transfer = layui.transfer
 	const api = layui.api
-	
 	const view = {
 		itemList: function() {
 			return `
@@ -36,11 +35,17 @@ layui.define(['layer', 'form', 'transfer'], function(exports) {
 					showSearch: true,
 					parseData: function(res) {
 						return {
-							title: res.describe || res.modbusConfig == 0 ? res.itemReadName : res.itemName,
+							title: res.modbusConfig ? res.itemName : res.itemReadName,
 							value: res.id,
 							desc:res.describe,
 							scale:res.scale
 						}
+					},
+					onchange: function(obj){
+						// 更新transfer的数据
+						transfer.reload('item-list-transfer', {
+							data: json.data.policyItemList // 重新设置初始数据
+						});
 					}
 				})
 			})