monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit d2a6e96e15e7d1579a624401a846076ea65ebd5d 2 parents 604fcadd 9e554494

人员变更，删除注释代码

Inline Side-by-side
Showing 20 changed files with 191 additions and 206 deletions
@@ -25,10 +25,60 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -25,10 +25,60 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
25 //资源详细页面相关调用函数，包含各种展示类型的 25 //资源详细页面相关调用函数，包含各种展示类型的
26 26
27 let editKpiList = []; 27 let editKpiList = [];
  28 + let statusKpiList=[];//lsq 状态指标数据 2022-06-08
28 var obj = { 29 var obj = {
29 detailTimer:[], 30 detailTimer:[],
30 timerTime: 180000, 31 timerTime: 180000,
31 sessions: layui.sessions, 32 sessions: layui.sessions,
  33 + getStatusKpiList:function (){
  34 + //start lsq 根据kpiid获取是否是指标状态 2022-05-23
  35 + if(statusKpiList.length != 0){
  36 + return statusKpiList;
  37 + }
  38 + statusKpiList = [];
  39 + admin.req({
  40 + url: common.domainName + '/api-web/manage/kpi/page?' +
  41 + 'isWarning=&isTrend=&kpiLevel=&ignoreCnt=&startTime=&endTime=&kpiPower=',
  42 + data: {
  43 + page:1,limit:99999,
  44 + kpiName: '',resType: '',kpiIdent: 2,kpiCategory: '',
  45 + kpiDataType:'',kpiUnit:'',isWarning:'',isTrend:'',
  46 + kpiLevel:'',ignoreCnt:'',startTime:'',endTime:'',kpiPower:''
  47 + },
  48 + success(response) {
  49 + let arr=[];
  50 + if (response && response.success) {
  51 + arr=response.data;
  52 + arr.map(item=>{
  53 + statusKpiList.push(item.kpiId)
  54 + })
  55 + /*let idArr=[];
  56 + let idStr='';
  57 + if(id.indexOf(',')!=-1){
  58 + idArr=id.split(',');
  59 + idStr=idArr[0];
  60 + }else{
  61 + idStr=id;
  62 + }
  63 + let isKpi=false;
  64 + arr.map(item=>{
  65 + if(idStr==item.kpiId){
  66 + isKpi=true;
  67 + }
  68 + })
  69 + if(isKpi){
  70 + let menuboxStr = '<li type="link-status-kpi"><i class="layui-icon">&#xe758;</i>状态指标</li>';
  71 + $("#detail_menubox_id ul").append(menuboxStr)
  72 + }*/
  73 + } else {
  74 + // layer.msg('状态指标获取失败!', {icon: 2});
  75 + }
  76 + },
  77 + error(){
  78 + // layer.msg('状态指标获取失败!', {icon: 2});
  79 + }
  80 + });
  81 + },
32 // 获取编辑指标 82 // 获取编辑指标
33 getEditKpiList:function (){ 83 getEditKpiList:function (){
34 var editFlag = localStorage.getItem("editFlag");//是否编辑状态 84 var editFlag = localStorage.getItem("editFlag");//是否编辑状态
@@ -75,6 +125,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -75,6 +125,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
75 {"flag": "base","name": "最近采集时间","id": "KPIF74D9D2B","value": "2019-12-16 10:04:54","status": "0" }]} 125 {"flag": "base","name": "最近采集时间","id": "KPIF74D9D2B","value": "2019-12-16 10:04:54","status": "0" }]}
76 */ 126 */
77 renderText: function (targetId, resId, kpiId, fn, hasTotal,flag,isBasic) { 127 renderText: function (targetId, resId, kpiId, fn, hasTotal,flag,isBasic) {
  128 + //start lsq 状态信息的状态也增加下探 202-06-08
  129 + let statusF=false;//是否为状态信息
  130 + //end lsq 2022-06-08
78 var url = "/api-web/detail/block?resId=" + resId + "&kpiId=" + kpiId + "&hasTotal=" + hasTotal; 131 var url = "/api-web/detail/block?resId=" + resId + "&kpiId=" + kpiId + "&hasTotal=" + hasTotal;
79 if (flag) { 132 if (flag) {
80 url += '&flag=' + flag; 133 url += '&flag=' + flag;
@@ -98,7 +151,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -98,7 +151,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
98 var fontColor=''; 151 var fontColor='';
99 var valueStr = ''; 152 var valueStr = '';
100 var titleStr = ''; 153 var titleStr = '';
101 - if(v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D'){ 154 + //start lsq 判断当前kpiId是否在状态指标数据列表中 2022-06-08
  155 + let status=statusKpiList.indexOf(v.id);
  156 + if(status!=-1){
  157 + statusF=true;
  158 + }
  159 + //end lsq 2022-06-08
  160 + if(v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' ){
102 valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: v.value}); 161 valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: v.value});
103 //获取flag 162 //获取flag
104 $.each(v.value, function (i, v) { 163 $.each(v.value, function (i, v) {
@@ -122,13 +181,20 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -122,13 +181,20 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
122 } 181 }
123 titleStr = valueStr; 182 titleStr = valueStr;
124 } 183 }
125 - var tips = '<a class="detail_row_menu hide">\n' + 184 + /* var tips = '<a class="detail_row_menu hide">\n' +
  185 + '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
  186 + '</a>'*/
  187 + var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+
  188 + ' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' +
  189 + ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
  190 + // ' data-restype='+((data && data[0])?data[0].resType:"")+'>\n' +
  191 + ' data-restype='+(v.resType?v.resType:"")+'>\n' +
126 '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' + 192 '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
127 '</a>' 193 '</a>'
128 var menuId = ""; 194 var menuId = "";
129 - if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D') { 195 + if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' || status!=-1) {
130 v.name = v.name + tips; 196 v.name = v.name + tips;
131 - menuId = "id=\"" + targetId + "_detail_row_menu\""; 197 + menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
132 } 198 }
133 var $html = addIconByValue(valueStr); 199 var $html = addIconByValue(valueStr);
134 var resStyle = obj.alarmEleMatchStyle(v.flag, v.id); 200 var resStyle = obj.alarmEleMatchStyle(v.flag, v.id);
@@ -140,22 +206,26 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -140,22 +206,26 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
140 fn && fn(); 206 fn && fn();
141 207
142 //初始化监听告警压制需要的数据 208 //初始化监听告警压制需要的数据
143 - var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);  
144 - rowMenu.attr("data-id", kpiIdList);  
145 - rowMenu.attr("data-flag", flags);  
146 - rowMenu.attr("data-name", "监控连接状态");  
147 - rowMenu.attr("data-kpiname", "监控连接状态");  
148 - rowMenu.attr("data-iswarning", "1");  
149 - rowMenu.attr("data-ident", "1");  
150 - rowMenu.attr("data-trend", "0");  
151 - rowMenu.attr("data-unit", "");  
152 - rowMenu.attr('data-hidem', 'true');  
153 - rowMenu.attr('data-nature', 'true');//性能趋势  
154 - // rowMenu.attr('data-canca', data.canCA);  
155 - // rowMenu.attr('data-incaing', data.inCAing);  
156 - rowMenu.attr('data-restype', (data && data[0])?data[0].resType:''); 209 + if(!statusF){
  210 + var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
  211 + rowMenu.attr("data-id", kpiIdList);
  212 + rowMenu.attr("data-flag", flags);
  213 + rowMenu.attr("data-name", "监控连接状态");
  214 + rowMenu.attr("data-kpiname", "监控连接状态");
  215 + rowMenu.attr("data-iswarning", "1");
  216 + rowMenu.attr("data-ident", "1");
  217 + rowMenu.attr("data-trend", "0");
  218 + rowMenu.attr("data-unit", "");
  219 + rowMenu.attr('data-hidem', 'true');
  220 + rowMenu.attr('data-nature', 'true');//性能趋势
  221 + // rowMenu.attr('data-canca', data.canCA);
  222 + // rowMenu.attr('data-incaing', data.inCAing);
  223 + rowMenu.attr('data-restype', (data && data[0])?data[0].resType:'');
  224 + }
  225 +
157 //监听告警压制等操作配置 226 //监听告警压制等操作配置
158 - $('#' + targetId + "_detail_row_menu").hover(function () { 227 + // $('#' + targetId + "_detail_row_menu").hover(function () {
  228 + $('#' + targetId + "_detail_row_menu.statusMenu").hover(function () {
159 var $that = $(this); 229 var $that = $(this);
160 var $btn = $that.find(".detail_row_menu"); 230 var $btn = $that.find(".detail_row_menu");
161 if ($btn.length > 0) { 231 if ($btn.length > 0) {
@@ -175,6 +245,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -175,6 +245,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
175 * @param cols 指定列（一组key value为一列） 245 * @param cols 指定列（一组key value为一列）
176 */ 246 */
177 renderTextCols: function (targetId, resId, kpiId, cols, isBasic) { 247 renderTextCols: function (targetId, resId, kpiId, cols, isBasic) {
  248 + //start lsq 状态信息的状态也增加下探 202-06-08
  249 + let statusF=false;//是否为状态信息
  250 + //end lsq 2022-06-08
178 var url = "/api-web/detail/block?resId=" + resId + "&kpiId=" + kpiId; 251 var url = "/api-web/detail/block?resId=" + resId + "&kpiId=" + kpiId;
179 if (isBasic) { 252 if (isBasic) {
180 url += '&isBasic=' + isBasic; 253 url += '&isBasic=' + isBasic;
@@ -184,6 +257,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -184,6 +257,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
184 }).done(function (res) { 257 }).done(function (res) {
185 var flags = ""; 258 var flags = "";
186 var kpiIdList= ""; 259 var kpiIdList= "";
  260 + //start lsq 判断当前kpiId是否在状态指标数据列表中 2022-06-08
  261 + let status=statusKpiList.indexOf(v.id);
  262 + if(status!=-1){
  263 + statusF=true;
  264 + }
  265 + //end lsq 2022-06-08
187 var data = res.data; 266 var data = res.data;
188 if (data.length > 0) { 267 if (data.length > 0) {
189 var dataArr = common.splieceGroup(data, cols); 268 var dataArr = common.splieceGroup(data, cols);
@@ -215,13 +294,21 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -215,13 +294,21 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
215 //获取kpi 294 //获取kpi
216 kpiIdList += ar.id + ","; 295 kpiIdList += ar.id + ",";
217 } 296 }
218 - var tips = '<a class="detail_row_menu hide">\n' + 297 + //start lsq 更改下探图标的属性值 2022-06-08
  298 + /* var tips = '<a class="detail_row_menu hide">\n' +
  299 + '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
  300 + '</a>'*/
  301 + var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+
  302 + ' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' +
  303 + ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
  304 + ' data-restype='+(v.resType?v.resType:"")+'>\n' +
219 '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' + 305 '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
220 '</a>' 306 '</a>'
  307 + //end lsq 2022-06-08
221 var menuId = ""; 308 var menuId = "";
222 - if (ar.id == 'KPIE13DD9A3' || ar.id == 'KPI02786E8D') { 309 + if (ar.id == 'KPIE13DD9A3' || ar.id == 'KPI02786E8D' || status!=-1) {
223 ar.name = ar.name + tips; 310 ar.name = ar.name + tips;
224 - menuId = "id=\"" + targetId + "_detail_row_menu\""; 311 + menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
225 } 312 }
226 var $html = addIconByValue(valueStr); 313 var $html = addIconByValue(valueStr);
227 var resStyle = obj.alarmEleMatchStyle(ar.flag, ar.id); 314 var resStyle = obj.alarmEleMatchStyle(ar.flag, ar.id);
@@ -243,21 +330,23 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -243,21 +330,23 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
243 $("#" + targetId).html(li); 330 $("#" + targetId).html(li);
244 } 331 }
245 //初始化监听告警压制需要的数据 332 //初始化监听告警压制需要的数据
246 - var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);  
247 - rowMenu.attr("data-id", kpiIdList);  
248 - rowMenu.attr("data-flag", flags);  
249 - rowMenu.attr("data-name", "监控连接状态");  
250 - rowMenu.attr("data-kpiname", "监控连接状态");  
251 - rowMenu.attr("data-iswarning", "1");  
252 - rowMenu.attr("data-ident", "1");  
253 - rowMenu.attr("data-trend", "0");  
254 - rowMenu.attr("data-unit", "");  
255 - rowMenu.attr('data-hidem', 'true');  
256 - rowMenu.attr('data-nature', 'true');//性能趋势  
257 - rowMenu.attr('data-restype', data[0]?data[0].resType:'');  
258 - 333 + if(!statusF){
  334 + var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
  335 + rowMenu.attr("data-id", kpiIdList);
  336 + rowMenu.attr("data-flag", flags);
  337 + rowMenu.attr("data-name", "监控连接状态");
  338 + rowMenu.attr("data-kpiname", "监控连接状态");
  339 + rowMenu.attr("data-iswarning", "1");
  340 + rowMenu.attr("data-ident", "1");
  341 + rowMenu.attr("data-trend", "0");
  342 + rowMenu.attr("data-unit", "");
  343 + rowMenu.attr('data-hidem', 'true');
  344 + rowMenu.attr('data-nature', 'true');//性能趋势
  345 + rowMenu.attr('data-restype', data[0]?data[0].resType:'');
  346 + }
259 //监听告警压制等操作配置 347 //监听告警压制等操作配置
260 - $('#' + targetId + "_detail_row_menu").hover(function () { 348 + // $('#' + targetId + "_detail_row_menu").hover(function () {
  349 + $('#' + targetId + "_detail_row_menu.statusMenu").hover(function () {
261 var $that = $(this); 350 var $that = $(this);
262 var $btn = $that.find(".detail_row_menu"); 351 var $btn = $that.find(".detail_row_menu");
263 if ($btn.length > 0) { 352 if ($btn.length > 0) {
@@ -3357,7 +3446,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3357,7 +3446,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3357 , done: function (res) { 3446 , done: function (res) {
3358 if(res.data && res.data.length>0){ 3447 if(res.data && res.data.length>0){
3359 let listData=res.data; 3448 let listData=res.data;
3360 - // 3449 + $('#title-shutdown').css("width",'600px')
3361 let carouselStr=` 3450 let carouselStr=`
3362 <img src="/src/style/img/shutdown.png" style="position: absolute;top: 0; left: -3px;" alt=""> 3451 <img src="/src/style/img/shutdown.png" style="position: absolute;top: 0; left: -3px;" alt="">
3363 <div style="background: transparent; height: 30px;font-size: 14px; color:#ff0000; display: flex;align-items: center;"> 3452 <div style="background: transparent; height: 30px;font-size: 14px; color:#ff0000; display: flex;align-items: center;">
@@ -3377,24 +3466,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3377,24 +3466,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3377 $("#marqueeDiv").mouseout(function (){ 3466 $("#marqueeDiv").mouseout(function (){
3378 this.start(); 3467 this.start();
3379 }) 3468 })
3380 - /*//轮播切换  
3381 - let options={  
3382 - width: '630px'  
3383 - , height:'30px'  
3384 - , arrow: 'none'  
3385 - , autoplay: true//自动切换  
3386 - , interval:5000//自动切换的时间间隔  
3387 - // , trigger: (layui.device().ios || layui.device().android) ? 'click' : 'hover'  
3388 - , anim: 'default' //切换动画的方式 fade,default,updown  
3389 - , index: 0  
3390 - , indicator:'none'//指示器的位置 outside，inside,none  
3391 - }  
3392 - var ins=carousel.render({  
3393 - elem: '#shutdown-carousel'  
3394 - });  
3395 - //重置轮播  
3396 - ins.reload(options);*/ 3469 +
3397 //end lsq 2022-05-24 3470 //end lsq 2022-05-24
  3471 + }else{
  3472 + $('#title-shutdown').css("width",'0px')
3398 } 3473 }
3399 } 3474 }
3400 }) 3475 })
@@ -3894,6 +3969,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3894,6 +3969,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3894 var canCA = $menu.data('canca'); 3969 var canCA = $menu.data('canca');
3895 var inCAing = $menu.data('incaing'); 3970 var inCAing = $menu.data('incaing');
3896 var nature = $menu.data('nature'); 3971 var nature = $menu.data('nature');
  3972 + //lsq 状态信息无其他下探 2022-06-08
  3973 + var statusF = $menu.data('statusf');
3897 var menubox = '<div class="detail_menubox" id="detail_menubox_id" style="color:#666;"><ul>'; 3974 var menubox = '<div class="detail_menubox" id="detail_menubox_id" style="color:#666;"><ul>';
3898 if (!nature) { 3975 if (!nature) {
3899 menubox += 3976 menubox +=
@@ -3906,8 +3983,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3906,8 +3983,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3906 if (!nature) { 3983 if (!nature) {
3907 menubox += '<li type="t"><i class="layui-icon">&#xe62c;</i>性能趋势</li>'; 3984 menubox += '<li type="t"><i class="layui-icon">&#xe62c;</i>性能趋势</li>';
3908 } 3985 }
3909 -  
3910 - menubox += '<li type="n"><i class="layui-icon">&#xe758;</i>压制次数</li>'; 3986 + // if(!statusF){
  3987 + menubox += '<li type="n"><i class="layui-icon">&#xe758;</i>压制次数</li>';
  3988 + // }
3911 if (canCA) { 3989 if (canCA) {
3912 if (inCAing) { 3990 if (inCAing) {
3913 menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>'; 3991 menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>';
@@ -3938,45 +4016,24 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3938,45 +4016,24 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3938 flag = flag.replace(/^\s+|\s+$/g, ""); 4016 flag = flag.replace(/^\s+|\s+$/g, "");
3939 } 4017 }
3940 //start lsq 根据kpiid获取是否是指标状态 2022-05-23 4018 //start lsq 根据kpiid获取是否是指标状态 2022-05-23
3941 - admin.req({  
3942 - url: common.domainName + '/api-web/manage/kpi/page?' +  
3943 - 'isWarning=&isTrend=&kpiLevel=&ignoreCnt=&startTime=&endTime=&kpiPower=',  
3944 - data: {  
3945 - page:1,limit:99999,  
3946 - kpiName: '',resType: '',kpiIdent: 2,kpiCategory: '',  
3947 - kpiDataType:'',kpiUnit:'',isWarning:'',isTrend:'',  
3948 - kpiLevel:'',ignoreCnt:'',startTime:'',endTime:'',kpiPower:''  
3949 - },  
3950 - success(response) {  
3951 - let arr=[];  
3952 - if (response && response.success) {  
3953 - arr=response.data;  
3954 - let idArr=[];  
3955 - let idStr='';  
3956 - if(id.indexOf(',')!=-1){  
3957 - idArr=id.split(',');  
3958 - idStr=idArr[0];  
3959 - }else{  
3960 - idStr=id;  
3961 - }  
3962 - let isKpi=false;  
3963 - arr.map(item=>{  
3964 - if(idStr==item.kpiId){  
3965 - isKpi=true;  
3966 - }  
3967 - })  
3968 - if(isKpi){  
3969 - let menuboxStr = '<li type="link-status-kpi"><i class="layui-icon">&#xe758;</i>状态指标</li>';  
3970 - $("#detail_menubox_id ul").append(menuboxStr)  
3971 - }  
3972 - } else {  
3973 - // layer.msg('状态指标获取失败!', {icon: 2});  
3974 - }  
3975 - },  
3976 - error(){  
3977 - // layer.msg('状态指标获取失败!', {icon: 2}); 4019 + let idArr=[];
  4020 + let idStr='';
  4021 + if(id.indexOf(',')!=-1){
  4022 + idArr=id.split(',');
  4023 + idStr=idArr[0];
  4024 + }else{
  4025 + idStr=id;
  4026 + }
  4027 + let isKpi=false;
  4028 + statusKpiList.map(item=>{
  4029 + if(idStr==item){
  4030 + isKpi=true;
3978 } 4031 }
3979 - }); 4032 + })
  4033 + if(isKpi){
  4034 + let menuboxStr = '<li type="link-status-kpi"><i class="layui-icon">&#xe758;</i>状态指标</li>';
  4035 + $("#detail_menubox_id ul").append(menuboxStr)
  4036 + }
3980 setTimeout(function (){ 4037 setTimeout(function (){
3981 //end lsq 2022-05-23 4038 //end lsq 2022-05-23
3982 //菜单点击事件 4039 //菜单点击事件
@@ -4049,6 +4106,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -4049,6 +4106,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
4049 }); 4106 });
4050 } 4107 }
4051 4108
  4109 + //lsq 页面加载完就调用一下获取状态指标列表数据 2022-06-08
  4110 + obj.getStatusKpiList();
4052 //对外暴露的接口 4111 //对外暴露的接口
4053 exports('commonDetail', obj); 4112 exports('commonDetail', obj);
4054 }); 4113 });
@@ -1105,7 +1105,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions', @@ -1105,7 +1105,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
1105 type: 1, 1105 type: 1,
1106 area: ['90%','80%'], 1106 area: ['90%','80%'],
1107 resize:false, 1107 resize:false,
1108 - btn: ['关闭'], 1108 + btn: ['确定','取消'],
1109 content: laytpl($('#userResourceAuthorization').html()).render(JSON.stringify({})), 1109 content: laytpl($('#userResourceAuthorization').html()).render(JSON.stringify({})),
1110 success: function (index, layero) { 1110 success: function (index, layero) {
1111 renderResAuthByUser(usernames[0]) 1111 renderResAuthByUser(usernames[0])
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }" 29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
30 :total="data.count" 30 :total="data.count"
31 - :pageSize="pageSize" 31 + :pageSize="data.searchParams.limit"
32 @loaddata="loadTableDataList" 32 @loaddata="loadTableDataList"
33 @selectionChange="selectionChange" 33 @selectionChange="selectionChange"
34 :showIndex="true" 34 :showIndex="true"
@@ -156,7 +156,7 @@ export default { @@ -156,7 +156,7 @@ export default {
156 let params = { 156 let params = {
157 targetUserName: obj.selectModel.join(''), 157 targetUserName: obj.selectModel.join(''),
158 "userName": proxy.$route.query.username, 158 "userName": proxy.$route.query.username,
159 - "busId": arr.join(',') 159 + "subId": arr.join(',')
160 } 160 }
161 if(params.targetUserName == params.userName){ 161 if(params.targetUserName == params.userName){
162 proxy.$global.showMsg('变更用户不能与变更前用户一致，请修改！','warning'); 162 proxy.$global.showMsg('变更用户不能与变更前用户一致，请修改！','warning');
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }" 29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
30 :total="data.count" 30 :total="data.count"
31 - :pageSize="pageSize" 31 + :pageSize="data.searchParams.limit"
32 @loaddata="loadTableDataList" 32 @loaddata="loadTableDataList"
33 @selectionChange="selectionChange" 33 @selectionChange="selectionChange"
34 :showIndex="true" 34 :showIndex="true"
@@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
39 <cm-table-page :columns="columns" 39 <cm-table-page :columns="columns"
40 :dataList="resourceData" 40 :dataList="resourceData"
41 :total="count" 41 :total="count"
42 - :layout="'total, prev,pager,next,sizes, jumper'"  
43 :pageSize="search.limit" 42 :pageSize="search.limit"
44 @loaddata="loadTableDataList" 43 @loaddata="loadTableDataList"
45 @selectionChange="selectionChange" 44 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -39,7 +37,7 @@ export default { @@ -39,7 +37,7 @@ export default {
39 resType: '', 37 resType: '',
40 keyword: '', 38 keyword: '',
41 page: 1, 39 page: 1,
42 - limit: 20, 40 + limit: 50,
43 }); 41 });
44 let resTypeOptions=Vue.ref([]) 42 let resTypeOptions=Vue.ref([])
45 const columns = [ 43 const columns = [
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <cm-table-page :columns="data.columns" 27 <cm-table-page :columns="data.columns"
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :total="data.count" 29 :total="data.count"
30 - :pageSize="pageSize" 30 + :pageSize="data.searchParams.limit"
31 @loaddata="loadTableDataList" 31 @loaddata="loadTableDataList"
32 @selectionChange="selectionChange" 32 @selectionChange="selectionChange"
33 :showIndex="true" 33 :showIndex="true"
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }" 29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
30 :total="data.count" 30 :total="data.count"
31 - :pageSize="pageSize" 31 + :pageSize="data.searchParams.limit"
32 @loaddata="loadTableDataList" 32 @loaddata="loadTableDataList"
33 @selectionChange="selectionChange" 33 @selectionChange="selectionChange"
34 :showIndex="true" 34 :showIndex="true"
@@ -3,51 +3,13 @@ @@ -3,51 +3,13 @@
3 <el-col :span="22"> 3 <el-col :span="22">
4 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick"> 4 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
5 <el-tab-pane v-for="(item,index) in tabData" :key="index" :label="item.ddicName" :name="item.ddicCode"> 5 <el-tab-pane v-for="(item,index) in tabData" :key="index" :label="item.ddicName" :name="item.ddicCode">
6 -  
7 - <!--<div class="table-container" v-if="item.ddicCode=='resourcePer'">  
8 -  
9 - <ResourcePer></ResourcePer>  
10 - </div>  
11 - <div class="table-container" v-else-if="item.ddicCode=='resourceLeader'">  
12 - <ResourceLeader></ResourceLeader>  
13 - </div>  
14 - <div class="table-container" v-else-if="item.ddicCode=='resourceTypePer'">  
15 - <ResourceTypePer></ResourceTypePer>  
16 - </div>  
17 - <div class="table-container" v-else-if="item.ddicCode=='bizPer'">  
18 - <BizPer></BizPer>  
19 - </div>  
20 - <div class="table-container" v-else-if="item.ddicCode=='bizLeader'">  
21 - <BizLeader></BizLeader>  
22 - </div>  
23 - <div class="table-container" v-else-if="item.ddicCode=='alarmSubPer'">  
24 - <AlarmSubPer></AlarmSubPer>  
25 - </div>  
26 - <div class="table-container" v-else-if="item.ddicCode=='rolePer'">  
27 - <RolePer></RolePer>  
28 - </div>  
29 - <div class="table-container" v-else-if="item.ddicCode=='topoPer'">  
30 - <TopoPer></TopoPer>  
31 - </div>  
32 - <div class="table-container" v-else-if="item.ddicCode=='autoPatrolPortPer'">  
33 - <AutoPatrolPortPer></AutoPatrolPortPer>  
34 - </div>  
35 - <div class="table-container" v-else-if="item.ddicCode=='fileManagePer'">  
36 - <FileManagePer></FileManagePer>  
37 - </div>  
38 - <div class="table-container" v-else>暂无数据</div>-->  
39 </el-tab-pane> 6 </el-tab-pane>
40 -  
41 -  
42 </el-tabs> 7 </el-tabs>
43 -  
44 </el-col> 8 </el-col>
45 <el-col :span="2"> 9 <el-col :span="2">
46 <div style="padding:0 10px 6px;border-bottom: 2px solid var(--el-border-color-light);"> 10 <div style="padding:0 10px 6px;border-bottom: 2px solid var(--el-border-color-light);">
47 <el-button type="primary" @click="exportClick()" size="small" style="margin-left: 6px">导出</el-button> 11 <el-button type="primary" @click="exportClick()" size="small" style="margin-left: 6px">导出</el-button>
48 -  
49 </div> 12 </div>
50 -  
51 </el-col> 13 </el-col>
52 </el-row> 14 </el-row>
53 <el-row> 15 <el-row>
@@ -68,15 +30,13 @@ @@ -68,15 +30,13 @@
68 </el-row> 30 </el-row>
69 <el-row v-if="isAll==0"> 31 <el-row v-if="isAll==0">
70 <el-col :span="24" class="table-height"> 32 <el-col :span="24" class="table-height">
71 -<!-- <span style="margin-right:6px;"><el-button type="primary" @click="clickAll">全部</el-button></span>-->  
72 <el-select 33 <el-select
73 v-model="selectModel" 34 v-model="selectModel"
74 placeholder="请选择需要导出的页签" 35 placeholder="请选择需要导出的页签"
75 multiple 36 multiple
76 style="width:80%" 37 style="width:80%"
77 clearable 38 clearable
78 - filterable  
79 - > 39 + filterable>
80 <el-option 40 <el-option
81 v-for="item in tabData" 41 v-for="item in tabData"
82 :key="item.ddicCode" 42 :key="item.ddicCode"
@@ -44,7 +44,6 @@ @@ -44,7 +44,6 @@
44 <cm-table-page :columns="columns" 44 <cm-table-page :columns="columns"
45 :dataList="resourceData" 45 :dataList="resourceData"
46 :total="count" 46 :total="count"
47 - :layout="'total, prev,pager,next,sizes, jumper'"  
48 :pageSize="search.limit" 47 :pageSize="search.limit"
49 @loaddata="loadTableDataList" 48 @loaddata="loadTableDataList"
50 @selectionChange="selectionChange" 49 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -39,7 +37,7 @@ export default { @@ -39,7 +37,7 @@ export default {
39 resType: '', 37 resType: '',
40 keyword: '', 38 keyword: '',
41 page: 1, 39 page: 1,
42 - limit: 20, 40 + limit: 50,
43 }); 41 });
44 let resTypeOptions=Vue.ref([]) 42 let resTypeOptions=Vue.ref([])
45 const columns = [ 43 const columns = [
@@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
42 <cm-table-page :columns="columns" 42 <cm-table-page :columns="columns"
43 :dataList="resourceData" 43 :dataList="resourceData"
44 :total="count" 44 :total="count"
45 - :layout="'total, prev,pager,next,sizes, jumper'"  
46 :pageSize="search.limit" 45 :pageSize="search.limit"
47 @loaddata="loadTableDataList" 46 @loaddata="loadTableDataList"
48 @selectionChange="selectionChange" 47 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -39,7 +37,7 @@ export default { @@ -39,7 +37,7 @@ export default {
39 resType: '', 37 resType: '',
40 keyword: '', 38 keyword: '',
41 page: 1, 39 page: 1,
42 - limit: 20, 40 + limit: 50,
43 }); 41 });
44 let resTypeOptions=Vue.ref([]) 42 let resTypeOptions=Vue.ref([])
45 const columns = [ 43 const columns = [
@@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
42 <cm-table-page :columns="columns" 42 <cm-table-page :columns="columns"
43 :dataList="resourceData" 43 :dataList="resourceData"
44 :total="count" 44 :total="count"
45 - :layout="'total, prev,pager,next,sizes, jumper'"  
46 :pageSize="search.limit" 45 :pageSize="search.limit"
47 @loaddata="loadTableDataList" 46 @loaddata="loadTableDataList"
48 @selectionChange="selectionChange" 47 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -43,7 +41,7 @@ export default { @@ -43,7 +41,7 @@ export default {
43 resType: '', 41 resType: '',
44 keyword: '', 42 keyword: '',
45 page: 1, 43 page: 1,
46 - limit: 20, 44 + limit: 50,
47 }); 45 });
48 let resTypeOptions=Vue.ref([]) 46 let resTypeOptions=Vue.ref([])
49 const columns = [ 47 const columns = [
@@ -29,7 +29,6 @@ @@ -29,7 +29,6 @@
29 <cm-table-page :columns="columns" 29 <cm-table-page :columns="columns"
30 :dataList="resourceData" 30 :dataList="resourceData"
31 :total="count" 31 :total="count"
32 - :layout="'total, prev,pager,next,sizes, jumper'"  
33 :pageSize="search.limit" 32 :pageSize="search.limit"
34 @loaddata="loadTableDataList" 33 @loaddata="loadTableDataList"
35 @selectionChange="selectionChange" 34 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -38,7 +36,7 @@ export default { @@ -38,7 +36,7 @@ export default {
38 resType: '', 36 resType: '',
39 keyword: '', 37 keyword: '',
40 page: 1, 38 page: 1,
41 - limit: 20, 39 + limit: 50,
42 }); 40 });
43 const columns = [ 41 const columns = [
44 { 42 {
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }" 29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
30 :total="data.count" 30 :total="data.count"
31 - :pageSize="pageSize" 31 + :pageSize="data.searchParams.limit"
32 @loaddata="loadTableDataList" 32 @loaddata="loadTableDataList"
33 @selectionChange="selectionChange" 33 @selectionChange="selectionChange"
34 :showIndex="true" 34 :showIndex="true"
@@ -24,65 +24,46 @@ export default { @@ -24,65 +24,46 @@ export default {
24 "limit": 50, 24 "limit": 50,
25 "keywords": "", 25 "keywords": "",
26 "userName": proxy.$route.query.username, 26 "userName": proxy.$route.query.username,
27 - "busId": "" 27 + "jtopoId": ""
28 }, 28 },
29 userDialogFlag : false, 29 userDialogFlag : false,
30 count: 0, 30 count: 0,
31 columns: [{ 31 columns: [{
32 - prop: "busTypeName", 32 + prop: "topoName",
33 label: "名称", 33 label: "名称",
34 width: "250", 34 width: "250",
35 sortable: true, 35 sortable: true,
36 align: 'center' 36 align: 'center'
37 - }, {  
38 - prop: "nickname",  
39 - label: "负责人",  
40 - width: "120",  
41 - sortable: true,  
42 - align: 'center'  
43 - }, {  
44 - prop: "busTypeDesc",  
45 - label: "业务描述",  
46 - width: "200",  
47 - sortable: true,  
48 - align: 'center'  
49 - }, {  
50 - prop: "isUse",  
51 - label: "是否使用", 37 + },
  38 + {
  39 + prop: "isDefault",
  40 + label: "默认状态",
52 sortable: true, 41 sortable: true,
53 align: 'center', 42 align: 'center',
54 render: (row) => { 43 render: (row) => {
55 - switch (row.isUse) { 44 + //1是默认，0为非默认
  45 + switch (row.isDefault) {
56 case 0: 46 case 0:
57 - return '否'; 47 + return '非默认';
58 case 1: 48 case 1:
59 - return '是'; 49 + return '默认';
60 default: 50 default:
61 return ''; 51 return '';
62 } 52 }
63 } 53 }
64 }, { 54 }, {
65 - prop: "important",  
66 - label: "重要程度", 55 + prop: "createUser",
  56 + label: "创建人",
67 sortable: true, 57 sortable: true,
68 align: 'center', 58 align: 'center',
69 - render: (row) => {  
70 - switch (row.important) {  
71 - case 1:  
72 - return '核心';  
73 - case 2:  
74 - return '重要';  
75 - case 3:  
76 - return '一般';  
77 - case 9:  
78 - return '虚拟业务';  
79 - default:  
80 - return '';  
81 - }  
82 - }  
83 }, { 59 }, {
84 - prop: "sort",  
85 - label: "排序", 60 + prop: "createTime",
  61 + label: "创建时间",
  62 + sortable: true,
  63 + align: 'center'
  64 + }, {
  65 + prop: "remark",
  66 + label: "备注",
86 sortable: true, 67 sortable: true,
87 align: 'center' 68 align: 'center'
88 }], 69 }],
@@ -103,7 +84,7 @@ export default { @@ -103,7 +84,7 @@ export default {
103 if (v.parentId == '0') { 84 if (v.parentId == '0') {
104 // 获取子节点 85 // 获取子节点
105 let childs = list.filter(function (v1) { 86 let childs = list.filter(function (v1) {
106 - if (v1.parentId != '0' && v1.parentId == v.busId) { 87 + if (v1.parentId != '0' && v1.parentId == v.jtopoId) {
107 // 获取子节点 88 // 获取子节点
108 return v1; 89 return v1;
109 } 90 }
@@ -117,7 +98,7 @@ export default { @@ -117,7 +98,7 @@ export default {
117 return a.sort - b.sort 98 return a.sort - b.sort
118 }) 99 })
119 100
120 - dataVal.tableData = tableData; 101 + dataVal.tableData = list;
121 dataVal.count = count; 102 dataVal.count = count;
122 } 103 }
123 }) 104 })
@@ -139,7 +120,7 @@ export default { @@ -139,7 +120,7 @@ export default {
139 let params = { 120 let params = {
140 targetUserName: obj.selectModel.join(''), 121 targetUserName: obj.selectModel.join(''),
141 "userName": proxy.$route.query.username, 122 "userName": proxy.$route.query.username,
142 - "busId": arr.join(',') 123 + "jtopoId": arr.join(',')
143 } 124 }
144 if(params.targetUserName == params.userName){ 125 if(params.targetUserName == params.userName){
145 proxy.$global.showMsg('变更用户不能与变更前用户一致，请修改！','warning'); 126 proxy.$global.showMsg('变更用户不能与变更前用户一致，请修改！','warning');
@@ -177,7 +158,7 @@ export default { @@ -177,7 +158,7 @@ export default {
177 return; 158 return;
178 } 159 }
179 160
180 - data.value.searchParams.busId = arr.join(',') 161 + data.value.searchParams.jtopoId = arr.join(',')
181 proxy.$global.confirm("确定取消相关资源？", function () { 162 proxy.$global.confirm("确定取消相关资源？", function () {
182 proxy.$http.post(`/api-web/personnelChange/remove/topoPer`, data.value.searchParams , function (res) { 163 proxy.$http.post(`/api-web/personnelChange/remove/topoPer`, data.value.searchParams , function (res) {
183 if (res && res.success) { 164 if (res && res.success) {
@@ -200,12 +181,12 @@ export default { @@ -200,12 +181,12 @@ export default {
200 let selectionChange = (val) => { 181 let selectionChange = (val) => {
201 let checkArr = []; 182 let checkArr = [];
202 val.map(item => { 183 val.map(item => {
203 - checkArr.push(item.busId) 184 + checkArr.push(item.jtopoId)
204 }) 185 })
205 data.value.checkArr = checkArr; 186 data.value.checkArr = checkArr;
206 let isCheck = (list, checkArr) => { 187 let isCheck = (list, checkArr) => {
207 list.forEach((v, i) => { 188 list.forEach((v, i) => {
208 - v.checked = checkArr.includes(v.busId); 189 + v.checked = checkArr.includes(v.jtopoId);
209 if (v.children) { 190 if (v.children) {
210 isCheck(v.children, checkArr); 191 isCheck(v.children, checkArr);
211 } 192 }