Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-lushangqing
Showing
4 changed files
with
14 additions
and
11 deletions
| @@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
| 105 | <script type="text/html" id="activeAlarmtoolbar"> | 105 | <script type="text/html" id="activeAlarmtoolbar"> |
| 106 | <div class="ayui-btn-container"> | 106 | <div class="ayui-btn-container"> |
| 107 | <button id="alarmClear" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警消除</button> | 107 | <button id="alarmClear" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警消除</button> |
| 108 | - <button id="clearBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警闭环消除</button> | 108 | + <button id="clearBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal" style="display: none">告警闭环消除</button> |
| 109 | <button id="closeBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警关闭</button> | 109 | <button id="closeBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警关闭</button> |
| 110 | <button id="confirmBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警确认</button> | 110 | <button id="confirmBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警确认</button> |
| 111 | <button id="resumeBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警恢复</button> | 111 | <button id="resumeBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警恢复</button> |
| @@ -33,10 +33,8 @@ | @@ -33,10 +33,8 @@ | ||
| 33 | </template> | 33 | </template> |
| 34 | <template #tools="{scope}"> | 34 | <template #tools="{scope}"> |
| 35 | <div class="list-handle"> | 35 | <div class="list-handle"> |
| 36 | - <span class="icon-bg"> | ||
| 37 | <!-- <i class="el-icon-delete" title="处理" @click="handleDelete(scope.row)"></i>--> | 36 | <!-- <i class="el-icon-delete" title="处理" @click="handleDelete(scope.row)"></i>--> |
| 38 | - <i class="el-icon-view" title="查看" @click="handleView(scope.row)"></i> | ||
| 39 | - </span> | 37 | + <el-button @click="handleView(scope.row)" size="mini">查看</el-button> |
| 40 | </div> | 38 | </div> |
| 41 | </template> | 39 | </template> |
| 42 | </cm-table-page> | 40 | </cm-table-page> |
| @@ -259,6 +259,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -259,6 +259,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
| 259 | '<input type="radio" name="noticeFlag" value="true" title="是" > 是' + | 259 | '<input type="radio" name="noticeFlag" value="true" title="是" > 是' + |
| 260 | '<input type="radio" name="noticeFlag" value="false" title="否" checked="" style="margin-left: 20px;"> 否</div> ' //这里content是一个普通的String | 260 | '<input type="radio" name="noticeFlag" value="false" title="否" checked="" style="margin-left: 20px;"> 否</div> ' //这里content是一个普通的String |
| 261 | , yes: function () { | 261 | , yes: function () { |
| 262 | + var loading = layer.load(2); | ||
| 262 | admin.req({ | 263 | admin.req({ |
| 263 | url: common.domainName + '/api-web/home/alarm/clear' | 264 | url: common.domainName + '/api-web/home/alarm/clear' |
| 264 | , type: "post" | 265 | , type: "post" |
| @@ -269,6 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -269,6 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
| 269 | noticeFlag: $('input[name="noticeFlag"]:checked').val() | 270 | noticeFlag: $('input[name="noticeFlag"]:checked').val() |
| 270 | } | 271 | } |
| 271 | , done: function (res) { | 272 | , done: function (res) { |
| 273 | + layer.close(loading); | ||
| 272 | //如果消除成功，关闭弹出框然后重新加载页面 | 274 | //如果消除成功，关闭弹出框然后重新加载页面 |
| 273 | if (res.success) { | 275 | if (res.success) { |
| 274 | layer.close(index); | 276 | layer.close(index); |
| @@ -1044,8 +1046,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -1044,8 +1046,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
| 1044 | }, | 1046 | }, |
| 1045 | done: function (data) { | 1047 | done: function (data) { |
| 1046 | let knFlag=data.object.value; | 1048 | let knFlag=data.object.value; |
| 1047 | - if(knFlag == '0'){ | ||
| 1048 | - $('#clearBtn').hide(); | 1049 | + if(knFlag == '1'){ |
| 1050 | + $('#clearBtn').show(); | ||
| 1049 | } | 1051 | } |
| 1050 | } | 1052 | } |
| 1051 | }); | 1053 | }); |
| @@ -209,6 +209,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -209,6 +209,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
| 209 | } | 209 | } |
| 210 | $('td[data-field="alarmNo"]').css('color','black'); | 210 | $('td[data-field="alarmNo"]').css('color','black'); |
| 211 | layer.prompt({title: '恢复说明(必填)', formType: 2}, function (text, index) { | 211 | layer.prompt({title: '恢复说明(必填)', formType: 2}, function (text, index) { |
| 212 | + var loading = layer.load(2); | ||
| 212 | admin.req({ | 213 | admin.req({ |
| 213 | url: common.domainName + '/api-web/home/alarm/resume' | 214 | url: common.domainName + '/api-web/home/alarm/resume' |
| 214 | , type: "post" | 215 | , type: "post" |
| @@ -220,6 +221,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -220,6 +221,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
| 220 | access_token: accessToken | 221 | access_token: accessToken |
| 221 | } | 222 | } |
| 222 | , done: function (res) { | 223 | , done: function (res) { |
| 224 | + layer.close(loading); | ||
| 223 | //如果消除成功，关闭弹出框然后重新加载页面 | 225 | //如果消除成功，关闭弹出框然后重新加载页面 |
| 224 | if (res.success) { | 226 | if (res.success) { |
| 225 | layer.close(index); | 227 | layer.close(index); |
| @@ -318,10 +320,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -318,10 +320,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
| 318 | , {field: 'alarmTime', title: '首次告警时间', align: 'center', minWidth: 180, sort: true} | 320 | , {field: 'alarmTime', title: '首次告警时间', align: 'center', minWidth: 180, sort: true} |
| 319 | , {field: 'durationStr', title: '持续时间', align: 'center', width: 190} | 321 | , {field: 'durationStr', title: '持续时间', align: 'center', width: 190} |
| 320 | , { | 322 | , { |
| 321 | - title: '操作', align: 'center', minWidth: minWidthHandle, | 323 | + title: '操作', align: 'center', minWidth: 150, |
| 322 | templet: `<div> | 324 | templet: `<div> |
| 323 | 325 | ||
| 324 | - <span history-data-warn-clear="{{d.id}}" class="layui-table-link">补录</span> | 326 | + <span history-data-warn-clear="{{d.primaryKey}}" class="layui-table-link">补录</span> |
| 325 | <span history-data-warn-view="{{d.id}}" class="layui-table-link">查看</span> | 327 | <span history-data-warn-view="{{d.id}}" class="layui-table-link">查看</span> |
| 326 | <span history-data-warn-path="{{d.id}}" class="layui-table-link">轨迹</span> | 328 | <span history-data-warn-path="{{d.id}}" class="layui-table-link">轨迹</span> |
| 327 | </div>` | 329 | </div>` |
| @@ -407,7 +409,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -407,7 +409,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
| 407 | 409 | ||
| 408 | if(resArr){ | 410 | if(resArr){ |
| 409 | resArr.map(item=>{ | 411 | resArr.map(item=>{ |
| 410 | - if(item.id==$(this).attr('history-data-warn-clear')){ | 412 | + if(item.primaryKey==$(this).attr('history-data-warn-clear')){ |
| 411 | paramsData.push(item); | 413 | paramsData.push(item); |
| 412 | } | 414 | } |
| 413 | }) | 415 | }) |
| @@ -428,12 +430,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -428,12 +430,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
| 428 | url: common.domainName + '/api-web/bAlarmManage/manageInto', | 430 | url: common.domainName + '/api-web/bAlarmManage/manageInto', |
| 429 | type: "get", | 431 | type: "get", |
| 430 | data: { | 432 | data: { |
| 431 | - alarmId: params.id | 433 | + alarmId: params.primaryKey, |
| 434 | + alarm: "alarmHis" | ||
| 432 | }, | 435 | }, |
| 433 | done: function (data) { | 436 | done: function (data) { |
| 434 | if(data.data && data.data.length>0){ | 437 | if(data.data && data.data.length>0){ |
| 435 | //已存入了草稿 | 438 | //已存入了草稿 |
| 436 | - layer.msg('告警消除已存入草稿中了！', {icon: 2, time: 2000}); | 439 | + layer.msg('告警已补录', {icon: 2, time: 2000}); |
| 437 | }else{ | 440 | }else{ |
| 438 | layer.open({ | 441 | layer.open({ |
| 439 | title: ['告警消除', 'font-size:18px;'], | 442 | title: ['告警消除', 'font-size:18px;'], |
-
Please register or login to post a comment