From 5330eb812cdcc02cace0648b008092b24c6e2236 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 17:44:50 +0800
Subject: [PATCH] 1、利用率走势分析和利用率分段分析页面优化表格数据加载方式，实现滚动条触底加载，解决数据量较大时网页请求速度慢问题 2、报警分析页面调整图表样式，更换表格组件为ant-design表格 3、登录页面登录后若用户密码为初始密码或密码已过期则出现修改密码弹窗

---
 src/components/tools/UserPassword.vue |   63 ++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue
index ff16648..e15b51d 100644
--- a/src/components/tools/UserPassword.vue
+++ b/src/components/tools/UserPassword.vue
@@ -31,14 +31,13 @@
           label="纭鏂板瘑鐮�">
           <a-input type="password" @blur="handleConfirmBlur" placeholder="璇风‘璁ゆ柊瀵嗙爜" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
         </a-form-item>
-
       </a-form>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
-
+  import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
   import { putAction } from '@/api/manage'
 
   export default {
@@ -57,10 +56,14 @@
           },
           password:{
             rules: [{
-              required: true, message: '璇疯緭鍏ユ柊瀵嗙爜!',
+              required: true, message: '璇疯緭鍏ユ柊瀵嗙爜!',trigger:'blur'
             }, {
               validator: this.validateToNextPassword,
-            }],
+            },
+              {
+                pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+                message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!',
+              }],
           },
           confirmpassword:{
             rules: [{
@@ -85,6 +88,9 @@
         username:"",
       }
     },
+    created(){
+      // this.initDictData('password_length')
+    },
     methods: {
       show(uname){
         if(!uname){
@@ -95,6 +101,23 @@
           this.form.resetFields();
           this.visible = true;
         }
+      },
+      initDictData(dictCode) {
+        //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
+        if (getDictItemsFromCache(dictCode)) {
+          return getDictItemsFromCache(dictCode);
+        }
+        //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
+        ajaxGetDictItems(dictCode, null).then((res) => {
+          if (res.success) {
+            const regx = new RegExp(/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{12,}$/);
+            this.validatorRules.password.rules[2]={
+              pattern: regx,
+              message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!',
+            }
+            return res.result
+          }
+        })
       },
       handleCancel () {
         this.close()
@@ -110,20 +133,24 @@
         // 瑙﹀彂琛ㄥ崟楠岃瘉
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true;
-            let params = Object.assign({username:this.username},values)
-            console.log("淇敼瀵嗙爜鎻愪氦鏁版嵁",params)
-            putAction(this.url,params).then((res)=>{
-              if(res.success){
-                console.log(res)
-                that.$message.success(res.message);
-                that.close();
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
+            if(values.oldpassword!==values.confirmpassword){
+              that.confirmLoading = true;
+              let params = Object.assign({username:this.username},values)
+              console.log("淇敼瀵嗙爜鎻愪氦鏁版嵁",params)
+              putAction(this.url,params).then((res)=>{
+                if(res.success){
+                  console.log(res)
+                  that.$message.success(res.message);
+                  that.close();
+                }else{
+                  that.$message.warning(res.message);
+                }
+              }).finally(() => {
+                that.confirmLoading = false;
+              })
+            }else{
+              that.$message.warning('鏂板瘑鐮佷笌鏃у瘑鐮佷笉鑳界浉鍚�');
+            }
           }
         })
       },

--
Gitblit v1.9.3