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

@@ -11,7 +11,7 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
             , sessions = layui.sessions;
             , sessions = layui.sessions;
 
 
         var uuid = Math.uuid();
         var uuid = Math.uuid();
-        var lockNum = 10;//默认十次登录冻结
+        var lockNum = 5;//默认5次登录冻结，兼容天津
         //获取默认配置
         //获取默认配置
         $.ajax({
         $.ajax({
             url: '/config/getConfig',
             url: '/config/getConfig',
@@ -20,13 +20,15 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
             },
             },
             async: false,
             async: false,
             success(response) {
             success(response) {
-                lockNum = response.lockNum;
+                if (response && response.lockNum){  //如果配置了锁定次数，则更新
+                    lockNum = response.lockNum;
+                }
             }
             }
         });
         });
 
 
         //如果密码输入错误三次，第四次开启验证码
         //如果密码输入错误三次，第四次开启验证码
         if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") >= 3) {
         if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") >= 3) {
-            if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") > 5) {
+            if (sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") > lockNum) {
                 layer.alert('账号已被锁定，请联系管理员！');
                 layer.alert('账号已被锁定，请联系管理员！');
             }
             }
             //图形验证码
             //图形验证码
@@ -119,6 +121,14 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
 
 
         var loginErrorNum = sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") != null ? parseInt(sessionStorage.getItem("lockNum")) : 0;
         var loginErrorNum = sessionStorage.getItem("lockNum") && sessionStorage.getItem("lockNum") != null ? parseInt(sessionStorage.getItem("lockNum")) : 0;
 
 
+        //增加4-20位密码验证  joke add 20211214
+        form.verify({
+            password: function (d) {
+                if (d.trim() <= 4) {
+                    return "密码最少4位"
+                }
+            }
+        });
         form.on('submit(LAY-user-login-submit)', function (obj) {
         form.on('submit(LAY-user-login-submit)', function (obj) {
             login(obj);
             login(obj);
             return false;
             return false;

@@ -19,7 +19,7 @@
         </div>
         </div>
         <div class="layui-form-item">
         <div class="layui-form-item">
           <label class="layadmin-user-login-icon layui-icon layui-icon-password" for="loginPswd"></label>
           <label class="layadmin-user-login-icon layui-icon layui-icon-password" for="loginPswd"></label>
-          <input type="password" name="password" id="loginPswd" lay-verify="required" placeholder="密码"
+          <input type="password" name="password" id="loginPswd" lay-verify="required|password" minlength="4" placeholder="密码"
                  class="layui-input">
                  class="layui-input">
         </div>
         </div>
         <!--验证码-->
         <!--验证码-->

@@ -50,7 +50,7 @@
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
     position: absolute;
     position: absolute;
-    left: 0;
+    left: 25px;
 }
 }
 .ypt .item  .ui_base {
 .ypt .item  .ui_base {
     position: relative;
     position: relative;
@@ -83,7 +83,7 @@
     height:100%;
     height:100%;
     text-align: center;
     text-align: center;
     background: url('/vue3/src/assets/images/zjdp/cloud-bg.png') no-repeat;
     background: url('/vue3/src/assets/images/zjdp/cloud-bg.png') no-repeat;
-    left: 100px;
+    left: 125px;
     top: 77px;
     top: 77px;
 }
 }
 .ypt .item .ball_c.HuaWeiCloud{
 .ypt .item .ball_c.HuaWeiCloud{

-<div :style="{'height':'380px','padding':'6px'}">
+<div :style="{'height':'350px','padding':'6px'}">
     <div style="text-align: left;margin-bottom: 10px;padding-left: 10px;font-weight: bold">
     <div style="text-align: left;margin-bottom: 10px;padding-left: 10px;font-weight: bold">
         <slot name="title">
         <slot name="title">
             对比分析场景
             对比分析场景

-<el-dialog v-model="networkMonitorVisible" :title="titleName" width="60%" @close="closeDialog">
+<el-dialog v-model="networkMonitorVisible" :title="titleName" width="90%" @close="closeDialog">
     <el-row  v-if="!tableVisible">
     <el-row  v-if="!tableVisible">
         <el-col :span="6">
         <el-col :span="6">
             <div class="grid-content bg-purple network-monitor-popup-left">
             <div class="grid-content bg-purple network-monitor-popup-left">