monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 858f2b1fc034c9f0b657afc043555bb6c9d3c17b 2 parents 07c9af6b 403e69a4

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

拓补视图-【1692】-网络设备资源拓扑图可以绑定管理状态、端口状态和监控连接状态



See merge request !993
Inline Side-by-side
Showing 1 changed file with 10 additions and 2 deletions
@@ -119,6 +119,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -119,6 +119,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
119 admin.req({ 119 admin.req({
120 url: common.domainName + url 120 url: common.domainName + url
121 }).done(function (res) { 121 }).done(function (res) {
  122 + var editFlag = localStorage.getItem("editFlag");//是否编辑状态
122 var flags = ""; 123 var flags = "";
123 var kpiIdList = ""; 124 var kpiIdList = "";
124 if (res.data && res.data.length > 0) { 125 if (res.data && res.data.length > 0) {
@@ -172,6 +173,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -172,6 +173,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
172 '</a>' 173 '</a>'
173 var menuId = ""; 174 var menuId = "";
174 if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' || status != -1) { 175 if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' || status != -1) {
  176 + if (editFlag == 'true' && v.id == 'KPIE13DD9A3'){
  177 + v.name += '<div class="layui-form" style="float: left;height: 30px;width: 30px;padding-left: 10px">' +
  178 + '<input style="" lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" data-unit="" ' +
  179 + 'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + v.flag + '" data-name=' + v.name + '></div>';
  180 + }
175 v.name = v.name + tips; 181 v.name = v.name + tips;
176 menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'"; 182 menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
177 } 183 }
@@ -182,7 +188,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -182,7 +188,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
182 + $html + valueStr + '</span></li>' 188 + $html + valueStr + '</span></li>'
183 }); 189 });
184 $("#" + targetId).html(li); 190 $("#" + targetId).html(li);
185 - fn && fn(); 191 + form.render('checkbox');
  192 + getCheckedBoxData();
  193 + fn && fn()
186 194
187 //初始化监听告警压制需要的数据 195 //初始化监听告警压制需要的数据
188 if (!statusF) { 196 if (!statusF) {
@@ -2147,7 +2155,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -2147,7 +2155,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
2147 //拼接表空间名称、文件系统名称等等,如果是性能指标或者趋势指标，则可以下探 徐毫杰还原 2155 //拼接表空间名称、文件系统名称等等,如果是性能指标或者趋势指标，则可以下探 徐毫杰还原
2148 if (value.kpiIdent == '1' || value.isWarning == '1' || status != -1) { 2156 if (value.kpiIdent == '1' || value.isWarning == '1' || status != -1) {
2149 var chbox = ''; 2157 var chbox = '';
2150 - if (editFlag && editFlag == "true" && value.kpiIdent == '1') { 2158 + if (editFlag && editFlag == "true" && (value.kpiIdent == '1' || value.kpiId=='KPIFA92AF2D' || value.kpiId=='KPIBD006E36')) {
2151 chbox = '<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" ' + 2159 chbox = '<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" ' +
2152 'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + value.flag + '" data-name="' + kpiname + '" data-unit="' + v.unit + '">'; 2160 'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + value.flag + '" data-name="' + kpiname + '" data-unit="' + v.unit + '">';
2153 } 2161 }