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

@@ -124,7 +124,7 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
         //增加4-20位密码验证  joke add 20211214
         form.verify({
             password: function (d) {
-                if (d.trim() <= 4) {
+                if (d.trim().length < 4) {
                     return "密码最少4位"
                 }
             }

@@ -39,7 +39,9 @@
         </div>
         <div class="layui-form-item">
           <button class="layui-btn layui-btn-fluid login-btn" lay-submit lay-filter="LAY-user-login-submit">登 入</button>
-            <span style="color: red" class="login-tips-span"></span>
+        </div>
+        <div class="layui-form-item">
+            <span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
         </div>
     </div>
   </div>

@@ -193,6 +193,7 @@
     position: absolute;
     right: 10px;
     top: 7px;
+    cursor:pointer;
 }
 .yxqk .items li b {
     color: #ffffff;

@@ -65,7 +65,7 @@
                                             <div class="scrollbar " style="display: flex;flex-wrap: wrap;align-items: center;overflow-y: auto;height: 100%;">
                                                 <div v-else v-for="d in list" class="text">
                                                     <div class="dd"></div>
-                                                    <div class="name">{{d.name}}</div>
+                                                    <div class="name" style="font-size: 12px;width: 95px">{{d.name}}</div>
                                                     <div class="value">{{d.value}}</div>
                                                     <div class="unit">台</div>
                                                 </div>