From 51db57d3a5a647b5dab11b00189f05ae5ed6379a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B6=E6=99=B6=20=E5=BC=A0?=
 <zhangjingjing@geedgenetworks.com>
Date: Tue, 24 Aug 2021 17:36:27 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9ACN-112:=20Header=E5=8F=B3=E4=B8=8A?=
 =?UTF-8?q?=E8=A7=92=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=92=8C=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=86=E7=A0=81=E9=94=99=E8=AF=AF=E6=97=B6?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Login.vue                    | 23 ++++++----
 src/components/layout/Header.vue | 78 ++++++++++++++++++++++++++++++--
 2 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/src/Login.vue b/src/Login.vue
index 93b3766a..f8f0b1cd 100644
--- a/src/Login.vue
+++ b/src/Login.vue
@@ -40,6 +40,7 @@
 <script>
 import { mapActions } from 'vuex'
 import { post } from '@/utils/http'
+import { ElMessage } from 'element-plus'
 export default {
 
   name: 'Login',
@@ -56,18 +57,22 @@ export default {
       if (!this.username || !this.pin) {
         return
       }
-      if (!this.blockOperation.query) {
-        this.blockOperation.query = true
-      } else {
-        return
-      }
+      // if (!this.blockOperation.query) {
+      //   this.blockOperation.query = true
+      // } else {
+      //   return
+      // }
       post('sys/login', { username: this.username, pin: this.pin }).then(
         res => {
-          this.blockOperation.query = false
-          this.loading = true
-          if (res.code === 200) {
-            localStorage.setItem('cn-username', this.username)
+          if (res.code === 200 && res.msg == 'success') {
+            this.loading = true
+            this.blockOperation.query = true
             this.loginSuccess(res)
+            localStorage.setItem('cn-username', this.username)
+          } else {
+            this.loading = false
+            this.blockOperation.query = false
+            ElMessage.error('密码错误')
           }
         }
       )
diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index a1961899..6457424c 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -48,22 +48,60 @@
       </el-dropdown>
     </div>
 <!--    <change-password :cur-user="username" :show-dialog="showChangePin" @click="showPinDialog" @dialogClosed="dialogClosed"></change-password>-->
+    <el-dialog title="提示"
+               v-model="showChangePin"
+               width="30%"
+               :before-close="handleClose">
+      <el-form  :rules="changePassFormRules" :model="changePassForm" ref="changePassForm">
+        <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="旧密码" prop="oldPass">
+                <el-input v-model="changePassForm.oldPass" type="password"></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="新密码" prop="newPass">
+              <el-input v-model="changePassForm.newPass" type="password"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="确认新密码" prop="newPass2">
+              <el-input v-model="changePassForm.newPass2" type="password"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+    <span class="dialog-footer">
+      <el-button @click="showChangePin = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确认更改密码</el-button>
+    </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { useRoute } from 'vue-router'
-import { get } from '@/utils/http'
+import { get, put } from '@/utils/http'
 import { entityType, storageKey } from '@/utils/constants'
+import { ElMessage } from 'element-plus'
 export default {
   name: 'Header',
   data () {
+    const passwordYN = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'))
+      } else if (value !== this.changePassForm.newPass) {
+        callback(new Error('两次输入密码不一致!'))
+      } else {
+        callback()
+      }
+    }
     return {
       username: 'admin', // sessionStorage.getItem('cn-username'),
       language: localStorage.getItem('cn-language') ? localStorage.getItem('cn-language') : 'en',
-
       showChangePin: false,
-
       breadcrumbMap: [
         {
           path: '/panel/trafficSummary',
@@ -101,7 +139,17 @@ export default {
           name: 'I18N'
         }
       ],
-      from: '' // entity类型
+      from: '', // entity类型
+      changePassForm: {
+        oldPass: '',
+        newPass: '',
+        newPass2: ''
+      },
+      changePassFormRules: {
+        oldPass: [{ required: true, message: '请输入旧密码', trigger: 'blur' }],
+        newPass: [{ required: true, message: '请输入新密码', trigger: 'blur' }],
+        newPass2: [{ required: true, message: '请输入新密码', trigger: 'blur' }, { validator: passwordYN, trigger: 'blur' }]
+      }
     }
   },
   computed: {
@@ -153,6 +201,9 @@ export default {
     }
   },
   methods: {
+    handleClose () {
+      this.showChangePin = false
+    },
     changeLocal (lang) {
       if (lang !== localStorage.getItem('cn-language')) {
         localStorage.setItem('cn-language', lang)
@@ -176,6 +227,25 @@ export default {
     },
     shrink () {
       this.$store.commit('isShrink', !this.isShrink)
+    },
+    submit () {
+      this.$refs.changePassForm.validate((valid) => {
+        if (valid) {
+          put('sys/user/pin', { oldPin: this.changePassForm.oldPass, newPin: this.changePassForm.newPass }).then(res => {
+            if (res.code === 200) {
+              ElMessage.success({
+                message: '密码修改成功',
+                type: 'success'
+              })
+              this.showChangePin = false
+            } else if (res.msg == 'user oldpwd error') {
+              ElMessage.error('密码错误')
+            }
+          })
+        } else {
+          return false
+        }
+      })
     }
   }
 }