monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhichao
Commit 29735ebf7cab51a6115f9a7ed0edbe9d22794baf 2 parents a06d7ef2 6118bfa0

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-lzc
Inline Side-by-side
Showing 15 changed files with 72 additions and 49 deletions
@@ -148,7 +148,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm @@ -148,7 +148,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
148 }else{ 148 }else{
149 layTips='lay-tips="点击修改/删除"' 149 layTips='lay-tips="点击修改/删除"'
150 } 150 }
151 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 151 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
152 templet:` <div> 152 templet:` <div>
153 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 153 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
154 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 154 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -295,7 +295,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm @@ -295,7 +295,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
295 }else{ 295 }else{
296 layTips='lay-tips="点击修改/删除"' 296 layTips='lay-tips="点击修改/删除"'
297 } 297 }
298 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 298 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
299 templet:` <div> 299 templet:` <div>
300 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 300 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
301 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 301 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe @@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
62 , {field: 'resTypeName', title: '资源类型', align: 'center', width: '15%'} 62 , {field: 'resTypeName', title: '资源类型', align: 'center', width: '15%'}
63 , { 63 , {
64 field: 'resName', title: '资源名称', minWidth: 200, align: 'center', width: '25%', 64 field: 'resName', title: '资源名称', minWidth: 200, align: 'center', width: '25%',
65 - templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>' 65 + templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restypename="{{d.resTypeName}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
66 } 66 }
67 // , {field: 'kpiName', title: '指标', align: 'left'} 67 // , {field: 'kpiName', title: '指标', align: 'left'}
68 , {field: 'flag', title: '标识', align: 'center', width: '15%'} 68 , {field: 'flag', title: '标识', align: 'center', width: '15%'}
@@ -82,7 +82,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe @@ -82,7 +82,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
82 , {field: 'resTypeName', title: '资源类型', align: 'center'} 82 , {field: 'resTypeName', title: '资源类型', align: 'center'}
83 , { 83 , {
84 field: 'resName', title: '资源名称', minWidth: 200, align: 'center', 84 field: 'resName', title: '资源名称', minWidth: 200, align: 'center',
85 - templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>' 85 + templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restypename="{{d.resTypeName}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
86 } 86 }
87 , {field: 'kpiName', title: '指标', align: 'left'} 87 , {field: 'kpiName', title: '指标', align: 'left'}
88 , {field: 'flag', title: '标识', align: 'center'} 88 , {field: 'flag', title: '标识', align: 'center'}
@@ -116,10 +116,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe @@ -116,10 +116,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
116 $('[data-zymc]').unbind().bind('click', function () { 116 $('[data-zymc]').unbind().bind('click', function () {
117 var resId = $(this).data("resid"); 117 var resId = $(this).data("resid");
118 var resType = $(this).data("restype"); 118 var resType = $(this).data("restype");
119 - var ip = $(this).data("ip");  
120 - var resName = $(this).data("resname");  
121 - var resTypeName = $(this).data("");  
122 - var title = resName + '|' + resTypeName + '|' + ip;//名称，类型，及ip 119 + //lsq 优化详情页的title出现undefined 2022-08-31
  120 + var ip = $(this).data("ip") && $(this).data("ip")!=undefined && $(this).data("ip")!='undefined'?$(this).data("ip"):'';
  121 + var resName = $(this).data("resname") && $(this).data("resname")!=undefined && $(this).data("resname")!='undefined'?$(this).data("resname"):'';
  122 + var resTypeName = $(this).data("resTypeName") && $(this).data("resTypeName")!=undefined && $(this).data("resTypeName")!='undefined'?$(this).data("resTypeName"):'';
  123 + var title = resName + (resTypeName?'|' + resTypeName:'') + (ip?'|' + ip:'');//名称，类型，及ip
123 commonDetail.openDetail(resId, resType, title); 124 commonDetail.openDetail(resId, resType, title);
124 }); 125 });
125 126
@@ -219,11 +219,11 @@ layui.define(['sessions', 'form', 'common'], function (exports) { @@ -219,11 +219,11 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
219 async: false, 219 async: false,
220 success: function (data) { 220 success: function (data) {
221 sessionStorage.setItem("isNewPwd", data.isNewPwd); 221 sessionStorage.setItem("isNewPwd", data.isNewPwd);
222 - var roles = $.map(data.sysRoles, function (e) {  
223 - return e.code; 222 + var roles = data.sysRoles.map(item=> {
  223 + return item.code
224 }) 224 })
225 sessionStorage.setItem('permissions', data.permissions); 225 sessionStorage.setItem('permissions', data.permissions);
226 - sessionStorage.setItem('roles', roles); 226 + sessionStorage.setItem('roles', roles.join(','));
227 sessionStorage.setItem('user_id', data.id); //保存用户id joke add 20211206 227 sessionStorage.setItem('user_id', data.id); //保存用户id joke add 20211206
228 localStorage.setItem('user_id', data.id); //保存用户id lsq add 2022-03-31 228 localStorage.setItem('user_id', data.id); //保存用户id lsq add 2022-03-31
229 // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息 229 // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息
@@ -319,7 +319,8 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -319,7 +319,8 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
319 319
320 var resourceHealthTips; 320 var resourceHealthTips;
321 function baseInfoHover(){ 321 function baseInfoHover(){
322 - $(".detail_base_info").hover(function () { 322 + //lsq 悬浮提示重叠优化 2022-08-31
  323 + $(".index-banner-title .detail_base_info").hover(function () {
323 openMsg(); 324 openMsg();
324 }, function () { 325 }, function () {
325 layer.close(resourceHealthTips); 326 layer.close(resourceHealthTips);
@@ -46,6 +46,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -46,6 +46,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
46 form.render(); 46 form.render();
47 47
48 getChartData(); 48 getChartData();
  49 + userList();
49 //渲染表格 50 //渲染表格
50 var noticeTable = table.render({ 51 var noticeTable = table.render({
51 elem: '#noticeSearchTable' 52 elem: '#noticeSearchTable'
@@ -152,6 +153,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -152,6 +153,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
152 strict: false, 153 strict: false,
153 indent: 20 154 indent: 20
154 }, 155 },
  156 + toolbar: {
  157 + show: true,
  158 + list: ['CLEAR']
  159 + },
155 model: { 160 model: {
156 label: { 161 label: {
157 type: 'text' 162 type: 'text'
@@ -171,7 +176,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -171,7 +176,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
171 reloadData(); 176 reloadData();
172 } 177 }
173 }); 178 });
174 - }else { 179 + } else {
175 $('#notice_user_list_div').hide(); 180 $('#notice_user_list_div').hide();
176 } 181 }
177 if (userSelect) { 182 if (userSelect) {
@@ -209,13 +214,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -209,13 +214,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
209 type: 'text' 214 type: 'text'
210 } 215 }
211 }, 216 },
  217 + toolbar: {
  218 + show: true,
  219 + list: ['CLEAR']
  220 + },
212 prop: { 221 prop: {
213 name: 'busTypeName', 222 name: 'busTypeName',
214 value: 'busId' 223 value: 'busId'
215 }, 224 },
216 data: busTypeList, 225 data: busTypeList,
217 on: function (data) { 226 on: function (data) {
218 - if (data.isAdd) { 227 + if (data.arr && data.arr.length > 0) {
219 busId = data.arr[0].busId; 228 busId = data.arr[0].busId;
220 } else { 229 } else {
221 busId = ''; 230 busId = '';
@@ -263,6 +272,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -263,6 +272,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
263 strict: false, 272 strict: false,
264 indent: 20 273 indent: 20
265 }, 274 },
  275 + toolbar:{
  276 + show: true,
  277 + list: ['CLEAR']
  278 + },
266 model: { 279 model: {
267 label: { 280 label: {
268 type: 'text' 281 type: 'text'
@@ -271,7 +284,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -271,7 +284,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
271 height: '170px', 284 height: '170px',
272 data: resTypeList, 285 data: resTypeList,
273 on: function (data) { 286 on: function (data) {
274 - if (data.isAdd) { 287 + if (data.arr && data.arr.length > 0) {
275 resType = data.arr[0].resTypeCode; 288 resType = data.arr[0].resTypeCode;
276 } else { 289 } else {
277 resType = ''; 290 resType = '';
@@ -292,6 +305,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -292,6 +305,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
292 } 305 }
293 }); 306 });
294 307
  308 + function userList() {
  309 + let roles = sessionStorage.getItem("roles");
  310 + if (roles.indexOf('ADMIN') == -1){
  311 + $('#notice_user_list_div').hide();
  312 + }
  313 + }
  314 +
295 //刷新表格 315 //刷新表格
296 function reloadTable() { 316 function reloadTable() {
297 noticeTable.reload({ 317 noticeTable.reload({
@@ -858,7 +858,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -858,7 +858,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
858 }else{ 858 }else{
859 layTips='lay-tips="点击修改/删除"' 859 layTips='lay-tips="点击修改/删除"'
860 } 860 }
861 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 861 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
862 templet:` <div> 862 templet:` <div>
863 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 863 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
864 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 864 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -121,11 +121,12 @@ layui.define(['laytpl', 'layer'], function (exports) { @@ -121,11 +121,12 @@ layui.define(['laytpl', 'layer'], function (exports) {
121 } 121 }
122 //其它异常 122 //其它异常
123 else { 123 else {
124 - var error = [  
125 - '<cite>Error：</cite> ' + (res[response.msgName] || '返回状态码异常')  
126 - , debug()  
127 - ].join('');  
128 - view.error(error); 124 + // var error = [
  125 + // '<cite>Error：</cite> ' + (res[response.msgName] || '返回状态码异常')
  126 + // , debug()
  127 + // ].join('');
  128 + // view.error(error);
  129 + console.log(error)
129 } 130 }
130 131
131 //只要 http 状态码正常，无论 response 的 code 是否正常都执行 success 132 //只要 http 状态码正常，无论 response 的 code 是否正常都执行 success
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <div class="layui-form-item"> 20 <div class="layui-form-item">
21 <label class="layui-form-label textarea-label">备注</label> 21 <label class="layui-form-label textarea-label">备注</label>
22 <div class="layui-input-block"> 22 <div class="layui-input-block">
23 - <textarea class="layui-textarea" name="remark" placeholder="请输入备注"></textarea> 23 + <textarea maxlength="225" class="layui-textarea" name="remark" placeholder="请输入备注"></textarea>
24 </div> 24 </div>
25 </div> 25 </div>
26 <!--start lsq 搜索按钮位置调整 2022-06-07--> 26 <!--start lsq 搜索按钮位置调整 2022-06-07-->
@@ -56,8 +56,8 @@ @@ -56,8 +56,8 @@
56 <div class="layui-input-inline"> 56 <div class="layui-input-inline">
57 <select id="bizlink_state" lay-filter="bizlink_state" name="label"> 57 <select id="bizlink_state" lay-filter="bizlink_state" name="label">
58 <option value="">=连接状态=</option> 58 <option value="">=连接状态=</option>
59 - <option value="normal">成功</option>  
60 - <option value="unnormal">失败</option> 59 + <option value="1">成功</option>
  60 + <option value="0">失败</option>
61 <option value="9">未监控</option> 61 <option value="9">未监控</option>
62 </select> 62 </select>
63 </div> 63 </div>
@@ -338,9 +338,9 @@ @@ -338,9 +338,9 @@
338 <i></i> 338 <i></i>
339 <label>连接状态</label> 339 <label>连接状态</label>
340 <div class="num"> 340 <div class="num">
341 - <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="bizlink_state" 341 + <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="bizlink_state"
342 id="linksuccess_biz">0</span>/ 342 id="linksuccess_biz">0</span>/
343 - <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="bizlink_state" 343 + <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="bizlink_state"
344 id="linkfail_biz">0</span>/ 344 id="linkfail_biz">0</span>/
345 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="bizlink_state" 345 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="bizlink_state"
346 id="linkNone_biz">0</span> 346 id="linkNone_biz">0</span>
@@ -38,8 +38,8 @@ @@ -38,8 +38,8 @@
38 <select id="biz_reslist_link_state" lay-filter="biz_reslist_link_state" 38 <select id="biz_reslist_link_state" lay-filter="biz_reslist_link_state"
39 name="label"> 39 name="label">
40 <option value="">=连接状态=</option> 40 <option value="">=连接状态=</option>
41 - <option value="normal">成功</option>  
42 - <option value="unnormal">失败</option> 41 + <option value="1">成功</option>
  42 + <option value="0">失败</option>
43 <option value="9">未监控</option> 43 <option value="9">未监控</option>
44 </select> 44 </select>
45 </div> 45 </div>
@@ -255,9 +255,9 @@ @@ -255,9 +255,9 @@
255 <i></i> 255 <i></i>
256 <label>连接状态</label> 256 <label>连接状态</label>
257 <div class="num"> 257 <div class="num">
258 - <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="biz_reslist_link_state" 258 + <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="biz_reslist_link_state"
259 data-field="linksuccess">0</span>/ 259 data-field="linksuccess">0</span>/
260 - <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="biz_reslist_link_state" 260 + <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="biz_reslist_link_state"
261 data-field="linkfail">0</span>/ 261 data-field="linkfail">0</span>/
262 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="biz_reslist_link_state" 262 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="biz_reslist_link_state"
263 data-field="linkNone">0</span> 263 data-field="linkNone">0</span>
@@ -74,8 +74,8 @@ @@ -74,8 +74,8 @@
74 <div class="layui-input-inline"> 74 <div class="layui-input-inline">
75 <select id="domainlink_state" lay-filter="domainlink_state" name="label"> 75 <select id="domainlink_state" lay-filter="domainlink_state" name="label">
76 <option value="">=连接状态=</option> 76 <option value="">=连接状态=</option>
77 - <option value="normal">成功</option>  
78 - <option value="unnormal">失败</option> 77 + <option value="1">成功</option>
  78 + <option value="0">失败</option>
79 <option value="9">未监控</option> 79 <option value="9">未监控</option>
80 </select> 80 </select>
81 </div> 81 </div>
@@ -523,9 +523,9 @@ @@ -523,9 +523,9 @@
523 <i></i> 523 <i></i>
524 <label>连接状态</label> 524 <label>连接状态</label>
525 <div class="num"> 525 <div class="num">
526 - <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="domainlink_state" 526 + <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="domainlink_state"
527 id="linksuccess_domain"></span>/ 527 id="linksuccess_domain"></span>/
528 - <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="domainlink_state" 528 + <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="domainlink_state"
529 id="linkfail_domain"></span>/ 529 id="linkfail_domain"></span>/
530 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="domainlink_state" 530 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="domainlink_state"
531 id="linkNone_domain">0</span> 531 id="linkNone_domain">0</span>
@@ -71,9 +71,9 @@ @@ -71,9 +71,9 @@
71 data-serious="{{item.serious}}" data-important="{{item.important}}" 71 data-serious="{{item.serious}}" data-important="{{item.important}}"
72 data-normal="{{item.normal}}" lay-filter="layadmin-app"> 72 data-normal="{{item.normal}}" lay-filter="layadmin-app">
73 <!--lsq 右上角点击跳转到活动告警 2022-08-31--> 73 <!--lsq 右上角点击跳转到活动告警 2022-08-31-->
74 - <a href="javascript:;" lay-href="{{ '/alarm/activewarning/restype=' + item.resType }}">{{item.resTypeName}}  
75 - {{# if(alarmCount!=0){ }}<span  
76 - class="layui-badge">{{alarmCount}}</span> 74 + <a href="javascript:;" lay-href="{{ '/biz/list/restype=' + item.resType }}">{{item.resTypeName}}
  75 + {{# if(alarmCount!=0){ }}
  76 + <a href="javascript:;" lay-href="{{'/alarm/activewarning/restype=' + item.resType}}"><span class="layui-badge" >{{alarmCount}}</span></a>
77 {{# } }} 77 {{# } }}
78 </a> 78 </a>
79 </li> 79 </li>
@@ -107,8 +107,8 @@ @@ -107,8 +107,8 @@
107 <div class="layui-input-inline"> 107 <div class="layui-input-inline">
108 <select id="link_state" lay-filter="link_state" name="label"> 108 <select id="link_state" lay-filter="link_state" name="label">
109 <option value="">=连接状态=</option> 109 <option value="">=连接状态=</option>
110 - <option value="normal">成功</option>  
111 - <option value="unnormal">失败</option> 110 + <option value="1">成功</option>
  111 + <option value="0">失败</option>
112 <option value="9">未监控</option> 112 <option value="9">未监控</option>
113 </select> 113 </select>
114 </div> 114 </div>
@@ -429,9 +429,9 @@ @@ -429,9 +429,9 @@
429 <i></i> 429 <i></i>
430 <label>连接状态</label> 430 <label>连接状态</label>
431 <div class="num"> 431 <div class="num">
432 - <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="link_state" 432 + <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="link_state"
433 id="linksuccess_res">0</span>/ 433 id="linksuccess_res">0</span>/
434 - <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="link_state" 434 + <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="link_state"
435 id="linkfail_res">0</span>/ 435 id="linkfail_res">0</span>/
436 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="bizlink_state" 436 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="bizlink_state"
437 id="linkNone_res">0</span> 437 id="linkNone_res">0</span>
@@ -467,7 +467,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols @@ -467,7 +467,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
467 }else{ 467 }else{
468 layTips='lay-tips="点击修改/删除"' 468 layTips='lay-tips="点击修改/删除"'
469 } 469 }
470 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 470 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
471 templet:` <div> 471 templet:` <div>
472 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 472 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
473 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 473 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -619,7 +619,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols @@ -619,7 +619,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
619 }else{ 619 }else{
620 layTips='lay-tips="点击修改/删除"' 620 layTips='lay-tips="点击修改/删除"'
621 } 621 }
622 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 622 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
623 templet:` <div> 623 templet:` <div>
624 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 624 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
625 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 625 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -746,7 +746,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols @@ -746,7 +746,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
746 }else{ 746 }else{
747 layTips='lay-tips="点击修改/删除"' 747 layTips='lay-tips="点击修改/删除"'
748 } 748 }
749 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 749 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
750 templet:` <div> 750 templet:` <div>
751 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 751 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
752 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 752 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -886,7 +886,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols @@ -886,7 +886,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
886 }else{ 886 }else{
887 layTips='lay-tips="点击修改/删除"' 887 layTips='lay-tips="点击修改/删除"'
888 } 888 }
889 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 889 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
890 templet:` <div> 890 templet:` <div>
891 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 891 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
892 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 892 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -231,7 +231,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -231,7 +231,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
231 }else{ 231 }else{
232 layTips='lay-tips="点击修改/删除"' 232 layTips='lay-tips="点击修改/删除"'
233 } 233 }
234 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 234 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
235 templet:` <div> 235 templet:` <div>
236 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 236 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
237 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 237 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -872,7 +872,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -872,7 +872,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
872 }else{ 872 }else{
873 layTips='lay-tips="点击修改/删除"' 873 layTips='lay-tips="点击修改/删除"'
874 } 874 }
875 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 875 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
876 templet:` <div> 876 templet:` <div>
877 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 877 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
878 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 878 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -1121,7 +1121,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1121,7 +1121,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1121 }else{ 1121 }else{
1122 layTips='lay-tips="点击修改/删除"' 1122 layTips='lay-tips="点击修改/删除"'
1123 } 1123 }
1124 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 1124 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
1125 templet:` <div> 1125 templet:` <div>
1126 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 1126 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
1127 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 1127 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
@@ -1292,7 +1292,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1292,7 +1292,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1292 }else{ 1292 }else{
1293 layTips='lay-tips="点击修改/删除"' 1293 layTips='lay-tips="点击修改/删除"'
1294 } 1294 }
1295 - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, 1295 + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
1296 templet:` <div> 1296 templet:` <div>
1297 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" 1297 <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
1298 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> 1298 data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">