From 5c4a966d4ad3018cb01d96524f09d84bd007bb69 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Tue, 21 Apr 2026 14:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                            |  2 +-
 src/api/system/user.js                      | 10 +++--
 src/views/assetManage/inventory/index.vue   | 41 ++++++++++-----------
 src/views/system/user/center.vue            | 12 ++++--
 src/views/system/user/center/updatePass.vue | 18 ++++++---
 5 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/.env.development b/.env.development
index 49c2e4a..39e3d02 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,7 @@ ENV = 'development'
 # 接口地址
 
 # 许镇-本地服地址
-VUE_APP_BASE_API  = 'http://192.168.99.72:15000'
+VUE_APP_BASE_API  = 'http://192.168.99.63:15000'
 VUE_APP_WEBRTCSTREAMER_API = '127.0.0.1:8000'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 24c2e23..d8d25fb 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -53,7 +53,7 @@ export function edit(data) {
 
 export function editUser(data) {
   return request({
-    url: 'api/users/updateOwn',
+    url: 'api/user/updateOwn',
     method: 'put',
     data
   })
@@ -61,11 +61,13 @@ export function editUser(data) {
 
 export function updatePass(user) {
   const data = {
-    oldPass: encrypt(user.oldPass),
-    newPass: encrypt(user.newPass)
+    oldPass: user.oldPass,
+    // oldPass: encrypt(user.oldPass),
+    // newPass: encrypt(user.newPass)
+    newPass: user.newPass
   }
   return request({
-    url: 'api/users/updatePass/',
+    url: 'api/user/updatePass',
     method: 'post',
     data
   })
diff --git a/src/views/assetManage/inventory/index.vue b/src/views/assetManage/inventory/index.vue
index 59a754b..3efa783 100644
--- a/src/views/assetManage/inventory/index.vue
+++ b/src/views/assetManage/inventory/index.vue
@@ -125,28 +125,27 @@
               <img :src="selectedAsset && selectedAsset.imageUrl || require('@/assets/images/system/default-img2.png')" alt="资产图片">
             </div> -->
 
-
             <!-- 资产图片轮播 -->
-          <div class="asset-image">
-            <!-- 有图片时显示轮播 -->
-            <el-carousel
-              v-if="assetImageList.length > 0"
-              :interval="5000"
-              arrow="always"
-              height="200px"
-              class="asset-carousel"
-            >
-              <el-carousel-item v-for="(img, index) in assetImageList" :key="index">
-                <img :src="img" alt="资产图片" class="carousel-img">
-              </el-carousel-item>
-            </el-carousel>
+            <div class="asset-image">
+              <!-- 有图片时显示轮播 -->
+              <el-carousel
+                v-if="assetImageList.length > 0"
+                :interval="5000"
+                arrow="always"
+                height="200px"
+                class="asset-carousel"
+              >
+                <el-carousel-item v-for="(img, index) in assetImageList" :key="index">
+                  <img :src="img" alt="资产图片" class="carousel-img">
+                </el-carousel-item>
+              </el-carousel>
 
-            <!-- 无图片时显示默认图 -->
-            <div v-else class="default-img">
-              <img :src="require('@/assets/images/system/default-img2.png')" alt="默认图片">
+              <!-- 无图片时显示默认图 -->
+              <div v-else class="default-img">
+                <img :src="require('@/assets/images/system/default-img2.png')" alt="默认图片">
+              </div>
             </div>
           </div>
-          </div>
         </div>
       </div>
     </el-dialog>
@@ -155,7 +154,7 @@
 </template>
 
 <script>
-import crudAsset,{ FetchAssetInfoDetailsByMark } from '@/api/asset/index'
+import crudAsset, { FetchAssetInfoDetailsByMark } from '@/api/asset/index'
 import CRUD, { presenter, header, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -197,7 +196,7 @@ export default {
       newCount: 0,
       updateCount: 0,
       tabIndex: 0,
-      assetImageList: [],
+      assetImageList: []
     }
   },
   computed: {
@@ -333,7 +332,7 @@ export default {
       const params = { mark: row.mark }
       FetchAssetInfoDetailsByMark(params).then(res => {
         console.log('获取资产详情成功', res)
-         this.selectedAsset = res || row
+        this.selectedAsset = res || row
         const photoList = res.assetInfoPhoto || []
         // 拼接完整图片地址
         this.assetImageList = photoList.map(item => {
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index bfaabe8..ebcbea0 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -155,7 +155,7 @@ export default {
     }
   },
   created() {
-    this.form = { userId: this.user.id, lastname: this.user.lastname, sex: this.user.sex, mobile: this.user.mobile, email: this.user.email }
+    this.form = { id: this.user.id, lastname: this.user.lastname, sex: this.user.sex, mobile: this.user.mobile, email: this.user.email }
     store.dispatch('GetInfo').then(() => {})
     if (this.$route.query) {
       this.activeIndex = this.$route.query.activeIndex
@@ -180,9 +180,15 @@ export default {
         this.$refs['form'].validate((valid) => {
           if (valid) {
             this.saveLoading = true
-            editUser(this.form).then(() => {
+            editUser(this.form).then((res) => {
+              console.log('res', res)
+              if (res.data !== null) {
+                this.$message({ message: '修改成功，请重新登录', type: 'success', offset: 8 })
+                store.dispatch('GetInfo').then(() => {})
+              } else {
+                this.$message({ message: res.message, type: 'error', offset: 8 })
+              }
               this.editSuccessNotify()
-              store.dispatch('GetInfo').then(() => {})
               this.saveLoading = false
             }).catch(() => {
               this.saveLoading = false
diff --git a/src/views/system/user/center/updatePass.vue b/src/views/system/user/center/updatePass.vue
index f6797d0..088c990 100644
--- a/src/views/system/user/center/updatePass.vue
+++ b/src/views/system/user/center/updatePass.vue
@@ -65,13 +65,19 @@ export default {
         if (valid) {
           this.loading = true
           updatePass(this.form).then(res => {
+            console.log(res)
+            if (res === 'SUCCESS') {
+              this.$message({ message: '密码修改成功，请重新登录', type: 'success', offset: 8 })
+              setTimeout(() => {
+                store.dispatch('LogOut').then(() => {
+                  location.reload() // 为了重新实例化vue-router对象 避免bug
+                })
+              }, 1500)
+            } else {
+              this.$message({ message: res.message, type: 'error', offset: 8 })
+            }
             this.resetForm()
-            this.$message({ message: '密码修改成功，请重新登录', type: 'success', offset: 8 })
-            setTimeout(() => {
-              store.dispatch('LogOut').then(() => {
-                location.reload() // 为了重新实例化vue-router对象 避免bug
-              })
-            }, 1500)
+            this.loading = false
           }).catch(err => {
             this.loading = false
             console.log(err.response.data.message)