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

…eb into master-500-dev

@@ -26,10 +26,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         var trapCollectorId = (data && data.trapCollectorId) ? data.trapCollectorId : '';  //trap采集器绑定资源查询  joke add 20210723
         var alarmTempId = (data && data.alarmTempId) ? data.alarmTempId : '';
         var writeBackResList = (data && data.writeBackResList) ? data.writeBackResList : '';
-        var cutoverId = '', targetType = '';
+        var cutoverId = '', targetType = '',haveNum=0;
         if (data && data.cutoverId) {
             cutoverId = data.cutoverId;
             targetType = data.targetType;
+            haveNum = data.haveNum;
+            //查询有权限的数量
+            setTitle(cutoverId,targetType,haveNum)
         }
         if (data && data.protocolFlag) {
             protocolFlag = data.protocolFlag;
@@ -87,6 +90,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             reloadTable(resType);
         })
 
+
+
         //选择框搜索事件
         bindSelectEvent();
         //渲染表格
@@ -203,6 +208,35 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             }
         });
 
+        /**
+         * 根据停机计划id根类型，查询有权限的资源，并赋值title
+         * */
+        function setTitle(cutoverId,type,haveNum) {
+            var user = localStorage.getItem("lgn");
+            if (user === 'admin'){
+                return;
+            }
+            admin.req({
+                url:domainName + '/api-web/manage/cutover/countPerNumByCutoverIdAndType',
+                data:{
+                    cutoverId:cutoverId,
+                    type:type,
+                },
+                success(response){
+                    if (response && response.success) {
+                        var perNum = response.object>haveNum?haveNum:response.object;
+                        var msg = '资源明细    本次停机计划'+haveNum+'个资源，有权限的资源'+perNum+'个';
+                        if (type != 'res'){
+                            msg = '资源明细    本次停机计划受影响'+haveNum+'个资源，有权限的资源'+perNum+'个';
+                        }
+                        $('.layui-layer-title').html(msg);
+                    }
+                },
+                error(){
+                }
+            })
+        }
+
         //绑定下拉搜索事件
         function bindSelectEvent() {
             //选择业务搜索

@@ -186,25 +186,25 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 title: '停机业务',
                 align: 'center',
                 width: 120,
-                templet: '<div><span shutdownplan-data-bus="{{d.cutoverId}}" data-type="biz" class="layui-table-link">{{d.busNum}}</span>'
+                templet: '<div><span shutdownplan-data-bus="{{d.cutoverId}}" data-haveNum="{{d.busNum}}" data-type="biz" class="layui-table-link">{{d.busNum}}</span>'
             }, {
                 field: 'resNum',
                 title: '停机资源',
                 align: 'center',
                 width: 120,
-                templet: '<div><span shutdownplan-data-res="{{d.cutoverId}}" data-type="res" class="layui-table-link">{{d.resNum}}</span>'
+                templet: '<div><span shutdownplan-data-res="{{d.cutoverId}}" data-haveNum="{{d.resNum}}" data-type="res" class="layui-table-link">{{d.resNum}}</span>'
             }, {
                 field: 'affectedBusNum',
                 title: '受影响的业务',
                 align: 'center',
                 width: 120,
-                templet: '<div><span shutdownplan-data-bus="{{d.cutoverId}}" data-type="affectedBiz" class="layui-table-link">{{d.affectedBusNum}}</span>'
+                templet: '<div><span shutdownplan-data-bus="{{d.cutoverId}}" data-haveNum="{{d.affectedBusNum}}" data-type="affectedBiz" class="layui-table-link">{{d.affectedBusNum}}</span>'
             }, {
                 field: 'affectedResNum',
                 title: '受影响的资源',
                 align: 'center',
                 width: 120,
-                templet: '<div><span shutdownplan-data-res="{{d.cutoverId}}" data-type="affectedRes" class="layui-table-link">{{d.affectedResNum}}</span>'
+                templet: '<div><span shutdownplan-data-res="{{d.cutoverId}}" data-haveNum="{{d.affectedResNum}}" data-type="affectedRes" class="layui-table-link">{{d.affectedResNum}}</span>'
             }, {
                 field: 'startTime', title: '说明', align: 'center', width: 320, templet: function (d) {
                     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',
                     var $that = $(this);
                     var id = $that.attr("shutdownplan-data-res");
                     var type = $that.data("type");
+                    var haveNum = $that.data("havenum");
                     common.openWin("template/res/reslist", "资源明细", {
                         cutoverId: id,
-                        targetType: type
+                        targetType: type,
+                        haveNum: haveNum
                     }, ["确定"], function () {
                         return true;
                     })
@@ -309,10 +311,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     var $that = $(this);
                     var id = $that.attr("shutdownplan-data-bus");
                     var type = $that.data("type");
-
+                    var haveNum = $that.data("havenum");
                     view('commonViewModel').render('baseconfig/bustype/index', {
                         cutoverId: id,
-                        targetType: type
+                        targetType: type,
+                        haveNum: haveNum
                     }).then(function (res) {
                         layer.open({
                             title: '业务明细',

@@ -458,7 +458,7 @@ export default {
         })
 
         // 监听编辑状态
-        Vue.watch(() => props.projectId, (newValue, oldVlaue) => {
+        Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
             getAssetType();
             getPage();
             getAssets();

@@ -64,17 +64,28 @@ export default {
                 width: '170'
             }
         ])
+        let count = Vue.ref(0);
+        let page = Vue.ref(1);
+        let limit = Vue.ref(10);
 
 
         // 获取系统
         let getDetailList = () => {
-            proxy.$http.get(`/api-web/thirdParty/conf/list`, {keywords:keyword.value}, function (res) {
+            proxy.$http.get(`/api-web/thirdParty/conf/list`, {keywords:keyword.value,page:page.value,limit:limit.value}, function (res) {
                 if (res && res.success == true) {
+                    // console.log(res);
+                    count.value = res.count;
                     tableData.value = res.data;
                 }
             })
         };
 
+        let loadTableDataList = ({page, limit})=>{
+            page.value = page;
+            limit.value = limit;
+            getDetailList();
+        }
+
         let getUser = (arr) => {
             let types = arr.map(function (v) {
                 return v.username;
@@ -294,7 +305,9 @@ export default {
             userList,
             columns,
             handleClose,
-            docRulesForm
+            docRulesForm,
+            loadTableDataList,
+            count,
         }
     }
 }

@@ -19,10 +19,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
         var sessions = layui.sessions;
         var accessToken = sessions.getToken()['access_token'];
 
-        var cutoverId = '', targetType = '';
+        var cutoverId = '', targetType = '',haveNum=0;
         if (data && data.cutoverId) {
             cutoverId = data.cutoverId;
             targetType = data.targetType;
+            haveNum = data.haveNum;
+            //查询有权限的数量
+            setTitle(cutoverId,targetType,haveNum)
         }
         var mode = (data && data.mode) ? data.mode : '';
         var username = (data && data.username) ? data.username : '';
@@ -212,6 +215,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
             });
         }
 
+        function setTitle(cutoverId,type,haveNum) {
+            var user = localStorage.getItem("lgn");
+            if (user === 'admin'){
+                return;
+            }
+            admin.req({
+                url:domainName + '/api-web/manage/cutover/countPerNumByCutoverIdAndType',
+                data:{
+                    cutoverId:cutoverId,
+                    type:type,
+                },
+                success(response){
+                    if (response && response.success) {
+                        var perNum = response.object>haveNum?haveNum:response.object;
+                        var msg = '业务明细    本次停机计划'+haveNum+'个业务，有权限的业务'+perNum+'个';
+                        if (type != 'res'){
+                            msg = '业务明细    本次停机计划受影响'+haveNum+'个业务，有权限的业务'+perNum+'个';
+                        }
+                        $('.layui-layer-title').html(msg);
+                    }
+                },
+                error(){
+                }
+            })
+        }
+
         /**
          * 加载业务类型表格
          */