From f8d7fa4864e3431677e7e10b51d1ac7150c33a19 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 18 Apr 2024 19:43:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=A4=84=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/alarmMge/alarmMge.css | 16 ++- js/pages/alarmMge/alarmMge.js | 195 +++++++++++++++++++++++----------- pages/alarmMge/alarmMge.html | 37 ++++--- 3 files changed, 158 insertions(+), 90 deletions(-) diff --git a/css/alarmMge/alarmMge.css b/css/alarmMge/alarmMge.css index 70ee91e..69b8ac8 100644 --- a/css/alarmMge/alarmMge.css +++ b/css/alarmMge/alarmMge.css @@ -83,18 +83,14 @@ body { } .alarmDialog{ - color: #000; + /* color: #000; */ padding: 15px; } -.layui-input, .layui-select, .layui-textarea { - height: 38px; - line-height: 1.3; - line-height: 38px \9; - border-width: 1px; - border-style: solid; - background-color: transparent; - color: #000 !important; - border-radius: 2px; +#alarmContent{ + color: #000; +} +#alarmMask{ + color: #000; } .black{ color: #000; diff --git a/js/pages/alarmMge/alarmMge.js b/js/pages/alarmMge/alarmMge.js index 82f8589..7edc73c 100644 --- a/js/pages/alarmMge/alarmMge.js +++ b/js/pages/alarmMge/alarmMge.js @@ -9,6 +9,118 @@ layui.use(['layer','table','form','jquery'], function () { table = layui.table; //建管单位下拉选 getBuildLists(); + + table.on('tool(test)', function (obj) { + var data = obj.data; + console.log(data) + if (obj.event === 'edit') { + layer.open({ + type: 1, + title: '告警处置', //显示标题栏 + closeBtn: 1, + area: '600px;', + id: 'LAY_layuipro', //设定一个id，防止重复弹出 + resize: false, + btn: ['确定', '取消'], + btnAlign: 'c', + moveType: 1, //拖拽模式，0或者1 + skin:"layui-layer-molv", + content: $("#biaodan"), + success: function (layero) { + $(':focus').blur(); + // 添加form标识 + layero.addClass('layui-form'); + // 将保存按钮改变成提交按钮 + layero.find('.layui-layer-btn0').attr({ + 'lay-filter': 'formDemo', + 'lay-submit': '' + }); + $("#form_info")[0].reset(); + $("#isAlarm1").attr("checked",true); + $("#alarmContent").val(data.warnContent); + form.render(); + }, + yes: function (layero, index) { + form.on('submit(formDemo)', function (Fdata) { + //表单数据formData + var formData = Fdata.field; + // console.log(formData) + const url = commonUrl + "screen/largeScreen/alarmMge/warnProcess"; + const params = { + "warnId": data.warnId, + "status": formData.isAlarm, + "remark": formData.alarmMask, + } + // console.log(params) + let encryptStr = encryptCBC(JSON.stringify(params)); + ajaxRequest(url, "POST", encryptStr, true, function () { + }, function (result) { + // console.log(result); + if (result.code === 200) { + layer.close('LAY_layuipro') + getQueryList() + } else if (result.code === 500) { + layer.msg(result.msg, { icon: 2 }); + }else if(result.code === 401){ + + } + }, function (xhr, status, error) { + error(xhr, status, error) + }, "application/json",aqEnnable); + }); + }, + cancel: function () { + // 右上角关闭事件的逻辑 + layer.close('LAY_layuipro') + } + }); + }else if(obj.event === 'view'){ + layer.open({ + type: 1, + title: '告警处置', //显示标题栏 + closeBtn: 1, + area: '600px;', + id: 'LAY_layuipro1', //设定一个id，防止重复弹出 + resize: false, + // btn: ['确定', '取消'], + btnAlign: 'c', + moveType: 1, //拖拽模式，0或者1 + skin:"layui-layer-molv", + content: $("#biaodan"), + success: function (layero) { + $(':focus').blur(); + // 添加form标识 + layero.addClass('layui-form'); + // 将保存按钮改变成提交按钮 + layero.find('.layui-layer-btn0').attr({ + 'lay-filter': 'formDemo', + 'lay-submit': '' + }); + $("#form_info")[0].reset(); + $("#alarmContent").val(data.warnContent); + $("#alarmMask").val(data.remark); + if(data.status=='1'){ + console.log(11111) + $("#isAlarm1").attr("checked",true); + $("#isAlarm2").attr("checked",false); + }else if(data.status=='2'){ + console.log(22222) + $("#isAlarm1").attr("checked",false); + $("#isAlarm2").attr("checked",true); + } + form.render(); + }, + cancel: function () { + // 右上角关闭事件的逻辑 + layer.close('LAY_layuipro1') + } + }); + } + }); + + + + }); function getBuildLists(){ @@ -85,7 +197,7 @@ function init(warnType){ table.render({ elem: '#demo', url: url, - skin: 'line', + // skin: 'line', page: true, headers:{ decrypt:"decrypt", @@ -95,18 +207,21 @@ function init(warnType){ bidCode:bidCode, warnType:warnType, orgId:$('#build').val(), - proName:$('#proName').val(), - teamLeader:$('#teamLeader').val() + warnContent:$('#warnContent').val(), + // teamLeader:$('#teamLeader').val() }, cols: [[ {type: 'numbers', title: '序号'}, // 添加序号列 - {field: 'orgName', title: '建管单位',align:'center'}, + // {field: 'orgName', title: '',align:'center'}, {field: 'proName', title: '工程名称',align:'center'}, {field: 'warnContent', title: '告警内容',align:'center'}, - {field: 'teamLeader', title: '班组长',align:'center'}, - // {field: '', title: '操作',align:'center',templet:function(d){ - - // }}, + {field: 'warnTime', title: '告警时间',align:'center'}, + // {field: 'teamLeader', title: '班组长',align:'center'}, + // {field: 'remark', title: '备注',align:'center'}, + // {field: 'userName', title: '处理人',align:'center'}, + {field: 'status', title: '处理状态',align:'center'}, + // {field: 'updateTime', title: '处理时间',align:'center'}, + {fixed: 'right', title: '操作', align:'center',toolbar: '#barDemo' } ]], initComplete: function () { // 在表格渲染完成后，重新渲染序号列 @@ -118,6 +233,15 @@ function init(warnType){ }, done:function(res, curr, count, origin){ console.log(res); + $("[data-field='status']").children().each(function(){ + if($(this).text()=='0'){ + $(this).text('未处理') + }else if($(this).text()=='1'){ + $(this).text('告警') + }else if($(this).text()=='2'){ + $(this).text('未告警') + } + }) } }) } @@ -126,58 +250,3 @@ function getQueryList(){ init(buildCheck) } -function handleAlarm(){ - layer.open({ - type: 1, - title: '告警处置', //显示标题栏 - closeBtn: false, - area: '600px;', - id: 'LAY_layuipro' //设定一个id，防止重复弹出 - , - resize: false, - btn: ['确定', '取消'], - btnAlign: 'c', - moveType: 1 //拖拽模式，0或者1 - , - content: $("#biaodan"), - success: function (layero) { - $(':focus').blur(); - // 添加form标识 - layero.addClass('layui-form'); - // 将保存按钮改变成提交按钮 - layero.find('.layui-layer-btn0').attr({ - 'lay-filter': 'formDemo', - 'lay-submit': '' - }); - form.render(); - }, - yes: function (layero, index) { - form.on('submit(formDemo)', function (data) { - //表单数据formData - var formData = data.field; - console.log(formData) - const url = commonUrl + "screen/largeScreen/constructionQuality/qualityInspection"; - const params = { - "roleCode": roleCode, - "orgId": orgId, - "userId": userId, - "bidCode": bidCode - } - let encryptStr = encryptCBC(JSON.stringify(params)); - ajaxRequest(url, "POST", encryptStr, true, function () { - }, function (result) { - console.log(result); - if (result.code === 200) { - - } else if (result.code === 500) { - layer.msg(result.msg, { icon: 2 }); - }else if(result.code === 401){ - - } - }, function (xhr, status, error) { - error(xhr, status, error) - }, "application/json",aqEnnable); - }); - }, - }); -} \ No newline at end of file diff --git a/pages/alarmMge/alarmMge.html b/pages/alarmMge/alarmMge.html index d4f929e..f73ea80 100644 --- a/pages/alarmMge/alarmMge.html +++ b/pages/alarmMge/alarmMge.html @@ -27,40 +27,35 @@
-
+
- +
-
-
+
-
-
- -
-
@@ -74,29 +69,37 @@
+ + \ No newline at end of file