Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

Reviewed-on: #1

.gitea/workflows/dev.yml

@@ -1,37 +1,44 @@
-name: Gitea Actions Demo
 run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
-on: [push]
-
+on:
+  push:
+    branches:
+      - prod
 jobs:
-
   Explore-Gitea-Actions:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu
     steps:
-
-      - name: Checkout code
-        uses: http://47.109.37.87:3000/bichangxiong/checkout@v4 # 使用 Gitea 镜像
+      - name: 拉取代码仓库
+        uses: http://git.missmoc.top/mocheng/checkout@v4
         with:
-          fetch-depth: 1  # 只拉取最新一次提交
-      
-      - name: Set up Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+          fetch-depth: 0  # 只拉取最新的1个提交（浅克隆）
+
+      - name: Set up Node.js
+        uses: http://git.missmoc.top/mocheng/setup-node@v3
         with:
           node-version: 20.x
-      - name: pnpm 
+
+      - name: 安装pnpm
         run: npm i pnpm -g
-      - name: node
-        run: pnpm i
-      - name: Build
+
+      - name: 安装依赖
+        run: pnpm install
+        continue-on-error: false  # 依赖安装失败则终止工作流
+
+      - name: 构建项目
         run: pnpm build:antd
-      - name: copy file via ssh password
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: 192.168.1.3
-          username: root
-          password: by@2025!
-          port: 22
-          source: "./apps/web-antd/dist"
-          target: "/project/wl/web/dist"
-    
+        continue-on-error: false  # 构建失败则终止工作流
+
+      - name: 检查构建结果
+        run: |
+          if [ ! -d "./apps/web-antd/dist" ]; then
+            echo "构建目录不存在，构建失败"
+            exit 1
+          fi
+          if [ -z "$(ls -A ./apps/web-antd/dist)" ]; then
+            echo "构建目录为空，构建失败"
+            exit 1
+          fi
 
 
+      - name: 通过SSH复制文件
+        run: cp -rf ./apps/web-antd/dist/* /www/wwwroot/183.230.235.66_11010/property

apps/web-antd/package.json

@@ -27,6 +27,9 @@
   },
   "dependencies": {
     "@ant-design/icons-vue": "^7.0.1",
+    "@dataview/datav-vue3": "0.0.0-test.1672506674342",
+    "@jiaminghi/charts": "^0.2.18",
+    "@jiaminghi/data-view": "^2.10.0",
     "@tinymce/tinymce-vue": "^6.0.1",
     "@vben/access": "workspace:*",
     "@vben/common-ui": "workspace:*",

apps/web-antd/src/api/cockpit/cockpit.ts

@@ -0,0 +1,48 @@
+
+import { requestClient } from '#/api/request';
+
+/**
+ * 大屏接口
+ */
+
+/**
+ * 访客
+ */
+export function visitir() {
+  return requestClient.get('/property/cockpit/visitor');
+}
+
+/**
+ *费用
+ */
+export function expenses() {
+  return requestClient.get('/property/cockpit/expenses');
+}
+
+/**
+ * 物业人员配置
+ */
+export function propertyPerson() {
+  return requestClient.get('/property/cockpit/propertyperson');
+}
+
+/**
+ * sos报警
+ */
+export function sos() {
+  return requestClient.get('/property/cockpit/sos');
+}
+
+/**
+ * sos报警记录
+ */
+export function soslist() {
+  return requestClient.get('/property/cockpit/soslist');
+}
+
+/**
+ * 工单
+ */
+export function workcount() {
+  return requestClient.get('/property/cockpit/workcount');
+}

apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts

@@ -1,12 +1,12 @@
 import type {
-  ArrangementVO,
   ArrangementForm,
   ArrangementQuery,
+  ArrangementVO,
   arrangmentListQuery,
+  AttendanceUserGroup,
 } from './model';
 
-import type { ID, IDS } from '#/api/common';
-import type { PageResult } from '#/api/common';
+import type { ID, IDS, PageResult } from '#/api/common';
 
 import { requestClient } from '#/api/request';
 
@@ -21,6 +21,7 @@ export function arrangementList(params?: ArrangementQuery) {
     { params },
   );
 }
+
 /**
  * 根据月份查询排班列表
  * @param params
@@ -92,3 +93,14 @@ export function queryScheduleView(params?: arrangmentListQuery) {
   );
 }
 
+/**
+ * 查询某天排班人员详情列表
+ * @param params
+ * @returns 排班列表
+ */
+
+export function queryCurrentSchedu() {
+  return requestClient.get<AttendanceUserGroup[]>(
+    '/property/AttendanceUserGroup/query/currentDay',
+  );
+}

apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts

@@ -43,6 +43,7 @@ export interface ArrangementVO {
   userGroupList?: any[];
   attendanceGroup?: any;
   dateType?: number;
+  areaList: any[]; //区域
 }
 
 export interface ArrangementForm extends BaseEntity {

apps/web-antd/src/api/property/attendanceManagement/attendanceArea/model.d.ts

@@ -7,9 +7,9 @@ export interface AttendanceAreaVO {
   id: string | number;
 
   /**
-   * 摄像机id
+   * 摄像机列表
    */
-  deviceManageId: string | number;
+  deviceManageId: any[];
 
   /**
    * 区域
@@ -20,7 +20,7 @@ export interface AttendanceAreaVO {
    * 备注
    */
   reamark: string;
-
+  areaDevice?: any[];
 }
 
 export interface AttendanceAreaForm extends BaseEntity {
@@ -43,7 +43,6 @@ export interface AttendanceAreaForm extends BaseEntity {
    * 备注
    */
   reamark?: string;
-
 }
 
 export interface AttendanceAreaQuery extends PageQuery {
@@ -63,7 +62,7 @@ export interface AttendanceAreaQuery extends PageQuery {
   reamark?: string;
 
   /**
-    * 日期范围参数
-    */
+   * 日期范围参数
+   */
   params?: any;
 }

apps/web-antd/src/api/property/businessManagement/workOrders/index.ts

@@ -59,3 +59,19 @@ export function workOrdersUpdate(data: WorkOrdersForm) {
 export function workOrdersRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/property/workOrders/${id}`);
 }
+
+/**
+ * 派单
+ * @param data
+ */
+export function workOrdersDispatch(data: WorkOrdersForm) {
+  return requestClient.putWithMsg<void>('/property/workOrders/dispatch', data);
+}
+
+/**
+ * 抢单
+ * @param data
+ */
+export function workOrdersGrab(data: WorkOrdersForm) {
+  return requestClient.putWithMsg<void>('/property/workOrders/grab', data);
+}

apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts

@@ -64,7 +64,7 @@ export interface WorkOrdersVO {
   /**
    * 评价
    */
-  serviceEvalua: string;
+  serviceEvalua: number;
 
   /**
    * 是否超时
@@ -82,6 +82,8 @@ export interface WorkOrdersVO {
    * 评价图片
    */
   imgUrl: string;
+
+ evaluateImgPath: string[];
   /**
    * 评价内容
    */
@@ -99,6 +101,12 @@ export interface WorkOrdersVO {
    */
   orderImgUrl:  string;
 
+  orderImgPath:  string[];
+
+  reportingType:  string;
+
+  processingWeight:  string;
+
 }
 
 export interface HandleRecords {

apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts

@@ -37,6 +37,11 @@ export interface WorkOrdersTypeVO {
   isTransfers: string;
 
   excludeId: string;
+  /**
+   * 处理优先级
+   */
+  processingWeight: string;
+
 }
 
 export interface WorkOrdersTypeForm extends BaseEntity {
@@ -79,6 +84,11 @@ export interface WorkOrdersTypeForm extends BaseEntity {
    * 上级类型id
    */
   parentId?: string;
+
+  /**
+   * 处理优先级
+   */
+  processingWeight: string;
 }
 
 export interface WorkOrdersTypeQuery extends PageQuery {

apps/web-antd/src/api/property/clean_order/model.d.ts

@@ -144,6 +144,16 @@ export interface Clean_orderForm extends BaseEntity {
    */
   phone?: string;
 
+  /**
+   * 签到图片
+   */
+  signImgUrl?: string;
+
+  /**
+   * 评价图片
+   */
+  imgUrl?: string;
+
 }
 
 export interface Clean_orderQuery extends PageQuery {

apps/web-antd/src/api/property/customerService/activities/index.ts

@@ -0,0 +1,61 @@
+import type { ActivitiesVO, ActivitiesForm, ActivitiesQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询热门活动列表
+* @param params
+* @returns 热门活动列表
+*/
+export function activitiesList(params?: ActivitiesQuery) {
+  return requestClient.get<PageResult<ActivitiesVO>>('/property/activities/list', { params });
+}
+
+/**
+ * 导出热门活动列表
+ * @param params
+ * @returns 热门活动列表
+ */
+export function activitiesExport(params?: ActivitiesQuery) {
+  return commonExport('/property/activities/export', params ?? {});
+}
+
+/**
+ * 查询热门活动详情
+ * @param id id
+ * @returns 热门活动详情
+ */
+export function activitiesInfo(id: ID) {
+  return requestClient.get<ActivitiesVO>(`/property/activities/${id}`);
+}
+
+/**
+ * 新增热门活动
+ * @param data
+ * @returns void
+ */
+export function activitiesAdd(data: ActivitiesForm) {
+  return requestClient.postWithMsg<void>('/property/activities', data);
+}
+
+/**
+ * 更新热门活动
+ * @param data
+ * @returns void
+ */
+export function activitiesUpdate(data: ActivitiesForm) {
+  return requestClient.putWithMsg<void>('/property/activities', data);
+}
+
+/**
+ * 删除热门活动
+ * @param id id
+ * @returns void
+ */
+export function activitiesRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/activities/${id}`);
+}

apps/web-antd/src/api/property/customerService/activities/model.d.ts

@@ -0,0 +1,129 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface ActivitiesVO {
+  /**
+   * 主键
+   */
+  id: string | number;
+
+  /**
+   * 标题
+   */
+  title: string;
+
+  /**
+   * 头部照片
+   */
+  headImgUrl: string;
+
+  /**
+   * 开始时间
+   */
+  startTime: string;
+
+  /**
+   * 结束时间
+   */
+  endTime: string;
+
+  /**
+   * 活动内容
+   */
+  activeContent: string;
+
+  /**
+   * 状态（1.未开始 2.进行中 3.已结束）
+   */
+  status: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue: string;
+
+}
+
+export interface ActivitiesForm extends BaseEntity {
+  /**
+   * 主键
+   */
+  id?: string | number;
+
+  /**
+   * 标题
+   */
+  title?: string;
+
+  /**
+   * 头部照片
+   */
+  headImgUrl?: string;
+
+  /**
+   * 开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 活动内容
+   */
+  activeContent?: string;
+
+  /**
+   * 状态（1.未开始 2.进行中 3.已结束）
+   */
+  status?: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
+}
+
+export interface ActivitiesQuery extends PageQuery {
+  /**
+   * 标题
+   */
+  title?: string;
+
+  /**
+   * 头部照片
+   */
+  headImgUrl?: string;
+
+  /**
+   * 开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 活动内容
+   */
+  activeContent?: string;
+
+  /**
+   * 状态（1.未开始 2.进行中 3.已结束）
+   */
+  status?: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

apps/web-antd/src/api/property/customerService/faqManagement/index.ts

@@ -0,0 +1,61 @@
+import type { FaqManagementVO, FaqManagementForm, FaqManagementQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询常见问题管理列表
+* @param params
+* @returns 常见问题管理列表
+*/
+export function faqManagementList(params?: FaqManagementQuery) {
+  return requestClient.get<PageResult<FaqManagementVO>>('/property/faqManagement/list', { params });
+}
+
+/**
+ * 导出常见问题管理列表
+ * @param params
+ * @returns 常见问题管理列表
+ */
+export function faqManagementExport(params?: FaqManagementQuery) {
+  return commonExport('/property/faqManagement/export', params ?? {});
+}
+
+/**
+ * 查询常见问题管理详情
+ * @param id id
+ * @returns 常见问题管理详情
+ */
+export function faqManagementInfo(id: ID) {
+  return requestClient.get<FaqManagementVO>(`/property/faqManagement/${id}`);
+}
+
+/**
+ * 新增常见问题管理
+ * @param data
+ * @returns void
+ */
+export function faqManagementAdd(data: FaqManagementForm) {
+  return requestClient.postWithMsg<void>('/property/faqManagement', data);
+}
+
+/**
+ * 更新常见问题管理
+ * @param data
+ * @returns void
+ */
+export function faqManagementUpdate(data: FaqManagementForm) {
+  return requestClient.putWithMsg<void>('/property/faqManagement', data);
+}
+
+/**
+ * 删除常见问题管理
+ * @param id id
+ * @returns void
+ */
+export function faqManagementRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/faqManagement/${id}`);
+}

apps/web-antd/src/api/property/customerService/faqManagement/model.d.ts

@@ -0,0 +1,114 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface FaqManagementVO {
+  /**
+   * id
+   */
+  id: string | number;
+
+  /**
+   * 标题
+   */
+  head: string;
+
+  /**
+   * 分类
+   */
+  type: string;
+
+  /**
+   * 浏览量
+   */
+  pageView: number;
+
+  /**
+   * 内容
+   */
+  contents: string;
+
+  /**
+   * 状态(1草稿 2已发布)
+   */
+  status: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue: string;
+
+}
+
+export interface FaqManagementForm extends BaseEntity {
+  /**
+   * id
+   */
+  id?: string | number;
+
+  /**
+   * 标题
+   */
+  head?: string;
+
+  /**
+   * 分类
+   */
+  type?: string;
+
+  /**
+   * 浏览量
+   */
+  pageView?: number;
+
+  /**
+   * 内容
+   */
+  contents?: string;
+
+  /**
+   * 状态(1草稿 2已发布)
+   */
+  status?: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
+}
+
+export interface FaqManagementQuery extends PageQuery {
+  /**
+   * 标题
+   */
+  head?: string;
+
+  /**
+   * 分类
+   */
+  type?: string;
+
+  /**
+   * 浏览量
+   */
+  pageView?: number;
+
+  /**
+   * 内容
+   */
+  contents?: string;
+
+  /**
+   * 状态(1草稿 2已发布)
+   */
+  status?: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

apps/web-antd/src/api/property/customerService/feedbacks/model.d.ts

@@ -10,6 +10,7 @@ export interface FeedbacksVO {
    * 反馈类型(0保修1保洁2会议)
    */
   feedbackType: string;
+  feedbackTypeName: string;
 
   /**
    * 反馈人
@@ -21,6 +22,11 @@ export interface FeedbacksVO {
    */
   feedbackPersionPhone: string;
 
+  /**
+   * 反馈人名称
+   */
+  feedbackPersionName: string;
+
   /**
    * 反馈内容
    */
@@ -50,6 +56,10 @@ export interface FeedbacksVO {
    * 客服电话
    */
   serviceName: string;
+  /**
+   * 工单id
+   */
+  orderId: string;
 
 }
 

apps/web-antd/src/api/property/customerService/questionnaire/question/model.d.ts

@@ -1,6 +1,6 @@
-import type { PageQuery, BaseEntity } from '#/api/common';
+import type {PageQuery, BaseEntity} from '#/api/common';
 import type {
-  QuestionItemForm
+  QuestionItemForm, QuestionItemVO
 } from "#/api/property/customerService/questionnaire/questionItem/model";
 
 export interface QuestionVO {
@@ -39,6 +39,19 @@ export interface QuestionVO {
    */
   sort: number;
 
+  /**
+   * 问题选项
+   */
+  questionnaireQuestionItemVos: QuestionItemVO[];
+
+  options: string[];
+
+  answer: string;
+
+  rate:number;
+
+  checked:string[];
+
 }
 
 export interface QuestionForm extends BaseEntity {
@@ -80,17 +93,17 @@ export interface QuestionForm extends BaseEntity {
   /**
    * 选项
    */
-  questionnaireQuestionItems:QuestionItemForm[]
+  questionnaireQuestionItems: QuestionItemForm[]
 
   /**
    * 评分预览
    */
-  rate?:number;
+  rate?: number;
 
   /**
    * 时间预览
    */
-  dateTime?:string;
+  dateTime?: string;
 
 }
 
@@ -126,7 +139,7 @@ export interface QuestionQuery extends PageQuery {
   sort?: number;
 
   /**
-    * 日期范围参数
-    */
+   * 日期范围参数
+   */
   params?: any;
 }

apps/web-antd/src/api/property/customerService/questionnaire/questionnaire/model.d.ts

@@ -1,5 +1,8 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
-import type {QuestionForm} from "#/api/property/customerService/questionnaire/question/model";
+import type {
+  QuestionForm,
+  QuestionVO
+} from "#/api/property/customerService/questionnaire/question/model";
 
 export interface QuestionnaireVO {
   /**
@@ -36,7 +39,10 @@ export interface QuestionnaireVO {
    * 状态(1草稿2已发布3未发布)
    */
   status: string;
-
+  /**
+   * 问题
+   */
+  questionnaireQuestionVos:QuestionVO[];
 }
 
 export interface QuestionnaireForm extends BaseEntity {

apps/web-antd/src/api/property/energyManagement/lightInfo/index.ts

@@ -0,0 +1,79 @@
+import type { LightInfoVO, LightInfoForm, LightInfoQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询灯控开关信息列表
+* @param params
+* @returns 灯控开关信息列表
+*/
+export function lightInfoList(params?: LightInfoQuery) {
+  return requestClient.get<PageResult<LightInfoVO>>('/property/lightInfo/list', { params });
+}
+
+/**
+ * 导出灯控开关信息列表
+ * @param params
+ * @returns 灯控开关信息列表
+ */
+export function lightInfoExport(params?: LightInfoQuery) {
+  return commonExport('/property/lightInfo/export', params ?? {});
+}
+
+/**
+ * 查询灯控开关信息详情
+ * @param id id
+ * @returns 灯控开关信息详情
+ */
+export function lightInfoInfo(id: ID) {
+  return requestClient.get<LightInfoVO>(`/property/lightInfo/${id}`);
+}
+
+/**
+ * 新增灯控开关信息
+ * @param data
+ * @returns void
+ */
+export function lightInfoAdd(data: LightInfoForm) {
+  return requestClient.postWithMsg<void>('/property/lightInfo', data);
+}
+
+/**
+ * 更新灯控开关信息
+ * @param data
+ * @returns void
+ */
+export function lightInfoUpdate(data: LightInfoForm) {
+  return requestClient.putWithMsg<void>('/property/lightInfo', data);
+}
+
+/**
+ * 删除灯控开关信息
+ * @param id id
+ * @returns void
+ */
+export function lightInfoRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/lightInfo/${id}`);
+}
+
+/**
+ * 更新灯控开关状态
+ * @param data
+ * @returns void
+ */
+export function switchSingleLight(data: LightInfoForm) {
+  return requestClient.postWithMsg<void>('/property/lightInfo/switch', data);
+}
+
+/**
+ * 批量更新灯控开关状态
+ * @param data
+ * @returns void
+ */
+export function switchBatchLight(data: LightInfoForm) {
+  return requestClient.postWithMsg<void>('/property/lightInfo/switch', data);
+}

apps/web-antd/src/api/property/energyManagement/lightInfo/model.d.ts

@@ -0,0 +1,134 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface LightInfoVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 位置描述
+   */
+  locationRemark: string;
+
+  /**
+   * 开关状态（0：关，1：开）
+   */
+  isOn: boolean;
+
+  /**
+   * 灯控模块编码
+   */
+  code: number;
+
+  /**
+   * 园区编码
+   */
+  communityId: string | number;
+
+  /**
+   * 建筑名称
+   */
+  buildingId: string | number;
+
+  /**
+   * 单元编码
+   */
+  unitId: string | number;
+
+  /**
+   * 所属楼层ID
+   */
+  floorId: string | number;
+
+  /**
+   * 楼层
+   */
+  floorName: string;
+
+}
+
+export interface LightInfoForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 位置描述
+   */
+  locationRemark?: string;
+
+  /**
+   * 开关状态（0：关，1：开）
+   */
+  isOn: boolean;
+
+  /**
+   * 灯控模块编码
+   */
+  code?: number;
+
+  /**
+   * 园区编码
+   */
+  communityId?: string | number;
+
+  /**
+   * 建筑名称
+   */
+  buildingId?: string | number;
+
+  /**
+   * 单元编码
+   */
+  unitId?: string | number;
+
+  /**
+   * 所属楼层ID
+   */
+  floorId?: string | number;
+
+}
+
+export interface LightInfoQuery extends PageQuery {
+  /**
+   * 位置描述
+   */
+  locationRemark?: string;
+
+  /**
+   * 开关状态（0：关，1：开）
+   */
+  isOn?: number;
+
+  /**
+   * 灯控模块编码
+   */
+  code?: number;
+
+  /**
+   * 园区编码
+   */
+  communityId?: string | number;
+
+  /**
+   * 建筑名称
+   */
+  buildingId?: string | number;
+
+  /**
+   * 单元编码
+   */
+  unitId?: string | number;
+
+  /**
+   * 所属楼层ID
+   */
+  floorId?: string | number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts

@@ -1,10 +1,9 @@
-import type { MeterInfoVO, MeterInfoForm, MeterInfoQuery } from './model';
+import type { MeterInfoVO, MeterInfoForm, MeterInfoQuery } from './model'
 
-import type { ID, IDS } from '#/api/common';
-import type { PageResult } from '#/api/common';
+import type { ID, IDS, PageResult, TreeNode } from '#/api/common';
 
-import { commonExport } from '#/api/helper';
-import { requestClient } from '#/api/request';
+import { commonExport } from '#/api/helper'
+import { requestClient } from '#/api/request'
 
 /**
 * 查询水电气列表
@@ -12,7 +11,7 @@ import { requestClient } from '#/api/request';
 * @returns 水电气列表
 */
 export function meterInfoList(params?: MeterInfoQuery) {
-  return requestClient.get<PageResult<MeterInfoVO>>('/property/meterInfo/list', { params });
+  return requestClient.get<PageResult<MeterInfoVO>>('/property/meterInfo/list', { params })
 }
 
 /**
@@ -21,7 +20,7 @@ export function meterInfoList(params?: MeterInfoQuery) {
  * @returns 水电气列表
  */
 export function meterInfoExport(params?: MeterInfoQuery) {
-  return commonExport('/property/meterInfo/export', params ?? {});
+  return commonExport('/property/meterInfo/export', params ?? {})
 }
 
 /**
@@ -30,7 +29,7 @@ export function meterInfoExport(params?: MeterInfoQuery) {
  * @returns 水电气详情
  */
 export function meterInfoInfo(id: ID) {
-  return requestClient.get<MeterInfoVO>(`/property/meterInfo/${id}`);
+  return requestClient.get<MeterInfoVO>(`/property/meterInfo/${id}`)
 }
 
 /**
@@ -39,7 +38,7 @@ export function meterInfoInfo(id: ID) {
  * @returns void
  */
 export function meterInfoAdd(data: MeterInfoForm) {
-  return requestClient.postWithMsg<void>('/property/meterInfo', data);
+  return requestClient.postWithMsg<void>('/property/meterInfo', data)
 }
 
 /**
@@ -48,7 +47,7 @@ export function meterInfoAdd(data: MeterInfoForm) {
  * @returns void
  */
 export function meterInfoUpdate(data: MeterInfoForm) {
-  return requestClient.putWithMsg<void>('/property/meterInfo', data);
+  return requestClient.putWithMsg<void>('/property/meterInfo', data)
 }
 
 /**
@@ -57,5 +56,14 @@ export function meterInfoUpdate(data: MeterInfoForm) {
  * @returns void
  */
 export function meterInfoRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/property/meterInfo/${id}`);
+  return requestClient.deleteWithMsg<void>(`/property/meterInfo/${id}`)
 }
+
+/**
+ * 查询水电气树
+ * @param level
+ * @returns 水电气树
+ */
+export function queryTree(meterType: number | string) {
+  return requestClient.get<TreeNode<Number>[]>(`/property/meterInfo/tree/${meterType}`)
+}

apps/web-antd/src/api/property/energyManagement/meterInfo/model.d.ts

@@ -1,65 +1,65 @@
-import type { PageQuery, BaseEntity } from '#/api/common';
+import type { PageQuery, BaseEntity } from '#/api/common'
 
 export interface MeterInfoVO {
   /**
    * 主键id
    */
-  id: string | number;
+  id: string | number
 
   /**
    * 仪表名称
    */
-  meterName: string;
+  meterName: string
 
   /**
    * 仪表编码
    */
-  meterCode: string;
+  meterCode: string
 
   /**
    * 设备厂商
    */
-  factoryNo: string;
+  factoryNo: string
 
   /**
    * 设备类型(1-电表，2-水表，3-气表)
    */
-  meterType: number;
+  meterType: number | String
 
   /**
    * 计量单位(1-度，2-吨，3-立方米)
    */
-  meterUnit: number;
+  meterUnit: number | String
 
   /**
    * 安装位置
    */
-  installLocation: string;
+  installLocation: string
 
   /**
    * 初始读数
    */
-  initReading: number;
+  initReading: number
 
   /**
    * 最大量程
    */
-  maxRang: number;
+  maxRang: number
 
   /**
    * 通信状态
    */
-  communicationState: number;
+  communicationState: number | String
 
   /**
    * 运行状态
    */
-  runningState: number;
+  runningState: number | String
 
   /**
    * 备注
    */
-  remark: string;
+  remark: string
 
 }
 
@@ -67,62 +67,67 @@ export interface MeterInfoForm extends BaseEntity {
   /**
    * 主键id
    */
-  id?: string | number;
+  id?: string | number
 
   /**
    * 仪表名称
    */
-  meterName?: string;
+  meterName?: string
 
   /**
    * 仪表编码
    */
-  meterCode?: string;
+  meterCode?: string
 
   /**
    * 设备厂商
    */
-  factoryNo?: string;
+  factoryNo?: string
 
   /**
    * 设备类型(1-电表，2-水表，3-气表)
    */
-  meterType?: number;
+  meterType?: number
 
   /**
    * 计量单位(1-度，2-吨，3-立方米)
    */
-  meterUnit?: number;
+  meterUnit?: number
 
   /**
    * 安装位置
    */
-  installLocation?: string;
+  installLocation?: string
 
   /**
    * 初始读数
    */
-  initReading?: number;
+  initReading?: number
 
   /**
    * 最大量程
    */
-  maxRang?: number;
+  maxRang?: number
 
   /**
    * 通信状态
    */
-  communicationState?: number;
+  communicationState?: number
 
   /**
    * 运行状态
    */
-  runningState?: number;
+  runningState?: number
+
+  /**
+   * 采集器IP
+   */
+  hostIp?: string
 
   /**
    * 备注
    */
-  remark?: string;
+  remark?: string
 
 }
 
@@ -130,55 +135,55 @@ export interface MeterInfoQuery extends PageQuery {
   /**
    * 仪表名称
    */
-  meterName?: string;
+  meterName?: string
 
   /**
    * 仪表编码
    */
-  meterCode?: string;
+  meterCode?: string
 
   /**
    * 设备厂商
    */
-  factoryNo?: string;
+  factoryNo?: string
 
   /**
    * 设备类型(1-电表，2-水表，3-气表)
    */
-  meterType?: number;
+  meterType?: number
 
   /**
    * 计量单位(1-度，2-吨，3-立方米)
    */
-  meterUnit?: number;
+  meterUnit?: number
 
   /**
    * 安装位置
    */
-  installLocation?: string;
+  installLocation?: string
 
   /**
    * 初始读数
    */
-  initReading?: number;
+  initReading?: number
 
   /**
    * 最大量程
    */
-  maxRang?: number;
+  maxRang?: number
 
   /**
    * 通信状态
    */
-  communicationState?: number;
+  communicationState?: number
 
   /**
    * 运行状态
    */
-  runningState?: number;
+  runningState?: number
 
   /**
     * 日期范围参数
     */
-  params?: any;
+  params?: any
 }

apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts

@@ -0,0 +1,71 @@
+import type { MeterRecordVO, MeterRecordForm, MeterRecordQuery, MeterRecordTrend } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询抄表记录列表
+* @param params
+* @returns 抄表记录列表
+*/
+export function meterRecordList(params?: MeterRecordQuery) {
+  return requestClient.get<PageResult<MeterRecordVO>>('/property/meterRecord/list', { params });
+}
+
+/**
+ * 导出抄表记录列表
+ * @param params
+ * @returns 抄表记录列表
+ */
+export function meterRecordExport(params?: MeterRecordQuery) {
+  return commonExport('/property/meterRecord/export', params ?? {});
+}
+
+/**
+ * 查询抄表记录详情
+ * @param id id
+ * @returns 抄表记录详情
+ */
+export function meterRecordInfo(id: ID) {
+  return requestClient.get<MeterRecordVO>(`/property/meterRecord/${id}`);
+}
+
+/**
+ * 新增抄表记录
+ * @param data
+ * @returns void
+ */
+export function meterRecordAdd(data: MeterRecordForm) {
+  return requestClient.postWithMsg<void>('/property/meterRecord', data);
+}
+
+/**
+ * 更新抄表记录
+ * @param data
+ * @returns void
+ */
+export function meterRecordUpdate(data: MeterRecordForm) {
+  return requestClient.putWithMsg<void>('/property/meterRecord', data);
+}
+
+/**
+ * 删除抄表记录
+ * @param id id
+ * @returns void
+ */
+export function meterRecordRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/meterRecord/${id}`);
+}
+
+/**
+ * 获取用电/气/水趋势分析数据
+ * 
+ * @param params
+ * @returns 用电/气/水趋势分析数据
+ */
+export function meterRecordTrend(params: MeterRecordTrend) {
+  return requestClient.get<void>('/property/meterRecord/trend', { params });
+}

apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts

@@ -0,0 +1,182 @@
+import type { PageQuery, BaseEntity } from '#/api/common'
+
+export interface MeterRecordVO {
+  /**
+   * 记录ID
+   */
+  id: string | number
+
+  /**
+   * 仪表编号
+   */
+  meterId: string | number
+
+  /**
+  * 仪表类型
+  */
+  meterType: string | number
+
+  /**
+   * 抄表员ID
+   */
+  readerId: string | number
+
+  /**
+   * 抄表时间
+   */
+  readingTime: string
+
+  /**
+   * 当前读数
+   */
+  currentReading: number
+
+  /**
+   * 上次读数
+   */
+  previousReading: number
+
+  /**
+   * 用量
+   */
+  consumption: number
+
+  /**
+   * 抄表方式(1手动 2自动 3用户上报)
+   */
+  readingMethod: number
+
+  /**
+   * 抄表照片
+   */
+  imgOssid: string | number
+
+}
+
+export interface MeterRecordForm extends BaseEntity {
+  /**
+   * 记录ID
+   */
+  id?: string | number
+
+  /**
+   * 仪表编号
+   */
+  meterId?: string | number
+
+  /**
+   * 抄表员ID
+   */
+  readerId?: string | number
+
+  /**
+   * 抄表时间
+   */
+  readingTime?: string
+
+  /**
+   * 当前读数
+   */
+  currentReading?: number
+
+  /**
+   * 上次读数
+   */
+  previousReading?: number
+
+  /**
+   * 用量
+   */
+  consumption?: number
+
+  /**
+   * 抄表方式(1手动 2自动 3用户上报)
+   */
+  readingMethod?: number
+
+  /**
+   * 抄表照片
+   */
+  imgOssid?: string | number
+
+}
+
+export interface MeterRecordQuery extends PageQuery {
+  /**
+   * 仪表编号
+   */
+  meterId?: string | number
+
+  /**
+   * 抄表员ID
+   */
+  readerId?: string | number
+
+  /**
+   * 抄表时间
+   */
+  readingTime?: string
+
+  /**
+   * 当前读数
+   */
+  currentReading?: number
+
+  /**
+   * 上次读数
+   */
+  previousReading?: number
+
+  /**
+   * 用量
+   */
+  consumption?: number
+
+  /**
+   * 抄表方式(1手动 2自动 3用户上报)
+   */
+  readingMethod?: number
+
+  /**
+   * 抄表照片
+   */
+  imgOssid?: string | number
+
+  /**
+    * 日期范围参数
+    */
+  params?: any
+}
+
+
+export interface MeterRecordTrend {
+  /**
+   * 仪表类型
+   */
+  meterType?: string | number
+
+  /**
+   * 仪表ID
+   */
+  meterId: string | number
+
+  /**
+   * 楼层ID
+   */
+  floorId: string | number
+
+  /**
+   * 日期
+   */
+  day?: string
+
+  /**
+   * 月份
+   */
+  month?: string
+
+  /**
+   * 年份
+   */
+  year?: string
+}

apps/web-antd/src/api/property/maintenance/knowledge/model.d.ts

@@ -21,6 +21,8 @@ export interface KnowledgeVO {
    */
   covers: string;
 
+  coversPath: string|undefined;
+
   /**
    * 内容
    */

apps/web-antd/src/api/property/productManagement/model.d.ts

@@ -26,6 +26,8 @@ export interface PropertyVO {
    */
   imgPath: string;
 
+  plantImg: string;
+
   /**
    * 规格
    */
@@ -102,7 +104,6 @@ export interface PropertyForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface PropertyQuery extends PageQuery {
@@ -178,6 +179,8 @@ export interface plantsProduct extends BaseEntity {
    */
   imgPath?: string;
 
+  plantImg: string |undefined;
+
   /**
    * 规格
    */

apps/web-antd/src/api/property/resident/passRecordManagement/index.ts

@@ -0,0 +1,11 @@
+import { requestClient } from '#/api/request';
+import type { PageResult } from '#/api/common';
+
+/**
+ * 通行记录列表
+ * @param data
+ * @returns void
+ */
+export function getVisitorList(params?: any) {
+  return requestClient.get<PageResult<any>>('/sis/visitor/list', { params });
+}

apps/web-antd/src/api/property/resident/person/model.d.ts

@@ -31,6 +31,8 @@ export interface PersonVO {
    */
   img: string
 
+  imgPath?: string
+
   /**
    * 所属单位id
    */
@@ -79,6 +81,10 @@ export interface PersonVO {
 
   rosterType?: string | number
 
+  email?: string
+
+  idCard?: string
+
 }
 
 export interface PersonForm extends BaseEntity {

apps/web-antd/src/api/property/resident/unit/model.d.ts

@@ -35,6 +35,7 @@ export interface Resident_unitVO {
    * 入驻位置
    */
   location: string;
+  locations: string[];
 
   /**
    * 入驻时间
@@ -65,6 +66,9 @@ export interface Resident_unitVO {
    * 权限组名称
    */
   authGroupName?: string;
+  // 授权期限
+  authBegDate?:string;//开始
+  authEndDate?:string;//结束
 
 }
 

apps/web-antd/src/api/property/roomBooking/conferenceSettings/index.ts

@@ -61,5 +61,5 @@ export function meetRemove(id: ID | IDS) {
 }
 
 export function notlist(params?: MeetBo) {
-  return requestClient.get<PageResult<MeetVO>>('/property/meet/notlist', { params });
+  return requestClient.get<MeetVO[]>('/property/meet/notlist', { params });
 }

apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts

@@ -67,6 +67,29 @@ export interface MeetVO {
    * 图片
    */
   picture: string;
+
+  pictureArr: string[];
+  /**
+   * 开放时段开始时间
+   */
+  openStartHours: string;
+  /**
+   * 开放时段结束时间
+   */
+  openEndHours: string;
+
+  /**
+   * 会议室类型
+   */
+  meetingRoomType: string;
+  /**
+   * 位置
+   */
+  locationName: string;
+  /**
+   *  负责人
+   */
+  principalsName: string;
 }
 
 export interface MeetForm extends BaseEntity {
@@ -153,6 +176,17 @@ export interface MeetForm extends BaseEntity {
    */
   picture: string;
 
+  pictureArr: string[];
+
+  /**
+   * 开放时段开始时间
+   */
+  openStartHours: string;
+  /**
+   * 开放时段结束时间
+   */
+  openEndHours: string;
+
 }
 
 export interface MeetQuery extends PageQuery {
@@ -240,7 +274,7 @@ export interface MeetQuery extends PageQuery {
   picture: string;
 }
 
-export interface conferenceSettingsDetail extends BaseEntity {
+export interface ConferenceSettingsDetail{
   /**
    * 主键
    */
@@ -329,6 +363,16 @@ export interface conferenceSettingsDetail extends BaseEntity {
    * 图片
    */
   picture: string;
+
+  /**
+   * 开放时段开始时间
+   */
+  openStartHours: string;
+  /**
+   * 开放时段结束时间
+   */
+  openEndHours: string;
+
 }
 
 export interface MeetBo{

apps/web-antd/src/api/sis/alarmEventAttachments/index.ts

@@ -1,18 +1,30 @@
-import type { AlarmEventAttachmentsVO, AlarmEventAttachmentsForm, AlarmEventAttachmentsQuery } from './model';
+import type {
+  AlarmEventAttachmentsForm,
+  AlarmEventAttachmentsQuery,
+  AlarmEventAttachmentsVO,
+} from './model';
 
-import type { ID, IDS } from '#/api/common';
-import type { PageResult } from '#/api/common';
+import type { ID, IDS, PageResult } from '#/api/common';
 
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
 /**
-* 查询【请填写功能名称】列表
-* @param params
-* @returns 【请填写功能名称】列表
-*/
+ * 查询【请填写功能名称】列表
+ * @param params
+ * @returns 【请填写功能名称】列表
+ */
 export function alarmEventAttachmentsList(params?: AlarmEventAttachmentsQuery) {
-  return requestClient.get<PageResult<AlarmEventAttachmentsVO>>('/sis/alarmEventAttachments/list', { params });
+  return requestClient.get<PageResult<AlarmEventAttachmentsVO>>(
+    '/sis/alarmEventAttachments/list',
+    { params },
+  );
+}
+
+export function queryAlarmEventAttachmentsList(id: ID) {
+  return requestClient.get<AlarmEventAttachmentsVO[]>(
+    '/sis/alarmEventAttachments/query/' + id,
+  );
 }
 
 /**
@@ -20,7 +32,9 @@ export function alarmEventAttachmentsList(params?: AlarmEventAttachmentsQuery) {
  * @param params
  * @returns 【请填写功能名称】列表
  */
-export function alarmEventAttachmentsExport(params?: AlarmEventAttachmentsQuery) {
+export function alarmEventAttachmentsExport(
+  params?: AlarmEventAttachmentsQuery,
+) {
   return commonExport('/sis/alarmEventAttachments/export', params ?? {});
 }
 
@@ -30,7 +44,9 @@ export function alarmEventAttachmentsExport(params?: AlarmEventAttachmentsQuery)
  * @returns 【请填写功能名称】详情
  */
 export function alarmEventAttachmentsInfo(id: ID) {
-  return requestClient.get<AlarmEventAttachmentsVO>(`/sis/alarmEventAttachments/${id}`);
+  return requestClient.get<AlarmEventAttachmentsVO>(
+    `/sis/alarmEventAttachments/${id}`,
+  );
 }
 
 /**

apps/web-antd/src/api/sis/alarmEventAttachments/model.d.ts

@@ -16,6 +16,8 @@ export interface AlarmEventAttachmentsVO {
    */
   ossId: string | number;
 
+  imagePath: string;
+
   /**
    * 1：图片，2：文件；3视频
    */

apps/web-antd/src/api/sis/alarmEventProcess/index.ts

@@ -0,0 +1,78 @@
+import type {
+  AlarmEventProcessForm,
+  AlarmEventProcessQuery,
+  AlarmEventProcessVO,
+} from './model';
+
+import type { ID, IDS, PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+ * 查询告警信息处理流程记录列表
+ * @param params
+ * @returns 告警信息处理流程记录列表
+ */
+export function alarmEventProcessList(params?: AlarmEventProcessQuery) {
+  return requestClient.get<PageResult<AlarmEventProcessVO>>(
+    '/sis/alarmEventProcess/list',
+    { params },
+  );
+}
+
+/**
+ * 导出告警信息处理流程记录列表
+ * @param params
+ * @returns 告警信息处理流程记录列表
+ */
+export function alarmEventProcessExport(params?: AlarmEventProcessQuery) {
+  return commonExport('/sis/alarmEventProcess/export', params ?? {});
+}
+
+/**
+ * 查询告警信息处理流程记录详情
+ * @param id id
+ * @returns 告警信息处理流程记录详情
+ */
+export function alarmEventProcessInfo(id: ID) {
+  return requestClient.get<AlarmEventProcessVO>(`/sis/alarmEventProcess/${id}`);
+}
+
+/**
+ * 新增告警信息处理流程记录
+ * @param data
+ * @returns void
+ */
+export function alarmEventProcessAdd(data: AlarmEventProcessForm) {
+  return requestClient.postWithMsg<void>('/sis/alarmEventProcess', data);
+}
+
+/**
+ * 更新告警信息处理流程记录
+ * @param data
+ * @returns void
+ */
+export function alarmEventProcessUpdate(data: AlarmEventProcessForm) {
+  return requestClient.putWithMsg<void>('/sis/alarmEventProcess', data);
+}
+
+/**
+ * 删除告警信息处理流程记录
+ * @param id id
+ * @returns void
+ */
+export function alarmEventProcessRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/sis/alarmEventProcess/${id}`);
+}
+
+/**
+ * 删除告警信息处理流程记录
+ * @param id id
+ * @returns void
+ */
+export function queryResult(id: ID | IDS) {
+  return requestClient.get<AlarmEventProcessVO>(
+    `/sis/alarmEventProcess/query/result/${id}`,
+  );
+}

apps/web-antd/src/api/sis/alarmEventProcess/model.d.ts

@@ -0,0 +1,147 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface AlarmEventProcessVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 告警记录主键id
+   */
+  alarmId: string | number;
+
+  /**
+   * 指派人员id
+   */
+  solveId: string | number;
+
+  /**
+   * 指派人员名称
+   */
+  solveName: string;
+
+  /**
+   * 工单问题回复内容
+   */
+  workReply: string;
+
+  /**
+   * 处理时间
+   */
+  workReplyTime: string;
+
+  /**
+   * 是否已接受任务 0:未接收;1:已接收
+   */
+  receiveTaskTag: number;
+
+  /**
+   * 10: 已上报待确认
+20：已确认待处理
+30: 处理中
+31：升级-转工单
+32：升级-协助
+40：已解决
+50：已关闭 
+   */
+  state: number;
+
+}
+
+export interface AlarmEventProcessForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 告警记录主键id
+   */
+  alarmId?: string | number;
+
+  /**
+   * 指派人员id
+   */
+  solveId?: string | number;
+
+  /**
+   * 指派人员名称
+   */
+  solveName?: string;
+
+  /**
+   * 工单问题回复内容
+   */
+  workReply?: string;
+
+  /**
+   * 处理时间
+   */
+  workReplyTime?: string;
+
+  /**
+   * 是否已接受任务 0:未接收;1:已接收
+   */
+  receiveTaskTag?: number;
+
+  /**
+   * 10: 已上报待确认
+20：已确认待处理
+30: 处理中
+31：升级-转工单
+32：升级-协助
+40：已解决
+50：已关闭 
+   */
+  state?: number;
+
+}
+
+export interface AlarmEventProcessQuery extends PageQuery {
+  /**
+   * 告警记录主键id
+   */
+  alarmId?: string | number;
+
+  /**
+   * 指派人员id
+   */
+  solveId?: string | number;
+
+  /**
+   * 指派人员名称
+   */
+  solveName?: string;
+
+  /**
+   * 工单问题回复内容
+   */
+  workReply?: string;
+
+  /**
+   * 处理时间
+   */
+  workReplyTime?: string;
+
+  /**
+   * 是否已接受任务 0:未接收;1:已接收
+   */
+  receiveTaskTag?: number;
+
+  /**
+   * 10: 已上报待确认
+20：已确认待处理
+30: 处理中
+31：升级-转工单
+32：升级-协助
+40：已解决
+50：已关闭 
+   */
+  state?: number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

apps/web-antd/src/api/sis/alarmEvents/index.ts

@@ -1,18 +1,30 @@
-import type { AlarmEventsVO, AlarmEventsForm, AlarmEventsQuery } from './model';
+import type { AlarmEventsForm, AlarmEventsQuery, AlarmEventsVO } from './model';
 
-import type { ID, IDS } from '#/api/common';
-import type { PageResult } from '#/api/common';
+import type { ID, IDS, PageResult } from '#/api/common';
 
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
 /**
-* 查询【请填写功能名称】列表
-* @param params
-* @returns 【请填写功能名称】列表
-*/
+ * 查询【请填写功能名称】列表
+ * @param params
+ * @returns 【请填写功能名称】列表
+ */
 export function alarmEventsList(params?: AlarmEventsQuery) {
-  return requestClient.get<PageResult<AlarmEventsVO>>('/sis/alarmEvents/list', { params });
+  return requestClient.get<PageResult<AlarmEventsVO>>('/sis/alarmEvents/list', {
+    params,
+  });
+}
+
+/**
+ * 查询【请填写功能名称】列表
+ * @param params
+ * @returns 【请填写功能名称】列表
+ */
+export function alarmEventsListCurr(params?: AlarmEventsQuery) {
+  return requestClient.get<PageResult<AlarmEventsVO>>('/sis/alarmEvents/list/curr', {
+    params,
+  });
 }
 
 /**
@@ -59,3 +71,25 @@ export function alarmEventsUpdate(data: AlarmEventsForm) {
 export function alarmEventsRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/sis/alarmEvents/${id}`);
 }
+
+/**
+ * 告警指派
+ * @returns void
+ */
+export function taskAssignment(params: any) {
+  return requestClient.postWithMsg<void>(
+    `/sis/alarmEvents/assignment`,
+    params ?? {},
+  );
+}
+
+/**
+ * 告警处理完成
+ * @returns void
+ */
+export function alarmEventComplete(params: any) {
+  return requestClient.postWithMsg<void>(
+    `/sis/alarmEvents/complete`,
+    params ?? {},
+  );
+}

apps/web-antd/src/app.vue

@@ -3,13 +3,8 @@ import { computed } from 'vue';
 
 import { useAntdDesignTokens } from '@vben/hooks';
 import { preferences, usePreferences } from '@vben/preferences';
-
 import { App, ConfigProvider, theme } from 'ant-design-vue';
-
 import { antdLocale } from '#/locales';
-
-import { useUploadTip } from './upload-tip';
-
 defineOptions({ name: 'App' });
 
 const { isDark } = usePreferences();
@@ -30,8 +25,6 @@ const tokenTheme = computed(() => {
     token: tokens,
   };
 });
-
-useUploadTip();
 </script>
 
 <template>

apps/web-antd/src/bootstrap.ts

@@ -17,6 +17,8 @@ import { initSetupVbenForm } from './adapter/form';
 import App from './app.vue';
 import { router } from './router';
 
+
+
 async function bootstrap(namespace: string) {
   // 初始化组件适配器
   await initComponentAdapter();
@@ -43,6 +45,7 @@ async function bootstrap(namespace: string) {
     spinning: 'spinning',
   });
 
+
   // 国际化 i18n 配置
   await setupI18n(app);
 
@@ -59,6 +62,7 @@ async function bootstrap(namespace: string) {
   // 配置路由及路由守卫
   app.use(router);
 
+
   // 配置Motion插件
   const { MotionPlugin } = await import('@vben/plugins/motion');
   app.use(MotionPlugin);

apps/web-antd/src/layouts/basic.vue

@@ -84,13 +84,13 @@ const menus = computed(() => {
     //   icon: CircleHelp,
     //   text: $t('ui.widgets.qa'),
     // },
-    {
-      handler: () => {
-        router.push('/navigation');
-      },
-      // icon: TagOutlined,
-      text: '返回导航',
-    },
+    // {
+    //   handler: () => {
+    //     router.push('/navigation');
+    //   },
+    //   // icon: TagOutlined,
+    //   text: '返回导航',
+    // },
   ];
   /**
    * 租户选中状态 不显示个人中心
@@ -146,7 +146,7 @@ watch(
         :avatar
         :menus
         :text="userStore.userInfo?.realName"
-        description="ann.vben@gmail.com"
+        :description="userStore.userInfo?.roles[0]"
         tag-text="Pro"
         @logout="handleLogout"
       />

apps/web-antd/src/main.ts

@@ -1,6 +1,7 @@
 import { initPreferences } from '@vben/preferences';
 import { unmountGlobalLoading } from '@vben/utils';
 import { overridesPreferences } from './preferences';
+
 /**
  * 应用初始化完成之后再进行页面加载渲染
  */

apps/web-antd/src/router/routes/core.ts

@@ -125,8 +125,18 @@ const coreRoutes: RouteRecordRaw[] = [
       title: '物业大屏',
       requiresAuth: true, // 如果需要登录验证
     },
-  },  {
-    component: () => import('#/views/screen/security/index.vue'),
+  },
+  // {
+  //   component: () => import('#/views/screen/security/index.vue'),
+  //   name: 'security',
+  //   path: '/security',
+  //   meta: {
+  //     title: '安防大屏',
+  //     requiresAuth: true, // 如果需要登录验证
+  //   },
+  // },
+  {
+    component: () => import('#/views/cockpit/security/index.vue'),
     name: 'security',
     path: '/security',
     meta: {
@@ -143,15 +153,15 @@ const coreRoutes: RouteRecordRaw[] = [
       requiresAuth: true, // 如果需要登录验证
     },
   },
-  {
-    component: () => import('#/views/screen/security/index.vue'),
-    name: 'security',
-    path: '/security',
-    meta: {
-      title: '安防大屏',
-      requiresAuth: true, // 如果需要登录验证
-    },
-  },
+  // {
+  //   component: () => import('#/views/screen/security/index.vue'),
+  //   name: 'security',
+  //   path: '/security',
+  //   meta: {
+  //     title: '安防大屏',
+  //     requiresAuth: true, // 如果需要登录验证
+  //   },
+  // },
     {
     component: () => import('#/views/screen/digitalIntelligence/index.vue'),
     name: 'digitalIntelligence',

apps/web-antd/src/store/auth.ts

@@ -56,9 +56,7 @@ export const useAuthStore = defineStore('auth', () => {
       if (accessStore.loginExpired) {
         accessStore.setLoginExpired(false);
       } else {
-        onSuccess
-          ? await onSuccess?.()
-          : await router.push('/navigation');
+        onSuccess ? await onSuccess?.() : await router.push('/analytics');
       }
 
       if (userInfo?.realName) {

apps/web-antd/src/store/notify.ts

@@ -24,7 +24,7 @@ export const useNotifyStore = defineStore(
      * return才会被持久化 存储全部消息
      */
     const notificationList = ref<NotificationItem[]>([]);
-
+    const sseList = ref<string[]>(["111"]);
     const userStore = useUserStore();
     const userId = computed(() => {
       return userStore.userInfo?.userId || '0';
@@ -65,24 +65,33 @@ export const useNotifyStore = defineStore(
         if (!message) return;
         console.log(`接收到消息: ${message}`);
 
-        notification.success({
-          description: message,
-          duration: 3,
-          message: $t('component.notice.received'),
-        });
+        try {
+          // 尝试解析JSON
+          const obj = JSON.parse(message);
+          // 检查解析结果是否为对象且不为null
+          if (obj.getType() ==="yvjin"){
+            sseList.value.join(message)
+          }
+        } catch (e) {
+          notification.success({
+            description: message,
+            duration: 3,
+            message: $t('component.notice.received'),
+          });
 
-        notificationList.value.unshift({
-          // avatar: `https://api.multiavatar.com/${random(0, 10_000)}.png`, 随机头像
-          avatar: SvgMessageUrl,
-          date: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-          isRead: false,
-          message,
-          title: $t('component.notice.title'),
-          userId: userId.value,
-        });
+          notificationList.value.unshift({
+            // avatar: `https://api.multiavatar.com/${random(0, 10_000)}.png`, 随机头像
+            avatar: SvgMessageUrl,
+            date: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            isRead: false,
+            message,
+            title: $t('component.notice.title'),
+            userId: userId.value,
+          });
 
-        // 需要手动置空 vue3在值相同时不会触发watch
-        data.value = null;
+          // 需要手动置空 vue3在值相同时不会触发watch
+          data.value = null;
+        }
       });
     }
 
@@ -96,6 +105,10 @@ export const useNotifyStore = defineStore(
           item.isRead = true;
         });
     }
+    function getsseList(){
+      console.log(sseList.value)
+      return sseList.value
+    }
 
     /**
      * 设置单条消息已读
@@ -134,6 +147,8 @@ export const useNotifyStore = defineStore(
       $reset,
       clearAllMessage,
       notificationList,
+      sseList,
+      getsseList,
       notifications,
       setAllRead,
       setRead,

apps/web-antd/src/upload-tip.ts

@@ -1,36 +0,0 @@
-import { onMounted } from 'vue';
-
-import { useLocalStorage } from '@vueuse/core';
-import { Modal } from 'ant-design-vue';
-
-export function useUploadTip() {
-  const readTip = useLocalStorage<boolean>('__upload_tip_read_5.4.0', false);
-  onMounted(() => {
-    if (readTip.value || !import.meta.env.DEV) {
-      return;
-    }
-    const modalInstance = Modal.info({
-      title: '提示',
-      centered: true,
-      content:
-        '如果你的版本是从低版本升级到后端>5.4.0, 记得执行升级sql, 否则跳转页面(如oss 代码生成配置)等会404',
-      okButtonProps: { disabled: true },
-      onOk() {
-        modalInstance.destroy();
-        readTip.value = true;
-      },
-    });
-
-    let time = 3;
-    const interval = setInterval(() => {
-      modalInstance.update({
-        okText: time === 0 ? '我知道了, 不再弹出' : `${time}秒后关闭`,
-        okButtonProps: { disabled: time > 0 },
-      });
-      if (time <= 0) {
-        clearInterval(interval);
-      }
-      time--;
-    }, 1000);
-  });
-}

apps/web-antd/src/views/cockpit/security/index.css

@@ -0,0 +1,116 @@
+/* 自定义滚动条样式 */
+.scrollbar-thin {
+    scrollbar-width: thin;
+}
+
+.scrollbar-thumb-slate-700::-webkit-scrollbar-thumb {
+    background-color: #334155;
+    border-radius: 3px;
+}
+
+.scrollbar-track-transparent::-webkit-scrollbar-track {
+    background-color: transparent;
+}
+
+/* 动画效果 */
+@keyframes ping {
+    0%, 100% {
+        opacity: 1;
+    }
+    50% {
+        opacity: 0.5;
+    }
+}
+
+.animate-ping {
+    animation: ping 1s cubic-bezier(0, 0, 0.2, 1) infinite;
+}
+
+/* 淡入动画 */
+@keyframes fadeIn {
+    from {
+        opacity: 0;
+        transform: translateY(10px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+.animate-fadeIn {
+    animation: fadeIn 0.3s ease-out forwards;
+}
+
+/* 数字计数器动画 */
+@keyframes countUp {
+    from {
+        opacity: 0;
+        transform: translateY(5px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+.counter-animation {
+    animation: countUp 0.5s ease-out forwards;
+}
+
+/* 网格背景图案 */
+.pattern-grid {
+    background-image: linear-gradient(rgba(148, 163, 184, 0.05) 1px, transparent 1px),
+    linear-gradient(90deg, rgba(148, 163, 184, 0.05) 1px, transparent 1px);
+    background-size: 20px 20px;
+    background-position: center center;
+}
+
+/* 确保Canvas元素占满容器 */
+canvas {
+    width: 100%;
+    height: 100%;
+    display: block;
+}
+
+/* 自定义按钮反馈效果 */
+button:active {
+    transform: scale(0.98);
+}
+
+/* 卡片悬停效果增强 */
+div[class*="bg-slate-800/60"] {
+    transition: all 0.3s ease;
+}
+
+div[class*="bg-slate-800/60"]:hover {
+    box-shadow: 0 0 15px rgba(59, 130, 246, 0.1);
+}
+
+/* 输入框焦点效果 */
+input:focus, textarea:focus {
+    box-shadow: 0 0 0 1px rgba(59, 130, 246, 0.5);
+}
+
+/* 列表项悬停效果 */
+div[class*="cursor-pointer"] {
+    transition: all 0.2s ease;
+}
+
+div[class*="cursor-pointer"]:hover {
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+}
+
+/* 平滑滚动 */
+html {
+    scroll-behavior: smooth;
+}
+
+/* 状态徽章样式优化 */
+span[class*="rounded-full"][class*="text-xs"] {
+    transition: all 0.3s ease;
+}
+
+span[class*="rounded-full"][class*="text-xs"]:hover {
+    transform: scale(1.05);
+}

apps/web-antd/src/views/cockpit/security/index.vue

@@ -0,0 +1,894 @@
+<template>
+  <div class="min-h-screen bg-slate-900 text-slate-100 flex flex-col overflow-hidden relative">
+    <!-- 背景动态效果 -->
+    <div class="absolute inset-0 bg-[radial-gradient(circle_at_center,rgba(59,130,246,0.15)_0,rgba(15,23,42,0)_70%)] pointer-events-none"></div>
+    <div class="absolute inset-0 bg-grid pattern-grid pointer-events-none"></div>
+
+    <!-- 顶部标题区域 -->
+    <header class="bg-slate-800/80 backdrop-blur-sm border-b border-slate-700 py-3 px-6 flex justify-between items-center z-10">
+      <div class="flex items-center gap-3">
+        <div class="bg-blue-600 rounded-lg w-10 h-10 flex items-center justify-center shadow-lg shadow-blue-600/20">
+          <i class="fa fa-shield text-xl"></i>
+        </div>
+        <h1 class="text-2xl font-bold tracking-wide text-transparent bg-clip-text bg-gradient-to-r from-blue-400 to-cyan-300">
+          预警监控指挥系统
+        </h1>
+      </div>
+
+      <div class="flex items-center gap-6">
+        <div class="flex items-center gap-2 text-slate-300">
+          <i class="fa fa-clock-o"></i>
+          <span>{{ currentTime }}</span>
+        </div>
+        <div class="flex items-center gap-2 text-slate-300">
+          <i class="fa fa-refresh"></i>
+          <span>数据更新于: {{ currentTime }}</span>
+        </div>
+<!--        <button class="bg-blue-600/20 hover:bg-blue-600/30 text-blue-300 px-4 py-2 rounded-lg transition-all duration-300 flex items-center gap-2 transform hover:scale-105">-->
+<!--          <i class="fa fa-download"></i>-->
+<!--          <span>导出报告</span>-->
+<!--        </button>-->
+      </div>
+    </header>
+
+    <!-- 主内容区域 -->
+    <main class="flex-1 flex overflow-hidden p-4 gap-4">
+      <!-- 左侧预警列表区域 -->
+      <section class="w-1/4 flex flex-col gap-4">
+        <!-- 预警分类统计 -->
+        <div class="bg-slate-800/60 backdrop-blur-sm rounded-xl p-4 border border-slate-700/50 shadow-lg transform transition-all duration-300 hover:shadow-blue-500/10 hover:border-blue-500/20">
+          <h2 class="text-lg font-semibold mb-3 flex items-center">
+            <i class="fa fa-tags text-blue-400 mr-2"></i>
+            预警分类统计
+          </h2>
+          <div class="grid grid-cols-2 gap-3">
+            <div class="bg-red-600/10 border border-red-500/30 rounded-lg p-3 transform transition-all duration-300 hover:scale-105 hover:shadow-lg hover:shadow-red-500/10">
+              <div class="text-sm text-red-300">紧急预警</div>
+              <div class="text-2xl font-bold text-red-400 mt-1 counter-animation">{{ stats.emergency }}</div>
+            </div>
+            <div class="bg-orange-600/10 border border-orange-500/30 rounded-lg p-3 transform transition-all duration-300 hover:scale-105 hover:shadow-lg hover:shadow-orange-500/10">
+              <div class="text-sm text-orange-300">重要预警</div>
+              <div class="text-2xl font-bold text-orange-400 mt-1 counter-animation">{{ stats.important }}</div>
+            </div>
+            <div class="bg-yellow-600/10 border border-yellow-500/30 rounded-lg p-3 transform transition-all duration-300 hover:scale-105 hover:shadow-lg hover:shadow-yellow-500/10">
+              <div class="text-sm text-yellow-300">一般预警</div>
+              <div class="text-2xl font-bold text-yellow-400 mt-1 counter-animation">{{ stats.normal }}</div>
+            </div>
+            <div class="bg-green-600/10 border border-green-500/30 rounded-lg p-3 transform transition-all duration-300 hover:scale-105 hover:shadow-lg hover:shadow-green-500/10">
+              <div class="text-sm text-green-300">已处理</div>
+              <div class="text-2xl font-bold text-green-400 mt-1 counter-animation">{{ stats.resolved }}</div>
+            </div>
+          </div>
+
+          <!-- 预警类型饼图 -->
+<!--          <div class="mt-4 h-40">-->
+<!--            <canvas ref="eventTypePieChart"></canvas>-->
+<!--          </div>-->
+        </div>
+
+        <!-- 预警列表 -->
+        <div class="bg-slate-800/60 backdrop-blur-sm rounded-xl p-4 border border-slate-700/50 shadow-lg flex-1 overflow-hidden flex flex-col transform transition-all duration-300 hover:shadow-blue-500/10 hover:border-blue-500/20">
+          <div class="flex justify-between items-center mb-3">
+            <h2 class="text-lg font-semibold flex items-center">
+              <i class="fa fa-list-alt text-blue-400 mr-2"></i>
+              预警列表
+            </h2>
+            <div class="relative">
+              <input
+                type="text"
+                placeholder="搜索预警..."
+                class="bg-slate-700/50 text-sm rounded-lg px-3 py-1.5 w-40 focus:outline-none focus:ring-1 focus:ring-blue-500 transition-all duration-300 focus:w-48"
+              >
+              <i class="fa fa-search absolute right-3 top-1/2 -translate-y-1/2 text-slate-400 text-sm"></i>
+            </div>
+          </div>
+
+          <div class="overflow-y-auto flex-1 scrollbar-thin scrollbar-thumb-slate-700 scrollbar-track-transparent">
+            <div
+              v-for="event in events"
+              :key="event.id"
+              @click="selectEvent(event)"
+              class="p-3 rounded-lg border border-slate-700 mb-2 cursor-pointer transition-all duration-200 hover:border-blue-500/50 hover:bg-slate-700/30 flex items-center gap-3 transform hover:translate-x-1"
+              :class="{ 'bg-blue-600/20 border-blue-500/50': selectedEvent?.id === event.id }"
+            >
+              <div class="w-2 h-2 rounded-full" :class="eventStatusColor(event.status)"></div>
+              <div class="flex-1 min-w-0">
+                <div class="font-medium text-sm truncate">{{ event.title }}</div>
+                <div class="text-xs text-slate-400 mt-0.5">{{ event.location }} · {{ formatTime(event.time) }}</div>
+              </div>
+              <span class="text-xs px-2 py-0.5 rounded-full" :class="eventStatusBadgeClass(event.status)">
+                {{ eventStatusText(event.status) }}
+              </span>
+            </div>
+          </div>
+        </div>
+      </section>
+
+      <!-- 中间地图区域 -->
+      <section class="flex-1 flex flex-col gap-4">
+        <div class="bg-slate-800/60 backdrop-blur-sm rounded-xl p-4 border border-slate-700/50 shadow-lg flex-1 relative overflow-hidden transform transition-all duration-300 hover:shadow-blue-500/10 hover:border-blue-500/20">
+          <h2 class="text-lg font-semibold mb-3 flex items-center relative z-10">
+            <i class="fa fa-map-marker text-blue-400 mr-2"></i>
+            预警分布地图
+          </h2>
+
+          <!-- 模拟地图 -->
+          <div class="absolute inset-0 bg-slate-900/50 rounded-lg overflow-hidden">
+            <div class="w-full h-full bg-[url('https://picsum.photos/id/1015/1200/800')] opacity-20 bg-cover bg-center"></div>
+
+            <!-- 网格线 -->
+            <div class="absolute inset-0 grid grid-cols-8 grid-rows-6">
+              <div v-for="i in 48" :key="i" class="border border-slate-700/30"></div>
+            </div>
+
+            <!-- 预警标记点 -->
+            <div
+              v-for="event in events"
+              :key="event.id"
+              :style="{ left: `${event.position.x}%`, top: `${event.position.y}%` }"
+              class="absolute transform -translate-x-1/2 -translate-y-1/2 cursor-pointer group"
+              @click="selectEvent(event)"
+            >
+              <div
+                class="w-3 h-3 rounded-full"
+                :class="eventStatusColor(event.status)"
+              ></div>
+              <div class="absolute -top-10 left-1/2 transform -translate-x-1/2 bg-slate-800 px-2 py-1 rounded text-xs opacity-0 group-hover:opacity-100 transition-opacity whitespace-nowrap z-10">
+                {{ event.title }}
+              </div>
+              <div
+                class="absolute w-6 h-6 rounded-full animate-ping"
+                :class="eventStatusPingClass(event.status)"
+                style="animation-duration: 2s"
+              ></div>
+            </div>
+
+            <!-- 选中预警的高亮 -->
+            <div
+              v-if="selectedEvent"
+              :style="{ left: `${selectedEvent.position.x}%`, top: `${selectedEvent.position.y}%` }"
+              class="absolute transform -translate-x-1/2 -translate-y-1/2"
+            >
+              <div class="w-4 h-4 rounded-full bg-blue-500 border-2 border-white shadow-lg"></div>
+              <div class="absolute w-8 h-8 rounded-full border-2 border-blue-500 animate-ping opacity-75" style="animation-duration: 1.5s"></div>
+            </div>
+          </div>
+
+          <!-- 地图控制 -->
+          <div class="absolute bottom-4 right-4 flex flex-col gap-2 z-10">
+            <button class="bg-slate-800/80 hover:bg-slate-700 w-8 h-8 rounded-lg flex items-center justify-center transition-all duration-300 hover:scale-110">
+              <i class="fa fa-plus text-sm"></i>
+            </button>
+            <button class="bg-slate-800/80 hover:bg-slate-700 w-8 h-8 rounded-lg flex items-center justify-center transition-all duration-300 hover:scale-110">
+              <i class="fa fa-minus text-sm"></i>
+            </button>
+            <button class="bg-slate-800/80 hover:bg-slate-700 w-8 h-8 rounded-lg flex items-center justify-center transition-all duration-300 hover:scale-110">
+              <i class="fa fa-location-arrow text-sm"></i>
+            </button>
+          </div>
+        </div>
+
+        <!-- 处理时间和图表区域 -->
+        <div class="bg-slate-800/60 backdrop-blur-sm rounded-xl p-4 border border-slate-700/50 shadow-lg h-64 transform transition-all duration-300 hover:shadow-blue-500/10 hover:border-blue-500/20">
+          <h2 class="text-lg font-semibold mb-3 flex items-center">
+            <i class="fa fa-line-chart text-blue-400 mr-2"></i>
+            预警处理数据分析
+          </h2>
+          <div class="grid grid-cols-2 gap-4 h-48">
+            <!-- 处理时间趋势折线图 -->
+            <div>
+              <h3 class="text-sm text-slate-300 mb-2">平均处理时间(分钟)</h3>
+              <div class="h-36">
+                <canvas ref="processingTimeChart"></canvas>
+              </div>
+            </div>
+
+            <!-- 每日预警数量柱状图 -->
+            <div>
+              <h3 class="text-sm text-slate-300 mb-2">每日预警数量</h3>
+              <div class="h-36">
+                <canvas ref="dailyEventsChart"></canvas>
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+
+      <!-- 右侧处理状态和操作 -->
+      <section class="w-1/4 flex flex-col gap-4">
+        <!-- 预警详情 -->
+        <div class="bg-slate-800/60 backdrop-blur-sm rounded-xl p-4 border border-slate-700/50 shadow-lg transform transition-all duration-300 hover:shadow-blue-500/10 hover:border-blue-500/20">
+          <h2 class="text-lg font-semibold mb-3 flex items-center">
+            <i class="fa fa-info-circle text-blue-400 mr-2"></i>
+            预警详情
+          </h2>
+
+          <div v-if="selectedEvent" class="space-y-3 animate-fadeIn">
+            <div>
+              <div class="text-xs text-slate-400">预警标题</div>
+              <div class="font-medium">{{ selectedEvent.title }}</div>
+            </div>
+            <div>
+              <div class="text-xs text-slate-400">预警类型</div>
+              <div class="font-medium">{{ selectedEvent.type }}</div>
+            </div>
+            <div>
+              <div class="text-xs text-slate-400">发生时间</div>
+              <div class="font-medium">{{ formatDateTime(selectedEvent.time) }}</div>
+            </div>
+            <div>
+              <div class="text-xs text-slate-400">位置信息</div>
+              <div class="font-medium">{{ selectedEvent.location }}</div>
+            </div>
+            <div>
+              <div class="text-xs text-slate-400">预警描述</div>
+              <div class="text-sm text-slate-300 bg-slate-700/30 p-2 rounded-lg mt-1 hover:bg-slate-700/50 transition-colors duration-300">
+                {{ selectedEvent.description }}
+              </div>
+            </div>
+            <div>
+              <div class="text-xs text-slate-400">当前状态</div>
+              <div class="flex items-center mt-1">
+                <span class="text-sm px-2 py-0.5 rounded-full" :class="eventStatusBadgeClass(selectedEvent.status)">
+                  {{ eventStatusText(selectedEvent.status) }}
+                </span>
+                <span class="ml-2 text-xs text-slate-400">
+                  更新于: {{ formatTime(selectedEvent.updateTime) }}
+                </span>
+              </div>
+            </div>
+          </div>
+
+          <div v-else class="flex items-center justify-center h-48 text-slate-500">
+            <div class="text-center">
+              <i class="fa fa-hand-pointer-o text-2xl mb-2 animate-pulse"></i>
+              <p>请从左侧列表或地图中选择一个预警</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- 处理状态和操作 -->
+        <div class="bg-slate-800/60 backdrop-blur-sm rounded-xl p-4 border border-slate-700/50 shadow-lg flex-1 flex flex-col transform transition-all duration-300 hover:shadow-blue-500/10 hover:border-blue-500/20">
+          <h2 class="text-lg font-semibold mb-3 flex items-center">
+            <i class="fa fa-cogs text-blue-400 mr-2"></i>
+            处理操作
+          </h2>
+
+          <div v-if="selectedEvent" class="flex-1 flex flex-col animate-fadeIn">
+            <!-- 处理进度 -->
+            <div class="mb-4">
+              <div class="text-sm font-medium mb-2">处理进度</div>
+              <div class="relative pt-1">
+                <div class="flex mb-2 items-center justify-between">
+                  <div>
+                    <span class="text-xs font-semibold inline-block py-1 px-2 uppercase rounded-full text-blue-600 bg-blue-200/10">
+                      处理进度
+                    </span>
+                  </div>
+                  <div class="text-right">
+                    <span class="text-xs font-semibold inline-block text-blue-400">
+                      {{ processingProgress }}%
+                    </span>
+                  </div>
+                </div>
+                <div class="overflow-hidden h-2 mb-4 text-xs flex rounded bg-slate-700/50">
+                  <div
+                    :style="{ width: `${processingProgress}%` }"
+                    class="shadow-none flex flex-col text-center whitespace-nowrap text-white justify-center bg-gradient-to-r from-blue-500 to-cyan-400 transition-all duration-1000 ease-out"
+                  ></div>
+                </div>
+              </div>
+            </div>
+
+            <!-- 处理记录 -->
+            <div class="mb-4 flex-1 overflow-y-auto scrollbar-thin scrollbar-thumb-slate-700">
+              <div class="text-sm font-medium mb-2">处理记录</div>
+              <div class="space-y-3">
+                <div v-for="record in selectedEvent.processingRecords" :key="record.id" class="flex gap-2 transform transition-all duration-300 hover:translate-x-1">
+                  <div class="mt-0.5 w-6 h-6 rounded-full bg-slate-700 flex items-center justify-center flex-shrink-0">
+                    <i class="fa fa-check text-xs text-slate-300"></i>
+                  </div>
+                  <div>
+                    <div class="text-sm">{{ record.action }}</div>
+                    <div class="text-xs text-slate-400 mt-0.5">
+                      {{ record.user }} · {{ formatTime(record.time) }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <!-- 操作按钮 -->
+            <div class="space-y-2 pt-2 border-t border-slate-700/50">
+              <div class="flex gap-2">
+                <button
+                  class="flex-1 bg-blue-600 hover:bg-blue-700 text-white px-4 py-2 rounded-lg transition-all duration-300 flex items-center justify-center gap-1 text-sm transform hover:scale-[1.02] active:scale-[0.98]"
+                  :disabled="selectedEvent.status === 'resolved'"
+                  @click="markAsResolved"
+                >
+                  <i class="fa fa-check"></i>
+                  <span>标记为已处理</span>
+                </button>
+                <button class="bg-slate-700 hover:bg-slate-600 text-white p-2 rounded-lg transition-all duration-300 transform hover:scale-110 active:scale-90">
+                  <i class="fa fa-comments"></i>
+                </button>
+              </div>
+
+              <div class="flex gap-2">
+                <button class="flex-1 bg-slate-700 hover:bg-slate-600 text-white px-4 py-2 rounded-lg transition-all duration-300 flex items-center justify-center gap-1 text-sm transform hover:scale-[1.02] active:scale-[0.98]">
+                  <i class="fa fa-user-plus"></i>
+                  <span>指派处理人</span>
+                </button>
+                <button class="flex-1 bg-slate-700 hover:bg-slate-600 text-white px-4 py-2 rounded-lg transition-all duration-300 flex items-center justify-center gap-1 text-sm transform hover:scale-[1.02] active:scale-[0.98]">
+                  <i class="fa fa-file-text-o"></i>
+                  <span>生成报告</span>
+                </button>
+              </div>
+
+              <div>
+                <textarea
+                  placeholder="输入处理备注..."
+                  class="w-full bg-slate-700/50 border border-slate-600 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-blue-500 resize-none h-16 transition-all duration-300 focus:border-blue-500/50"
+                  v-model="processingNote"
+                ></textarea>
+              </div>
+            </div>
+          </div>
+
+          <div v-else class="flex-1 flex items-center justify-center text-slate-500">
+            <div class="text-center">
+              <i class="fa fa-wrench text-2xl mb-2 animate-pulse"></i>
+              <p>选择预警后显示处理操作</p>
+            </div>
+          </div>
+        </div>
+      </section>
+    </main>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import {useNotifyStore } from '#/store';
+// 处理备注
+const processingNote = ref('');
+
+const list=useNotifyStore().sseList;
+list.map(item=>{
+
+})
+// 模拟预警数据
+const events = ref([
+  {
+    id: 1,
+    title: "设备故障报警",
+    type: "设备故障",
+    status: "emergency",
+    time: "2023-10-15T08:23:45",
+    updateTime: "2023-10-15T08:45:12",
+    location: "一号厂房A区",
+    description: "流水线三号设备突然停机，显示电机故障代码E109，需要紧急处理以避免生产线中断。",
+    position: { x: 35, y: 40 },
+    processingRecords: [
+      { id: 1, action: "接收到报警信息", user: "系统自动", time: "2023-10-15T08:23:45" },
+      { id: 2, action: "指派给维修组", user: "张经理", time: "2023-10-15T08:25:10" }
+    ]
+  },
+  {
+    id: 2,
+    title: "安全门异常开启",
+    type: "安全预警",
+    status: "important",
+    time: "2023-10-15T07:15:30",
+    updateTime: "2023-10-15T07:30:22",
+    location: "二号仓库入口",
+    description: "非工作时间安全门被异常开启，系统已自动记录并触发警报，需检查是否有异常进入。",
+    position: { x: 65, y: 30 },
+    processingRecords: [
+      { id: 1, action: "接收到报警信息", user: "系统自动", time: "2023-10-15T07:15:30" },
+      { id: 2, action: "安保人员已前往查看", user: "李主管", time: "2023-10-15T07:17:05" },
+      { id: 3, action: "初步检查未发现异常", user: "王保安", time: "2023-10-15T07:30:22" }
+    ]
+  },
+  {
+    id: 3,
+    title: "温湿度超标",
+    type: "环境异常",
+    status: "normal",
+    time: "2023-10-15T09:40:12",
+    updateTime: "2023-10-15T09:40:12",
+    location: "实验室B区",
+    description: "实验室B区温湿度超出正常范围，当前温度26℃，湿度65%，需调整空调系统。",
+    position: { x: 45, y: 60 },
+    processingRecords: [
+      { id: 1, action: "接收到报警信息", user: "系统自动", time: "2023-10-15T09:40:12" }
+    ]
+  },
+  {
+    id: 4,
+    title: "物料短缺预警",
+    type: "物料管理",
+    status: "normal",
+    time: "2023-10-15T10:15:22",
+    updateTime: "2023-10-15T10:15:22",
+    location: "原料仓库",
+    description: "A类原材料库存低于警戒线，剩余数量约可维持2天生产，请及时采购补充。",
+    position: { x: 25, y: 70 },
+    processingRecords: [
+      { id: 1, action: "系统自动发出预警", user: "系统自动", time: "2023-10-15T10:15:22" }
+    ]
+  },
+  {
+    id: 5,
+    title: "网络中断恢复",
+    type: "网络问题",
+    status: "resolved",
+    time: "2023-10-15T06:30:15",
+    updateTime: "2023-10-15T07:05:33",
+    location: "三号车间",
+    description: "三号车间网络中断，影响设备数据上传，技术人员已修复，网络恢复正常。",
+    position: { x: 75, y: 55 },
+    processingRecords: [
+      { id: 1, action: "检测到网络中断", user: "系统自动", time: "2023-10-15T06:30:15" },
+      { id: 2, action: "技术人员前往处理", user: "赵主管", time: "2023-10-15T06:35:40" },
+      { id: 3, action: "网络已恢复正常", user: "孙工", time: "2023-10-15T07:05:33" }
+    ]
+  }
+]);
+
+// 选中的预警
+const selectedEvent = ref(null);
+
+// 统计数据
+const stats = ref({
+  emergency: 1,
+  important: 1,
+  normal: 2,
+  resolved: 1
+});
+
+// 当前时间和最后更新时间
+const currentTime = ref("");
+const lastUpdateTime = ref("2023-10-15 10:30:45");
+
+// 图表引用
+const eventTypePieChart = ref(null);
+const processingTimeChart = ref(null);
+const dailyEventsChart = ref(null);
+
+// 处理进度（根据预警状态计算）
+const processingProgress = computed(() => {
+  if (!selectedEvent.value) return 0;
+
+  switch(selectedEvent.value.status) {
+    case 'emergency': return 30;
+    case 'important': return 50;
+    case 'normal': return 20;
+    case 'resolved': return 100;
+    default: return 0;
+  }
+});
+
+// 选择预警
+const selectEvent = (event) => {
+  selectedEvent.value = event;
+};
+
+// 标记为已处理
+const markAsResolved = () => {
+  if (selectedEvent.value) {
+    // 更新预警状态
+    selectedEvent.value.status = 'resolved';
+    selectedEvent.value.updateTime = new Date().toISOString();
+
+    // 添加处理记录
+    if (processingNote.value.trim()) {
+      selectedEvent.value.processingRecords.push({
+        id: selectedEvent.value.processingRecords.length + 1,
+        action: `标记为已处理: ${processingNote.value.trim()}`,
+        user: "当前操作员",
+        time: new Date().toISOString()
+      });
+      processingNote.value = '';
+    } else {
+      selectedEvent.value.processingRecords.push({
+        id: selectedEvent.value.processingRecords.length + 1,
+        action: "标记为已处理",
+        user: "当前操作员",
+        time: new Date().toISOString()
+      });
+    }
+
+    // 更新统计数据
+    stats.value.resolved++;
+    if (stats.value.emergency > 0) stats.value.emergency--;
+    else if (stats.value.important > 0) stats.value.important--;
+    else if (stats.value.normal > 0) stats.value.normal--;
+
+    // 重新绘制图表
+    drawAllCharts();
+  }
+};
+
+// 格式化时间
+const formatTime = (timeString) => {
+  const date = new Date(timeString);
+  return date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
+};
+
+// 格式化日期时间
+const formatDateTime = (timeString) => {
+  const date = new Date(timeString);
+  return date.toLocaleString();
+};
+
+// 预警状态文本
+const eventStatusText = (status) => {
+  const statusMap = {
+    'emergency': '紧急',
+    'important': '重要',
+    'normal': '一般',
+    'resolved': '已处理'
+  };
+  return statusMap[status] || '未知';
+};
+
+// 预警状态颜色
+const eventStatusColor = (status) => {
+  const colorMap = {
+    'emergency': 'bg-red-500',
+    'important': 'bg-orange-500',
+    'normal': 'bg-yellow-500',
+    'resolved': 'bg-green-500'
+  };
+  return colorMap[status] || 'bg-slate-500';
+};
+
+// 预警状态标记颜色（脉冲效果）
+const eventStatusPingClass = (status) => {
+  const colorMap = {
+    'emergency': 'bg-red-500/30',
+    'important': 'bg-orange-500/30',
+    'normal': 'bg-yellow-500/30',
+    'resolved': 'bg-green-500/30'
+  };
+  return colorMap[status] || 'bg-slate-500/30';
+};
+
+// 预警状态徽章样式
+const eventStatusBadgeClass = (status) => {
+  const classMap = {
+    'emergency': 'bg-red-500/20 text-red-400 border border-red-500/30',
+    'important': 'bg-orange-500/20 text-orange-400 border border-orange-500/30',
+    'normal': 'bg-yellow-500/20 text-yellow-400 border border-yellow-500/30',
+    'resolved': 'bg-green-500/20 text-green-400 border border-green-500/30'
+  };
+  return classMap[status] || 'bg-slate-500/20 text-slate-400 border border-slate-500/30';
+};
+
+// 更新当前时间
+const updateCurrentTime = () => {
+  const now = new Date();
+  currentTime.value = now.toLocaleString();
+};
+
+// 绘制饼图 - 使用原生Canvas API
+const drawPieChart = (canvas, data) => {
+  if (!canvas) return;
+
+  const ctx = canvas.getContext('2d');
+  const width = canvas.width;
+  const height = canvas.height;
+
+  // 清除画布
+  ctx.clearRect(0, 0, width, height);
+
+  const centerX = width / 2;
+  const centerY = height / 2;
+  const radius = Math.min(width, height) / 3;
+
+  const total = data.values.reduce((sum, value) => sum + value, 0);
+  let startAngle = 0;
+
+  data.values.forEach((value, index) => {
+    const sliceAngle = 2 * Math.PI * (value / total);
+    const color = data.colors[index];
+
+    // 绘制扇形
+    ctx.beginPath();
+    ctx.moveTo(centerX, centerY);
+    ctx.arc(centerX, centerY, radius, startAngle, startAngle + sliceAngle);
+    ctx.closePath();
+    ctx.fillStyle = color;
+    ctx.fill();
+
+    // 添加边框
+    ctx.strokeStyle = 'rgba(30, 41, 59, 0.8)';
+    ctx.lineWidth = 1;
+    ctx.stroke();
+
+    // 计算标签位置
+    const labelAngle = startAngle + sliceAngle / 2;
+    const labelRadius = radius + 15;
+    const labelX = centerX + Math.cos(labelAngle) * labelRadius;
+    const labelY = centerY + Math.sin(labelAngle) * labelRadius;
+
+    // 绘制标签
+    ctx.fillStyle = '#e2e8f0';
+    ctx.font = '10px sans-serif';
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'middle';
+    ctx.fillText(`${data.labels[index]}: ${value}`, labelX, labelY);
+
+    startAngle += sliceAngle;
+  });
+};
+
+// 绘制折线图 - 使用原生Canvas API
+const drawLineChart = (canvas, data) => {
+  if (!canvas) return;
+
+  const ctx = canvas.getContext('2d');
+  const width = canvas.width;
+  const height = canvas.height;
+
+  // 清除画布
+  ctx.clearRect(0, 0, width, height);
+
+  // 边距
+  const margin = { top: 10, right: 10, bottom: 20, left: 30 };
+  const chartWidth = width - margin.left - margin.right;
+  const chartHeight = height - margin.top - margin.bottom;
+
+  // 找到数据范围
+  const maxValue = Math.max(...data.values);
+  const minValue = 0;
+  const valueRange = maxValue - minValue;
+
+  // 计算X轴和Y轴的比例
+  const xScale = chartWidth / (data.values.length - 1);
+  const yScale = chartHeight / valueRange;
+
+  // 绘制坐标轴
+  ctx.beginPath();
+  ctx.strokeStyle = 'rgba(148, 163, 184, 0.5)';
+  ctx.lineWidth = 1;
+
+  // X轴
+  ctx.moveTo(margin.left, margin.top + chartHeight);
+  ctx.lineTo(margin.left + chartWidth, margin.top + chartHeight);
+  ctx.stroke();
+
+  // Y轴
+  ctx.moveTo(margin.left, margin.top);
+  ctx.lineTo(margin.left, margin.top + chartHeight);
+  ctx.stroke();
+
+  // 绘制网格线
+  ctx.strokeStyle = 'rgba(148, 163, 184, 0.1)';
+
+  // 水平网格线
+  const yGridCount = 5;
+  for (let i = 0; i <= yGridCount; i++) {
+    const y = margin.top + chartHeight - (i * chartHeight / yGridCount);
+    ctx.beginPath();
+    ctx.moveTo(margin.left, y);
+    ctx.lineTo(margin.left + chartWidth, y);
+    ctx.stroke();
+
+    // Y轴刻度
+    ctx.fillStyle = 'rgba(148, 163, 184, 0.7)';
+    ctx.font = '8px sans-serif';
+    ctx.textAlign = 'right';
+    ctx.textBaseline = 'middle';
+    ctx.fillText(Math.round(i * valueRange / yGridCount), margin.left - 5, y);
+  }
+
+  // 绘制数据线
+  ctx.beginPath();
+  data.values.forEach((value, index) => {
+    const x = margin.left + index * xScale;
+    const y = margin.top + chartHeight - (value - minValue) * yScale;
+
+    if (index === 0) {
+      ctx.moveTo(x, y);
+    } else {
+      ctx.lineTo(x, y);
+    }
+
+    // 绘制数据点
+    ctx.fillStyle = data.lineColor;
+    ctx.beginPath();
+    ctx.arc(x, y, 3, 0, 2 * Math.PI);
+    ctx.fill();
+
+    // 绘制白色边框
+    ctx.strokeStyle = '#fff';
+    ctx.lineWidth = 1;
+    ctx.stroke();
+  });
+
+  // 绘制线条
+  ctx.strokeStyle = data.lineColor;
+  ctx.lineWidth = 2;
+  ctx.stroke();
+
+  // 填充区域
+  ctx.lineTo(margin.left + (data.values.length - 1) * xScale, margin.top + chartHeight);
+  ctx.lineTo(margin.left, margin.top + chartHeight);
+  ctx.closePath();
+  ctx.fillStyle = data.areaColor;
+  ctx.fill();
+
+  // 绘制X轴标签
+  data.labels.forEach((label, index) => {
+    const x = margin.left + index * xScale;
+    ctx.fillStyle = 'rgba(148, 163, 184, 0.7)';
+    ctx.font = '8px sans-serif';
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'top';
+    ctx.fillText(label, x, margin.top + chartHeight + 5);
+  });
+};
+
+// 绘制柱状图 - 使用原生Canvas API
+const drawBarChart = (canvas, data) => {
+  if (!canvas) return;
+
+  const ctx = canvas.getContext('2d');
+  const width = canvas.width;
+  const height = canvas.height;
+
+  // 清除画布
+  ctx.clearRect(0, 0, width, height);
+
+  // 边距
+  const margin = { top: 10, right: 10, bottom: 20, left: 30 };
+  const chartWidth = width - margin.left - margin.right;
+  const chartHeight = height - margin.top - margin.bottom;
+
+  // 找到数据范围
+  const maxValue = Math.max(...data.values) * 1.1; // 留10%的余量
+  const minValue = 0;
+  const valueRange = maxValue - minValue;
+
+  // 计算X轴和Y轴的比例
+  const barWidth = chartWidth / (data.values.length * 2);
+  const xScale = chartWidth / (data.values.length);
+  const yScale = chartHeight / valueRange;
+
+  // 绘制坐标轴
+  ctx.beginPath();
+  ctx.strokeStyle = 'rgba(148, 163, 184, 0.5)';
+  ctx.lineWidth = 1;
+
+  // X轴
+  ctx.moveTo(margin.left, margin.top + chartHeight);
+  ctx.lineTo(margin.left + chartWidth, margin.top + chartHeight);
+  ctx.stroke();
+
+  // Y轴
+  ctx.moveTo(margin.left, margin.top);
+  ctx.lineTo(margin.left, margin.top + chartHeight);
+  ctx.stroke();
+
+  // 绘制网格线
+  ctx.strokeStyle = 'rgba(148, 163, 184, 0.1)';
+
+  // 水平网格线
+  const yGridCount = 5;
+  for (let i = 0; i <= yGridCount; i++) {
+    const y = margin.top + chartHeight - (i * chartHeight / yGridCount);
+    ctx.beginPath();
+    ctx.moveTo(margin.left, y);
+    ctx.lineTo(margin.left + chartWidth, y);
+    ctx.stroke();
+
+    // Y轴刻度
+    ctx.fillStyle = 'rgba(148, 163, 184, 0.7)';
+    ctx.font = '8px sans-serif';
+    ctx.textAlign = 'right';
+    ctx.textBaseline = 'middle';
+    ctx.fillText(Math.round(i * valueRange / yGridCount), margin.left - 5, y);
+  }
+
+  // 绘制柱子
+  data.values.forEach((value, index) => {
+    const x = margin.left + index * xScale + (xScale - barWidth) / 2;
+    const barHeight = (value - minValue) * yScale;
+    const y = margin.top + chartHeight - barHeight;
+
+    // 绘制柱子
+    ctx.fillStyle = data.barColor;
+    ctx.fillRect(x, y, barWidth, barHeight);
+
+    // 绘制柱子顶部的值
+    ctx.fillStyle = 'rgba(226, 232, 240, 0.9)';
+    ctx.font = '8px sans-serif';
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'bottom';
+    ctx.fillText(value, x + barWidth / 2, y - 3);
+  });
+
+  // 绘制X轴标签
+  data.labels.forEach((label, index) => {
+    const x = margin.left + index * xScale + xScale / 2;
+    ctx.fillStyle = 'rgba(148, 163, 184, 0.7)';
+    ctx.font = '8px sans-serif';
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'top';
+    ctx.fillText(label, x, margin.top + chartHeight + 5);
+  });
+};
+
+// 绘制所有图表
+const drawAllCharts = () => {
+  // 设置Canvas尺寸（考虑高DPI屏幕）
+  const setupCanvas = (canvas) => {
+    if (!canvas) return;
+    const dpr = window.devicePixelRatio || 1;
+    const rect = canvas.getBoundingClientRect();
+    canvas.width = rect.width * dpr;
+    canvas.height = rect.height * dpr;
+    const ctx = canvas.getContext('2d');
+    ctx.scale(dpr, dpr);
+    canvas.style.width = `${rect.width}px`;
+    canvas.style.height = `${rect.height}px`;
+  };
+
+  // 预警类型饼图数据
+  const pieData = {
+    labels: ['设备故障', '安全预警', '环境异常', '物料管理', '网络问题'],
+    values: [1, 1, 1, 1, 1],
+    colors: [
+      '#3b82f6', // 蓝色
+      '#f97316', // 橙色
+      '#eab308', // 黄色
+      '#10b981', // 绿色
+      '#8b5cf6'  // 紫色
+    ]
+  };
+
+  // 处理时间折线图数据
+  const lineData = {
+    labels: ['1日', '2日', '3日', '4日', '5日', '6日', '7日'],
+    values: [25, 32, 28, 45, 36, 22, 30],
+    lineColor: '#3b82f6',
+    areaColor: 'rgba(59, 130, 246, 0.1)'
+  };
+
+  // 每日预警数量柱状图数据
+  const barData = {
+    labels: ['1日', '2日', '3日', '4日', '5日', '6日', '7日'],
+    values: [8, 12, 5, 15, 7, 10, 5],
+    barColor: '#06b6d4'
+  };
+
+  // 设置并绘制图表
+  // setupCanvas(eventTypePieChart.value);
+  setupCanvas(processingTimeChart.value);
+  setupCanvas(dailyEventsChart.value);
+
+  // drawPieChart(eventTypePieChart.value, pieData);
+  drawLineChart(processingTimeChart.value, lineData);
+  drawBarChart(dailyEventsChart.value, barData);
+};
+
+// 页面加载时初始化
+onMounted(() => {
+  // 默认选择第一个预警
+  if (events.value.length > 0) {
+    selectedEvent.value = events.value[0];
+  }
+
+  // 初始化时间
+  updateCurrentTime();
+  setInterval(updateCurrentTime, 1000);
+
+  // 初始化图表
+  drawAllCharts();
+
+  // 监听窗口大小变化，重新绘制图表
+  window.addEventListener('resize', drawAllCharts);
+});
+</script>

apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue

@@ -26,7 +26,7 @@ onMounted(() => {
           { name: '搜索引擎', value: 1048 },
           { name: '直接访问', value: 735 },
           { name: '邮件营销', value: 580 },
-          { name: '联盟广告', value: 484 },
+          // { name: '联盟广告', value: 484 },
         ],
         emphasis: {
           label: {

apps/web-antd/src/views/dashboard/analytics/index.vue

@@ -25,29 +25,29 @@ const overviewItems: AnalysisOverviewItem[] = [
     icon: SvgCardIcon,
     title: '用户量',
     totalTitle: '总用户量',
-    totalValue: 120_000,
-    value: 2000,
+    totalValue: 78,
+    value: 15,
   },
   {
     icon: SvgCakeIcon,
     title: '访问量',
     totalTitle: '总访问量',
-    totalValue: 500_000,
-    value: 20_000,
+    totalValue: 2_278,
+    value: 461,
   },
   {
     icon: SvgDownloadIcon,
     title: '下载量',
     totalTitle: '总下载量',
-    totalValue: 120_000,
-    value: 8000,
+    totalValue: 17,
+    value: 2,
   },
   {
     icon: SvgBellIcon,
     title: '使用量',
     totalTitle: '总使用量',
-    totalValue: 50_000,
-    value: 5000,
+    totalValue: 6_652,
+    value: 3_739,
   },
 ];
 

apps/web-antd/src/views/demo/demo/api/index.ts

@@ -1,60 +0,0 @@
-import type { DemoForm, DemoQuery, DemoVO } from './model';
-
-import type { ID, IDS, PageResult } from '#/api/common';
-
-import { commonExport } from '#/api/helper';
-import { requestClient } from '#/api/request';
-
-/**
- * 查询测试单表列表
- * @param params
- * @returns 测试单表列表
- */
-export function demoList(params?: DemoQuery) {
-  return requestClient.get<PageResult<DemoVO>>('/demo/demo/list', { params });
-}
-
-/**
- * 导出测试单表列表
- * @param params
- * @returns 测试单表列表
- */
-export function demoExport(params?: DemoQuery) {
-  return commonExport('/demo/demo/export', params ?? {});
-}
-
-/**
- * 查询测试单表详情
- * @param id id
- * @returns 测试单表详情
- */
-export function demoInfo(id: ID) {
-  return requestClient.get<DemoVO>(`/demo/demo/${id}`);
-}
-
-/**
- * 新增测试单表
- * @param data
- * @returns void
- */
-export function demoAdd(data: DemoForm) {
-  return requestClient.postWithMsg<void>('/demo/demo', data);
-}
-
-/**
- * 更新测试单表
- * @param data
- * @returns void
- */
-export function demoUpdate(data: DemoForm) {
-  return requestClient.putWithMsg<void>('/demo/demo', data);
-}
-
-/**
- * 删除测试单表
- * @param id id
- * @returns void
- */
-export function demoRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/demo/demo/${id}`);
-}

apps/web-antd/src/views/demo/demo/api/model.d.ts

@@ -1,82 +0,0 @@
-import type { BaseEntity, PageQuery } from '#/api/common';
-
-export interface DemoVO {
-  /**
-   * 主键
-   */
-  id: number | string;
-
-  /**
-   * 排序号
-   */
-  orderNum: number;
-
-  /**
-   * key键
-   */
-  testKey: string;
-
-  /**
-   * 值
-   */
-  value: string;
-
-  /**
-   * 版本
-   */
-  version: number;
-}
-
-export interface DemoForm extends BaseEntity {
-  /**
-   * 主键
-   */
-  id?: number | string;
-
-  /**
-   * 排序号
-   */
-  orderNum?: number;
-
-  /**
-   * key键
-   */
-  testKey?: string;
-
-  /**
-   * 值
-   */
-  value?: string;
-
-  /**
-   * 版本
-   */
-  version?: number;
-}
-
-export interface DemoQuery extends PageQuery {
-  /**
-   * 排序号
-   */
-  orderNum?: number;
-
-  /**
-   * key键
-   */
-  testKey?: string;
-
-  /**
-   * 值
-   */
-  value?: string;
-
-  /**
-   * 版本
-   */
-  version?: number;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

apps/web-antd/src/views/demo/demo/data.ts

@@ -1,93 +0,0 @@
-import type { FormSchemaGetter } from '#/adapter/form';
-import type { VxeGridProps } from '#/adapter/vxe-table';
-
-export const querySchema: FormSchemaGetter = () => [
-  {
-    component: 'Input',
-    fieldName: 'orderNum',
-    label: '排序号',
-  },
-  {
-    component: 'Input',
-    fieldName: 'testKey',
-    label: 'key键',
-  },
-  {
-    component: 'Input',
-    fieldName: 'value',
-    label: '值',
-  },
-  {
-    component: 'Input',
-    fieldName: 'version',
-    label: '版本',
-  },
-];
-
-export const columns: VxeGridProps['columns'] = [
-  { type: 'checkbox', width: 60 },
-  {
-    title: '主键',
-    field: 'id',
-  },
-  {
-    title: '排序号',
-    field: 'orderNum',
-  },
-  {
-    title: 'key键',
-    field: 'testKey',
-  },
-  {
-    title: '值',
-    field: 'value',
-  },
-  {
-    title: '版本',
-    field: 'version',
-  },
-  {
-    field: 'action',
-    fixed: 'right',
-    slots: { default: 'action' },
-    title: '操作',
-    resizable: false,
-    width: 'auto',
-  },
-];
-
-export const modalSchema: FormSchemaGetter = () => [
-  {
-    label: '主键',
-    fieldName: 'id',
-    component: 'Input',
-    dependencies: {
-      show: () => false,
-      triggerFields: [''],
-    },
-  },
-  {
-    label: '排序号',
-    fieldName: 'orderNum',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: 'key键',
-    fieldName: 'testKey',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '值',
-    fieldName: 'value',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '版本',
-    fieldName: 'version',
-    component: 'Input',
-    rules: 'required',
-  },
-];

apps/web-antd/src/views/demo/tree/api/index.ts

@@ -1,50 +0,0 @@
-import type { TreeForm, TreeQuery, TreeVO } from './model';
-
-import type { ID, IDS } from '#/api/common';
-
-import { requestClient } from '#/api/request';
-
-/**
- * 查询测试树列表
- * @param params
- * @returns 测试树列表
- */
-export function treeList(params?: TreeQuery) {
-  return requestClient.get<TreeVO[]>('/demo/tree/list', { params });
-}
-
-/**
- * 查询测试树详情
- * @param id id
- * @returns 测试树详情
- */
-export function treeInfo(id: ID) {
-  return requestClient.get<TreeVO>(`/demo/tree/${id}`);
-}
-
-/**
- * 新增测试树
- * @param data
- * @returns void
- */
-export function treeAdd(data: TreeForm) {
-  return requestClient.postWithMsg<void>('/demo/tree', data);
-}
-
-/**
- * 更新测试树
- * @param data
- * @returns void
- */
-export function treeUpdate(data: TreeForm) {
-  return requestClient.putWithMsg<void>('/demo/tree', data);
-}
-
-/**
- * 删除测试树
- * @param id id
- * @returns void
- */
-export function treeRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/demo/tree/${id}`);
-}

apps/web-antd/src/views/demo/tree/api/model.d.ts

@@ -1,102 +0,0 @@
-import type { BaseEntity } from '#/api/common';
-
-export interface TreeVO {
-  /**
-   * 主键
-   */
-  id: number | string;
-
-  /**
-   * 父id
-   */
-  parentId: number | string;
-
-  /**
-   * 部门id
-   */
-  deptId: number | string;
-
-  /**
-   * 用户id
-   */
-  userId: number | string;
-
-  /**
-   * 值
-   */
-  treeName: string;
-
-  /**
-   * 版本
-   */
-  version: number;
-
-  /**
-   * 子对象
-   */
-  children: TreeVO[];
-}
-
-export interface TreeForm extends BaseEntity {
-  /**
-   * 主键
-   */
-  id?: number | string;
-
-  /**
-   * 父id
-   */
-  parentId?: number | string;
-
-  /**
-   * 部门id
-   */
-  deptId?: number | string;
-
-  /**
-   * 用户id
-   */
-  userId?: number | string;
-
-  /**
-   * 值
-   */
-  treeName?: string;
-
-  /**
-   * 版本
-   */
-  version?: number;
-}
-
-export interface TreeQuery {
-  /**
-   * 父id
-   */
-  parentId?: number | string;
-
-  /**
-   * 部门id
-   */
-  deptId?: number | string;
-
-  /**
-   * 用户id
-   */
-  userId?: number | string;
-
-  /**
-   * 值
-   */
-  treeName?: string;
-
-  /**
-   * 版本
-   */
-  version?: number;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

apps/web-antd/src/views/demo/tree/data.ts

@@ -1,108 +0,0 @@
-import type { FormSchemaGetter } from '#/adapter/form';
-import type { VxeGridProps } from '#/adapter/vxe-table';
-
-export const querySchema: FormSchemaGetter = () => [
-  {
-    component: 'Input',
-    fieldName: 'parentId',
-    label: '父id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'deptId',
-    label: '部门id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'userId',
-    label: '用户id',
-  },
-  {
-    component: 'Input',
-    fieldName: 'treeName',
-    label: '值',
-  },
-  {
-    component: 'Input',
-    fieldName: 'version',
-    label: '版本',
-  },
-];
-
-export const columns: VxeGridProps['columns'] = [
-  {
-    title: '主键',
-    field: 'id',
-    treeNode: true,
-  },
-  {
-    title: '父id',
-    field: 'parentId',
-  },
-  {
-    title: '部门id',
-    field: 'deptId',
-  },
-  {
-    title: '用户id',
-    field: 'userId',
-  },
-  {
-    title: '值',
-    field: 'treeName',
-  },
-  {
-    title: '版本',
-    field: 'version',
-  },
-  {
-    field: 'action',
-    fixed: 'right',
-    slots: { default: 'action' },
-    title: '操作',
-    resizable: false,
-    width: 'auto',
-  },
-];
-
-export const modalSchema: FormSchemaGetter = () => [
-  {
-    label: '主键',
-    fieldName: 'id',
-    component: 'Input',
-    dependencies: {
-      show: () => false,
-      triggerFields: [''],
-    },
-  },
-  {
-    label: '父id',
-    fieldName: 'parentId',
-    component: 'TreeSelect',
-    rules: 'required',
-  },
-  {
-    label: '部门id',
-    fieldName: 'deptId',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '用户id',
-    fieldName: 'userId',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '值',
-    fieldName: 'treeName',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '版本',
-    fieldName: 'version',
-    component: 'Input',
-    rules: 'required',
-  },
-];

apps/web-antd/src/views/demo/tree/index.vue

@@ -1,146 +0,0 @@
-<script setup lang="ts">
-import type { VbenFormProps } from '@vben/common-ui';
-import type { Recordable } from '@vben/types';
-
-import type { VxeGridProps } from '#/adapter/vxe-table';
-
-import { nextTick } from 'vue';
-
-import { Page, useVbenModal } from '@vben/common-ui';
-import { getPopupContainer, listToTree } from '@vben/utils';
-
-import { Popconfirm, Space } from 'ant-design-vue';
-
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-
-import { treeList, treeRemove } from './api';
-import { columns, querySchema } from './data';
-import treeModal from './tree-modal.vue';
-
-const formOptions: VbenFormProps = {
-  commonConfig: {
-    labelWidth: 80,
-  },
-  schema: querySchema(),
-  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-};
-
-const gridOptions: VxeGridProps = {
-  columns,
-  height: 'auto',
-  keepSource: true,
-  pagerConfig: {
-    enabled: false,
-  },
-  proxyConfig: {
-    ajax: {
-      query: async (_, formValues = {}) => {
-        const resp = await treeList({
-          ...formValues,
-        });
-        const treeData = listToTree(resp, {
-          id: 'id',
-          pid: 'parentId',
-          children: 'children',
-        });
-        return { rows: treeData };
-      },
-      // 默认请求接口后展开全部 不需要可以删除这段
-      querySuccess: () => {
-        nextTick(() => {
-          expandAll();
-        });
-      },
-    },
-  },
-  rowConfig: {
-    keyField: 'id',
-  },
-
-  treeConfig: {
-    parentField: 'parentId',
-    rowField: 'id',
-    transform: false,
-  },
-};
-
-const [BasicTable, tableApi] = useVbenVxeGrid({ formOptions, gridOptions });
-const [TreeModal, modalApi] = useVbenModal({
-  connectedComponent: treeModal,
-});
-
-function handleAdd() {
-  modalApi.setData({ update: false });
-  modalApi.open();
-}
-
-async function handleEdit(row: Recordable<any>) {
-  modalApi.setData({ id: row.id, update: true });
-  modalApi.open();
-}
-
-async function handleDelete(row: Recordable<any>) {
-  await treeRemove(row.id);
-  await tableApi.query();
-}
-
-function expandAll() {
-  tableApi.grid?.setAllTreeExpand(true);
-}
-
-function collapseAll() {
-  tableApi.grid?.setAllTreeExpand(false);
-}
-</script>
-
-<template>
-  <Page :auto-content-height="true">
-    <BasicTable>
-      <template #toolbar-actions>
-        <span class="pl-[7px] text-[16px]">测试树列表</span>
-      </template>
-      <template #toolbar-tools>
-        <Space>
-          <a-button @click="collapseAll">
-            {{ $t('pages.common.collapse') }}
-          </a-button>
-          <a-button @click="expandAll">
-            {{ $t('pages.common.expand') }}
-          </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['system:tree:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
-        </Space>
-      </template>
-      <template #action="{ row }">
-        <Space>
-          <ghost-button
-            v-access:code="['system:tree:edit']"
-            @click.stop="handleEdit(row)"
-          >
-            {{ $t('pages.common.edit') }}
-          </ghost-button>
-          <Popconfirm
-            :get-popup-container="getPopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              danger
-              v-access:code="['system:tree:remove']"
-              @click.stop=""
-            >
-              {{ $t('pages.common.delete') }}
-            </ghost-button>
-          </Popconfirm>
-        </Space>
-      </template>
-    </BasicTable>
-    <TreeModal @reload="tableApi.query()" />
-  </Page>
-</template>

apps/web-antd/src/views/property/assetManage/assetType/data.ts

@@ -61,5 +61,11 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '排序',
     fieldName: 'sort',
     component: 'InputNumber',
+    rules:'required',
+    componentProps: {
+      min: 0,
+      precision: 0,
+      step: 1
+    },
   },
 ];

apps/web-antd/src/views/property/assetManage/depot/index.vue

@@ -164,7 +164,7 @@ const { hasAccessByCodes } = useAccess();
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:depot:info']"
+            v-access:code="['property:depot:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}

apps/web-antd/src/views/property/assetManage/procurementApplication/data.ts

@@ -5,9 +5,9 @@ import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 import { suppliersList } from '#/api/property/assetManage/suppliers';
 import { depotList } from '#/api/property/assetManage/depot';
-import { useUserStore } from '@vben/stores';
+// import { useUserStore } from '@vben/stores';
 
-const userStore = useUserStore();
+// const userStore = useUserStore();
 
 export const querySchema: FormSchemaGetter = () => [
   // {
@@ -39,11 +39,13 @@ export const querySchema: FormSchemaGetter = () => [
 
   {
     component: 'Select',
-    componentProps: {},
+    componentProps: {
+      options: getDictOptions('wy_zccgfs'),
+    },
     fieldName: 'buyType',
     label: '采购方式',
-    options: getDictOptions('wy_zccgfs'),
   },
+
   {
     component: 'Select',
     componentProps: {

apps/web-antd/src/views/property/assetManage/procurementApplication/index.vue

@@ -179,7 +179,7 @@ function handleDownloadExcel() {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['domain:procurementApplication:audit']"
+            v-access:code="['domain:procurementApplication:edit']"
             :disabled="row.state === '1' || row.state === '2'"
             type="primary"
             @click.stop="handleAudit(row)"
@@ -187,7 +187,7 @@ function handleDownloadExcel() {
             审核
           </ghost-button>
           <ghost-button
-            v-access:code="['domain:procurementApplication:detail']"
+            v-access:code="['domain:procurementApplication:query']"
             @click.stop="handleDetail(row)"
           >
             详情

apps/web-antd/src/views/property/assetManage/suppliers/index.vue

@@ -155,14 +155,14 @@ const { hasAccessByCodes } = useAccess();
           :unCheckedValue="0"
           v-model:value="row.state"
           :api="() => suppliersUpdate(row)"
-          :disabled="!hasAccessByCodes(['property:suppliers:update'])"
+          :disabled="!hasAccessByCodes(['property:suppliers:edit'])"
           @reload="() => tableApi.query()"
         />
       </template>
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:suppliers:info']"
+            v-access:code="['property:suppliers:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}

apps/web-antd/src/views/property/assetType/index.vue

@@ -1,20 +1,12 @@
 <script setup lang="ts">
-import type { Recordable } from '@vben/types';
-
-import { ref } from 'vue';
-
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
-
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-import dayjs from 'dayjs';
-
-import {   
+import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
-  type VxeGridProps 
+  type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
   assetTypeExport,
   assetTypeList,
@@ -35,15 +27,6 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
-  // 不需要直接删除
-  // fieldMappingTime: [
-  //  [
-  //    'createTime',
-  //    ['params[beginTime]', 'params[endTime]'],
-  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //  ],
-  // ],
 };
 
 const gridOptions: VxeGridProps = {
@@ -138,8 +121,8 @@ function handleDownloadExcel() {
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
-            type="primary" 
-            v-access:code="['property:assetType:remove']" 
+            type="primary"
+            v-access:code="['property:assetType:remove']"
             @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>

apps/web-antd/src/views/property/attendanceManagement/attendanceArea/attendanceArea-modal.vue

@@ -6,7 +6,11 @@ import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { attendanceAreaAdd, attendanceAreaInfo, attendanceAreaUpdate } from '#/api/property/attendanceManagement/attendanceArea';
+import {
+  attendanceAreaAdd,
+  attendanceAreaInfo,
+  attendanceAreaUpdate,
+} from '#/api/property/attendanceManagement/attendanceArea';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
@@ -27,7 +31,7 @@ const [BasicForm, formApi] = useVbenForm({
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
-    }
+    },
   },
   schema: modalSchema(),
   showDefaultActions: false,
@@ -59,6 +63,9 @@ const [BasicModal, modalApi] = useVbenModal({
 
     if (isUpdate.value && id) {
       const record = await attendanceAreaInfo(id);
+      record.deviceManageId = record.areaDevice
+          .map((device: any) => device.remoteSisDeviceManage?.id || '')
+          .filter((id: string) => id);
       await formApi.setValues(record);
     }
     await markInitialized();
@@ -76,7 +83,9 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? attendanceAreaUpdate(data) : attendanceAreaAdd(data));
+    await (isUpdate.value
+      ? attendanceAreaUpdate(data)
+      : attendanceAreaAdd(data));
     resetInitialized();
     emit('reload');
     modalApi.close();
@@ -98,4 +107,3 @@ async function handleClosed() {
     <BasicForm />
   </BasicModal>
 </template>
-

apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts

@@ -19,9 +19,20 @@ export const columns: VxeGridProps['columns'] = [
     width: 'auto',
   },
   {
-    title: '摄像机id',
-    field: 'deviceManageId',
+    title: '摄像机',
+    field: 'areaDevice',
     minWidth: 300,
+    slots: {
+      default: ({ row }: { row: any }) => {
+        if (!row.areaDevice || !Array.isArray(row.areaDevice)) {
+          return '';
+        }
+        return row.areaDevice
+          .map((device: any) => device.remoteSisDeviceManage?.deviceName || '')
+          .filter((deviceName: string) => deviceName)
+          .join(', ');
+      },
+    },
   },
 
   {
@@ -51,11 +62,13 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '区域',
     fieldName: 'area',
     component: 'Input',
+    rules: 'required',
   },
   {
     label: '摄像机',
     fieldName: 'deviceManageId',
     component: 'ApiSelect',
+    rules: 'required',
     componentProps: {
       api: async () => {
         const res = await deviceManageList({

apps/web-antd/src/views/property/attendanceManagement/attendanceArea/index.vue

@@ -9,10 +9,10 @@ import { getVxePopupContainer } from '@vben/utils';
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
-import {   
+import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
-  type VxeGridProps 
+  type VxeGridProps,
 } from '#/adapter/vxe-table';
 
 import {
@@ -76,7 +76,7 @@ const gridOptions: VxeGridProps = {
     keyField: 'id',
   },
   // 表格全局唯一表示 保存列配置需要用到
-  id: 'property-attendanceArea-index'
+  id: 'property-attendanceArea-index',
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
@@ -118,9 +118,14 @@ function handleMultiDelete() {
 }
 
 function handleDownloadExcel() {
-  commonDownloadExcel(attendanceAreaExport, '区域区域管理数据', tableApi.formApi.form.values, {
-    fieldMappingTime: formOptions.fieldMappingTime,
-  });
+  commonDownloadExcel(
+    attendanceAreaExport,
+    '区域区域管理数据',
+    tableApi.formApi.form.values,
+    {
+      fieldMappingTime: formOptions.fieldMappingTime,
+    },
+  );
 }
 </script>
 
@@ -138,9 +143,10 @@ function handleDownloadExcel() {
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
-            type="primary" 
-            v-access:code="['property:attendanceArea:remove']" 
-            @click="handleMultiDelete">
+            type="primary"
+            v-access:code="['property:attendanceArea:remove']"
+            @click="handleMultiDelete"
+          >
             {{ $t('pages.common.delete') }}
           </a-button>
           <a-button

apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/index.vue

@@ -154,7 +154,7 @@ function handleDownloadExcel() {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['Property:group:info']"
+            v-access:code="['Property:group:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}
@@ -187,7 +187,7 @@ function handleDownloadExcel() {
           :unCheckedValue="0"
           v-model:value="row.status"
           :api="() => groupUpdate(row)"
-          :disabled="!hasAccessByCodes(['property:depot:edit'])"
+          :disabled="!hasAccessByCodes(['Property:group:edit'])"
           @reload="() => tableApi.query()"
         />
       </template>

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue

@@ -20,6 +20,8 @@ import dayjs from 'dayjs';
 import type { PersonVO } from './type';
 import { ref, h } from 'vue';
 import { Tag, Table } from 'ant-design-vue';
+import { attendanceAreaList } from '#/api/property/attendanceManagement/attendanceArea';
+
 const emit = defineEmits<{ reload: [] }>();
 //表单项
 let formModal = reactive<{
@@ -29,6 +31,7 @@ let formModal = reactive<{
   dateType: number | undefined;
   startDate: string;
   endDate: string;
+  areaId: string[];
   userGroupList: any[];
 }>({
   id: '',
@@ -40,6 +43,7 @@ let formModal = reactive<{
   // dateRange: [null, null],
   startDate: '', //开始日期
   endDate: '', //结束日期
+  areaId: [], //区域
   userGroupList: [
     // scheduleId:undefined,//排班ID
     // employeeId:undefined,//员工ID
@@ -57,7 +61,8 @@ const rules = {
   attendanceType: [{ required: true }],
   dateType: [{ required: true, message: '请选择排班日期' }],
 };
-const groupOptions = ref<any[]>([]);
+const groupOptions = ref<any[]>([]); //考勤组
+const areaOptions = ref<any[]>([]); //区域
 const groupMap = ref<Record<string, any>>({}); // 用于快速查找
 let tableData = reactive<
   { dept: { deptId: string | number; deptName: string }; users: PersonVO[] }[]
@@ -72,7 +77,7 @@ const columns = [
   },
   {
     title: '部门',
-    dataIndex: ['dept', 'unitName'],
+    dataIndex: ['dept', 'deptName'],
     key: 'dept',
     width: 120,
     customRender: ({
@@ -209,6 +214,7 @@ const [BasicModal, modalApi] = useVbenModal({
     }
     modalApi.modalLoading(true);
     await getGroupList();
+    await getAreaList();
     // await markInitialized();
     modalApi.modalLoading(false);
   },
@@ -238,6 +244,13 @@ async function getGroupList() {
     groupMap.value[item.id] = item;
   });
 }
+async function getAreaList() {
+  const res = await attendanceAreaList({ pageSize: 1000000000, pageNum: 1 });
+  areaOptions.value = (res.rows || []).map((item) => ({
+    label: item.area,
+    value: item.id,
+  }));
+}
 function chooseGroup(value: any) {
   const group = groupMap.value[value];
   if (group) {
@@ -300,6 +313,7 @@ async function handleConfirm() {
       dateType: undefined,
       startDate: '',
       endDate: '',
+      areaId: [],
       userGroupList: [],
     });
     // 重置其他数据
@@ -324,6 +338,7 @@ async function handleClosed() {
     dateType: undefined,
     startDate: '',
     endDate: '',
+    areaId: [],
     userGroupList: [],
   });
 
@@ -402,6 +417,15 @@ onMounted(() => {});
             </Radio>
           </RadioGroup>
         </FormItem>
+        <FormItem name="areaId" label="请选择区域" class="mb-0">
+          <Select
+            v-model:value="formModal.areaId"
+            :options="areaOptions"
+            placeholder="请选择"
+            mode="multiple"
+            @change="chooseGroup"
+          />
+        </FormItem>
       </div>
     </Form>
     <!-- 考勤组人员表格区 -->
@@ -419,7 +443,7 @@ onMounted(() => {});
         :columns="columns"
         :dataSource="tableData"
         :pagination="false"
-        rowKey="dept.unitId"
+        rowKey="dept.deptId"
         bordered
       />
     </div>

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/calendarView.vue

@@ -160,9 +160,7 @@ const scheduleData: {
   date: string;
   list: { type: BadgeProps['status']; content: string }[];
 }[] = [
-  { date: '2025-07-08', list: [{ type: 'warning', content: '7月8日事件' }] },
-  { date: '2025-07-06', list: [{ type: 'success', content: '8月8日事件' }] },
-  // ...
+  //组件需要数据结构 { date: '2025-07-08', list: [{ type: 'warning', content: '7月8日事件' }] },
 ];
 // 切换视图模式
 function handleViewModeChange(e: RadioChangeEvent): void {
@@ -180,45 +178,11 @@ const getListData2 = (
     if (found) {
       return found.list;
     }
-
   }
   // 如果没有找到数据，返回空数组
   return [];
 };
 
-const getListData = (
-  value: Dayjs,
-): { type: BadgeProps['status']; content: string }[] => {
-  let listData: { type: BadgeProps['status']; content: string }[] | undefined;
-  switch (value.date()) {
-    case 8:
-      listData = [
-        { type: 'warning', content: 'This is warning event.' },
-        { type: 'success', content: 'This is usual event.' },
-      ];
-      break;
-    case 10:
-      listData = [
-        { type: 'warning', content: 'This is warning event.' },
-        { type: 'success', content: 'This is usual event.' },
-        { type: 'error', content: 'This is error event.' },
-      ];
-      break;
-    case 15:
-      listData = [
-        { type: 'warning', content: 'This is warning event' },
-        { type: 'success', content: 'This is very long usual event。。....' },
-        { type: 'error', content: 'This is error event 1.' },
-        { type: 'error', content: 'This is error event 2.' },
-        { type: 'error', content: 'This is error event 3.' },
-        { type: 'error', content: 'This is error event 4.' },
-      ];
-      break;
-    default:
-  }
-  return listData || [];
-};
-
 function customHeader() {
   // 返回想要的VNode或null
   return null; // 什么都不显示
@@ -284,6 +248,11 @@ function handleViewDateDetails(date: string) {
 onMounted(() => {
   fetchCalendarData();
 });
+
+// 暴露方法给父组件调用
+defineExpose({
+  fetchCalendarData,
+});
 </script>
 <template>
   <div class="flex h-full flex-col">
@@ -307,7 +276,7 @@ onMounted(() => {
         </div>
       </div>
       <div>
-        <Button type="primary" @click="handleAdd">新增排班</Button>
+        <Button type="primary" @click="handleAdd"  v-access:code="['Property:arrangement:add']">新增排班</Button>
       </div>
     </div>
     <div class="flex-1 p-1">
@@ -326,12 +295,16 @@ onMounted(() => {
                   <a
                     style="margin-left: 4px; color: #1890ff; cursor: pointer"
                     @click.stop="handleEdit(item.item, current)"
+               v-access:code="['Property:arrangement:edit']"
+
                   >
                     编辑
                   </a>
                   <a
                     style="margin-left: 4px; color: #ff4d4f; cursor: pointer"
                     @click.stop="handleDelete(item.item)"
+               v-access:code="['Property:arrangement:remove']"
+
                   >
                     删除
                   </a>
@@ -342,6 +315,7 @@ onMounted(() => {
               v-if="getListData2(current).length > 0"
               style="margin-left: 4px; color: #1890ff; cursor: pointer"
               @click.stop="handleViewDateDetails(current)"
+               v-access:code="['Property:userGroup:queryScheduleView']"
             >
               详情
             </a>

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts

@@ -1,6 +1,7 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import { renderDict } from '#/utils/render';
+import { attendanceAreaList } from '#/api/property/attendanceManagement/attendanceArea';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -58,7 +59,7 @@ export const querySchema: FormSchemaGetter = () => [
 export const unitQuerySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
-    fieldName: 'scheduleName',
+    fieldName: 'userName',
     label: '姓名',
   },
   {
@@ -261,6 +262,20 @@ export const modalSchema: FormSchemaGetter = () => [
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
   },
+  {
+    label: '选择区域',
+    fieldName: 'areaId',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const res = await attendanceAreaList({ pageNum: 1, pageSize: 10000 });
+        return res;
+      },
+      resultField: 'rows',
+      labelField: '',
+      valueField: '',
+    },
+  },
   {
     label: '状态：0-未生效，1-已生效',
     fieldName: 'status',
@@ -324,6 +339,22 @@ export const workforceDayDetailColumns: VxeGridProps['columns'] = [
       },
     },
   },
+  {
+    title: '区域',
+    field: 'areaList',
+    width: 'auto',
+    slots: {
+      default: ({ row }: { row: any }) => {
+        if (!row.areaList || !Array.isArray(row.areaList)) {
+          return '';
+        }
+        return row.areaList
+          .map((item: any) => item.area || '')
+          .filter((areaName: string) => areaName)
+          .join(', ');
+      },
+    },
+  },
   {
     title: '班组人数',
     field: 'userCount',

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/index.vue

@@ -1,22 +1,36 @@
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, nextTick } from 'vue';
 import calendarView from './calendarView.vue';
 import scheduleView from './scheduleView.vue';
 const viewMode = ref<'calender' | 'schedule'>('calender');
-// const isCalenderView = ref(true);
+const calendarViewRef = ref();
+const scheduleViewRef = ref();
+
 function handleViewModeChange(mode: 'calender' | 'schedule') {
   viewMode.value = mode;
+  // 切换视图后，需要重新加载对应视图的数据
+  nextTick(() => {
+    if (mode === 'calender') {
+      // 触发日历视图的数据加载
+      calendarViewRef.value?.fetchCalendarData();
+    } else if (mode === 'schedule') {
+      // 触发班表视图的数据加载
+      scheduleViewRef.value?.tableApi?.query();
+    }
+  });
 }
 </script>
 <template>
   <div class="h-full p-4">
     <div class="h-full bg-white p-4">
       <calendarView
+        ref="calendarViewRef"
         v-show="viewMode === 'calender'"
         :viewMode="viewMode"
         @changeView="handleViewModeChange"
       />
       <scheduleView
+        ref="scheduleViewRef"
         v-show="viewMode === 'schedule'"
         :viewMode="viewMode"
         @changeView="handleViewModeChange"

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue

@@ -82,15 +82,15 @@ function handleAdd() {
   modalApi.open();
 }
 
-async function handleEdit(row: Required<ArrangementForm>) {
-  modalApi.setData({ id: row.scheduleId });
-  modalApi.open();
-}
-
 async function handleDelete(row: Required<ArrangementForm>) {
   await arrangementRemove(row.scheduleId);
   await tableApi.query();
 }
+
+// 暴露方法给父组件调用
+defineExpose({
+  tableApi,
+});
 </script>
 <template>
   <div class="h-full">
@@ -137,7 +137,7 @@ async function handleDelete(row: Required<ArrangementForm>) {
                 >
                   <ghost-button
                     danger
-                    v-access:code="['property:arrangement:remove']"
+                    v-access:code="['Property:arrangement:remove']"
                     @click.stop=""
                   >
                     移除

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue

@@ -14,18 +14,22 @@ import dayjs from 'dayjs';
 import type { PersonVO } from './type';
 import { ref, h } from 'vue';
 import { Tag, Table } from 'ant-design-vue';
+import { attendanceAreaList } from '#/api/property/attendanceManagement/attendanceArea';
+
 const emit = defineEmits<{ reload: [] }>();
 //表单项
 let formModal = reactive<{
   id: string | number;
   groupId?: string | number;
   attendanceType: string;
+  areaId: string[];
   userGroupList: any[];
   dateType: number | undefined;
 }>({
   id: '',
   groupId: '',
   attendanceType: '', //考勤组类型
+  areaId: [], //区域
   userGroupList: [
     // scheduleId:undefined,//排班ID
     // employeeId:undefined,//员工ID
@@ -36,10 +40,11 @@ let formModal = reactive<{
   dateType: undefined, //排班日期类型
 });
 const formRef = ref();
-const groupOptions = ref<any[]>([]);
+const groupOptions = ref<any[]>([]); //考勤组
+const areaOptions = ref<any[]>([]); //区域
 const groupMap = ref<Record<string, any>>({}); // 用于快速查找
 let tableData = reactive<
-  { dept: { unitId: string | number; unitName: string }; users: PersonVO[] }[]
+  { dept: { deptId: string | number; deptName: string }; users: PersonVO[] }[]
 >([]); //存放考勤组人员列表数据
 const columns = [
   {
@@ -51,10 +56,10 @@ const columns = [
   },
   {
     title: '部门',
-    dataIndex: ['dept', 'unitName'],
+    dataIndex: ['dept', 'deptName'],
     key: 'dept',
     width: 120,
-    customRender: ({ record }: { record: any }) => record.dept.unitName,
+    customRender: ({ record }: { record: any }) => record.dept.deptName,
   },
   {
     title: '已选人数',
@@ -119,12 +124,11 @@ function handleTableData(newTableData: any) {
   if (newTableData.length === 0) {
     return;
   }
-
   // 处理有数据的情况
   for (const newItem of newTableData) {
     // 查找是否已存在相同部门
     const existingDeptIndex = tableData.findIndex(
-      (item) => item.dept.unitId === newItem.dept.unitId,
+      (item) => item.dept.deptId === newItem.dept.deptId,
     );
 
     if (existingDeptIndex !== -1) {
@@ -161,6 +165,8 @@ const [BasicModal, modalApi] = useVbenModal({
     }
     modalApi.modalLoading(true);
     await getGroupList();
+    await getAreaList();
+
     const { id, date } = modalApi.getData() as {
       id?: number | string;
       date?: string;
@@ -172,6 +178,7 @@ const [BasicModal, modalApi] = useVbenModal({
       formModal.id = record.id;
       formModal.groupId = record.attendanceGroup.id;
       formModal.dateType = record.dateType;
+      formModal.areaId = record.areaList?.map((area: any) => area.id) || [];
 
       if (record.userGroupList) {
         // 按部门分组处理 userGroupList
@@ -183,7 +190,7 @@ const [BasicModal, modalApi] = useVbenModal({
 
           if (!deptMap.has(deptId)) {
             deptMap.set(deptId, {
-              dept: { unitId: deptId, unitName: deptName },
+              dept: { deptId: deptId, deptName: deptName },
               users: [],
             });
           }
@@ -196,8 +203,6 @@ const [BasicModal, modalApi] = useVbenModal({
         tableData.splice(0, 0, ...Array.from(deptMap.values()));
       }
     }
-    console.log(tableData);
-
     // await markInitialized();
     modalApi.modalLoading(false);
   },
@@ -221,6 +226,13 @@ async function getGroupList() {
     groupMap.value[item.id] = item;
   });
 }
+async function getAreaList() {
+  const res = await attendanceAreaList({ pageSize: 1000000000, pageNum: 1 });
+  areaOptions.value = (res.rows || []).map((item) => ({
+    label: item.area,
+    value: item.id,
+  }));
+}
 function chooseGroup(value: any) {
   const group = groupMap.value[value];
   if (group) {
@@ -237,11 +249,10 @@ async function handleConfirm() {
     modalApi.lock(true);
     await formRef.value.validate(); // 先校验
     const data = formModal;
-    console.log(tableData);
     data.userGroupList = tableData.flatMap((item) =>
       item.users.map((user) => ({
-        deptId: item.dept.unitId,
-        deptName: item.dept.unitName,
+        deptId: item.dept.deptId,
+        deptName: item.dept.deptName,
         employeeId: user.userId,
         employeeName: user.userName,
       })),
@@ -256,6 +267,7 @@ async function handleConfirm() {
       dateType: undefined,
       startDate: '',
       endDate: '',
+      areaId: [],
       userGroupList: [],
     });
     // 重置其他数据
@@ -277,6 +289,7 @@ async function handleClosed() {
     dateType: undefined,
     startDate: '',
     endDate: '',
+    areaId: [],
     userGroupList: [],
   });
 
@@ -311,6 +324,15 @@ onMounted(() => {});
             placeholder="请选择考勤组"
           />
         </FormItem>
+        <FormItem name="areaId" label="请选择区域" class="mb-0">
+          <Select
+            v-model:value="formModal.areaId"
+            :options="areaOptions"
+            placeholder="请选择"
+            mode="multiple"
+            @change="chooseGroup"
+          />
+        </FormItem>
       </div>
     </Form>
     <!-- 考勤组人员表格区 -->
@@ -328,7 +350,7 @@ onMounted(() => {});
         :columns="columns"
         :dataSource="tableData"
         :pagination="false"
-        rowKey="dept.unitId"
+        rowKey="dept.deptId"
         bordered
       />
     </div>

apps/web-antd/src/views/property/businessManagement/workOrderPending/index.vue

@@ -75,7 +75,7 @@ function handleInfo(row:any) {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:workOrders:info']"
+            v-access:code="['property:workOrders:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}

apps/web-antd/src/views/property/businessManagement/workOrderProcessed/index.vue

@@ -8,7 +8,7 @@ import {
 import {
   workOrdersList,
 } from '#/api/property/businessManagement/workOrders';
-import workOrdersDetail from './work-orders-detail.vue';
+import workOrdersDetail from '../workOrders/work-orders-detail.vue';
 import {columns, querySchema} from './data';
 
 const formOptions: VbenFormProps = {
@@ -75,7 +75,7 @@ function handleInfo(row:any) {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:workOrders:info']"
+            v-access:code="['property:workOrders:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}

apps/web-antd/src/views/property/businessManagement/workOrders/data.ts

@@ -2,8 +2,6 @@ import type {FormSchemaGetter} from '#/adapter/form';
 import type {VxeGridProps} from '#/adapter/vxe-table';
 import {renderDict} from "#/utils/render";
 import {getDictOptions} from "#/utils/dict";
-import {h} from "vue";
-import {Rate} from "ant-design-vue";
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -30,7 +28,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions('pro_processing_weight'),
     },
     fieldName: 'processingWeight',
-    label: '处理权重',
+    label: '处理优先级',
   },
 ];
 
@@ -56,7 +54,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportingType',
     slots: {
       default: ({row}) => {
-        return renderDict(row.reportingType, 'wy_gdsblx');
+        return row.reportingType!=null?renderDict(row.reportingType, 'wy_gdsblx'):'';
       },
     },
     width: 100,
@@ -82,11 +80,11 @@ export const columns: VxeGridProps['columns'] = [
     width: 100,
   },
   {
-    title: '处理权重',
+    title: '处理优先级',
     field: 'processingWeight',
     slots: {
       default: ({row}) => {
-        return renderDict(row.processingWeight, 'pro_processing_weight');
+        return row.processingWeight!=null?renderDict(row.processingWeight, 'pro_processing_weight'):'';
       },
     },
     width: 100,
@@ -96,34 +94,34 @@ export const columns: VxeGridProps['columns'] = [
   //   field: 'planCompleTime',
   //   width: 100,
   // },
-  {
-    title: '完成时间',
-    field: 'compleTime',
-    width: 100,
-  },
-  {
-    title: '评价',
-    field: 'serviceEvalua',
-    width: 180,
-    slots: {
-      default: ({row}) => {
-        return h(Rate, {
-          value: row.serviceEvalua || 0,
-          disabled: true,
-        });
-      },
-    },
-  },
-  {
-    title: '是否超时',
-    field: 'isTimeOut',
-    width: 100,
-    slots: {
-      default: ({row}) => {
-        return row.isTimeOut ? renderDict(row.isTimeOut, 'wy_sf') : '';
-      },
-    },
-  },
+  // {
+  //   title: '完成时间',
+  //   field: 'compleTime',
+  //   width: 100,
+  // },
+  // {
+  //   title: '评价',
+  //   field: 'serviceEvalua',
+  //   width: 180,
+  //   slots: {
+  //     default: ({row}) => {
+  //       return h(Rate, {
+  //         value: row.serviceEvalua || 0,
+  //         disabled: true,
+  //       });
+  //     },
+  //   },
+  // },
+  // {
+  //   title: '是否超时',
+  //   field: 'isTimeOut',
+  //   width: 100,
+  //   slots: {
+  //     default: ({row}) => {
+  //       return row.isTimeOut ? renderDict(row.isTimeOut, 'wy_sf') : '';
+  //     },
+  //   },
+  // },
   {
     title: '创建时间',
     field: 'createTime',
@@ -166,7 +164,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '处理权重',
+    label: '处理优先级',
     fieldName: 'processingWeight',
     component: 'Select',
     componentProps: {

apps/web-antd/src/views/property/businessManagement/workOrders/index.vue

@@ -184,19 +184,21 @@ onMounted(async () => {
       <template #action="{ row }">
         <Space>
           <ghost-button
+            v-access:code="['property:workOrders:dispatch']"
             @click.stop="handleOrders(row,'group')"
-            v-if="row.status!=='1' && row.status!=='2'"
+            v-if="row.status!=='1' && row.status!=='2'&&row.operationMode!=='2'"
           >
             {{ '派单' }}
           </ghost-button>
           <ghost-button
+            v-access:code="['property:workOrders:grab']"
             @click.stop="handleOrders(row,'rob')"
-            v-if="row.status!=='1' && row.status!=='2'"
+            v-if="row.status!=='1' && row.status!=='2'&&row.operationMode!=='2'"
           >
             {{ '抢单' }}
           </ghost-button>
           <ghost-button
-            v-access:code="['property:workOrders:info']"
+            v-access:code="['property:workOrders:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}

apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue

@@ -3,6 +3,7 @@ import {useVbenModal} from '@vben/common-ui';
 import {cloneDeep} from '@vben/utils';
 import {useVbenForm} from '#/adapter/form';
 import {
+  workOrdersDispatch, workOrdersGrab,
   workOrdersInfo,
   workOrdersUpdate
 } from '#/api/property/businessManagement/workOrders';
@@ -84,11 +85,15 @@ async function handleConfirm() {
     }
     const data = cloneDeep(await formApi.getValues());
     if(title.value === '派单'){
+      //派单
       record.value.handler = data.handler
+      await  workOrdersDispatch(record.value)
     }else{
+      //抢单
       record.value.handler = userStore.userInfo.userId
+      await  workOrdersGrab(record.value)
     }
-    await  workOrdersUpdate(record.value)
+
     resetInitialized();
     emit('reload');
     modalApi.close();

apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue

@@ -1,13 +1,21 @@
 <script setup lang="ts">
-import { ref, shallowRef} from 'vue';
+import {ref, shallowRef} from 'vue';
 import {useVbenModal} from '@vben/common-ui';
-import {Descriptions, DescriptionsItem, Timeline, TimelineItem, Rate,Divider} from 'ant-design-vue';
+import {
+  Descriptions,
+  DescriptionsItem,
+  Timeline,
+  TimelineItem,
+  Rate,
+  Divider
+} from 'ant-design-vue';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import relativeTime from 'dayjs/plugin/relativeTime';
 import {renderDict} from "#/utils/render";
 import {workOrdersInfo} from "#/api/property/businessManagement/workOrders";
 import type {HandleRecords, WorkOrdersVO} from "#/api/property/businessManagement/workOrders/model";
+import {ossInfo} from "#/api/system/oss";
 
 dayjs.extend(duration);
 dayjs.extend(relativeTime);
@@ -20,7 +28,8 @@ const [BasicModal, modalApi] = useVbenModal({
 });
 
 const orderDetail = shallowRef<null | WorkOrdersVO>(null);
-const handleRecords=ref<HandleRecords[]>([])
+const handleRecords = ref<HandleRecords[]>([])
+
 async function handleOpenChange(open: boolean) {
   if (!open) {
     return null;
@@ -28,14 +37,33 @@ async function handleOpenChange(open: boolean) {
   modalApi.modalLoading(true);
   const {id} = modalApi.getData() as { id: number | string };
   orderDetail.value = await workOrdersInfo(id);
-  if(orderDetail.value){
-    handleRecords.value = orderDetail.value.workOrdersRecordVoList.map( (item, index) => ({
+  if (orderDetail.value.workOrdersRecordVoList) {
+    handleRecords.value = orderDetail.value.workOrdersRecordVoList.map((item, index) => ({
       status: item.status,
       createTime: item.createTime,
       handlerName: index === 0 ? item.initiatorPeople : item.handlerName
     }))
   }
-  modalApi.modalLoading(false);
+  try {
+    if (orderDetail.value.orderImgUrl) {
+      const res = await ossInfo([orderDetail.value.orderImgUrl]);
+      let imgUrls = [] as string[];
+      res.forEach(item => {
+        imgUrls.push(item.url)
+      })
+      orderDetail.value.orderImgPath = imgUrls;
+    }
+    if (orderDetail.value.imgUrl) {
+      const res = await ossInfo([orderDetail.value.imgUrl]);
+      let imgUrls = [] as string[];
+      res.forEach(item => {
+        imgUrls.push(item.url)
+      })
+      orderDetail.value.evaluateImgPath = imgUrls
+    }
+  } catch (e) {
+  }
+    modalApi.modalLoading(false);
 }
 </script>
 
@@ -50,16 +78,16 @@ async function handleOpenChange(open: boolean) {
           {{ orderDetail.orderName }}
         </DescriptionsItem>
         <DescriptionsItem label="工单类型">
-         {{orderDetail.typeName}}
+          {{ orderDetail.typeName }}
         </DescriptionsItem>
         <DescriptionsItem label="上报类型">
-          <component
-            :is="renderDict(orderDetail.reportingType,'wy_gdsblx')"
+          <component v-if="orderDetail.reportingType!=null"
+                     :is="renderDict(orderDetail.reportingType,'wy_gdsblx')"
           />
         </DescriptionsItem>
-        <DescriptionsItem label="处理权重">
-          <component
-            :is="renderDict(orderDetail.processingWeight,'pro_processing_weight')"
+        <DescriptionsItem label="处理优先级">
+          <component v-if="orderDetail.processingWeight!=null"
+                     :is="renderDict(orderDetail.processingWeight,'pro_processing_weight')"
           />
         </DescriptionsItem>
         <DescriptionsItem label="发起人">
@@ -74,10 +102,9 @@ async function handleOpenChange(open: boolean) {
         <DescriptionsItem label="具体位置" :span="2">
           {{ orderDetail.location }}
         </DescriptionsItem>
-<!--        <DescriptionsItem label="计划完成时间">-->
-<!--          {{ orderDetail.planCompleTime }}-->
-<!--        </DescriptionsItem>-->
-
+        <!--        <DescriptionsItem label="计划完成时间">-->
+        <!--          {{ orderDetail.planCompleTime }}-->
+        <!--        </DescriptionsItem>-->
 
         <DescriptionsItem label="备注" :span="2">
           {{ orderDetail.remark }}
@@ -88,23 +115,24 @@ async function handleOpenChange(open: boolean) {
         <DescriptionsItem label="完成时间">
           {{ orderDetail.compleTime }}
         </DescriptionsItem>
-
-        <DescriptionsItem label="是否超时" v-if="orderDetail.isTimeOut!=null">
-          <component
-            :is="renderDict(orderDetail.isTimeOut,'wy_sf')"
+        <DescriptionsItem label="是否超时" :span="2">
+          <component v-if="orderDetail.isTimeOut!=null"
+                     :is="renderDict(orderDetail.isTimeOut,'wy_sf')"
           />
         </DescriptionsItem>
+        <DescriptionsItem label="工单图片" v-if="orderDetail.orderImgPath" :span="2">
+          <img v-for="item in orderDetail.orderImgPath" :src="item" alt="图片加载失败"
+               class="orders-img"/>
+        </DescriptionsItem>
         <DescriptionsItem label="服务评价" v-if="orderDetail.serviceEvalua!=null" :span="2">
           <Rate :value="orderDetail.serviceEvalua" disabled/>
         </DescriptionsItem>
         <DescriptionsItem label="评价内容" v-if="orderDetail.serviceEvaluaText" :span="2">
           {{ orderDetail.serviceEvaluaText }}
         </DescriptionsItem>
-        <DescriptionsItem label="评价图片" v-if="orderDetail.imgUrl" :span="2">
-          {{ orderDetail.imgUrl }}
-        </DescriptionsItem>
-        <DescriptionsItem label="工单图片" v-if="orderDetail.orderImgUrl" :span="2">
-          {{ orderDetail.orderImgUrl }}
+        <DescriptionsItem label="评价图片" v-if="orderDetail.evaluateImgPath" :span="2">
+          <img v-for="item in orderDetail.evaluateImgPath" :src="item" alt="图片加载失败"
+               class="orders-img"/>
         </DescriptionsItem>
       </Descriptions>
       <Divider orientation="left" orientation-margin="0px">
@@ -112,14 +140,22 @@ async function handleOpenChange(open: boolean) {
       </Divider>
       <Timeline>
         <TimelineItem v-for="(item,index) in handleRecords" :key="index">
-            <p style="display: flex;">类型：
-              <component
-                :is="renderDict(item.status,'wy_gdclzt')"
-              /></p>
-            <p>时间：{{item.createTime}}</p>
-            <p>处理人：{{item.handlerName}}</p>
+          <p style="display: flex;">类型：
+            <component v-if="item.status!=null"
+                       :is="renderDict(item.status,'wy_gdclzt')"
+            />
+          </p>
+          <p>时间：{{ item.createTime }}</p>
+          <p>处理人：{{ item.handlerName }}</p>
         </TimelineItem>
       </Timeline>
     </div>
   </BasicModal>
 </template>
+<style scoped lang="scss">
+.orders-img {
+  width: 100px;
+  margin: 5px 10px;
+  display: inline-block;
+}
+</style>

apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue

@@ -15,6 +15,7 @@ import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
 
 import {modalSchema} from './data';
 import {workOrdersTypeTree} from "#/api/property/businessManagement/workOrdersType";
+import type {WorkOrdersTypeVO} from "#/api/property/businessManagement/workOrdersType/model";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -108,7 +109,7 @@ async function queryWorkOrdersType() {
   const options = await workOrdersTypeTree()
   formApi.updateSchema([
     {
-      componentProps: () => ({
+      componentProps: (formModel) => ({
         class: 'w-full',
         fieldNames: {
           key: 'id',
@@ -123,16 +124,15 @@ async function queryWorkOrdersType() {
         treeLine: { showLeafIcon: false },
         treeNodeFilterProp: 'orderTypeName',
         treeNodeLabelProp: 'orderTypeName',
+        async onSelect(type:string,node:WorkOrdersTypeVO) {
+          formModel.processingWeight = node.processingWeight;
+        },
       }),
       fieldName: 'type',
     },
   ]);
 }
 
-const filterOption = (input: string, option: any) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-};
-
 </script>
 
 <template>

apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts

@@ -46,6 +46,16 @@ export const columns: VxeGridProps['columns'] = [
     },
     width:180,
   },
+  {
+    title: '处理优先级',
+    field: 'processingWeight',
+    slots: {
+      default: ({row}) => {
+        return row.processingWeight!=null?renderDict(row.processingWeight, 'pro_processing_weight'):'';
+      },
+    },
+    width: 100,
+  },
   {
     title: '排序值',
     field: 'sort',
@@ -105,6 +115,15 @@ export const modalSchema: FormSchemaGetter = () => [
     },
     rules: 'selectRequired',
   },
+  {
+    label: '处理优先级',
+    fieldName: 'processingWeight',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_processing_weight'),
+    },
+    rules: 'selectRequired',
+  },
   {
     label: '完成时效（小时）',
     fieldName: 'completionNumber',

apps/web-antd/src/views/property/businessManagement/workOrdersType/index.vue

@@ -140,6 +140,7 @@ function handleMultiDelete() {
         <Space>
           <ghost-button
             @click.stop="handleInfo(row)"
+            v-access:code="['property:workOrdersType:query']"
           >
             {{ $t('pages.common.info') }}
           </ghost-button>

apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-detail.vue

@@ -29,18 +29,24 @@ async function handleOpenChange(open: boolean) {
 
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="工单类型信息" class="w-[70%]">
-    <Descriptions v-if="workOrdersTypeInfoDetail" size="small" :column="2" bordered :labelStyle="{width:'120px'}">
-<!--      <DescriptionsItem label="工单类型编号">-->
-<!--        {{ workOrdersTypeInfoDetail.orderTypeNo }}-->
-<!--      </DescriptionsItem>-->
+    <Descriptions v-if="workOrdersTypeInfoDetail" size="small" :column="2" bordered
+                  :labelStyle="{width:'120px'}">
+      <!--      <DescriptionsItem label="工单类型编号">-->
+      <!--        {{ workOrdersTypeInfoDetail.orderTypeNo }}-->
+      <!--      </DescriptionsItem>-->
       <DescriptionsItem label="类型名称">
         {{ workOrdersTypeInfoDetail.orderTypeName }}
       </DescriptionsItem>
-      <DescriptionsItem label="运作模式" v-if="workOrdersTypeInfoDetail.operationMode!=null">
-        <component
+      <DescriptionsItem label="运作模式" >
+        <component v-if="workOrdersTypeInfoDetail.operationMode!=null"
           :is="renderDict(workOrdersTypeInfoDetail.operationMode,'pro_operation_pattern')"
         />
       </DescriptionsItem>
+      <DescriptionsItem label="处理优先级">
+        <component v-if="workOrdersTypeInfoDetail.processingWeight!=null"
+          :is="renderDict(workOrdersTypeInfoDetail.processingWeight,'pro_processing_weight')"
+        />
+      </DescriptionsItem>
       <DescriptionsItem label="排序值">
         {{ workOrdersTypeInfoDetail.sort }}
       </DescriptionsItem>

apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue

@@ -26,6 +26,7 @@ import cleanDetailModal from './clean-detail-modal.vue';
 // import { modalSchema } from './data';
 import { communityTree } from '#/api/property/community';
 import { getDictOptions } from '#/utils/dict';
+import type {Clean_orderForm} from "#/api/property/clean_order/model";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -190,9 +191,13 @@ const modalSchema = [
   {
     label: '评价图片',
     fieldName: 'imgUrl',
-    component: 'Input',
+    component: 'ImageUpload',
+    componentProps: {
+      helpMessage: false,
+    },
     dependencies: {
-      show: () => (isReadonly.value ? true : false),
+      show: (formValue:Clean_orderForm) =>
+        isReadonly.value && formValue.imgUrl ? true : false,
       triggerFields: [''],
     },
   },
@@ -201,7 +206,7 @@ const modalSchema = [
     fieldName: 'signType',
     component: 'Select',
     componentProps: {
-      options:getDictOptions('wy_bjqdfs')
+      options: getDictOptions('wy_bjqdfs'),
     },
     dependencies: {
       show: () => (isReadonly.value ? true : false),
@@ -213,10 +218,11 @@ const modalSchema = [
     fieldName: 'signImgUrl',
     component: 'ImageUpload',
     componentProps: {
-      helpMessage:false
+      helpMessage: false,
     },
     dependencies: {
-      show: (formValue) => (isReadonly.value&&formValue.signImgUrl ? true : false),
+      show: (formValue:Clean_orderForm) =>
+        isReadonly.value && formValue.signImgUrl ? true : false,
       triggerFields: [''],
     },
   },
@@ -289,7 +295,6 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
-    console.log(isReadonly.value);
 
     // 查询服务地址树形结构
     setupCommunitySelect();
@@ -314,6 +319,7 @@ const [BasicModal, modalApi] = useVbenModal({
     }
     if ((isUpdate.value || isReadonly.value) && id) {
       const record: any = await clean_orderInfo(id);
+
       if (record.starTime) record.starTime = dayjs(record.starTime);
       if (record.endTime) record.endTime = dayjs(record.endTime);
       editUnitId.value = record.unitId || '';
@@ -496,7 +502,6 @@ async function handleConfirm() {
       return;
     }
     const data = cloneDeep(await formApi.getValues());
-    console.log(data);
 
     // 单位数据缓存
     if (unitListData.length === 0) {
@@ -537,7 +542,6 @@ async function handleClosed() {
 // 获取服务地址
 async function setupCommunitySelect() {
   const areaList = await communityTree(4);
-  console.log(areaList);
 
   // 选中后显示在输入框的值 即父节点 / 子节点
   // addFullName(areaList, 'areaName', ' / ');

apps/web-antd/src/views/property/clean/cleanOrders/data.ts

@@ -74,8 +74,8 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '服务地址',
-    field: 'location',
-    width: '180',
+    field: 'locationName',
+    width: '260',
   },
   {
     title: '合计费用（元）',

apps/web-antd/src/views/property/costManagement/carCharge/data.ts

@@ -7,8 +7,6 @@ import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 import { costItemSettingList } from '#/api/property/costManagement/costItemSetting';
 import { personList } from '#/api/property/resident/person';
-import { communityTree } from '#/api/property/community';
-import { handleNode } from '@vben/utils';
 
 /**
  * 查询表单 schema
@@ -57,7 +55,7 @@ export const columns: VxeGridProps['columns'] = [
   },
   { title: '车牌号', field: 'carNumber' },
   { title: '车位', field: 'location' },
-  { title: '业主', field: 'personId' },
+  { title: '业主', field: 'personName' },
   {
     title: '缴费状态',
     field: 'chargeStatus',
@@ -106,12 +104,12 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
     componentProps: {
       api: async () => {
-        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
+        const rows = await userList({ pageSize: 1000000000, pageNum: 1 });
         return rows;
       },
       resultField: 'rows',
       labelField: 'userName',
-      valueField: 'id',
+      valueField: 'userId',
     },
     disabled: true,
   },
@@ -143,7 +141,11 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'ApiSelect',
     componentProps: {
       api: async () => {
-        const rows = await costItemSettingList({ pageSize: 1000000000, pageNum: 1, costType: '2' });
+        const rows = await costItemSettingList({
+          pageSize: 1000000000,
+          pageNum: 1,
+          costType: '2',
+        });
         return rows;
       },
       resultField: 'rows',
@@ -244,7 +246,11 @@ export const addModalSchema: FormSchemaGetter = () => [
     component: 'ApiSelect',
     componentProps: {
       api: async () => {
-        const rows = await costItemSettingList({ pageSize: 1000000000, pageNum: 1, costType: '2' });
+        const rows = await costItemSettingList({
+          pageSize: 1000000000,
+          pageNum: 1,
+          costType: '2',
+        });
         return rows;
       },
       resultField: 'rows',

apps/web-antd/src/views/property/costManagement/carCharge/index.vue

@@ -152,7 +152,7 @@ function handleDownloadExcel() {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:carCharge:info']"
+            v-access:code="['property:carCharge:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}

apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue

@@ -140,7 +140,7 @@ const { hasAccessByCodes } = useAccess();
           unCheckedValue="0"
           v-model:value="row.state"
           :api="() => costItemSettingUpdate(row)"
-          :disabled=" !hasAccessByCodes(['property:unit:edit'])"
+          :disabled=" !hasAccessByCodes(['property:costItemSetting:edit'])"
           @reload="() => tableApi.query()"
         />
       </template>

apps/web-antd/src/views/property/costManagement/costMeterWater/costMeterWater-modal.vue

@@ -19,7 +19,7 @@ import { personList } from '#/api/property/resident/person';
 const emit = defineEmits<{ reload: [] }>();
 const costItemsOptions = ref<any>([]);
 const meterTypeOptions = ref<any>([]);
-const isMeterType = ref(false);
+const isMeterType = ref(false); //是否选择了费用类型
 const isUpdate = ref(false);
 const title = computed(() => {
   return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
@@ -48,11 +48,11 @@ const schema = [
     componentProps: {
       api: async () => {
         const res = await personList({ pageSize: 1000000000, pageNum: 1 });
-        return res.rows.map((item: any) => ({
-          label: item.userName,
-          value: item.id,
-        }));
+        return res;
       },
+      resultField: 'rows',
+      labelField: 'userName',
+      valueField: 'id',
     },
   },
   {
@@ -70,6 +70,7 @@ const schema = [
           isMeterType.value = false;
         } else {
           isMeterType.value = true;
+          // 获取费用项目
           const costItemsRes = await costItemSettingList({
             pageSize: 1000000000,
             pageNum: 1,
@@ -79,10 +80,11 @@ const schema = [
             label: item.chargeItem,
             value: item.id,
           }));
+          // 获取抄表类型：水费字典为0，电费为1
           const meterTypeRes = await meterReadingTypeList({
             pageSize: 1000000000,
             pageNum: 1,
-            costType: value == '5' ? 0 : 1,
+            meterType: value == '5' ? '0' : '1',
           });
           meterTypeOptions.value = (meterTypeRes?.rows || []).map((item) => ({
             label: item.name,

apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts

@@ -1,8 +1,7 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import { getDictOptions } from '#/utils/dict';
-import { costItemSettingList } from '#/api/property/costManagement/costItemSetting';
-import {meterReadingTypeList} from '#/api/property/costManagement/meterReadingType';
+import {renderDict} from "#/utils/render";
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -27,11 +26,16 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '费用类型',
-    field: 'itemId',
+    field: 'costType',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.costType, 'wy_cbfylx');
+      },
+    },
   },
   {
     title: '抄表类型',
-    field: 'meterTypeId',
+    field: 'costTypeName',
   },
   {
     title: '本期度数',
@@ -97,7 +101,7 @@ export const modalSchema: FormSchemaGetter = () => [
     //   return {
     //   api: async ()=>{
     //     console.log(values);
-        
+
     //     const rows = await costItemSettingList({pageSize:1000000000,pageNum:1,costType:values.costType});
     //     return rows;
     //   },
@@ -118,7 +122,7 @@ export const modalSchema: FormSchemaGetter = () => [
     //   return {
     //     api: async()=>{
     //       const rows = await meterReadingTypeList({pageSize:1000000000,pageNum:1,costType:values.costType=='5'?0:1});
-    //       return rows;      
+    //       return rows;
     //   },
     //       resultField:'rows',
     //       labelField:'name',

apps/web-antd/src/views/property/costManagement/costMeterWater/index.vue

@@ -29,15 +29,6 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
-  // 不需要直接删除
-  // fieldMappingTime: [
-  //  [
-  //    'createTime',
-  //    ['params[beginTime]', 'params[endTime]'],
-  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //  ],
-  // ],
 };
 
 const gridOptions: VxeGridProps = {

apps/web-antd/src/views/property/costManagement/houseCharge/data.ts

@@ -36,7 +36,7 @@ export const columns: VxeGridProps['columns'] = [
   {type: 'checkbox', width: 60},
   {
     title: '房屋',
-    field: 'roomId',
+    field: 'roomName',
     minWidth: 150,
   },
   {

apps/web-antd/src/views/property/costManagement/houseCharge/index.vue

@@ -164,7 +164,7 @@ function handleDownloadExcel() {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:houseCharge:info']"
+            v-access:code="['property:houseCharge:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}

apps/web-antd/src/views/property/costManagement/paymentReview/data.ts

@@ -33,8 +33,13 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '房屋',
-    field: 'roomNumber',
+    title: '费用类型',
+    field: 'costType',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.costType, 'pro_expense_type');
+      },
+    },
   },
   {
     title: '费用项目',

apps/web-antd/src/views/property/costManagement/paymentReview/index.vue

@@ -85,12 +85,14 @@ async function handleEdit(row: Required<PaymentReviewForm>) {
         <Space>
           <ghost-button
               @click.stop="handleInfo(row)"
+              v-access:code="['property:payFeeAudit:query']"
           >
             {{ $t('pages.common.info') }}
           </ghost-button>
           <ghost-button
               :disabled="row.state!=='0'"
               @click.stop="handleEdit(row)"
+              v-access:code="['property:payFeeAudit:edit']"
           >
             {{ '审核' }}
           </ghost-button>

apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-detail.vue

@@ -36,7 +36,7 @@ async function handleOpenChange(open: boolean) {
   <BasicModal :footer="false" :fullscreen-button="false" title="缴费审核详情" class="w-[70%]">
     <Descriptions v-if="paymentReviewDetail" size="small" :column="2" bordered
                   :labelStyle="{width:'120px'}">
-      <DescriptionsItem label="房屋">
+      <DescriptionsItem label="房屋" v-if="paymentReviewDetail.roomNumber">
         {{ paymentReviewDetail.roomNumber }}
       </DescriptionsItem>
       <DescriptionsItem label="费用项目">

apps/web-antd/src/views/property/costManagement/returnPayFee/index.vue

@@ -158,7 +158,7 @@ function handleDownloadExcel() {
             审核
           </ghost-button>
           <ghost-button
-            v-access:code="['property:returnPayFee:info']"
+            v-access:code="['property:returnPayFee:query']"
             @click.stop="handleInfo(row)"
           >
             {{ $t('pages.common.info') }}

apps/web-antd/src/views/property/customerService/activities/activities-modal.vue

@@ -1,61 +1,50 @@
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed, ref } from 'vue';
 
-import { useVbenModal } from "@vben/common-ui";
-import { $t } from "@vben/locales";
-import { cloneDeep } from "@vben/utils";
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+import { cloneDeep } from '@vben/utils';
 
-import { useVbenForm } from "#/adapter/form";
-import {
-  meterInfoAdd,
-  meterInfoInfo,
-  meterInfoUpdate,
-} from "#/api/property/meter/meterInfo";
-import { defaultFormValueGetter, useBeforeCloseDiff } from "#/utils/popup";
+import { useVbenForm } from '#/adapter/form';
+import { activitiesAdd, activitiesInfo, activitiesUpdate } from '#/api/property/customerService/activities';
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
-const props = defineProps({
-  meterType: {
-    type: Number,
-    required: true,
-  },
-});
-
-import { initMoalForm } from "./data";
-const modalSchema = initMoalForm(props.meterType);
+import { modalSchema } from './data';
+import dayjs from "dayjs";
 
 const emit = defineEmits<{ reload: [] }>();
+
 const isUpdate = ref(false);
 const title = computed(() => {
-  return isUpdate.value ? $t("pages.common.edit") : $t("pages.common.add");
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
 });
 
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: "col-span-1",
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
-    labelWidth: 120,
-
+    labelWidth: 80,
     // 通用配置项 会影响到所有表单项
     componentProps: {
-      class: "w-full",
-    },
+      class: 'w-full',
+    }
   },
   schema: modalSchema(),
   showDefaultActions: false,
-  wrapperClass: "grid-cols-2",
+  wrapperClass: 'grid-cols-2',
 });
 
 const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   {
     initializedGetter: defaultFormValueGetter(formApi),
     currentGetter: defaultFormValueGetter(formApi),
-  }
+  },
 );
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: "w-[900px]",
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
@@ -70,11 +59,9 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id;
 
     if (isUpdate.value && id) {
-      const record = await meterInfoInfo(id);
-      record.meterType = record.meterType.toString();
-      record.meterUnit = record.meterUnit.toString();
-      record.runningState = record.runningState.toString();
-      record.communicationState = record.communicationState.toString();
+      const record = await activitiesInfo(id);
+      dayjs(record.startTime, 'YYYY-MM-DD HH:mm:ss')
+      dayjs(record.endTime, 'YYYY-MM-DD HH:mm:ss')
       await formApi.setValues(record);
     }
     await markInitialized();
@@ -92,9 +79,11 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? meterInfoUpdate(data) : meterInfoAdd(data));
+    data.startTime = dayjs(data.startTime).format('YYYY-MM-DD HH:mm:ss');
+    data.endTime = dayjs(data.endTime).format('YYYY-MM-DD HH:mm:ss');
+    await (isUpdate.value ? activitiesUpdate(data) : activitiesAdd(data));
     resetInitialized();
-    emit("reload");
+    emit('reload');
     modalApi.close();
   } catch (error) {
     console.error(error);

apps/web-antd/src/views/property/customerService/activities/data.ts

@@ -0,0 +1,128 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    fieldName: 'title',
+    label: '标题',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_activity_status'),
+    },
+    fieldName: 'status',
+    label: '状态',
+  },
+];
+
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
+  {
+    title: '序号',
+    field: 'id',
+    slots: {
+      default: ({ rowIndex }) => {
+        return (rowIndex + 1).toString();
+      },
+    },
+  },
+  {
+    title: '标题',
+    field: 'title',
+  },
+  {
+    title: '创建人',
+    field: 'createName',
+  },
+  {
+    title: '开始时间',
+    field: 'startTime',
+  },
+  {
+    title: '结束时间',
+    field: 'endTime',
+  },
+  {
+    title: '状态',
+    field: 'status',
+    slots: {
+      default: ({ row }) => {
+        // 可选从DictEnum中获取 DictEnum.PRO_ACTIVITY_STATUS 便于维护
+        return renderDict(row.status, 'pro_activity_status');
+      },
+    },
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
+export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '标题',
+    fieldName: 'title',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '头部照片',
+    fieldName: 'headImgUrl',
+    component: 'ImageUpload',
+    componentProps: {
+      maxCount: 1,
+    },
+    formItemClass: 'col-span-2',
+    // rules: 'required',
+  },
+  {
+    label: '开始时间',
+    fieldName: 'startTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+    rules: 'required',
+  },
+  {
+    label: '结束时间',
+    fieldName: 'endTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+    rules: 'required',
+  },
+  {
+    label: '活动内容',
+    fieldName: 'activeContent',
+    component: 'RichTextarea',
+    formItemClass: 'col-span-2',
+    componentProps: {
+      // disabled: false, // 是否只读
+      // height: 400 // 高度 默认400
+    },
+    rules: 'required',
+  },
+];

apps/web-antd/src/views/property/customerService/activities/index.vue

@@ -9,24 +9,22 @@ import { getVxePopupContainer } from '@vben/utils';
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
-import {   
+import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
-  type VxeGridProps 
+  type VxeGridProps
 } from '#/adapter/vxe-table';
 
 import {
-  meterInfoExport,
-  meterInfoList,
-  meterInfoRemove,
-} from '#/api/property/meter/meterInfo';
-import type { MeterInfoForm } from '#/api/property/meterInfo/model';
+  activitiesExport,
+  activitiesList,
+  activitiesRemove,
+} from '#/api/property/customerService/activities';
+import type { ActivitiesForm } from '#/api/property/customerService/activities/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
-import meterInfoModal from "../components/meterInfo-modal.vue";
-import { initQuerySchema, initColumns } from "../components/data";
-const columns = initColumns(2);
-const querySchema = initQuerySchema(2);
+import activitiesModal from './activities-modal.vue';
+import { columns, querySchema } from './data';
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -66,7 +64,7 @@ const gridOptions: VxeGridProps = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues = {}) => {
-        return await meterInfoList({
+        return await activitiesList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,
@@ -78,7 +76,7 @@ const gridOptions: VxeGridProps = {
     keyField: 'id',
   },
   // 表格全局唯一表示 保存列配置需要用到
-  id: 'property-meterInfo-index'
+  id: 'property-activities-index'
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
@@ -86,8 +84,8 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
   gridOptions,
 });
 
-const [MeterInfoModal, modalApi] = useVbenModal({
-  connectedComponent: meterInfoModal,
+const [ActivitiesModal, modalApi] = useVbenModal({
+  connectedComponent: activitiesModal,
 });
 
 function handleAdd() {
@@ -95,32 +93,32 @@ function handleAdd() {
   modalApi.open();
 }
 
-async function handleEdit(row: Required<MeterInfoForm>) {
+async function handleEdit(row: Required<ActivitiesForm>) {
   modalApi.setData({ id: row.id });
   modalApi.open();
 }
 
-async function handleDelete(row: Required<MeterInfoForm>) {
-  await meterInfoRemove(row.id);
+async function handleDelete(row: Required<ActivitiesForm>) {
+  await activitiesRemove(row.id);
   await tableApi.query();
 }
 
 function handleMultiDelete() {
   const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: Required<MeterInfoForm>) => row.id);
+  const ids = rows.map((row: Required<ActivitiesForm>) => row.id);
   Modal.confirm({
     title: '提示',
     okType: 'danger',
     content: `确认删除选中的${ids.length}条记录吗？`,
     onOk: async () => {
-      await meterInfoRemove(ids);
+      await activitiesRemove(ids);
       await tableApi.query();
     },
   });
 }
 
 function handleDownloadExcel() {
-  commonDownloadExcel(meterInfoExport, '水电气数据', tableApi.formApi.form.values, {
+  commonDownloadExcel(activitiesExport, '热门活动数据', tableApi.formApi.form.values, {
     fieldMappingTime: formOptions.fieldMappingTime,
   });
 }
@@ -128,11 +126,11 @@ function handleDownloadExcel() {
 
 <template>
   <Page :auto-content-height="true">
-    <BasicTable table-title="水电气列表">
+    <BasicTable table-title="热门活动列表">
       <template #toolbar-tools>
         <Space>
           <a-button
-            v-access:code="['property:meterInfo:export']"
+            v-access:code="['property:activities:export']"
             @click="handleDownloadExcel"
           >
             {{ $t('pages.common.export') }}
@@ -140,14 +138,14 @@ function handleDownloadExcel() {
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
-            type="primary" 
-            v-access:code="['property:meterInfo:remove']" 
+            type="primary"
+            v-access:code="['property:activities:remove']"
             @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>
           <a-button
             type="primary"
-            v-access:code="['property:meterInfo:add']"
+            v-access:code="['property:activities:add']"
             @click="handleAdd"
           >
             {{ $t('pages.common.add') }}
@@ -157,7 +155,7 @@ function handleDownloadExcel() {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:meterInfo:edit']"
+            v-access:code="['property:activities:edit']"
             @click.stop="handleEdit(row)"
           >
             {{ $t('pages.common.edit') }}
@@ -170,7 +168,7 @@ function handleDownloadExcel() {
           >
             <ghost-button
               danger
-              v-access:code="['property:meterInfo:remove']"
+              v-access:code="['property:activities:remove']"
               @click.stop=""
             >
               {{ $t('pages.common.delete') }}
@@ -179,6 +177,6 @@ function handleDownloadExcel() {
         </Space>
       </template>
     </BasicTable>
-    <MeterInfoModal @reload="tableApi.query()" :meterType="2" />
+    <ActivitiesModal @reload="tableApi.query()" />
   </Page>
 </template>

apps/web-antd/src/views/property/customerService/commonProblem/index.vue

@@ -1,11 +0,0 @@
-<script setup lang="ts">
-
-</script>
-
-<template>
-常见问题管理
-</template>
-
-<style scoped lang="scss">
-
-</style>

apps/web-antd/src/views/property/customerService/contingenPlan/contingenPlan-examine.vue

@@ -0,0 +1,88 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import { useVbenModal } from '@vben/common-ui';
+import { cloneDeep } from '@vben/utils';
+import { useVbenForm } from '#/adapter/form';
+import { contingenPlanInfo, contingenPlanUpdate } from '#/api/property/customerService/contingenPlan';
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+import {schema} from './data';
+
+const emit = defineEmits<{ reload: [] }>();
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    formItemClass: 'col-span-1',
+    labelWidth: 80,
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: schema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const record = ref({})
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[550px]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+    const { id } = modalApi.getData() as { id?: number | string };
+
+    record.value = await contingenPlanInfo(id);
+    await formApi.setValues(record.value);
+
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
+    const data = cloneDeep(await formApi.getValues());
+    record.value.status = data.status
+    await contingenPlanUpdate(record.value)
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+</script>
+
+<template>
+  <BasicModal title="审核">
+    <BasicForm />
+  </BasicModal>
+</template>
+

apps/web-antd/src/views/property/customerService/contingenPlan/contingenPlan-modal.vue

@@ -39,6 +39,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   },
 );
 
+const record = ref({})
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
   class: 'w-[60%]',
@@ -56,8 +57,8 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id;
 
     if (isUpdate.value && id) {
-      const record = await contingenPlanInfo(id);
-      await formApi.setValues(record);
+      record.value = await contingenPlanInfo(id);
+      await formApi.setValues(record.value);
     }
     await markInitialized();
 
@@ -74,6 +75,8 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
+    data.status = record.value.status
+    console.log(data,123)
     await (isUpdate.value ? contingenPlanUpdate(data) : contingenPlanAdd(data));
     resetInitialized();
     emit('reload');