Merge branch 'master' of http://116.63.33.55/git/industry-data-platform into master

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

@@ -262,6 +262,16 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 			$('.item-list-bucket-value').removeClass('layui-hide')
 		}
 	})
+	form.on('select(data-item-group)', function(data) {
+		if (layui.sheetTypew.templateReportType != 2) {
+			return
+		}
+		layui.api.getReportDataPolicyById(data.value).then(res => {
+			const item = res.data.policyItemList.filter(item => item.itemId == res.data.eventItemId)[0]
+			$('#event-span>span').text((item.modbusConfig ? item.itemName : item.itemReadName) + conditionTableItems[res.data.readModeType] + res.data.modeValue)
+			$('#event-span').removeClass('layui-hide')
+		})
+	})
 	const view = {
 		content: function() {
 			return `
@@ -292,6 +302,7 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 							</div>
 						</div>
 					</form>
+					<div id="event-span" class="layui-hide" style="margin-bottom: 15px;color:#9b9a9a;">条件：<span></span></div>
 					<div id="item-list-table" lay-filter="item-list-table"></div>
 					<form lay-filter="item-list-form" class="layui-form " action="" style="margin-top: 30px;">
 						${this.bottomContent()}
@@ -606,6 +617,12 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 						if (params.type == 'edit') {
 							if (layui.sheetTypew.templateReportType == 1) {
 								form.val('item-list-form', params.itemForm)
+							} else if (layui.sheetTypew.templateReportType == 2) {
+								layui.api.getReportDataPolicyById(_this.data.itemList[0].policyId).then(res => {
+									const item = res.data.policyItemList.filter(item => item.itemId == res.data.eventItemId)[0]
+									$('#event-span>span').text((item.modbusConfig ? item.itemName : item.itemReadName) + conditionTableItems[res.data.readModeType] + res.data.modeValue)
+									$('#event-span').removeClass('layui-hide')
+								})
 							} else if (layui.sheetTypew.templateReportType == 5) {
 								const deviceDataSetting = _this.data.deviceDataSetting
 								$('#itemvar-name-1').attr('data-itemid', deviceDataSetting.var1)