From b2d902a2e02b18bebdc8717534b71a708afb6dcd Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Fri, 27 Jun 2025 22:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=83=8F=E9=A1=B5=E9=9D=A2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/sis/accessControlDevice/data.ts      |  9 +++++++++
 apps/web-antd/src/views/sis/personLib/data.ts      | 14 ++++++++++++--
 apps/web-antd/src/views/sis/personLib/index.vue    |  7 ++++++-
 apps/web-antd/src/views/sis/personLibImg/data.ts   |  5 ++---
 apps/web-antd/vite.config.mts                      |  4 ++--
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/apps/web-antd/src/views/sis/accessControlDevice/data.ts b/apps/web-antd/src/views/sis/accessControlDevice/data.ts
index 62f790ca..950997de 100644
--- a/apps/web-antd/src/views/sis/accessControlDevice/data.ts
+++ b/apps/web-antd/src/views/sis/accessControlDevice/data.ts
@@ -66,6 +66,15 @@ export const columns: VxeGridProps['columns'] = [
 ];
 
 export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
   {
     label: '设备名称',
     fieldName: 'eqpName',
diff --git a/apps/web-antd/src/views/sis/personLib/data.ts b/apps/web-antd/src/views/sis/personLib/data.ts
index fae53fa8..34726a0a 100644
--- a/apps/web-antd/src/views/sis/personLib/data.ts
+++ b/apps/web-antd/src/views/sis/personLib/data.ts
@@ -4,8 +4,8 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import { DictEnum } from '@vben/constants';
 import { getPopupContainer } from '@vben/utils';
 
-import { getDictOptions } from '#/utils/dict';
 import { queryListByFactoryNo } from '#/api/sis/accessControlDevice';
+import { getDictOptions } from '#/utils/dict';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -45,6 +45,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '库类型',
     field: 'libType',
+    slots: { default: 'libType' },
   },
   /* {
     title: '业务类型',
@@ -60,6 +61,15 @@ export const columns: VxeGridProps['columns'] = [
 ];
 
 export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
   {
     label: '人员库名称',
     fieldName: 'libName',
@@ -89,7 +99,7 @@ export const modalSchema: FormSchemaGetter = () => [
       mode: 'multiple', // 关键属性，启用多选模式
       resultField: 'list', // 根据API返回结构调整
       labelField: 'eqpName',
-      valueField: 'eqpNo',
+      valueField: 'id',
       api: async () => {
         return await queryListByFactoryNo('2');
       },
diff --git a/apps/web-antd/src/views/sis/personLib/index.vue b/apps/web-antd/src/views/sis/personLib/index.vue
index da110e76..cad9d844 100644
--- a/apps/web-antd/src/views/sis/personLib/index.vue
+++ b/apps/web-antd/src/views/sis/personLib/index.vue
@@ -7,7 +7,7 @@ import type { PersonLibForm } from '#/api/sis/personLib/model';
 import { Page, useVbenModal } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import { Modal, Popconfirm, Space, Tag } from 'ant-design-vue';
 
 import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
 import {
@@ -176,6 +176,11 @@ function handleDownloadExcel() {
           </Popconfirm>
         </Space>
       </template>
+
+      <template #libType="{ row }">
+        <Tag v-if="row.libType == 1" color="#108ee9">人脸库</Tag>
+        <Tag v-else color="#2db7f5">工服库</Tag>
+      </template>
     </BasicTable>
     <PersonLibModal @reload="tableApi.query()" />
   </Page>
diff --git a/apps/web-antd/src/views/sis/personLibImg/data.ts b/apps/web-antd/src/views/sis/personLibImg/data.ts
index 5131c503..4b262699 100644
--- a/apps/web-antd/src/views/sis/personLibImg/data.ts
+++ b/apps/web-antd/src/views/sis/personLibImg/data.ts
@@ -27,11 +27,10 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-
-  {
+  /*  {
     title: '人员库编码',
     field: 'libCode',
-  },
+  },*/
   {
     title: '人像名称',
     field: 'imgName',
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index 8f148ea3..1e37cb9a 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -28,8 +28,8 @@ export default defineConfig(async () => {
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
             // target: 'http://by.missmoc.top:3010/',
-            // target: 'http://127.0.0.1:8080/',
-            target: 'http://47.109.37.87:3010',
+            target: 'http://127.0.0.1:8080/',
+            // target: 'http://47.109.37.87:3010',
             ws: true,
           },
         },