From 4c749ce15c2db9b12143febc14a07a604134cc7a Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Mon, 29 May 2023 15:20:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 psdc-ui/src/api/system/userInfo.js            |  4 +-
 psdc-ui/src/views/bigview/index.vue           |  6 +++
 .../src/views/system/user/profile/index.vue   | 50 ++++++++++---------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/psdc-ui/src/api/system/userInfo.js b/psdc-ui/src/api/system/userInfo.js
index da43739..7c830f7 100644
--- a/psdc-ui/src/api/system/userInfo.js
+++ b/psdc-ui/src/api/system/userInfo.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
 /** 获取设备*/
-export function getUpdatePwd() {
-    return request.put('/system/user/profile/updatePwd')
+export function getUpdatePwd(oldPassword,newPassword) {
+    return request.put(`/system/user/profile/updatePwd?oldPassword=${oldPassword}&newPassword=${newPassword}`)
 }
\ No newline at end of file
diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue
index 14cec98..fda977d 100644
--- a/psdc-ui/src/views/bigview/index.vue
+++ b/psdc-ui/src/views/bigview/index.vue
@@ -132,7 +132,13 @@ onMounted(()=>{
 const wdcgqArr = ref([])
 function getWenduFun(){
   getTemperature("温度传感器").then((res)=>{
+    // console.log(res.data)
     wdcgqArr.value = res.data
+    for(let i = 0;i < res.data.length;i++){
+      if(res.data[i].thermometerValue == null){
+        res.data[i].thermometerValue = '--'
+      }
+    }
   })
 }
 
diff --git a/psdc-ui/src/views/system/user/profile/index.vue b/psdc-ui/src/views/system/user/profile/index.vue
index dd21ad4..3f777dd 100644
--- a/psdc-ui/src/views/system/user/profile/index.vue
+++ b/psdc-ui/src/views/system/user/profile/index.vue
@@ -73,19 +73,18 @@
 import {ref,reactive} from "vue"
 import { getUserProfile } from "@/api/system/user";
 import { getUpdatePwd } from "@/api/system/userInfo";
+import {ElMessage} from "element-plus";
+import router from "@/router";
+import { removeToken } from '@/utils/auth'
 
 // const activeTab = ref("userinfo");
 const state = reactive({
   user: {},
   roleGroup: {},
-  postGroup: {},
-  userResetPwd:{
-    oldPassword: undefined,
-    newPassword: undefined,
-    confirmPassword: undefined
-  },
+  postGroup: {}
 });
 
+//个人信息
 function getUser() {
   getUserProfile().then(response => {
     state.user = response.data;
@@ -101,6 +100,15 @@ const userResetPwd = reactive({
     confirmPassword: undefined
 })
 
+//确认密码
+const equalToPassword = (rule, value, callback) => {
+  if (userResetPwd.newPassword !== value) {
+    callback(new Error("两次输入的密码不一致"));
+  } else {
+    callback();
+  }
+};
+
 //规则
 const rules = reactive({
   oldPassword: [
@@ -112,29 +120,25 @@ const rules = reactive({
   ],
   confirmPassword: [
     {required: true, message: "确认密码不能为空", trigger: "blur"},
-    // {required: true, validator: equalToPassword, trigger: "blur"}
+    {required: true, validator: equalToPassword, trigger: "blur"}
   ]
 })
 
 //保存按钮
 function submitResetPwd() {
-  // this.$refs["formResetPwd"].validate(valid => {
-  //   if (valid) {
-      // userResetPwd().then(response => {
-      //   if (response.data.code === 200){
-      //     this.$message.success(response.data.msg)
-      //     this.$router.push({ path: "/Logout" });
-      //   }else {
-      //     this.$message.error(response.data.msg)
-      //   }
-      // });
-      getUpdatePwd({
-        oldPassword: '123456',
-        newPassword: '16341526'
-      }).then((res)=>{
+    getUpdatePwd(userResetPwd.oldPassword, userResetPwd.newPassword).then((res)=>{
         console.log(res)
-    //   })
-    // }
+      if(res.code === 200){
+        ElMessage({
+          type:'success',
+          message:'修改密码成功！',
+        })
+        // 清除token
+        removeToken()
+        // 跳转到登录页
+        location.href = '/login';
+        // `/login?redirect=${to.fullPath}`
+      }
   })
 }