monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 9b2e051fd5627a8662d7c6a35b6f3fbbd356fc9c 2 parents 597e9c77 61085c47

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

…eb into master-500-dev
Inline Side-by-side
Showing 5 changed files with 91 additions and 12 deletions
@@ -26,10 +26,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -26,10 +26,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
26 var trapCollectorId = (data && data.trapCollectorId) ? data.trapCollectorId : ''; //trap采集器绑定资源查询 joke add 20210723 26 var trapCollectorId = (data && data.trapCollectorId) ? data.trapCollectorId : ''; //trap采集器绑定资源查询 joke add 20210723
27 var alarmTempId = (data && data.alarmTempId) ? data.alarmTempId : ''; 27 var alarmTempId = (data && data.alarmTempId) ? data.alarmTempId : '';
28 var writeBackResList = (data && data.writeBackResList) ? data.writeBackResList : ''; 28 var writeBackResList = (data && data.writeBackResList) ? data.writeBackResList : '';
29 - var cutoverId = '', targetType = ''; 29 + var cutoverId = '', targetType = '',haveNum=0;
30 if (data && data.cutoverId) { 30 if (data && data.cutoverId) {
31 cutoverId = data.cutoverId; 31 cutoverId = data.cutoverId;
32 targetType = data.targetType; 32 targetType = data.targetType;
  33 + haveNum = data.haveNum;
  34 + //查询有权限的数量
  35 + setTitle(cutoverId,targetType,haveNum)
33 } 36 }
34 if (data && data.protocolFlag) { 37 if (data && data.protocolFlag) {
35 protocolFlag = data.protocolFlag; 38 protocolFlag = data.protocolFlag;
@@ -87,6 +90,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -87,6 +90,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
87 reloadTable(resType); 90 reloadTable(resType);
88 }) 91 })
89 92
  93 +
  94 +
90 //选择框搜索事件 95 //选择框搜索事件
91 bindSelectEvent(); 96 bindSelectEvent();
92 //渲染表格 97 //渲染表格
@@ -203,6 +208,35 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -203,6 +208,35 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
203 } 208 }
204 }); 209 });
205 210
  211 + /**
  212 + * 根据停机计划id根类型，查询有权限的资源，并赋值title
  213 + * */
  214 + function setTitle(cutoverId,type,haveNum) {
  215 + var user = localStorage.getItem("lgn");
  216 + if (user === 'admin'){
  217 + return;
  218 + }
  219 + admin.req({
  220 + url:domainName + '/api-web/manage/cutover/countPerNumByCutoverIdAndType',
  221 + data:{
  222 + cutoverId:cutoverId,
  223 + type:type,
  224 + },
  225 + success(response){
  226 + if (response && response.success) {
  227 + var perNum = response.object>haveNum?haveNum:response.object;
  228 + var msg = '资源明细    本次停机计划'+haveNum+'个资源，有权限的资源'+perNum+'个';
  229 + if (type != 'res'){
  230 + msg = '资源明细    本次停机计划受影响'+haveNum+'个资源，有权限的资源'+perNum+'个';
  231 + }
  232 + $('.layui-layer-title').html(msg);
  233 + }
  234 + },
  235 + error(){
  236 + }
  237 + })
  238 + }
  239 +
206 //绑定下拉搜索事件 240 //绑定下拉搜索事件
207 function bindSelectEvent() { 241 function bindSelectEvent() {
208 //选择业务搜索 242 //选择业务搜索
@@ -186,25 +186,25 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -186,25 +186,25 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
186 title: '停机业务', 186 title: '停机业务',
187 align: 'center', 187 align: 'center',
188 width: 120, 188 width: 120,
189 - templet: '<div><span shutdownplan-data-bus="{{d.cutoverId}}" data-type="biz" class="layui-table-link">{{d.busNum}}</span>' 189 + templet: '<div><span shutdownplan-data-bus="{{d.cutoverId}}" data-haveNum="{{d.busNum}}" data-type="biz" class="layui-table-link">{{d.busNum}}</span>'
190 }, { 190 }, {
191 field: 'resNum', 191 field: 'resNum',
192 title: '停机资源', 192 title: '停机资源',
193 align: 'center', 193 align: 'center',
194 width: 120, 194 width: 120,
195 - templet: '<div><span shutdownplan-data-res="{{d.cutoverId}}" data-type="res" class="layui-table-link">{{d.resNum}}</span>' 195 + templet: '<div><span shutdownplan-data-res="{{d.cutoverId}}" data-haveNum="{{d.resNum}}" data-type="res" class="layui-table-link">{{d.resNum}}</span>'
196 }, { 196 }, {
197 field: 'affectedBusNum', 197 field: 'affectedBusNum',
198 title: '受影响的业务', 198 title: '受影响的业务',
199 align: 'center', 199 align: 'center',
200 width: 120, 200 width: 120,
201 - templet: '<div><span shutdownplan-data-bus="{{d.cutoverId}}" data-type="affectedBiz" class="layui-table-link">{{d.affectedBusNum}}</span>' 201 + templet: '<div><span shutdownplan-data-bus="{{d.cutoverId}}" data-haveNum="{{d.affectedBusNum}}" data-type="affectedBiz" class="layui-table-link">{{d.affectedBusNum}}</span>'
202 }, { 202 }, {
203 field: 'affectedResNum', 203 field: 'affectedResNum',
204 title: '受影响的资源', 204 title: '受影响的资源',
205 align: 'center', 205 align: 'center',
206 width: 120, 206 width: 120,
207 - templet: '<div><span shutdownplan-data-res="{{d.cutoverId}}" data-type="affectedRes" class="layui-table-link">{{d.affectedResNum}}</span>' 207 + templet: '<div><span shutdownplan-data-res="{{d.cutoverId}}" data-haveNum="{{d.affectedResNum}}" data-type="affectedRes" class="layui-table-link">{{d.affectedResNum}}</span>'
208 }, { 208 }, {
209 field: 'startTime', title: '说明', align: 'center', width: 320, templet: function (d) { 209 field: 'startTime', title: '说明', align: 'center', width: 320, templet: function (d) {
210 return layui.util.toDateString(d.startTime, "yyyy-MM-dd HH:mm:ss") + ' 至 ' + layui.util.toDateString(d.endTime, "yyyy-MM-dd HH:mm:ss") 210 return layui.util.toDateString(d.startTime, "yyyy-MM-dd HH:mm:ss") + ' 至 ' + layui.util.toDateString(d.endTime, "yyyy-MM-dd HH:mm:ss")
@@ -298,9 +298,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -298,9 +298,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
298 var $that = $(this); 298 var $that = $(this);
299 var id = $that.attr("shutdownplan-data-res"); 299 var id = $that.attr("shutdownplan-data-res");
300 var type = $that.data("type"); 300 var type = $that.data("type");
  301 + var haveNum = $that.data("havenum");
301 common.openWin("template/res/reslist", "资源明细", { 302 common.openWin("template/res/reslist", "资源明细", {
302 cutoverId: id, 303 cutoverId: id,
303 - targetType: type 304 + targetType: type,
  305 + haveNum: haveNum
304 }, ["确定"], function () { 306 }, ["确定"], function () {
305 return true; 307 return true;
306 }) 308 })
@@ -309,10 +311,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -309,10 +311,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
309 var $that = $(this); 311 var $that = $(this);
310 var id = $that.attr("shutdownplan-data-bus"); 312 var id = $that.attr("shutdownplan-data-bus");
311 var type = $that.data("type"); 313 var type = $that.data("type");
312 - 314 + var haveNum = $that.data("havenum");
313 view('commonViewModel').render('baseconfig/bustype/index', { 315 view('commonViewModel').render('baseconfig/bustype/index', {
314 cutoverId: id, 316 cutoverId: id,
315 - targetType: type 317 + targetType: type,
  318 + haveNum: haveNum
316 }).then(function (res) { 319 }).then(function (res) {
317 layer.open({ 320 layer.open({
318 title: '业务明细', 321 title: '业务明细',
@@ -458,7 +458,7 @@ export default { @@ -458,7 +458,7 @@ export default {
458 }) 458 })
459 459
460 // 监听编辑状态 460 // 监听编辑状态
461 - Vue.watch(() => props.projectId, (newValue, oldVlaue) => { 461 + Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
462 getAssetType(); 462 getAssetType();
463 getPage(); 463 getPage();
464 getAssets(); 464 getAssets();
@@ -64,17 +64,28 @@ export default { @@ -64,17 +64,28 @@ export default {
64 width: '170' 64 width: '170'
65 } 65 }
66 ]) 66 ])
  67 + let count = Vue.ref(0);
  68 + let page = Vue.ref(1);
  69 + let limit = Vue.ref(10);
67 70
68 71
69 // 获取系统 72 // 获取系统
70 let getDetailList = () => { 73 let getDetailList = () => {
71 - proxy.$http.get(`/api-web/thirdParty/conf/list`, {keywords:keyword.value}, function (res) { 74 + proxy.$http.get(`/api-web/thirdParty/conf/list`, {keywords:keyword.value,page:page.value,limit:limit.value}, function (res) {
72 if (res && res.success == true) { 75 if (res && res.success == true) {
  76 + // console.log(res);
  77 + count.value = res.count;
73 tableData.value = res.data; 78 tableData.value = res.data;
74 } 79 }
75 }) 80 })
76 }; 81 };
77 82
  83 + let loadTableDataList = ({page, limit})=>{
  84 + page.value = page;
  85 + limit.value = limit;
  86 + getDetailList();
  87 + }
  88 +
78 let getUser = (arr) => { 89 let getUser = (arr) => {
79 let types = arr.map(function (v) { 90 let types = arr.map(function (v) {
80 return v.username; 91 return v.username;
@@ -294,7 +305,9 @@ export default { @@ -294,7 +305,9 @@ export default {
294 userList, 305 userList,
295 columns, 306 columns,
296 handleClose, 307 handleClose,
297 - docRulesForm 308 + docRulesForm,
  309 + loadTableDataList,
  310 + count,
298 } 311 }
299 } 312 }
300 } 313 }
@@ -19,10 +19,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -19,10 +19,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
19 var sessions = layui.sessions; 19 var sessions = layui.sessions;
20 var accessToken = sessions.getToken()['access_token']; 20 var accessToken = sessions.getToken()['access_token'];
21 21
22 - var cutoverId = '', targetType = ''; 22 + var cutoverId = '', targetType = '',haveNum=0;
23 if (data && data.cutoverId) { 23 if (data && data.cutoverId) {
24 cutoverId = data.cutoverId; 24 cutoverId = data.cutoverId;
25 targetType = data.targetType; 25 targetType = data.targetType;
  26 + haveNum = data.haveNum;
  27 + //查询有权限的数量
  28 + setTitle(cutoverId,targetType,haveNum)
26 } 29 }
27 var mode = (data && data.mode) ? data.mode : ''; 30 var mode = (data && data.mode) ? data.mode : '';
28 var username = (data && data.username) ? data.username : ''; 31 var username = (data && data.username) ? data.username : '';
@@ -212,6 +215,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -212,6 +215,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
212 }); 215 });
213 } 216 }
214 217
  218 + function setTitle(cutoverId,type,haveNum) {
  219 + var user = localStorage.getItem("lgn");
  220 + if (user === 'admin'){
  221 + return;
  222 + }
  223 + admin.req({
  224 + url:domainName + '/api-web/manage/cutover/countPerNumByCutoverIdAndType',
  225 + data:{
  226 + cutoverId:cutoverId,
  227 + type:type,
  228 + },
  229 + success(response){
  230 + if (response && response.success) {
  231 + var perNum = response.object>haveNum?haveNum:response.object;
  232 + var msg = '业务明细&ensp;&ensp;&ensp;&ensp;本次停机计划'+haveNum+'个业务，有权限的业务'+perNum+'个';
  233 + if (type != 'res'){
  234 + msg = '业务明细&ensp;&ensp;&ensp;&ensp;本次停机计划受影响'+haveNum+'个业务，有权限的业务'+perNum+'个';
  235 + }
  236 + $('.layui-layer-title').html(msg);
  237 + }
  238 + },
  239 + error(){
  240 + }
  241 + })
  242 + }
  243 +
215 /** 244 /**
216 * 加载业务类型表格 245 * 加载业务类型表格
217 */ 246 */