From 15581de676a1e3821d25fd768b95b4372733f8a1 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Fri, 11 Jul 2025 14:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionItem/index.ts                   | 10 +-
 .../inspectionPoint/index.ts                  | 10 +-
 .../inspectionItem/data.ts                    |  7 +-
 .../inspectionItem/index.vue                  |  3 +-
 .../inspectionPoint/data.ts                   | 96 ++++++-------------
 .../inspectionPoint/inspectionPoint-modal.vue |  4 +-
 6 files changed, 45 insertions(+), 85 deletions(-)

diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionItem/index.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionItem/index.ts
index 1ce5f52a..3f17f692 100644
--- a/apps/web-antd/src/api/property/inspectionManagement/inspectionItem/index.ts
+++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionItem/index.ts
@@ -12,7 +12,7 @@ import { requestClient } from '#/api/request';
 * @returns 巡检项目列表
 */
 export function inspectionItemList(params?: InspectionItemQuery) {
-  return requestClient.get<PageResult<InspectionItemVO>>('/property/inspectionItem/list', { params });
+  return requestClient.get<PageResult<InspectionItemVO>>('/property/item/list', { params });
 }
 
 /**
@@ -30,7 +30,7 @@ export function inspectionItemExport(params?: InspectionItemQuery) {
  * @returns 巡检项目详情
  */
 export function inspectionItemInfo(id: ID) {
-  return requestClient.get<InspectionItemVO>(`/property/inspectionItem/${id}`);
+  return requestClient.get<InspectionItemVO>(`/property/item/${id}`);
 }
 
 /**
@@ -39,7 +39,7 @@ export function inspectionItemInfo(id: ID) {
  * @returns void
  */
 export function inspectionItemAdd(data: InspectionItemForm) {
-  return requestClient.postWithMsg<void>('/property/inspectionItem', data);
+  return requestClient.postWithMsg<void>('/property/item', data);
 }
 
 /**
@@ -48,7 +48,7 @@ export function inspectionItemAdd(data: InspectionItemForm) {
  * @returns void
  */
 export function inspectionItemUpdate(data: InspectionItemForm) {
-  return requestClient.putWithMsg<void>('/property/inspectionItem', data);
+  return requestClient.putWithMsg<void>('/property/item', data);
 }
 
 /**
@@ -57,5 +57,5 @@ export function inspectionItemUpdate(data: InspectionItemForm) {
  * @returns void
  */
 export function inspectionItemRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/property/inspectionItem/${id}`);
+  return requestClient.deleteWithMsg<void>(`/property/item/${id}`);
 }
diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/index.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/index.ts
index c96eb528..75ff61be 100644
--- a/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/index.ts
+++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/index.ts
@@ -12,7 +12,7 @@ import { requestClient } from '#/api/request';
 * @returns 巡检点列表
 */
 export function inspectionPointList(params?: InspectionPointQuery) {
-  return requestClient.get<PageResult<InspectionPointVO>>('/property/inspectionPoint/list', { params });
+  return requestClient.get<PageResult<InspectionPointVO>>('/property/point/list', { params });
 }
 
 /**
@@ -30,7 +30,7 @@ export function inspectionPointExport(params?: InspectionPointQuery) {
  * @returns 巡检点详情
  */
 export function inspectionPointInfo(id: ID) {
-  return requestClient.get<InspectionPointVO>(`/property/inspectionPoint/${id}`);
+  return requestClient.get<InspectionPointVO>(`/property/point/${id}`);
 }
 
 /**
@@ -39,7 +39,7 @@ export function inspectionPointInfo(id: ID) {
  * @returns void
  */
 export function inspectionPointAdd(data: InspectionPointForm) {
-  return requestClient.postWithMsg<void>('/property/inspectionPoint', data);
+  return requestClient.postWithMsg<void>('/property/point', data);
 }
 
 /**
@@ -48,7 +48,7 @@ export function inspectionPointAdd(data: InspectionPointForm) {
  * @returns void
  */
 export function inspectionPointUpdate(data: InspectionPointForm) {
-  return requestClient.putWithMsg<void>('/property/inspectionPoint', data);
+  return requestClient.putWithMsg<void>('/property/point', data);
 }
 
 /**
@@ -57,5 +57,5 @@ export function inspectionPointUpdate(data: InspectionPointForm) {
  * @returns void
  */
 export function inspectionPointRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/property/inspectionPoint/${id}`);
+  return requestClient.deleteWithMsg<void>(`/property/point/${id}`);
 }
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionItem/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionItem/data.ts
index 1cc20e42..c3111f70 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionItem/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionItem/data.ts
@@ -3,11 +3,6 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 
 
 export const querySchema: FormSchemaGetter = () => [
-  {
-    component: 'Input',
-    fieldName: 'id',
-    label: '编号',
-  },
   {
     component: 'Input',
     fieldName: 'itemName',
@@ -20,7 +15,7 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '编号',
+    title: '项目编号',
     field: 'id',
   },
   {
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionItem/index.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionItem/index.vue
index bff83954..503d6211 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionItem/index.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionItem/index.vue
@@ -130,10 +130,11 @@ function handleDownloadExcel() {
       <template #toolbar-tools>
         <Space>
           <a-button
+            type="primary"
             v-access:code="['property:inspectionItem:export']"
             @click="handleDownloadExcel"
           >
-            {{ $t('pages.common.export') }}
+            {{ '文档' }}
           </a-button>
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
index d4fd584f..6f8e65ca 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
@@ -1,13 +1,11 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
+import {getDictOptions} from "#/utils/dict";
+import {inspectionItemList} from "#/api/property/inspectionManagement/inspectionItem";
+import {renderDict} from "#/utils/render";
 
 
 export const querySchema: FormSchemaGetter = () => [
-  {
-    component: 'Input',
-    fieldName: 'itemId',
-    label: '巡检项目id',
-  },
   {
     component: 'Input',
     fieldName: 'pointName',
@@ -16,44 +14,17 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Select',
     componentProps: {
+      options: getDictOptions('inspection_point_type'),
     },
     fieldName: 'pointType',
     label: '巡检点类型',
   },
-  {
-    component: 'Input',
-    fieldName: 'nfcCode',
-    label: 'nfc编码',
-  },
-  {
-    component: 'Input',
-    fieldName: 'createById',
-    label: '创建人id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'updateById',
-    label: '更新人id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'searchValue',
-    label: '搜索值',
-  },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '主键id',
-    field: 'id',
-  },
-  {
-    title: '巡检项目id',
-    field: 'itemId',
-  },
   {
     title: '巡检点名称',
     field: 'pointName',
@@ -61,27 +32,28 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '巡检点类型',
     field: 'pointType',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.pointType, 'inspection_point_type');
+      },
+    },
+  },
+  {
+    title: '巡检项目',
+    field: 'itemId',
   },
   {
     title: 'nfc编码',
     field: 'nfcCode',
   },
+  {
+    title: '创建时间',
+    field: 'createTime',
+  },
   {
     title: '备注',
     field: 'remark',
   },
-  {
-    title: '创建人id',
-    field: 'createById',
-  },
-  {
-    title: '更新人id',
-    field: 'updateById',
-  },
-  {
-    title: '搜索值',
-    field: 'searchValue',
-  },
   {
     field: 'action',
     fixed: 'right',
@@ -101,12 +73,6 @@ export const modalSchema: FormSchemaGetter = () => [
       triggerFields: [''],
     },
   },
-  {
-    label: '巡检项目id',
-    fieldName: 'itemId',
-    component: 'Input',
-    rules: 'required',
-  },
   {
     label: '巡检点名称',
     fieldName: 'pointName',
@@ -118,9 +84,22 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'pointType',
     component: 'Select',
     componentProps: {
+      options: getDictOptions('inspection_point_type'),
     },
     rules: 'selectRequired',
   },
+  {
+    label: '巡检项目',
+    fieldName: 'itemId',
+    component: 'ApiSelect',
+    componentProps: {
+      api: inspectionItemList,
+      resultField: 'rows',
+      labelField: 'itemName',
+      valueField: 'id',
+    },
+    rules: 'required',
+  },
   {
     label: 'nfc编码',
     fieldName: 'nfcCode',
@@ -131,19 +110,4 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'remark',
     component: 'Textarea',
   },
-  {
-    label: '创建人id',
-    fieldName: 'createById',
-    component: 'Input',
-  },
-  {
-    label: '更新人id',
-    fieldName: 'updateById',
-    component: 'Input',
-  },
-  {
-    label: '搜索值',
-    fieldName: 'searchValue',
-    component: 'Input',
-  },
 ];
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue
index 5cd51b95..aeeabe8a 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/inspectionPoint-modal.vue
@@ -21,7 +21,7 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
     labelWidth: 80,
     // 通用配置项 会影响到所有表单项
@@ -43,7 +43,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,