From 684cfcda70012f2effb4e843b924e86667bdf3a7 Mon Sep 17 00:00:00 2001
From: suyanyan <1321717064@qq.com>
Date: Wed, 17 Jul 2024 16:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/interface/sys/usermanage/personnel.ts |  6 +-
 .../personnel/components/form/form_basic.vue  |  1 -
 .../src/views/userManage/personnel/index.vue  | 65 +++++++++++++++----
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts b/SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts
index 691834d..8f91f0c 100644
--- a/SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts
+++ b/SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts
@@ -24,15 +24,16 @@ export namespace SysUserPersonnel {
 
   /** 底库信息 */
   export interface ClassPage {
-    personSetId?: string | undefined;
+    personSetId?: string | number | undefined;
     personSetName?: string | undefined;
     id?: string | undefined;
     name?: string | undefined;
+    personId?: string | undefined | number;
   }
   /** 人脸信息 */
   export interface SysUserAvatar {
     /** 人脸 */
-    personId?: string | undefined;
+    personId?: string | undefined | number;
     faceId?: string | number;
     faceUrl: string;
     uid?: string | number;
@@ -61,5 +62,6 @@ export namespace SysUserPersonnel {
     faces: Array<SysUserAvatar>;
     /** 分组 */
     personSets: Array<ClassPage>;
+    personSetId?: number | string;
   }
 }
diff --git a/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue b/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue
index 97b7411..a8c4c6b 100644
--- a/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue
+++ b/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue
@@ -15,7 +15,6 @@
         <el-col :span="12">
           <s-form-item label="所属班级" prop="personSetId">
             <s-select v-model="userInfo.personSetId" :options="treeData" label="personSetName" value="personSetId"></s-select>
-            <!-- <s-input v-model="userInfo.personSets[0].personSetName" disabled></s-input> -->
           </s-form-item>
         </el-col>
       </el-row>
diff --git a/SafeCampus.WEB/src/views/userManage/personnel/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/index.vue
index 45a605f..b491cd0 100644
--- a/SafeCampus.WEB/src/views/userManage/personnel/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/personnel/index.vue
@@ -38,7 +38,7 @@
       <ProTable ref="proTable" title="人员管理" :columns="columns" rowKey="personId" :request-api="userManagePersonnelApi.page">
         <!-- 表格 header 按钮 -->
         <template #tableHeader="scope">
-          <s-button v-auth="userPerButtonCode.add" suffix="人员" @click="onOpen(FormOptEnum.ADD)" />
+          <s-button v-auth="userPerButtonCode.add" suffix="人员" @click="onOpen(FormOptEnum.ADD, { personSetId: personSetId })" />
           <s-button
             v-auth="userPerButtonCode.delete"
             type="danger"
@@ -58,8 +58,26 @@
               <el-link type="primary" :underline="false" :icon="ArrowDown"> 更多 </el-link>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item :command="command(scope.row, cmdEnum.AddFace)">{{ cmdEnum.AddFace }}</el-dropdown-item>
-                  <el-dropdown-item :command="command(scope.row, cmdEnum.UnderpantsUnBinding)">{{ cmdEnum.UnderpantsUnBinding }}</el-dropdown-item>
+                  <el-dropdown-item :command="command(scope.row, cmdEnum.AddFace)"
+                    ><el-upload
+                      ref="upload"
+                      class="upload-demo"
+                      action="/api/business/personApi/uploadFile"
+                      :show-file-list="false"
+                      :on-success="handleAvatarSuccess"
+                      accept=".jpg, .jpeg, .png"
+                      :headers="{
+                        Authorization: `${TokenEnum.TOKEN_PREFIX} ${accessToken}`
+                      }"
+                    >
+                      <template #trigger>
+                        {{ cmdEnum.AddFace }}
+                      </template>
+                    </el-upload>
+                  </el-dropdown-item>
+                  <el-dropdown-item :command="command(scope.row, cmdEnum.UnderpantsUnBinding)">
+                    {{ cmdEnum.UnderpantsUnBinding }}
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </template>
             </el-dropdown>
@@ -93,11 +111,16 @@ import FormClass from "./components/formClass/index.vue";
 import { ArrowDown } from "@element-plus/icons-vue";
 import { ColumnProps, ProTableInstance } from "@/components/ProTable/interface";
 import TreeFilter from "@/components/TreeFilter/index.vue";
+import { useUserStore } from "@/stores/modules";
+import { TokenEnum } from "@/enums";
+import type { UploadProps } from "element-plus";
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const faceUrl = ref('');
 const visible = ref(false); //是否显示人员表单
 const proTable = ref<ProTableInstance>();
 const treeFilter = ref<InstanceType<typeof TreeFilter> | null>(null);
+const userStore = useUserStore();
+const { accessToken } = userStore;
 // 表格配置项
 const columns: ColumnProps<SysUserPersonnel.SysUserPerInfo>[] = [
   { type: "selection", fixed: "left", width: 50 },
@@ -219,27 +242,45 @@ function command(row: SysUserPersonnel.SysUserPerInfo, command: cmdEnum): Comman
  * 更多下拉菜单点击事件
  * @param command
  */
+ const personId = ref<number | string>(); //人员id
  function handleCommand(command: Command) {
   switch (command.command) {
     case cmdEnum.AddFace:
+      personId.value = command.row.personId; //获取人员id
       break
     case cmdEnum.UnderpantsUnBinding:
+      userManagePersonnelApi.personUnBindDfie({
+        personId:command.row.personId,
+        personSetId: command.row.personSets[0].personSetId
+      }).then(res=>{
+        if(res.code == 200){
+          ElMessage.success('底库解绑成功');
+          RefreshTable()
+        }
+      })
       break;
   }
 }
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+  if (response.code === 200) {
+    userManagePersonnelApi.addFace({
+      personId: personId.value,
+      faceUrl: response.data
+    }).then(res=>{
+      RefreshTable()
+    })
+  } else {
+    ElMessage.error(response.msg);
+  }
+};
 
 /** 部门切换 */
+const personSetId = ref<number | string>()
 function changeTreeFilter(val: number | string) {
-  console.log(proTable.value,".........",val);
-  
+  personSetId.value = val
   proTable.value!.pageable.pageNum = 1;
-  // if (val != "") {
-  //   // 如果传入的val不为空，则将val赋值给initParam.parentId
-  //   initParam.orgId = val;
-  // } else {
-  //   // 否则将initParam.parentId赋值为0
-  //   initParam.orgId = 0;
-  // }
+  proTable.value!.searchParam.personSetId = val;
+  proTable.value!.search();
 }
 </script>
 <style scoped lang="scss">