From 1bce9382fb075dac9acd52d4a9e63eab25720a5d Mon Sep 17 00:00:00 2001
From: Double-_-Z <2492419643@qq.com>
Date: Sat, 19 Jul 2025 15:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js          |  2 ++
 src/views/system/area/index.vue |  6 +++---
 src/views/system/user/index.vue | 16 ++++++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 1f4efeb..47c4f68 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -30,6 +30,8 @@ export function resetPwd(ids) {
 
 export function edit(data) {
   if(data.password) data.password = encrypt(data.password)
+    console.log(data);
+    
   return request({
     url: 'api/users',
     method: 'put',
diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index f22d9b8..564eba1 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -59,7 +59,7 @@
             <!--表格渲染-->
             <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;">
                 <el-table-column :show-overflow-tooltip="true" prop="name" align="center" :label="`${crud.title}名称`" />
-                <el-table-column :show-overflow-tooltip="true" prop="scenicNum" align="center" :label="`${crud.title === '区域' ? '景区' : '人员'}数量`" />
+                <el-table-column :show-overflow-tooltip="true" :prop="crud.title === '区域'?'scenicNum':'peopleNum'" align="center" :label="`${crud.title === '区域' ? '景区' : '人员'}数量`" />
                 <el-table-column v-if="checkPer(['admin', 'area:edit', 'area:del'])" label="操作" width="115" align="center"
                     fixed="right">
                     <template slot-scope="scope">
@@ -134,7 +134,7 @@ export default {
             // console.log('data',data)
         },
         handleTool(node, data) {
-            const id = node.level === 4 ? data.parentId : data.id
+            const id = node.level === 3 ? data.parentId : data.id
             this.active = data.id
             console.log(node, 'node', data)
             this.$set(this, 'parentArr', [{
@@ -153,7 +153,7 @@ export default {
         },
         // 查询景区
         getList(id,{type}){
-            if(type === 'area'){
+            if(type === 'area' || type === "scenic"){
                 this.crud.url = '/aerocraftAdminApi/emScenic'
                 this.crud.query.areaId = id;
                 this.crud.form.areaId = id;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e87b3d2..c98950a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -72,7 +72,7 @@
                 <el-form-item label="景区" prop="scenicId">
                   <el-select v-model="form.scenicId" placeholder="请选择景区">
                     <el-option v-for="item in scenics" :key="item.name" 
-                    :label="item.name" :value="item.id"/>
+                    :label="item.name" :value="Number(item.id)"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -327,6 +327,11 @@ export default {
     [CRUD.HOOK.afterToCU](crud, form) {
       this.getRoles()
       this.getAreas()
+      if(form.scenicId&&form.areaId){
+        allScenic({areaId: form.areaId}).then(res=>{
+          this.scenics = res || [];
+        })
+      }
     },
     // 新增前将多选的值设置为空
     [CRUD.HOOK.beforeToAdd]() {
@@ -336,7 +341,12 @@ export default {
     [CRUD.HOOK.beforeToEdit](crud, form) {
       this.roleDatas = []
       form.password = '$123456$';
-      form.roles = form.roles[0].id
+      form.roles = form.roles[0].id;
+      if(form.scenicId) form.scenicId = Number(form.scenicId);
+      if(form.qualificationAttachment){
+        this.form.files = [{url: this.baseApi + form.qualificationAttachment,}]
+        this.uploadDisabled = true;
+      }
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
@@ -344,6 +354,8 @@ export default {
       const roleItem = this.roles.find(item=>item.id === crud.form.roles);
       crud.form.userType = roleItem.name === '飞行员' ? 1 : 0;
       crud.form.roles = [{id:rolesIds}];
+      console.log(crud.form.password);
+      
       if(crud.form.password === '$123456$')
         delete crud.form.password;
       return true;