提交阶段性预览

2026-04-20 16:38:04 +08:00
parent d0888c6afb
commit 9f9a88f303
39 changed files with 2987 additions and 194 deletions
--- a/src/api/system/InspectionItem/index.ts
+++ b/src/api/system/InspectionItem/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ItemVO, ItemForm, ItemQuery } from './type';
+
+/**
+ * 查询巡检项目列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listItem = (query?: ItemQuery): AxiosPromise<ItemVO[]> => {
+  return request({
+    url: '/inspection/item/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询巡检项目详细
+ * @param id
+ */
+export const getItem = (id: string | number): AxiosPromise<ItemVO> => {
+  return request({
+    url: '/inspection/item/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增巡检项目
+ * @param data
+ */
+export const addItem = (data: ItemForm) => {
+  return request({
+    url: '/inspection/item',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改巡检项目
+ * @param data
+ */
+export const updateItem = (data: ItemForm) => {
+  return request({
+    url: '/inspection/item',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除巡检项目
+ * @param id
+ */
+export const delItem = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/inspection/item/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/system/InspectionItem/type.ts
+++ b/src/api/system/InspectionItem/type.ts
@@ -0,0 +1,180 @@
+export interface ItemVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目名称
+   */
+  itemName: string;
+
+  /**
+   * 项目编号
+   */
+  itemCode: string;
+
+  /**
+   * 巡检标准
+   */
+  inspectionStandard: string;
+
+  /**
+   * 项目类别
+   */
+  category: string;
+
+  /**
+   * 项目描述
+   */
+  description: string;
+
+  /**
+   * 默认值
+   */
+  defaultValue: string;
+
+  /**
+   * 输入类型：text/select/radio/checkbox
+   */
+  inputType: string;
+
+  /**
+   * 选项，多个用逗号分隔
+   */
+  options: string;
+
+  /**
+   * 是否必填：0-否，1-是
+   */
+  isRequired: number;
+
+  /**
+   * 状态：0-开启，1-关闭
+   */
+  status: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface ItemForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目名称
+   */
+  itemName?: string;
+
+  /**
+   * 项目编号
+   */
+  itemCode?: string;
+
+  /**
+   * 巡检标准
+   */
+  inspectionStandard?: string;
+
+  /**
+   * 项目类别
+   */
+  category?: string;
+
+  /**
+   * 项目描述
+   */
+  description?: string;
+
+  /**
+   * 默认值
+   */
+  defaultValue?: string;
+
+  /**
+   * 输入类型：text/select/radio/checkbox
+   */
+  inputType?: string;
+
+  /**
+   * 选项，多个用逗号分隔
+   */
+  options?: string;
+
+  /**
+   * 是否必填：0-否，1-是
+   */
+  isRequired?: number;
+
+  /**
+   * 状态：0-开启，1-关闭
+   */
+  status?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface ItemQuery extends PageQuery {
+  /**
+   * 项目名称
+   */
+  itemName?: string;
+
+  /**
+   * 项目编号
+   */
+  itemCode?: string;
+
+  /**
+   * 巡检标准
+   */
+  inspectionStandard?: string;
+
+  /**
+   * 项目类别
+   */
+  category?: string;
+
+  /**
+   * 项目描述
+   */
+  description?: string;
+
+  /**
+   * 默认值
+   */
+  defaultValue?: string;
+
+  /**
+   * 输入类型：text/select/radio/checkbox
+   */
+  inputType?: string;
+
+  /**
+   * 选项，多个用逗号分隔
+   */
+  options?: string;
+
+  /**
+   * 是否必填：0-否，1-是
+   */
+  isRequired?: number;
+
+  /**
+   * 状态：0-开启，1-关闭
+   */
+  status?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/InspectionPoint/type.ts
+++ b/src/api/system/InspectionPoint/type.ts
@@ -12,7 +12,7 @@ export interface PointVO {
  /**
   * 巡检项目id
   */
-  itemId: string | number;
+  itemId: string;

  /**
   * 所属路线ID
@@ -64,7 +64,7 @@ export interface PointForm extends BaseEntity {
  /**
   * 巡检项目id
   */
-  itemId?: string | number;
+  itemId?: string;

  /**
   * 所属路线ID
@@ -111,7 +111,7 @@ export interface PointQuery extends PageQuery {
  /**
   * 巡检项目id
   */
-  itemId?: string | number;
+  itemId?: string;

  /**
   * 所属路线ID
--- a/src/api/system/InspectionRoute/index.ts
+++ b/src/api/system/InspectionRoute/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RouteVO, RouteForm, RouteQuery } from './type';
+
+/**
+ * 查询巡检路线列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listRoute = (query?: RouteQuery): AxiosPromise<RouteVO[]> => {
+  return request({
+    url: '/inspection/route/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询巡检路线详细
+ * @param id
+ */
+export const getRoute = (id: string | number): AxiosPromise<RouteVO> => {
+  return request({
+    url: '/inspection/route/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增巡检路线
+ * @param data
+ */
+export const addRoute = (data: RouteForm) => {
+  return request({
+    url: '/inspection/route',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改巡检路线
+ * @param data
+ */
+export const updateRoute = (data: RouteForm) => {
+  return request({
+    url: '/inspection/route',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除巡检路线
+ * @param id
+ */
+export const delRoute = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/inspection/route/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/system/InspectionRoute/type.ts
+++ b/src/api/system/InspectionRoute/type.ts
@@ -0,0 +1,168 @@
+export interface RouteVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 巡检路线名称
+   */
+  routeName: string;
+
+  /**
+   * 路线描述
+   */
+  description: string;
+
+  /**
+   * 巡检点
+   */
+  totalPoints: string;
+
+  /**
+   * 预计巡检时长（分钟）
+   */
+  estimatedTime: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 巡检路线状态 0开启 1关闭
+
+   */
+  routeStatus: number;
+
+  /**
+   * 起点经度
+   */
+  startLng: string;
+
+  /**
+   * 起点纬度
+   */
+  startLat: string;
+
+  /**
+   * 终点经度
+   */
+  endLng: string;
+
+  /**
+   * 终点纬度
+   */
+  endLat: string;
+}
+
+export interface RouteForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 巡检路线名称
+   */
+  routeName?: string;
+
+  /**
+   * 路线描述
+   */
+  description?: string;
+
+  /**
+   * 巡检点
+   */
+  totalPoints?: string;
+
+  /**
+   * 预计巡检时长（分钟）
+   */
+  estimatedTime?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 巡检路线状态 0开启 1关闭
+
+   */
+  routeStatus?: number;
+
+  /**
+   * 起点经度
+   */
+  startLng?: string;
+
+  /**
+   * 起点纬度
+   */
+  startLat?: string;
+
+  /**
+   * 终点经度
+   */
+  endLng?: string;
+
+  /**
+   * 终点纬度
+   */
+  endLat?: string;
+}
+
+export interface RouteQuery extends PageQuery {
+  /**
+   * 巡检路线名称
+   */
+  routeName?: string;
+
+  /**
+   * 路线描述
+   */
+  description?: string;
+
+  /**
+   * 巡检点
+   */
+  totalPoints?: string;
+
+  /**
+   * 预计巡检时长（分钟）
+   */
+  estimatedTime?: number;
+
+  /**
+   * 巡检路线状态 0开启 1关闭
+
+   */
+  routeStatus?: number;
+
+  /**
+   * 起点经度
+   */
+  startLng?: string;
+
+  /**
+   * 起点纬度
+   */
+  startLat?: string;
+
+  /**
+   * 终点经度
+   */
+  endLng?: string;
+
+  /**
+   * 终点纬度
+   */
+  endLat?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/SdbElectricityMeterReading/index.ts
+++ b/src/api/system/SdbElectricityMeterReading/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ElectricityRecordVO, ElectricityRecordForm, ElectricityRecordQuery } from './type';
+
+/**
+ * 查询电抄记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listElectricityRecord = (query?: ElectricityRecordQuery): AxiosPromise<ElectricityRecordVO[]> => {
+  return request({
+    url: '/electricityRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询电抄记录详细
+ * @param id
+ */
+export const getElectricityRecord = (id: string | number): AxiosPromise<ElectricityRecordVO> => {
+  return request({
+    url: '/electricityRecord/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增电抄记录
+ * @param data
+ */
+export const addElectricityRecord = (data: ElectricityRecordForm) => {
+  return request({
+    url: '/electricityRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改电抄记录
+ * @param data
+ */
+export const updateElectricityRecord = (data: ElectricityRecordForm) => {
+  return request({
+    url: '/electricityRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除电抄记录
+ * @param id
+ */
+export const delElectricityRecord = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/electricityRecord/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/system/SdbElectricityMeterReading/type.ts
+++ b/src/api/system/SdbElectricityMeterReading/type.ts
@@ -0,0 +1,140 @@
+export interface ElectricityRecordVO {
+  /**
+   * 抄表记录ID
+   */
+  id: string | number;
+
+  /**
+   * 用户ID
+   */
+  deviceCode: string;
+
+  /**
+   * 总用电量
+   */
+  totalEnergy: number;
+
+  /**
+   * 抄表时间
+   */
+  readTime: string;
+
+  /**
+   * 当前余额
+   */
+  balance: number;
+
+  /**
+   * 状态（0为欠费拉闸，1为合闸，2为主动拉闸）
+   */
+  status: number;
+
+  /**
+   *
+   */
+  event: string;
+
+  /**
+   *
+   */
+  rangeTime: string;
+
+  /**
+   *
+   */
+  rangeFee: string;
+}
+
+export interface ElectricityRecordForm extends BaseEntity {
+  /**
+   * 抄表记录ID
+   */
+  id?: string | number;
+
+  /**
+   * 用户ID
+   */
+  deviceCode?: string;
+
+  /**
+   * 总用电量
+   */
+  totalEnergy?: number;
+
+  /**
+   * 抄表时间
+   */
+  readTime?: string;
+
+  /**
+   * 当前余额
+   */
+  balance?: number;
+
+  /**
+   * 状态（0为欠费拉闸，1为合闸，2为主动拉闸）
+   */
+  status?: number;
+
+  /**
+   *
+   */
+  event?: string;
+
+  /**
+   *
+   */
+  rangeTime?: string;
+
+  /**
+   *
+   */
+  rangeFee?: string;
+}
+
+export interface ElectricityRecordQuery extends PageQuery {
+  /**
+   * 用户ID
+   */
+  deviceCode?: string;
+
+  /**
+   * 总用电量
+   */
+  totalEnergy?: number;
+
+  /**
+   * 抄表时间
+   */
+  readTime?: string;
+
+  /**
+   * 当前余额
+   */
+  balance?: number;
+
+  /**
+   * 状态（0为欠费拉闸，1为合闸，2为主动拉闸）
+   */
+  status?: number;
+
+  /**
+   *
+   */
+  event?: string;
+
+  /**
+   *
+   */
+  rangeTime?: string;
+
+  /**
+   *
+   */
+  rangeFee?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/SdbWaterMeterReading/index.ts
+++ b/src/api/system/SdbWaterMeterReading/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { WaterRecordVO, WaterRecordForm, WaterRecordQuery } from './type';
+
+/**
+ * 查询水抄记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listWaterRecord = (query?: WaterRecordQuery): AxiosPromise<WaterRecordVO[]> => {
+  return request({
+    url: '/waterRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询水抄记录详细
+ * @param id
+ */
+export const getWaterRecord = (id: string | number): AxiosPromise<WaterRecordVO> => {
+  return request({
+    url: '/waterRecord/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增水抄记录
+ * @param data
+ */
+export const addWaterRecord = (data: WaterRecordForm) => {
+  return request({
+    url: '/waterRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改水抄记录
+ * @param data
+ */
+export const updateWaterRecord = (data: WaterRecordForm) => {
+  return request({
+    url: '/waterRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除水抄记录
+ * @param id
+ */
+export const delWaterRecord = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/waterRecord/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/system/SdbWaterMeterReading/type.ts
+++ b/src/api/system/SdbWaterMeterReading/type.ts
@@ -0,0 +1,125 @@
+export interface WaterRecordVO {
+  /**
+   * 抄表记录ID
+   */
+  id: string | number;
+
+  /**
+   * 用户ID
+   */
+  deviceCode: string;
+
+  /**
+   * 总用电量
+   */
+  totalEnergy: number;
+
+  /**
+   * 抄表时间
+   */
+  readTime: string;
+
+  /**
+   * 当前余额
+   */
+  balance: number;
+
+  /**
+   * 状态（0为欠费拉闸，1为合闸，2为主动拉闸）
+   */
+  status: number;
+
+  /**
+   * 1.电表 2.水表
+   */
+  type: number;
+
+  /**
+   * 水表外接电源状态（0.未连接 1.接通）
+   */
+  eleStatus: number;
+}
+
+export interface WaterRecordForm extends BaseEntity {
+  /**
+   * 抄表记录ID
+   */
+  id?: string | number;
+
+  /**
+   * 用户ID
+   */
+  deviceCode?: string;
+
+  /**
+   * 总用电量
+   */
+  totalEnergy?: number;
+
+  /**
+   * 抄表时间
+   */
+  readTime?: string;
+
+  /**
+   * 当前余额
+   */
+  balance?: number;
+
+  /**
+   * 状态（0为欠费拉闸，1为合闸，2为主动拉闸）
+   */
+  status?: number;
+
+  /**
+   * 1.电表 2.水表
+   */
+  type?: number;
+
+  /**
+   * 水表外接电源状态（0.未连接 1.接通）
+   */
+  eleStatus?: number;
+}
+
+export interface WaterRecordQuery extends PageQuery {
+  /**
+   * 用户ID
+   */
+  deviceCode?: string;
+
+  /**
+   * 总用电量
+   */
+  totalEnergy?: number;
+
+  /**
+   * 抄表时间
+   */
+  readTime?: string;
+
+  /**
+   * 当前余额
+   */
+  balance?: number;
+
+  /**
+   * 状态（0为欠费拉闸，1为合闸，2为主动拉闸）
+   */
+  status?: number;
+
+  /**
+   * 1.电表 2.水表
+   */
+  type?: number;
+
+  /**
+   * 水表外接电源状态（0.未连接 1.接通）
+   */
+  eleStatus?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/community/index.ts
+++ b/src/api/system/community/index.ts
@@ -23,8 +23,17 @@ export function deleteVillageByIdAPI(id: number): AxiosPromise<null> {
    method: 'delete'
  });
 }
+
+type uploadResponseType = {
+  'success': {
+    'url': string;
+    'fileName': string;
+    'ossId': string;
+  }[];
+  'error': string[];
+};
 /** 上传小区图片 */
-export function uploadVillageImageAPI(formdata: FormData): AxiosPromise<{ fileName: string; url: string; ossId: string }[]> {
+export function uploadVillageImageAPI(formdata: FormData): AxiosPromise<uploadResponseType> {
  return request({
    url: `/village/uploadImages`,
    method: 'post',
--- a/src/api/system/house/index.ts
+++ b/src/api/system/house/index.ts
@@ -73,9 +73,9 @@ export function addHouseAPI(data: addHouseType) {
  });
 }
 // 删除房屋
-export function deleteHouseApi(houseIds: string) {
+export function deleteHouseApi(houseIds: string | string[]) {
  return request({
-    url: `/house/${houseIds}`,
+    url: `/house/` + houseIds,
    method: 'delete'
  });
 }
--- a/src/api/workflow/index.ts
+++ b/src/api/workflow/index.ts
@@ -0,0 +1,22 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 查询小区概况
+ * @param query
+ * @returns {*}
+ */
+export const workSpaceTotalListApi = (
+  villageId: number
+): Promise<{
+  totalResident: number;
+  totalHouse: number;
+  totalParking: number;
+  totalComplaint: number;
+}> => {
+  return request({
+    url: '/workSpace/totalList',
+    method: 'get',
+    params: villageId
+  });
+};
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -151,6 +151,8 @@ watch(
  border-bottom: 1px solid #dfedff;

  color: #fff;
+  color: #c0c4cc;
+
  box-shadow: none;
  display: flex;
  align-items: center;
@@ -216,6 +218,8 @@ watch(
      height: 100%;
      font-size: 18px;
      color: #fff;
+      color: #c0c4cc;
+
      vertical-align: text-bottom;

      &.hover-effect {
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -11,75 +11,123 @@ import { usePermissionStore } from '@/store/modules/permission';
 import { ElMessage } from 'element-plus/es';

 NProgress.configure({ showSpinner: false });
+
+// 白名单：不需要登录就能访问的页面
 const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*'];

-// ✅ 关键：防止重复添加动态路由
+// 全局标记：动态路由是否已经添加过（只加载一次！）
 let isDynamicRoutesAdded = false;

+// 判断是否在白名单
 const isWhiteList = (path: string) => {
  return whiteList.some((pattern) => isPathMatch(pattern, path));
 };

 router.beforeEach(async (to, from) => {
  NProgress.start();
-  if (getToken()) {
+
+  // ==============================================
+  // 🚥 调试日志：每次跳转都打印（方便看你跳去了哪）
+  // ==============================================
+  console.log('==========================================================');
+  console.log('🔀 路由跳转：', from.path, ' → ', to.path);
+  console.log('🔐 是否有Token：', !!getToken());
+  console.log('🚦 动态路由是否已加载：', isDynamicRoutesAdded);
+
+  const hasToken = getToken();
+  const userStore = useUserStore();
+  const permissionStore = usePermissionStore();
+
+  if (hasToken) {
+    // 设置标题
    to.meta.title && useSettingsStore().setTitle(to.meta.title as string);

+    // 已登录 且 去登录页 → 跳首页
    if (to.path === '/login') {
+      console.log('✅ 已登录，访问登录页，直接跳首页');
      NProgress.done();
      return '/';
-    } else if (isWhiteList(to.path)) {
+    }
+
+    // 白名单页面直接放行
+    if (isWhiteList(to.path)) {
+      console.log('✅ 白名单页面，直接放行');
      return;
-    } else {
-      // ✅ 关键：判断是否已添加过动态路由
-      if (useUserStore().roles.length === 0 || !isDynamicRoutesAdded) {
-        isRelogin.show = true;
-        const [err, res] = await tos(useUserStore().getInfo());
-        if (err) {
-          await useUserStore().logout();
-          ElMessage.error(err);
-          isDynamicRoutesAdded = false; // 重置标志
-          return '/';
-        } else {
-          isRelogin.show = false;
-          const accessRoutes = await usePermissionStore().generateRoutes();
+    }

-          accessRoutes.forEach((route) => {
-            if (!isHttp(route.path) && !router.hasRoute(route.name)) {
-              router.addRoute(route);
-            }
-          });
+    // ==============================================
+    // ✅ 【关键】只在【没有角色 + 没有加载过路由】时执行一次
+    // ==============================================
+    console.log('👤 当前用户角色：', userStore.roles);
+    console.log('🧪 判断条件：roles.length === 0 && !isDynamicRoutesAdded');
+    console.log('🧪 结果：', userStore.roles.length === 0 && !isDynamicRoutesAdded);

-          isDynamicRoutesAdded = true; // ✅ 标记已添加
+    if (userStore.roles.length === 0 && !isDynamicRoutesAdded) {
+      console.log('==========================================================');
+      console.log('🚀 【首次初始化】获取用户信息 + 生成动态路由（只执行一次）');
+      console.log('==========================================================');

-          if (res.user.userId === 1 && from.path === '/login') {
-            // ✅ 关键：返回完整路由对象 + replace
-            return { path: '/community/communitylist', replace: true };
-          } else {
-            // ✅ 终极修复：返回完整路由对象，强制 replace，防止白屏
-            return {
-              path: to.path,
-              query: to.query,
-              hash: to.hash,
-              replace: true
-            };
-          }
+      isRelogin.show = true;
+
+      // 获取用户信息
+      const [err, res] = await tos(userStore.getInfo());
+      if (err) {
+        console.error('❌ 获取用户信息失败：', err);
+        await userStore.logout();
+        ElMessage.error(err);
+        isDynamicRoutesAdded = false;
+        return '/';
+      }
+
+      console.log('✅ 用户信息获取成功：', res);
+      isRelogin.show = false;
+
+      // 生成动态路由
+      const accessRoutes = await permissionStore.generateRoutes();
+      console.log('✅ 动态路由生成成功，数量：', accessRoutes.length);
+
+      // 添加路由（避免重复添加）
+      accessRoutes.forEach((route) => {
+        if (!isHttp(route.path) && !router.hasRoute(route.name)) {
+          router.addRoute(route);
        }
+      });
+
+      // ✅ 标记：路由已添加
+      isDynamicRoutesAdded = true;
+      console.log('✅ 动态路由添加完成，标记 isDynamicRoutesAdded = true');
+
+      // 管理员登录强制跳转
+      if (res.user.userId === 1 && from.path === '/login') {
+        console.log('👑 管理员登录，跳转到社区列表');
+        return { path: '/community/communitylist', replace: true };
      } else {
-        return;
+        // 重新进入当前路由（让新添加的路由生效）
+        console.log('🔄 重新跳转目标页面：', to.path);
+        return { ...to, replace: true };
      }
    }
+
+    // ==============================================
+    // ✅ 已经初始化完成 → 直接放行！
+    // ==============================================
+    console.log('✅ 已完成初始化，直接放行');
+    return;
  } else {
-    isDynamicRoutesAdded = false; // ✅ 退出时重置标志
+    // 未登录
+    isDynamicRoutesAdded = false;
+    console.log('🔒 未登录，跳转到登录页');
+
    if (isWhiteList(to.path)) {
      return;
    } else {
      NProgress.done();
-      return '/login';
+      return `/login?redirect=${to.fullPath}`;
    }
  }
 });

 router.afterEach(() => {
  NProgress.done();
+  console.log('✅ 跳转完成\n\n');
 });
--- a/src/store/modules/house.ts
+++ b/src/store/modules/house.ts
@@ -65,7 +65,7 @@ export const useHouseStore = defineStore(
    };

    // 更新小区信息
-    const updateVilageinfo = (data) => {
+    const updateVilageinfo = (data: communitylist_rows_type) => {
      currentVilageInfo.value = data;
    };

--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -15,7 +15,12 @@ declare global {
    visible: boolean;
    children?: Array<FieldOption>;
  }
-
+  /** 地图 */
+  interface Window {
+    _AMapSecurityConfig?: {
+      securityJsCode: string;
+    };
+  }
  /**
   * 弹窗属性
   */
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -35,15 +35,29 @@ const service = axios.create({
  }
 });

-// 不需要小区id 或者 加上小区id报错的接口地址
-const whiteVillageId = [];
+// 不需要小区 ID 的接口白名单（支持 * 通配符）
+const whiteVillageId = [
+  '/village',
+  '/village/*'
+  // 以后直接在这里加新地址，支持 /xxx/*、/xxx/xxx 写法
+];

-function handleWhiteVillageid(url) {
-  const spliturl = url.split('?')[0];
-  if (whiteVillageId.includes(spliturl)) {
-    return false;
-  }
-  return true;
+/**
+ * 判断当前接口是否需要携带小区 ID
+ * @param {string} url - 请求地址
+ * @returns {boolean} true=需要小区ID / false=不需要
+ */
+export function needVillageId(url: string): boolean {
+  // 去掉 ? 后面的参数
+  const path = url.split('?')[0];
+
+  // 遍历白名单，正则匹配
+  return !whiteVillageId.some((pattern) => {
+    // 把 * 转成正则的 .* 通配
+    const regPattern = pattern.replace(/\*/g, '[^\\/]*');
+    const regex = new RegExp(`^${regPattern}$`);
+    return regex.test(path);
+  });
 }
 // 请求拦截器
 service.interceptors.request.use(
@@ -60,11 +74,12 @@ service.interceptors.request.use(
    if (getToken() && !isToken) {
      config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
    }
+    console.log(needVillageId(config.url), config.url);
    // get请求映射params参数
    const villageid = localStorage.getItem('villageid');
    if (config.method === 'get' && config.params) {
      let url = '';
-      if (villageid != 'null' && !Number.isNaN(Number(villageid)) && handleWhiteVillageid(config.url)) {
+      if (villageid != 'null' && !Number.isNaN(Number(villageid)) && needVillageId(config.url)) {
        url =
          config.url +
          '?' +
@@ -82,7 +97,7 @@ service.interceptors.request.use(

    if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
      let obj = null;
-      if (villageid != 'null' && !Number.isNaN(Number(villageid)) && handleWhiteVillageid(config.url)) {
+      if (villageid != 'null' && !Number.isNaN(Number(villageid)) && needVillageId(config.url)) {
        obj = {
          ...config.data,
          villageId: Number(villageid)
--- a/src/views/community/AddCommunity.vue
+++ b/src/views/community/AddCommunity.vue
@@ -301,7 +301,7 @@ const submitForm = () => {
      newFiles.forEach((file) => formdata.append('files', file));

      uploadVillageImageAPI(formdata).then((res) => {
-        const uploadedUrls = res.data.map((x) => x.url).filter(Boolean);
+        const uploadedUrls = res.data.success.map((x) => x.url).filter(Boolean);
        // 4) 最终图片 = 已有图片 + 新上传图片（避免覆盖）
        form.value.villageImageUrl = [...existingUrls, ...uploadedUrls].join(',');
        submitFormInfo();
@@ -358,13 +358,13 @@ const cancelForm = () => {

 <style scoped lang="scss">
 .box {
+  background: linear-gradient(180deg, #deedff 0%, #f8f9fe 50%);
  .header {
    display: flex;
    align-items: center;
    height: 50px;
    line-height: 50px;
-    background-color: #1a75ff;
-    background-color: #dfedff;
+    background: linear-gradient(180deg, #deedff 0%, #f8f9fe 50%);
    & > div {
      flex: 1;
    }
--- a/src/views/community/index.vue
+++ b/src/views/community/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="box">
+  <div class="h-full box">
    <div class="header">
      <span class="">智慧物业后台管理系统</span>
      <navbar ref="navbarRef" />
@@ -14,7 +14,7 @@
      </div>
      <div class="communityBody">
        <div class="coummunity_card" v-for="(item, index) in list" :key="index">
-          <el-image :src="item.villageImageUrl ? splitImages(item.villageImageUrl.split(',')[0]) : defaultVilageinfoImage">
+          <el-image :src="item.villageImageUrl ? item.villageImageUrl.split(',')[0] : defaultVilageinfoImage">
            <template #error>
              <div class="image-viewer-slot image-slot">
                <el-icon><Picture /></el-icon>
@@ -41,6 +41,7 @@
        </div>
      </div>
    </div>
+    <i class="bgcolor"></i>
  </div>
 </template>
 <script lang="ts" setup>
@@ -59,11 +60,6 @@ const currentViliageInfo = ref<communitylist_rows_type>();
 function getlist() {
  getCommunitylistAPI().then((res) => {
    list.value = res.rows;
-    res.rows.forEach((item) => {
-      if (item.villageImageUrl) {
-        console.log(item.villageImageUrl.split(','));
-      }
-    });
  });
 }
 getlist();
@@ -105,13 +101,14 @@ function handleclick(item: communitylist_rows_type) {
 </script>
 <style scoped lang="scss">
 .box {
+  background: linear-gradient(180deg, #deedff 0%, #f8f9fe 50%);
+
  .header {
    display: flex;
    align-items: center;
    height: 50px;
    line-height: 50px;
-    background-color: #1a75ff;
-    background-color: #dfedff;
+    background: transparent;
    & > div {
      flex: 1;
    }
@@ -122,6 +119,31 @@ function handleclick(item: communitylist_rows_type) {
      color: #000;
    }
  }
+
+  .bgcolor {
+    width: 1085px;
+    height: 571px;
+    background: #fdf1ee;
+    filter: blur(400px);
+    display: block;
+    position: absolute;
+    top: 0;
+    transform: translateY(-50%);
+    right: 0;
+    pointer-events: none; /* 🔥 让它不拦截鼠标点击，穿透到下面 */
+    @media (max-width: 1540px) {
+      width: 800px;
+      height: 400px;
+    }
+    @media (max-width: 1280px) {
+      width: 600px;
+      height: 300px;
+    }
+    @media (max-width: 1030px) {
+      width: 400px;
+      height: 200px;
+    }
+  }
 }
 .image-slot {
  display: flex;
@@ -136,7 +158,7 @@ function handleclick(item: communitylist_rows_type) {
  width: 100%;
  margin: 0 auto;
  padding: 20px;
-  background-color: #f5f7fb;
+  background: transparent;
  .community_nav_box {
    height: 98px;
    border-radius: 5px;
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -101,13 +101,11 @@ const handleLogin = () => {
      if (loginForm.value.rememberMe) {
        localStorage.setItem('tenantId', String(loginForm.value.tenantId));
        localStorage.setItem('username', String(loginForm.value.username));
-        localStorage.setItem('password', String(loginForm.value.password));
        localStorage.setItem('rememberMe', String(loginForm.value.rememberMe));
      } else {
        // 否则移除
        localStorage.removeItem('tenantId');
        localStorage.removeItem('username');
-        localStorage.removeItem('password');
        localStorage.removeItem('rememberMe');
      }
      // 调用action的登录方法
--- a/src/views/system/Decoration/index.vue
+++ b/src/views/system/Decoration/index.vue
@@ -9,7 +9,7 @@
              <el-input v-model="queryParams.applyName" placeholder="请输入申请人姓名" clearable @keyup.enter="handleQuery" />
            </el-form-item>
            <el-form-item label="装修验收结果" prop="inspectionResult">
-              <el-select v-model="queryParams.typeId" placeholder="请选择装修验收结果" style="width: 240px">
+              <el-select v-model="queryParams.inspectionResult" placeholder="请选择装修验收结果" style="width: 240px">
                <el-option v-for="item in com_decoration_status" :key="item.value" :label="item.label" :value="item.value" />
              </el-select>
            </el-form-item>
--- a/src/views/system/Questionnaire/QuestionnaireView.vue
+++ b/src/views/system/Questionnaire/QuestionnaireView.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="p-2 h-full flex flex-col">
-    <div class="container_box">
+    <div class="container_box flex-1">
      <div class="titlebox flex justify-between items-center">
        <span>问卷内容</span>
        <el-button link type="primary" @click="router.back()">返回</el-button>
@@ -24,7 +24,8 @@
            <!-- 单选题/多选题选项展示 -->
            <div v-if="q.type === 'radio' || q.type === 'checkbox'" class="options">
              <div v-for="(opt, idx) in q.options" :key="idx" class="option-item">
-                <span>{{ opt.label }}</span>
+                <span :class="q.type === 'radio' ? 'radio__type' : 'checkbox__type'"></span>
+                <span class="option-label">{{ opt.label }}</span>
              </div>
            </div>

@@ -113,9 +114,9 @@ init();
 }
 .container_box {
  background-color: white;
-  height: inherit;
  font-size: 16px;
  padding: 20px;
+  padding-bottom: 60px;
 }
 .contentBox {
  width: 1200px;
@@ -150,7 +151,25 @@ init();
      align-items: center;
      margin-bottom: 8px;
      color: #666;
-
+      position: relative;
+      .option-label {
+        padding-left: 20px;
+      }
+      .radio__type {
+        position: absolute;
+        top: 6px;
+        width: 12px;
+        height: 12px;
+        border: 1px solid #666;
+        border-radius: 50%;
+      }
+      .checkbox__type {
+        position: absolute;
+        top: 6px;
+        width: 12px;
+        height: 12px;
+        border: 1px solid #666;
+      }
      .el-icon {
        margin-right: 8px;
        color: #909399;
--- a/src/views/system/Sdb/ElectricityRecord/index.vue
+++ b/src/views/system/Sdb/ElectricityRecord/index.vue
@@ -0,0 +1,310 @@
+<template>
+  <div class="p-2">
+    <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">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="用户ID" prop="deviceCode">
+              <el-input v-model="queryParams.deviceCode" placeholder="请输入用户ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="总用电量" prop="totalEnergy">
+              <el-input v-model="queryParams.totalEnergy" placeholder="请输入总用电量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="抄表时间" prop="readTime">
+              <el-date-picker clearable v-model="queryParams.readTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择抄表时间" />
+            </el-form-item>
+            <el-form-item label="当前余额" prop="balance">
+              <el-input v-model="queryParams.balance" placeholder="请输入当前余额" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="" prop="event">
+              <el-input v-model="queryParams.event" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="" prop="rangeTime">
+              <el-input v-model="queryParams.rangeTime" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="" prop="rangeFee">
+              <el-input v-model="queryParams.rangeFee" placeholder="请输入" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <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="['electricityRecord:electricityRecord:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="Edit"
+              :disabled="single"
+              @click="handleUpdate()"
+              v-hasPermi="['electricityRecord:electricityRecord:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['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
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="electricityRecordList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="抄表记录ID" align="center" prop="id" v-if="true" />
+        <el-table-column label="用户ID" align="center" prop="deviceCode" />
+        <el-table-column label="总用电量" align="center" prop="totalEnergy" />
+        <el-table-column label="抄表时间" align="center" prop="readTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.readTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前余额" align="center" prop="balance" />
+        <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column label="" align="center" prop="event" />
+        <el-table-column label="" align="center" prop="rangeTime" />
+        <el-table-column label="" align="center" prop="rangeFee" />
+        <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="['electricityRecord:electricityRecord:edit']"
+              ></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['electricityRecord:electricityRecord:remove']"
+              ></el-button>
+            </el-tooltip>
+          </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>
+    <!-- 添加或修改电抄记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="electricityRecordFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户ID" prop="deviceCode">
+          <el-input v-model="form.deviceCode" placeholder="请输入用户ID" />
+        </el-form-item>
+        <el-form-item label="总用电量" prop="totalEnergy">
+          <el-input v-model="form.totalEnergy" placeholder="请输入总用电量" />
+        </el-form-item>
+        <el-form-item label="抄表时间" prop="readTime">
+          <el-date-picker clearable v-model="form.readTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择抄表时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="当前余额" prop="balance">
+          <el-input v-model="form.balance" placeholder="请输入当前余额" />
+        </el-form-item>
+        <el-form-item label="" prop="event">
+          <el-input v-model="form.event" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="rangeTime">
+          <el-input v-model="form.rangeTime" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="rangeFee">
+          <el-input v-model="form.rangeFee" placeholder="请输入" />
+        </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="ElectricityRecord" lang="ts">
+import {
+  listElectricityRecord,
+  getElectricityRecord,
+  delElectricityRecord,
+  addElectricityRecord,
+  updateElectricityRecord
+} from '@/api/system/SdbElectricityMeterReading/index';
+import { ElectricityRecordVO, ElectricityRecordQuery, ElectricityRecordForm } from '@/api/system/SdbElectricityMeterReading/type';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const electricityRecordList = ref<ElectricityRecordVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const electricityRecordFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ElectricityRecordForm = {
+  id: undefined,
+  deviceCode: undefined,
+  totalEnergy: undefined,
+  readTime: undefined,
+  balance: undefined,
+  status: undefined,
+  event: undefined,
+  rangeTime: undefined,
+  rangeFee: undefined
+};
+const data = reactive<PageData<ElectricityRecordForm, ElectricityRecordQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceCode: undefined,
+    totalEnergy: undefined,
+    readTime: undefined,
+    balance: undefined,
+    status: undefined,
+    event: undefined,
+    rangeTime: undefined,
+    rangeFee: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '抄表记录ID不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询电抄记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listElectricityRecord(queryParams.value);
+  electricityRecordList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  electricityRecordFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ElectricityRecordVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加电抄记录';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ElectricityRecordVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getElectricityRecord(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改电抄记录';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  electricityRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateElectricityRecord(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addElectricityRecord(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ElectricityRecordVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除电抄记录编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delElectricityRecord(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'electricityRecord/electricityRecord/export',
+    {
+      ...queryParams.value
+    },
+    `electricityRecord_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/system/Sdb/SdbElectricityDevice/index.vue
+++ b/src/views/system/Sdb/SdbElectricityDevice/index.vue
@@ -20,9 +20,6 @@
    <el-card class="flex-1" shadow="never">
      <template #header>
        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button :disabled="true" type="warning" plain @click="handleExport">导入</el-button>
-          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
      </template>
--- a/src/views/system/Sdb/SdbTopupRecord/index.vue
+++ b/src/views/system/Sdb/SdbTopupRecord/index.vue
@@ -23,22 +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="['topupRecord:topupRecord:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['topupRecord:topupRecord:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['topupRecord:topupRecord:remove']"
-              >删除</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['topupRecord:topupRecord:export']">导出</el-button>
-          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
      </template>
@@ -67,22 +51,6 @@
            <DictTag :options="com_waterelectricity_topup_getOver" :value="scope.row.getOver"></DictTag>
          </template>
        </el-table-column>
-        <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="['topupRecord:topupRecord:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['topupRecord:topupRecord:remove']"
-              ></el-button>
-            </el-tooltip>
-          </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" />
--- a/src/views/system/Sdb/SdbWaterDevice/index.vue
+++ b/src/views/system/Sdb/SdbWaterDevice/index.vue
@@ -20,9 +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">导入</el-button>
-          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
      </template>
--- a/src/views/system/Sdb/WaterRecord/index.vue
+++ b/src/views/system/Sdb/WaterRecord/index.vue
@@ -0,0 +1,260 @@
+<template>
+  <div class="p-2">
+    <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">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="总用电量" prop="totalEnergy">
+              <el-input v-model="queryParams.totalEnergy" placeholder="请输入总用电量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="抄表时间" prop="readTime">
+              <el-date-picker clearable v-model="queryParams.readTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择抄表时间" />
+            </el-form-item>
+            <el-form-item label="当前余额" prop="balance">
+              <el-input v-model="queryParams.balance" placeholder="请输入当前余额" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <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="['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
+            >
+          </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
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['waterRecord:waterRecord:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="waterRecordList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="抄表记录ID" align="center" prop="id" v-if="true" />
+        <el-table-column label="用户ID" align="center" prop="deviceCode" />
+        <el-table-column label="总用电量" align="center" prop="totalEnergy" />
+        <el-table-column label="抄表时间" align="center" prop="readTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.readTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前余额" align="center" prop="balance" />
+        <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column label="1.电表 2.水表" align="center" prop="type" />
+        <el-table-column label="水表外接电源状态" align="center" prop="eleStatus" />
+        <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-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['waterRecord:waterRecord:remove']"
+              ></el-button>
+            </el-tooltip>
+          </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>
+    <!-- 添加或修改水抄记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="waterRecordFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户ID" prop="deviceCode">
+          <el-input v-model="form.deviceCode" placeholder="请输入用户ID" />
+        </el-form-item>
+        <el-form-item label="总用电量" prop="totalEnergy">
+          <el-input v-model="form.totalEnergy" placeholder="请输入总用电量" />
+        </el-form-item>
+        <el-form-item label="抄表时间" prop="readTime">
+          <el-date-picker clearable v-model="form.readTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择抄表时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="当前余额" prop="balance">
+          <el-input v-model="form.balance" placeholder="请输入当前余额" />
+        </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="WaterRecord" lang="ts">
+import { listWaterRecord, getWaterRecord, delWaterRecord, addWaterRecord, updateWaterRecord } from '@/api/system/SdbWaterMeterReading/index';
+import { WaterRecordVO, WaterRecordQuery, WaterRecordForm } from '@/api/system/SdbWaterMeterReading/type';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const waterRecordList = ref<WaterRecordVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const waterRecordFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: WaterRecordForm = {
+  id: undefined,
+  deviceCode: undefined,
+  totalEnergy: undefined,
+  readTime: undefined,
+  balance: undefined,
+  status: undefined,
+  type: undefined,
+  eleStatus: undefined
+};
+const data = reactive<PageData<WaterRecordForm, WaterRecordQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceCode: undefined,
+    totalEnergy: undefined,
+    readTime: undefined,
+    balance: undefined,
+    status: undefined,
+    type: undefined,
+    eleStatus: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '抄表记录ID不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询水抄记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listWaterRecord(queryParams.value);
+  waterRecordList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  waterRecordFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: WaterRecordVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加水抄记录';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: WaterRecordVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getWaterRecord(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改水抄记录';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  waterRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateWaterRecord(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addWaterRecord(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: WaterRecordVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除水抄记录编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delWaterRecord(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'waterRecord/waterRecord/export',
+    {
+      ...queryParams.value
+    },
+    `waterRecord_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/system/Visitor/index.vue
+++ b/src/views/system/Visitor/index.vue
@@ -5,8 +5,10 @@
      <div v-show="showSearch" class="mb-[10px]">
        <el-card shadow="hover">
          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="访客状态" prop="visitorName">
-              <el-input v-model="queryParams.visitorName" placeholder="请输入访客姓名" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="访客状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="请选择访客状态" clearable>
+                <el-option v-for="dict in com_visitor_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
            </el-form-item>
            <el-form-item label="访客姓名" prop="visitorName">
              <el-input v-model="queryParams.visitorName" placeholder="请输入访客姓名" clearable @keyup.enter="handleQuery" />
@@ -23,7 +25,7 @@
    <el-card class="flex-1" shadow="never">
      <el-table v-loading="loading" border :data="visitorList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="访问房屋" align="center" prop="houseId" />
+        <el-table-column label="访问房屋" align="center" prop="houseName" />
        <el-table-column label="访客姓名" align="center" prop="visitorName" />
        <el-table-column label="访客状态" align="center" prop="status">
          <template #default="scope">
--- a/src/views/system/Visitor/visitorMain.vue
+++ b/src/views/system/Visitor/visitorMain.vue
@@ -5,7 +5,7 @@
      <el-card>
        <template #header>
          <div class="card-header">
-            <span>车位信息</span>
+            <span>基本信息</span>
          </div>
        </template>
        <el-row>
@@ -37,13 +37,13 @@
                <div class="label">访问时长:</div>
                <div class="main">{{ formatTimeDiff(form.startTime, form.endTime) }}</div>
              </div>
-              <div class="carinfo_item">
+              <!-- <div class="carinfo_item">
                <div class="label">访问业主:</div>
                <div class="main flex align-items-center">
                  <div>去丽丽</div>
                  <div class="ml-20px color-blue cursor-pointer">住户详情</div>
                </div>
-              </div>
+              </div> -->
              <div class="carinfo_item">
                <div class="label">提交时间:</div>
                <div class="main">{{ form.startTime }}</div>
@@ -53,10 +53,11 @@
          <el-col :span="5"></el-col>
          <el-col :span="4">
            <div class="flex">
-              <div>通行证</div>
+              <div>通行证:</div>
              <div class="content-imageBox">
-                <i></i>
-                <el-image :src="splitImages(form.url)"></el-image>
+                <i class="bordertopline"></i>
+                <el-image :src="form.url"></el-image>
+                <i class="borderline"></i>
              </div>
            </div>
          </el-col>
@@ -67,8 +68,8 @@
        <el-row>
          <el-col :span="8">
            <el-table :data="tableData" style="width: 100%">
-              <el-table-column align="center" prop="date" label="开门位置" />
-              <el-table-column align="center" prop="name" label="开门时间" />
+              <el-table-column align="center" prop="name" label="开门位置" />
+              <el-table-column align="center" prop="date" label="开门时间" />
            </el-table>
          </el-col>
        </el-row>
@@ -86,21 +87,20 @@ import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { getVisitor } from '@/api/system/Visitor';
 import { formatTimeDiff } from '@/utils/time';
-import { splitImages } from '@/utils';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));

-const tableData = [
+const tableData = ref([
  {
-    date: '西大门',
-    name: '2026-04-13 13:38:11'
+    date: '',
+    name: '西大门'
  },
  {
-    date: '西大门',
-    name: '2026-05-30 02:31:16'
+    date: '',
+    name: '西大门'
  }
-];
+]);

 const userid = ref(null);
 const route = useRoute();
@@ -129,6 +129,8 @@ function init() {
        ...form.value,
        ...res.data
      };
+      tableData.value[0].date = form.value.startTime;
+      tableData.value[1].date = form.value.endTime;
    });
  }
 }
@@ -189,26 +191,19 @@ function back() {
 //

 .content-imageBox {
-  width: 200px;
-  height: 200px;
+  width: 220px;
+  height: 220px;
+  padding: 3px;
+  margin-left: 20px;
  position: relative;
  background: transparent;
-
-  i {
-    display: block;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    left: 0;
-    top: 0;
-  }
 }

 /* 四个角 */
-.content-imageBox ::before,
-.content-imageBox ::after,
-.content-imageBox i::before,
-.content-imageBox i::after {
+.content-imageBox i.borderline::before,
+.content-imageBox i.borderline::after,
+.content-imageBox i.bordertopline::before,
+.content-imageBox i.bordertopline::after {
  content: '';
  position: absolute;
  width: 20px; /* 角的大小 */
@@ -219,7 +214,7 @@ function back() {
 }

 /* 左上角 */
-.content-imageBox ::before {
+.content-imageBox i.borderline::before {
  top: 0;
  left: 0;
  border-right: none;
@@ -227,7 +222,7 @@ function back() {
 }

 /* 右上角 */
-.content-imageBox ::after {
+.content-imageBox i.borderline::after {
  top: 0;
  right: 0;
  border-left: none;
@@ -235,7 +230,7 @@ function back() {
 }

 /* 左下角 */
-.content-imageBox i::before {
+.content-imageBox i.bordertopline::before {
  bottom: 0;
  left: 0;
  border-right: none;
@@ -243,7 +238,7 @@ function back() {
 }

 /* 右下角 */
-.content-imageBox i::after {
+.content-imageBox i.bordertopline::after {
  bottom: 0;
  right: 0;
  border-left: none;
--- a/src/views/system/house/components/building.vue
+++ b/src/views/system/house/components/building.vue
@@ -27,6 +27,7 @@
 <script setup lang="ts">
 import { deleteBuildingApi } from '@/api/system/house';
 import { useHouseStore } from '@/store/modules/house';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;

 const houseStore = useHouseStore();
 const { switchBuilding } = houseStore; // 方法
@@ -47,11 +48,12 @@ const editBuilding = (id: number) => {
  });
 };
 const deleteBuilding = (id: number) => {
-  deleteBuildingApi(id)
-    .then(() => {
+  proxy?.$modal.confirm('该信息删除后无法恢复，确定要删除吗？').then(() => {
+    deleteBuildingApi(id).then(() => {
      houseStore.deleteBuildingFun(id);
-    })
-    .catch(() => {});
+      proxy?.$modal.msgSuccess('删除成功');
+    });
+  });
 };
 </script>

--- a/src/views/system/house/components/components/houseItem.vue
+++ b/src/views/system/house/components/components/houseItem.vue
@@ -39,10 +39,11 @@ const emit = defineEmits<{
  flex-wrap: wrap;
  max-height: 300px;
  overflow: auto;
+  justify-content: space-evenly;
 }

 .house {
-  width: 110px;
+  width: 100px;
  height: 40px;
  line-height: 40px;
  border: 1px solid #ddd;
--- a/src/views/system/house/components/components/table.vue
+++ b/src/views/system/house/components/components/table.vue
@@ -8,7 +8,7 @@
          </template>
        </el-table-column>
        <el-table-column
-          min-width="160"
+          min-width="260"
          align="center"
          :label="`${unit.unitNo}单元`"
          v-for="(unit, index) in houseStore.currentHouseInfoList?.units ?? []"
@@ -27,12 +27,14 @@
 import { deleteHouseApi } from '@/api/system/house';
 import houseItem from './houseItem.vue';
 import { useHouseStore } from '@/store/modules/house';
+
 const houseStore = useHouseStore();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;

 const router = useRouter();
 const menutlist = [
  { label: '编辑', value: 'edit' },
-  { label: '收费标准', value: 'money' },
+  // { label: '收费标准', value: 'money' },
  { label: '详情', value: 'main' },
  { label: '删除', value: 'delete' }
 ];
@@ -62,9 +64,11 @@ function contextMenuFun(val: { type: string; value: string }) {
      });
      break;
    case 'delete':
-      deleteHouseApi(val.value).then(() => {
-        ElMessage.success('删除成功');
-        houseStore.switchBuilding(houseStore.currentBuildingInfo.id);
+      proxy?.$modal.confirm('该信息删除后无法恢复，确定要删除吗？').then(() => {
+        deleteHouseApi(val.value).then(() => {
+          houseStore.switchBuilding(houseStore.currentBuildingInfo.id);
+          proxy?.$modal.msgSuccess('删除成功');
+        });
      });
      break;
  }
--- a/src/views/system/house/components/unit.vue
+++ b/src/views/system/house/components/unit.vue
@@ -25,6 +25,9 @@
 import { deleteHouseApi } from '@/api/system/house';
 import TableUnit from './components/table.vue';
 import { useHouseStore } from '@/store/modules/house';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
 const houseStore = useHouseStore();
 const router = useRouter();
 function handleAddHouse() {
@@ -33,18 +36,13 @@ function handleAddHouse() {
  });
 }

-function deleteAllhouse() {
+async function deleteAllhouse() {
+  await proxy?.$modal.confirm('该信息删除后无法恢复，确定要删除吗？');
  const checkhouse = houseStore.checkoutHouses;
  if (checkhouse.length > 0) {
-    let deletecount = 0;
-    checkhouse.forEach((item) => {
-      deleteHouseApi(item).then(() => {
-        deletecount++;
-        if (deletecount === checkhouse.length - 1) {
-          ElMessage.success('批量删除成功');
-          houseStore.switchBuilding(houseStore.currentBuildingInfo.id);
-        }
-      });
+    deleteHouseApi(checkhouse).then(() => {
+      houseStore.switchBuilding(houseStore.currentBuildingInfo.id);
+      ElMessage.success('批量删除成功');
    });
  } else {
    ElMessage.warning('请选择要删除的房屋');
--- a/src/views/system/inspection/Item/index2.vue
+++ b/src/views/system/inspection/Item/index2.vue
@@ -0,0 +1,262 @@
+<template>
+  <div class="p-2">
+    <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">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="项目名称" prop="itemName">
+              <el-input v-model="queryParams.itemName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <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="['system:item:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:item:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:item:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:item:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="itemList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="项目名称" align="center" prop="itemName" />
+        <el-table-column label="巡检标准" align="center" prop="inspectionStandard" />
+        <el-table-column label="状态：0-开启，1-关闭" align="center" prop="status" />
+        <el-table-column label="添加人" align="center" prop="remark" />
+        <el-table-column label="添加时间" align="center" prop="remark" />
+        <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-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:item:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:item:remove']"></el-button>
+            </el-tooltip>
+          </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>
+    <!-- 添加或修改巡检项目对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="itemFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目名称" prop="itemName">
+          <el-input v-model="form.itemName" placeholder="请输入项目名称" />
+        </el-form-item>
+        <el-form-item label="项目编号" prop="itemCode">
+          <el-input v-model="form.itemCode" placeholder="请输入项目编号" />
+        </el-form-item>
+        <el-form-item label="巡检标准" prop="inspectionStandard">
+          <el-input v-model="form.inspectionStandard" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="项目类别" prop="category">
+          <el-input v-model="form.category" placeholder="请输入项目类别" />
+        </el-form-item>
+        <el-form-item label="项目描述" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="默认值" prop="defaultValue">
+          <el-input v-model="form.defaultValue" placeholder="请输入默认值" />
+        </el-form-item>
+        <el-form-item label="选项，多个用逗号分隔" prop="options">
+          <el-input v-model="form.options" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="是否必填：0-否，1-是" prop="isRequired">
+          <el-input v-model="form.isRequired" placeholder="请输入是否必填：0-否，1-是" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </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="Item" lang="ts">
+import { listItem, getItem, delItem, addItem, updateItem } from '@/api/system/InspectionItem/index';
+import { ItemVO, ItemQuery, ItemForm } from '@/api/system/InspectionItem/type';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const itemList = ref<ItemVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const itemFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ItemForm = {
+  id: undefined,
+  itemName: undefined,
+  itemCode: undefined,
+  inspectionStandard: undefined,
+  category: undefined,
+  description: undefined,
+  defaultValue: undefined,
+  inputType: undefined,
+  options: undefined,
+  isRequired: undefined,
+  status: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<ItemForm, ItemQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    itemName: undefined,
+    itemCode: undefined,
+    inspectionStandard: undefined,
+    category: undefined,
+    description: undefined,
+    defaultValue: undefined,
+    inputType: undefined,
+    options: undefined,
+    isRequired: undefined,
+    status: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    itemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询巡检项目列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listItem(queryParams.value);
+  itemList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  itemFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ItemVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加巡检项目';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ItemVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getItem(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改巡检项目';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  itemFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateItem(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addItem(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ItemVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除巡检项目编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delItem(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/item/export',
+    {
+      ...queryParams.value
+    },
+    `item_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/system/inspection/Point/addInspectionPoint.vue
+++ b/src/views/system/inspection/Point/addInspectionPoint.vue
@@ -1,9 +1,334 @@
 <template>
-  <div class=" "></div>
+  <div class="AddBuildingBox">
+    <PageHeader></PageHeader>
+    <div class="AddBuildingBody">
+      <div class="title">基本信息</div>
+      <div class="addBuildingFormBody">
+        <el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
+          <el-form-item label="巡检点名称" prop="pointName">
+            <el-input v-model.trim="form.pointName" placeholder="请输入巡检点名称" />
+          </el-form-item>
+          <el-form-item label="巡检项目" prop="itemId">
+            <div class="itembox">
+              <div
+                class="item"
+                :class="{
+                  active: checkoutPointItemlist.includes(item.id)
+                }"
+                @click="checkoutItem(item.id)"
+                v-for="(item, index) in pointItemlist"
+                :key="index"
+              >
+                <el-icon><Check /></el-icon>
+                <div>{{ item.itemName }}</div>
+              </div>
+            </div>
+          </el-form-item>
+          <el-form-item label="打卡方式" prop="checkMode">
+            <el-select v-model="form.checkMode" placeholder="请选择打卡方式" clearable>
+              <el-option v-for="dict in com_inspection_point_checkmode" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="巡检点状态" prop="status">
+            <el-radio-group v-model="form.status">
+              <el-radio v-for="item in com_inspection_point_status" :value="item.value" :key="item.value" :label="item.value">{{
+                item.label
+              }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="巡检点位置" prop="location">
+            <div class="map" id="containerMap"></div>
+            <div class="tips">
+              <span>点击地图选择位置</span>
+              <span class="deleteMarker" v-show="Boolean(marker)" @click="clearLocation">清空选择地点</span>
+            </div>
+          </el-form-item>
+          <el-form-item style="margin-top: 30px">
+            <el-button type="primary" @click="submitForm">提交</el-button>
+            <el-button @click="cancelForm">返回</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
 </template>

 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, toRefs } from 'vue';
+import { getCurrentInstance, ComponentInternalInstance } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { ElMessage } from 'element-plus';
+import PageHeader from '@/components/Pageheader/index.vue';
+import { addPoint, getPoint, updatePoint } from '@/api/system/InspectionPoint';
+import { listItem } from '@/api/system/InspectionItem';
+import { onMounted, onUnmounted } from 'vue';
+import AMapLoader from '@amap/amap-jsapi-loader';
+import { getVillageByIdAPI } from '@/api/system/community';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_inspection_point_checkmode } = toRefs<any>(proxy?.useDict('com_inspection_point_checkmode'));
+const { com_inspection_point_status } = toRefs<any>(proxy?.useDict('com_inspection_point_status'));
+
+const router = useRouter();
+const route = useRoute();
+
+const formRef = ref();
+const form = ref({
+  id: null,
+  pointName: '',
+  itemId: '',
+  location: '',
+  status: '0',
+  checkMode: '9999'
+});
+
+const rules = ref({
+  pointName: [{ required: true, message: '请输入巡检点名称', trigger: 'blur' }],
+  itemId: [{ required: true, message: '请选择巡检项目', trigger: 'change' }],
+  checkMode: [{ required: true, message: '请选择打卡方式', trigger: 'change' }],
+  location: [{ required: true, message: '请选择巡检点位置', trigger: 'change' }]
+});
+
+// !== 初始化 =============================================================================
+
+const pointId = ref(null);
+const pointItemlist = ref([]);
+const checkoutPointItemlist = ref([]);
+function checkoutItem(id: string) {
+  form.value.itemId = ''; // 每次点击都先清空 itemId
+  if (checkoutPointItemlist.value.includes(id)) {
+    checkoutPointItemlist.value = checkoutPointItemlist.value.filter((item) => item !== id);
+  } else {
+    checkoutPointItemlist.value.push(id);
+  }
+  form.value.itemId = checkoutPointItemlist.value.join(','); // 将选中的 id 数组转换为逗号分隔的字符串
+}
+function init() {
+  // 获取巡检项目列表
+  listItem().then((res) => {
+    pointItemlist.value = res.rows;
+  });
+
+  if (route.query.id) {
+    pointId.value = route.query.id;
+    // 获取巡检点详情
+    getPoint(pointId.value).then((res) => {
+      form.value = {
+        ...form.value,
+        ...res.data
+      };
+      // 如果有 itemId，拆分到 checkoutPointItemlist
+      if (res.data.itemId) {
+        checkoutPointItemlist.value = res.data.itemId.split(',');
+      }
+      nextTick(() => {
+        initLocation();
+      });
+    });
+  }
+}
+init();
+
+// !== 提交 =============================================================================
+const submitForm = () => {
+  formRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      // 设置 itemId
+      form.value.itemId = checkoutPointItemlist.value.join(',');
+      if (pointId.value) {
+        updatePoint(form.value).then((res) => {
+          ElMessage.success('编辑成功');
+          cancelForm();
+        });
+      } else {
+        addPoint(form.value).then((res) => {
+          ElMessage.success('添加成功');
+          cancelForm();
+        });
+      }
+    }
+  });
+};
+// 返回
+const cancelForm = () => {
+  router.push({
+    path: '/inspection/point'
+  });
+};
+
+// ! map
+const mapReady = ref(false);
+let map = ref(null);
+const marker = ref(null);
+const villageid = localStorage.getItem('villageid');
+onMounted(async () => {
+  await nextTick();
+
+  window._AMapSecurityConfig = { securityJsCode: '09534b3534d8da53968529a9ce164118' };
+
+  AMapLoader.load({
+    key: '8e302fe1be5f4db62bc734db23dca149',
+    version: '2.0',
+    plugins: ['AMap.Scale', 'AMap.Marker']
+  }).then(async (AMap) => {
+    const villageinfo = await getVillageByIdAPI(Number(villageid));
+    console.log(villageinfo);
+    map.value = new AMap.Map('containerMap', {
+      viewMode: '3D',
+      zoom: 11,
+      center: [116.397428, 39.90923]
+    });
+
+    mapReady.value = true;
+    handleMap(AMap);
+    initLocation(AMap);
+  });
+});
+
+/** 清空选择地点 */
+function clearLocation() {
+  form.value.location = '';
+  if (marker.value) {
+    map.value.remove(marker.value);
+    marker.value = null;
+  }
+}
+
+function handleMap(AMap) {
+  // 添加点击事件
+  map.value.on('click', (e) => {
+    const lnglat = e.lnglat;
+    form.value.location = `${lnglat.lng},${lnglat.lat}`;
+    // 如果有 marker.value，先移除
+    if (marker.value) {
+      map.value.remove(marker.value);
+    }
+    // 添加新 marker
+    marker.value = new AMap.Marker({
+      position: lnglat,
+      map: map.value,
+      title: form.value.pointName || '巡检点'
+    });
+  });
+}
+
+const initLocation = (AMap) => {
+  if (!map.value || !form.value.location) return;
+
+  const [lng, lat] = form.value.location.split(',').map((v) => Number(v.trim()));
+  if (!Number.isFinite(lng) || !Number.isFinite(lat)) return;
+  if (!lng || !lat) return;
+
+  const lnglat = new AMap.LngLat(lng, lat);
+  map.value.setCenter(lnglat);
+  map.value.setZoom(16);
+
+  if (marker.value) {
+    map.value.remove(marker.value);
+  }
+
+  marker.value = new AMap.Marker({
+    position: lnglat,
+    map: map.value,
+    title: form.value.pointName || '巡检点'
+  });
+};
+
+onUnmounted(() => {
+  map.value?.destroy();
+});
 </script>

-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.AddBuildingBox {
+  padding: 15px;
+  height: 100%;
+  width: 100%;
+}
+.AddBuildingBody {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background-color: white;
+  padding: 15px;
+  .title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(16, 16, 16, 1);
+    border-bottom: 1px solid #bbbbbb;
+    margin-bottom: 60px;
+  }
+
+  .formBody {
+    width: 800px;
+    margin: 0 auto;
+
+    .itembox {
+      display: flex;
+      flex-wrap: wrap;
+      .item {
+        display: flex;
+        align-items: center;
+        margin-right: 20px;
+        margin-bottom: 10px;
+        font-size: 14px;
+        color: #606266;
+        border: 1px solid #ccc;
+        padding: 5px 10px;
+        border-radius: 4px;
+        cursor: pointer;
+        &:hover {
+          border-color: #409eff;
+          color: #409eff;
+        }
+        div {
+          margin-left: 10px;
+        }
+        &.active {
+          border-color: #409eff;
+          color: #409eff;
+          background-color: #f0f9ff;
+        }
+      }
+    }
+
+    .map {
+      width: 100%;
+      min-height: 500px;
+      background-color: #f0f0f0;
+      border: 1px solid #ccc;
+      border-radius: 4px;
+      margin-top: 10px;
+    }
+    .tips {
+      margin-top: 10px;
+      font-size: 12px;
+      color: #ccc;
+      .deleteMarker {
+        margin-left: 20px;
+        cursor: pointer;
+        color: #f00;
+      }
+    }
+    &:deep(.el-form-item__content, .el-select, .el-input) {
+      width: 350px !important;
+      margin-right: 10px;
+      .el-cascader {
+        width: 100%;
+      }
+    }
+    .el-form-item {
+      margin-bottom: 20px;
+      align-items: center;
+    }
+    .el-button {
+      width: 80px;
+      height: 35px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>
--- a/src/views/system/inspection/Point/index.vue
+++ b/src/views/system/inspection/Point/index.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="p-2">
+  <div class="h-full flex flex-col p-2">
    <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">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <el-form label-width="100px" ref="queryFormRef" :model="queryParams" :inline="true">
            <el-form-item label="巡检点名称" prop="pointName">
              <el-input v-model="queryParams.pointName" placeholder="请输入巡检点名称" clearable @keyup.enter="handleQuery" />
            </el-form-item>
@@ -17,7 +17,7 @@
      </div>
    </transition>

-    <el-card shadow="never">
+    <el-card class="flex-1" shadow="never">
      <template #header>
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
@@ -38,12 +38,19 @@
      <el-table v-loading="loading" border :data="pointList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="巡检点名称" align="center" prop="pointName" />
-        <el-table-column label="巡检项目id" align="center" prop="itemId" />
-        <el-table-column label="打卡方式：9999定位打卡、9998蓝牙打卡、9997NFC打卡" align="center" prop="checkMode" />
+        <el-table-column label="打卡方式" align="center" prop="checkModeName">
+          <template #default="scope">
+            <DictTag :options="com_inspection_point_checkmode" :value="scope.row.checkModeName"></DictTag>
+          </template>
+        </el-table-column>
        <el-table-column label="巡检点位置" align="center" prop="location" />
-        <el-table-column label="状态：0-开启，1-关闭" align="center" prop="status" />
-        <el-table-column label="添加人" align="center" prop="isCheck" />
-        <el-table-column label="添加时间" align="center" prop="isCheck" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <DictTag :options="com_inspection_point_status" :value="scope.row.status"></DictTag>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加人" align="center" prop="createByName" />
+        <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-tooltip content="修改" placement="top">
@@ -67,6 +74,8 @@ import { listPoint, getPoint, delPoint, addPoint, updatePoint } from '@/api/syst
 import { PointVO, PointQuery, PointForm } from '@/api/system/InspectionPoint/type';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_inspection_point_status } = toRefs<any>(proxy?.useDict('com_inspection_point_status'));
+const { com_inspection_point_checkmode } = toRefs<any>(proxy?.useDict('com_inspection_point_checkmode'));

 const pointList = ref<PointVO[]>([]);
 const buttonLoading = ref(false);
@@ -219,3 +228,9 @@ onMounted(() => {
  getList();
 });
 </script>
+
+<style lang="scss" scoped>
+.el-table {
+  height: calc(100% - 80px);
+}
+</style>
--- a/src/views/system/inspection/Route/addInspectionRoute.vue
+++ b/src/views/system/inspection/Route/addInspectionRoute.vue
@@ -0,0 +1,334 @@
+<template>
+  <div class="AddBuildingBox">
+    <PageHeader></PageHeader>
+    <div class="AddBuildingBody">
+      <div class="title">基本信息</div>
+      <div class="addBuildingFormBody">
+        <el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
+          <el-form-item label="巡检点名称" prop="pointName">
+            <el-input v-model.trim="form.pointName" placeholder="请输入巡检点名称" />
+          </el-form-item>
+          <el-form-item label="巡检项目" prop="itemId">
+            <div class="itembox">
+              <div
+                class="item"
+                :class="{
+                  active: checkoutPointItemlist.includes(item.id)
+                }"
+                @click="checkoutItem(item.id)"
+                v-for="(item, index) in pointItemlist"
+                :key="index"
+              >
+                <el-icon><Check /></el-icon>
+                <div>{{ item.itemName }}</div>
+              </div>
+            </div>
+          </el-form-item>
+          <el-form-item label="打卡方式" prop="checkMode">
+            <el-select v-model="form.checkMode" placeholder="请选择打卡方式" clearable>
+              <el-option v-for="dict in com_inspection_point_checkmode" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="巡检点状态" prop="status">
+            <el-radio-group v-model="form.status">
+              <el-radio v-for="item in com_inspection_point_status" :value="item.value" :key="item.value" :label="item.value">{{
+                item.label
+              }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="巡检点位置" prop="location">
+            <div class="map" id="containerMap"></div>
+            <div class="tips">
+              <span>点击地图选择位置</span>
+              <span class="deleteMarker" v-show="Boolean(marker)" @click="clearLocation">清空选择地点</span>
+            </div>
+          </el-form-item>
+          <el-form-item style="margin-top: 30px">
+            <el-button type="primary" @click="submitForm">提交</el-button>
+            <el-button @click="cancelForm">返回</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, toRefs } from 'vue';
+import { getCurrentInstance, ComponentInternalInstance } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { ElMessage } from 'element-plus';
+import PageHeader from '@/components/Pageheader/index.vue';
+import { addPoint, getPoint, updatePoint } from '@/api/system/InspectionPoint';
+import { listItem } from '@/api/system/InspectionItem';
+import { onMounted, onUnmounted } from 'vue';
+import AMapLoader from '@amap/amap-jsapi-loader';
+import { getVillageByIdAPI } from '@/api/system/community';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_inspection_point_checkmode } = toRefs<any>(proxy?.useDict('com_inspection_point_checkmode'));
+const { com_inspection_point_status } = toRefs<any>(proxy?.useDict('com_inspection_point_status'));
+
+const router = useRouter();
+const route = useRoute();
+
+const formRef = ref();
+const form = ref({
+  id: null,
+  pointName: '',
+  itemId: '',
+  location: '',
+  status: '0',
+  checkMode: '9999'
+});
+
+const rules = ref({
+  pointName: [{ required: true, message: '请输入巡检点名称', trigger: 'blur' }],
+  itemId: [{ required: true, message: '请选择巡检项目', trigger: 'change' }],
+  checkMode: [{ required: true, message: '请选择打卡方式', trigger: 'change' }],
+  location: [{ required: true, message: '请选择巡检点位置', trigger: 'change' }]
+});
+
+// !== 初始化 =============================================================================
+
+const pointId = ref(null);
+const pointItemlist = ref([]);
+const checkoutPointItemlist = ref([]);
+function checkoutItem(id: string) {
+  form.value.itemId = ''; // 每次点击都先清空 itemId
+  if (checkoutPointItemlist.value.includes(id)) {
+    checkoutPointItemlist.value = checkoutPointItemlist.value.filter((item) => item !== id);
+  } else {
+    checkoutPointItemlist.value.push(id);
+  }
+  form.value.itemId = checkoutPointItemlist.value.join(','); // 将选中的 id 数组转换为逗号分隔的字符串
+}
+function init() {
+  // 获取巡检项目列表
+  listItem().then((res) => {
+    pointItemlist.value = res.rows;
+  });
+
+  if (route.query.id) {
+    pointId.value = route.query.id;
+    // 获取巡检点详情
+    getPoint(pointId.value).then((res) => {
+      form.value = {
+        ...form.value,
+        ...res.data
+      };
+      // 如果有 itemId，拆分到 checkoutPointItemlist
+      if (res.data.itemId) {
+        checkoutPointItemlist.value = res.data.itemId.split(',');
+      }
+      nextTick(() => {
+        initLocation();
+      });
+    });
+  }
+}
+init();
+
+// !== 提交 =============================================================================
+const submitForm = () => {
+  formRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      // 设置 itemId
+      form.value.itemId = checkoutPointItemlist.value.join(',');
+      if (pointId.value) {
+        updatePoint(form.value).then((res) => {
+          ElMessage.success('编辑成功');
+          cancelForm();
+        });
+      } else {
+        addPoint(form.value).then((res) => {
+          ElMessage.success('添加成功');
+          cancelForm();
+        });
+      }
+    }
+  });
+};
+// 返回
+const cancelForm = () => {
+  router.push({
+    path: '/inspection/point'
+  });
+};
+
+// ! map
+const mapReady = ref(false);
+let map = ref(null);
+const marker = ref(null);
+const villageid = localStorage.getItem('villageid');
+onMounted(async () => {
+  await nextTick();
+
+  window._AMapSecurityConfig = { securityJsCode: '09534b3534d8da53968529a9ce164118' };
+
+  AMapLoader.load({
+    key: '8e302fe1be5f4db62bc734db23dca149',
+    version: '2.0',
+    plugins: ['AMap.Scale', 'AMap.Marker']
+  }).then(async (AMap) => {
+    const villageinfo = await getVillageByIdAPI(Number(villageid));
+    console.log(villageinfo);
+    map.value = new AMap.Map('containerMap', {
+      viewMode: '3D',
+      zoom: 11,
+      center: [116.397428, 39.90923]
+    });
+
+    mapReady.value = true;
+    handleMap(AMap);
+    initLocation(AMap);
+  });
+});
+
+/** 清空选择地点 */
+function clearLocation() {
+  form.value.location = '';
+  if (marker.value) {
+    map.value.remove(marker.value);
+    marker.value = null;
+  }
+}
+
+function handleMap(AMap) {
+  // 添加点击事件
+  map.value.on('click', (e) => {
+    const lnglat = e.lnglat;
+    form.value.location = `${lnglat.lng},${lnglat.lat}`;
+    // 如果有 marker.value，先移除
+    if (marker.value) {
+      map.value.remove(marker.value);
+    }
+    // 添加新 marker
+    marker.value = new AMap.Marker({
+      position: lnglat,
+      map: map.value,
+      title: form.value.pointName || '巡检点'
+    });
+  });
+}
+
+const initLocation = (AMap) => {
+  if (!map.value || !form.value.location) return;
+
+  const [lng, lat] = form.value.location.split(',').map((v) => Number(v.trim()));
+  if (!Number.isFinite(lng) || !Number.isFinite(lat)) return;
+  if (!lng || !lat) return;
+
+  const lnglat = new AMap.LngLat(lng, lat);
+  map.value.setCenter(lnglat);
+  map.value.setZoom(16);
+
+  if (marker.value) {
+    map.value.remove(marker.value);
+  }
+
+  marker.value = new AMap.Marker({
+    position: lnglat,
+    map: map.value,
+    title: form.value.pointName || '巡检点'
+  });
+};
+
+onUnmounted(() => {
+  map.value?.destroy();
+});
+</script>
+
+<style scoped lang="scss">
+.AddBuildingBox {
+  padding: 15px;
+  height: 100%;
+  width: 100%;
+}
+.AddBuildingBody {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background-color: white;
+  padding: 15px;
+  .title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(16, 16, 16, 1);
+    border-bottom: 1px solid #bbbbbb;
+    margin-bottom: 60px;
+  }
+
+  .formBody {
+    width: 800px;
+    margin: 0 auto;
+
+    .itembox {
+      display: flex;
+      flex-wrap: wrap;
+      .item {
+        display: flex;
+        align-items: center;
+        margin-right: 20px;
+        margin-bottom: 10px;
+        font-size: 14px;
+        color: #606266;
+        border: 1px solid #ccc;
+        padding: 5px 10px;
+        border-radius: 4px;
+        cursor: pointer;
+        &:hover {
+          border-color: #409eff;
+          color: #409eff;
+        }
+        div {
+          margin-left: 10px;
+        }
+        &.active {
+          border-color: #409eff;
+          color: #409eff;
+          background-color: #f0f9ff;
+        }
+      }
+    }
+
+    .map {
+      width: 100%;
+      min-height: 500px;
+      background-color: #f0f0f0;
+      border: 1px solid #ccc;
+      border-radius: 4px;
+      margin-top: 10px;
+    }
+    .tips {
+      margin-top: 10px;
+      font-size: 12px;
+      color: #ccc;
+      .deleteMarker {
+        margin-left: 20px;
+        cursor: pointer;
+        color: #f00;
+      }
+    }
+    &:deep(.el-form-item__content, .el-select, .el-input) {
+      width: 350px !important;
+      margin-right: 10px;
+      .el-cascader {
+        width: 100%;
+      }
+    }
+    .el-form-item {
+      margin-bottom: 20px;
+      align-items: center;
+    }
+    .el-button {
+      width: 80px;
+      height: 35px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>
--- a/src/views/system/inspection/Route/index2.vue
+++ b/src/views/system/inspection/Route/index2.vue
@@ -0,0 +1,270 @@
+<template>
+  <div class="p-2">
+    <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">
+          <el-form ref="queryFormRef" label-width="120px" :model="queryParams" :inline="true">
+            <el-form-item label="巡检路线名称" prop="routeName">
+              <el-input v-model="queryParams.routeName" placeholder="请输入巡检路线名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <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="['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 v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="routeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="巡检路线名称" align="center" prop="routeName" />
+        <el-table-column label="路线描述" align="center" prop="description" />
+        <el-table-column label="巡检点" align="center" prop="PointsName" show-overflow-tooltip />
+        <el-table-column label="预计巡检时长" align="center" prop="estimatedTime" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="巡检路线状态" align="center" prop="routeStatus">
+          <template #default="scope">
+            <dict-tag :options="com_inspection_route_status" :value="scope.row.routeStatus"></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="起点经度" align="center" prop="startLng" />
+        <el-table-column label="起点纬度" align="center" prop="startLat" />
+        <el-table-column label="终点经度" align="center" prop="endLng" />
+        <el-table-column label="终点纬度" align="center" prop="endLat" />
+        <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="['system:route:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:route:remove']"></el-button>
+            </el-tooltip>
+          </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>
+    <!-- 添加或修改巡检路线对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="routeFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="巡检路线名称" prop="routeName">
+          <el-input v-model="form.routeName" placeholder="请输入巡检路线名称" />
+        </el-form-item>
+        <el-form-item label="路线描述" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="巡检点" prop="totalPoints">
+          <el-input v-model="form.totalPoints" placeholder="请输入巡检点" />
+        </el-form-item>
+        <el-form-item label="预计巡检时长" prop="estimatedTime">
+          <el-input v-model="form.estimatedTime" placeholder="请输入预计巡检时长" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="起点经度" prop="startLng">
+          <el-input v-model="form.startLng" placeholder="请输入起点经度" />
+        </el-form-item>
+        <el-form-item label="起点纬度" prop="startLat">
+          <el-input v-model="form.startLat" placeholder="请输入起点纬度" />
+        </el-form-item>
+        <el-form-item label="终点经度" prop="endLng">
+          <el-input v-model="form.endLng" placeholder="请输入终点经度" />
+        </el-form-item>
+        <el-form-item label="终点纬度" prop="endLat">
+          <el-input v-model="form.endLat" placeholder="请输入终点纬度" />
+        </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="Route" lang="ts">
+import { listRoute, getRoute, delRoute, addRoute, updateRoute } from '@/api/system/InspectionRoute/index';
+import { RouteVO, RouteQuery, RouteForm } from '@/api/system/InspectionRoute/type';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_inspection_route_status } = toRefs<any>(proxy?.useDict('com_inspection_route_status'));
+
+const routeList = ref<RouteVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const routeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: RouteForm = {
+  id: undefined,
+  routeName: undefined,
+  description: undefined,
+  totalPoints: undefined,
+  estimatedTime: undefined,
+  remark: undefined,
+  routeStatus: undefined,
+  startLng: undefined,
+  startLat: undefined,
+  endLng: undefined,
+  endLat: undefined
+};
+const data = reactive<PageData<RouteForm, RouteQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    routeName: undefined,
+    description: undefined,
+    totalPoints: undefined,
+    estimatedTime: undefined,
+    routeStatus: undefined,
+    startLng: undefined,
+    startLat: undefined,
+    endLng: undefined,
+    endLat: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    routeName: [{ required: true, message: '巡检路线名称不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询巡检路线列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listRoute(queryParams.value);
+  routeList.value = res.rows;
+  routeList.value.forEach((item) => {
+    if (item.items && item.items.length > 0) {
+      item.PointsName = item.items.map((i) => i.itemName).join(', '); // 将巡检项目名称数组转换为逗号分隔的字符串
+    }
+  });
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  routeFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: RouteVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+const router = useRouter();
+/** 新增按钮操作 */
+const handleAdd = () => {
+  router.push({
+    path: '/Inspection/addRoute'
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: RouteVO) => {
+  router.push({
+    path: '/Inspection/addRoute',
+    query: { id: row?.id }
+  });
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  routeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateRoute(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addRoute(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: RouteVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除巡检路线编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delRoute(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/route/export',
+    {
+      ...queryParams.value
+    },
+    `route_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/workbench/index2.vue
+++ b/src/views/workbench/index2.vue
@@ -68,8 +68,11 @@
              <div class="villagename">{{ villageinfo.villageName }}</div>
              <div class="week">{{ new Date().toLocaleDateString().replaceAll('/', '-') }} {{ numToWeek2(new Date().getDay()) }}</div>
            </div>
+            <i class="white1"></i>
+            <i class="white2"></i>
+            <i class="white3"></i>
          </div>
-          <div class="tabsbox">
+          <div class="tabsbox flex flex-col">
            <div class="topbox">
              <div
                :class="{
@@ -90,16 +93,16 @@
                <i class="righti"></i>
              </div>
            </div>
-            <div class="body">
+            <div class="body flex-1">
              <div class="quicly_box" v-if="Sideactive === 1">
                <div class="quickly_item" v-for="(item, index) in quickBox" :key="index" @click="handleRouter(item.url)">
                  <div class="quickly_item_icon"></div>
                  <div class="quickly_item_content">{{ item.name }}</div>
                </div>
-                <div class="quickly_item add">
+                <!-- <div class="quickly_item add">
                  <el-icon><Plus /></el-icon>
                  <span>添加</span>
-                </div>
+                </div> -->
              </div>
              <div v-else>
                <div class="noticeNav">
@@ -128,6 +131,7 @@
                    <el-form-item label="附件">
                      <el-upload
                        v-model:file-list="fileList"
+                        :auto-upload="false"
                        class="upload-demo"
                        action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
                        multiple
@@ -216,14 +220,6 @@ const villageinfo = ref({
  'villageId': null,
  'villageName': ''
 });
-function getVillageinfo() {
-  const id = Number(localStorage.getItem('villageid'));
-  getVillageByIdAPI(id).then((res) => {
-    villageinfo.value = res.data;
-    houseStore.updateVilageinfo(res.data);
-  });
-}
-getVillageinfo();

 import icon1 from '@/assets/images/index/1.png';
 import icon2 from '@/assets/images/index/2.png';
@@ -234,6 +230,7 @@ import { UploadUserFile } from 'element-plus';
 import { getVillageByIdAPI } from '@/api/system/community';
 import { getLast7Days, numToWeek2 } from '@/utils/time';
 import { EChartsOption } from 'echarts';
+import { workSpaceTotalListApi } from '@/api/workflow';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_resident_type } = toRefs<any>(proxy?.useDict('com_resident_type'));
@@ -247,6 +244,25 @@ const list = ref([
  { name: '物料总数量', value: 458, icon: icon6 },
  { name: '投诉总数量', value: 458, icon: icon6 }
 ]);
+
+function getVillageinfo() {
+  const id = Number(localStorage.getItem('villageid'));
+  workSpaceTotalListApi(id).then((res) => {
+    list.value[0].value = res.totalResident;
+    list.value[1].value = res.totalHouse;
+    list.value[2].value = res.totalParking;
+    list.value[5].value = res.totalComplaint;
+  });
+  getVillageByIdAPI(id).then((res) => {
+    villageinfo.value = {
+      ...villageinfo.value,
+      villageId: res.data.villageId,
+      villageName: res.data.villageName
+    };
+    houseStore.updateVilageinfo(res.data);
+  });
+}
+getVillageinfo();
 // ! echarts 切换
 const active_index = ref(0);
 const actions = ref([
@@ -380,7 +396,7 @@ const quickBox = ref([
  },
  {
    name: '账单管理',
-    url: '/repair/visitorList'
+    url: '/sdb/sdbbill'
  }
 ]);
 const router = useRouter();
@@ -605,6 +621,8 @@ getList();
    background: #036aff;
    border-radius: 16px 16px 16px 16px;
    margin-bottom: 20px;
+    position: relative;
+    overflow: hidden;
    .iconbox {
      width: 70px;
      height: 70px;
@@ -627,6 +645,34 @@ getList();
        line-height: 23px;
      }
    }
+
+    // 白色装饰
+    .white1,
+    .white2,
+    .white3 {
+      position: absolute;
+      background: #d9d9d9;
+      border-radius: 50%;
+      display: block;
+      width: 100px;
+      height: 100px;
+      left: 0;
+      bottom: 0;
+      transform: translate(-50%, 50%) scale(1.5);
+      opacity: 0.1;
+    }
+    .white2 {
+      width: 200px;
+      height: 200px;
+      opacity: 0.08;
+      transform: translate(-20%, 63%) scale(1.5);
+    }
+    .white3 {
+      width: 300px;
+      height: 300px;
+      opacity: 0.05;
+      transform: translate(-20%, 65%) scale(1.5);
+    }
  }

  // tabs