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/chart-right-window.js

@@ -1793,7 +1793,7 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 			return `
 			<form class="layui-form" action="" lay-filter="pieForm">
 				<div class="layui-form-item">
-					<label class="layui-form-label">南丁格尔图：</label>
+					<label class="layui-form-label" style="padding-left: 0;width: 95px;">南丁格尔图：</label>
 					<div class="layui-input-block">
 						<input type="checkbox" name="chart-pie-rose-show" lay-filter="chart-pie-rose-show" lay-skin="switch">
 					</div>

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

@@ -293,7 +293,7 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 						</div>
 					</form>
 					<div id="item-list-table" lay-filter="item-list-table"></div>
-					<form lay-filter="item-list-form" class="layui-form ${fn.data.type == 'edit'? 'layui-hide' : ''}" action="" style="margin-top: 30px;">
+					<form lay-filter="item-list-form" class="layui-form " action="" style="margin-top: 30px;">
 						${this.bottomContent()}
 					</form>
 				</div>
@@ -584,11 +584,12 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 			_this.data.dataSetting = params.type == 'edit' ? params.dataSetting : {}
 			_this.data.tableId = params.type == 'edit' ? params.tableId : uuidv4()
 			_this.data.position = params.type == 'edit' ? params.position : {}
-			if (params.type == 'edit' && layui.sheetTypew.templateReportType == 5) {
-				_this.data.deviceDataSetting = params.dataSetting
-			}
 			if (params.type == 'edit') {
 				_this.data.itemEditInfo = params.data[0]
+				if (layui.sheetTypew.templateReportType == 5) {
+					_this.data.deviceDataSetting = params.dataSetting
+				}
+				
 			}
 			//console.log(_this.data.dataSetting)
 			layer.open({
@@ -601,8 +602,48 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 					form.render()
 					view.render()
 					setTimeout(() => {
-						if (params.type == 'edit' && layui.sheetTypew.templateReportType == 1) {
-							form.val('item-list-form', params.itemForm)
+						if (params.type == 'edit') {
+							if (layui.sheetTypew.templateReportType == 1) {
+								form.val('item-list-form', params.itemForm)
+							} else if (layui.sheetTypew.templateReportType == 5) {
+								const deviceDataSetting = _this.data.deviceDataSetting
+								$('#itemvar-name-1').attr('data-itemid', deviceDataSetting.var1)
+								$('#itemvar-name-2').attr('data-itemid', deviceDataSetting.var2)
+								$('#itemvar-input-1').val(deviceDataSetting.ipt1)
+								$('#itemvar-input-2').val(deviceDataSetting.ipt2)
+								
+								form.val('item-list-form', {
+									variableType: deviceDataSetting.var1 == deviceDataSetting.var2 ? 1 : 2,
+									isGenCountTime: deviceDataSetting.isGenCountTime,
+									rowNumber: deviceDataSetting.rowNumber
+								})
+								layui.api.getReportDataPolicyById(_this.data.itemList[0].policyId).then(res => {
+									const arr = res.data.policyItemList
+									.filter(item => item.id == deviceDataSetting.var1 || item.id == deviceDataSetting.var2)
+									.map(item => {
+										const width = sheetUtil.getTextWidth('^.' + item.modbusConfig ? item.itemName : item.itemReadName)
+										return {
+											itemDesc: item.describe,
+											itemId: item.id,
+											itemName: item.modbusConfig ? item.itemName : item.itemReadName,
+											itemScale: item.scale,
+											policyId: res.data.id,
+											policyName: res.data.reportDataPolicyName,
+											tableId: _this.data.itemList[0].tableId,
+											uid: uuidv4(),
+											width
+										}
+									})
+									_this.data.itemList = _this.data.itemList.concat(arr)
+									$('#itemvar-name-1').text(_this.data.itemList.filter(item => item.itemId == deviceDataSetting.var1)[0].itemName)
+									$('#itemvar-name-2').text(_this.data.itemList.filter(item => item.itemId == deviceDataSetting.var2)[0].itemName)
+									$('#itemvar-name-1').parent().removeClass('layui-hide')
+									$('#itemvar-name-2').parent().removeClass('layui-hide')
+									if (deviceDataSetting.var1 != deviceDataSetting.var2) {
+										$('button[lay-on="itemvar-event-2"]').removeClass('layui-hide')
+									}
+								})
+							}
 						}
 						luckysheet.exitEditMode()
 					}, 500)
@@ -656,12 +697,27 @@ layui.define(['layer', 'form', 'table', 'util', 'dataSettingw', 'sheetUtil', 'it
 								})
 							})
 						} else if (type == 5) {
+							const dataList = _this.data.itemList.filter(item => item.itemId != $('#itemvar-name-1').attr('data-itemid')
+							&& item.itemId != $('#itemvar-name-2').attr('data-itemid'))
 							_this.data.deviceDataSetting.valueType = _this.data.dataSetting.valueType
 							layui.itemUtil.clearCell(_this.data.tableId, function() {
-								layui.itemUtil.deviceReport(_this.data.itemList, {
-									valLine: _this.data.deviceDataSetting.rowNumber,
-									isGenCountTime: _this.data.deviceDataSetting.isGenCountTime,
-								}, _this.data.deviceDataSetting, _this.data.tableId, function() {
+								layui.itemUtil.deviceReport(dataList, {
+									valLine: itemForm.rowNumber,
+									isGenCountTime: $('input[type="radio"][name="isGenCountTime"]:checked').val(),
+								}, {
+									var1: $('#itemvar-name-1').attr('data-itemid'),
+									var2: $('#itemvar-name-2').attr('data-itemid'),
+									ipt1: $('#itemvar-input-1').val(),
+									ipt2: $('#itemvar-input-2').val(),
+									isGenCountTime: $('input[type="radio"][name="isGenCountTime"]:checked').val(),
+									valueType: _this.data.dataSetting.valueType,
+									valueTakingMode: _this.data.dataSetting.valueTakingMode,
+									dateTimeType1: _this.data.dataSetting.dateTimeType1,
+									dateTimeType2: _this.data.dataSetting.dateTimeType2,
+									startTime: _this.data.dataSetting.startTime,
+									endTime: _this.data.dataSetting.endTime,
+									rowNumber: itemForm.rowNumber,
+								}, _this.data.tableId, function() {
 									layer.close(index)
 								}, function() {
 									layer.alert('检测到数据生成区域含有其他定义报表，生成失败！', {icon: 2})