Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -24,7 +24,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
         domainAssetsManage: sessionStorage.getItem('domainAssetsManage'), // 资产系统地址
         domainAssetsManage: sessionStorage.getItem('domainAssetsManage'), // 资产系统地址
         graphEditorOrigin: sessionStorage.getItem('graphEditorOrigin'), // 拓扑系统地址
         graphEditorOrigin: sessionStorage.getItem('graphEditorOrigin'), // 拓扑系统地址
         workflowName: sessionStorage.getItem('workflow'),//流程系统地址
         workflowName: sessionStorage.getItem('workflow'),//流程系统地址
-        domainCMDBName: "http://120.236.178.177:7180/HGKJCMDB",  //杭州咨源老cmdb系统地址
+        domainCMDBName: "http://80.12.147.24:8888/hgkjcmdb",  //杭州咨源老cmdb系统地址
         lineTimer: null,//性能曲线图全局定时器
         lineTimer: null,//性能曲线图全局定时器
         detailTimer: [],//详细页的全局定时器
         detailTimer: [],//详细页的全局定时器
         alarmTimer: null,//首页告警刷新定时器
         alarmTimer: null,//首页告警刷新定时器

@@ -853,16 +853,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
                 },
                 },
                 yes: function (index, layero) {
                 yes: function (index, layero) {
                     var password = $('#userReSetPwd').val();
                     var password = $('#userReSetPwd').val();
+                    var flag = false;
                     //验证密码等级是否满足
                     //验证密码等级是否满足
-                    var flag = new RegExp(pattern).test(password);
-                    if (!flag){
-                        $('.deptTips').html(patternTips.replace('密码格式为：',''));
-                        return;
-                    }
-                    if (checkHas(passwords,password)){
-                        $('.deptTips').html('不能使用最近5次密码');
-                        return;
+                    if (pattern != ''){
+                        flag = new RegExp(pattern).test(password);
+                        if (!flag){
+                            $('.deptTips').html(patternTips.replace('密码格式为：',''));
+                            return;
+                        }
+                    }else{
+                        if (password.trim().length <4 || password.trim().length >20){
+                            $('.deptTips').html('密码必须为4-20位！');
+                            return;
+                        }
                     }
                     }
+                    //管理员重置密码，不用做最近5次验证
+                    // if (checkHas(passwords,password)){
+                    //     $('.deptTips').html('不能使用最近5次密码');
+                    //     return;
+                    // }
                     resetPwd(id,password);
                     resetPwd(id,password);
                 }
                 }
             });
             });

@@ -73,16 +73,22 @@
             form.verify((function(pattern, patternTips,last5His) {
             form.verify((function(pattern, patternTips,last5His) {
                 return {
                 return {
                     pass: function (value) {
                     pass: function (value) {
-                        if (value === ''){
+                        if (value.trim() === ''){
                             return '必填项不能位空';
                             return '必填项不能位空';
                         }
                         }
-                        if (value === $('#oldPassword').val()){
+                        if (value.trim() === $('#oldPassword').val()){
                             return '新密码不能与旧密码一致';
                             return '新密码不能与旧密码一致';
                         }
                         }
-                        if(pattern && !new RegExp(pattern).test(value)){
+                        if(pattern && !new RegExp(pattern).test(value.trim())){
                             return patternTips;
                             return patternTips;
                         }
                         }
 
 
+                        if (!pattern || pattern == undefined){
+                            if (value.trim().length <4 || value.trim().length >20){
+                                return '新密码必须4-20位！';
+                            }
+                        }
+
                         //临时增加用户组写死密码  joke add 20210508
                         //临时增加用户组写死密码  joke add 20210508
                         if (last5His && last5His.length > 0 && checkHas(last5His,value)){
                         if (last5His && last5His.length > 0 && checkHas(last5His,value)){
                             return '不能使用最近5次密码';
                             return '不能使用最近5次密码';
@@ -186,7 +192,7 @@
                         var last5His = passwords;
                         var last5His = passwords;
                         verifyForm(pattern, patternTips,last5His);
                         verifyForm(pattern, patternTips,last5His);
                     } else {
                     } else {
-                        layer.msg('没有获取去密码级别，将不做密码级别验证!', {icon: 0});
+                        console.log('没有获取去密码级别，将不做密码级别验证!');
                         verifyForm(undefined, undefined,passwords);
                         verifyForm(undefined, undefined,passwords);
                     }
                     }
                 }
                 }

@@ -59,7 +59,7 @@
                             <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/>
                             <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/>
                         </el-dropdown>-->
                         </el-dropdown>-->
 
 
-                        <el-select v-model="busTypeArr" multiple filterable clearable collapse-tags  placeholder="请选择指标" style="margin-top: 10px">
+                        <el-select v-model="busTypeArr" multiple filterable clearable collapse-tags  placeholder="请选择业务" style="margin-top: 10px">
                             <el-option
                             <el-option
                                     v-for="item in busTypeList"
                                     v-for="item in busTypeList"
                                     :label="item.busTypeName" :value="item.busId"></el-option>
                                     :label="item.busTypeName" :value="item.busId"></el-option>

@@ -199,8 +199,8 @@ export default {
                 kpiId: kpiTypeArr.value.join(','),
                 kpiId: kpiTypeArr.value.join(','),
                 busId: busTypeArr.value.join(','),
                 busId: busTypeArr.value.join(','),
                 configId: config.value,
                 configId: config.value,
-                page:2,
-                limit:10
+                page: 1,
+                limit: 50
             }
             }
         }
         }
 
 
@@ -210,8 +210,8 @@ export default {
             // }
             // }
 
 
             proxy.$http.get(`/api-web/ContrastAnalysis/added`, getParams(), function (res) {
             proxy.$http.get(`/api-web/ContrastAnalysis/added`, getParams(), function (res) {
-                if (res && res.data) {
-                    proxy.countFirst=res.count;
+                if (res && res.success) {
+                    proxy.countFirst = res.count;
                     tabFirstList.value = res.data;
                     tabFirstList.value = res.data;
                 }
                 }
             });
             });
@@ -222,8 +222,8 @@ export default {
             //     return false;
             //     return false;
             // }
             // }
             proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams(), function (res) {
             proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams(), function (res) {
-                if (res && res.data) {
-                    proxy.count=res.count;
+                if (res && res.success) {
+                    proxy.count = res.count;
                     tabSecondList.value = res.data;
                     tabSecondList.value = res.data;
                 }
                 }
             });
             });