ws 1 year ago
parent
commit
47ac5ea34d

BIN
industry-system/industry-da/src/main/resources/static/cy-collector.7z


+ 21 - 6
industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/sheet-type-window.js

@@ -5,6 +5,19 @@ layui.define(['layer', 'form', 'jquery'], function(exports) {
 
 	form.on('radio(sheetType)', function(data) {
 		const elem = data.elem;
+		if (elem.value == 1) {
+			$('.auto-sheet').removeClass('layui-hide')
+			form.val('sheetTypeForm', {
+				sheet2: 1
+			})
+		} else {
+			$('.auto-sheet').addClass('layui-hide')
+		}
+		$('#st-numberView').addClass('layui-hide')
+	})
+	
+	form.on('radio(sheetType2)', function(data) {
+		const elem = data.elem;
 		if (elem.value == 2 || elem.value == 5) {
 			$('#st-numberView').removeClass('layui-hide')
 		} else {
@@ -22,8 +35,11 @@ layui.define(['layer', 'form', 'jquery'], function(exports) {
 					<div class="layui-input-block">
 						<input type="radio" lay-filter="sheetType" name="sheet" value="0" title="手动报表">
 						<input type="radio" lay-filter="sheetType" name="sheet" value="1" title="自动报表">
-						<input type="radio" lay-filter="sheetType" name="sheet" value="2" title="事件驱动报表">
-						<input type="radio" lay-filter="sheetType" name="sheet" value="5" title="设备报表">
+					</div>
+					<div class="layui-input-block auto-sheet layui-hide">
+						<input type="radio" lay-filter="sheetType2" name="sheet2" value="1" title="周期报表">
+						<input type="radio" lay-filter="sheetType2" name="sheet2" value="2" title="事件驱动报表">
+						<input type="radio" lay-filter="sheetType2" name="sheet2" value="5" title="设备报表">
 					</div>
 				</div>
 				<div id="st-numberView" class="layui-form-item layui-hide" style="width: 80%;">
@@ -38,10 +54,9 @@ layui.define(['layer', 'form', 'jquery'], function(exports) {
 			const _this = this
 			layer.open({
 				type: 1,
-				area: ['700px', '260px'],
+				area: ['700px', '280px'],
 				title: ['选择模板报表类型', 'text-align: center;padding-left: 81px;font-size: 18px;'],
-				btn: ['确定'],
-				btnAlign: 'c',
+				btn: ['确定', '取消'],
 				content: _this.content,
 				success: function() {
 					form.render()
@@ -52,7 +67,7 @@ layui.define(['layer', 'form', 'jquery'], function(exports) {
 						layer.alert('请选择模板报表类型');
 						return;
 					}
-					_this.templateReportType = data.sheet;
+					_this.templateReportType = data.sheet == 1 ? data.sheet2 : data.sheet;
 					_this.templateEventReportNum = data.sheetNumber;
 					layer.close(index);
 					if (callback) {