diff --git a/.gitignore b/.gitignore
index 7dab95c..92ade64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,8 +29,6 @@ tests/e2e/reports
 selenium-debug.log
 
 # Editor directories and files
-.idea
-.vscode
 *.suo
 *.ntvs*
 *.njsproj
diff --git a/src/api/login.ts b/src/api/login.ts
index 35e6a4e..834cfae 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -80,7 +80,7 @@ export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
 /**
  * 第三方登录
  */
-export function callback(data: LoginData): AxiosPromise<any> {
+export function callback(data: LoginData) {
   const LoginData = {
     ...data,
     clientId: clientId,
diff --git a/src/api/system/Banner/index.ts b/src/api/system/Banner/index.ts
index c0880a4..8544b35 100644
--- a/src/api/system/Banner/index.ts
+++ b/src/api/system/Banner/index.ts
@@ -65,6 +65,7 @@ export const delBanner = (id: string | number | Array<string | number>) => {
 /**
  * 改变Banner图管理 状态
  * @param id
+ * @param status
  */
 export const switchBanner = (id: string, status: string) => {
   return request({
diff --git a/src/api/system/Banner/type.ts b/src/api/system/Banner/type.ts
index b191614..d80a7e9 100644
--- a/src/api/system/Banner/type.ts
+++ b/src/api/system/Banner/type.ts
@@ -47,11 +47,6 @@ export interface BannerForm extends BaseEntity {
    */
   byOrder?: number;
   link: string;
-
-  /**
-   * 小区id
-   */
-  villageId?: string;
 }
 
 export interface BannerQuery extends PageQuery {
diff --git a/src/api/system/Complaint/type.ts b/src/api/system/Complaint/type.ts
index 8250a41..d13de25 100644
--- a/src/api/system/Complaint/type.ts
+++ b/src/api/system/Complaint/type.ts
@@ -81,7 +81,7 @@ export interface ComplaintForm extends BaseEntity {
   /**
    * 问题照片url
    */
-  problemIamgeUrl?: string;
+  problemImageUrl?: string;
 
   /**
    * 投诉状态 0待处理 1处理中 2已处理
@@ -128,7 +128,7 @@ export interface ComplaintQuery extends PageQuery {
   /**
    * 问题照片url
    */
-  problemIamgeUrl?: string;
+  problemImageUrl?: string;
 
   /**
    * 投诉状态 0待处理 1处理中 2已处理
diff --git a/src/api/system/HandleLog/index.ts b/src/api/system/HandleLog/index.ts
index 1c21b36..920faa5 100644
--- a/src/api/system/HandleLog/index.ts
+++ b/src/api/system/HandleLog/index.ts
@@ -1,7 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { HandleLogVO, HandleLogForm, HandleLogQuery } from '@/api/system/HandleLog/type';
-import { UploadFiles, UploadUserFile } from 'element-plus';
 
 /**
  * 查询办事记录列表
diff --git a/src/api/system/InspectionPoint/index.ts b/src/api/system/InspectionPoint/index.ts
index 0e1dc13..a873c36 100644
--- a/src/api/system/InspectionPoint/index.ts
+++ b/src/api/system/InspectionPoint/index.ts
@@ -64,6 +64,7 @@ export const delPoint = (id: string | number | Array<string | number>) => {
 /**
  * 修改巡检点状态
  * @param id
+ * @param status
  */
 export const changePointStatus = (id: string, status: string) => {
   return request({
diff --git a/src/api/system/InspectionRecord/index.ts b/src/api/system/InspectionRecord/index.ts
index fa2de74..e5cd56f 100644
--- a/src/api/system/InspectionRecord/index.ts
+++ b/src/api/system/InspectionRecord/index.ts
@@ -19,6 +19,7 @@ export const listRecord = (query?: RecordQuery): AxiosPromise<RecordVO[]> => {
 /**
  * 查询巡检记录主详细
  * @param id
+ * @param date
  */
 export const getRecord = (id: string, date?: string): AxiosPromise<RecordVO> => {
   return request({
diff --git a/src/api/system/Notification/index.ts b/src/api/system/Notification/index.ts
index 9b840cb..0e11779 100644
--- a/src/api/system/Notification/index.ts
+++ b/src/api/system/Notification/index.ts
@@ -25,8 +25,8 @@ export const getNotificationList = (query): AxiosPromise<NotificationVo[]> => {
 
 /**
  * 消息通知 已读
- * @param query
  * @returns {*}
+ * @param ids
  */
 
 export const ReadNotificationByID = (ids: string[]) => {
diff --git a/src/api/system/Questionnaire/index.ts b/src/api/system/Questionnaire/index.ts
index 8d7b518..1ef09e4 100644
--- a/src/api/system/Questionnaire/index.ts
+++ b/src/api/system/Questionnaire/index.ts
@@ -53,7 +53,10 @@ export const updateQuestionnaire = (data: QuestionnaireForm) => {
 
 /**
  * 删除问卷调查
- * @param id
+ * @param ids
+ * @param vailid
+ * @param ids
+ * @param vailid
  */
 export const delQuestionnaire = (ids: string | string[], vailid: boolean = true) => {
   return request({
diff --git a/src/api/system/SdbBill/index.ts b/src/api/system/SdbBill/index.ts
index d537616..4e06267 100644
--- a/src/api/system/SdbBill/index.ts
+++ b/src/api/system/SdbBill/index.ts
@@ -97,8 +97,8 @@ export type BillUserlist = {
 };
 /**
  * 查询业主列表
- * @param data
- * @returns {*}
+ * @param query
+ * @param query
  */
 export const queryResidentList_holder = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
   return request({
@@ -110,8 +110,8 @@ export const queryResidentList_holder = (query: { pageNum: number; pageSize: num
 
 /**
  * 查询车位业主列表
- * @param data
- * @returns {*}
+ * @param query
+ * @param query
  */
 export const queryResidentList_Cars = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
   return request({
diff --git a/src/api/system/SdbCashier/index.ts b/src/api/system/SdbCashier/index.ts
index 9ec0506..4bbbd6c 100644
--- a/src/api/system/SdbCashier/index.ts
+++ b/src/api/system/SdbCashier/index.ts
@@ -10,8 +10,8 @@ export type cashlist = {
 
 /**
  * 查询住户列表
- * @param post
  * @returns {*}
+ * @param data
  */
 export const cashQuery = (data: { residentName?: string; queryType: number }): AxiosPromise<cashlist[]> => {
   return request({
diff --git a/src/api/system/SdbChargeItem/index.ts b/src/api/system/SdbChargeItem/index.ts
index d39ed9a..ee30da1 100644
--- a/src/api/system/SdbChargeItem/index.ts
+++ b/src/api/system/SdbChargeItem/index.ts
@@ -12,7 +12,7 @@ export const listChargeItem = (query?: ChargeItemQuery | {}): AxiosPromise<Charg
   return request({
     url: '/chargeItem/list',
     method: 'get',
-    params: query,
+    params: query
   });
 };
 
@@ -64,7 +64,7 @@ export const delChargeItem = (id: string | number | Array<string | number>) => {
 
 /**
  *  启停 收费项目
- * @param id
+ * @param data
  */
 export const changChargeItem = (data: { id: string; status: string }) => {
   return request({
diff --git a/src/api/system/SdbChargeItem/type.ts b/src/api/system/SdbChargeItem/type.ts
index 8131b51..5ae4ef7 100644
--- a/src/api/system/SdbChargeItem/type.ts
+++ b/src/api/system/SdbChargeItem/type.ts
@@ -12,7 +12,7 @@ export interface ChargeItemVO {
    * 收费类型
    */
   typeId: string;
-  itemName:string;
+  itemName: string;
 
   /**
    * 计费方式 0单次收费 1周期收费 2仪表收费
diff --git a/src/api/system/SdbElectricityDevice/index.ts b/src/api/system/SdbElectricityDevice/index.ts
index 60189f5..186099b 100644
--- a/src/api/system/SdbElectricityDevice/index.ts
+++ b/src/api/system/SdbElectricityDevice/index.ts
@@ -64,7 +64,7 @@ export const delElectricityDevice = (id: string | number | Array<string | number
 
 /**
  * 生成条形码
- * @param id
+ * @param data
  */
 export const ElectricityDeviceMakerQrcode = (data: { deviceCode: string; id: string }[]) => {
   return request({
@@ -76,7 +76,7 @@ export const ElectricityDeviceMakerQrcode = (data: { deviceCode: string; id: str
 
 /**
  * 获取设备指定时间段的用电量
- * @param id
+ * @param data
  */
 export const getElectricityDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'startTime': string; 'endTime': string }) => {
   return request({
diff --git a/src/api/system/SdbWaterDevice/index.ts b/src/api/system/SdbWaterDevice/index.ts
index 187d047..b8fa836 100644
--- a/src/api/system/SdbWaterDevice/index.ts
+++ b/src/api/system/SdbWaterDevice/index.ts
@@ -64,7 +64,7 @@ export const delWaterDevice = (id: string | number | Array<string | number>) =>
 
 /**
  * 获取设备指定时间段的用水量
- * @param id
+ * @param data
  */
 export const getWaterDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'startTime': string; 'endTime': string }) => {
   return request({
@@ -76,7 +76,7 @@ export const getWaterDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'st
 
 /**
  * 生成条形码
- * @param id
+ * @param data
  */
 export const WaterDeviceMakerQrcode = (data: { deviceCode: string; id: string }[]) => {
   return request({
@@ -87,7 +87,7 @@ export const WaterDeviceMakerQrcode = (data: { deviceCode: string; id: string }[
 };
 /**
  * 更新固件
- * @param id
+ * @param data
  */
 export const WaterDeviceUpdateBin = (data: { deviceCodes: string[]; urlA: string; urlB: string }) => {
   return request({
diff --git a/src/api/system/Tstock/index.ts b/src/api/system/Tstock/index.ts
index 52fad0b..d223051 100644
--- a/src/api/system/Tstock/index.ts
+++ b/src/api/system/Tstock/index.ts
@@ -17,8 +17,8 @@ export const listStock = (query?: any): AxiosPromise<any[]> => {
 
 /**
  * 查询 库存查询 详情
- * @param query
  * @returns {*}
+ * @param id
  */
 
 export const listStockMain = (id?: string): AxiosPromise<any[]> => {
diff --git a/src/api/system/Twarehouse/type.ts b/src/api/system/Twarehouse/type.ts
index 92206cf..042fa05 100644
--- a/src/api/system/Twarehouse/type.ts
+++ b/src/api/system/Twarehouse/type.ts
@@ -88,10 +88,6 @@ export interface WarehouseQuery extends PageQuery {
    */
   warehouseName?: string;
 
-  /**
-   * 仓库归属id*（关联com_village）
-   */
-  villageId?: string;
 
   /**
    * 联系人*
diff --git a/src/api/system/cars/index.ts b/src/api/system/cars/index.ts
index 39f8493..ff47ced 100644
--- a/src/api/system/cars/index.ts
+++ b/src/api/system/cars/index.ts
@@ -64,20 +64,27 @@ export const delCar = (id: string | number | Array<string | number>) => {
 
 /**
  * 删除车辆图片
- * @param id
+ * @param format
  */
-export const uploadCar = (formdata: FormData) => {
+export const uploadCar = (format: FormData) => {
   return request({
     url: '/car/uploadImage',
     method: 'POST',
-    data: formdata
+    data: format
   });
 };
 
+export interface AppUserList {
+  'user_id': string;
+  'user_name': string;
+  'user_phone': string;
+}
 /**
  * 获取用户端app-用户
  *  */
-export const getAppUser = (data) => {
+export const getAppUser = (
+  data
+): AxiosPromise<AppUserList[]> => {
   return request({
     url: '/car/getAppUserList',
     method: 'GET',
diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts
index 03c54d5..8802b57 100644
--- a/src/api/system/dept/index.ts
+++ b/src/api/system/dept/index.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { DeptForm, DeptQuery, DeptTreeVO, DeptVO } from './types';
+import { DeptForm, DeptQuery, DeptVO } from './types';
 
 // 查询部门列表
 export const listDept = (query?: DeptQuery) => {
diff --git a/src/api/system/house/index.ts b/src/api/system/house/index.ts
index 80d2da3..c72dc80 100644
--- a/src/api/system/house/index.ts
+++ b/src/api/system/house/index.ts
@@ -167,7 +167,7 @@ export interface Storeroom {
   unitNoId: string;
   unitNo: number;
 
-  unitNoName:string;
+  unitNoName: string;
 }
 
 export interface Parking {
diff --git a/src/api/system/houseUse/index.ts b/src/api/system/houseUse/index.ts
index 8b8db1d..dba7892 100644
--- a/src/api/system/houseUse/index.ts
+++ b/src/api/system/houseUse/index.ts
@@ -15,7 +15,7 @@ export const listHouseUseType = (query?: HouseUseTypeQuery): AxiosPromise<HouseU
     params: query
   });
 };
-export const listHouseUseType_add_house = (query?: HouseUseTypeQuery): AxiosPromise<HouseUseTypeVO[]> => {
+export const listHouseUseType_add_house = (query?: HouseUseTypeQuery | {}): AxiosPromise<HouseUseTypeVO[]> => {
   return request({
     url: '/houseUseType/getList',
     method: 'get',
diff --git a/src/api/system/parking/index.ts b/src/api/system/parking/index.ts
index 9268f6d..2612a48 100644
--- a/src/api/system/parking/index.ts
+++ b/src/api/system/parking/index.ts
@@ -63,7 +63,7 @@ export const delParking = (id: string | number | Array<string | number>) => {
 };
 /**
  * 改变车位审核装填
- * @param id
+ * @param data
  */
 export const getParkingReview = (data: { id: string; propertyReviewFeedback: string; propertyStatus: number }) => {
   return request({
@@ -88,6 +88,7 @@ export const getParkingReviewInfo = (id: string) => {
 /**
  * 查询小区内车位列表
  * @param { string } villageid
+ * @param houseId
  * @returns {*}
  */
 
diff --git a/src/api/system/resident/index.ts b/src/api/system/resident/index.ts
index d171311..fc610f3 100644
--- a/src/api/system/resident/index.ts
+++ b/src/api/system/resident/index.ts
@@ -8,7 +8,7 @@ import { ResidentVO, ResidentForm, ResidentQuery } from '@/api/system/resident/t
  * @returns {*}
  */
 
-export const listResident = (query?: ResidentQuery): AxiosPromise<ResidentVO[]> => {
+export const listResident = (query?: ResidentQuery | {}): AxiosPromise<ResidentVO[]> => {
   return request({
     url: '/resident/list',
     method: 'get',
@@ -64,7 +64,6 @@ export const delResident = (id: string | number | Array<string | number>) => {
 
 /**
  * 添加住户管理-上传身份证
- * @param id
  */
 export const UploadidCardApi = () => {
   return request({
diff --git a/src/api/system/resident/type.ts b/src/api/system/resident/type.ts
index 89aa32b..007aa0c 100644
--- a/src/api/system/resident/type.ts
+++ b/src/api/system/resident/type.ts
@@ -2,7 +2,7 @@ export interface ResidentVO {
   /**
    * 主键  住户管理id
    */
-  userId: string | number;
+  userId: string;
   id: string;
   /**
    * 住户编号
@@ -28,7 +28,7 @@ export interface ResidentVO {
   /**
    * 身份证号
    */
-  idCard: string | number;
+  idCard: string;
 
   /**
    * 手机号码
@@ -43,7 +43,7 @@ export interface ResidentVO {
   /**
    * 楼栋id
    */
-  buildingId: string | number;
+  buildingId: string;
 
   /**
    * 房屋表id
@@ -78,7 +78,7 @@ export interface ResidentForm extends BaseEntity {
   /**
    * 主键  住户管理id
    */
-  userId?: string | number;
+  userId?: string;
 
   /**
    * 住户编号
@@ -106,7 +106,7 @@ export interface ResidentForm extends BaseEntity {
   /**
    * 身份证号
    */
-  idCard?: string | number;
+  idCard?: string;
 
   /**
    * 手机号码
@@ -121,7 +121,7 @@ export interface ResidentForm extends BaseEntity {
   /**
    * 楼栋id
    */
-  buildingId?: string | number;
+  buildingId?: string;
 
   /**
    * 房屋表id
diff --git a/src/api/system/storeroom/index.ts b/src/api/system/storeroom/index.ts
index 1eeb231..cf2b035 100644
--- a/src/api/system/storeroom/index.ts
+++ b/src/api/system/storeroom/index.ts
@@ -63,8 +63,8 @@ export const delStoreroom = (id: string | number | Array<string | number>) => {
 };
 /**
  * 查询小区内储藏室管理列表
- * @param query
  * @returns {*}
+ * @param data
  */
 
 export const GetVillagelistStoreroom = (
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index d656f36..ba5288a 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -212,7 +212,7 @@ export const deptTreeSelect = (): AxiosPromise<DeptTreeVO[]> => {
 /**
  * 查询用户 根据不同的角色key
  */
-export const getUserByRoleKey = (roleKey: string = 'repair'): AxiosPromise<any> => {
+export const getUserByRoleKey = (roleKey: string = 'repair') => {
   return request({
     url: '/system/user/list/byRoleKey?roleKey=' + roleKey,
     method: 'get'
diff --git a/src/api/tool/gen/index.ts b/src/api/tool/gen/index.ts
index efe079c..2629926 100644
--- a/src/api/tool/gen/index.ts
+++ b/src/api/tool/gen/index.ts
@@ -68,7 +68,7 @@ export const genCode = (tableId: string | number) => {
     method: 'get'
   });
 };
-
+253029745
 // 同步数据库
 export const synchDb = (tableId: string | number) => {
   return request({
diff --git a/src/api/workflow/index.ts b/src/api/workflow/index.ts
index c38969e..86a1b0c 100644
--- a/src/api/workflow/index.ts
+++ b/src/api/workflow/index.ts
@@ -1,10 +1,9 @@
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
 
 /**
  * 查询小区概况
- * @param query
  * @returns {*}
+ * @param villageId
  */
 export const workSpaceTotalListApi = (
   villageId: string
@@ -26,8 +25,8 @@ export const workSpaceTotalListApi = (
 };
 /**
  * 查询近一周报修趋势
- * @param query
  * @returns {*}
+ * @param villageId
  */
 export const workSpaceRepairTrendListApi = (
   villageId: string
@@ -47,8 +46,8 @@ export const workSpaceRepairTrendListApi = (
 };
 /**
  * 查询近一周收入趋势
- * @param query
  * @returns {*}
+ * @param villageId
  */
 export const workSpaceIncomeTrendListApi = (
   villageId: string
@@ -68,8 +67,8 @@ export const workSpaceIncomeTrendListApi = (
 };
 /**
  * 查询近一周支出趋势
- * @param query
  * @returns {*}
+ * @param villageId
  */
 export const workSpaceOutcomeTrendListApi = (
   villageId: string
@@ -90,8 +89,8 @@ export const workSpaceOutcomeTrendListApi = (
 
 /**
  * 查询当日天气
- * @param query
  * @returns {*}
+ * @param city
  */
 export const workSpaceWeatherApi = (city: string): Promise<reponseType> => {
   const url = 'https://uapis.cn/api/v1/misc/weather?city=' + city + '&lang=zh';
@@ -307,20 +306,20 @@ type LifeIndices = {
 
 /**
  *  查询 快捷入口
- * @param query
  * @returns {*}
  */
-export const getQuicklyshortcut = () => {
+export const getQuicklyshortcut = (query?: {}) => {
   return request({
     url: '/workSpace/shortcut/list',
-    method: 'GET'
+    method: 'GET',
+    params: query
   });
 };
 
 /**
  *  添加 快捷入口
- * @param query
  * @returns {*}
+ * @param data
  */
 export const addQuicklyshortcut = (data) => {
   return request({
@@ -332,8 +331,8 @@ export const addQuicklyshortcut = (data) => {
 
 /**
  * 删除 快捷入口
- * @param query
  * @returns {*}
+ * @param id
  */
 export const delQuicklyshortcut = (id) => {
   return request({
diff --git a/src/api/workflow/spel/types.ts b/src/api/workflow/spel/types.ts
index e0a694c..53b6c41 100644
--- a/src/api/workflow/spel/types.ts
+++ b/src/api/workflow/spel/types.ts
@@ -33,7 +33,6 @@ export interface SpelVO {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface SpelForm extends BaseEntity {
@@ -71,11 +70,9 @@ export interface SpelForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface SpelQuery extends PageQuery {
-
   /**
    * 组件名称
    */
@@ -101,11 +98,8 @@ export interface SpelQuery extends PageQuery {
    */
   status?: string;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-
diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts
index dc52f62..f8722dd 100644
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@@ -181,8 +181,8 @@ export const currentTaskAllUser = (taskId: string | number) => {
 
 /**
  * 获取下一节点写
- * @param data参数
- * @returns
+ * @param data
+ * @param data
  */
 export const getNextNodeList = (data: any): any => {
   return request({
@@ -194,8 +194,8 @@ export const getNextNodeList = (data: any): any => {
 
 /**
  * 催办任务
- * @param data参数
- * @returns
+ * @param data
+ * @param data
  */
 export const urgeTask = (data: any): any => {
   return request({
diff --git a/src/components/Holder/CarUser.vue b/src/components/Holder/CarUser.vue
index 80db469..4520d5b 100644
--- a/src/components/Holder/CarUser.vue
+++ b/src/components/Holder/CarUser.vue
@@ -39,8 +39,10 @@
 </template>
 
 <script setup lang="ts">
+import DictTag from '@/components/DictTag/index.vue';
+import pagination from '@/components/Pagination/index.vue';
 import { getBuildinglistAPI, getHouselistAPI } from '@/api/system/house';
-import { BillUserlist, queryResidentList_Cars, queryResidentList_holder } from '@/api/system/SdbBill';
+import { BillUserlist, queryResidentList_Cars } from '@/api/system/SdbBill';
 import { ref, nextTick, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/components/Holder/appUser.vue b/src/components/Holder/appUser.vue
index e8ae89a..e8301ca 100644
--- a/src/components/Holder/appUser.vue
+++ b/src/components/Holder/appUser.vue
@@ -19,10 +19,10 @@
           :total="total"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
-          @pagination="getlist"
+          @pagination="getList"
         />
         <div>
-          <el-button @click="conback">退出</el-button>
+          <el-button @click="conBack">退出</el-button>
           <el-button type="primary" @click="confirm"> 确定 </el-button>
         </div>
       </div>
@@ -31,33 +31,30 @@
 </template>
 
 <script setup lang="ts">
-import { BillUserlist } from '@/api/system/SdbBill';
-import { ref, nextTick, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';
-import { getAppUser } from '@/api/system/cars';
+import pagination from '@/components/Pagination/index.vue';
+import { ref, nextTick, toRefs } from 'vue';
+import { AppUserList, getAppUser } from '@/api/system/cars';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const props = defineProps({
-  returnvalue: {
-    type: String,
-    default: '*'
-  },
-  titleName: {
-    type: String,
-    default: '选择业主'
-  },
-  /** 是否多选 false 单选   */
-  isMultiple: {
-    type: Boolean,
-    default: false
+type ReturnValueType = keyof AppUserList | '*';
+
+const props = withDefaults(
+  defineProps<{
+    returnable: ReturnValueType;
+    titleName?: string;
+    isMultiple?: boolean;
+  }>(),
+  {
+    returnable: '*',
+    titleName: '选择业主',
+    isMultiple: false
   }
-});
-
-const { titleName, returnvalue } = toRefs(props);
+);
+const { titleName, returnable } = toRefs(props);
 
 const userid = ref([]);
 // ✅ 手动设置默认值（替代 withDefaults）
 const emit = defineEmits<{
-  change: [value: string | number | (string | number)[] | BillUserlist | BillUserlist[]]; // 支持返回数组
+  change: [value: AppUserList[keyof AppUserList] | AppUserList | AppUserList[]]; // 支持返回数组
 }>();
 
 const dialog = ref({
@@ -71,12 +68,12 @@ const queryParams = ref({
 });
 
 const multipleTableRef = ref();
-const tableData = ref<BillUserlist[]>([]);
+const tableData = ref<AppUserList[]>([]);
 const total = ref(0);
 const loading = ref(false);
 const isFetching = ref(false);
 // 存储选中项
-const multipleSelection = ref<BillUserlist[]>([]);
+const multipleSelection = ref<AppUserList[]>([]);
 
 const isMultiple = computed(() => props.isMultiple ?? false);
 
@@ -88,7 +85,7 @@ const handleUserSelection = () => {
     return;
   }
   const rowsToSelect = tableData.value.filter((row) => {
-    return multipleSelection.value.some((selected) => selected.parkingId === row.parkingId);
+    return multipleSelection.value.some((selected) => selected.user_id === row.user_id);
   });
   multipleTableRef.value.clearSelection();
   if (rowsToSelect.length > 0) {
@@ -106,7 +103,7 @@ const handleUserSelection = () => {
 // ====================== 方法 ======================
 
 // 获取列表
-function getlist() {
+function getList() {
   isFetching.value = true; // 加锁
   loading.value = true;
   getAppUser(queryParams.value)
@@ -127,14 +124,14 @@ function getlist() {
 // ==============================================
 // ✅ 新增：处理 selection-change（多选专用）
 // ==============================================
-function handleSelectionChange(selection: BillUserlist[]) {
+function handleSelectionChange(selection: AppUserList[]) {
   if (isFetching.value) return;
   if (isMultiple.value) {
-    const currentSelectedIds = new Set(selection.map((item) => item.parkingId));
+    const currentSelectedIds = new Set(selection.map((item) => item.user_id));
     const otherPageSelections = multipleSelection.value.filter((item) => {
-      const isCurrentPageItem = tableData.value.some((row) => row.parkingId === item.parkingId);
+      const isCurrentPageItem = tableData.value.some((row) => row.user_id === item.user_id);
       if (isCurrentPageItem) {
-        return currentSelectedIds.has(item.parkingId);
+        return currentSelectedIds.has(item.user_id);
       } else {
         return true;
       }
@@ -143,9 +140,9 @@ function handleSelectionChange(selection: BillUserlist[]) {
     const finalSelection = [...otherPageSelections, ...selection];
     // 4. 去重（以防万一）
     const uniqueMap = new Map();
-    finalSelection.forEach((item) => uniqueMap.set(item.parkingId, item));
+    finalSelection.forEach((item) => uniqueMap.set(item.user_id, item));
     multipleSelection.value = Array.from(uniqueMap.values());
-    console.log(multipleSelection.value.map((item) => item.parkingId));
+    console.log(multipleSelection.value.map((item) => item.user_id));
   } else {
     // --- 单选逻辑 ---
     if (selection.length > 0) {
@@ -169,40 +166,40 @@ function resetQuery() {
     pageNum: 1,
     pageSize: 10
   };
-  getlist();
+  getList();
 }
 
 // 退出
-function conback() {
+function conBack() {
   dialog.value.dialogVisible = false;
   resetQuery();
 }
 
 // ==============================================
-// ✅ 核心修改：根据 returnvalue 返回对应的值
+// ✅ 核心修改：根据 returnable 返回对应的值
 // ==============================================
 function confirm() {
   dialog.value.dialogVisible = false;
   if (isMultiple.value) {
     // 多选
-    if (returnvalue.value === '*') {
+    if (returnable.value === '*') {
       // ✅ 返回整个对象数组
       emit('change', multipleSelection.value);
     } else {
       // 返回指定字段数组
       emit(
         'change',
-        multipleSelection.value.map((item) => item[returnvalue.value as keyof BillUserlist])
+        multipleSelection.value.map((item) => item[returnable.value])
       );
     }
   } else {
     // 单选
-    if (returnvalue.value === '*') {
+    if (returnable.value === '*') {
       // ✅ 返回整个对象
-      emit('change', multipleSelection.value[0]);
+      emit('change', multipleSelection.value[multipleSelection.value.length - 1]);
     } else {
       // 返回指定字段
-      emit('change', multipleSelection.value[0][returnvalue.value as keyof BillUserlist]);
+      emit('change', multipleSelection.value[multipleSelection.value.length - 1][returnable.value]);
     }
   }
 
@@ -217,14 +214,13 @@ defineExpose({
       multipleSelection.value = arr.map(
         (id) =>
           ({
-            parkingId: id
-          }) as BillUserlist
+            user_id: id
+          }) as AppUserList
       );
-      console.log(multipleSelection.value);
     } else {
       multipleSelection.value = [];
     }
-    getlist();
+    getList();
     dialog.value.dialogVisible = true;
   }
 });
@@ -238,7 +234,7 @@ defineExpose({
   border: 1px solid #ccc;
   border-radius: 5px;
   padding: 0 10px;
-  .defaultbox {
+  .defaultBox {
     display: flex;
     align-items: center;
     justify-content: space-between;
diff --git a/src/components/Holder/house.vue b/src/components/Holder/house.vue
index 578384a..d0f1f31 100644
--- a/src/components/Holder/house.vue
+++ b/src/components/Holder/house.vue
@@ -87,10 +87,11 @@
 </template>
 
 <script setup lang="ts">
-import { getBuildinglistAPI, getBuildingOnly, getHouselistAPI } from '@/api/system/house';
-import { listHouseUseType, listHouseUseType_add_house } from '@/api/system/houseUse';
+import { getBuildinglistAPI, getHouselistAPI } from '@/api/system/house';
+import { listHouseUseType_add_house } from '@/api/system/houseUse';
 import { BillHouse, listBillHouse } from '@/api/system/SdbBill';
-import { ref, watch, nextTick, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';
+import { ref, nextTick, toRefs } from 'vue';
+import pagination from '@/components/Pagination/index.vue';
 
 // const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 // const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
diff --git a/src/components/Holder/index.vue b/src/components/Holder/index.vue
index 7125a49..a7adf1f 100644
--- a/src/components/Holder/index.vue
+++ b/src/components/Holder/index.vue
@@ -132,7 +132,6 @@ const queryParams = ref({
   status: '', // 👈 原来 null → 改成 ''
   type: '', // 👈 原来 null → 改成 ''
   houseId: null,
-  villageId: null,
   buildingId: null,
   unitNo: null
 });
@@ -260,7 +259,6 @@ function resetQuery() {
     type: '', // 👈 这里也改
     status: '', // 👈 这里也改
     houseId: null,
-    villageId: null,
     buildingId: null,
     unitNo: null
   };
diff --git a/src/components/Holder/material.vue b/src/components/Holder/material.vue
index 7715abb..217c595 100644
--- a/src/components/Holder/material.vue
+++ b/src/components/Holder/material.vue
@@ -58,7 +58,7 @@
 <script setup lang="ts">
 import { listMaterial } from '@/api/system/Tmaterial';
 import { MaterialVO } from '@/api/system/Tmaterial/type';
-import { ref, watch, nextTick, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';
+import { ref, nextTick, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/components/Holder/repairUser.vue b/src/components/Holder/repairUser.vue
index 0ebcade..34b7575 100644
--- a/src/components/Holder/repairUser.vue
+++ b/src/components/Holder/repairUser.vue
@@ -2,7 +2,7 @@
   <slot v-if="$slots.default" />
 
   <div v-else class="residentBox" @click="choiceResidentFun">
-    <div class="defaultbox" v-if="multipleSelection.length === 0 && props.username === null">
+    <div class="defaultBox" v-if="multipleSelection.length === 0 && props.username === null">
       <span>请选择</span>
       <el-icon><Search /></el-icon>
     </div>
@@ -26,7 +26,7 @@
         </div>
       </div>
       <div>
-        <el-button type="primary" @click="getlist">查询</el-button>
+        <el-button type="primary" @click="getList">查询</el-button>
         <el-button @click="resetQuery">重置</el-button>
       </div>
     </nav>
@@ -52,10 +52,10 @@
           :total="total"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
-          @pagination="getlist"
+          @pagination="getList"
         />
         <div>
-          <el-button @click="conback">退出</el-button>
+          <el-button @click="conBack">退出</el-button>
           <el-button type="primary" @click="confirm"> 确定 </el-button>
         </div>
       </div>
@@ -159,9 +159,6 @@ const handleUserSelection = () => {
 // 监听
 // 监听优化：只在 userid 变化时触发
 watch(userid, handleUserSelection, { immediate: true });
-// watch(tableData, () => {
-//   if (userid.value) handleUserSelection(); // 仅在有 userid 时重新处理
-// });
 
 // ====================== 方法 ======================
 // 打开选择框
@@ -177,11 +174,11 @@ function choiceResidentFun() {
   } else if (Array.isArray(props.userid)) {
     multipleSelection.value = props.userid.map((id) => ({ userId: id })) as tableType[];
   }
-  getlist();
+  getList();
 }
 
 // 获取列表
-function getlist() {
+function getList() {
   loading.value = true;
   getUserByRoleKey(userType.value)
     .then((res) => {
@@ -244,11 +241,11 @@ function resetQuery() {
     nickName: null,
     phonenumber: null
   };
-  getlist();
+  getList();
 }
 
 // 退出
-function conback() {
+function conBack() {
   dialog.value.dialogVisible = false;
   resetQuery();
 }
@@ -288,7 +285,7 @@ onMounted(() => {
 defineExpose({
   open: () => {
     dialog.value.dialogVisible = true;
-    getlist();
+    getList();
   }
 });
 </script>
@@ -301,7 +298,7 @@ defineExpose({
   border: 1px solid #ccc;
   border-radius: 5px;
   padding: 0 10px;
-  .defaultbox {
+  .defaultBox {
     display: flex;
     align-items: center;
     justify-content: space-between;
diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue
index afe02c7..f596a29 100644
--- a/src/components/ImagePreview/index.vue
+++ b/src/components/ImagePreview/index.vue
@@ -10,6 +10,7 @@
 
 <script setup lang="ts">
 import { propTypes } from '@/utils/propTypes';
+import { PictureFilled } from '@element-plus/icons-vue';
 
 const props = defineProps({
   src: propTypes.string.def(''),
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index f81e4bc..8f9d504 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -35,7 +35,7 @@
     </div>
 
     <el-dialog v-model="dialogVisible" title="预览" width="800px" append-to-body>
-      <img :src="dialogImageUrl" style="display: block; max-width: 100%; margin: 0 auto" />
+      <img alt="预览" :src="dialogImageUrl" style="display: block; max-width: 100%; margin: 0 auto" />
     </el-dialog>
   </div>
 </template>
@@ -46,6 +46,7 @@ import { OssVO } from '@/api/system/oss/types';
 import { propTypes } from '@/utils/propTypes';
 import { globalHeaders } from '@/utils/request';
 import { compressAccurately } from 'image-conversion';
+import { Plus } from '@element-plus/icons-vue';
 
 const props = defineProps({
   modelValue: {
diff --git a/src/components/Pageheader/index.vue b/src/components/Pageheader/index.vue
index 9b2b26f..d1c69dc 100644
--- a/src/components/Pageheader/index.vue
+++ b/src/components/Pageheader/index.vue
@@ -45,8 +45,7 @@ defineSlots<{
 
 <style scoped lang="scss">
 .PageHeaderBox {
-  padding: 15px 20px;
-  padding-bottom: 0;
+  padding: 15px 20px 0;
   background-color: #fff;
   border-radius: 2px;
   background-color: rgba(255, 255, 255, 1);
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 2413f08..23820f6 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -59,6 +59,7 @@
   </div>
 </template>
 <script setup lang="ts">
+import DictTag from '@/components/DictTag/index.vue';
 import { flowHisTaskList } from '@/api/workflow/instance';
 import { propTypes } from '@/utils/propTypes';
 import { listByIds } from '@/api/system/oss';
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index b9d158d..77ed1da 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -109,7 +109,7 @@ onMounted(() => {
 :deep(.el-transfer__button) {
   border-radius: 50%;
   display: block;
-  margin-left: 0px;
+  margin-left: 0;
 }
 
 :deep(.el-transfer__button:first-child) {
diff --git a/src/directive/index.ts b/src/directive/index.ts
index ef25ee8..2b5c82f 100644
--- a/src/directive/index.ts
+++ b/src/directive/index.ts
@@ -4,6 +4,7 @@ import { App } from 'vue';
 
 export default (app: App) => {
   app.directive('copyText', copyText);
+  /** 权限校验 */
   app.directive('hasPermi', hasPermi);
   app.directive('hasRoles', hasRoles);
 };
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d9e227a..8c9718e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -29,7 +29,7 @@
       <div class="avatar-container">
         <el-dropdown class="right-menu-item hover-effect" trigger="click" @command="handleCommand">
           <div class="avatar-wrapper">
-            <img :src="userStore.avatar" class="user-avatar" />
+            <img alt="头像" :src="userStore.avatar" class="user-avatar" />
             <el-icon><caret-bottom /></el-icon>
           </div>
           <template #dropdown>
@@ -60,6 +60,7 @@ import { useNoticeStore } from '@/store/modules/notice';
 import notice from './notice/index.vue';
 import router from '@/router';
 import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type';
+import { CaretBottom } from '@element-plus/icons-vue';
 
 const props = defineProps({
   Showhamburger: {
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 4a4105c..dedf451 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -2,7 +2,7 @@
   <div class="sidebar-logo-container" :class="{ collapse: collapse }">
     <transition :enter-active-class="proxy?.animate.logoAnimate.enter" mode="out-in">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img alt="" v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 v-else class="sidebar-title">
           {{ title }}
         </h1>
@@ -114,7 +114,7 @@ const getLogoTextColor = computed(() => {
 
   &.collapse {
     .sidebar-logo {
-      margin-right: 0px;
+      margin-right: 0;
     }
   }
 }
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index 21985ac..b9cdc2f 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -93,7 +93,7 @@ defineExpose({
   overflow: hidden;
   width: 100%;
   :deep(.el-scrollbar__bar) {
-    bottom: 0px;
+    bottom: 0;
   }
   :deep(.el-scrollbar__wrap) {
     height: 49px;
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 38479f6..8ddef59 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -37,6 +37,7 @@ import { useSettingsStore } from '@/store/modules/settings';
 import { usePermissionStore } from '@/store/modules/permission';
 import { useTagsViewStore } from '@/store/modules/tagsView';
 import { RouteRecordRaw, RouteLocationNormalized } from 'vue-router';
+import { Back, CircleClose, Close, RefreshRight, Right } from '@element-plus/icons-vue';
 
 const visible = ref(false);
 const top = ref(0);
diff --git a/src/layout/components/TopBar/index.vue b/src/layout/components/TopBar/index.vue
index 592c5ba..ca4c383 100644
--- a/src/layout/components/TopBar/index.vue
+++ b/src/layout/components/TopBar/index.vue
@@ -11,8 +11,8 @@
   </el-menu>
 </template>
 
-<script setup>
-import SidebarItem from '../Sidebar/SidebarItem';
+<script lang="ts" setup>
+import SidebarItem from '../Sidebar/SidebarItem.vue';
 import { useAppStore } from '@/store/modules/app';
 import { useSettingsStore } from '@/store/modules/settings';
 import { usePermissionStore } from '@/store/modules/permission';
@@ -45,7 +45,7 @@ function setVisibleNumber() {
   if (width >= 1000) {
     width -= 500;
   }
-  visibleNumber.value = parseInt(width / 3 / 85);
+  visibleNumber.value = parseInt(String(width / 3 / 85));
 }
 
 onMounted(() => {
@@ -95,7 +95,7 @@ onMounted(() => {
 .topbar-menu .el-sub-menu .el-sub-menu__icon-arrow {
   position: static;
   margin-left: 8px;
-  margin-top: 0px;
+  margin-top: 0;
   display: block !important;
 }
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 17bd130..b4ad5d9 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -19,7 +19,7 @@
 import { ref, computed, watchEffect, onMounted, onUnmounted } from 'vue';
 import { useWindowSize } from '@vueuse/core';
 import SideBar from './components/Sidebar/index.vue';
-import { AppMain, Navbar, Settings, TagsView } from './components';
+import { AppMain, Navbar, Settings } from './components';
 import { useAppStore } from '@/store/modules/app';
 import { useSettingsStore } from '@/store/modules/settings';
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index ef66b3a..4cf2300 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -23,7 +23,7 @@ export default {
         const blob = new Blob([res.data], { type: 'application/octet-stream' });
         FileSaver.saveAs(blob, decodeURIComponent(res.headers['download-filename'] as string));
       } else {
-        this.printErrMsg(res.data);
+        await this.printErrMsg(res.data);
       }
       downloadLoadingInstance.close();
     } catch (r) {
@@ -47,7 +47,7 @@ export default {
         const blob = new Blob([res.data], { type: 'application/zip' });
         FileSaver.saveAs(blob, name);
       } else {
-        this.printErrMsg(res.data);
+        await this.printErrMsg(res.data);
       }
       downloadLoadingInstance.close();
     } catch (r) {
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 7ab72c5..b02facc 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import router, { constantRoutes, dynamicRoutes } from '@/router';
+import { constantRoutes, dynamicRoutes } from '@/router';
 import store from '@/store';
 import { getRouters } from '@/api/menu';
 import auth from '@/plugins/auth';
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 37e7125..8640949 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -5,7 +5,6 @@ import { LoginData } from '@/api/types';
 import defAva from '@/assets/images/profile.jpg';
 import { defineStore } from 'pinia';
 import { ref } from 'vue';
-import { useHouseStore } from './house';
 import { UserInfo } from '@/api/system/user/types';
 import { useDictStore } from './dict';
 
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index bc0e030..a584818 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,4 +1,4 @@
-import type { PropType as VuePropType, ComponentInternalInstance as ComponentInstance } from 'vue';
+import type { ComponentInternalInstance as ComponentInstance } from 'vue';
 import { LanguageEnum } from '@/enums/LanguageEnum';
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
 
diff --git a/src/utils/Reg.ts b/src/utils/Reg.ts
index cc9bba2..26b8230 100644
--- a/src/utils/Reg.ts
+++ b/src/utils/Reg.ts
@@ -19,8 +19,8 @@ export function isPlateNumber(val: string): boolean {
 }
 /**
  * 验证金钱
- * @param {number} val
  * @return {boolean} true 符合 false 不符合
+ * @param value
  */
 export function isMoney(value: number): boolean {
   const reg = /^(0|[1-9]\d*)(\.\d{1,2})?$/;
diff --git a/src/utils/house.ts b/src/utils/house.ts
index b45992d..4f658ae 100644
--- a/src/utils/house.ts
+++ b/src/utils/house.ts
@@ -73,6 +73,7 @@ type ValidTreeKey = {
  * 根据 houseId 查找完整路径（楼栋 > 单元 > 楼层 > 房屋）
  * @param treeData 转换后的树形数据
  * @param houseId 目标房屋ID
+ * @param response
  * @returns string[] 路径数组，如 ['1号楼', '1单元', '3层', '301']
  */
 export function getHousePathById(treeData: Tree[], houseId: string | number, response: ValidTreeKey = 'value'): (string | number)[] {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index b8af607..f30badc 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -90,8 +90,8 @@ export const getQueryObject = (url: string) => {
 };
 
 /**
- * @param {string} input value
- * @returns {number} output value
+ * @param str
+ * @param str
  */
 export const byteLength = (str: string) => {
   // returns the byte length of an utf8 string
@@ -245,7 +245,7 @@ export const debounce = (func: any, wait: number, immediate: boolean) => {
       // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
       if (!immediate) {
         result = func.apply(context, args);
-        if (!timeout) context = args = null;
+        context = args = null;
       }
     }
   };
diff --git a/src/views/community/AddCommunity.vue b/src/views/community/AddCommunity.vue
index 3a2fd47..1df66c8 100644
--- a/src/views/community/AddCommunity.vue
+++ b/src/views/community/AddCommunity.vue
@@ -115,8 +115,9 @@ import { pcaTextArr } from 'element-china-area-data';
 import type { DataItem } from 'element-china-area-data';
 import { useUserStore } from '@/store/modules/user';
 import { CascaderValue } from 'element-plus';
-import { addVillageAPI, editVillageAPI, getVillageByIdAPI, uploadVillageImageAPI } from '@/api/system/community/index';
+import { addVillageAPI, editVillageAPI, getVillageByIdAPI, uploadVillageImageAPI } from '@/api/system/community';
 import { communitylist_rows_type } from '@/api/system/community/type';
+import { Delete, Plus } from '@element-plus/icons-vue';
 
 const route = useRoute();
 const router = useRouter();
diff --git a/src/views/community/index.vue b/src/views/community/index.vue
index 0ff7633..07dc31e 100644
--- a/src/views/community/index.vue
+++ b/src/views/community/index.vue
@@ -35,11 +35,11 @@
           </div>
           <div class="actions flex">
             <div @click="handleclick(item)">管理</div>
-            <div @click="handleEdit(item)" v-hasPermi="['system:village:edit']">编辑</div>
-            <div @click="handleDelete(item)" v-hasPermi="['system:village:remove']">删除</div>
+            <div @click="handleEdit(item)" v-has-permi="['system:village:edit']">编辑</div>
+            <div @click="handleDelete(item)" v-has-permi="['system:village:remove']">删除</div>
           </div>
         </div>
-        <div v-hasPermi="['system:village:add']" @click="handleAdd" class="coummunity_card addActions flex flex-items-center justify-center">
+        <div v-has-permi="['system:village:add']" @click="handleAdd" class="coummunity_card addActions flex flex-items-center justify-center">
           <div class="addCoummunity">
             <el-icon>
               <AddLocation></AddLocation>
@@ -57,7 +57,7 @@ import defaultVilageinfoImage from '@/assets/images/villageimage.png';
 import Navbar from '@/layout/components/Navbar.vue';
 import { deleteVillageByIdAPI, switchVillageAPI, getCommunitylistAPI } from '@/api/system/community/index';
 import type { communitylist_rows_type } from '@/api/system/community/type';
-import { Picture } from '@element-plus/icons-vue';
+import { AddLocation, Picture } from '@element-plus/icons-vue';
 import { useHouseStore } from '@/store/modules/house';
 
 const houseStore = useHouseStore();
@@ -225,7 +225,7 @@ function handleclick(item: communitylist_rows_type) {
       min-height: 358px;
       border: 2px solid #ffffff;
       background: linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, #ffffff 70%);
-      box-shadow: 0px 4px 8px 0px rgba(0, 104, 255, 0.06);
+      box-shadow: 0 4px 8px 0 rgba(0, 104, 255, 0.06);
       border-radius: 16px 16px 16px 16px;
       margin-right: 20px;
       margin-bottom: 15px;
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index 78e32c6..db3e54e 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -23,18 +23,18 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button v-has-permi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">编辑</el-button>
+            <el-button v-has-permi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">编辑</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+            <el-button v-has-permi="['demo:demo:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
               >删除</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-has-permi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -51,10 +51,10 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['demo:demo:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-has-permi="['demo:demo:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['demo:demo:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['demo:demo:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -92,6 +92,8 @@
 </template>
 
 <script setup name="Demo" lang="ts">
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import pagination from '@/components/Pagination/index.vue';
 import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
 import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
 
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index cff2c7f..431fdd6 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -20,7 +20,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:tree:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+            <el-button v-has-permi="['demo:tree:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -44,13 +44,13 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['demo:tree:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
+              <el-button v-has-permi="['demo:tree:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
             </el-tooltip>
             <el-tooltip content="新增" placement="top">
-              <el-button v-hasPermi="['demo:tree:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
+              <el-button v-has-permi="['demo:tree:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['demo:tree:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
+              <el-button v-has-permi="['demo:tree:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -90,6 +90,7 @@
 </template>
 
 <script setup name="Tree" lang="ts">
+import RightToolbar from '@/components/RightToolbar/index.vue';
 import { listTree, getTree, delTree, addTree, updateTree } from '@/api/demo/tree';
 import { TreeVO, TreeQuery, TreeForm } from '@/api/demo/tree/types';
 
diff --git a/src/views/login.vue b/src/views/login.vue
index 4101b83..5a902cd 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -235,7 +235,7 @@ onMounted(() => {
   .input-icon {
     height: 40px;
     width: 23px;
-    margin-left: 0px;
+    margin-left: 0;
     margin-right: 16px;
     color: #1a75ff;
   }
diff --git a/src/views/monitor/cache/index.vue b/src/views/monitor/cache/index.vue
index f894586..5cb1ea9 100644
--- a/src/views/monitor/cache/index.vue
+++ b/src/views/monitor/cache/index.vue
@@ -127,6 +127,7 @@
 import { getCache } from '@/api/monitor/cache';
 import * as echarts from 'echarts';
 import { CacheVO } from '@/api/monitor/cache/types';
+import { Monitor, Odometer, PieChart } from '@element-plus/icons-vue';
 
 const cache = ref<Partial<CacheVO>>({});
 const commandstats = ref();
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 9ac26e0..4a4e67b 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -41,20 +41,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['monitor:logininfor:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['monitor:logininfor:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['monitor:logininfor:remove']" type="danger" plain icon="Delete" @click="handleClean">清空</el-button>
+            <el-button v-has-permi="['monitor:logininfor:remove']" type="danger" plain icon="Delete" @click="handleClean">清空</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['monitor:logininfor:unlock']" type="primary" plain icon="Unlock" :disabled="single" @click="handleUnlock">
+            <el-button v-has-permi="['monitor:logininfor:unlock']" type="primary" plain icon="Unlock" :disabled="single" @click="handleUnlock">
               解锁
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['monitor:logininfor:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-has-permi="['monitor:logininfor:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 193eb76..033dd7d 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -49,7 +49,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="强退" placement="top">
-              <el-button v-hasPermi="['monitor:online:forceLogout']" link type="primary" icon="Delete" @click="handleForceLogout(scope.row)">
+              <el-button v-has-permi="['monitor:online:forceLogout']" link type="primary" icon="Delete" @click="handleForceLogout(scope.row)">
               </el-button>
             </el-tooltip>
           </template>
@@ -64,7 +64,6 @@
 <script setup name="Online" lang="ts">
 import { forceLogout, list as initData } from '@/api/monitor/online';
 import { OnlineQuery, OnlineVO } from '@/api/monitor/online/types';
-import api from '@/api/system/user';
 import { to } from 'await-to-js';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index eb45c03..ecc798b 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -49,15 +49,15 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['monitor:operlog:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['monitor:operlog:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['monitor:operlog:remove']" type="danger" plain icon="WarnTriangleFilled" @click="handleClean">清空</el-button>
+            <el-button v-has-permi="['monitor:operlog:remove']" type="danger" plain icon="WarnTriangleFilled" @click="handleClean">清空</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['monitor:operlog:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-has-permi="['monitor:operlog:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -116,7 +116,7 @@
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="详细" placement="top">
-              <el-button v-hasPermi="['monitor:operlog:query']" link type="primary" icon="View" @click="handleView(scope.row)"> </el-button>
+              <el-button v-has-permi="['monitor:operlog:query']" link type="primary" icon="View" @click="handleView(scope.row)"> </el-button>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/register.vue b/src/views/register.vue
index f18cf83..12c3920 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -52,7 +52,7 @@
           <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
         </el-input>
         <div class="register-code">
-          <img :src="codeUrl" class="register-code-img" @click="getCode" />
+          <img alt="验证码" :src="codeUrl" class="register-code-img" @click="getCode" />
         </div>
       </el-form-item>
       <el-form-item style="width: 100%">
@@ -186,7 +186,7 @@ onMounted(() => {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url('../assets/images/login-background.jpg');
+  background-image: url('../assets/images/login-background.png');
   background-size: cover;
 }
 
@@ -194,7 +194,7 @@ onMounted(() => {
   display: flex;
 
   .title {
-    margin: 0px auto 30px auto;
+    margin: 0 auto 30px auto;
     text-align: center;
     color: #707070;
   }
diff --git a/src/views/system/Activity/addActivity.vue b/src/views/system/Activity/addActivity.vue
index 3642d59..b6c47cb 100644
--- a/src/views/system/Activity/addActivity.vue
+++ b/src/views/system/Activity/addActivity.vue
@@ -28,9 +28,9 @@
                       v-model="activityTime"
                       format="YYYY-MM-DD HH:mm:ss"
                       value-format="YYYY-MM-DD HH:mm:ss"
-                      @update:model-value="
-                        (data) => {
-                          if (data && data.length > 0) {
+                      @change="
+                        (data: string[] | null) => {
+                          if (data) {
                             form.startTime = data[0];
                             form.endTime = data[1];
                           } else {
@@ -116,7 +116,7 @@
                       :on-error="handleError"
                       :limit="1"
                     >
-                      <img v-if="form.coverImage" :src="form.coverImage" class="avatar" />
+                      <img alt="活动封面" v-if="form.coverImage" :src="form.coverImage" class="avatar" />
                       <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
                     </el-upload>
                   </el-form-item>
@@ -210,11 +210,13 @@
   </div>
 </template>
 <script setup lang="ts">
+import editor from '@/components/Editor/index.vue';
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { addActivity, getActivity, updateActivity } from '@/api/system/Activity';
-import { genFileId, UploadFiles, UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
+import { genFileId, UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
 import AMapLoader from '@amap/amap-jsapi-loader';
+import { Plus } from '@element-plus/icons-vue';
 
 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/activity/uploadImage';
 
@@ -290,7 +292,7 @@ const activityTime = ref([]);
 // 上传文件
 const upload = ref<UploadInstance>();
 // 上传成功
-const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
+const handleAvatarSuccess: UploadProps['onSuccess'] = (response) => {
   if (response.data && response.data.url) {
     form.value.coverImage = response.data.url;
   }
@@ -305,14 +307,14 @@ const handleExceed: UploadProps['onExceed'] = (files) => {
   upload.value?.submit();
 };
 // 上传失败
-const handleError: UploadProps['onError'] = (error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+const handleError: UploadProps['onError'] = (error: Error) => {
   console.log(error);
 };
 
 //  ! 投诉 ====================================================================================================
 
 // ! 签到 =======================================
-const isSignin = ref(false);
+// const isSignin = ref(false);
 let AMapLi = null;
 let map: any = null;
 let circle: any = null;
@@ -514,17 +516,17 @@ function handleBack() {
 /**
  * 销毁地图及所有工具实例（防内存泄漏、重复初始化）
  */
-function destroyMapInstance() {
-  if (map) {
-    map.destroy();
-    map = null;
-  }
-  mouseTool = null;
-  geocoder = null;
-  circle = null;
-  AMapLi = null;
-  mapReady.value = false;
-}
+// function destroyMapInstance() {
+//   if (map) {
+//     map.destroy();
+//     map = null;
+//   }
+//   mouseTool = null;
+//   geocoder = null;
+//   circle = null;
+//   AMapLi = null;
+//   mapReady.value = false;
+// }
 onUnmounted(() => {
   // destroyMapInstance();
 });
diff --git a/src/views/system/Activity/index.vue b/src/views/system/Activity/index.vue
index c363c2d..894bf5c 100644
--- a/src/views/system/Activity/index.vue
+++ b/src/views/system/Activity/index.vue
@@ -20,19 +20,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['activity:activity:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['repair:edit:activity']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['activity:activity:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -60,8 +47,8 @@
         <el-table-column label="操作" align="center" width="300px" fixed="right">
           <template #default="scope">
             <el-button v-if="scope.row.status === '0'" link type="primary" @click="handleSend(scope.row)">发布</el-button>
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['activity:activity:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['activity:activity:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['activity:activity:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['activity:activity:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -89,7 +76,7 @@
 </template>
 
 <script setup name="Activity" lang="ts">
-import { listActivity, delActivity, updateActivity } from '@/api/system/Activity/index';
+import { listActivity, delActivity, updateActivity } from '@/api/system/Activity';
 import { ActivityVO, ActivityQuery, ActivityForm } from '@/api/system/Activity/type';
 import { checkPermi } from '@/utils/permission';
 
@@ -201,7 +188,7 @@ const handleAdd = () => {
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: ActivityVO) => {
+const handleUpdate = (row?: ActivityVO) => {
   const _id = row?.id || ids.value[0];
   router.push({
     path: '/repair/editActivity',
@@ -233,17 +220,6 @@ const handleDelete = async (row?: ActivityVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'activity/activity/export',
-    {
-      ...queryParams.value
-    },
-    `activity_${new Date().getTime()}.xlsx`
-  );
-};
-
 onMounted(() => {
   getList();
 });
diff --git a/src/views/system/Banner/add.vue b/src/views/system/Banner/add.vue
index 785e0f9..1b0c715 100644
--- a/src/views/system/Banner/add.vue
+++ b/src/views/system/Banner/add.vue
@@ -21,7 +21,7 @@
               v-on:error="handleAvatarError"
               :before-upload="beforeAvatarUpload"
             >
-              <img v-if="form.url" :src="form.url" class="avatar" />
+              <img v-if="form.url" :src="form.url" class="avatar" alt="" />
               <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
               <template #tip>
                 <div class="el-upload__tip">支持jpg, png等格式文件上传，文件大小不超过10MB.</div>
@@ -49,9 +49,9 @@ import PageHeader from '@/components/Pageheader/index.vue';
 import { addBanner, getBanner, updateBanner } from '@/api/system/Banner';
 import { useUserStore } from '@/store/modules/user';
 import { UploadProps, UploadRawFile } from 'element-plus';
+import { Plus } from '@element-plus/icons-vue';
 
 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/car/uploadImage';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const router = useRouter();
 const route = useRoute();
diff --git a/src/views/system/Banner/index.vue b/src/views/system/Banner/index.vue
index 7f6c853..6967a07 100644
--- a/src/views/system/Banner/index.vue
+++ b/src/views/system/Banner/index.vue
@@ -20,25 +20,12 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['banner:banner:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['banner:banner:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['banner:banner:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
             :show-add="checkPermi(['banner:banner:add'])"
-            :show-edit="checkPermi(['banner:banner:edit'])"
-            :show-delete="checkPermi(['banner:banner:remove'])"
+            :show-edit="false"
+            :show-delete="false"
             @update:add="handleAdd"
             @update:edit="handleUpdate()"
             @update:delete="handleDelete()"
@@ -77,46 +64,25 @@
         <el-table-column label="添加时间" align="center" prop="createTime" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['banner:banner:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['banner:banner:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['banner:banner:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['banner:banner:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改Banner图管理对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="bannerFormRef" :model="form" label-width="80px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="排序" prop="byOrder">
-          <el-input v-model="form.byOrder" placeholder="请输入排序" />
-        </el-form-item>
-        <el-form-item label="小区id" prop="villageId">
-          <el-input v-model="form.villageId" placeholder="请输入小区id" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
 <script setup name="Banner" lang="ts">
-import { listBanner, getBanner, delBanner, addBanner, updateBanner, switchBanner } from '@/api/system/Banner';
+import { listBanner, delBanner, switchBanner } from '@/api/system/Banner';
 import { BannerVO, BannerQuery, BannerForm } from '@/api/system/Banner/type';
 import { checkPermi } from '@/utils/permission';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const bannerList = ref<BannerVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
@@ -125,20 +91,13 @@ const multiple = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const bannerFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
 
 const initFormData: BannerForm = {
   id: undefined,
   name: undefined,
   status: undefined,
   byOrder: undefined,
-  link: undefined,
-  villageId: undefined
+  link: undefined
 };
 const data = reactive<PageData<BannerForm, BannerQuery>>({
   form: { ...initFormData },
@@ -148,12 +107,11 @@ const data = reactive<PageData<BannerForm, BannerQuery>>({
     name: undefined,
     status: undefined,
     byOrder: undefined,
-    link: undefined,
-    villageId: undefined
+    link: undefined
   }
 });
 
-const { queryParams, form } = toRefs(data);
+const { queryParams } = toRefs(data);
 
 /** 查询Banner图管理列表 */
 const getList = async () => {
@@ -168,18 +126,6 @@ const getList = async () => {
     });
 };
 
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  bannerFormRef.value?.resetFields();
-};
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -208,7 +154,7 @@ const handleAdd = () => {
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: BannerVO) => {
+const handleUpdate = (row?: BannerVO) => {
   const _id = row?.id || ids.value[0];
   router.push({
     path: '/system/editBanner',
@@ -218,23 +164,6 @@ const handleUpdate = async (row?: BannerVO) => {
   });
 };
 
-/** 提交按钮 */
-const submitForm = () => {
-  bannerFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateBanner(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addBanner(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
 /** 删除按钮操作 */
 const handleDelete = async (row?: BannerVO) => {
   const _ids = row?.id || ids.value;
@@ -244,16 +173,6 @@ const handleDelete = async (row?: BannerVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'banner/banner/export',
-    {
-      ...queryParams.value
-    },
-    `banner_${new Date().getTime()}.xlsx`
-  );
-};
 function handleSwitch(id: string, status: string) {
   switchBanner(id, status).then(() => {
     ElMessage.success('操作成功');
diff --git a/src/views/system/Complaint/complainMain.vue b/src/views/system/Complaint/complainMain.vue
index 575651e..750f7aa 100644
--- a/src/views/system/Complaint/complainMain.vue
+++ b/src/views/system/Complaint/complainMain.vue
@@ -11,50 +11,50 @@
             </div>
           </template>
           <div>
-            <div class="CarinfoBox">
-              <div class="carinfo_item">
+            <div class="carInfoBox">
+              <div class="carInfo_item">
                 <div class="label">投诉类型</div>
                 <div class="main">{{ form.type }}</div>
               </div>
 
-              <div class="carinfo_item">
+              <div class="carInfo_item">
                 <div class="label">投诉人姓名</div>
                 <div class="main">{{ form.complaintName }}</div>
               </div>
 
-              <div class="carinfo_item">
+              <div class="carInfo_item">
                 <div class="label">手机号码</div>
                 <div class="main">{{ form.phone }}</div>
               </div>
 
-              <div class="carinfo_item">
+              <div class="carInfo_item">
                 <div class="label">投诉时间</div>
                 <div class="main">{{ form.createTime }}</div>
               </div>
 
-              <div class="carinfo_item">
+              <div class="carInfo_item">
                 <div class="label">处理状态</div>
                 <div class="main">
                   <DictTag :options="com_complaint_status" :value="form.status"></DictTag>
                 </div>
               </div>
             </div>
-            <div class="CarinfoBox signle">
-              <div class="carinfo_item">
+            <div class="carInfoBox signLe">
+              <div class="carInfo_item">
                 <div class="label">问题描述</div>
                 <div class="main">{{ form.problemDes }}</div>
               </div>
             </div>
-            <div class="CarinfoBox signle">
-              <div class="carinfo_item">
+            <div class="carInfoBox signLe">
+              <div class="carInfo_item">
                 <div class="label">问题照片</div>
                 <div class="main">
                   <el-image
-                    v-for="(item, index) in problemIamgeUrllist"
+                    v-for="(item, index) in problemImageUrlList"
                     :key="index"
                     :src="item"
                     :preview-teleported="true"
-                    :preview-src-list="problemIamgeUrllist"
+                    :preview-src-list="problemImageUrlList"
                     style="width: 120px; height: 120px; margin-right: 10px"
                   ></el-image>
                 </div>
@@ -71,7 +71,7 @@
               <span>处理情况</span>
             </div>
           </template>
-          <div class="formbox">
+          <div class="formBox">
             <el-form ref="formRef" :rules="rules" class="m-auto" :inline="false" label-width="100px" :model="form">
               <el-form-item label="处理状态" prop="status">
                 <el-radio-group v-model="form.status">
@@ -103,11 +103,13 @@
   </div>
 </template>
 <script setup lang="ts">
+import DictTag from '@/components/DictTag/index.vue';
 import { ref } from 'vue';
 import repairUser from '@/components/Holder/repairUser.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { getComplaint, updateComplaint } from '@/api/system/Complaint';
 import { listComplaintType } from '@/api/system/ComplainType';
+import { ResidentVO } from '@/api/system/resident/type';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_complaint_status } = toRefs<any>(proxy?.useDict('com_complaint_status'));
 
@@ -121,7 +123,7 @@ const form = ref({
   'problemDes': '',
   'complaintName': '',
   'phone': '',
-  'problemIamgeUrl': '',
+  'problemImageUrl': '',
   'status': '1', // 投诉状态 0待处理 1已处理
   'handleId': '',
   'handleName': '',
@@ -133,7 +135,7 @@ const rules = {
   handleContent: [{ required: true, message: '投诉处理内容不能为空', trigger: 'blur' }]
 };
 const userid = ref();
-const problemIamgeUrllist = ref([]);
+const problemImageUrlList = ref([]);
 //  ! 投诉 ====================================================================================================
 async function init() {
   const res2 = await listComplaintType();
@@ -142,7 +144,7 @@ async function init() {
       ...form.value,
       ...res.data
     };
-    problemIamgeUrllist.value = res.data.problemImageUrl ? res.data.problemImageUrl.split(',') : [];
+    problemImageUrlList.value = res.data.problemImageUrl ? res.data.problemImageUrl.split(',') : [];
     form.value.status = '1';
     const find = res2.rows.find((item) => item.id === form.value.typeId);
     if (find) {
@@ -156,8 +158,7 @@ if (route.query.id) {
   init();
 }
 
-function handleChange(pop) {
-  console.log(pop);
+function handleChange(pop: ResidentVO) {
   form.value.handleId = pop.userId;
   form.value.handleName = pop.nickName;
 }
@@ -195,14 +196,14 @@ function handleBack() {
     flex: 1;
     font-size: 14px;
 
-    .CarinfoBox {
+    .carInfoBox {
       display: grid;
       grid-template-columns: repeat(3, 1fr);
       grid-template-rows: repeat(2, 1fr);
       gap: 20px;
       margin-bottom: 20px;
 
-      .carinfo_item {
+      .carInfo_item {
         display: flex;
         align-items: center;
         .label {
@@ -211,13 +212,13 @@ function handleBack() {
         }
       }
 
-      &.signle {
+      &.signLe {
         grid-template-columns: repeat(1, 1fr);
         grid-template-rows: repeat(1, 1fr);
       }
     }
 
-    .formbox {
+    .formBox {
       width: 500px;
       margin: 0 auto;
     }
diff --git a/src/views/system/Complaint/index.vue b/src/views/system/Complaint/index.vue
index 0c4bd06..4bdaa00 100644
--- a/src/views/system/Complaint/index.vue
+++ b/src/views/system/Complaint/index.vue
@@ -7,7 +7,7 @@
           <el-form ref="queryFormRef" label-width="120px" :model="queryParams" :inline="true">
             <el-form-item label="投诉类型" prop="typeId">
               <el-select v-model="queryParams.typeId" placeholder="请选择投诉类型" style="width: 240px">
-                <el-option :disabled="item.status === '1'" v-for="item in complaintyTyplist" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option :disabled="item.status === '1'" v-for="item in complainTypeList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
             <el-form-item label="投诉人姓名" prop="complaintName">
@@ -36,7 +36,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['complaint:complaint:query']">查看详情</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['complaint:complaint:query']">查看详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -45,9 +45,8 @@
     </el-card>
   </div>
 </template>
-<!-- complaint -->
 <script setup name="Complaint" lang="ts">
-import { listComplaint, getComplaint, delComplaint, addComplaint, updateComplaint } from '@/api/system/Complaint/index';
+import { listComplaint } from '@/api/system/Complaint';
 import { ComplaintVO, ComplaintQuery, ComplaintForm } from '@/api/system/Complaint/type';
 import { listComplaintType } from '@/api/system/ComplainType';
 
@@ -55,7 +54,6 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_complaint_status } = toRefs<any>(proxy?.useDict('com_complaint_status'));
 
 const complaintList = ref<ComplaintVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
@@ -64,12 +62,6 @@ const multiple = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const complaintFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
 
 const initFormData: ComplaintForm = {
   id: undefined,
@@ -77,7 +69,7 @@ const initFormData: ComplaintForm = {
   problemDes: undefined,
   complaintName: undefined,
   phone: undefined,
-  problemIamgeUrl: undefined,
+  problemImageUrl: undefined,
   status: undefined,
   handleId: undefined,
   handleName: undefined,
@@ -92,26 +84,25 @@ const data = reactive<PageData<ComplaintForm, ComplaintQuery>>({
     problemDes: undefined,
     complaintName: undefined,
     phone: undefined,
-    problemIamgeUrl: undefined,
+    problemImageUrl: undefined,
     status: undefined,
     handleId: undefined,
     handleName: undefined,
-    handleContent: undefined,
-    params: {}
+    handleContent: undefined
   },
   rules: {
     id: [{ required: true, message: '投诉管理表id不能为空', trigger: 'blur' }]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams } = toRefs(data);
 
-const complaintyTyplist = ref([]);
+const complainTypeList = ref([]);
 /** 查询投诉管理列表 */
 const getList = async () => {
   loading.value = true;
   const res2 = await listComplaintType();
-  complaintyTyplist.value = res2.rows;
+  complainTypeList.value = res2.rows;
   listComplaint(queryParams.value)
     .then((res) => {
       complaintList.value = res.rows;
@@ -143,7 +134,7 @@ const handleSelectionChange = (selection: ComplaintVO[]) => {
 
 const router = useRouter();
 /** 详情按钮操作 */
-const handleUpdate = async (row?: ComplaintVO) => {
+const handleUpdate = (row?: ComplaintVO) => {
   router.push({
     path: '/repair/complainMain',
     query: {
@@ -152,43 +143,6 @@ const handleUpdate = async (row?: ComplaintVO) => {
   });
 };
 
-/** 提交按钮 */
-const submitForm = () => {
-  complaintFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateComplaint(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addComplaint(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: ComplaintVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('该信息删除后无法恢复，确定要删除吗？').finally(() => (loading.value = false));
-  await delComplaint(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'complaint/complaint/export',
-    {
-      ...queryParams.value
-    },
-    `complaint_${new Date().getTime()}.xlsx`
-  );
-};
-
 onMounted(() => {
   getList();
 });
diff --git a/src/views/system/ComplaintType/index.vue b/src/views/system/ComplaintType/index.vue
index 68732ad..ba16a6e 100644
--- a/src/views/system/ComplaintType/index.vue
+++ b/src/views/system/ComplaintType/index.vue
@@ -20,31 +20,12 @@
     <el-card shadow="never" class="flex-1">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['complaintType:complaintType:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['complaintType:complaintType:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['complaintType:complaintType:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
             :show-add="checkPermi(['complaintType:complaintType:add'])"
-            :show-edit="checkPermi(['complaintType:complaintType:edit'])"
-            :show-delete="checkPermi(['complaintType:complaintType:remove'])"
+            :show-edit="false"
+            :show-delete="false"
             @update:add="handleAdd"
             @update:edit="handleUpdate()"
             @update:delete="handleDelete()"
@@ -73,8 +54,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['complaintType:complaintType:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['complaintType:complaintType:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['complaintType:complaintType:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['complaintType:complaintType:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -85,7 +66,7 @@
 </template>
 
 <script setup name="ComplaintType" lang="ts">
-import { listComplaintType, getComplaintType, delComplaintType, addComplaintType, updateComplaintType } from '@/api/system/ComplainType/index';
+import { listComplaintType, delComplaintType } from '@/api/system/ComplainType/index';
 import { ComplaintTypeVO, ComplaintTypeQuery, ComplaintTypeForm } from '@/api/system/ComplainType/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/Decoration/addDecoration.vue b/src/views/system/Decoration/addDecoration.vue
index 40ea5b0..d633400 100644
--- a/src/views/system/Decoration/addDecoration.vue
+++ b/src/views/system/Decoration/addDecoration.vue
@@ -57,7 +57,6 @@ import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { addDecoration, getDecoration, updateDecoration } from '@/api/system/Decoration';
 import { useHouseStore } from '@/store/modules/house';
-import { CascaderValue } from 'element-plus';
 import { getHousePathById } from '@/utils/house';
 
 const houseStore = useHouseStore();
diff --git a/src/views/system/Decoration/index.vue b/src/views/system/Decoration/index.vue
index ebd7057..d994f90 100644
--- a/src/views/system/Decoration/index.vue
+++ b/src/views/system/Decoration/index.vue
@@ -25,20 +25,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['repair:add:decoration']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['repair:edit:decoration']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['decoration:decoration:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
-
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -74,14 +60,14 @@
               type="primary"
               v-if="scope.row.inspectionResult !== '1'"
               @click="handleInspection(scope.row, 0, '验收')"
-              v-hasPermi="['repair:edit:decoration']"
+              v-has-permi="['repair:edit:decoration']"
               >验收</el-button
             >
-            <el-button link type="primary" v-else @click="handleInspection(scope.row, 1, '详情')" v-hasPermi="['decoration:decoration:query']"
+            <el-button link type="primary" v-else @click="handleInspection(scope.row, 1, '详情')" v-has-permi="['decoration:decoration:query']"
               >详情</el-button
             >
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['decoration:decoration:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['decoration:decoration:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['decoration:decoration:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['decoration:decoration:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/system/HandleLog/addHandleLog.vue b/src/views/system/HandleLog/addHandleLog.vue
index 2e69647..5003203 100644
--- a/src/views/system/HandleLog/addHandleLog.vue
+++ b/src/views/system/HandleLog/addHandleLog.vue
@@ -90,6 +90,7 @@
 </template>
 
 <script setup lang="ts">
+import editor from '@/components/Editor/index.vue';
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { addHandleLog, getHandleLog, updateHandleLog, uploadAttachments } from '@/api/system/HandleLog';
diff --git a/src/views/system/HandleLog/index.vue b/src/views/system/HandleLog/index.vue
index 1768f86..2e42fc0 100644
--- a/src/views/system/HandleLog/index.vue
+++ b/src/views/system/HandleLog/index.vue
@@ -55,8 +55,8 @@
         </el-table-column>
         <el-table-column label="操作" width="200" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['handleLog:handleLog:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['handleLog:handleLog:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['handleLog:handleLog:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['handleLog:handleLog:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -83,7 +83,7 @@
 </template>
 
 <script setup name="HandleLog" lang="ts">
-import { listHandleLog, getHandleLog, delHandleLog, addHandleLog, updateHandleLog } from '@/api/system/HandleLog/index';
+import { listHandleLog, delHandleLog } from '@/api/system/HandleLog/index';
 import { HandleLogVO, HandleLogQuery, HandleLogForm } from '@/api/system/HandleLog/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/HouseFacilities/index.vue b/src/views/system/HouseFacilities/index.vue
index ec0b10a..9c8d6a7 100644
--- a/src/views/system/HouseFacilities/index.vue
+++ b/src/views/system/HouseFacilities/index.vue
@@ -20,37 +20,12 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['houseFacilities:houseFacilities:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="Edit"
-              :disabled="single"
-              @click="handleUpdate()"
-              v-hasPermi="['houseFacilities:houseFacilities:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['houseFacilities:houseFacilities:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
             :show-add="checkPermi(['houseFacilities:houseFacilities:add'])"
-            :show-edit="checkPermi(['houseFacilities:houseFacilities:edit'])"
-            :show-delete="checkPermi(['houseFacilities:houseFacilities:remove'])"
+            :show-edit="false"
+            :show-delete="false"
             @update:add="handleAdd"
             @update:edit="handleUpdate()"
             @update:delete="handleDelete()"
@@ -68,8 +43,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['houseFacilities:houseFacilities:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['houseFacilities:houseFacilities:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['houseFacilities:houseFacilities:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['houseFacilities:houseFacilities:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -80,13 +55,7 @@
 </template>
 
 <script setup name="HouseFacilities" lang="ts">
-import {
-  listHouseFacilities,
-  getHouseFacilities,
-  delHouseFacilities,
-  addHouseFacilities,
-  updateHouseFacilities
-} from '@/api/system/HouseFacilities/index';
+import { listHouseFacilities, delHouseFacilities } from '@/api/system/HouseFacilities';
 import { HouseFacilitiesVO, HouseFacilitiesQuery, HouseFacilitiesForm } from '@/api/system/HouseFacilities/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/MonthCard/addMonthCard.vue b/src/views/system/MonthCard/addMonthCard.vue
index e857546..c325835 100644
--- a/src/views/system/MonthCard/addMonthCard.vue
+++ b/src/views/system/MonthCard/addMonthCard.vue
@@ -90,6 +90,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
+import LicensePlateInput from '@/components/LicensePlateInput/index.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { addMonthCard, getMonthCard, updateMonthCard } from '@/api/system/MonthCard';
 import { LicensePlateValidator, validator } from '@/utils/Reg';
diff --git a/src/views/system/MonthCard/index.vue b/src/views/system/MonthCard/index.vue
index 385fcd3..3ab600f 100644
--- a/src/views/system/MonthCard/index.vue
+++ b/src/views/system/MonthCard/index.vue
@@ -26,15 +26,15 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['carArea:add:monthcard']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['carArea:add:monthcard']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['carArea:edit:monthcard']"
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-has-permi="['carArea:edit:monthcard']"
               >修改</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['monthCard:monthCard:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-has-permi="['monthCard:monthCard:remove']"
               >删除</el-button
             >
           </el-col> -->
@@ -79,8 +79,8 @@
         <el-table-column label="备注" show-overflow-tooltip align="center" prop="remark"></el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['monthCard:monthCard:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['monthCard:monthCard:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['monthCard:monthCard:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['monthCard:monthCard:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -138,7 +138,7 @@
 </template>
 
 <script setup name="MonthCard" lang="ts">
-import { listMonthCard, getMonthCard, delMonthCard, addMonthCard, updateMonthCard } from '@/api/system/MonthCard/index';
+import { listMonthCard, delMonthCard, addMonthCard, updateMonthCard } from '@/api/system/MonthCard/index';
 import { MonthCardVO, MonthCardQuery, MonthCardForm } from '@/api/system/MonthCard/type';
 import { checkPermi } from '@/utils/permission';
 import { diffDays } from '@/utils/time';
diff --git a/src/views/system/NoticePc/addNoticePc.vue b/src/views/system/NoticePc/addNoticePc.vue
index 6ec0b18..56a401f 100644
--- a/src/views/system/NoticePc/addNoticePc.vue
+++ b/src/views/system/NoticePc/addNoticePc.vue
@@ -65,9 +65,10 @@
   </div>
 </template>
 <script setup lang="ts">
+import editor from '@/components/Editor/index.vue';
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { addNotice, getNotice } from '@/api/system/NoticePc/index';
+import { addNotice, getNotice } from '@/api/system/NoticePc';
 import { updateNotice } from '@/api/system/NoticePc';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_noticepc_level } = toRefs<any>(proxy?.useDict('com_noticepc_level'));
diff --git a/src/views/system/NoticePc/index.vue b/src/views/system/NoticePc/index.vue
index 8a87e18..53298c3 100644
--- a/src/views/system/NoticePc/index.vue
+++ b/src/views/system/NoticePc/index.vue
@@ -21,15 +21,15 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['repair:add:noticepc']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['repair:add:noticepc']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['repair:edit:noticepc']"
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-has-permi="['repair:edit:noticepc']"
               >修改</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['notice:notice:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-has-permi="['notice:notice:remove']"
               >删除</el-button
             >
           </el-col> -->
@@ -70,8 +70,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="220" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['notice:notice:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['notice:notice:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['notice:notice:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['notice:notice:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -82,7 +82,7 @@
 </template>
 
 <script setup name="Notice" lang="ts">
-import { listNotice, getNotice, delNotice, addNotice, updateNotice } from '@/api/system/NoticePc/index';
+import { listNotice, delNotice } from '@/api/system/NoticePc/index';
 import { NoticeVO, NoticeQuery, NoticeForm } from '@/api/system/NoticePc/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/Notification/index.vue b/src/views/system/Notification/index.vue
index 097624c..4fad0a4 100644
--- a/src/views/system/Notification/index.vue
+++ b/src/views/system/Notification/index.vue
@@ -3,7 +3,7 @@
     <Pageheader></Pageheader>
     <div class="NotificationBody">
       <ul class="lefttabs">
-        <div style="height: 50px"></div>
+        <li style="height: 50px"></li>
         <li
           :class="{
             active: activeTabs === 1
diff --git a/src/views/system/ParkingCost/index.vue b/src/views/system/ParkingCost/index.vue
index 9cc7ff0..7d334ac 100644
--- a/src/views/system/ParkingCost/index.vue
+++ b/src/views/system/ParkingCost/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <pageheader title="停车缴费管理"></pageheader>
+    <pageHeader title="停车缴费管理"></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -23,19 +23,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['carArea:add:parkingcost']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['carArea:edit:parkingcost']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['parkingCost:parkingCost:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -83,21 +70,22 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['parkingCost:parkingCost:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['parkingCost:parkingCost:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['parkingCost:parkingCost:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['parkingCost:parkingCost:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <Pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
 </template>
 
 <script setup name="ParkingCost" lang="ts">
-import { listArea } from '@/api/system/carArea';
-import { listParking } from '@/api/system/parking';
-import { listParkingCost, getParkingCost, delParkingCost, addParkingCost, updateParkingCost } from '@/api/system/ParkingCost';
+import Pagination from '@/components/Pagination/index.vue';
+import pageHeader from '@/components/Pageheader/index.vue';
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import { listParkingCost, delParkingCost } from '@/api/system/ParkingCost';
 import { ParkingCostVO, ParkingCostQuery, ParkingCostForm } from '@/api/system/ParkingCost/type';
 import { checkPermi } from '@/utils/permission';
 import { formatTimeDiff } from '@/utils/time';
diff --git a/src/views/system/Questionnaire/QuestionnaireView.vue b/src/views/system/Questionnaire/QuestionnaireView.vue
index 2883e5e..1eab073 100644
--- a/src/views/system/Questionnaire/QuestionnaireView.vue
+++ b/src/views/system/Questionnaire/QuestionnaireView.vue
@@ -115,8 +115,7 @@ init();
 .container_box {
   background-color: white;
   font-size: 16px;
-  padding: 20px;
-  padding-bottom: 60px;
+  padding: 20px 20px 60px;
 }
 .contentBox {
   width: 1200px;
diff --git a/src/views/system/Questionnaire/addQuestionnaire.vue b/src/views/system/Questionnaire/addQuestionnaire.vue
index 6c1d692..9d4d6ca 100644
--- a/src/views/system/Questionnaire/addQuestionnaire.vue
+++ b/src/views/system/Questionnaire/addQuestionnaire.vue
@@ -64,8 +64,7 @@ import Holder from '@/components/Holder/index.vue';
 import QuestionnaireEdit from './components/QuestionnaireEdit.vue';
 
 import PageHeader from '@/components/Pageheader/index.vue';
-import { Delete, DocumentAdd } from '@element-plus/icons-vue';
-import { QuestionComponentnaireForm, QuestionnaireForm, QuestionnaireVO } from '@/api/system/Questionnaire/type';
+import { QuestionComponentnaireForm } from '@/api/system/Questionnaire/type';
 import { addQuestionnaire, getQuestionnaire, updateQuestionnaire } from '@/api/system/Questionnaire';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -74,7 +73,6 @@ const { com_questionnaire_scope } = toRefs<any>(proxy?.useDict('com_questionnair
 const router = useRouter();
 const route = useRoute();
 
-import { useHouseStore } from '@/store/modules/house';
 import { listResident } from '@/api/system/resident';
 
 const form = ref({
diff --git a/src/views/system/Questionnaire/components/QuestionnaireEdit.vue b/src/views/system/Questionnaire/components/QuestionnaireEdit.vue
index 39bca3a..401b475 100644
--- a/src/views/system/Questionnaire/components/QuestionnaireEdit.vue
+++ b/src/views/system/Questionnaire/components/QuestionnaireEdit.vue
@@ -103,7 +103,7 @@
 
 <script setup lang="ts" name="QuestionnaireEdit">
 import draggable from 'vuedraggable';
-import { Plus, Delete, Rank, Tickets, Document, Edit } from '@element-plus/icons-vue';
+import { Delete, Rank, Tickets, Document, Edit } from '@element-plus/icons-vue';
 import { ComponentItem, QuestionComponentItem, QuestionComponentnaireForm } from '@/api/system/Questionnaire/type';
 import { ElMessage } from 'element-plus'; // 👈 补充引入
 // ==================== Props & Emit ====================
diff --git a/src/views/system/Questionnaire/index.vue b/src/views/system/Questionnaire/index.vue
index e4c01ea..abde33d 100644
--- a/src/views/system/Questionnaire/index.vue
+++ b/src/views/system/Questionnaire/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col h-full p-2">
-    <Pageheader></Pageheader>
+    <pageHeader></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -19,29 +19,9 @@
         </el-card>
       </div>
     </transition>
-    <!-- TODO 删除问题 -->
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['repair:add:questionnaire']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['repair:edit:questionnaire']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['questionnaire:questionnaire:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -72,20 +52,24 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template #default="scope">
-            <el-button link type="primary" @click="handleView(scope.row)" v-hasPermi="['questionnaire:questionnaire:query']">查看</el-button>
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['questionnaire:questionnaire:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['questionnaire:questionnaire:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleView(scope.row)" v-has-permi="['questionnaire:questionnaire:query']">查看</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['questionnaire:questionnaire:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['questionnaire:questionnaire:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <Pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
 </template>
 
 <script setup name="Questionnaire" lang="ts">
-import { listQuestionnaire, getQuestionnaire, delQuestionnaire, addQuestionnaire, updateQuestionnaire } from '@/api/system/Questionnaire/index';
+import Pagination from '@/components/Pagination/index.vue';
+import pageHeader from '@/components/Pageheader/index.vue';
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
+import { listQuestionnaire, delQuestionnaire, addQuestionnaire, updateQuestionnaire } from '@/api/system/Questionnaire';
 import { QuestionnaireVO, QuestionnaireQuery, QuestionnaireForm } from '@/api/system/Questionnaire/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/Repair/addRepair.vue b/src/views/system/Repair/addRepair.vue
index 0b7c9d5..c228e5c 100644
--- a/src/views/system/Repair/addRepair.vue
+++ b/src/views/system/Repair/addRepair.vue
@@ -106,13 +106,14 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { convertBuildingToTree, hasFormData } from '@/utils/house';
+import { hasFormData } from '@/utils/house';
 import Holder from '@/components/Holder/index.vue';
 import { UploadProps, UploadUserFile } from 'element-plus';
 import { addRepair, getRepair, updateRepair, uploadRepairImages } from '@/api/system/Repair';
 import { gettreelistRepairProject } from '@/api/system/RepairProject';
 import { useHouseStore } from '@/store/modules/house';
 import { validator } from '@/utils/Reg';
+import { Plus } from '@element-plus/icons-vue';
 
 const houseStore = useHouseStore();
 const { treedata } = storeToRefs(houseStore);
diff --git a/src/views/system/Repair/index.vue b/src/views/system/Repair/index.vue
index 6451bc1..0db21eb 100644
--- a/src/views/system/Repair/index.vue
+++ b/src/views/system/Repair/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="h-full flex flex-col p-2">
-    <Pageheader title="报修管理"></Pageheader>
+    <pageHeader title="报修管理"></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -32,19 +32,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['repair:add:repair']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['repair:edit:repair']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['repair:repair:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -78,11 +65,11 @@
 
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleShare(scope.row)" v-hasPermi="['repair:repair:query']">{{
+            <el-button link type="primary" @click="handleShare(scope.row)" v-has-permi="['repair:repair:query']">{{
               scope.row.problemStatus === '0' ? '分配' : '详情'
             }}</el-button>
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['repair:repair:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['repair:repair:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['repair:repair:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['repair:repair:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -93,7 +80,11 @@
 </template>
 
 <script setup name="Repair" lang="ts">
-import { listRepair, delRepair } from '@/api/system/Repair/index';
+import Pagination from '@/components/Pagination/index.vue';
+import pageHeader from '@/components/Pageheader/index.vue';
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
+import { listRepair, delRepair } from '@/api/system/Repair';
 import { RepairVO, RepairQuery, RepairForm } from '@/api/system/Repair/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/Repair/repairMain.vue b/src/views/system/Repair/repairMain.vue
index 97c7da6..1d1a07e 100644
--- a/src/views/system/Repair/repairMain.vue
+++ b/src/views/system/Repair/repairMain.vue
@@ -153,7 +153,7 @@ import repairUser from '@/components/Holder/repairUser.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { getRepair, updateRepair } from '@/api/system/Repair';
 import { RepairVO } from '@/api/system/Repair/type';
-import { getRepairProcess, listRepairProcess, updateRepairProcess } from '@/api/system/repairProcess';
+import { listRepairProcess, updateRepairProcess } from '@/api/system/repairProcess';
 import { splitImages } from '@/utils';
 
 const route = useRoute();
diff --git a/src/views/system/Repair/repairlist.vue b/src/views/system/Repair/repairlist.vue
index de35f35..9ab79cd 100644
--- a/src/views/system/Repair/repairlist.vue
+++ b/src/views/system/Repair/repairlist.vue
@@ -20,7 +20,7 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-button style="width: 100px" type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['repairProject:repairProject:add']"
+          <!-- <el-button style="width: 100px" type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['repairProject:repairProject:add']"
             >新增维修类</el-button
           >
           <el-button
@@ -29,7 +29,7 @@
             icon="Delete"
             :disabled="multiple"
             @click="handleDelete()"
-            v-hasPermi="['repairProject:repairProject:remove']"
+            v-has-permi="['repairProject:repairProject:remove']"
             >删除</el-button
           > -->
           <right-toolbar
@@ -37,7 +37,7 @@
             :disable-edit="single"
             :show-add="checkPermi(['repairProject:repairProject:add'])"
             :show-edit="false"
-            :show-delete="checkPermi(['repairProject:repairProject:remove'])"
+            :show-delete="false"
             @update:add="handleAdd"
             @update:edit="handleUpdate()"
             @update:delete="handleDelete()"
@@ -97,8 +97,8 @@
         </el-table-column>
         <el-table-column label="操作" width="350" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['repairProject:repairProject:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['repairProject:repairProject:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['repairProject:repairProject:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['repairProject:repairProject:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -146,14 +146,7 @@
 </template>
 
 <script setup name="RepairProject" lang="ts">
-import {
-  listRepairProject,
-  getRepairProject,
-  delRepairProject,
-  addRepairProject,
-  updateRepairProject,
-  gettreelistRepairProject
-} from '@/api/system/RepairProject/index';
+import { listRepairProject, delRepairProject, addRepairProject, updateRepairProject } from '@/api/system/RepairProject';
 import { RepairProjectVO, RepairProjectQuery, RepairProjectForm } from '@/api/system/RepairProject/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/Sdb/ChargeItem/index.vue b/src/views/system/Sdb/ChargeItem/index.vue
index 1c7f316..838f14d 100644
--- a/src/views/system/Sdb/ChargeItem/index.vue
+++ b/src/views/system/Sdb/ChargeItem/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col h-full p-2">
-    <pageheader></pageheader>
+    <pageHeader></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -81,8 +81,8 @@
         <el-table-column label="备注" show-overflow-tooltip align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['chargeItem:chargeItem:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['chargeItem:chargeItem:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['chargeItem:chargeItem:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['chargeItem:chargeItem:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -93,7 +93,10 @@
 </template>
 
 <script setup name="ChargeItem" lang="ts">
-import { listChargeItem, getChargeItem, delChargeItem, addChargeItem, updateChargeItem, changChargeItem } from '@/api/system/SdbChargeItem';
+import pageHeader from '@/components/Pageheader/index.vue';
+import Pagination from '@/components/Pagination/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
+import { listChargeItem, delChargeItem, updateChargeItem } from '@/api/system/SdbChargeItem';
 import { ChargeItemVO, ChargeItemQuery, ChargeItemForm } from '@/api/system/SdbChargeItem/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/Sdb/ChargeType/index.vue b/src/views/system/Sdb/ChargeType/index.vue
index aec1a15..c5379da 100644
--- a/src/views/system/Sdb/ChargeType/index.vue
+++ b/src/views/system/Sdb/ChargeType/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <pageheader></pageheader>
+    <PageHeader></PageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -20,25 +20,12 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['chargeType:chargeType:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['chargeType:chargeType:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['chargeType:chargeType:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
             :show-add="checkPermi(['chargeType:chargeType:add'])"
-            :show-edit="checkPermi(['chargeType:chargeType:edit'])"
-            :show-delete="checkPermi(['chargeType:chargeType:remove'])"
+            :show-edit="false"
+            :show-delete="false"
             @update:add="handleAdd"
             @update:edit="handleUpdate()"
             @update:delete="handleDelete()"
@@ -61,8 +48,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['chargeType:chargeType:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['chargeType:chargeType:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['chargeType:chargeType:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['chargeType:chargeType:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -87,8 +74,10 @@
 </template>
 
 <script setup name="ChargeType" lang="ts">
+import PageHeader from '@/components/Pageheader/index.vue';
+import pagination from '@/components/Pagination/index.vue';
 import { listChargeType, getChargeType, delChargeType, addChargeType, updateChargeType } from '@/api/system/ChargeType';
-import { ChargeTypeVO, ChargeTypeQuery, ChargeTypeForm, ChargeType2Query } from '@/api/system/ChargeType/type';
+import { ChargeTypeVO, ChargeTypeForm, ChargeType2Query } from '@/api/system/ChargeType/type';
 import { checkPermi } from '@/utils/permission';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/Sdb/ElectricityRecord/index.vue b/src/views/system/Sdb/ElectricityRecord/index.vue
index 312a435..d639877 100644
--- a/src/views/system/Sdb/ElectricityRecord/index.vue
+++ b/src/views/system/Sdb/ElectricityRecord/index.vue
@@ -38,7 +38,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['electricityRecord:electricityRecord:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['electricityRecord:electricityRecord:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -47,7 +47,7 @@
               icon="Edit"
               :disabled="single"
               @click="handleUpdate()"
-              v-hasPermi="['electricityRecord:electricityRecord:edit']"
+              v-has-permi="['electricityRecord:electricityRecord:edit']"
               >修改</el-button
             >
           </el-col>
@@ -58,12 +58,12 @@
               icon="Delete"
               :disabled="multiple"
               @click="handleDelete()"
-              v-hasPermi="['electricityRecord:electricityRecord:remove']"
+              v-has-permi="['electricityRecord:electricityRecord:remove']"
               >删除</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['electricityRecord:electricityRecord:export']"
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-has-permi="['electricityRecord:electricityRecord:export']"
               >导出</el-button
             >
           </el-col>
@@ -94,7 +94,7 @@
                 type="primary"
                 icon="Edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['electricityRecord:electricityRecord:edit']"
+                v-has-permi="['electricityRecord:electricityRecord:edit']"
               ></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
@@ -103,7 +103,7 @@
                 type="primary"
                 icon="Delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['electricityRecord:electricityRecord:remove']"
+                v-has-permi="['electricityRecord:electricityRecord:remove']"
               ></el-button>
             </el-tooltip>
           </template>
@@ -149,13 +149,14 @@
 </template>
 
 <script setup name="ElectricityRecord" lang="ts">
+import pagination from '@/components/Pagination/index.vue';
 import {
   listElectricityRecord,
   getElectricityRecord,
   delElectricityRecord,
   addElectricityRecord,
   updateElectricityRecord
-} from '@/api/system/SdbElectricityMeterReading/index';
+} from '@/api/system/SdbElectricityMeterReading';
 import { ElectricityRecordVO, ElectricityRecordQuery, ElectricityRecordForm } from '@/api/system/SdbElectricityMeterReading/type';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/Sdb/PayRecord/index.vue b/src/views/system/Sdb/PayRecord/index.vue
index d2d38bf..aebe552 100644
--- a/src/views/system/Sdb/PayRecord/index.vue
+++ b/src/views/system/Sdb/PayRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="h-full flex flex-col p-2">
-    <pageheader></pageheader>
+    <PageHeader></PageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -20,20 +20,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['payRecordList:payRecordList:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['payRecordList:payRecordList:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :show-edit="false"
@@ -79,8 +65,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['sdb:main:payrecord']">明细</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['payRecord:payRecord:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleMain(scope.row)" v-has-permi="['sdb:main:payrecord']">明细</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['payRecord:payRecord:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -166,8 +152,11 @@
 </template>
 
 <script setup name="PayRecord" lang="ts">
-import { listPayRecord, getPayRecord, delPayRecord, addPayRecord, updatePayRecord } from '@/api/system/SdbPayRecord';
-import { PayRecordVO, PayRecordQuery, PayRecordForm } from '@/api/system/SdbPayRecord/type';
+import PageHeader from '@/components/Pageheader/index.vue';
+import pagination from '@/components/Pagination/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
+import { listPayRecord, delPayRecord } from '@/api/system/SdbPayRecord';
+import { PayRecordVO, PayRecordQuery } from '@/api/system/SdbPayRecord/type';
 import { PayRecordListForm } from '@/api/system/SdbPayRecordMain/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/Sdb/PayRecord/main.vue b/src/views/system/Sdb/PayRecord/main.vue
index 61c9fb5..5c14baa 100644
--- a/src/views/system/Sdb/PayRecord/main.vue
+++ b/src/views/system/Sdb/PayRecord/main.vue
@@ -142,7 +142,7 @@
 </template>
 
 <script setup name="PayRecordList" lang="ts">
-import { listPayRecordList, getPayRecordList, delPayRecordList, addPayRecordList, updatePayRecordList } from '@/api/system/SdbPayRecordMain/index';
+import { listPayRecordList, getPayRecordList, addPayRecordList, updatePayRecordList } from '@/api/system/SdbPayRecordMain/index';
 import { PayRecordListVO, PayRecordListQuery, PayRecordListForm } from '@/api/system/SdbPayRecordMain/type';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/Sdb/SdbBill/add.vue b/src/views/system/Sdb/SdbBill/add.vue
index ef85435..5997c9c 100644
--- a/src/views/system/Sdb/SdbBill/add.vue
+++ b/src/views/system/Sdb/SdbBill/add.vue
@@ -131,7 +131,7 @@ import CarUser from '@/components/Holder/CarUser.vue';
 
 import PageHeader from '@/components/Pageheader/index.vue';
 import { listChargeItem } from '@/api/system/SdbChargeItem';
-import { getBill, updateBill, addBill, BillHouse, listBillHouse, queryResidentList_holder } from '@/api/system/SdbBill';
+import { getBill, updateBill, addBill } from '@/api/system/SdbBill';
 import type { DatePickerType } from 'element-plus';
 import { formatDate2 } from '@/utils';
 
diff --git a/src/views/system/Sdb/SdbBill/index.vue b/src/views/system/Sdb/SdbBill/index.vue
index 1d0be9d..6e41155 100644
--- a/src/views/system/Sdb/SdbBill/index.vue
+++ b/src/views/system/Sdb/SdbBill/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <pageheader></pageheader>
+    <PageHeader></PageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -33,10 +33,10 @@
         <el-table-column label="收费范围" align="center" prop="chargeScope" width="100">
           <template #default="scope">
             <template v-if="ShowHouselist.includes(scope.row.chargeTypeId)">
-              <dict-tag :options="com_bill_charge_scope_house" :value="scope.row.chargeScope"></dict-tag>
+              <DictTag :options="com_bill_charge_scope_house" :value="scope.row.chargeScope"></DictTag>
             </template>
             <template v-else>
-              <dict-tag :options="com_questionnaire_scope" :value="scope.row.chargeScope"></dict-tag>
+              <DictTag :options="com_questionnaire_scope" :value="scope.row.chargeScope"></DictTag>
             </template>
           </template>
         </el-table-column>
@@ -51,15 +51,15 @@
           <template #default="scope">
             <div class="flex justify-center" v-if="scope.row.unit">
               <span>{{ scope.row.fixedPrice }}</span> /
-              <dict-tag :options="com_charge_item_unit" :value="scope.row.unit"></dict-tag>
+              <DictTag :options="com_charge_item_unit" :value="scope.row.unit"></DictTag>
             </div>
             <span v-else>---</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="120" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['bill:bill:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['bill:bill:query']">详情</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['bill:bill:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleMain(scope.row)" v-has-permi="['bill:bill:query']">详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -69,7 +69,10 @@
 </template>
 
 <script setup name="Bill" lang="ts">
-import { listBill, getBill, delBill, addBill, updateBill } from '@/api/system/SdbBill/index';
+import PageHeader from '@/components/Pageheader/index.vue';
+import pagination from '@/components/Pagination/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
+import { listBill } from '@/api/system/SdbBill';
 import { BillVO, BillQuery, BillForm } from '@/api/system/SdbBill/type';
 import { listChargeItem } from '@/api/system/SdbChargeItem';
 import { checkPermi } from '@/utils/permission';
@@ -164,7 +167,7 @@ const handleAdd = () => {
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: BillVO) => {
+const handleUpdate = (row?: BillVO) => {
   router.push({
     path: '/sdb/editSdbbill',
     query: {
@@ -182,7 +185,6 @@ function handleMain(row) {
   });
 }
 
-
 onMounted(() => {
   getList();
 });
diff --git a/src/views/system/Sdb/SdbBill/main.vue b/src/views/system/Sdb/SdbBill/main.vue
index 7ff499e..ccb4a6f 100644
--- a/src/views/system/Sdb/SdbBill/main.vue
+++ b/src/views/system/Sdb/SdbBill/main.vue
@@ -59,13 +59,11 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import Holder from '@/components/Holder/index.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { listChargeItem } from '@/api/system/SdbChargeItem';
-import { getBill, updateBill, addBill, listBillHouse } from '@/api/system/SdbBill';
+import { getBill, listBillHouse } from '@/api/system/SdbBill';
 import type { DatePickerType } from 'element-plus';
 import { formatDate, formatDate2 } from '@/utils';
-import { Delete } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_questionnaire_scope } = toRefs<any>(proxy?.useDict('com_questionnaire_scope'));
diff --git a/src/views/system/Sdb/SdbCashier/cashier.vue b/src/views/system/Sdb/SdbCashier/cashier.vue
index 823b531..b115e1d 100644
--- a/src/views/system/Sdb/SdbCashier/cashier.vue
+++ b/src/views/system/Sdb/SdbCashier/cashier.vue
@@ -108,6 +108,8 @@
 </template>
 
 <script setup lang="ts">
+import DictTag from '@/components/DictTag/index.vue';
+import pagination from '@/components/Pagination/index.vue';
 import { ref } from 'vue';
 import { billlistType, billQuery, billEdit } from '@/api/system/SdbCashier';
 import { moneyAdd } from '@/utils/money';
diff --git a/src/views/system/Sdb/SdbCashier/history.vue b/src/views/system/Sdb/SdbCashier/history.vue
index 8068d23..990cb2e 100644
--- a/src/views/system/Sdb/SdbCashier/history.vue
+++ b/src/views/system/Sdb/SdbCashier/history.vue
@@ -114,6 +114,8 @@
 </template>
 
 <script setup lang="ts">
+import DictTag from '@/components/DictTag/index.vue';
+import pagination from '@/components/Pagination/index.vue';
 import { ref } from 'vue';
 import { billlistType, billPrint, BillPrintType, billQuery } from '@/api/system/SdbCashier';
 import { printTicketDiv } from '@/utils/print';
diff --git a/src/views/system/Sdb/SdbCashier/index.vue b/src/views/system/Sdb/SdbCashier/index.vue
index eeb2cb2..628fa6c 100644
--- a/src/views/system/Sdb/SdbCashier/index.vue
+++ b/src/views/system/Sdb/SdbCashier/index.vue
@@ -114,10 +114,10 @@
         <el-table-column label="缴费时间" align="center" prop="" />
         <el-table-column label="操作" width="220" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" v-if="scope.row.payStatus === '0'" @click="handleIncome(scope.row)" v-hasPermi="['bill:bill:edit']"
+            <el-button link type="primary" v-if="scope.row.payStatus === '0'" @click="handleIncome(scope.row)" v-has-permi="['bill:bill:edit']"
               >收费</el-button
             >
-            <el-button link type="primary" v-if="scope.row.payStatus === '1'" @click="printPIaoJuByOnly(scope.row)" v-hasPermi="['bill:bill:query']"
+            <el-button link type="primary" v-if="scope.row.payStatus === '1'" @click="printPIaoJuByOnly(scope.row)" v-has-permi="['bill:bill:query']"
               >打印票据</el-button
             >
           </template>
diff --git a/src/views/system/Sdb/SdbElectricityDevice/addSdbElectricityDevice.vue b/src/views/system/Sdb/SdbElectricityDevice/addSdbElectricityDevice.vue
index b6df1d6..9f5cbf0 100644
--- a/src/views/system/Sdb/SdbElectricityDevice/addSdbElectricityDevice.vue
+++ b/src/views/system/Sdb/SdbElectricityDevice/addSdbElectricityDevice.vue
@@ -76,8 +76,7 @@ function routeback() {
   background-color: white;
   .bodybox {
     width: 600px;
-    margin: 0 auto;
-    margin-top: 20px;
+    margin: 20px auto 0;
   }
   .week-items {
     width: 90px;
diff --git a/src/views/system/Sdb/SdbElectricityDevice/index.vue b/src/views/system/Sdb/SdbElectricityDevice/index.vue
index 1ce501c..4555271 100644
--- a/src/views/system/Sdb/SdbElectricityDevice/index.vue
+++ b/src/views/system/Sdb/SdbElectricityDevice/index.vue
@@ -36,7 +36,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleMarkqrcode" v-hasPermi="['equipment:addqrcode:electricitydevice']"
+            <el-button type="primary" plain icon="Plus" @click="handleMarkqrcode" v-has-permi="['equipment:addqrcode:electricitydevice']"
               >批量生成条形码</el-button
             >
           </el-col>
@@ -56,7 +56,7 @@
                 <span>批量下载条形码</span>
               </el-dropdown-item>
               <!-- </el-dropdown-menu> -->
-              <!-- <el-dropdown-item v-hasPermi="['equipment:addqrcode:electricitydevice']">
+              <!-- <el-dropdown-item v-has-permi="['equipment:addqrcode:electricitydevice']">
                 <div @click="handleMarkqrcode">批量更新固件</div>
               </el-dropdown-item> -->
             </template>
@@ -112,7 +112,7 @@
             <span>{{ scope.row.electricityRecord ? scope.row.electricityRecord.readTime : '--' }}</span>
           </template>
         </el-table-column>
-        <!-- <el-table-column width="150" label="启停" align="center" prop="deleted" v-hasPermi="['equipment:isUse:electricitydevice']">
+        <!-- <el-table-column width="150" label="启停" align="center" prop="deleted" v-has-permi="['equipment:isUse:electricitydevice']">
           <template #default="scope">
             <el-switch
               @change="(val: string) => handleChangeWater(val, scope.row)"
@@ -127,25 +127,25 @@
         <el-table-column min-width="120" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <div class="actions">
-              <el-button link type="primary" @click="handleRecode(scope.row)" v-hasPermi="['equipment:view:electricitydevice']">充值记录</el-button>
-              <el-button link type="primary" @click="handleQrCode(scope.row)" v-hasPermi="['equipment:addqrcode:electricitydevice']"
+              <el-button link type="primary" @click="handleRecode(scope.row)" v-has-permi="['equipment:view:electricitydevice']">充值记录</el-button>
+              <el-button link type="primary" @click="handleQrCode(scope.row)" v-has-permi="['equipment:addqrcode:electricitydevice']"
                 >生成条码</el-button
               >
-              <el-button link type="primary" @click="handleOpenDialog('usedWater', scope.row)" v-hasPermi="['equipment:useWater:electricitydevice']"
+              <el-button link type="primary" @click="handleOpenDialog('usedWater', scope.row)" v-has-permi="['equipment:useWater:electricitydevice']"
                 >用电量</el-button
               >
               <!-- <el-button
                 link
                 type="primary"
                 @click="handleOpenDialog('Upload', scope.row)"
-                v-hasPermi="['equipment:updatehardware:electricitydevice']"
+                v-has-permi="['equipment:updatehardware:electricitydevice']"
                 >更新固件</el-button
               > -->
               <el-button
                 link
                 type="primary"
                 @click="handleOpenDialog('UpdateHouse', scope.row)"
-                v-hasPermi="['equipment:edithouse:electricitydevice']"
+                v-has-permi="['equipment:edithouse:electricitydevice']"
                 >绑定房屋</el-button
               >
               <!-- <el-dropdown style="vertical-align: text-top">
@@ -157,13 +157,13 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item>
-                        <div @click="handleOpenDialog('usedWater', scope.row)" v-hasPermi="['equipment:used:electricitydevice']">用电量</div>
+                        <div @click="handleOpenDialog('usedWater', scope.row)" v-has-permi="['equipment:used:electricitydevice']">用电量</div>
                       </el-dropdown-item>
                       <el-dropdown-item>
-                        <div @click="handleOpenDialog('Upload', scope.row)" v-hasPermi="['equipment:updatehardware:electricitydevice']">更新固件</div>
+                        <div @click="handleOpenDialog('Upload', scope.row)" v-has-permi="['equipment:updatehardware:electricitydevice']">更新固件</div>
                       </el-dropdown-item>
                       <el-dropdown-item>
-                        <div @click="handleOpenDialog('UpdateHouse', scope.row)" v-hasPermi="['equipment:edithouse:electricitydevice']">修改</div>
+                        <div @click="handleOpenDialog('UpdateHouse', scope.row)" v-has-permi="['equipment:edithouse:electricitydevice']">修改</div>
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
@@ -267,7 +267,7 @@ import { useHouseStore } from '@/store/modules/house';
 import { useUserStore } from '@/store/modules/user';
 import { checkPermi } from '@/utils/permission';
 import { Upload } from '@element-plus/icons-vue';
-import { CascaderValue, tourEmits, UploadProps, UploadRawFile } from 'element-plus';
+import { CascaderValue, UploadProps, UploadRawFile } from 'element-plus';
 import { exportImagesToZip } from '@/utils/exportZip';
 
 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/electricityDevice/upload';
diff --git a/src/views/system/Sdb/SdbElectricityDevice/index3.vue b/src/views/system/Sdb/SdbElectricityDevice/index3.vue
index d692c63..d8a0a9b 100644
--- a/src/views/system/Sdb/SdbElectricityDevice/index3.vue
+++ b/src/views/system/Sdb/SdbElectricityDevice/index3.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <Pageheader title="电表管理"></Pageheader>
+    <pageHeader title="电表管理"></pageHeader>
     <div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中，敬请期待...</div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import pageHeader from '@/components/Pageheader/index.vue';
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/system/Sdb/SdbRetainer/index.vue b/src/views/system/Sdb/SdbRetainer/index.vue
index d0b4b97..655f268 100644
--- a/src/views/system/Sdb/SdbRetainer/index.vue
+++ b/src/views/system/Sdb/SdbRetainer/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <Pageheader title="预存款管理"></Pageheader>
+    <pageHeader title="预存款管理"></pageHeader>
     <div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中，敬请期待...</div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import pageHeader from '@/components/Pageheader/index.vue';
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/system/Sdb/SdbWaterDevice/index.vue b/src/views/system/Sdb/SdbWaterDevice/index.vue
index 8eb83bf..d486f8b 100644
--- a/src/views/system/Sdb/SdbWaterDevice/index.vue
+++ b/src/views/system/Sdb/SdbWaterDevice/index.vue
@@ -44,7 +44,7 @@
               <el-dropdown-item @click="handleMarkQrcodeZip">
                 <span>批量下载条形码</span>
               </el-dropdown-item>
-              <!-- <el-dropdown-item v-hasPermi="['equipment:updatehardware:waterdevice']">
+              <!-- <el-dropdown-item v-has-permi="['equipment:updatehardware:waterdevice']">
                 <div @click="handleMarkUpload">批量更新固件</div>
               </el-dropdown-item> -->
             </template>
@@ -97,7 +97,7 @@
             <span>{{ scope.row.waterRecord ? scope.row.waterRecord.readTime : '---' }}</span>
           </template>
         </el-table-column>
-        <!-- <el-table-column width="150" label="启停" align="center" prop="deleted" v-hasPermi="['equipment:isUse:waterdevice']">
+        <!-- <el-table-column width="150" label="启停" align="center" prop="deleted" v-has-permi="['equipment:isUse:waterdevice']">
           <template #default="scope">
             <el-switch
               @change="(val: string) => handleChangeWater(val, scope.row)"
@@ -112,24 +112,24 @@
         <el-table-column label="操作" min-width="150" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <div class="actions">
-              <el-button link type="primary" @click="handleRecode(scope.row)" v-hasPermi="['equipment:view:waterdevice']">充值记录</el-button>
+              <el-button link type="primary" @click="handleRecode(scope.row)" v-has-permi="['equipment:view:waterdevice']">充值记录</el-button>
               <el-button
                 link
                 type="primary"
                 :loading="loadingQRCode.includes(scope.row.id)"
                 @click="handleQrCode(scope.row)"
-                v-hasPermi="['equipment:addqrcode:waterdevice']"
+                v-has-permi="['equipment:addqrcode:waterdevice']"
                 >生成条码</el-button
               >
-              <el-button link type="primary" @click="handleOpenDialog('usedWater', scope.row)" v-hasPermi="['equipment:useWater:waterdevice']"
+              <el-button link type="primary" @click="handleOpenDialog('usedWater', scope.row)" v-has-permi="['equipment:useWater:waterdevice']"
                 >用水量</el-button
               >
-              <el-button link type="primary" @click="handleOpenDialog('Upload', scope.row)" v-hasPermi="['equipment:updatehardware:waterdevice']"
+              <el-button link type="primary" @click="handleOpenDialog('Upload', scope.row)" v-has-permi="['equipment:updatehardware:waterdevice']"
                 >更新固件</el-button
               >
               <!-- <el-button link type="primary" @click="handleUpdate(scope.row.deviceCode)">最新抄表记录</el-button> -->
 
-              <el-button link type="primary" @click="handleOpenDialog('UpdateHouse', scope.row)" v-hasPermi="['equipment:edithouse:waterdevice']"
+              <el-button link type="primary" @click="handleOpenDialog('UpdateHouse', scope.row)" v-has-permi="['equipment:edithouse:waterdevice']"
                 >绑定房屋</el-button
               >
               <!-- <el-dropdown style="vertical-align: text-top">
@@ -141,13 +141,13 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item>
-                        <div @click="handleOpenDialog('usedWater', scope.row)" v-hasPermi="['equipment:useWater:waterdevice']">用水量</div>
+                        <div @click="handleOpenDialog('usedWater', scope.row)" v-has-permi="['equipment:useWater:waterdevice']">用水量</div>
                       </el-dropdown-item>
                       <el-dropdown-item>
-                        <div @click="handleOpenDialog('Upload', scope.row)" v-hasPermi="['equipment:updatehardware:waterdevice']">更新固件</div>
+                        <div @click="handleOpenDialog('Upload', scope.row)" v-has-permi="['equipment:updatehardware:waterdevice']">更新固件</div>
                       </el-dropdown-item>
                       <el-dropdown-item>
-                        <div @click="handleOpenDialog('UpdateHouse', scope.row)" v-hasPermi="['equipment:edithouse:waterdevice']">修改</div>
+                        <div @click="handleOpenDialog('UpdateHouse', scope.row)" v-has-permi="['equipment:edithouse:waterdevice']">修改</div>
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
diff --git a/src/views/system/Sdb/SdbWaterDevice/index2.vue b/src/views/system/Sdb/SdbWaterDevice/index2.vue
index a739ac1..194e8cd 100644
--- a/src/views/system/Sdb/SdbWaterDevice/index2.vue
+++ b/src/views/system/Sdb/SdbWaterDevice/index2.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <Pageheader title="水表管理"></Pageheader>
+    <pageHeader title="水表管理"></pageHeader>
     <div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中，敬请期待...</div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import pageHeader from '@/components/Pageheader/index.vue';
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/system/Sdb/WaterRecord/index.vue b/src/views/system/Sdb/WaterRecord/index.vue
index c0e56e8..75f95b0 100644
--- a/src/views/system/Sdb/WaterRecord/index.vue
+++ b/src/views/system/Sdb/WaterRecord/index.vue
@@ -26,20 +26,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['waterRecord:waterRecord:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['waterRecord:waterRecord:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['waterRecord:waterRecord:edit']"
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-has-permi="['waterRecord:waterRecord:edit']"
               >修改</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['waterRecord:waterRecord:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-has-permi="['waterRecord:waterRecord:remove']"
               >删除</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['waterRecord:waterRecord:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-has-permi="['waterRecord:waterRecord:export']">导出</el-button>
           </el-col>
           <right-toolbar></right-toolbar>
         </el-row>
@@ -62,7 +62,7 @@
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['waterRecord:waterRecord:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-has-permi="['waterRecord:waterRecord:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button
@@ -70,7 +70,7 @@
                 type="primary"
                 icon="Delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['waterRecord:waterRecord:remove']"
+                v-has-permi="['waterRecord:waterRecord:remove']"
               ></el-button>
             </el-tooltip>
           </template>
diff --git a/src/views/system/Sdb/statistics/electricity.vue b/src/views/system/Sdb/statistics/electricity.vue
index fe6af76..6b34ca5 100644
--- a/src/views/system/Sdb/statistics/electricity.vue
+++ b/src/views/system/Sdb/statistics/electricity.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col h-full p-2">
-    <pageheader></pageheader>
+    <pageHeader></pageHeader>
     <el-card class="flex-1 mt-10px" shadow="never">
       <template #header>
         <div class="flex justify-between items-center">
@@ -31,11 +31,11 @@
                 end-placeholder="结束日期"
               />
             </el-form-item>
-            <el-form-item label="" v-hasPermi="['electricity:topupRecord:list']">
+            <el-form-item label="" v-has-permi="['electricity:topupRecord:list']">
               <el-button type="primary" @click="getList">查询</el-button>
             </el-form-item>
           </el-form>
-          <el-button @click="handleExport" v-hasPermi="['electricity:topupRecord:export']" type="warning">导出统计</el-button>
+          <el-button @click="handleExport" v-has-permi="['electricity:topupRecord:export']" type="warning">导出统计</el-button>
         </div>
       </template>
       <el-table v-loading="loading" border :data="topupRecordList">
@@ -86,7 +86,9 @@
 </template>
 
 <script setup lang="ts">
-import { getElectricityTopupRecordByDate, type TopupRecordList } from '@/api/system/SdbTopupRecord/index';
+import pageHeader from '@/components/Pageheader/index.vue';
+import pagination from '@/components/Pagination/index.vue';
+import { getElectricityTopupRecordByDate, type TopupRecordList } from '@/api/system/SdbTopupRecord';
 import { checkPermi } from '@/utils/permission';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/system/Sdb/statistics/index.vue b/src/views/system/Sdb/statistics/index.vue
index 1e21c99..94e36b8 100644
--- a/src/views/system/Sdb/statistics/index.vue
+++ b/src/views/system/Sdb/statistics/index.vue
@@ -31,11 +31,11 @@
                 end-placeholder="结束日期"
               />
             </el-form-item>
-            <el-form-item label="" v-hasPermi="['water:topupRecord:list']">
+            <el-form-item label="" v-has-permi="['water:topupRecord:list']">
               <el-button type="primary" @click="getList">查询</el-button>
             </el-form-item>
           </el-form>
-          <el-button @click="handleExport" v-hasPermi="['water:topupRecord:export']" type="warning">导出统计</el-button>
+          <el-button @click="handleExport" v-has-permi="['water:topupRecord:export']" type="warning">导出统计</el-button>
         </div>
       </template>
       <el-table v-loading="loading" border :data="topupRecordList">
diff --git a/src/views/system/Visitor/index.vue b/src/views/system/Visitor/index.vue
index 753ebc7..9e874e8 100644
--- a/src/views/system/Visitor/index.vue
+++ b/src/views/system/Visitor/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <Pageheader title="访客信息"></Pageheader>
+    <PageHeader title="访客信息"></PageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -45,18 +45,21 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['visitor:visitor:query']">访客详情</el-button>
+            <el-button link type="primary" @click="handleMain(scope.row)" v-has-permi="['visitor:visitor:query']">访客详情</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <Pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
 </template>
 
 <script setup name="Visitor" lang="ts">
-import { listVisitor } from '@/api/system/Visitor/index';
+import Pagination from '@/components/Pagination/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
+import PageHeader from '@/components/Pageheader/index.vue';
+import { listVisitor } from '@/api/system/Visitor';
 import { VisitorVO, VisitorQuery, VisitorForm } from '@/api/system/Visitor/type';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -64,9 +67,7 @@ const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
 const { com_visitor_status } = toRefs<any>(proxy?.useDict('com_visitor_status'));
 const router = useRouter();
 
-// com_visitor_status
 const visitorList = ref<VisitorVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
@@ -74,7 +75,6 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const queryFormRef = ref<ElFormInstance>();
-const visitorFormRef = ref<ElFormInstance>();
 
 const initFormData: VisitorForm = {
   id: undefined,
@@ -113,7 +113,7 @@ const data = reactive<PageData<VisitorForm, VisitorQuery>>({
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams } = toRefs(data);
 
 /** 查询访客管理列表 */
 const getList = async () => {
@@ -144,7 +144,7 @@ const handleSelectionChange = (selection: VisitorVO[]) => {
 };
 
 /** 删除按钮操作 */
-const handleMain = async (row?: VisitorVO) => {
+const handleMain = (row?: VisitorVO) => {
   router.push({
     path: '/repair/visitorMain',
     query: {
diff --git a/src/views/system/carArea/addCarArea.vue b/src/views/system/carArea/addCarArea.vue
index e3cc17f..9507d55 100644
--- a/src/views/system/carArea/addCarArea.vue
+++ b/src/views/system/carArea/addCarArea.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="AddBuildingBox">
-    <PageHeader :title="parkingid ? '编辑区域信息' : '添加区域信息'"></PageHeader>
+    <PageHeader :title="parking ? '编辑区域信息' : '添加区域信息'"></PageHeader>
     <div class="AddBuildingBody">
       <div class="title">基本信息</div>
       <div class="addBuildingFormBody">
@@ -53,7 +53,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { addArea, getArea, updateArea } from '@/api/system/carArea/index';
+import { addArea, getArea, updateArea } from '@/api/system/carArea';
 
 const router = useRouter();
 const route = useRoute();
@@ -71,11 +71,11 @@ const rules = ref({
   areaName: [{ required: true, message: '请输入区域名称', trigger: 'blur' }],
   areaCode: [{ required: true, message: '请输入区域编号', trigger: 'blur' }]
 });
-const parkingid = ref(null);
+const parking = ref(null);
 
 if (route.query.id) {
-  parkingid.value = route.query.id;
-  getArea(parkingid.value).then((res) => {
+  parking.value = route.query.id;
+  getArea(parking.value).then((res) => {
     form.value = {
       ...form.value,
       ...res.data
@@ -88,7 +88,7 @@ if (route.query.id) {
 const submitForm = () => {
   formRef.value?.validate(async (valid: boolean) => {
     if (valid) {
-      if (parkingid.value) {
+      if (parking.value) {
         updateArea(form.value).then(() => {
           ElMessage.success('编辑成功');
           cancelForm();
diff --git a/src/views/system/carArea/index.vue b/src/views/system/carArea/index.vue
index c280cfc..965cad0 100644
--- a/src/views/system/carArea/index.vue
+++ b/src/views/system/carArea/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="p-2 flex w-full h-full flex-column">
-    <Pageheader title="区域管理"></Pageheader>
+    <pageHeader title="区域管理"></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -23,19 +23,6 @@
     <el-card shadow="never" class="flex-1">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['area:area:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['carArea:edit:carArea']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['area:area:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -62,8 +49,8 @@
         <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['area:area:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['area:area:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['area:area:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['area:area:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -74,15 +61,14 @@
 </template>
 
 <script setup name="Area" lang="ts">
-import Pageheader from '@/components/Pageheader/index.vue';
-import { listArea, getArea, delArea, addArea, updateArea } from '@/api/system/carArea/index';
+import pageHeader from '@/components/Pageheader/index.vue';
+import { listArea, delArea } from '@/api/system/carArea';
 import { AreaVO, AreaQuery, AreaForm } from '@/api/system/carArea/type';
 import { checkPermi } from '@/utils/permission';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const router = useRouter();
 const areaList = ref<AreaVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
@@ -121,7 +107,7 @@ const data = reactive<PageData<AreaForm, AreaQuery>>({
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams } = toRefs(data);
 
 /** 查询车位区域管理列表 */
 const getList = async () => {
@@ -163,7 +149,7 @@ const handleAdd = () => {
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: AreaVO) => {
+const handleUpdate = (row?: AreaVO) => {
   const _id = row ? row.id : ids.value[0];
   router.push({
     path: '/carArea/editCarArea',
diff --git a/src/views/system/cars/addCars.vue b/src/views/system/cars/addCars.vue
index 65f2ed7..d708340 100644
--- a/src/views/system/cars/addCars.vue
+++ b/src/views/system/cars/addCars.vue
@@ -66,7 +66,7 @@
                   :on-success="handleAvatarSuccess"
                   :before-upload="beforeAvatarUpload"
                 >
-                  <img v-if="form.carImageUrl" :src="form.carImageUrl" class="avatar" />
+                  <img alt="车辆照片" v-if="form.carImageUrl" :src="form.carImageUrl" class="avatar" />
                   <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
                   <template #tip>
                     <span>支持jpg, png等格式文件上传，文件大小不超过10MB，可上传多张 </span>
@@ -79,15 +79,15 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="持有人">
-                <AppUser :isMultiple="false" ref="HolderRef" @change="handleChange">
+                <AppUser returnable="*" :isMultiple="false" ref="HolderRef" @change="handleChange">
                   <template #default>
                     <div class="residentBox" @click="choiceResidentFun">
-                      <div class="defaultbox" v-if="form.residentId === ''">
+                      <div class="defaultbox" v-if="form.residentId === '' || form.userId === ''">
                         <span>请选择</span>
                         <el-icon><Search /></el-icon>
                       </div>
                       <div v-else class="overflow-auto overflow-hidden w-full text-ellipsis text-nowrap">
-                        <span>姓名：{{ form?.residentName }}</span>
+                        <span>姓名：{{ form.residentName && form.residentName.trim() !== '' ? form.residentName : form.userName }}</span>
                       </div>
                     </div>
                   </template>
@@ -120,13 +120,13 @@ import Holder from '@/components/Holder/index.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { listArea } from '@/api/system/carArea';
 import { listParking } from '@/api/system/parking';
-import { UploadFiles, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus';
-import { addCar, getCar, updateCar, uploadCar } from '@/api/system/cars';
+import { UploadFiles, UploadProps, UploadRawFile } from 'element-plus';
+import { addCar, getCar, updateCar } from '@/api/system/cars';
 import { useUserStore } from '@/store/modules/user';
 import AppUser from '@/components/Holder/appUser.vue';
+import { Plus } from '@element-plus/icons-vue';
 
 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/car/uploadImage';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const router = useRouter();
 const route = useRoute();
@@ -143,6 +143,8 @@ const form = ref({
   carModel: '', //车辆型号
   carColor: '', //车身颜色
   remark: '', //备注
+  userId: '',
+  userName: '',
   carImageUrl: '' //车辆图片url
 });
 
@@ -255,8 +257,8 @@ const cancelForm = () => {
 const holderInfo = ref(null);
 const HolderRef = ref<typeof Holder>(null);
 function choiceResidentFun() {
-  if (form.value.residentId) {
-    HolderRef.value.open([...form.value.residentId]);
+  if (form.value.userId && form.value.userId.trim() !== '') {
+    HolderRef.value.open([form.value.userId]);
   } else {
     HolderRef.value.open([]);
   }
diff --git a/src/views/system/cars/index.vue b/src/views/system/cars/index.vue
index 8b02815..bb2444e 100644
--- a/src/views/system/cars/index.vue
+++ b/src/views/system/cars/index.vue
@@ -26,15 +26,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['carArea:add:cars']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['carArea:edit:car']">编辑</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['car:car:remove']">删除</el-button>
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -54,14 +45,14 @@
         <el-table-column label="车辆品牌" width="155" align="center" prop="carBrand" />
         <el-table-column label="车辆型号" width="155" align="center" prop="carModel" />
         <el-table-column label="车身颜色" width="125" align="center" prop="carColor" />
-        <el-table-column label="持有人" width="155" align="center" prop="residentId">
-          <template #default="scope"> {{ getResidentName(scope.row.residentId) }} </template>
+        <el-table-column label="持有人" width="155" align="center" prop="userName">
+          <template #default="scope"> {{ scope.row.userName }} </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['car:car:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['car:car:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['car:car:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['car:car:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -73,7 +64,7 @@
 
 <script setup name="Car" lang="ts">
 import Pageheader from '@/components/Pageheader/index.vue';
-import { listCar, getCar, delCar, addCar, updateCar } from '@/api/system/cars/index';
+import { listCar, delCar } from '@/api/system/cars/index';
 import { CarVO, CarQuery, CarForm } from '@/api/system/cars/type';
 import { listResident } from '@/api/system/resident';
 import { checkPermi } from '@/utils/permission';
@@ -122,28 +113,18 @@ const data = reactive<PageData<CarForm, CarQuery>>({
     carBrand: undefined,
     carModel: undefined,
     carColor: undefined,
-    carImageUrl: undefined,
-    params: {}
+    carImageUrl: undefined
   },
   rules: {
     id: [{ required: true, message: '车辆管理表id不能为空', trigger: 'blur' }]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
-
-/** 持有人 */
-const ResidentList = ref([]);
-const getResidentName = (id: string) => {
-  const find = ResidentList.value.find((item) => item.id === id);
-  if (!find) return '--';
-  return find.name;
-};
+const { queryParams } = toRefs(data);
 
 /** 查询车辆管理列表 */
 const getList = async () => {
   loading.value = true;
-
   listCar(queryParams.value)
     .then((res) => {
       carList.value = res.rows;
@@ -152,9 +133,6 @@ const getList = async () => {
     .finally(() => {
       loading.value = false;
     });
-  const res1 = await listResident();
-  ResidentList.value = res1.rows;
-  loading.value = false;
 };
 
 /** 搜索按钮操作 */
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 90b3373..aec737a 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -27,20 +27,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:client:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button v-has-permi="['system:client:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:client:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
+            <el-button v-has-permi="['system:client:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
               修改
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:client:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['system:client:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:client:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-has-permi="['system:client:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -72,10 +72,10 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:client:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-has-permi="['system:client:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:client:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['system:client:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -145,6 +145,7 @@
 <script setup name="Client" lang="ts">
 import { listClient, getClient, delClient, addClient, updateClient, changeStatus } from '@/api/system/client';
 import { ClientVO, ClientQuery, ClientForm } from '@/api/system/client/types';
+import { QuestionFilled } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index ce1faad..5a5c202 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -38,23 +38,23 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:config:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button v-has-permi="['system:config:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:config:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
+            <el-button v-has-permi="['system:config:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
               修改
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:config:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['system:config:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:config:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-has-permi="['system:config:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:config:remove']" type="danger" plain @click="handleRefreshCache">刷新缓存</el-button>
+            <el-button v-has-permi="['system:config:remove']" type="danger" plain @click="handleRefreshCache">刷新缓存</el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -80,10 +80,10 @@
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:config:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-has-permi="['system:config:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:config:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['system:config:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 9e1b94b..c501432 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -28,7 +28,7 @@
       <template #header>
         <el-row :gutter="10">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增 </el-button>
+            <el-button v-has-permi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -62,13 +62,13 @@
         <el-table-column fixed="right" align="center" label="操作">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
+              <el-button v-has-permi="['system:dept:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
             </el-tooltip>
             <el-tooltip content="新增" placement="top">
-              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
+              <el-button v-has-permi="['system:dept:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
+              <el-button v-has-permi="['system:dept:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 18a43a0..63c3e2b 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -38,15 +38,15 @@
           </div>
 
           <div class="dict-actions">
-            <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleTypeAdd">新增</el-button>
-            <el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="typeSingle" @click="handleTypeUpdate()"
+            <el-button v-has-permi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleTypeAdd">新增</el-button>
+            <el-button v-has-permi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="typeSingle" @click="handleTypeUpdate()"
               >修改</el-button
             >
-            <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="typeMultiple" @click="handleTypeDelete()"
+            <el-button v-has-permi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="typeMultiple" @click="handleTypeDelete()"
               >删除</el-button
             >
-            <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleTypeExport">导出</el-button>
-            <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
+            <el-button v-has-permi="['system:dict:export']" type="warning" plain icon="Download" @click="handleTypeExport">导出</el-button>
+            <el-button v-has-permi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
           </div>
 
           <div class="dict-table-wrap">
@@ -76,10 +76,16 @@
               <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
                 <template #default="scope">
                   <el-tooltip content="修改" placement="top">
-                    <el-button v-hasPermi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleTypeUpdate(scope.row)"></el-button>
+                    <el-button v-has-permi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleTypeUpdate(scope.row)"></el-button>
                   </el-tooltip>
                   <el-tooltip content="删除" placement="top">
-                    <el-button v-hasPermi="['system:dict:remove']" link type="primary" icon="Delete" @click="handleTypeDelete(scope.row)"></el-button>
+                    <el-button
+                      v-has-permi="['system:dict:remove']"
+                      link
+                      type="primary"
+                      icon="Delete"
+                      @click="handleTypeDelete(scope.row)"
+                    ></el-button>
                   </el-tooltip>
                 </template>
               </el-table-column>
@@ -127,11 +133,11 @@
           </div>
 
           <div class="dict-actions">
-            <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" :disabled="!hasCurrentDict" @click="handleDataAdd"
+            <el-button v-has-permi="['system:dict:add']" type="primary" plain icon="Plus" :disabled="!hasCurrentDict" @click="handleDataAdd"
               >新增</el-button
             >
             <el-button
-              v-hasPermi="['system:dict:edit']"
+              v-has-permi="['system:dict:edit']"
               type="success"
               plain
               icon="Edit"
@@ -140,7 +146,7 @@
               >修改</el-button
             >
             <el-button
-              v-hasPermi="['system:dict:remove']"
+              v-has-permi="['system:dict:remove']"
               type="danger"
               plain
               icon="Delete"
@@ -148,7 +154,7 @@
               @click="handleDataDelete()"
               >删除</el-button
             >
-            <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" :disabled="!hasCurrentDict" @click="handleDataExport"
+            <el-button v-has-permi="['system:dict:export']" type="warning" plain icon="Download" :disabled="!hasCurrentDict" @click="handleDataExport"
               >导出</el-button
             >
           </div>
@@ -184,10 +190,16 @@
               <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
                 <template #default="scope">
                   <el-tooltip content="修改" placement="top">
-                    <el-button v-hasPermi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleDataUpdate(scope.row)"></el-button>
+                    <el-button v-has-permi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleDataUpdate(scope.row)"></el-button>
                   </el-tooltip>
                   <el-tooltip content="删除" placement="top">
-                    <el-button v-hasPermi="['system:dict:remove']" link type="primary" icon="Delete" @click="handleDataDelete(scope.row)"></el-button>
+                    <el-button
+                      v-has-permi="['system:dict:remove']"
+                      link
+                      type="primary"
+                      icon="Delete"
+                      @click="handleDataDelete(scope.row)"
+                    ></el-button>
                   </el-tooltip>
                 </template>
               </el-table-column>
@@ -613,6 +625,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .dict-grid {
   row-gap: 16px;
+  margin-top: 20px;
 }
 
 .dict-card__header {
diff --git a/src/views/system/equipment/Archive/add.vue b/src/views/system/equipment/Archive/add.vue
index 5d87d28..6de7e3b 100644
--- a/src/views/system/equipment/Archive/add.vue
+++ b/src/views/system/equipment/Archive/add.vue
@@ -73,10 +73,9 @@
 import { ref } from 'vue';
 import repairUser from '@/components/Holder/repairUser.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { getMaterial, updateMaterial, addMaterial } from '@/api/system/Tmaterial';
 import { listDeviceCategory } from '@/api/system/equipment/Category';
 import { addDevice, getDevice, updateDevice } from '@/api/system/equipment/archive';
-import { Delete } from '@element-plus/icons-vue';
+import { Delete, Plus } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_equipment_archive_status } = toRefs<any>(proxy?.useDict('com_equipment_archive_status'));
diff --git a/src/views/system/equipment/Archive/index.vue b/src/views/system/equipment/Archive/index.vue
index f9f1351..cd11c4e 100644
--- a/src/views/system/equipment/Archive/index.vue
+++ b/src/views/system/equipment/Archive/index.vue
@@ -24,19 +24,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['equipment:add:archive']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['equipment:edit:archive']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:device:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -65,9 +52,9 @@
         <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['system:device:query']">查看详情</el-button>
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:device:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:device:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleMain(scope.row)" v-has-permi="['system:device:query']">查看详情</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:device:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:device:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -78,7 +65,7 @@
 </template>
 
 <script setup name="Device" lang="ts">
-import { listDevice, getDevice, delDevice, addDevice, updateDevice } from '@/api/system/equipment/archive';
+import { listDevice, delDevice, addDevice, updateDevice } from '@/api/system/equipment/archive';
 import { DeviceVO, DeviceQuery, DeviceForm } from '@/api/system/equipment/archive/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/equipment/Category/index.vue b/src/views/system/equipment/Category/index.vue
index 456ba05..6f82d64 100644
--- a/src/views/system/equipment/Category/index.vue
+++ b/src/views/system/equipment/Category/index.vue
@@ -38,15 +38,14 @@
         <el-table-column label="设备分类名称" align="center" prop="categoryName" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
-            <!-- TODO 设备状态开关 -->
             <el-switch :inactive-value="1" :active-value="0" v-model="scope.row.status"></el-switch>
           </template>
         </el-table-column>
         <el-table-column label="添加时间" align="center" prop="createTime" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:deviceCategory:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:deviceCategory:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:deviceCategory:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:deviceCategory:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -79,7 +78,7 @@
 </template>
 
 <script setup name="DeviceCategory" lang="ts">
-import { listDeviceCategory, getDeviceCategory, delDeviceCategory, addDeviceCategory, updateDeviceCategory } from '@/api/system/equipment/Category';
+import { listDeviceCategory, delDeviceCategory, addDeviceCategory, updateDeviceCategory } from '@/api/system/equipment/Category';
 import { DeviceCategoryVO, DeviceCategoryQuery, DeviceCategoryForm } from '@/api/system/equipment/Category/type';
 import { checkPermi } from '@/utils/permission';
 
@@ -213,17 +212,6 @@ const handleDelete = async (row?: DeviceCategoryVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'system/deviceCategory/export',
-    {
-      ...queryParams.value
-    },
-    `deviceCategory_${new Date().getTime()}.xlsx`
-  );
-};
-
 onMounted(() => {
   getList();
 });
diff --git a/src/views/system/equipment/Repair/add.vue b/src/views/system/equipment/Repair/add.vue
index c7c4753..7098aae 100644
--- a/src/views/system/equipment/Repair/add.vue
+++ b/src/views/system/equipment/Repair/add.vue
@@ -82,7 +82,7 @@ import { ref } from 'vue';
 import repairUser from '@/components/Holder/repairUser.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { listDeviceCategory } from '@/api/system/equipment/Category';
-import { Delete } from '@element-plus/icons-vue';
+import { Delete, Plus } from '@element-plus/icons-vue';
 import { addDeviceRepair, getDeviceRepair, updateDeviceRepair } from '@/api/system/equipment/Repair';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/equipment/Repair/index.vue b/src/views/system/equipment/Repair/index.vue
index 0a06ad3..8613682 100644
--- a/src/views/system/equipment/Repair/index.vue
+++ b/src/views/system/equipment/Repair/index.vue
@@ -23,19 +23,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['equipment:add:repair']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['equipment:edit:repair']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:deviceRepair:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -70,9 +57,9 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" width="160" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['system:deviceRepair:query']">详情</el-button>
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:deviceRepair:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:deviceRepair:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleMain(scope.row)" v-has-permi="['system:deviceRepair:query']">详情</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:deviceRepair:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:deviceRepair:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -83,7 +70,7 @@
 </template>
 
 <script setup name="DeviceRepair" lang="ts">
-import { listDeviceRepair, getDeviceRepair, delDeviceRepair, addDeviceRepair, updateDeviceRepair } from '@/api/system/equipment/Repair';
+import { listDeviceRepair, delDeviceRepair } from '@/api/system/equipment/Repair';
 import { DeviceRepairVO, DeviceRepairQuery, DeviceRepairForm } from '@/api/system/equipment/Repair/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/house/AddBuilding.vue b/src/views/system/house/AddBuilding.vue
index 48fe3ea..b136d35 100644
--- a/src/views/system/house/AddBuilding.vue
+++ b/src/views/system/house/AddBuilding.vue
@@ -147,7 +147,7 @@ function goBack() {
   cursor: pointer;
   font-size: 14px;
   &:hover {
-    box-shadow: 0px 2px 6px 0px rgba(26, 117, 255, 0.1);
+    box-shadow: 0 2px 6px 0 rgba(26, 117, 255, 0.1);
   }
 }
 .AddBuildingBox {
diff --git a/src/views/system/house/AddHouse.vue b/src/views/system/house/AddHouse.vue
index c88761f..faa544f 100644
--- a/src/views/system/house/AddHouse.vue
+++ b/src/views/system/house/AddHouse.vue
@@ -139,7 +139,7 @@ async function init() {
   if (route.query.id) {
     houseid.value = route.query.id;
   }
-  nextTick(() => geteditinfo());
+  await nextTick(() => geteditinfo());
 }
 init();
 
@@ -320,7 +320,7 @@ const cancelForm = () => {
         align-items: center;
         .el-input {
           width: 100px;
-          margin-right: 0px;
+          margin-right: 0;
         }
         span {
           margin: 0 20px;
diff --git a/src/views/system/house/HouseDetails.vue b/src/views/system/house/HouseDetails.vue
index 04a8716..1e07dab 100644
--- a/src/views/system/house/HouseDetails.vue
+++ b/src/views/system/house/HouseDetails.vue
@@ -4,7 +4,7 @@
     <div class="AddBuildingBody">
       <div class="title">
         <span>基本信息</span>
-        <el-button v-hasPermi="['system:house:edit']" type="primary" text v-if="HouseInfo.house" @click="editHouse">编辑</el-button>
+        <el-button v-has-permi="['system:house:edit']" type="primary" text v-if="HouseInfo.house" @click="editHouse">编辑</el-button>
       </div>
       <div class="addBuildingFormBody" v-if="HouseInfo.house">
         <div class="descriptionsbox">
@@ -52,7 +52,7 @@
     <div class="AddBuildingBody">
       <div class="title">
         <span>储藏室信息 </span>
-        <el-button v-hasPermi="['storeroom:storeroom:edit']" type="primary" text v-if="HouseInfo.storeroom" @click="editStoreRoom">编辑</el-button>
+        <el-button v-has-permi="['storeroom:storeroom:edit']" type="primary" text v-if="HouseInfo.storeroom" @click="editStoreRoom">编辑</el-button>
       </div>
       <div class="" v-if="HouseInfo.storeroom">
         <div class="addBuildingFormBody">
@@ -182,7 +182,7 @@
         <span>缴费账单</span>
       </div>
       <div>
-        <el-table :data="HouseInfo.billResidentList" align="center" style="width: 100%">
+        <el-table :data="HouseInfo.billResidentList"  style="width: 100%">
           <el-table-column prop="billCode" label="账单编号" />
           <el-table-column prop="billName" label="账单名称" />
           <el-table-column prop="chargeTypeName" label="账单项目" />
@@ -206,6 +206,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
+import DictTag from '@/components/DictTag/index.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { Data, getHouseMain } from '@/api/system/house';
 
diff --git a/src/views/system/house/components/building.vue b/src/views/system/house/components/building.vue
index 9239f7c..ad8a87f 100644
--- a/src/views/system/house/components/building.vue
+++ b/src/views/system/house/components/building.vue
@@ -3,7 +3,7 @@
     <div class="buildingheader flex align-center justify-between">
       <div>楼栋</div>
       <div>
-        <span class="pointer" @click="handleAddBuilding" v-hasPermi="['system:building:add']">+增加楼栋</span>
+        <span class="pointer" @click="handleAddBuilding" v-has-permi="['system:building:add']">+增加楼栋</span>
       </div>
     </div>
     <ul class="flex-1 overflow-y-auto overflow-x-hidden">
@@ -16,8 +16,8 @@
       >
         <div class="buildingname" :title="item.buildingName ?? ''" @click="switchBuilding(item.id ?? null)">{{ item.buildingName ?? '' }}</div>
         <div class="buildactions flex align-center justify-around">
-          <el-icon class="pointer hover-color-blue" @click="editBuilding(item.id)" v-hasPermi="['system:building:edit']"><Setting /></el-icon>
-          <el-icon class="pointer hover-color-red" @click="deleteBuilding(item.id)" v-hasPermi="['system:building:remove']"><Delete /></el-icon>
+          <el-icon class="pointer hover-color-blue" @click="editBuilding(item.id)" v-has-permi="['system:building:edit']"><Setting /></el-icon>
+          <el-icon class="pointer hover-color-red" @click="deleteBuilding(item.id)" v-has-permi="['system:building:remove']"><Delete /></el-icon>
         </div>
       </li>
     </ul>
@@ -27,6 +27,7 @@
 <script setup lang="ts">
 import { deleteBuildingApi } from '@/api/system/house';
 import { useHouseStore } from '@/store/modules/house';
+import { Delete, Setting } from '@element-plus/icons-vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const houseStore = useHouseStore();
@@ -106,8 +107,7 @@ $primary_color: #1978fe;
     .buildactions {
       width: 75px;
       font-size: 15px;
-      padding: 15px 0;
-      padding-right: 10px;
+      padding: 15px 10px 15px 0;
       color: rgba(153, 153, 153, 1);
     }
 
diff --git a/src/views/system/house/components/components/table.vue b/src/views/system/house/components/components/table.vue
index 4f9f98a..794ad1a 100644
--- a/src/views/system/house/components/components/table.vue
+++ b/src/views/system/house/components/components/table.vue
@@ -17,9 +17,9 @@
             <template #header>
               <div class="flex align-center justify-center">
                 <div class="houseName" :title="unit.unitNoName">{{ unit.unitNoName }}</div>
-                <el-button v-hasPermi="['unitNo:unitNo:edit']" link type="primary" icon="Edit" @click="HandleEditUnit(unit)"></el-button>
+                <el-button v-has-permi="['unitNo:unitNo:edit']" link type="primary" icon="Edit" @click="HandleEditUnit(unit)"></el-button>
                 <el-button
-                  v-hasPermi="['unitNo:unitNo:remove']"
+                  v-has-permi="['unitNo:unitNo:remove']"
                   link
                   type="danger"
                   icon="Delete"
diff --git a/src/views/system/house/components/unit.vue b/src/views/system/house/components/unit.vue
index c0afe4f..65badcf 100644
--- a/src/views/system/house/components/unit.vue
+++ b/src/views/system/house/components/unit.vue
@@ -28,10 +28,10 @@
         </span>
       </div>
       <div style="text-wrap: nowrap" class="rightActions flex flex-items-center">
-        <span class="mr-20px" @click="handleAddUnit" v-hasPermi="['unitNo:unitNo:add']">+添加单元</span>
-        <span class="mr-20px" @click="handleAddHouse" v-hasPermi="['system:house:add']">+增加房屋</span>
+        <span class="mr-20px" @click="handleAddUnit" v-has-permi="['unitNo:unitNo:add']">+添加单元</span>
+        <span class="mr-20px" @click="handleAddHouse" v-has-permi="['system:house:add']">+增加房屋</span>
         <!-- <span class="mr-20px">收费标准设置</span> -->
-        <span @click="deleteAllhouse" v-hasPermi="['system:house:remove']">批量删除房屋</span>
+        <span @click="deleteAllhouse" v-has-permi="['system:house:remove']">批量删除房屋</span>
         <el-select clearable @clear="handleClearUse" @change="handleChangeUse" v-model="houseUse" placeholder="筛选房屋类型" class="selectbox">
           <el-option v-for="item in houseUseTypeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
@@ -72,9 +72,8 @@
 import { deleteHouseApi } from '@/api/system/house';
 import TableUnit from './components/table.vue';
 import { useHouseStore } from '@/store/modules/house';
-import { listHouseUseType, listHouseUseType_add_house } from '@/api/system/houseUse';
+import { listHouseUseType_add_house } from '@/api/system/houseUse';
 import { addUnitNo, delUnitNo, getUnitNo, updateUnitNo } from '@/api/system/houseUnit';
-import { UnitNoVO } from '@/api/system/houseUnit/type';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -89,7 +88,7 @@ const houseUseTypeList = ref([]);
  * 获取房屋 类型
  */
 function init() {
-  listHouseUseType_add_house().then((res) => {
+  listHouseUseType_add_house({}).then((res) => {
     houseUseTypeList.value = res.data;
   });
 }
diff --git a/src/views/system/houseRental/addhouseResident.vue b/src/views/system/houseRental/addhouseResident.vue
index 8045773..6815f3c 100644
--- a/src/views/system/houseRental/addhouseResident.vue
+++ b/src/views/system/houseRental/addhouseResident.vue
@@ -178,7 +178,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { HouseRentalVO } from '@/api/system/houseRental/type';
 import { CascaderValue, UploadInstance, UploadProps, UploadUserFile } from 'element-plus';
 
 import { getHousePathById, hasFormData, splitStringUrl } from '@/utils/house';
@@ -186,6 +185,7 @@ import { addHouseRental, getHouseOwnUser, getHouseRental, updateHouseRental, upl
 import { validator } from '@/utils/Reg';
 import { useHouseStore } from '@/store/modules/house';
 import { listHouseFacilities } from '@/api/system/HouseFacilities';
+import { Plus } from '@element-plus/icons-vue';
 
 const houseStore = useHouseStore();
 
diff --git a/src/views/system/houseRental/houseMain.vue b/src/views/system/houseRental/houseMain.vue
index a039587..ad4236b 100644
--- a/src/views/system/houseRental/houseMain.vue
+++ b/src/views/system/houseRental/houseMain.vue
@@ -96,12 +96,12 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
+import DictTag from '@/components/DictTag/index.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { getHouseRental } from '@/api/system/houseRental';
 import { useHouseStore } from '@/store/modules/house';
 import { getHousePathById } from '@/utils/house';
 import { listHouseFacilities } from '@/api/system/HouseFacilities';
-import { splitImages } from '@/utils';
 
 const houseStore = useHouseStore();
 const { treedata } = storeToRefs(houseStore);
diff --git a/src/views/system/houseRental/index.vue b/src/views/system/houseRental/index.vue
index 2690e7d..92fd233 100644
--- a/src/views/system/houseRental/index.vue
+++ b/src/views/system/houseRental/index.vue
@@ -27,19 +27,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['houseRental:houseRental:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['houseRental:houseRental:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['houseRental:houseRental:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -76,9 +63,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['houseRental:houseRental:edit']">详情</el-button>
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['houseRental:houseRental:query']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['houseRental:houseRental:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleMain(scope.row)" v-has-permi="['houseRental:houseRental:edit']">详情</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['houseRental:houseRental:query']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['houseRental:houseRental:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/system/houseUnit/index.vue b/src/views/system/houseUnit/index.vue
index 93a0f54..2287327 100644
--- a/src/views/system/houseUnit/index.vue
+++ b/src/views/system/houseUnit/index.vue
@@ -26,22 +26,6 @@
     <el-card shadow="never" class="flex-1">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['unitNo:unitNo:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['unitNo:unitNo:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['unitNo:unitNo:remove']"
-              >删除</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['unitNo:unitNo:export']">导出</el-button>
-          </el-col> -->
           <right-toolbar :show-add="checkPermi(['unitNo:unitNo:add'])" @update:add="handleAdd">
             <template #dropdown>
               <el-dropdown-item :disabled="single" v-if="checkPermi(['unitNo:unitNo:edit'])" @click="handleUpdate">
@@ -66,10 +50,10 @@
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['unitNo:unitNo:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-has-permi="['unitNo:unitNo:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['unitNo:unitNo:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-has-permi="['unitNo:unitNo:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/system/houseUse/index.vue b/src/views/system/houseUse/index.vue
index 8809797..d121be5 100644
--- a/src/views/system/houseUse/index.vue
+++ b/src/views/system/houseUse/index.vue
@@ -20,18 +20,7 @@
     <el-card shadow="never" class="flex-1">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <right-toolbar :show-add="checkPermi(['houseUseType:houseUseType:add'])" @update:add="handleAdd">
-            <template #dropdown>
-              <el-dropdown-item :disabled="single" v-if="checkPermi(['houseUseType:houseUseType:edit'])" @click="handleUpdate">
-                <div>编辑</div>
-              </el-dropdown-item>
-              <el-dropdown-item :disabled="multiple" v-if="checkPermi(['houseUseType:houseUseType:delete'])" @click="handleDelete">
-                <div>批量删除</div>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="checkPermi(['houseUseType:houseUseType:export'])" @click="handleExport">
-                <div>导出</div>
-              </el-dropdown-item>
-            </template>
+          <right-toolbar :show-delete="false" :show-edit="false" :show-add="checkPermi(['houseUseType:houseUseType:add'])" @update:add="handleAdd">
           </right-toolbar>
         </el-row>
       </template>
@@ -41,8 +30,8 @@
         <el-table-column label="用途名称" align="center" prop="name" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['houseUseType:houseUseType:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['houseUseType:houseUseType:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['houseUseType:houseUseType:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['houseUseType:houseUseType:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/system/inspection/Item/addInspectionItem.vue b/src/views/system/inspection/Item/addInspectionItem.vue
index f2db317..413f033 100644
--- a/src/views/system/inspection/Item/addInspectionItem.vue
+++ b/src/views/system/inspection/Item/addInspectionItem.vue
@@ -24,7 +24,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { addMonthCard, getMonthCard, updateMonthCard } from '@/api/system/MonthCard';
 import { addItem, getItem, updateItem } from '@/api/system/InspectionItem';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/system/inspection/Item/index.vue b/src/views/system/inspection/Item/index.vue
index f315429..026667b 100644
--- a/src/views/system/inspection/Item/index.vue
+++ b/src/views/system/inspection/Item/index.vue
@@ -6,7 +6,6 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 </script>
 
diff --git a/src/views/system/inspection/Item/index2.vue b/src/views/system/inspection/Item/index2.vue
index 80d2b46..5cc0883 100644
--- a/src/views/system/inspection/Item/index2.vue
+++ b/src/views/system/inspection/Item/index2.vue
@@ -49,8 +49,8 @@
         </el-table-column>
         <el-table-column label="操作" width="300" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:item:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:item:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:item:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:item:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -61,7 +61,7 @@
 </template>
 
 <script setup name="Item" lang="ts">
-import { listItem, getItem, delItem, addItem, updateItem, updateItemStatus } from '@/api/system/InspectionItem/index';
+import { listItem, delItem, addItem, updateItem, updateItemStatus } from '@/api/system/InspectionItem/index';
 import { ItemVO, ItemQuery, ItemForm } from '@/api/system/InspectionItem/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/inspection/Overview/index.vue b/src/views/system/inspection/Overview/index.vue
index c864905..43a4482 100644
--- a/src/views/system/inspection/Overview/index.vue
+++ b/src/views/system/inspection/Overview/index.vue
@@ -92,7 +92,7 @@
 <script setup name="Item" lang="ts">
 import EchartsCompontent from '@/components/Echarts/index.vue';
 import { listItem, type Request } from '@/api/system/Inspection/index';
-import { getNaturalDayDiff, getLast7Days, getLastNDays, diffDays, formatDate } from '@/utils/time';
+import { getNaturalDayDiff, getLastNDays, diffDays, formatDate } from '@/utils/time';
 import { EChartsOption } from 'echarts';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -360,7 +360,7 @@ onMounted(() => {
     height: 112px;
     border-radius: 10px;
     background-color: rgba(255, 255, 255, 1);
-    box-shadow: 0px 2px 6px 0px rgba(26, 117, 255, 0.2);
+    box-shadow: 0 2px 6px 0 rgba(26, 117, 255, 0.2);
     border: 1px solid rgba(26, 117, 255, 0.2);
 
     .overviewitem_name {
@@ -392,12 +392,12 @@ onMounted(() => {
       border-left: none;
       cursor: pointer;
       &:first-of-type {
-        border-radius: 4px 0px 0px 0px;
+        border-radius: 4px 0 0 0;
         border-left: 1px solid rgba(220, 223, 230, 1);
       }
 
       &:last-of-type {
-        border-radius: 0px 4px 0px 0px;
+        border-radius: 0 4px 0 0;
       }
       &.active {
         color: #fff;
diff --git a/src/views/system/inspection/Plan/addInspectionPlan.vue b/src/views/system/inspection/Plan/addInspectionPlan.vue
index 28176fb..f1d8e6c 100644
--- a/src/views/system/inspection/Plan/addInspectionPlan.vue
+++ b/src/views/system/inspection/Plan/addInspectionPlan.vue
@@ -12,7 +12,7 @@
           </el-form-item>
 
           <el-form-item label="任务时间">
-            <div flex flex-wrap>
+            <div class="flex flex-wrap">
               <div
                 class="week-items"
                 @click="checkoutWeekFun(item)"
@@ -33,7 +33,7 @@
             <!-- <el-select v-model="form.taskTime" placeholder="选择任务时间段" style="width: 100%">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
             </el-select> -->
-            <div v-for="(item, index) in taskTime" :key="index" style="display: flex; align-items: center; margin-top: 10px">
+            <div v-for="(_, index) in taskTime" :key="index" style="display: flex; align-items: center; margin-top: 10px">
               <el-time-picker
                 v-model="taskTime[index]"
                 is-range
@@ -62,13 +62,13 @@
           </el-form-item>
           <el-form-item label="计划路线">
             <el-select @change="handlChangeMap" v-model="form.routeIds" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in planlist" :key="item.value" :label="item.routeName" :value="item.id" />
+              <el-option v-for="item in playlist" :key="item.value" :label="item.routeName" :value="item.id" />
             </el-select>
             <div class="mapbox" id="PlanMapBox"></div>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="submit">提交</el-button>
-            <el-button @click="routeback">返回</el-button>
+            <el-button @click="outback">返回</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -77,13 +77,13 @@
 </template>
 
 <script setup lang="ts">
-// TODO 巡检计划 添加
 import { listRoute } from '@/api/system/InspectionRoute';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { numToWeek } from '@/utils/time';
 import { ref } from 'vue';
 import AMapLoader from '@amap/amap-jsapi-loader';
 import { addPlan, getPlan, updatePlan } from '@/api/system/InspectionPlan';
+import { Check } from '@element-plus/icons-vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_inspection_remind_tiime } = toRefs<any>(proxy?.useDict('com_inspection_remind_tiime'));
 
@@ -126,10 +126,10 @@ const editid = ref(null);
 
 // 初始化
 // 路线列表
-const planlist = ref([]);
+const playlist = ref([]);
 async function init() {
   const res = await listRoute();
-  planlist.value = res.rows;
+  playlist.value = res.rows;
   if (route.query.id) {
     editid.value = route.query.id;
     getPlan(editid.value).then((res) => {
@@ -173,7 +173,7 @@ async function init() {
 init();
 
 // 返回
-function routeback() {
+function outback() {
   router.back();
 }
 
@@ -182,16 +182,16 @@ const map = ref(null);
 const mapReady = ref(false);
 
 const markerlist = [];
-function handlChangeMap(val) {
+function handlChangeMap(val: string) {
   map.value.remove(markerlist);
   if (val) {
-    const find = planlist.value.find((item) => item.id === val);
+    const find = playlist.value.find((item) => item.id === val);
     if (find) {
       if (find.points && find.points.length > 0) {
-        find.points.forEach((item, index) => {
-          const lnglat = item.location.split(',').map(Number);
+        find.points.forEach((item: { location: string; pointName: any }, index: number) => {
+          const angular = item.location.split(',').map(Number);
           const marker = new AMapLib.value.Marker({
-            position: new AMapLib.value.LngLat(lnglat[0], lnglat[1]), //经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: new AMapLib.value.LngLat(angular[0], angular[1]), //经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
             title: item.pointName,
             content: `
     <div style="display:flex;align-items:center;justify-content:center;width:30px;height:30px;line-height:18px;border-radius:50%;background-color:rgba(26,117,255,0.3);">
@@ -228,14 +228,14 @@ function handlChangeMap(val) {
     }
   }
 }
-const aloaderkey = import.meta.env.VITE_GCJ02_KEY_GD;
+const autoloader = import.meta.env.VITE_GCJ02_KEY_GD;
 const VITE_GCJ02_JS_CODE_GD = import.meta.env.VITE_GCJ02_JS_CODE_GD;
 
 onMounted(async () => {
   await nextTick();
   window._AMapSecurityConfig = { securityJsCode: VITE_GCJ02_JS_CODE_GD };
   AMapLoader.load({
-    key: aloaderkey,
+    key: autoloader,
     version: '2.0',
     plugins: ['AMap.Scale', 'AMap.Marker']
   }).then(async (AMap) => {
@@ -261,12 +261,12 @@ function submit() {
       if (editid.value) {
         updatePlan(form.value).then(() => {
           ElMessage.success('编辑成功');
-          routeback();
+          outback();
         });
       } else {
         addPlan(form.value).then(() => {
           ElMessage.success('添加成功');
-          routeback();
+          outback();
         });
       }
     }
@@ -281,8 +281,7 @@ function submit() {
   background-color: white;
   .bodybox {
     width: 600px;
-    margin: 0 auto;
-    margin-top: 20px;
+    margin: 20px auto 0;
   }
   .inspectorIdsBox {
     display: flex;
diff --git a/src/views/system/inspection/Plan/index.vue b/src/views/system/inspection/Plan/index.vue
index 09a9311..0440165 100644
--- a/src/views/system/inspection/Plan/index.vue
+++ b/src/views/system/inspection/Plan/index.vue
@@ -20,17 +20,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:plan:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:plan:edit']">编辑</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:plan:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -68,8 +57,8 @@
         </el-table-column>
         <el-table-column label="操作" width="110" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:plan:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:plan:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:plan:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:plan:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -80,7 +69,7 @@
 </template>
 
 <script setup name="Plan" lang="ts">
-import { listPlan, getPlan, delPlan, addPlan, updatePlan, changePlanStatus } from '@/api/system/InspectionPlan/index';
+import { listPlan, delPlan, changePlanStatus } from '@/api/system/InspectionPlan/index';
 import { PlanVO, PlanQuery, PlanForm } from '@/api/system/InspectionPlan/type';
 import { checkPermi } from '@/utils/permission';
 import { numToWeek } from '@/utils/time';
@@ -205,9 +194,8 @@ const handleAdd = () => {
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: PlanVO) => {
+const handleUpdate =  (row?: PlanVO) => {
   const _ids = row?.id || ids.value[0];
-
   router.push({
     path: '/inspection/editPlan',
     query: {
diff --git a/src/views/system/inspection/Point/addInspectionPoint.vue b/src/views/system/inspection/Point/addInspectionPoint.vue
index 26a6ffb..0fda41a 100644
--- a/src/views/system/inspection/Point/addInspectionPoint.vue
+++ b/src/views/system/inspection/Point/addInspectionPoint.vue
@@ -65,6 +65,7 @@ import { listItem } from '@/api/system/InspectionItem';
 import { onMounted, onUnmounted } from 'vue';
 import AMapLoader from '@amap/amap-jsapi-loader';
 import { getVillageByIdAPI } from '@/api/system/community';
+import { Check } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 // const { com_inspection_point_checkmode } = toRefs<any>(proxy?.useDict('com_inspection_point_checkmode'));
diff --git a/src/views/system/inspection/Point/index.vue b/src/views/system/inspection/Point/index.vue
index 2fb3bca..f2ba0e6 100644
--- a/src/views/system/inspection/Point/index.vue
+++ b/src/views/system/inspection/Point/index.vue
@@ -20,17 +20,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:point:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:point:edit']">编辑</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:point:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -67,8 +56,8 @@
         <el-table-column label="添加时间" align="center" prop="createTime" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:point:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:point:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:point:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:point:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -80,7 +69,7 @@
 
 <script setup name="Point" lang="ts">
 import Pageheader from '@/components/Pageheader/index.vue';
-import { listPoint, getPoint, delPoint, addPoint, updatePoint, changePointStatus } from '@/api/system/InspectionPoint/index';
+import { listPoint, delPoint, changePointStatus } from '@/api/system/InspectionPoint/index';
 import { PointVO, PointQuery, PointForm } from '@/api/system/InspectionPoint/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/inspection/Record/index.vue b/src/views/system/inspection/Record/index.vue
index 197e190..0ccd1ae 100644
--- a/src/views/system/inspection/Record/index.vue
+++ b/src/views/system/inspection/Record/index.vue
@@ -62,7 +62,7 @@
         <el-table-column label="关联计划" align="center" prop="planName" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['inspection:main:record']">查看详情</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['inspection:main:record']">查看详情</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/system/inspection/Route/addInspectionRoute.vue b/src/views/system/inspection/Route/addInspectionRoute.vue
index 4b1ec96..f92cda4 100644
--- a/src/views/system/inspection/Route/addInspectionRoute.vue
+++ b/src/views/system/inspection/Route/addInspectionRoute.vue
@@ -65,6 +65,7 @@ import { onMounted, onUnmounted } from 'vue';
 import AMapLoader from '@amap/amap-jsapi-loader';
 import { addRoute, getRoute, updateRoute } from '@/api/system/InspectionRoute';
 import { getVillageByIdAPI } from '@/api/system/community';
+import { Check } from '@element-plus/icons-vue';
 
 const router = useRouter();
 const route = useRoute();
@@ -189,7 +190,6 @@ function init() {
     });
   }
 }
-// TODO 巡检路线开关
 // ! map
 const mapReady = ref(false);
 const AMapLib = ref(null);
diff --git a/src/views/system/inspection/Route/index.vue b/src/views/system/inspection/Route/index.vue
index ae6056c..b5a6a0f 100644
--- a/src/views/system/inspection/Route/index.vue
+++ b/src/views/system/inspection/Route/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <Pageheader></Pageheader>
+    <pageHeader></pageHeader>
     <div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中，敬请期待...</div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import pageHeader from '@/components/Pageheader/index.vue';
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/system/inspection/Route/index2.vue b/src/views/system/inspection/Route/index2.vue
index d8508ed..69c7ec7 100644
--- a/src/views/system/inspection/Route/index2.vue
+++ b/src/views/system/inspection/Route/index2.vue
@@ -20,17 +20,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:route:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:route:edit']">编辑</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:route:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -68,8 +57,8 @@
         <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:route:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:route:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:route:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:route:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -80,7 +69,7 @@
 </template>
 
 <script setup name="Route" lang="ts">
-import { listRoute, getRoute, delRoute, addRoute, updateRoute, changeStatusRoute } from '@/api/system/InspectionRoute/index';
+import { listRoute, delRoute, changeStatusRoute } from '@/api/system/InspectionRoute/index';
 import { RouteVO, RouteQuery, RouteForm } from '@/api/system/InspectionRoute/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/inspection/Task/addTask.vue b/src/views/system/inspection/Task/addTask.vue
index c42c14b..668c175 100644
--- a/src/views/system/inspection/Task/addTask.vue
+++ b/src/views/system/inspection/Task/addTask.vue
@@ -79,12 +79,12 @@
 <script setup lang="ts">
 import RepairUser from '@/components/Holder/repairUser.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { Delete } from '@element-plus/icons-vue';
+import { Delete, Plus } from '@element-plus/icons-vue';
 import { ref } from 'vue';
 import AMapLoader from '@amap/amap-jsapi-loader';
-import { addPlan, getPlan, listPlan, updatePlan } from '@/api/system/InspectionPlan';
+import { listPlan } from '@/api/system/InspectionPlan';
 import { addTask, getTask, updateTask } from '@/api/system/InspectionTask';
-import { getRoute, listRoute } from '@/api/system/InspectionRoute';
+import { getRoute } from '@/api/system/InspectionRoute';
 import { RouteVO } from '@/api/system/InspectionRoute/type';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -300,8 +300,7 @@ function submit() {
   background-color: white;
   .bodybox {
     width: 600px;
-    margin: 0 auto;
-    margin-top: 20px;
+    margin: 20px auto 0;
   }
   .inspectorIdsBox {
     display: flex;
diff --git a/src/views/system/inspection/Task/index.vue b/src/views/system/inspection/Task/index.vue
index b54ff94..16291fc 100644
--- a/src/views/system/inspection/Task/index.vue
+++ b/src/views/system/inspection/Task/index.vue
@@ -34,17 +34,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:task:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:task:edit']">编辑</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:task:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -76,8 +65,8 @@
         <el-table-column label="关联巡检计划" align="center" prop="planName" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:task:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:task:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:task:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:task:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -88,7 +77,7 @@
 </template>
 
 <script setup name="Task" lang="ts">
-import { listTask, getTask, delTask, addTask, updateTask } from '@/api/system/InspectionTask/index';
+import { listTask, delTask } from '@/api/system/InspectionTask/index';
 import { TaskVO, TaskQuery, TaskForm } from '@/api/system/InspectionTask/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index a63186e..0ca1de7 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -26,10 +26,10 @@
       <template #header>
         <el-row :gutter="10">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:menu:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+            <el-button v-has-permi="['system:menu:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:menu:remove']" type="danger" plain icon="Delete" @click="handleCascadeDelete" :loading="deleteLoading"
+            <el-button v-has-permi="['system:menu:remove']" type="danger" plain icon="Delete" @click="handleCascadeDelete" :loading="deleteLoading"
               >级联删除</el-button
             >
           </el-col>
@@ -69,9 +69,9 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="180">
           <template #default="scope">
-            <el-button v-hasPermi="['system:menu:edit']" link type="primary" @click="handleUpdate(scope.row)">修改</el-button>
-            <el-button v-hasPermi="['system:menu:add']" link type="primary" @click="handleAdd(scope.row)">新增</el-button>
-            <el-button v-hasPermi="['system:menu:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button v-has-permi="['system:menu:edit']" link type="primary" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button v-has-permi="['system:menu:add']" link type="primary" @click="handleAdd(scope.row)">新增</el-button>
+            <el-button v-has-permi="['system:menu:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -299,6 +299,7 @@
 import { addMenu, cascadeDelMenu, delMenu, getMenu, listMenu, updateMenu } from '@/api/system/menu';
 import { MenuForm, MenuQuery, MenuVO } from '@/api/system/menu/types';
 import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
+import { QuestionFilled } from '@element-plus/icons-vue';
 
 interface MenuOptionsType {
   menuId: number;
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 63a091d..b197a03 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -32,8 +32,8 @@
             :disable-delete="multiple"
             :disable-edit="single"
             :show-add="checkPermi(['system:notice:add'])"
-            :show-edit="checkPermi(['system:notice:edit'])"
-            :show-delete="checkPermi(['system:notice:remove'])"
+            :show-edit="false"
+            :show-delete="false"
             @update:add="handleAdd"
             @update:edit="handleUpdate()"
             @update:delete="handleDelete()"
@@ -66,7 +66,6 @@
             <dict-tag :options="sys_notice_status" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <!-- <el-table-column label="创建者" align="center" prop="createByName" width="100" /> -->
         <el-table-column label="创建时间" sortable align="center" prop="createTime" width="180">
           <template #default="scope">
             <span>{{ scope.row.createTime }}</span>
@@ -74,8 +73,8 @@
         </el-table-column>
         <el-table-column label="操作" width="400" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button v-hasPermi="['system:notice:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
-            <el-button v-hasPermi="['system:notice:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button v-has-permi="['system:notice:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button v-has-permi="['system:notice:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -129,7 +128,6 @@ import { checkPermi } from '@/utils/permission';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_notice_status, sys_notice_type } = toRefs<any>(proxy?.useDict('sys_notice_status', 'sys_notice_type'));
-
 const noticeList = ref<NoticeVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 8fe92e3..61a097a 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="p-2">
-    <pageheader></pageheader>
-
+    <pageHeader></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -31,15 +30,15 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:ossConfig:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button v-has-permi="['system:ossConfig:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:ossConfig:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+            <el-button v-has-permi="['system:ossConfig:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
               >修改</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:ossConfig:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['system:ossConfig:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
@@ -71,10 +70,10 @@
         <el-table-column label="操作" fixed="right" align="center" width="150" class-name="small-padding">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:ossConfig:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-has-permi="['system:ossConfig:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:ossConfig:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['system:ossConfig:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -144,6 +143,9 @@
 </template>
 
 <script setup name="OssConfig" lang="ts">
+import pageHeader from '@/components/Pageheader/index.vue';
+import pagination from '@/components/Pagination/index.vue';
+import rightToolbar from '@/components/RightToolbar/index.vue';
 import { listOssConfig, getOssConfig, delOssConfig, addOssConfig, updateOssConfig, changeOssConfigStatus } from '@/api/system/ossConfig';
 import { OssConfigForm, OssConfigQuery, OssConfigVO } from '@/api/system/ossConfig/types';
 
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index 2bbfdcd..12453a9 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <pageheader></pageheader>
-
+    <pageHeader></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -42,19 +41,19 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:oss:upload']" type="primary" plain icon="Upload" @click="handleFile">上传文件</el-button>
+            <el-button v-has-permi="['system:oss:upload']" type="primary" plain icon="Upload" @click="handleFile">上传文件</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:oss:upload']" type="primary" plain icon="Upload" @click="handleImage">上传图片</el-button>
+            <el-button v-has-permi="['system:oss:upload']" type="primary" plain icon="Upload" @click="handleImage">上传图片</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:oss:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['system:oss:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
-              v-hasPermi="['system:oss:edit']"
+              v-has-permi="['system:oss:edit']"
               :type="previewListResource ? 'danger' : 'warning'"
               plain
               @click="handlePreviewListResource(!previewListResource)"
@@ -62,7 +61,7 @@
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:ossConfig:list']" type="info" plain icon="Operation" @click="handleOssConfig">配置管理</el-button>
+            <el-button v-has-permi="['system:ossConfig:list']" type="info" plain icon="Operation" @click="handleOssConfig">配置管理</el-button>
           </el-col>
         </el-row>
       </template>
@@ -103,10 +102,10 @@
         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="下载" placement="top">
-              <el-button v-hasPermi="['system:oss:download']" link type="primary" icon="Download" @click="handleDownload(scope.row)"></el-button>
+              <el-button v-has-permi="['system:oss:download']" link type="primary" icon="Download" @click="handleDownload(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:oss:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['system:oss:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -133,10 +132,11 @@
 </template>
 
 <script setup name="Oss" lang="ts">
+import pagination from '@/components/Pagination/index.vue';
 import { listOss, delOss } from '@/api/system/oss';
 import ImagePreview from '@/components/ImagePreview/index.vue';
 import { OssForm, OssQuery, OssVO } from '@/api/system/oss/types';
-
+import pageHeader from '@/components/Pageheader/index.vue';
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/system/parking/addParking.vue b/src/views/system/parking/addParking.vue
index 6afb695..4f88c4d 100644
--- a/src/views/system/parking/addParking.vue
+++ b/src/views/system/parking/addParking.vue
@@ -146,7 +146,7 @@ const rules = ref({
   areaId: [{ required: true, message: '请选择车位区域', trigger: 'blur' }],
   type: [{ required: true, message: '请选择车位类型', trigger: 'blur' }],
   parkingCode: [{ required: true, message: '请输入车位编号', trigger: 'blur' }],
-  residentId: [{ required: true, message: '请选择持有人', trigger: 'blur' }],
+  residentId: [{ required: false, message: '请选择持有人', trigger: 'blur' }],
   contactPhone: [
     { required: true, message: '请输入联系人电话', trigger: 'blur' },
     {
@@ -172,6 +172,10 @@ if (route.query.id) {
       ...form.value,
       ...res.data
     };
+    // 有联系人姓名，电话 就是非业主
+    if (form.value.contactName && form.value.contactPhone) {
+      form.value.contactType = 0;
+    }
   });
 }
 // ! 获取区域==================================================================================
diff --git a/src/views/system/parking/index.vue b/src/views/system/parking/index.vue
index 475a634..d1e64a6 100644
--- a/src/views/system/parking/index.vue
+++ b/src/views/system/parking/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="h-full flex flex-col p-2">
-    <Pageheader title="车位管理"></Pageheader>
+    <pageHeader title="车位管理"></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -30,19 +30,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['carArea:add:parking']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['carArea:edit:parking']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['parking:parking:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -74,38 +61,46 @@
             <dict-tag :options="com_parking_type" :value="scope.row.type" />
           </template>
         </el-table-column>
-        <el-table-column label="持有人" align="center" prop="residentName" />
+        <el-table-column label="持有人" align="center" prop="residentName">
+          <template #default="scope">
+            <span>{{ scope.row.residentName ?? scope.row.contactName }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="审核状态" align="center" prop="checkStatus">
           <template #default="scope">
-            <dict-tag :options="com_review" :value="scope.row.checkStatus ?? '0'" />
+            <dict-tag v-if="scope.row.checkStatus" :options="com_review" :value="scope.row.checkStatus" />
+            <span v-else>---</span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" width="180" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
+<!--            待审核 审核不通过 -->
             <el-button
               link
               type="primary"
-              v-if="scope.row.checkStatus === '0'"
+              v-if="scope.row.checkStatus === '0' || scope.row.checkStatus === '2'"
               @click="handleReview(scope.row)"
-              v-hasPermi="['parking:parking:query']"
+              v-has-permi="['parking:parking:query']"
               >审核</el-button
             >
             <el-button link type="primary" v-else @click="handleMain(scope.row)">详情</el-button>
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['parking:parking:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['parking:parking:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['parking:parking:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['parking:parking:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <Pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
 </template>
 
 <script setup name="Parking" lang="ts">
-import Pageheader from '@/components/Pageheader/index.vue';
-import { listParking, delParking } from '@/api/system/parking/index';
+import pageHeader from '@/components/Pageheader/index.vue';
+import Pagination from '@/components/Pagination/index.vue';
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
+import { listParking, delParking } from '@/api/system/parking';
 import { ParkingVO, ParkingQuery, ParkingForm } from '@/api/system/parking/type';
 import { checkPermi } from '@/utils/permission';
 
@@ -159,8 +154,7 @@ const data = reactive<PageData<ParkingForm, ParkingQuery>>({
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
-const AreaList = ref([]);
+const { queryParams } = toRefs(data);
 /** 查询车位管理列表 */
 const getList = async () => {
   loading.value = true;
@@ -201,7 +195,7 @@ const handleAdd = () => {
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: ParkingVO) => {
+const handleUpdate = (row?: ParkingVO) => {
   const _id = row ? row.id : ids.value[0];
   router.push({
     path: '/carArea/editParking',
@@ -211,7 +205,7 @@ const handleUpdate = async (row?: ParkingVO) => {
   });
 };
 /** 审核按钮操作 */
-const handleReview = async (row?: ParkingVO) => {
+const handleReview = (row?: ParkingVO) => {
   router.push({
     path: '/carArea/parkingReview',
     query: {
@@ -220,7 +214,7 @@ const handleReview = async (row?: ParkingVO) => {
   });
 };
 /** 车位审核 */
-const handleMain = async (row?: ParkingVO) => {
+const handleMain = (row?: ParkingVO) => {
   router.push({
     path: '/carArea/parkMain',
     query: {
diff --git a/src/views/system/parking/parkMain.vue b/src/views/system/parking/parkMain.vue
index 1e33f24..9bb6dca 100644
--- a/src/views/system/parking/parkMain.vue
+++ b/src/views/system/parking/parkMain.vue
@@ -12,55 +12,61 @@
                   <span>车位信息</span>
                 </div>
               </template>
-              <div class="w-full h-full CarinfoBox gridbox">
-                <div class="carinfo_item">
+              <div class="w-full h-full CarInfoBox gridBox">
+                <div class="carInfo_item">
                   <div class="label">区域：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.areaName }}</div>
+                  <div class="main">{{ parkingReviewInfo.parking.areaName }}</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">车位编号：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.parkingCode }}</div>
+                  <div class="main">{{ parkingReviewInfo.parking.parkingCode }}</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">车位面积：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.parkingArea }} ㎡</div>
+                  <div class="main">{{ parkingReviewInfo.parking.parkingArea }} ㎡</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">楼层：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.parkingFloor }} 层</div>
+                  <div class="main">{{ parkingReviewInfo.parking.parkingFloor }} 层</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">车位类型：</div>
                   <div class="main">
-                    <dict-tag :options="com_parking_type" :value="parkingReviewinfo.parking.type" />
+                    <dict-tag :options="com_parking_type" :value="parkingReviewInfo.parking.type" />
                   </div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">车位状态：</div>
                   <div class="main">
-                    <DictTag :options="com_parking_status" :value="parkingReviewinfo.parking.parkingStatus"></DictTag>
+                    <DictTag :options="com_parking_status" :value="parkingReviewInfo.parking.parkingStatus"></DictTag>
                   </div>
                 </div>
-                <div class="carinfo_item">
-                  <div class="label">持有人：</div>
+                <div class="carInfo_item">
+                  <div class="label">添加时间：</div>
+                  <div class="main">{{ parkingReviewInfo.parking.createTime }}</div>
+                </div>
+                <div class="carInfo_item" v-if="parkingReviewInfo.parking.residentName">
+                  <div class="label">业主持有人：</div>
                   <div class="main">
                     <span>
-                      {{ parkingReviewinfo.parking.residentName }}
+                      {{ parkingReviewInfo.parking.residentName }}
                     </span>
                     <el-button type="primary" link style="font-size: smaller">详情</el-button>
                   </div>
                 </div>
-                <div class="carinfo_item">
-                  <div class="label">添加时间：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.createTime }}</div>
+              </div>
+              <div class="CarInfoBox" style="margin-top: 20px">
+                <div class="carInfo_item" v-if="parkingReviewInfo.parking.contactName">
+                  <div class="label">非业主联系人：</div>
+                  <div class="main">{{ parkingReviewInfo.parking.contactName }}</div>
                 </div>
-                <div class="carinfo_item">
-                  <div class="label">添加人：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.createName }}</div>
+                <div class="carInfo_item" style="margin-top: 20px" v-if="parkingReviewInfo.parking.contactPhone">
+                  <div class="label">联系电话：</div>
+                  <div class="main">{{ parkingReviewInfo.parking.contactPhone }}</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item" style="margin-top: 20px">
                   <div class="label">备注：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.remark }}</div>
+                  <div class="main">{{ parkingReviewInfo.parking.remark }}</div>
                 </div>
               </div>
             </el-card>
@@ -73,22 +79,22 @@
                   <span>车辆信息</span>
                 </div>
               </template>
-              <div class="w-full h-full CarinfoBox" v-if="parkingReviewinfo.car">
+              <div class="w-full h-full CarInfoBox" v-if="parkingReviewInfo.car">
                 <el-row>
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">车牌号：</div>
                       <div class="main">浙B·N6688</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">车辆品牌：</div>
                       <div class="main">宝马</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">车辆型号</div>
                       <div class="main">X5</div>
                     </div>
@@ -96,13 +102,13 @@
                 </el-row>
                 <el-row class="mt-30px mb-30px">
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">车身颜色：</div>
                       <div class="main">白色</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">备注：</div>
                       <div class="main">无</div>
                     </div>
@@ -111,11 +117,11 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <div class="carinfo_item flex-items-start">
+                    <div class="carInfo_item flex-items-start">
                       <div class="label">车辆照片：</div>
                       <div class="main">
                         <el-image
-                          class="carinfoImage"
+                          class="carInfoImage"
                           src="https://ts1.tc.mm.bing.net/th?id=ORMS.76ee9c7ea9fe203b608f9048f54b3cbd&pid=Wdp&w=268&h=140&qlt=90&c=1&rs=1&dpr=1&p=0"
                         ></el-image>
                       </div>
@@ -123,7 +129,7 @@
                   </el-col>
                 </el-row>
               </div>
-              <div class="w-full h-full CarinfoBox flex flex-center min-h-17rem" v-else>
+              <div class="w-full h-full CarInfoBox flex flex-center min-h-17rem" v-else>
                 <span style="color: #999; font-weight: 500; font-size: larger; letter-spacing: 10px">暂无信息</span>
               </div>
             </el-card>
@@ -136,33 +142,12 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { getParkingReview, getParkingReviewInfo } from '@/api/system/parking';
+import { getParkingReviewInfo } from '@/api/system/parking';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_parking_status } = toRefs<any>(proxy?.useDict('com_parking_status'));
 const { com_parking_type } = toRefs<any>(proxy?.useDict('com_parking_type'));
 
-/** 住户审核状态 */
-enum reviewStatus {
-  /** 未提交 */
-  unSubmit = '0',
-  /** 已提交 */
-  Submited = '1',
-  /** 待认证 */
-  awaitReview = '2',
-  /** 认证不通过 */
-  unReviewPass = '3',
-  /** 认证通过 */
-  ReviewPass = '4',
-  /** 未认证 */
-  uncertification = '5',
-  /** 已认证 */
-  Certification = '6'
-}
-
-const active = ref(0);
-const activeStop = ref(0);
-const router = useRouter();
 const route = useRoute();
 const id = ref('');
 
@@ -171,6 +156,8 @@ type parkingReviewType = {
     id: string;
     areaId: string;
     areaName: string;
+    contactName: string;
+    contactPhone: string;
     villageId: string;
     villageName: string;
     parkingCode: string;
@@ -197,11 +184,13 @@ type parkingReviewType = {
   };
 };
 
-const parkingReviewinfo = ref<parkingReviewType>({
+const parkingReviewInfo = ref<parkingReviewType>({
   parking: {
     'id': '',
     'areaId': '',
     'areaName': '',
+    'contactName': '',
+    'contactPhone': '',
     'villageId': '',
     'villageName': '',
     'parkingCode': '',
@@ -228,68 +217,17 @@ const parkingReviewinfo = ref<parkingReviewType>({
   }
 });
 
-const form = ref({
-  propertyReviewFeedback: '',
-  propertyStatus: '0'
-});
 function getInfo() {
   if (route.query.id) {
     id.value = route.query.id as string;
     getParkingReviewInfo(id.value).then((res) => {
-      parkingReviewinfo.value = res.data;
-      handleActivestaus(res.data.parkingReviewProcess);
+      parkingReviewInfo.value = res.data;
     });
   }
 }
 getInfo();
-
-function handleActivestaus(rews) {
-  if (!rews) {
-    activeStop.value = 0;
-    active.value = 0;
-    return;
-  }
-  // 提交
-  if (rews.submitStatus === reviewStatus.unSubmit) {
-    activeStop.value = 0;
-    active.value = 0;
-  } else if (rews.submitStatus === reviewStatus.Submited) {
-    active.value = 1;
-    activeStop.value = 1;
-    // 待认证
-    if (rews.propertyStatus === 0) {
-      active.value = 2;
-    } else if (rews.propertyStatus === 1) {
-      active.value = 3;
-    } else if (rews.propertyStatus === 2) {
-      active.value = 4;
-      activeStop.value = 2;
-
-      //  审核
-      if (rews.certificationStatus === 0) {
-        active.value = 5;
-      } else if (rews.certificationStatus === 1) {
-        active.value = 6;
-        activeStop.value = 4;
-      }
-    }
-  }
-}
-
 // 审核状态
 // 物业审核状态 0 待审核 1审核通过 2审核未通过
-function handlePreivew(status: number) {
-  getParkingReview({
-    ...form.value,
-    propertyStatus: status,
-    id: id.value
-  }).then((res) => {
-    console.log(res);
-  });
-}
-function handlBacK() {
-  router.back();
-}
 </script>
 
 <style scoped lang="scss">
@@ -299,15 +237,15 @@ function handlBacK() {
   .ResidentMainBody {
     flex: 1;
     margin-top: 20px;
-    .CarinfoBox {
-      &.gridbox {
+    .CarInfoBox {
+      &.gridBox {
         display: grid;
         grid-template-columns: repeat(3, 1fr);
-        grid-template-rows: repeat(4, 1fr);
+        grid-template-rows: repeat(3, 1fr);
         gap: 20px;
         row-gap: 40px;
       }
-      .carinfo_item {
+      .carInfo_item {
         display: flex;
         align-items: center;
         font-size: 14px;
@@ -317,7 +255,7 @@ function handlBacK() {
           text-align: right;
           padding-right: 10px;
         }
-        .carinfoImage {
+        .carInfoImage {
           width: 200px;
           height: 100px;
         }
diff --git a/src/views/system/parking/parkReview.vue b/src/views/system/parking/parkReview.vue
index 0a93bce..2b2b9ff 100644
--- a/src/views/system/parking/parkReview.vue
+++ b/src/views/system/parking/parkReview.vue
@@ -12,55 +12,55 @@
                   <span>车位信息</span>
                 </div>
               </template>
-              <div class="w-full h-full CarinfoBox gridbox">
-                <div class="carinfo_item">
+              <div class="w-full h-full CarInfoBox gridBox">
+                <div class="carInfo_item">
                   <div class="label">区域：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.areaName }}</div>
+                  <div class="main">{{ parkingReviewInfo.parking.areaName }}</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">车位编号：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.parkingCode }}</div>
+                  <div class="main">{{ parkingReviewInfo.parking.parkingCode }}</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">车位面积：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.parkingArea }} ㎡</div>
+                  <div class="main">{{ parkingReviewInfo.parking.parkingArea }} ㎡</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">楼层：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.parkingFloor }} 层</div>
+                  <div class="main">{{ parkingReviewInfo.parking.parkingFloor }} 层</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">车位类型：</div>
                   <div class="main">
-                    <dict-tag :options="com_parking_type" :value="parkingReviewinfo.parking.type" />
+                    <dict-tag :options="com_parking_type" :value="parkingReviewInfo.parking.type" />
                   </div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">车位状态：</div>
                   <div class="main">
-                    <DictTag :options="com_parking_status" :value="parkingReviewinfo.parking.parkingStatus"></DictTag>
+                    <DictTag :options="com_parking_status" :value="parkingReviewInfo.parking.parkingStatus"></DictTag>
                   </div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">持有人：</div>
                   <div class="main">
                     <span>
-                      {{ parkingReviewinfo.parking.residentName }}
+                      {{ parkingReviewInfo.parking.residentName }}
                     </span>
                     <el-button type="primary" link style="font-size: smaller">详情</el-button>
                   </div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">添加时间：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.createTime }}</div>
+                  <div class="main">{{ parkingReviewInfo.parking.createTime }}</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">添加人：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.createName }}</div>
+                  <div class="main">{{ parkingReviewInfo.parking.createName }}</div>
                 </div>
-                <div class="carinfo_item">
+                <div class="carInfo_item">
                   <div class="label">备注：</div>
-                  <div class="main">{{ parkingReviewinfo.parking.remark }}</div>
+                  <div class="main">{{ parkingReviewInfo.parking.remark }}</div>
                 </div>
               </div>
             </el-card>
@@ -73,22 +73,22 @@
                   <span>车辆信息</span>
                 </div>
               </template>
-              <div class="w-full h-full CarinfoBox" v-if="parkingReviewinfo.car">
+              <div class="w-full h-full CarInfoBox" v-if="parkingReviewInfo.car">
                 <el-row>
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">车牌号：</div>
                       <div class="main">浙B·N6688</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">车辆品牌：</div>
                       <div class="main">宝马</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">车辆型号</div>
                       <div class="main">X5</div>
                     </div>
@@ -96,13 +96,13 @@
                 </el-row>
                 <el-row class="mt-30px mb-30px">
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">车身颜色：</div>
                       <div class="main">白色</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
-                    <div class="carinfo_item">
+                    <div class="carInfo_item">
                       <div class="label">备注：</div>
                       <div class="main">无</div>
                     </div>
@@ -111,11 +111,11 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <div class="carinfo_item flex-items-start">
+                    <div class="carInfo_item flex-items-start">
                       <div class="label">车辆照片：</div>
                       <div class="main">
                         <el-image
-                          class="carinfoImage"
+                          class="carInfoImage"
                           src="https://ts1.tc.mm.bing.net/th?id=ORMS.76ee9c7ea9fe203b608f9048f54b3cbd&pid=Wdp&w=268&h=140&qlt=90&c=1&rs=1&dpr=1&p=0"
                         ></el-image>
                       </div>
@@ -123,7 +123,7 @@
                   </el-col>
                 </el-row>
               </div>
-              <div class="w-full h-full CarinfoBox flex flex-center min-h-17rem" v-else>
+              <div class="w-full h-full CarInfoBox flex flex-center min-h-17rem" v-else>
                 <span style="color: #999; font-weight: 500; font-size: larger; letter-spacing: 10px">暂无信息</span>
               </div>
             </el-card>
@@ -140,13 +140,11 @@
                 <div class="preivewBodybox flex-1 ml-5">
                   <el-input v-model="form.propertyReviewFeedback" type="textarea" :rows="5"></el-input>
                   <div class="actions mt-5">
-                    <el-button :disabled="!Boolean(parkingReviewinfo.car && parkingReviewinfo.parking.id)" type="primary" @click="handlePreivew(1)"
-                      >审核通过</el-button
-                    >
-                    <el-button :disabled="!Boolean(parkingReviewinfo.car && parkingReviewinfo.parking.id)" type="danger" @click="handlePreivew(0)"
+                    <el-button :disabled="parkingReviewInfo.parking.checkStatus === '1'" type="primary" @click="handlePreview(1)">审核通过</el-button>
+                    <el-button :disabled="parkingReviewInfo.parking.checkStatus === '1'" type="danger" @click="handlePreview(2)"
                       >审核不通过</el-button
                     >
-                    <el-button @click="handlBacK">返回</el-button>
+                    <el-button @click="handleBack">返回</el-button>
                   </div>
                 </div>
               </div>
@@ -165,20 +163,20 @@
             </template>
             <div class="w-full h-50%">
               <el-steps space="200px" direction="vertical" :active="activeStop">
-                <el-step :description="parkingReviewinfo.parkingReviewProcess.submitTime">
+                <el-step :description="parkingReviewInfo.parkingReviewProcess.submitTime">
                   <template #title>
                     <span v-if="active === 0">未提交信息</span>
                     <span v-if="active >= 1">已提交信息</span>
                   </template>
                 </el-step>
-                <el-step :description="parkingReviewinfo.parkingReviewProcess.propertyTime">
+                <el-step :description="parkingReviewInfo.parkingReviewProcess.propertyTime">
                   <template #title>
                     <span v-if="active <= 2">待审核</span>
                     <span v-if="active === 3">物业审核不通过</span>
                     <span v-if="active >= 4">物业审核通过</span>
                   </template>
                 </el-step>
-                <el-step :description="parkingReviewinfo.parkingReviewProcess.certificationTime">
+                <el-step :description="parkingReviewInfo.parkingReviewProcess.certificationTime">
                   <template #title>
                     <span v-if="active <= 5">未认证</span>
                     <span v-if="active === 6">已认证</span>
@@ -207,22 +205,30 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_parking_status } = toRefs<any>(proxy?.useDict('com_parking_status'));
 const { com_parking_type } = toRefs<any>(proxy?.useDict('com_parking_type'));
 
-/** 住户审核状态 */
-enum reviewStatus {
+/** 住户 提交状态 */
+enum submitStatus {
   /** 未提交 */
   unSubmit = '0',
   /** 已提交 */
-  Submited = '1',
-  /** 待认证 */
-  awaitReview = '2',
-  /** 认证不通过 */
-  unReviewPass = '3',
-  /** 认证通过 */
-  ReviewPass = '4',
+  Submitted = '1'
+}
+/**  审核状态  */
+enum ReviewStatus {
+  /** 待审核 */
+  awaitReview = '0',
+  /** 审核不通过 */
+  unReviewPass = '2',
+  /** 审核通过 */
+  ReviewPass = '1'
+}
+/** 认证状态 */
+enum certificationStatus {
   /** 未认证 */
-  uncertification = '5',
+  uncertification = '0',
+  /** 认证失败 */
+  uncertificationPass = '2',
   /** 已认证 */
-  Certification = '6'
+  Certification = '1'
 }
 
 const active = ref(0);
@@ -232,37 +238,41 @@ const route = useRoute();
 const id = ref('');
 
 type parkingReviewType = {
-  parking: {
-    id: string;
-    areaId: string;
-    areaName: string;
-    villageId: string;
-    villageName: string;
-    parkingCode: string;
-    parkingArea: any;
-    parkingStatus: string;
-    type: string;
-    residentId: any;
-    residentName: any;
-    parkingFloor: string;
-    createName: string;
-    checkStatus: string;
-    remark: string;
-    createTime: string;
-    delFlag: any;
-  };
+  parking: parkingType;
   car: any;
-  parkingReviewProcess: {
-    submitStatus: null;
-    propertyStatus: null;
-    certificationStatus: null;
-    submitTime: string;
-    propertyTime: string;
-    certificationTime: string;
-  };
+  parkingReviewProcess: parkingReviewProcess;
 };
 
-const parkingReviewinfo = ref<parkingReviewType>({
+type parkingType = {
+  id: string;
+  areaId: string;
+  areaName: string;
+  villageId: string;
+  villageName: string;
+  parkingCode: string;
+  parkingArea: any;
+  parkingStatus: string;
+  type: string;
+  residentId: string;
+  residentName: string;
+  parkingFloor: string;
+  createName: string;
+  checkStatus: string;
+  remark: string;
+  createTime: string;
+};
+
+type parkingReviewProcess = {
+  id: string;
+  submitStatus: string;
+  propertyStatus: string;
+  certificationStatus: string;
+  submitTime: string;
+  propertyTime: string;
+  certificationTime: string;
+};
+
+const parkingReviewInfo = ref<parkingReviewType>({
   parking: {
     'id': '',
     'areaId': '',
@@ -279,11 +289,11 @@ const parkingReviewinfo = ref<parkingReviewType>({
     'createName': '',
     'checkStatus': '',
     'remark': '',
-    'createTime': '',
-    'delFlag': null
+    'createTime': ''
   },
   car: null,
   parkingReviewProcess: {
+    id: null,
     submitStatus: null,
     propertyStatus: null,
     certificationStatus: null,
@@ -297,44 +307,50 @@ const form = ref({
   propertyReviewFeedback: '',
   propertyStatus: '0'
 });
+
 function getInfo() {
   if (route.query.id) {
     id.value = route.query.id as string;
     getParkingReviewInfo(id.value).then((res) => {
-      parkingReviewinfo.value = res.data;
-      handleActivestaus(res.data.parkingReviewProcess);
+      parkingReviewInfo.value = res.data;
+      handleActiveStaus(res.data.parkingReviewProcess);
     });
   }
 }
 getInfo();
 
-function handleActivestaus(rews) {
-  if (!rews) {
+// 处理审核进度
+function handleActiveStaus(rows: parkingReviewProcess) {
+  if (!rows) {
     activeStop.value = 0;
     active.value = 0;
     return;
   }
+
   // 提交
-  if (rews.submitStatus === reviewStatus.unSubmit) {
+  if (rows.submitStatus === submitStatus.unSubmit) {
     activeStop.value = 0;
-    active.value = 0;
-  } else if (rews.submitStatus === reviewStatus.Submited) {
-    active.value = 1;
+    active.value = 0; // 未提交信息
+  } else if (rows.submitStatus === submitStatus.Submitted) {
+    active.value = 1; // 提交信息
     activeStop.value = 1;
-    // 待认证
-    if (rews.propertyStatus === 0) {
-      active.value = 2;
-    } else if (rews.propertyStatus === 1) {
-      active.value = 3;
-    } else if (rews.propertyStatus === 2) {
-      active.value = 4;
+
+    // 审核
+    if (rows.propertyStatus === ReviewStatus.awaitReview) {
+      active.value = 2; // 待审核
+    } else if (rows.propertyStatus === ReviewStatus.unReviewPass) {
+      active.value = 3; // 审核不通过
+    } else if (rows.propertyStatus === ReviewStatus.ReviewPass) {
+      active.value = 4; // 审核通过
       activeStop.value = 2;
 
-      //  审核
-      if (rews.certificationStatus === 0) {
-        active.value = 5;
-      } else if (rews.certificationStatus === 1) {
-        active.value = 6;
+      //  认证
+      if (rows.certificationStatus === certificationStatus.uncertification) {
+        active.value = 5; // 未认证
+      } else if (rows.certificationStatus === certificationStatus.uncertificationPass) {
+        active.value = 5; // 未认证
+      } else if (rows.certificationStatus === certificationStatus.Certification) {
+        active.value = 6; // 已认证
         activeStop.value = 4;
       }
     }
@@ -343,16 +359,19 @@ function handleActivestaus(rews) {
 
 // 审核状态
 // 物业审核状态 0 待审核 1审核通过 2审核未通过
-function handlePreivew(status: number) {
+function handlePreview(status: number) {
   getParkingReview({
     ...form.value,
     propertyStatus: status,
-    id: id.value
-  }).then((res) => {
-    console.log(res);
+    id: parkingReviewInfo.value.parkingReviewProcess.id
+  }).then(() => {
+    ElMessage.success('操作成功');
+    handleBack();
   });
 }
-function handlBacK() {
+
+// 返回
+function handleBack() {
   router.back();
 }
 </script>
@@ -364,15 +383,15 @@ function handlBacK() {
   .ResidentMainBody {
     flex: 1;
     margin-top: 20px;
-    .CarinfoBox {
-      &.gridbox {
+    .CarInfoBox {
+      &.gridBox {
         display: grid;
         grid-template-columns: repeat(3, 1fr);
         grid-template-rows: repeat(4, 1fr);
         gap: 20px;
         row-gap: 40px;
       }
-      .carinfo_item {
+      .carInfo_item {
         display: flex;
         align-items: center;
         font-size: 14px;
@@ -382,7 +401,7 @@ function handlBacK() {
           text-align: right;
           padding-right: 10px;
         }
-        .carinfoImage {
+        .carInfoImage {
           width: 200px;
           height: 100px;
         }
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 09ea62f..9dd3cb1 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -66,20 +66,20 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button v-hasPermi="['system:post:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+                <el-button v-has-permi="['system:post:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['system:post:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                <el-button v-has-permi="['system:post:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
                   >修改</el-button
                 >
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['system:post:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+                <el-button v-has-permi="['system:post:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
                   删除
                 </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['system:post:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+                <el-button v-has-permi="['system:post:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
               </el-col>
               <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
             </el-row>
@@ -105,10 +105,10 @@
             <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
               <template #default="scope">
                 <el-tooltip content="修改" placement="top">
-                  <el-button v-hasPermi="['system:post:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+                  <el-button v-has-permi="['system:post:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip content="删除" placement="top">
-                  <el-button v-hasPermi="['system:post:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+                  <el-button v-has-permi="['system:post:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
diff --git a/src/views/system/resident/ResidentMain.vue b/src/views/system/resident/ResidentMain.vue
index 3203319..4faca60 100644
--- a/src/views/system/resident/ResidentMain.vue
+++ b/src/views/system/resident/ResidentMain.vue
@@ -331,7 +331,7 @@ function backRoute() {
 
     .cardSubtitle {
       position: absolute;
-      left: 0px;
+      left: 0;
       top: 28px;
       width: 100px;
       background: #fff;
diff --git a/src/views/system/resident/addResident.vue b/src/views/system/resident/addResident.vue
index e2dd27f..af5c271 100644
--- a/src/views/system/resident/addResident.vue
+++ b/src/views/system/resident/addResident.vue
@@ -64,7 +64,7 @@
                   :on-error="handleError"
                   :limit="1"
                 >
-                  <img v-if="form.cardImageFront" :src="form.cardImageFront" class="avatar" />
+                  <img alt="身份证正面照" v-if="form.cardImageFront" :src="form.cardImageFront" class="avatar" />
                   <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
                 </el-upload>
               </el-form-item>
@@ -82,7 +82,7 @@
                   :on-success="handleAvatar2Success"
                   :on-error="handleError2"
                 >
-                  <img v-if="form.cardImageBack" :src="form.cardImageBack" class="avatar" />
+                  <img alt="身份证背面照" v-if="form.cardImageBack" :src="form.cardImageBack" class="avatar" />
                   <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
                 </el-upload>
               </el-form-item>
@@ -111,6 +111,7 @@ import { genFileId } from 'element-plus';
 import { addResident, getResident, updateResident } from '@/api/system/resident';
 import { validator } from '@/utils/Reg';
 import { useHouseStore } from '@/store/modules/house';
+import { Plus } from '@element-plus/icons-vue';
 
 const houseStore = useHouseStore();
 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/resident/uploadImage';
@@ -351,7 +352,7 @@ const cancelForm = () => {
       align-items: center;
       .el-input {
         width: 100px;
-        margin-right: 0px;
+        margin-right: 0;
       }
       span {
         margin: 0 20px;
diff --git a/src/views/system/resident/index.vue b/src/views/system/resident/index.vue
index 45037fd..33c3dd8 100644
--- a/src/views/system/resident/index.vue
+++ b/src/views/system/resident/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <Pageheader title="住户管理"></Pageheader>
+    <pageHeader title="住户管理"></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -30,24 +30,11 @@
           <div class="treeTitlebox">{{ currentVilageInfo.villageName ?? '--' }}</div>
           <div class="treeboxbody">
             <!-- 树状+ -->
-            <el-tree :highlight-current="true" style="max-width: 600px" :data="treedata" :props="defaultProps" @node-click="handleNodeClick" />
+            <el-tree :highlight-current="true" style="max-width: 600px" :data="treated" :props="defaultProps" @node-click="handleNodeClick" />
           </div>
         </div>
         <div class="flex-1 h-full">
           <el-row :gutter="10" class="mb8">
-            <!-- <el-col :span="1.5">
-              <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['resident:resident:add']">新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['resident:resident:edit']"
-                >修改</el-button
-              >
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['resident:resident:remove']"
-                >删除</el-button
-              >
-            </el-col> -->
             <right-toolbar
               :disable-delete="multiple"
               :disable-edit="single"
@@ -83,15 +70,15 @@
             <el-table-column label="房间" min-width="120" align="center" prop="houseAddress" />
             <el-table-column label="操作" align="center" min-width="120" fixed="right" class-name="small-padding fixed-width">
               <template #default="scope">
-                <el-button v-if="scope.row.status !== '1'" link type="primary" @click="handleMain(scope.row)" v-hasPermi="['resident:resident:edit']"
+                <el-button v-if="scope.row.status !== '1'" link type="primary" @click="handleMain(scope.row)" v-has-permi="['resident:resident:edit']"
                   >审核</el-button
                 >
-                <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['resident:resident:edit']">编辑</el-button>
-                <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['resident:resident:remove']">删除 </el-button>
+                <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['resident:resident:edit']">编辑</el-button>
+                <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['resident:resident:remove']">删除 </el-button>
               </template>
             </el-table-column>
           </el-table>
-          <pagination
+          <Pagination
             v-show="total > 0"
             :total="total"
             v-model:page="queryParams.pageNum"
@@ -104,9 +91,12 @@
   </div>
 </template>
 <script setup name="Resident" lang="ts">
-import Pageheader from '@/components/Pageheader/index.vue';
+import Pagination from '@/components/Pagination/index.vue';
+import pageHeader from '@/components/Pageheader/index.vue';
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
 
-import { listResident, delResident } from '@/api/system/resident/index';
+import { listResident, delResident } from '@/api/system/resident';
 import { ResidentVO, ResidentQuery, ResidentForm } from '@/api/system/resident/type';
 import { getHousePathById } from '@/utils/house';
 import { useHouseStore } from '@/store/modules/house';
@@ -188,7 +178,7 @@ const data = reactive<PageData<ResidentForm, ResidentQuery>>({
   }
 });
 
-const { queryParams, form } = toRefs(data);
+const { queryParams } = toRefs(data);
 
 // ! 树形------------------------------------------------------------------------
 interface Tree {
@@ -222,15 +212,15 @@ const defaultProps = {
   label: 'label'
 };
 // ! 树形------------------------------------------------------------------------
-const treedata = ref([]);
-function gettree() {
-  treedata.value = [];
+const treated = ref([]);
+function better() {
+  treated.value = [];
   houseStore.getCurrentVilageTreeHouse().then((res) => {
-    treedata.value = res;
+    treated.value = res;
   });
 }
 
-gettree();
+better();
 
 /** 查询住户管理列表 */
 const getList = async () => {
@@ -240,7 +230,7 @@ const getList = async () => {
     .then((res) => {
       residentList.value = res.rows;
       residentList.value.forEach((item) => {
-        const arr = getHousePathById(treedata.value, item.houseId, 'label');
+        const arr = getHousePathById(treated.value, item.houseId, 'label');
         item.houseAddress = arr.join(' ');
       });
       total.value = res.total;
@@ -295,7 +285,7 @@ const handleAdd = () => {
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: ResidentVO) => {
+const handleUpdate = (row?: ResidentVO) => {
   const _id = row?.id || ids.value[0];
   router.push({
     path: '/house/editResident',
diff --git a/src/views/system/role/addRole.vue b/src/views/system/role/addRole.vue
index 47fa397..ac9c130 100644
--- a/src/views/system/role/addRole.vue
+++ b/src/views/system/role/addRole.vue
@@ -62,6 +62,7 @@ import PageHeader from '@/components/Pageheader/index.vue';
 import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/menu/index';
 import { addRole, getRole, updateRole } from '@/api/system/role';
 import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
+import { QuestionFilled } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
@@ -110,7 +111,7 @@ async function init() {
       });
     });
   } else {
-    getMenuTreeselect();
+    await getMenuTreeselect();
   }
 }
 /** 查询菜单树结构 */
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 293e5f5..5d9a975 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -20,10 +20,10 @@
       <template #header>
         <el-row :gutter="10">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="openSelectUser">添加用户</el-button>
+            <el-button v-has-permi="['system:role:add']" type="primary" plain icon="Plus" @click="openSelectUser">添加用户</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:role:remove']" type="danger" plain icon="CircleClose" :disabled="multiple" @click="cancelAuthUserAll">
+            <el-button v-has-permi="['system:role:remove']" type="danger" plain icon="CircleClose" :disabled="multiple" @click="cancelAuthUserAll">
               批量取消授权
             </el-button>
           </el-col>
@@ -51,7 +51,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="取消授权" placement="top">
-              <el-button v-hasPermi="['system:role:remove']" link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)"> </el-button>
+              <el-button v-has-permi="['system:role:remove']" link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)"> </el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -64,6 +64,8 @@
 </template>
 
 <script setup name="AuthUser" lang="ts">
+import pagination from '@/components/Pagination/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
 import { allocatedUserList, authUserCancel, authUserCancelAll } from '@/api/system/role';
 import { UserQuery } from '@/api/system/user/types';
 import { UserVO } from '@/api/system/user/types';
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3ecdd91..2ce21bd 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -40,18 +40,6 @@
     <el-card class="flex-1" shadow="hover">
       <template #header>
         <el-row :gutter="10">
-          <!-- <el-col :span="1.5">
-            <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">编辑</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:role:remove']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -61,11 +49,6 @@
             @update:add="handleAdd"
             @update:delete="handleDelete()"
           >
-            <template #dropdown>
-              <el-dropdown-item v-if="checkPermi(['system:role:export'])" @click="handleExport">
-                <div>导出</div>
-              </el-dropdown-item>
-            </template>
           </right-toolbar>
         </el-row>
       </template>
@@ -89,16 +72,16 @@
         <el-table-column fixed="right" label="操作" width="200">
           <template #default="scope">
             <el-tooltip v-if="scope.row.roleId !== 1" content="修改" placement="top">
-              <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-has-permi="['system:role:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip v-if="scope.row.roleId !== 1" content="删除" placement="top">
-              <el-button v-hasPermi="['system:role:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['system:role:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip v-if="scope.row.roleId !== 1" content="数据权限" placement="top">
-              <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
+              <el-button v-has-permi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip v-if="scope.row.roleId !== 1" content="分配用户" placement="top">
-              <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(scope.row)"></el-button>
+              <el-button v-has-permi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -213,6 +196,7 @@ import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/m
 import { RoleVO, RoleForm, RoleQuery, DeptTreeOption } from '@/api/system/role/types';
 import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
 import { checkPermi } from '@/utils/permission';
+import { QuestionFilled } from '@element-plus/icons-vue';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -388,10 +372,6 @@ const handleAdd = () => {
     path: '/system/addRole'
   });
   return;
-  reset();
-  getMenuTreeselect();
-  dialog.visible = true;
-  dialog.title = '添加角色';
 };
 /** 修改角色 */
 const handleUpdate = async (row?: RoleVO) => {
@@ -403,19 +383,6 @@ const handleUpdate = async (row?: RoleVO) => {
     }
   });
   return;
-  reset();
-  const roleId = row?.roleId || ids.value[0];
-  const { data } = await getRole(roleId);
-  Object.assign(form.value, data);
-  form.value.roleSort = Number(form.value.roleSort);
-  const res = await getRoleMenuTreeselect(roleId);
-  dialog.title = '修改角色';
-  dialog.visible = true;
-  res.checkedKeys.forEach((v) => {
-    nextTick(() => {
-      menuRef.value?.setChecked(v, true, false);
-    });
-  });
 };
 /** 根据角色ID查询菜单树结构 */
 const getRoleMenuTreeselect = (roleId: string | number) => {
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 2c50231..21a47b9 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -44,6 +44,7 @@
 </template>
 
 <script setup name="SelectUser" lang="ts">
+import pagination from '@/components/Pagination/index.vue';
 import { authUserSelectAll, unallocatedUserList } from '@/api/system/role';
 import { UserVO } from '@/api/system/user/types';
 import { UserQuery } from '@/api/system/user/types';
diff --git a/src/views/system/statistics/Payment/index.vue b/src/views/system/statistics/Payment/index.vue
index 82884be..e22b8a1 100644
--- a/src/views/system/statistics/Payment/index.vue
+++ b/src/views/system/statistics/Payment/index.vue
@@ -61,7 +61,7 @@
         <el-col :lg="12" :xl="10">
           <div class="cardbox w-full" style="height: 400px">
             <div style="height: 50px; margin-bottom: 20px">缴费来源</div>
-            <div flex flex-items-center justify-center>
+            <div class="flex flex-items-center justify-center">
               <ul class="legendbox">
                 <li v-for="(item, index) in paytypelist" :key="index">
                   <i
diff --git a/src/views/system/statistics/Personnel/index.vue b/src/views/system/statistics/Personnel/index.vue
index 55908de..41b15eb 100644
--- a/src/views/system/statistics/Personnel/index.vue
+++ b/src/views/system/statistics/Personnel/index.vue
@@ -72,7 +72,7 @@
 import { ref } from 'vue';
 import Echarts from '@/components/Echarts/index.vue';
 import { EChartsOption } from 'echarts';
-import { getLast7Days, getLastNDays } from '@/utils/time';
+import { getLastNDays } from '@/utils/time';
 import { get_movein_moveout_list, get_movein_user_sex, get_movein_user_type, user_movein_list } from '@/api/system/Personnel';
 
 const date = ref('');
diff --git a/src/views/system/storeroom/addStoreRoom.vue b/src/views/system/storeroom/addStoreRoom.vue
index 95a9939..b9cc99d 100644
--- a/src/views/system/storeroom/addStoreRoom.vue
+++ b/src/views/system/storeroom/addStoreRoom.vue
@@ -65,7 +65,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { getBuildinglistAPI, getBuildinglists, getBuildingOnly, getHouselistAPI } from '@/api/system/house';
+import { getBuildinglists } from '@/api/system/house';
 import { addStoreroom, getStoreroom, updateStoreroom } from '@/api/system/storeroom';
 import { StoreroomVO } from '@/api/system/storeroom/types';
 import { getByBUildingidtoUnitNo } from '@/api/system/houseUnit';
@@ -211,7 +211,7 @@ const cancelForm = () => {
         align-items: center;
         .el-input {
           width: 100px;
-          margin-right: 0px;
+          margin-right: 0;
         }
         span {
           margin: 0 20px;
diff --git a/src/views/system/storeroom/index.vue b/src/views/system/storeroom/index.vue
index 3bd9a3a..13bb25f 100644
--- a/src/views/system/storeroom/index.vue
+++ b/src/views/system/storeroom/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="p-2 flex storeRoomBox">
-    <Pageheader title="储藏室管理"></Pageheader>
+    <pageHeader title="储藏室管理"></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -20,19 +20,6 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['storeroom:storeroom:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['storeroom:storeroom:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['storeroom:storeroom:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
             :disable-edit="single"
@@ -57,8 +44,8 @@
         <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" width="150" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['storeroom:storeroom:edit']">修改</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['storeroom:storeroom:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['storeroom:storeroom:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['storeroom:storeroom:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -69,8 +56,11 @@
 </template>
 
 <script setup name="Storeroom" lang="ts">
-import Pageheader from '@/components/Pageheader/index.vue';
-import { listStoreroom, delStoreroom } from '@/api/system/storeroom/index';
+import pageHeader from '@/components/Pageheader/index.vue';
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import pagination from '@/components/Pagination/index.vue';
+
+import { listStoreroom, delStoreroom } from '@/api/system/storeroom';
 import { StoreroomVO, StoreroomQuery, StoreroomForm } from '@/api/system/storeroom/types';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 72ae0ec..2b8ef7d 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -29,20 +29,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button v-has-permi="['system:tenant:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+            <el-button v-has-permi="['system:tenant:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
               >修改</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['system:tenant:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-has-permi="['system:tenant:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
@@ -75,14 +75,14 @@
         <el-table-column width="150" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-has-permi="['system:tenant:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="同步套餐" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)">
+              <el-button v-has-permi="['system:tenant:edit']" link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)">
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:tenant:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['system:tenant:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index e6986ee..77e22e7 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -20,20 +20,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:add']" type="primary" plain icon="Plus" @click="handleAdd"> 新增 </el-button>
+            <el-button v-has-permi="['system:tenantPackage:add']" type="primary" plain icon="Plus" @click="handleAdd"> 新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
+            <el-button v-has-permi="['system:tenantPackage:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
               修改
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['system:tenantPackage:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:export']" type="warning" plain icon="Download" @click="handleExport">导出 </el-button>
+            <el-button v-has-permi="['system:tenantPackage:export']" type="warning" plain icon="Download" @click="handleExport">导出 </el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -52,10 +52,10 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:tenantPackage:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-has-permi="['system:tenantPackage:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:tenantPackage:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['system:tenantPackage:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/system/test/Questionnaire.vue b/src/views/system/test/Questionnaire.vue
index 3dcc192..7c8e069 100644
--- a/src/views/system/test/Questionnaire.vue
+++ b/src/views/system/test/Questionnaire.vue
@@ -88,6 +88,7 @@
 <script setup name="Questionnaire">
 import { listQuestionnaire, delQuestionnaire, getQuestionnaire } from './api';
 import QuestionnaireEdit from './QuestionnaireEdit.vue';
+import { Delete, Edit, Plus } from '@element-plus/icons-vue';
 const { proxy } = getCurrentInstance();
 const questionnaireList = ref([]);
 const open = ref(false);
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 88499de..3a9eded 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="p-2 h-full flex flex-col">
-    <pageheader> </pageheader>
+    <pageHeader> </pageHeader>
     <div class="panel">
       <h4 class="panel-title">基本信息</h4>
       <el-form :model="form" :inline="true">
@@ -56,11 +56,12 @@
 </template>
 
 <script setup name="AuthRole" lang="ts">
+import pageHeader from '@/components/Pageheader/index.vue';
+import pagination from '@/components/Pagination/index.vue';
 import { RoleVO } from '@/api/system/role/types';
 import { getAuthRole, updateAuthRole } from '@/api/system/user';
 import { UserForm } from '@/api/system/user/types';
 import { RouteLocationNormalized } from 'vue-router';
-import { parseTime } from '@/utils/ruoyi';
 
 const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 5dcd915..6b01ee6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -8,17 +8,6 @@
             <el-form-item label="员工姓名" prop="nickName">
               <el-input v-model="queryParams.nickName" placeholder="请输入员工姓名" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <!-- <el-form-item label="员工账号" prop="userName">
-                  <el-input v-model="queryParams.userName" placeholder="请输入员工账号" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phonenumber">
-                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                  <el-select v-model="queryParams.status" placeholder="员工状态" clearable>
-                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-                  </el-select>
-                </el-form-item> -->
             <el-form-item>
               <el-button type="primary" @click="handleQuery">搜索</el-button>
               <el-button @click="resetQuery">重置</el-button>
@@ -31,45 +20,20 @@
     <el-card class="flex-1" shadow="hover">
       <template #header>
         <el-row :gutter="10">
-          <!-- <el-col :span="1.5">
-            <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-has-permi="['system:user:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
-              修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-has-permi="['system:user:remove']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
-              删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-dropdown class="mt-[1px]">
-              <el-button plain type="info">
-                更多
-                <el-icon class="el-icon--right"><arrow-down /></el-icon
-              ></el-button>
-              <template #dropdown>
-                <el-dropdown-menu>
-                  <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
-                  注意 由于el-dropdown-item标签是延迟加载的 所以v-has-permi自定义标签不生效 需要使用v-if调用方法执行
-                  <el-dropdown-item v-if="checkPermi(['system:user:import'])" icon="Top" @click="handleImport">导入数据</el-dropdown-item>
-                  <el-dropdown-item v-if="checkPermi(['system:user:export'])" icon="Download" @click="handleExport">导出数据</el-dropdown-item>
-                </el-dropdown-menu>
-              </template>
-            </el-dropdown>
-          </el-col> -->
-
-          <right-toolbar :show-add="checkPermi(['system:user:add'])" @update:add="handleAdd" more-title="更多" :columns="columns">
-            <template #dropdown>
-              <!-- <el-dropdown-item v-if="checkPermi(['system:user:edit'])" :disabled="single" @click="handleUpdate()">修改</el-dropdown-item> -->
-              <!-- <el-dropdown-item v-if="checkPermi(['system:user:remove'])" :disabled="multiple" @click="handleDelete()">删除</el-dropdown-item> -->
-              <el-dropdown-item @click="importTemplate">下载模板</el-dropdown-item>
-              <!-- 注意 由于el-dropdown-item标签是延迟加载的 所以v-has-permi自定义标签不生效 需要使用v-if调用方法执行 -->
-              <el-dropdown-item v-if="checkPermi(['system:user:import'])" @click="handleImport">导入数据</el-dropdown-item>
-              <el-dropdown-item v-if="checkPermi(['system:user:export'])" @click="handleExport">导出数据</el-dropdown-item>
-            </template>
+          <right-toolbar
+            :show-add="checkPermi(['system:user:add'])"
+            :show-delete="false"
+            :show-edit="false"
+            @update:add="handleAdd"
+            more-title="更多"
+            :columns="columns"
+          >
+            <!--            <template #dropdown>-->
+            <!--              <el-dropdown-item @click="importTemplate">下载模板</el-dropdown-item>-->
+            <!--              &lt;!&ndash; 注意 由于el-dropdown-item标签是延迟加载的 所以v-has-permi自定义标签不生效 需要使用v-if调用方法执行 &ndash;&gt;-->
+            <!--              <el-dropdown-item v-if="checkPermi(['system:user:import'])" @click="handleImport">导入数据</el-dropdown-item>-->
+            <!--              <el-dropdown-item v-if="checkPermi(['system:user:export'])" @click="handleExport">导出数据</el-dropdown-item>-->
+            <!--            </template>-->
           </right-toolbar>
         </el-row>
       </template>
@@ -95,18 +59,18 @@
         <el-table-column align="center" label="操作" fixed="right" width="200">
           <template #default="scope">
             <el-tooltip v-if="scope.row.userId !== 1" content="修改" placement="top">
-              <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button v-has-permi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip v-if="scope.row.userId !== 1" content="删除" placement="top">
-              <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
 
             <el-tooltip v-if="scope.row.userId !== 1" content="重置密码" placement="top">
-              <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key" @click="handleResetPwd(scope.row)"></el-button>
+              <el-button v-has-permi="['system:user:resetPwd']" link type="primary" icon="Key" @click="handleResetPwd(scope.row)"></el-button>
             </el-tooltip>
 
             <el-tooltip v-if="scope.row.userId !== 1" content="分配角色" placement="top">
-              <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
+              <el-button v-has-permi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -523,13 +487,6 @@ const handleAdd = async () => {
     path: '/system/addUser'
   });
   return;
-  reset();
-  const { data } = await api.getUser();
-  dialog.visible = true;
-  dialog.title = '新增员工';
-  postOptions.value = data.posts;
-  roleOptions.value = data.roles;
-  form.value.password = initPassword.value.toString();
 };
 
 /** 修改按钮操作 */
@@ -542,19 +499,6 @@ const handleUpdate = async (row?: UserForm) => {
     }
   });
   return;
-  reset();
-  const { data } = await api.getUser(userId);
-  dialog.visible = true;
-  dialog.title = '修改员工';
-  Object.assign(form.value, data.user);
-  postOptions.value = data.posts;
-  roleOptions.value = Array.from(new Map([...data.roles, ...data.user.roles].map((role) => [role.roleId, role])).values());
-  form.value.postIds = data.postIds;
-  form.value.roleIds = data.roleIds;
-  if (data.user.villageIds) {
-    villags.value = data.user.villageIds.split(',').filter((item) => item);
-  }
-  form.value.password = '';
 };
 
 /** 提交按钮 */
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index cf40440..4ce5692 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -69,7 +69,6 @@
 import UserAvatar from './userAvatar.vue';
 import UserInfo from './userInfo.vue';
 import ResetPwd from './resetPwd.vue';
-import ThirdParty from './thirdParty.vue';
 import OnlineDevice from './onlineDevice.vue';
 import { getAuthList } from '@/api/system/social/auth';
 import { getUserProfile } from '@/api/system/user';
diff --git a/src/views/system/user/profile/thirdParty.vue b/src/views/system/user/profile/thirdParty.vue
index 9266596..d4241b9 100644
--- a/src/views/system/user/profile/thirdParty.vue
+++ b/src/views/system/user/profile/thirdParty.vue
@@ -5,7 +5,7 @@
       <el-table-column label="绑定账号平台" width="140" align="center" prop="source" show-overflow-tooltip />
       <el-table-column label="头像" width="120" align="center" prop="avatar">
         <template #default="scope">
-          <img :src="scope.row.avatar" style="width: 45px; height: 45px" />
+          <img alt="头像" :src="scope.row.avatar" style="width: 45px; height: 45px" />
         </template>
       </el-table-column>
       <el-table-column label="系统账号" width="180" align="center" prop="userName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 8709289..fae63cd 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="user-info-head" @click="editCropper()">
-    <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
+    <img alt="头像" :src="options.img" title="点击上传头像" class="img-circle img-lg" />
     <el-dialog v-model="open" :title="title" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
       <el-row>
         <el-col :xs="24" :md="12" :style="{ height: '350px' }">
@@ -19,7 +19,7 @@
         </el-col>
         <el-col :xs="24" :md="12" :style="{ height: '350px' }">
           <div class="avatar-upload-preview">
-            <img :src="options.previews.url" :style="options.previews.img" />
+            <img alt="头像" :src="options.previews.url" :style="options.previews.img" />
           </div>
         </el-col>
       </el-row>
@@ -61,6 +61,7 @@ import { VueCropper } from 'vue-cropper';
 import { uploadAvatar } from '@/api/system/user';
 import { useUserStore } from '@/store/modules/user';
 import { UploadRawFile } from 'element-plus';
+import { Upload } from '@element-plus/icons-vue';
 
 interface Options {
   img: string | any; // 裁剪图片的地址
diff --git a/src/views/system/version/index.vue b/src/views/system/version/index.vue
index f963079..6ed957a 100644
--- a/src/views/system/version/index.vue
+++ b/src/views/system/version/index.vue
@@ -36,7 +36,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:version:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['system:version:add']">新增</el-button>
           </el-col>
           <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
         </el-row>
diff --git a/src/views/system/warehouse/Inventory/index.vue b/src/views/system/warehouse/Inventory/index.vue
index 4b32543..3868ef2 100644
--- a/src/views/system/warehouse/Inventory/index.vue
+++ b/src/views/system/warehouse/Inventory/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col h-full p-2">
-    <pageheader></pageheader>
+    <pageHeader></pageHeader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -50,21 +50,24 @@
         <el-table-column label="备注" show-overflow-tooltip align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['warehouse:edit:inventory']">编辑</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['warehouse:edit:inventory']">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <Pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
 </template>
 
 <script setup name="Material" lang="ts">
+import pageHeader from '@/components/Pageheader/index.vue';
+import Pagination from '@/components/Pagination/index.vue';
+import RightToolbar from '@/components/RightToolbar/index.vue';
+
 import { delMaterial } from '@/api/system/Tmaterial';
 import { MaterialVO, MaterialQuery, MaterialForm } from '@/api/system/Tmaterial/type';
-import { listStock } from '@/api/system/Tstock/index';
-import { checkPermi } from '@/utils/permission';
+import { listStock } from '@/api/system/Tstock';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const router = useRouter();
diff --git a/src/views/system/warehouse/IssueOut/Main.vue b/src/views/system/warehouse/IssueOut/Main.vue
index 6e759b9..8f11548 100644
--- a/src/views/system/warehouse/IssueOut/Main.vue
+++ b/src/views/system/warehouse/IssueOut/Main.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="h-full flex flex-col p-2">
-    <Pageheader></Pageheader>
+    <pageHeader></pageHeader>
     <div class="mainbody">
       <div class="actionsbox">
         <el-button @click="handlePrint" icon="Printer" type="primary">打印</el-button>
@@ -56,6 +56,7 @@
 </template>
 
 <script setup lang="ts">
+import pageHeader from '@/components/Pageheader/index.vue';
 import { ref } from 'vue';
 import { printVueDiv } from '@/utils/print';
 import { convertToChineseCapital } from '@/utils/money';
@@ -161,9 +162,8 @@ const cancelForm = () => {
       display: grid;
       grid-template-columns: repeat(3, 1fr);
       width: 85%;
-      margin: 0 auto;
       gap: 30px;
-      margin-top: 30px;
+      margin: 30px auto 0;
     }
   }
 }
diff --git a/src/views/system/warehouse/IssueOut/index.vue b/src/views/system/warehouse/IssueOut/index.vue
index e6e7ffd..bc5a858 100644
--- a/src/views/system/warehouse/IssueOut/index.vue
+++ b/src/views/system/warehouse/IssueOut/index.vue
@@ -21,10 +21,10 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['warehouse:add:issueout']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['warehouse:add:issueout']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:stockOut:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-has-permi="['system:stockOut:remove']"
               >删除</el-button
             >
           </el-col> -->
@@ -54,8 +54,8 @@
         <el-table-column label="备注" show-overflow-tooltip align="center" prop="remark" />
         <el-table-column label="操作" width="180" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['system:stockOut:query']">查看清单</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:stockOut:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleMain(scope.row)" v-has-permi="['system:stockOut:query']">查看清单</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:stockOut:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -66,7 +66,7 @@
 </template>
 
 <script setup name="StockOut" lang="ts">
-import { listStockOut, getStockOut, delStockOut, addStockOut, updateStockOut } from '@/api/system/TissueOut/index';
+import { listStockOut, delStockOut, addStockOut, updateStockOut } from '@/api/system/TissueOut/index';
 import { StockOutVO, StockOutQuery, StockOutForm } from '@/api/system/TissueOut/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/warehouse/Material/addMaterial.vue b/src/views/system/warehouse/Material/addMaterial.vue
index 8dfd1b8..1a9df94 100644
--- a/src/views/system/warehouse/Material/addMaterial.vue
+++ b/src/views/system/warehouse/Material/addMaterial.vue
@@ -33,7 +33,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { validator } from '@/utils/Reg';
 import { getMaterial, updateMaterial, addMaterial } from '@/api/system/Tmaterial';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
diff --git a/src/views/system/warehouse/Material/index.vue b/src/views/system/warehouse/Material/index.vue
index 6f9428d..da585f9 100644
--- a/src/views/system/warehouse/Material/index.vue
+++ b/src/views/system/warehouse/Material/index.vue
@@ -21,10 +21,10 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:material:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['system:material:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:material:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-has-permi="['system:material:remove']"
               >删除</el-button
             >
           </el-col> -->
@@ -50,8 +50,8 @@
         <el-table-column label="备注" show-overflow-tooltip align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:material:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:material:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:material:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:material:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -88,7 +88,7 @@
 </template>
 
 <script setup name="Material" lang="ts">
-import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from '@/api/system/Tmaterial';
+import { listMaterial, delMaterial, addMaterial, updateMaterial } from '@/api/system/Tmaterial';
 import { MaterialVO, MaterialQuery, MaterialForm } from '@/api/system/Tmaterial/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/warehouse/PurchaseIn/Main.vue b/src/views/system/warehouse/PurchaseIn/Main.vue
index 0702cc1..6a4d8b5 100644
--- a/src/views/system/warehouse/PurchaseIn/Main.vue
+++ b/src/views/system/warehouse/PurchaseIn/Main.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="h-full flex flex-col p-2">
-    <Pageheader></Pageheader>
+    <pageHeader></pageHeader>
     <div class="mainbody">
       <div class="actionsbox">
         <el-button @click="handlePrint" icon="Printer" type="primary">打印</el-button>
@@ -56,6 +56,7 @@
 </template>
 
 <script setup lang="ts">
+import pageHeader from '@/components/Pageheader/index.vue';
 import { getStockIn } from '@/api/system/TPurchaseIn';
 import { ref } from 'vue';
 import { printVueDiv } from '@/utils/print';
@@ -161,9 +162,8 @@ const cancelForm = () => {
       display: grid;
       grid-template-columns: repeat(3, 1fr);
       width: 85%;
-      margin: 0 auto;
       gap: 30px;
-      margin-top: 30px;
+      margin: 30px auto 0;
     }
   }
 }
diff --git a/src/views/system/warehouse/PurchaseIn/index.vue b/src/views/system/warehouse/PurchaseIn/index.vue
index 6670f5e..64175bf 100644
--- a/src/views/system/warehouse/PurchaseIn/index.vue
+++ b/src/views/system/warehouse/PurchaseIn/index.vue
@@ -21,7 +21,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:stockIn:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['system:stockIn:add']">新增</el-button>
           </el-col> -->
           <right-toolbar
             :disable-delete="multiple"
@@ -51,9 +51,9 @@
         <el-table-column label="备注" show-overflow-tooltip align="center" prop="remark" />
         <el-table-column label="操作" width="200" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['system:stockIn:query']">查看清单</el-button>
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:stockIn:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:stockIn:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleMain(scope.row)" v-has-permi="['system:stockIn:query']">查看清单</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:stockIn:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:stockIn:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -63,7 +63,7 @@
 </template>
 
 <script setup name="StockIn" lang="ts">
-import { listStockIn, getStockIn, delStockIn, addStockIn, updateStockIn } from '@/api/system/TPurchaseIn';
+import { listStockIn, delStockIn, addStockIn, updateStockIn } from '@/api/system/TPurchaseIn';
 import { StockInVO, StockInQuery, StockInForm } from '@/api/system/TPurchaseIn/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/warehouse/Supplier/index.vue b/src/views/system/warehouse/Supplier/index.vue
index 567d1a0..ab6feb6 100644
--- a/src/views/system/warehouse/Supplier/index.vue
+++ b/src/views/system/warehouse/Supplier/index.vue
@@ -21,10 +21,10 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['warehouse:add:supplier']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['warehouse:add:supplier']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:supplier:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-has-permi="['system:supplier:remove']"
               >删除</el-button
             >
           </el-col> -->
@@ -51,8 +51,8 @@
         <el-table-column label="备注" show-overflow-tooltip align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:supplier:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:supplier:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:supplier:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:supplier:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -92,7 +92,7 @@
 </template>
 
 <script setup name="Supplier" lang="ts">
-import { listSupplier, getSupplier, delSupplier, addSupplier, updateSupplier } from '@/api/system/Tsupplier/index';
+import { listSupplier, delSupplier, addSupplier, updateSupplier } from '@/api/system/Tsupplier/index';
 import { SupplierVO, SupplierQuery, SupplierForm } from '@/api/system/Tsupplier/type';
 import { checkPermi } from '@/utils/permission';
 
diff --git a/src/views/system/warehouse/Warehouse/index.vue b/src/views/system/warehouse/Warehouse/index.vue
index 0acdaf9..7792d09 100644
--- a/src/views/system/warehouse/Warehouse/index.vue
+++ b/src/views/system/warehouse/Warehouse/index.vue
@@ -21,10 +21,10 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:warehouse:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['system:warehouse:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:warehouse:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-has-permi="['system:warehouse:remove']"
               >删除</el-button
             >
           </el-col> -->
@@ -43,6 +43,7 @@
 
       <el-table v-loading="loading" border :data="warehouseList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" />
+<!--        <el-table-column label="隶属小区" align="center" prop="villageName" />-->
         <el-table-column label="仓库名称" align="center" prop="warehouseName" />
         <el-table-column label="联系人" width="100" align="center" prop="contactPerson" />
         <el-table-column label="联系电话" width="120" align="center" prop="contactPhone" />
@@ -60,8 +61,8 @@
         <el-table-column label="备注" width="80" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:warehouse:edit']">编辑</el-button>
-            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:warehouse:remove']">删除</el-button>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['system:warehouse:edit']">编辑</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['system:warehouse:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -101,7 +102,7 @@
 </template>
 
 <script setup name="Warehouse" lang="ts">
-import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse } from '@/api/system/Twarehouse/index';
+import { listWarehouse, delWarehouse, addWarehouse, updateWarehouse } from '@/api/system/Twarehouse/index';
 import { WarehouseVO, WarehouseQuery, WarehouseForm } from '@/api/system/Twarehouse/type';
 import { checkPermi } from '@/utils/permission';
 
@@ -140,12 +141,10 @@ const data = reactive<PageData<WarehouseForm, WarehouseQuery>>({
     pageNum: 1,
     pageSize: 10,
     warehouseName: undefined,
-    villageId: undefined,
     contactPerson: undefined,
     contactPhone: undefined,
     address: undefined,
     status: undefined,
-    params: {}
   },
   rules: {
     id: [{ required: true, message: '仓库ID不能为空', trigger: 'blur' }],
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 95065a0..cf87ce8 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -224,6 +224,7 @@
 <script setup lang="ts">
 import { listMenu } from '@/api/system/menu';
 import { propTypes } from '@/utils/propTypes';
+import { QuestionFilled } from '@element-plus/icons-vue';
 
 interface MenuOptionsType {
   menuId: number | string;
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 9a22f9d..23e3b48 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -38,6 +38,7 @@
 </template>
 
 <script setup lang="ts">
+import pagination from '@/components/Pagination/index.vue';
 import { listDbTable, importTable, getDataNames } from '@/api/tool/gen';
 import { DbTableQuery, DbTableVO } from '@/api/tool/gen/types';
 
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index e172c09..06370ea 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -39,16 +39,16 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['tool:gen:code']" type="primary" plain icon="Download" @click="handleGenTable()">生成</el-button>
+            <el-button v-has-permi="['tool:gen:code']" type="primary" plain icon="Download" @click="handleGenTable()">生成</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['tool:gen:import']" type="info" plain icon="Upload" @click="openImportTable">导入</el-button>
+            <el-button v-has-permi="['tool:gen:import']" type="info" plain icon="Upload" @click="openImportTable">导入</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['tool:gen:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleEditTable()">编辑</el-button>
+            <el-button v-has-permi="['tool:gen:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleEditTable()">编辑</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['tool:gen:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+            <el-button v-has-permi="['tool:gen:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
               删除
             </el-button>
           </el-col>
@@ -71,16 +71,16 @@
         <!-- <el-table-column label="更新时间" align="center" prop="updateTime" /> -->
         <el-table-column label="操作" align="center" width="400" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button v-hasPermi="['tool:gen:preview']" link type="primary" icon="View" @click="handlePreview(scope.row)">预览</el-button>
-            <el-button v-hasPermi="['tool:gen:edit']" link type="primary" icon="Edit" @click="handleEditTable(scope.row)">编辑</el-button>
+            <el-button v-has-permi="['tool:gen:preview']" link type="primary" icon="View" @click="handlePreview(scope.row)">预览</el-button>
+            <el-button v-has-permi="['tool:gen:edit']" link type="primary" icon="Edit" @click="handleEditTable(scope.row)">编辑</el-button>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['tool:gen:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button v-has-permi="['tool:gen:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="同步" placement="top">
-              <el-button v-hasPermi="['tool:gen:edit']" link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)"></el-button>
+              <el-button v-has-permi="['tool:gen:edit']" link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="生成代码" placement="top">
-              <el-button v-hasPermi="['tool:gen:code']" link type="primary" icon="Download" @click="handleGenTable(scope.row)"></el-button>
+              <el-button v-has-permi="['tool:gen:code']" link type="primary" icon="Download" @click="handleGenTable(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -109,6 +109,8 @@
 </template>
 
 <script setup name="Gen" lang="ts">
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import pagination from '@/components/Pagination/index.vue';
 import { delTable, genCode, getDataNames, listTable, previewTable, synchDb } from '@/api/tool/gen';
 import { TableQuery, TableVO } from '@/api/tool/gen/types';
 import router from '@/router';
diff --git a/src/views/workbench/components/inandout.vue b/src/views/workbench/components/inandout.vue
index 72cc5a8..68d0eb3 100644
--- a/src/views/workbench/components/inandout.vue
+++ b/src/views/workbench/components/inandout.vue
@@ -24,6 +24,7 @@
 </template>
 
 <script lang="ts" setup>
+import Echarts from '@/components/Echarts/index.vue';
 import { workSpaceIncomeTrendListApi, workSpaceOutcomeTrendListApi } from '@/api/workflow';
 import { getLast7Days } from '@/utils/time';
 import { EChartsOption } from 'echarts';
@@ -114,8 +115,8 @@ async function changeChartConfig(val: number) {
 
   try {
     // 1. 定义请求 Promise，如果不需请求则 resolve 空数组
-    const incomePromise = val === 0 || val === 1 ? workSpaceIncomeTrendListApi(id) : Promise.resolve([]);
-    const outcomePromise = val === 0 || val === 2 ? workSpaceOutcomeTrendListApi(id) : Promise.resolve([]);
+    const incomePromise = val === 0 || val === 1 ? await workSpaceIncomeTrendListApi(id) : [];
+    const outcomePromise = val === 0 || val === 2 ? await workSpaceOutcomeTrendListApi(id) : [];
     // 2. 并行等待，确保顺序一致：[收入数据, 支出数据]
     const [incomeRes, outcomeRes] = await Promise.all([incomePromise, outcomePromise]);
     console.log(incomeRes, outcomeRes);
diff --git a/src/views/workbench/components/quick.vue b/src/views/workbench/components/quick.vue
index e23212d..1f2b396 100644
--- a/src/views/workbench/components/quick.vue
+++ b/src/views/workbench/components/quick.vue
@@ -5,17 +5,7 @@
         <svg-icon :icon-class="item.menuIcon" />
       </div>
       <div class="quickly_item_content">{{ item.menuName }}</div>
-      <!-- <div class="actionsbox">
-                        <div class="routeactions">
-                          <el-icon><Position /></el-icon>
-                          <span style="padding-left: 0.1rem">跳转</span>
-                        </div>
-                        <div class="deleteaction">
-                          <el-icon><Delete /></el-icon>
-                          <span style="padding-left: 0.1rem">删除</span>
-                        </div>
-                      </div> -->
-      <div class="deleteaction" @click="delteRoute(item.id)">
+      <div class="deleteaction" @click="delteRoute($event, item.id)">
         <el-icon class="icons"><Remove /></el-icon>
       </div>
     </div>
@@ -27,14 +17,7 @@
     <!-- 添加快捷入口 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="repairProjectFormRef" :model="form" :rules="rules" label-width="80px">
-        <!-- <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入" />
-        </el-form-item> -->
-        <!-- <el-form-item label="图标" prop="icon">
-          <el-input v-model="form.icon" placeholder="请输入" />
-        </el-form-item> -->
         <el-form-item label="展示页面" prop="path">
-          <!-- <el-input v-model="form.path" placeholder="请输入" /> -->
           <el-cascader
             @change="handleCascader"
             clearable
@@ -59,6 +42,7 @@
 <script lang="ts" setup>
 import { addQuicklyshortcut, delQuicklyshortcut, getQuicklyshortcut } from '@/api/workflow';
 import { usePermissionStore } from '@/store/modules/permission';
+import { Plus, Remove } from '@element-plus/icons-vue';
 
 // ! 快捷入口
 const quickBox = ref<
@@ -106,7 +90,7 @@ function addQuieckDialog() {
   dialog.visible = true;
 }
 function getquicklist() {
-  getQuicklyshortcut().then((res) => {
+  getQuicklyshortcut({}).then((res) => {
     quickBox.value = res.data;
   });
 }
@@ -116,10 +100,13 @@ function handleroutestoshowlist(rotues) {
   if (!Array.isArray(rotues)) {
     return [];
   }
-  const arr = rotues.map((ele) => _hanle(null, ele, 1)).filter((item) => item);
-  quicklylist.value = arr;
+  quicklylist.value = rotues.map((ele) => _handle(null, ele, 1)).filter((item) => item);
 }
-function _hanle(parentRoute, currentRoute, level) {
+function _handle(
+  parentRoute: { name?: any; icon?: any; path: any; level?: any; children?: any[] },
+  currentRoute: { hidden: any; path: string; meta: { title: any; icon: any }; children: any[] },
+  level: number
+) {
   // 非页面路由
   if (currentRoute.hidden && level === 1) {
     return null;
@@ -156,7 +143,7 @@ function _hanle(parentRoute, currentRoute, level) {
   }
   // 4. 递归处理子节点
   if (level < 2 && currentRoute.children && Array.isArray(currentRoute.children)) {
-    obj.children = currentRoute.children.map((item) => _hanle(obj, item, level + 1)).filter((item) => item !== null); // 过滤掉 null 值
+    obj.children = currentRoute.children.map((item) => _handle(obj, item, level + 1)).filter((item) => item !== null); // 过滤掉 null 值
   }
   return obj;
 }
@@ -184,7 +171,8 @@ function submitQuick() {
     getquicklist();
   });
 }
-function delteRoute(id: string) {
+function delteRoute(e: MouseEvent, id: string) {
+  e.stopPropagation();
   delQuicklyshortcut(id).then(() => {
     getquicklist();
   });
diff --git a/src/views/workbench/components/repairEcharts.vue b/src/views/workbench/components/repairEcharts.vue
index e06e0a6..3cb402c 100644
--- a/src/views/workbench/components/repairEcharts.vue
+++ b/src/views/workbench/components/repairEcharts.vue
@@ -1,5 +1,5 @@
 <script name="repairEcharts" setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { onMounted } from 'vue';
 import { workSpaceRepairTrendListApi } from '@/api/workflow';
 import Echarts from '@/components/Echarts/index.vue';
 import type { EChartsOption } from 'echarts';
diff --git a/src/views/workbench/components/repairechartsAll.vue b/src/views/workbench/components/repairechartsAll.vue
index 6cdd558..879c3d5 100644
--- a/src/views/workbench/components/repairechartsAll.vue
+++ b/src/views/workbench/components/repairechartsAll.vue
@@ -21,81 +21,77 @@ import repairEcharts from './repairEcharts.vue';
 </script>
 
 <style scoped lang="scss">
-// echarts
-.echartsbox {
-  height: inherit;
-  .echarts {
-    margin-right: 20px;
+.echarts {
+  margin-right: 20px;
+  flex: 1;
+  height: 450px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, #ffffff 70%);
+  border: 2px solid #ffffff;
+  border-radius: 12px;
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+  &:last-child {
+    margin-right: 0;
+  }
+
+  .nav {
+    .ecarts_title {
+      font-weight: 500;
+      font-size: 1rem;
+      color: #303133;
+      line-height: 25px;
+    }
+    .echarts_units {
+      margin-left: 10px;
+      font-weight: 400;
+      font-size: 12px;
+      color: #98a4b2;
+      line-height: 15px;
+      text-align: left;
+    }
+    .echarts_all_baoxiu {
+      height: 18px;
+      font-weight: 400;
+      font-size: 14px;
+      color: #98a4b2;
+      line-height: 18px;
+      margin-right: 7px;
+    }
+    .echarts_all_arrow {
+      display: block;
+      width: 10px;
+      height: 10px;
+      border: 1px solid #ccc;
+      transform: rotateZ(45deg);
+      border-bottom-color: transparent;
+      border-left-color: transparent;
+    }
+
+    .actions {
+      width: 60px;
+      height: 22px;
+      border-radius: 4px 4px 4px 4px;
+      background-color: #f6f7fb;
+      color: #99a5b3;
+      text-align: center;
+      line-height: 22px;
+      font-size: 14px;
+      cursor: pointer;
+      margin-right: 10px;
+      &:hover {
+        color: #036aff;
+        background-color: #036cff25;
+      }
+    }
+    .actions.active {
+      color: white;
+      background-color: #036aff;
+    }
+  }
+  .echartsbody {
     flex: 1;
-    height: 450px;
-    background: linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, #ffffff 70%);
-    border: 2px solid #ffffff;
-    border-radius: 12px;
-    padding: 20px;
-    display: flex;
-    flex-direction: column;
-    &:last-child {
-      margin-right: 0;
-    }
-
-    .nav {
-      .ecarts_title {
-        font-weight: 500;
-        font-size: 1rem;
-        color: #303133;
-        line-height: 25px;
-      }
-      .echarts_units {
-        margin-left: 10px;
-        font-weight: 400;
-        font-size: 12px;
-        color: #98a4b2;
-        line-height: 15px;
-        text-align: left;
-      }
-      .echarts_all_baoxiu {
-        height: 18px;
-        font-weight: 400;
-        font-size: 14px;
-        color: #98a4b2;
-        line-height: 18px;
-        margin-right: 7px;
-      }
-      .echarts_all_arrow {
-        display: block;
-        width: 10px;
-        height: 10px;
-        border: 1px solid #ccc;
-        transform: rotateZ(45deg);
-        border-bottom-color: transparent;
-        border-left-color: transparent;
-      }
-
-      .actions {
-        width: 60px;
-        height: 22px;
-        border-radius: 4px 4px 4px 4px;
-        background-color: #f6f7fb;
-        color: #99a5b3;
-        text-align: center;
-        line-height: 22px;
-        font-size: 14px;
-        cursor: pointer;
-        margin-right: 10px;
-        &:hover {
-          color: #036aff;
-          background-color: #036cff25;
-        }
-      }
-      .actions.active {
-        color: white;
-        background-color: #036aff;
-      }
-    }
-    .echartsbody {
-      flex: 1;
-      margin-top: 20px;
-    }
+    margin-top: 20px;
   }
 }
 </style>
diff --git a/src/views/workbench/components/todo.vue b/src/views/workbench/components/todo.vue
index 2da528b..ef34ac4 100644
--- a/src/views/workbench/components/todo.vue
+++ b/src/views/workbench/components/todo.vue
@@ -51,6 +51,7 @@
 import { addHandleLog, uploadAttachments } from '@/api/system/HandleLog';
 import { useUserStore } from '@/store/modules/user';
 import { UploadFiles, UploadProps, UploadUserFile } from 'element-plus';
+import { Upload } from '@element-plus/icons-vue';
 
 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/handleLog/uploadAttachments';
 const noticForm = ref({
diff --git a/src/views/workbench/components/villageAllinfo.vue b/src/views/workbench/components/villageAllinfo.vue
index caeff0e..c06e912 100644
--- a/src/views/workbench/components/villageAllinfo.vue
+++ b/src/views/workbench/components/villageAllinfo.vue
@@ -47,7 +47,7 @@ const props = defineProps<{
       margin-right: 10px;
       min-height: 109px;
       background: linear-gradient(180deg, rgba(255, 255, 255, 0.5) 0%, #ffffff 100%);
-      box-shadow: 0px 4px 8px 0px rgba(0, 104, 255, 0.06);
+      box-shadow: 0 4px 8px 0 rgba(0, 104, 255, 0.06);
       border-radius: 8px 8px 8px 8px;
       border: 1px solid #ffffff;
       padding-left: 20px;
@@ -56,7 +56,7 @@ const props = defineProps<{
       .icon {
         width: 40px;
         height: 46px;
-        box-shadow: inset 0px 0px 20px 0px #ffffff;
+        box-shadow: inset 0 0 20px 0 #ffffff;
         border-radius: 10px 10px 10px 10px;
         border: 1px solid #ffffff;
         margin-right: 15px;
diff --git a/src/views/workbench/components/weather.vue b/src/views/workbench/components/weather.vue
index c8a4900..b86dbec 100644
--- a/src/views/workbench/components/weather.vue
+++ b/src/views/workbench/components/weather.vue
@@ -17,7 +17,13 @@
     <div class="villageinfo flex-1">
       <div class="villagename">{{ props.villageinfo.villageName }}</div>
       <div class="week">
-        <span style="padding-right: 10px">{{ new Date().toLocaleDateString().replaceAll('/', '-') }}</span>
+        <span style="padding-right: 10px">{{
+          new Intl.DateTimeFormat('zh-cn', {
+            year: 'numeric',
+            month: 'numeric',
+            day: 'numeric'
+          }).format(new Date())
+        }}</span>
         <span>{{ numToWeek2(new Date().getDay()) }}</span>
       </div>
     </div>
@@ -81,11 +87,11 @@ const weather_icon = ref({
     width: 70px;
     height: 70px;
     text-align: center;
-    margin-right: 20px;
     font-size: 60px;
     position: relative;
     z-index: 2;
     cursor: default;
+    margin-right: 20px;
     margin: 0 auto;
 
     .icon_box_text {
diff --git a/src/views/workflow/category/index.vue b/src/views/workflow/category/index.vue
index 720b063..1b66d36 100644
--- a/src/views/workflow/category/index.vue
+++ b/src/views/workflow/category/index.vue
@@ -18,7 +18,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['workflow:category:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-has-permi="['workflow:category:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -41,13 +41,13 @@
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['workflow:category:edit']" />
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-has-permi="['workflow:category:edit']" />
             </el-tooltip>
             <el-tooltip content="新增" placement="top">
-              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['workflow:category:add']" />
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-has-permi="['workflow:category:add']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['workflow:category:remove']" />
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-has-permi="['workflow:category:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 7e36743..01fd211 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -22,10 +22,10 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['workflow:leave:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button v-has-permi="['workflow:leave:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['workflow:leave:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-has-permi="['workflow:leave:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -60,12 +60,12 @@
           <template #default="scope">
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
-                <el-button v-hasPermi="['workflow:leave:edit']" size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                <el-button v-has-permi="['workflow:leave:edit']" size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)"
                   >修改</el-button
                 >
               </el-col>
               <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
-                <el-button v-hasPermi="['workflow:leave:remove']" size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                <el-button v-has-permi="['workflow:leave:remove']" size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)"
                   >删除</el-button
                 >
               </el-col>
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index f6085f6..e133937 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -55,12 +55,11 @@
 
 <script setup name="Leave" lang="ts">
 import { addLeave, getLeave, submitAndFlowStart, updateLeave } from '@/api/workflow/leave';
-import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { LeaveForm, LeaveQuery } from '@/api/workflow/leave/types';
 import { startWorkFlow } from '@/api/workflow/task';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import ApprovalButton from '@/components/Process/approvalButton.vue';
-import { AxiosResponse } from 'axios';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index af8a031..848d4ca 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -42,25 +42,25 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button v-hasPermi="['workflow:definition:add']" type="primary" icon="Plus" @click="handleAdd()">添加</el-button>
+                <el-button v-has-permi="['workflow:definition:add']" type="primary" icon="Plus" @click="handleAdd()">添加</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['workflow:definition:edit']" type="success" icon="Edit" :disabled="single" @click="handleUpdate()"
+                <el-button v-has-permi="['workflow:definition:edit']" type="success" icon="Edit" :disabled="single" @click="handleUpdate()"
                   >修改</el-button
                 >
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['workflow:definition:remove']" type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()"
+                <el-button v-has-permi="['workflow:definition:remove']" type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()"
                   >删除</el-button
                 >
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['workflow:definition:import']" type="primary" icon="UploadFilled" @click="uploadDialog.visible = true"
+                <el-button v-has-permi="['workflow:definition:import']" type="primary" icon="UploadFilled" @click="uploadDialog.visible = true"
                   >部署流程文件</el-button
                 >
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['workflow:definition:export']" type="warning" icon="Download" :disabled="single" @click="handleExportDef"
+                <el-button v-has-permi="['workflow:definition:export']" type="warning" icon="Download" :disabled="single" @click="handleExportDef"
                   >导出</el-button
                 >
               </el-col>
@@ -82,7 +82,7 @@
               <el-table-column align="center" prop="activityStatus" label="激活状态" width="130">
                 <template #default="scope">
                   <el-switch
-                    v-hasPermi="['workflow:definition:active']"
+                    v-has-permi="['workflow:definition:active']"
                     v-model="scope.row.activityStatus"
                     :active-value="1"
                     :inactive-value="0"
@@ -102,7 +102,7 @@
                   <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
                       <el-button
-                        v-hasPermi="['workflow:definition:remove']"
+                        v-has-permi="['workflow:definition:remove']"
                         link
                         type="primary"
                         size="small"
@@ -113,7 +113,7 @@
                     </el-col>
                     <el-col :span="1.5">
                       <el-button
-                        v-hasPermi="['workflow:definition:copy']"
+                        v-has-permi="['workflow:definition:copy']"
                         link
                         type="primary"
                         size="small"
@@ -126,7 +126,7 @@
                   <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
                       <el-button
-                        v-hasPermi="['workflow:definition:query']"
+                        v-has-permi="['workflow:definition:query']"
                         link
                         type="primary"
                         v-if="scope.row.isPublish === 0"
@@ -136,7 +136,7 @@
                         >流程设计</el-button
                       >
                       <el-button
-                        v-hasPermi="['workflow:definition:query']"
+                        v-has-permi="['workflow:definition:query']"
                         link
                         type="primary"
                         v-else
@@ -148,7 +148,7 @@
                     </el-col>
                     <el-col v-if="scope.row.isPublish !== 1" :span="1.5">
                       <el-button
-                        v-hasPermi="['workflow:definition:publish']"
+                        v-has-permi="['workflow:definition:publish']"
                         link
                         type="primary"
                         size="small"
@@ -262,6 +262,7 @@ import { CategoryTreeVO } from '@/api/workflow/category/types';
 import { FlowDefinitionQuery, FlowDefinitionVo, FlowDefinitionForm } from '@/api/workflow/definition/types';
 import { UploadRequestOptions, TabsPaneContext } from 'element-plus';
 import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type';
+import { UploadFilled } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index b128ce0..4ca3db4 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -50,7 +50,7 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button v-hasPermi="['workflow:instance:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                <el-button v-has-permi="['workflow:instance:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
                   >删除</el-button
                 >
               </el-col>
@@ -79,7 +79,7 @@
               </el-table-column>
               <el-table-column
                 v-if="tab === 'running'"
-                v-hasPermi="['workflow:instance:active']"
+                v-has-permi="['workflow:instance:active']"
                 align="center"
                 prop="isSuspended"
                 label="状态"
@@ -103,7 +103,7 @@
                     <el-col :span="1.5">
                       <el-popover :ref="`popoverRef${scope.$index}`" trigger="click" placement="left" :width="300">
                         <el-input v-model="deleteReason" resize="none" :rows="3" type="textarea" placeholder="请输入作废原因" />
-                        <div style="text-align: right; margin: 5px 0px 0px 0px">
+                        <div style="text-align: right; margin: 5px 0 0 0">
                           <el-button size="small" text @click="cancelPopover(scope.$index)">取消</el-button>
                           <el-button size="small" type="primary" @click="handleInvalid(scope.row)">确认</el-button>
                         </div>
@@ -113,20 +113,20 @@
                       </el-popover>
                     </el-col>
                     <el-col :span="1.5">
-                      <el-button v-hasPermi="['workflow:instance:remove']" type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)"
+                      <el-button v-has-permi="['workflow:instance:remove']" type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)"
                         >删除
                       </el-button>
                     </el-col>
                   </el-row>
                   <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
-                      <el-button v-hasPermi="['workflow:instance:query']" type="primary" size="small" icon="View" @click="handleView(scope.row)"
+                      <el-button v-has-permi="['workflow:instance:query']" type="primary" size="small" icon="View" @click="handleView(scope.row)"
                         >查看</el-button
                       >
                     </el-col>
                     <el-col :span="1.5">
                       <el-button
-                        v-hasPermi="['workflow:instance:variableQuery']"
+                        v-has-permi="['workflow:instance:variableQuery']"
                         type="primary"
                         size="small"
                         icon="Document"
@@ -159,7 +159,7 @@
         <el-table-column align="center" prop="version" label="版本号" width="90">
           <template #default="scope"> v{{ scope.row.version }}.0</template>
         </el-table-column>
-        <el-table-column v-hasPermi="['workflow:instance:active']" align="center" prop="suspensionState" label="状态" min-width="70">
+        <el-table-column v-has-permi="['workflow:instance:active']" align="center" prop="suspensionState" label="状态" min-width="70">
           <template #default="scope">
             <el-tag v-if="scope.row.suspensionState == 1" type="success">激活</el-tag>
             <el-tag v-else type="danger">挂起</el-tag>
@@ -191,7 +191,7 @@
             <el-input v-model="form.value" placeholder="请输入变量值" />
           </el-form-item>
           <el-form-item>
-            <el-button v-hasPermi="['workflow:instance:variable']" type="primary" @click="handleVariable(ruleFormRef)">确认</el-button>
+            <el-button v-has-permi="['workflow:instance:variable']" type="primary" @click="handleVariable(ruleFormRef)">确认</el-button>
           </el-form-item>
         </el-form>
       </el-card>
diff --git a/src/views/workflow/spel/index.vue b/src/views/workflow/spel/index.vue
index f76427f..aa8e9fa 100644
--- a/src/views/workflow/spel/index.vue
+++ b/src/views/workflow/spel/index.vue
@@ -23,15 +23,15 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['workflow:spel:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-has-permi="['workflow:spel:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['workflow:spel:edit']"
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-has-permi="['workflow:spel:edit']"
               >修改</el-button
             >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['workflow:spel:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-has-permi="['workflow:spel:remove']"
               >删除</el-button
             >
           </el-col>
@@ -76,10 +76,10 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['workflow:spel:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-has-permi="['workflow:spel:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['workflow:spel:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-has-permi="['workflow:spel:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -155,6 +155,7 @@
 <script setup name="Spel" lang="ts">
 import { listSpel, getSpel, delSpel, addSpel, updateSpel } from '@/api/workflow/spel';
 import { SpelVO, SpelQuery, SpelForm } from '@/api/workflow/spel/types';
+import { QuestionFilled } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_show_hide, sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_show_hide', 'sys_normal_disable'));
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 8dc948f..48cdee1 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -127,13 +127,16 @@
 </template>
 
 <script setup lang="ts">
-import { pageByAllTaskWait, pageByAllTaskFinish, updateAssignee, urgeTask } from '@/api/workflow/task';
+import RightToolbar from '@/components/RightToolbar/index.vue';
+import DictTag from '@/components/DictTag/index.vue';
+import pagination from '@/components/Pagination/index.vue';
 import UserSelect from '@/components/UserSelect/index.vue';
+import processMeddle from '@/components/Process/processMeddle.vue';
+import messageType from '@/components/Process/MessageType.vue';
+import { pageByAllTaskWait, pageByAllTaskFinish, updateAssignee, urgeTask } from '@/api/workflow/task';
 import { TaskQuery } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-import processMeddle from '@/components/Process/processMeddle.vue';
-import messageType from '@/components/Process/MessageType.vue';
 import { UserVO } from '@/api/system/user/types';
 import { TabsPaneContext } from 'element-plus';
 //选人组件
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 1032c9f..e436b59 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -109,6 +109,7 @@ import { CategoryTreeVO } from '@/api/workflow/category/types';
 import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 const queryFormRef = ref<ElFormInstance>();
diff --git a/vite/plugins/icons.ts b/vite/plugins/icons.ts
index 3ae63a5..2e430d7 100644
--- a/vite/plugins/icons.ts
+++ b/vite/plugins/icons.ts
@@ -4,6 +4,6 @@ export default () => {
   return Icons({
     // 自动安装图标库
     autoInstall: true,
-    compiler: "vue3"
+    compiler: 'vue3'
   });
 };