归档相关内容

apps/web-ele/.env.development

@@ -5,10 +5,12 @@ VITE_BASE=/
 
 # 接口地址
 
-VITE_GLOB_API_URL=http://localhost:8080
+VITE_GLOB_API_URL=http://39.164.159.226:8088
+# VITE_GLOB_API_URL=http://localhost:8080
 # VITE_GLOB_API_URL=http://192.168.1.7:8080
 # VITE_GLOB_API_URL=http://192.168.1.170:8080
 # VITE_GLOB_FLOW_URL=http://192.168.31.160:8082
+
 VITE_GLOB_FLOW_URL=http://192.168.1.21:8082
 
 # 是否开启 Nitro Mock服务，true 为开启，false 为关

apps/web-ele/src/api/archive/HSSE/HSSE.ts

@@ -0,0 +1,22 @@
+import type { EmergencyDrillModel } from './model';
+
+import type { BaseResult } from '#/api/base-result';
+
+import { requestClient } from '#/api/request';
+
+// API路径常量枚举
+enum Api {
+  // 应急演练列表
+  emergencyDrillList = '/formEmergencyDrill/drill/list',
+}
+
+/**
+ * 查询应急演练列表
+ * @param params 查询参数
+ * @returns 应急演练列表
+ */
+export function getEmergencyDrillList(params: any) {
+  return requestClient.get<BaseResult<EmergencyDrillModel[]>>(Api.emergencyDrillList, {
+    params,
+  });
+}

apps/web-ele/src/api/archive/HSSE/model.ts

@@ -0,0 +1,76 @@
+export interface EmergencyDrillModel {
+  // 主键id
+  id?: number;
+  // 任务类型
+  type?: string;
+  // 片区id
+  areaId?: number;
+  // 油站ID
+  stationId?: number;
+  // 任务id
+  taskId?: number;
+  // 任务名称
+  taskName?: string;
+  // 执行人ID
+  executorId?: number;
+  // 执行人姓名
+  executorName?: string;
+  // 岗位
+  position?: number;
+  // 是否评论0否1是
+  isComment?: number;
+  // 创建类型0系统1新增
+  createType?: number;
+  // 评论id
+  commentId?: number;
+  // 截止时间
+  deadline?: string;
+  // 处理时间
+  processTime?: string;
+  // 完成状态: 0-按时完成, 1-逾期完成
+  completionStatus?: number;
+  // 逻辑删除标识
+  delFlag?: number;
+  // 应急演练名称
+  drillName?: string;
+  // 演练时间
+  drillTime?: string;
+  // 演练地点/装置
+  drillLocation?: string;
+  // 参加人数
+  participantsCount?: number;
+  // 总人数
+  totalCount?: number;
+  // 组织部门
+  organizationDepartment?: string;
+  // 物资准备
+  materialPreparation?: string;
+  // 演练目的
+  drillPurpose?: string;
+  // 事件/事故现场假定
+  accidentAssumption?: string;
+  // 演练方案简述
+  drillPlanSummary?: string;
+  // 演练注意事项及要求
+  precautions?: string;
+  // 演练方案提交时间
+  planSubmitTime?: string;
+  // 演练方案是否提交
+  isSubmitPlan?: number;
+  // 演练评估
+  drillEvaluation?: string;
+  // 简述演练的主要内容
+  mainContent?: string;
+  // 演练过程存在的问题
+  existingProblems?: string;
+  // 针对问题的改进措施
+  improvementMeasures?: string;
+  // 经理点评
+  managerComment?: string;
+  // 图片URL数组
+  images?: string;
+  // 评估提交时间
+  evaluationSubmitTime?: string;
+  // 评估是否提交
+  isSubmitEvaluation?: number;
+}

apps/web-ele/src/api/archive/figuresManage/figuresManage.ts

@@ -0,0 +1,22 @@
+import type { GunSelfCheckModel } from './model';
+
+import type { BaseResult } from '#/api/base-result';
+
+import { requestClient } from '#/api/request';
+
+// API路径常量枚举
+enum Api {
+  // 油枪自检列表
+  gunSelfCheckList = '/formGunSelfCheck/check/list',
+}
+
+/**
+ * 查询油枪自检列表
+ * @param params 查询参数
+ * @returns 油枪自检列表
+ */
+export function getGunSelfCheckList(params: any) {
+  return requestClient.get<BaseResult<GunSelfCheckModel[]>>(Api.gunSelfCheckList, {
+    params,
+  });
+}

apps/web-ele/src/api/archive/figuresManage/model.ts

@@ -0,0 +1,45 @@
+export interface FormGunSelfCheckRecord {
+  id?: number;
+  gunId?: number;
+  gunNumber?: string;
+  checkResult?: number;
+  problemDescription?: string;
+  repairStatus?: number;
+}
+
+export interface GunSelfCheckModel {
+  // 主键id
+  id?: number;
+  // 任务类型
+  type?: string;
+  // 片区id
+  areaId?: number;
+  // 油站ID
+  stationId?: number;
+  // 任务id
+  taskId?: number;
+  // 任务名称
+  taskName?: string;
+  // 执行人ID
+  executorId?: number;
+  // 执行人姓名
+  executorName?: string;
+  // 岗位
+  position?: number;
+  // 是否评论0否1是
+  isComment?: number;
+  // 创建类型0系统1新增
+  createType?: number;
+  // 评论id
+  commentId?: number;
+  // 截止时间
+  deadline?: string;
+  // 处理时间
+  processTime?: string;
+  // 完成状态: 0-按时完成, 1-逾期完成
+  completionStatus?: number;
+  // 逻辑删除标识
+  delFlag?: number;
+  // 油枪自检记录
+  records?: FormGunSelfCheckRecord[];
+}

apps/web-ele/src/api/archive/operationsManagement/model.ts

@@ -47,4 +47,469 @@ export interface TaskCheckModel {
   updateBy?: string;
   // 更新时间
   updateTime?: string;
-}
+}
+
+export interface TaskPhotoModel {
+  // 主键id
+  id?: number;
+  // 任务类型
+  type?: string;
+  // 片区id
+  areaId?: number;
+  // 油站ID
+  stationId?: number;
+  // 任务id
+  taskId?: number;
+  // 任务名称
+  taskName?: string;
+  // 执行人ID
+  executorId?: number;
+  // 执行人姓名
+  executorName?: string;
+  // 岗位
+  position?: number;
+  // 是否评论0否1是
+  isComment?: number;
+  // 创建类型0系统1新增
+  createType?: number;
+  // 描述
+  description?: string;
+  // 评论id
+  commentId?: string;
+  // 截止时间
+  deadline?: string;
+  // 处理时间
+  processTime?: string;
+  // 完成状态: 0-按时完成, 1-逾期完成
+  completionStatus?: number;
+  // 附件多个附件中间用逗号隔开
+  attachment?: string;
+  // 逻辑删除标识
+  delFlag?: number;
+}
+
+export interface FormOilPriceRecord {
+  // 油价记录相关字段
+  id?: number;
+  oilType?: string;
+  price?: number;
+  competitorId?: number;
+}
+
+export interface CompetitorMarketingSurveyModel {
+  // 主键id
+  id?: number;
+  // 竞争油站id
+  competitorId?: number;
+  // 竞争油站名称
+  competitorName?: string;
+  // 是否是竞争油站0否1是
+  isCompetitor?: number;
+  // 调查日期
+  surveyDate?: string;
+  // 优惠活动描述
+  promotionActivities?: string;
+  // 增值服务
+  valueAddedServices?: string;
+  // 油站设备配置变化
+  equipmentConfigChanges?: string;
+  // 场站性质编码
+  stationNatureCode?: string;
+  // 竞争关系编码
+  competitiveRelationCode?: string;
+  // 与我方场站距离(KM)
+  distanceKm?: number;
+  // 油站油价记录
+  formOilPriceRecords?: FormOilPriceRecord[];
+}
+
+export interface CompetitorSalesSurveyModel {
+  // 主键id
+  id?: number;
+  // 调查开始时间
+  surveyStartTime?: string;
+  // 调查结束时间
+  surveyEndTime?: string;
+  // 竞争油站id
+  competitorId?: number;
+  // 竞争油站名称
+  competitorName?: string;
+  // 汽油车进站车次
+  gasolineVehicleCount?: number;
+  // 汽油车加油升数差(升)
+  gasolineVolumeDiff?: number;
+  // 柴油车进站车次
+  dieselVehicleCount?: number;
+  // 柴油车加油升数差(升)
+  dieselVolumeDiff?: number;
+  // 摩托车进站车次
+  motorcycleCount?: number;
+  // 摩托车加油升数差(升)
+  motorcycleVolumeDiff?: number;
+  // 气车进站车次
+  gasVehicleCount?: number;
+  // 气车加油升数差(升)
+  gasVolumeDiff?: number;
+  // 时段预测销量差（升）
+  periodForecastDiff?: number;
+  // 全天预测销量差（升）
+  dailyForecastDiff?: number;
+  // 汽油调查销量（升）
+  gasolineSurveyVolume?: number;
+  // 柴油调查销量（升）
+  dieselSurveyVolume?: number;
+  // 是否是竞争油站0否1是
+  isCompetitor?: number;
+}
+
+export interface TurnInRateSurveyModel {
+  // 主键id
+  id?: number;
+  // 任务类型
+  type?: string;
+  // 片区id
+  areaId?: number;
+  // 油站ID
+  stationId?: number;
+  // 任务id
+  taskId?: number;
+  // 任务名称
+  taskName?: string;
+  // 执行人ID
+  executorId?: number;
+  // 执行人姓名
+  executorName?: string;
+  // 岗位
+  position?: number;
+  // 是否评论0否1是
+  isComment?: number;
+  // 创建类型0系统1新增
+  createType?: number;
+  // 评论id
+  commentId?: number;
+  // 截止时间
+  deadline?: string;
+  // 处理时间
+  processTime?: string;
+  // 完成状态: 0-按时完成, 1-逾期完成
+  completionStatus?: number;
+  // 逻辑删除标识
+  delFlag?: number;
+  // 调查开始时间
+  surveyStartTime?: string;
+  // 竞争油站id
+  competitorId?: number;
+  // 竞争油站名称
+  competitorName?: string;
+  // 调查结束时间
+  surveyEndTime?: string;
+  // 汽油车路面车流（辆）
+  gasRoadFlow?: number;
+  // 汽油车进站车流（辆）
+  gasInFlow?: number;
+  // 柴油车路面车流（辆）
+  dieselRoadFlow?: number;
+  // 柴油车进站车流（辆）
+  dieselInFlow?: number;
+  // 摩托车路面车流（辆）
+  motorcycleRoadFlow?: number;
+  // 摩托车进站车流（辆）
+  motorcycleInFlow?: number;
+  // 是否是竞争油站0否1是
+  isCompetitor?: number;
+}
+
+export interface LicenseTaskModel {
+  // 主键id
+  id?: number;
+  // 任务类型
+  type?: string;
+  // 片区id
+  areaId?: number;
+  // 油站ID
+  stationId?: number;
+  // 任务id
+  taskId?: number;
+  // 任务名称
+  taskName?: string;
+  // 执行人ID
+  executorId?: number;
+  // 执行人姓名
+  executorName?: string;
+  // 岗位
+  position?: number;
+  // 是否评论0否1是
+  isComment?: number;
+  // 创建类型0系统1新增
+  createType?: number;
+  // 评论id
+  commentId?: number;
+  // 截止时间
+  deadline?: string;
+  // 处理时间
+  processTime?: string;
+  // 完成状态: 0-按时完成, 1-逾期完成
+  completionStatus?: number;
+  // 逻辑删除标识
+  delFlag?: number;
+  // 证照规则id
+  licenseRuleId?: number;
+  // 证照名称
+  licenseName?: string;
+  // 任务类型年审任务或换证任务
+  taskType?: string;
+}
+
+export interface SysEvaluation {
+  id?: number;
+  name?: string;
+  score?: number;
+}
+
+export interface SysEvaluationRecord {
+  id?: number;
+  evaluationId?: number;
+  score?: number;
+  comment?: string;
+}
+
+export interface TeamShiftLogModel {
+  // 主键id
+  id?: number;
+  // 任务类型
+  type?: string;
+  // 片区id
+  areaId?: number;
+  // 油站ID
+  stationId?: number;
+  // 任务id
+  taskId?: number;
+  // 任务名称
+  taskName?: string;
+  // 执行人ID
+  executorId?: number;
+  // 执行人姓名
+  executorName?: string;
+  // 岗位
+  position?: number;
+  // 是否评论0否1是
+  isComment?: number;
+  // 创建类型0系统1新增
+  createType?: number;
+  // 评论id
+  commentId?: number;
+  // 截止时间
+  deadline?: string;
+  // 处理时间
+  processTime?: string;
+  // 完成状态: 0-按时完成, 1-逾期完成
+  completionStatus?: number;
+  // 逻辑删除标识
+  delFlag?: number;
+  // 上班日期
+  shiftDate?: string;
+  // 上班班次
+  shiftId?: string;
+  // 天气
+  weather?: string;
+  // 促品完成率（%）
+  promotionCompletionRate?: number;
+  // 其它信息
+  otherInfo?: string;
+  // 当班负责人ID
+  shiftLeaderId?: number;
+  // 当班负责人姓名
+  shiftLeaderName?: string;
+  // 班员姓名（JSON数组格式）
+  shiftMembers?: string;
+  // 列队检查（仪容仪表、精神面貌）
+  lineupCheck?: string;
+  // 前期工作回顾
+  previousWorkReview?: string;
+  // 贵重物品盘点
+  valuableInventory?: string;
+  // 设备物料盘点
+  equipmentInventory?: string;
+  // 赠品盘点
+  giftInventory?: string;
+  // 车辆指引
+  vehicleGuidance?: string;
+  // 油机清洁
+  fuelMachineCleaning?: string;
+  // 前庭清洁
+  forecourtCleaning?: string;
+  // 卫生间清洁
+  toiletCleaning?: string;
+  // 便利店清洁
+  storeCleaning?: string;
+  // 垃圾处理
+  garbageDisposal?: string;
+  // 其它分工
+  otherDivision?: string;
+  // 重点强化（重点工作指引，服务手势操及全员演练）
+  keyEnhancement?: string;
+  // 营造氛围（齐喊口号，鼓舞斗志）
+  atmosphereBuilding?: string;
+  // 班组总结
+  teamSummary?: string;
+  // 班前会拍照现场
+  meetingPhotos?: string;
+  // 班后待跟进事项
+  followUpItems?: string;
+  // 评语
+  evaluationComments?: string;
+  // 评价项
+  evaluations?: SysEvaluation[];
+  // 评价记录
+  evaluationRecords?: SysEvaluationRecord[];
+}
+
+export interface TaskAttachmentModel {
+  // 主键id
+  id?: number;
+  // 任务类型
+  type?: string;
+  // 片区id
+  areaId?: number;
+  // 油站ID
+  stationId?: number;
+  // 任务id
+  taskId?: number;
+  // 任务名称
+  taskName?: string;
+  // 执行人ID
+  executorId?: number;
+  // 执行人姓名
+  executorName?: string;
+  // 岗位
+  position?: number;
+  // 是否评论0否1是
+  isComment?: number;
+  // 创建类型0系统1新增
+  createType?: number;
+  // 评论id
+  commentId?: number;
+  // 截止时间
+  deadline?: string;
+  // 处理时间
+  processTime?: string;
+  // 完成状态: 0-按时完成, 1-逾期完成
+  completionStatus?: number;
+  // 附件名称
+  attachmentName?: string;
+  // 附件路径
+  attachment?: string;
+  // 逻辑删除标识
+  delFlag?: number;
+  // 设备物料盘点
+  equipmentInventory?: string;
+  // 赠品盘点
+  giftInventory?: string;
+  // 车辆指引
+  vehicleGuidance?: string;
+  // 油机清洁
+  fuelMachineCleaning?: string;
+  // 前庭清洁
+  forecourtCleaning?: string;
+  // 卫生间清洁
+  toiletCleaning?: string;
+  // 便利店清洁
+  storeCleaning?: string;
+  // 垃圾处理
+  garbageDisposal?: string;
+  // 其它分工
+  otherDivision?: string;
+  // 重点强化（重点工作指引，服务手势操及全员演练）
+  keyEnhancement?: string;
+  // 营造氛围（齐喊口号，鼓舞斗志）
+  atmosphereBuilding?: string;
+  // 班组总结
+  teamSummary?: string;
+  // 班前会拍照现场
+  meetingPhotos?: string;
+  // 班后待跟进事项
+  followUpItems?: string;
+  // 评语
+  evaluationComments?: string;
+  // 评价项
+  evaluations?: SysEvaluation[];
+  // 评价记录
+  evaluationRecords?: SysEvaluationRecord[];
+}
+
+export interface FormCleaningPlan {
+  id?: number;
+  planId?: number;
+  cleaningItem?: string;
+  frequency?: string;
+  responsiblePerson?: string;
+  completionStatus?: number;
+}
+
+export interface FormOtherPlanAction {
+  id?: number;
+  planId?: number;
+  actionItem?: string;
+  target?: string;
+  deadline?: string;
+  responsiblePerson?: string;
+  completionStatus?: number;
+}
+
+export interface FormOtherPlanContingency {
+  id?: number;
+  planId?: number;
+  contingencyItem?: string;
+  responseStrategy?: string;
+  responsiblePerson?: string;
+  completionStatus?: number;
+}
+
+export interface FormManagementPlan {
+  // 主键id
+  id?: number;
+  // 任务类型
+  type?: string;
+  // 片区id
+  areaId?: number;
+  // 油站ID
+  stationId?: number;
+  // 任务id
+  taskId?: number;
+  // 任务名称
+  taskName?: string;
+  // 执行人ID
+  executorId?: number;
+  // 执行人姓名
+  executorName?: string;
+  // 岗位
+  position?: number;
+  // 是否评论0否1是
+  isComment?: number;
+  // 创建类型0系统1新增
+  createType?: number;
+  // 评论id
+  commentId?: number;
+  // 截止时间
+  deadline?: string;
+  // 处理时间
+  processTime?: string;
+  // 完成状态: 0-按时完成, 1-逾期完成
+  completionStatus?: number;
+  // 逻辑删除标识
+  delFlag?: number;
+  // 月份，格式：YYYY-MM
+  month?: string;
+  // 清洁计划回顾
+  cleaningPlanReview?: string;
+  // 其他计划回顾
+  otherPlanReview?: string;
+  // 清洁计划
+  cleaningPlanList?: FormCleaningPlan[];
+  // 其他计划
+  otherPlanActionList?: FormOtherPlanAction[];
+  // 其他应急计划
+  otherPlanContingencyList?: FormOtherPlanContingency[];
+  // 上次管理计划
+  lastManagementPlan?: FormManagementPlan;
+}

apps/web-ele/src/api/archive/operationsManagement/operationsManagement.ts

@@ -1,4 +1,4 @@
-import type { TaskCheckModel } from './model';
+import type { TaskCheckModel, TaskPhotoModel, CompetitorMarketingSurveyModel, CompetitorSalesSurveyModel, TurnInRateSurveyModel, LicenseTaskModel, TeamShiftLogModel, TaskAttachmentModel, FormManagementPlan } from './model';
 
 import type { BaseResult } from '#/api/base-result';
 
@@ -8,6 +8,24 @@ import { requestClient } from '#/api/request';
 enum Api {
   // 任务检查记录列表
   taskCheckList = '/taskCheck/check/list',
+  // 拍照任务列表
+  taskPhotoList = '/taskPhoto/photo/list',
+  // 竞争对手营销调查列表
+  competitorMarketingSurveyList = '/formCompetitorMarketingSurvey/survey/list',
+  // 竟对油站列表
+  competitiveStationList = '/gasCompetitiveStation/station/list',
+  // 竞争对手销量调查列表
+  competitorSalesSurveyList = '/formCompetitorSalesSurvey/survey/list',
+  // 拐入率调查列表
+  turnInRateSurveyList = '/formTurnInRateSurvey/survey/list',
+  // 证照任务管理列表
+  licenseTaskList = '/formLicense/license/list',
+  // 班组日志列表
+  teamShiftLogList = '/formTeamShiftLog/log/list',
+  // 收集附件列表
+  taskAttachmentList = '/taskAttachment/attachment/list',
+  // 管理计划列表
+  managementPlanList = '/formManagementPlan/plan/list',
 }
 
 /**
@@ -20,3 +38,102 @@ export function getTaskCheckList(params: any) {
     params,
   });
 }
+
+/**
+ * 查询拍照任务列表
+ * @param params 查询参数
+ * @returns 拍照任务列表
+ */
+export function getTaskPhotoList(params: any) {
+  return requestClient.get<BaseResult<TaskPhotoModel[]>>(Api.taskPhotoList, {
+    params,
+  });
+}
+
+/**
+ * 查询竞争对手营销调查列表
+ * @param params 查询参数
+ * @returns 竞争对手营销调查列表
+ */
+export function getCompetitorMarketingSurveyList(params: any) {
+  return requestClient.get<BaseResult<CompetitorMarketingSurveyModel[]>>(Api.competitorMarketingSurveyList, {
+    params,
+  });
+}
+
+/**
+ * 查询竟对油站列表
+ * @param params 查询参数
+ * @returns 竟对油站列表
+ */
+export function getCompetitiveStationList(params: any) {
+  return requestClient.get<BaseResult<any[]>>(Api.competitiveStationList, {
+    params,
+  });
+}
+
+/**
+ * 查询竞争对手销量调查列表
+ * @param params 查询参数
+ * @returns 竞争对手销量调查列表
+ */
+export function getCompetitorSalesSurveyList(params: any) {
+  return requestClient.get<BaseResult<CompetitorSalesSurveyModel[]>>(Api.competitorSalesSurveyList, {
+    params,
+  });
+}
+
+/**
+ * 查询拐入率调查列表
+ * @param params 查询参数
+ * @returns 拐入率调查列表
+ */
+export function getTurnInRateSurveyList(params: any) {
+  return requestClient.get<BaseResult<TurnInRateSurveyModel[]>>(Api.turnInRateSurveyList, {
+    params,
+  });
+}
+
+/**
+ * 查询证照任务管理列表
+ * @param params 查询参数
+ * @returns 证照任务管理列表
+ */
+export function getLicenseTaskList(params: any) {
+  return requestClient.get<BaseResult<LicenseTaskModel[]>>(Api.licenseTaskList, {
+    params,
+  });
+}
+
+/**
+ * 查询班组日志列表
+ * @param params 查询参数
+ * @returns 班组日志列表
+ */
+export function getTeamShiftLogList(params: any) {
+  return requestClient.get<BaseResult<TeamShiftLogModel[]>>(Api.teamShiftLogList, {
+    params,
+  });
+}
+
+/**
+ * 查询收集附件列表
+ * @param params 查询参数
+ * @returns 收集附件列表
+ */
+export function getTaskAttachmentList(params: any) {
+  return requestClient.get<BaseResult<TaskAttachmentModel[]>>(Api.taskAttachmentList, {
+    params,
+  });
+}
+
+/**
+ * 查询管理计划列表
+ * @param params 查询参数
+ * @returns 管理计划列表
+ */
+export function getManagementPlanList(params: any) {
+  return requestClient.get<BaseResult<FormManagementPlan[]>>(Api.managementPlanList, {
+    params,
+  });
+}

apps/web-ele/src/api/system/infoEntry/certificateSetting/certificateSetting.ts

@@ -75,4 +75,4 @@ export function deleteCertificateSetting(ids: number[]) {
  */
 export function exportCertificateSetting(data: Partial<CertificateSettingModel>) {
   return commonExport(Api.export, data);
-}
+}

apps/web-ele/src/router/routes/local.ts

@@ -142,7 +142,7 @@ const localRoutes: RouteRecordStringComponent[] = [
       hideInMenu: true,
     },
     name: 'ScheduleDetail',
-    path: '/schedule/detail/:taskId',
+    path: '/schedule/detail',
   },
   {
     component: 'workflow/processDefinition/design',

apps/web-ele/src/views/Archive/HSSEManage/emergencyDrill/config-data.tsx

@@ -1,177 +1,239 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { DictEnum } from '@vben/constants';
-import { getDictOptions } from '#/utils/dict';
+
+import { selectAllSysAreaList, selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
+// 岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
+
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'areaId',
+    label: '片区',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择片区',
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.areaName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'Areastatus',
-    label: '片区',
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'stationId',
+    label: '油站',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择油站',
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.stationName,
+              value: item.id.toString(),
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'Gasstationstatus',
-    label: '油站',
   },
   {
     component: 'Select',
+    fieldName: 'completionStatus',
+    label: '状态',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择完成状态',
+      options: [
+        { label: '按时完成', value: 0 },
+        { label: '逾期完成', value: 1 },
+      ],
     },
-    fieldName: 'Status',
-    label: '状态',
   },
   {
     component: 'DatePicker',
+    fieldName: 'processStartTime',
+    label: '提交时间',
     componentProps: {
-      type: 'daterange',
+      placeholder: '请选择处理开始日期',
+      type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
-      startPlaceholder: '开始日期',
-      endPlaceholder: '结束日期',
+      style: {
+        width: '100%',
+      },
     },
-    fieldName: 'SubmitTime',
-    label: '提交时间',
   },
   {
-    component: 'Select',
+    component: 'DatePicker',
+    fieldName: 'processEndTime',
+    label: '提交时间',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择处理结束日期',
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      style: {
+        width: '100%',
+      },
     },
-    fieldName: 'Commentstatus',
-    label: '评论',
   },
   {
     component: 'Select',
+    fieldName: 'isComment',
+    label: '评论',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择评论状态',
+      options: [
+        { label: '未评', value: 0 },
+        { label: '已评', value: 1 },
+      ],
     },
-    fieldName: 'PositionStatus',
-    label: '岗位',
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'position',
+    label: '岗位',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择岗位',
+      clearable: true,
+      api: async () => {
+        const data = await getPostList();
+        return Array.isArray(data.rows)
+          ? data.rows.map((item: any) => ({
+              label: item.postName || item.name,
+              value: item.postId,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'CreateStatus',
-    label: '创建',
   },
   {
     component: 'Select',
+    fieldName: 'createType',
+    label: '创建',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择创建方式',
+      options: [
+        { label: '系统', value: 0 },
+        { label: '新增', value: 1 },
+      ],
     },
-    fieldName: 'executorStatus',
+  },
+  {
+    component: 'Input',
+    fieldName: 'executorName',
     label: '执行人',
+    componentProps: {
+      placeholder: '请输入执行人',
+    },
   },
 ];
 
+
 export const columns: VxeGridProps['columns'] = [
   {
+    type: 'checkbox',
+    width: 80,
+  },
+  {
     field: 'action',
-    fixed: 'left',
+    fixed: 'right',
     slots: { default: 'action' },
-    resizable: false,
     title: '操作',
-    width: 180,
+    width: 150,
+  },
+  {
+    field: 'taskName',
+    title: '任务名称',
+    minWidth: 150,
   },
   {
+    field: 'drillName',
+    title: '演练名称',
+    minWidth: 150,
+  },
+  {
+    field: 'stationId',
     title: '油站',
-    field: 'Gasstation',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
+    field: 'executorName',
     title: '执行人',
-    field: 'Executor',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
+    field: 'position',
     title: '岗位',
-    field: 'Position',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
+    field: 'isComment',
     title: '评论',
-    field: 'Comment',
-    minWidth: 130,
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '已评' : '未评';
+    },
   },
   {
+    field: 'deadline',
     title: '截止时间',
-    field: 'Deadline',
-    minWidth: 130,
+    minWidth: 180,
   },
   {
+    field: 'processTime',
     title: '提交时间',
-    field: 'SubmitTime',
-    minWidth: 130,
+    minWidth: 180,
   },
   {
+    field: 'completionStatus',
     title: '任务状态',
-    field: 'TaskStatus',
-    minWidth: 130,
+    minWidth: 120,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '按时完成' : '逾期完成';
+    },
   },
   {
+    field: 'createType',
     title: '创建',
-    field: 'create',
-    minWidth: 130,
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '系统' : '新增';
+    },
   },
-];
-export const mockData = [
-  {
-    Gasstation: '中山路加油站',
-    Executor: '王保瑞',
-    Position: '当班经理',
-    Comment: '高峰期车流大，需增派人手',
-    Deadline: '2024-06-10 18:00',
-    SubmitTime: '2024-06-01 08:15',
-    TaskStatus: '待处理',
-    create: '系统',
-  },
-  {
-    Gasstation: '北环大道油站',
-    Executor: '王凯',
-    Position: '安全员',
-    Comment: '油罐液位异常，需立即检查',
-    Deadline: '2024-06-05 12:00',
-    SubmitTime: '2024-06-01 09:30',
-    TaskStatus: '处理中',
-    create: '系统',
-  },
-  {
-    Gasstation: '城南综合能源站',
-    Executor: '李威',
-    Position: '设备管理员',
-    Comment: '加油机滤芯更换完成，请复核',
-    Deadline: '2024-06-08 17:00',
-    SubmitTime: '2024-06-01 10:45',
-    TaskStatus: '已完成',
-    create: '系统',
-  },
-  {
-    Gasstation: '高速服务区东站',
-    Executor: '张敏',
-    Position: '收银员',
-    Comment: 'POS 系统版本升级，测试支付流程',
-    Deadline: '2024-06-07 20:00',
-    SubmitTime: '2024-06-01 14:20',
-    TaskStatus: '待处理',
-    create: '系统',
-  },
-  {
-    Gasstation: '城西快充站',
-    Executor: '刘洋',
-    Position: '电工',
-    Comment: '充电桩接地电阻复检',
-    Deadline: '2024-06-06 16:00',
-    SubmitTime: '2024-06-01 15:10',
-    TaskStatus: '处理中',
-    create: '系统',
+  {
+    field: 'drillTime',
+    title: '演练时间',
+    minWidth: 180,
+  },
+  {
+    field: 'drillLocation',
+    title: '演练地点',
+    minWidth: 150,
   },
 ];
+
+

apps/web-ele/src/views/Archive/HSSEManage/emergencyDrill/index.vue

@@ -1,11 +1,27 @@
 <script setup lang="ts">
-import { useRouter } from 'vue-router';
+import { ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
 import { columns, querySchema } from './config-data';
 import type { VbenFormProps } from '@vben/common-ui';
-import { mockData } from './config-data';
+import { getEmergencyDrillList } from '#/api/archive/HSSE/HSSE';
+
+const showSearchForm = ref(true) as any;
 const router = useRouter();
+const route = useRoute();
+
+// 表单字段到 API 字段的映射
+function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+    type: route.query.type || '',
+    directoryType: route.query.directoryType || '',
+    ...formValues,
+  };
+  return apiParams;
+}
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -16,14 +32,6 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 日期选择格式化
-  // fieldMappingTime: [
-  //   [
-  //     'createTime',
-  //     ['params[beginTime]', 'params[endTime]'],
-  //     ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //   ],
-  // ],
 };
 
 // 列表中显示配置
@@ -35,51 +43,58 @@ const gridOptions: VxeGridProps = {
     reserve: true,
     // 点击行选中
     trigger: 'default',
-    checkMethod: ({ row }) => row?.roleId !== 1,
   },
   columns,
   size: 'medium',
   height: 'auto',
-  data: mockData,
-  // proxyConfig: {
-  //   ajax: {
-  //     query: async ({ page }, formValues = {}) => {
-  //       const resp = await getRoleList({
-  //         ...formValues,
-  //         pageNum: page.currentPage,
-  //         pageSize: page.pageSize,
-  //       });
-  //       return { items: resp.rows, total: resp.total };
-  //     },
-  //   },
-  // },
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        // 映射表单字段到 API 字段
+        const apiParams = mapFormToApi(formValues, page);
+        
+        // 调用API
+        const response = await getEmergencyDrillList(apiParams);
+        
+        // 映射 API 响应数据到页面显示字段
+        const items = response.rows;
+        
+        return {
+          items,
+          total: response.total,
+        };
+      },
+    },
+  },
   rowConfig: {
-    keyField: 'roleId',
+    keyField: 'id',
   },
   toolbarConfig: {
     custom: true,
     refresh: true,
     zoom: true,
   },
-  id: 'system-role-index',
+  id: 'emergency-drill-index',
 };
-const [BasicTable, BasicTableApi] = useVbenVxeGrid({
+const [BasicTable] = useVbenVxeGrid({
+  showSearchForm,
   formOptions,
   gridOptions,
 });
 const handleTaskClick = (taskId: number) => {
-  router.push(`/schedule/detail/${taskId}`);
+  router.push(`/schedule/detail/${taskId}?type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`);  
 };
 </script>
+
 <template>
   <Page :auto-content-height="true">
-    <BasicTable>
+    <BasicTable table-title="应急演练列表">
       <template #action="{ row }">
         <el-button
           size="small"
           type="primary"
           plain
-          @click="() => handleTaskClick(row.taskId)"
+          @click="() => handleTaskClick(row.id)"
           >查看</el-button
         >
       </template>

apps/web-ele/src/views/Archive/figuresManage/oilGunTement/index.vue

@@ -1,17 +1,31 @@
 <script lang="ts" setup>
 // 导入部分
+import { ref } from 'vue';
 import type { VbenFormProps } from '@vben/common-ui';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { ElButton, ElSpace } from 'element-plus';
-import { tableColumns, OIL_GUN_TEMENT_MOCK_DATA, queryFormSchema } from './oilGunTement-data';
-import { useRouter } from 'vue-router';
+import { tableColumns, queryFormSchema } from './oilGunTement-data';
+import { useRouter, useRoute } from 'vue-router';
+import { getGunSelfCheckList } from '#/api/archive/figuresManage/figuresManage';
 // 路由实例
 const router = useRouter();
+const route = useRoute();
 
+const showSearchForm = ref(true) as any;
 
-
+// 表单字段到 API 字段的映射
+function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+    type: route.query.type || '',
+    directoryType: route.query.directoryType || '',
+    ...formValues,
+  };
+  return apiParams;
+}
 
 // 表单配置
 const formOptions: VbenFormProps = {
@@ -30,7 +44,21 @@ const oilGunTementGridOptions: VxeGridProps = {
   proxyConfig: {
     autoLoad: true,
     ajax: {
-      query: async () => ({ items: OIL_GUN_TEMENT_MOCK_DATA, total: OIL_GUN_TEMENT_MOCK_DATA.length }),
+      query: async ({ page }, formValues = {}) => {
+        // 映射表单字段到 API 字段
+        const apiParams = mapFormToApi(formValues, page);
+        
+        // 调用API
+        const response = await getGunSelfCheckList(apiParams);
+        
+        // 映射 API 响应数据到页面显示字段
+        const items = response.rows;
+        
+        return {
+          items,
+          total: response.total,
+        };
+      },
     },
   },
   rowConfig: { keyField: 'id' },
@@ -38,25 +66,12 @@ const oilGunTementGridOptions: VxeGridProps = {
 };
 
 // 创建表格实例
-const [OilGunTementTable] = useVbenVxeGrid({ formOptions, gridOptions: oilGunTementGridOptions });
-
-// 查询按钮点击事件
-const handleQuery = () => {
-  console.log('查询数据');
-  // TODO: 添加查询逻辑
-};
-
-// 重置按钮点击事件
-const handleReset = () => {
-  console.log('重置表单');
-  // TODO: 添加重置逻辑
-};
+const [OilGunTementTable] = useVbenVxeGrid({ formOptions, gridOptions: oilGunTementGridOptions, showSearchForm });
 
 // 查看按钮点击事件
 const handleView = (row: any) => {
   console.log('查看数据:', row);
-  router.push(`/schedule/detail/${row.id}`);
-  // TODO: 添加查看逻辑
+  router.push(`/schedule/detail/${row.id}?type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`);
 };
 
 // 导出按钮点击事件
@@ -79,19 +94,19 @@ const handleProfitLossReport = (row: any) => {
       <OilGunTementTable table-title="油枪自检损益表列表">
         <template #toolbar-tools>
           <ElSpace>
-            <ElButton 
+            <!-- <ElButton 
               @click="handleExport"
               v-access:code="['system:oilGunTement:export']"
             >
               导出
-            </ElButton>
+            </ElButton> -->
           </ElSpace>
         </template>
         <template #action="{ row }">
           <ElSpace>
             <ElButton size="small" @click="handleView(row)">查看</ElButton>
-            <ElButton size="small" @click="handleExport(row)">导出</ElButton>
-            <ElButton size="small" type="primary" @click="handleProfitLossReport(row)">损益报表</ElButton>
+            <!-- <ElButton size="small" @click="handleExport(row)">导出</ElButton> -->
+            <!-- <ElButton size="small" type="primary" @click="handleProfitLossReport(row)">损益报表</ElButton> -->
           </ElSpace>
         </template>
       </OilGunTementTable>

apps/web-ele/src/views/Archive/figuresManage/oilGunTement/oilGunTement-data.tsx

@@ -1,201 +1,223 @@
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import type { FormSchemaGetter } from '#/adapter/form';
 
-// 油枪自检损益表数据类型定义
-export interface OilGunTementData {
-  id: number;
-  taskName: string; // 任务名称
-  station: string; // 油站
-  executor: string; // 执行人
-  position: string; // 岗位
-  comment: string; // 评论
-  deadline: string; // 截止时间
-  processTime: string; // 处理时间
-  status: string; // 完成状态
-  creator: string; // 创建人
-  area: string; // 片区
-}
+import { selectAllSysAreaList, selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
+// 岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
 
 // 油枪自检损益表表格配置
 export const tableColumns: VxeGridProps['columns'] = [
-  { title: '任务名称', field: 'taskName', minWidth: 180, align: 'center' },
-  { title: '油站', field: 'station', minWidth: 150, align: 'center' },
-  { title: '执行人', field: 'executor', minWidth: 120, align: 'center' },
-  { title: '岗位', field: 'position', minWidth: 120, align: 'center' },
-  { title: '评论', field: 'comment', minWidth: 150, align: 'center' },
-  { title: '截止时间', field: 'deadline', minWidth: 160, align: 'center' },
-  { title: '处理时间', field: 'processTime', minWidth: 160, align: 'center' },
-  { title: '完成状态', field: 'status', minWidth: 120, align: 'center' },
-  { title: '创建人', field: 'creator', minWidth: 120, align: 'center' },
-  { 
-    title: '操作', 
-    minWidth: 200, 
-    align: 'center', 
+  {
+    type: 'checkbox',
+    width: 80,
+  },
+  {
+    field: 'action',
+    fixed: 'right',
     slots: { default: 'action' },
-    fixed: 'right'
+    title: '操作',
+    width: 150,
+  },
+  {
+    field: 'taskName',
+    title: '任务名称',
+    minWidth: 150,
+  },
+  {
+    field: 'stationId',
+    title: '油站',
+    minWidth: 120,
+  },
+  {
+    field: 'executorName',
+    title: '执行人',
+    minWidth: 120,
+  },
+  {
+    field: 'position',
+    title: '岗位',
+    minWidth: 120,
+  },
+  {
+    field: 'isComment',
+    title: '评论',
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '已评' : '未评';
+    },
+  },
+  {
+    field: 'deadline',
+    title: '截止时间',
+    minWidth: 180,
+  },
+  {
+    field: 'processTime',
+    title: '处理时间',
+    minWidth: 180,
+  },
+  {
+    field: 'completionStatus',
+    title: '完成状态',
+    minWidth: 120,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '按时完成' : '逾期完成';
+    },
+  },
+  {
+    field: 'createType',
+    title: '创建',
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '系统' : '新增';
+    },
   },
 ];
 
-// 搜索表单选项配置
-const areaOptions = [
-  { label: '默认片区', value: '默认片区' },
-  { label: '片区1', value: '片区1' },
-  { label: '片区2', value: '片区2' },
-  { label: '片区3', value: '片区3' },
-];
-
-const stationOptions = [
-  { label: '机场油站', value: '机场油站' },
-  { label: '北京东加油站', value: '北京东加油站' },
-  { label: '北京西加油站', value: '北京西加油站' },
-  { label: '北京南加油站', value: '北京南加油站' },
-  { label: '北京北加油站', value: '北京北加油站' },
-  { label: '河北油站', value: '河北油站' },
-  { label: '龙飞虎加油站', value: '龙飞虎加油站' },
-  { label: '法站加油站', value: '法站加油站' },
-];
-
-const statusOptions = [
-  { label: '已完成', value: '已完成' },
-  { label: '未完成', value: '未完成' },
-  { label: '进行中', value: '进行中' },
-];
-
-const positionOptions = [
-  { label: '管理员', value: '管理员' },
-  { label: '操作员', value: '操作员' },
-  { label: '负责人', value: '负责人' },
-  { label: '技术员', value: '技术员' },
-];
-
-const commentOptions = [
-  { label: '正常', value: '正常' },
-  { label: '异常', value: '异常' },
-  { label: '需关注', value: '需关注' },
-];
-
-const creatorOptions = [
-  { label: '张三', value: '张三' },
-  { label: '李四', value: '李四' },
-  { label: '王五', value: '王五' },
-  { label: '赵六', value: '赵六' },
-];
-
-// 生成随机日期
-const generateRandomDate = (startDate: Date, endDate: Date): string => {
-  const randomTime = startDate.getTime() + Math.random() * (endDate.getTime() - startDate.getTime());
-  const date = new Date(randomTime);
-  return date.toISOString().slice(0, 19).replace('T', ' ');
-};
-
-// 油枪自检损益表模拟数据
-export const OIL_GUN_TEMENT_MOCK_DATA: OilGunTementData[] = Array.from({ length: 20 }, (_, index) => {
-  const id = index + 1;
-  const randomArea = areaOptions[Math.floor(Math.random() * areaOptions.length)].value;
-  const randomStation = stationOptions[Math.floor(Math.random() * stationOptions.length)].value;
-  const randomStatus = statusOptions[Math.floor(Math.random() * statusOptions.length)].value;
-  const randomPosition = positionOptions[Math.floor(Math.random() * positionOptions.length)].value;
-  const randomComment = commentOptions[Math.floor(Math.random() * commentOptions.length)].value;
-  const randomCreator = creatorOptions[Math.floor(Math.random() * creatorOptions.length)].value;
-  
-  // 模拟执行人（使用创建人选项的随机值）
-  const randomExecutor = creatorOptions[Math.floor(Math.random() * creatorOptions.length)].value;
-  
-  // 生成随机日期：截止时间在处理时间之前
-  const processDate = new Date();
-  processDate.setDate(processDate.getDate() - Math.floor(Math.random() * 30));
-  const deadlineDate = new Date(processDate);
-  deadlineDate.setDate(deadlineDate.getDate() - Math.floor(Math.random() * 7));
-  
-  return {
-    id,
-    taskName: `油枪自检任务${id}`,
-    station: randomStation,
-    executor: randomExecutor,
-    position: randomPosition,
-    comment: randomComment,
-    deadline: generateRandomDate(deadlineDate, processDate),
-    processTime: generateRandomDate(processDate, new Date()),
-    status: randomStatus,
-    creator: randomCreator,
-    area: randomArea
-  };
-});
-
 export const queryFormSchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
-    fieldName: 'area',
+    component: 'ApiSelect',
+    fieldName: 'areaId',
     label: '片区',
     componentProps: {
       placeholder: '请选择片区',
-      options: areaOptions,
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.areaName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
-    component: 'Select',
-    fieldName: 'station',
+    component: 'ApiSelect',
+    fieldName: 'stationId',
     label: '油站',
     componentProps: {
       placeholder: '请选择油站',
-      options: stationOptions,
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.stationName,
+              value: item.id.toString(),
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
     component: 'Select',
-    fieldName: 'status',
-    label: '完成状态',
+    fieldName: 'completionStatus',
+    label: '状态',
     componentProps: {
       placeholder: '请选择完成状态',
-      options: statusOptions,
+      options: [
+        { label: '按时完成', value: 0 },
+        { label: '逾期完成', value: 1 },
+      ],
     },
   },
   {
     component: 'DatePicker',
-    fieldName: 'processTimeRange',
+    fieldName: 'processStartTime',
     label: '处理时间',
     componentProps: {
-      placeholder: '请选择处理时间范围',
-      type: 'daterange',
-      rangeSeparator: '至',
-      startPlaceholder: '开始时间',
-      endPlaceholder: '结束时间',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: '请选择处理开始日期',
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      style: {
+        width: '100%',
+      },
     },
   },
   {
-    component: 'Select',
+    component: 'DatePicker',
+    fieldName: 'processEndTime',
+    label: '处理时间',
+    componentProps: {
+      placeholder: '请选择处理结束日期',
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      style: {
+        width: '100%',
+      },
+    },
+  },
+  {
+    component: 'ApiSelect',
     fieldName: 'position',
     label: '岗位',
     componentProps: {
       placeholder: '请选择岗位',
-      options: positionOptions,
+      clearable: true,
+      api: async () => {
+        const data = await getPostList();
+        return Array.isArray(data.rows)
+          ? data.rows.map((item: any) => ({
+              label: item.postName || item.name,
+              value: item.postId,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
     component: 'Select',
-    fieldName: 'comment',
+    fieldName: 'isComment',
     label: '评论',
     componentProps: {
-      placeholder: '请选择评论',
-      options: commentOptions,
+      placeholder: '请选择评论状态',
+      options: [
+        { label: '未评', value: 0 },
+        { label: '已评', value: 1 },
+      ],
     },
   },
   {
     component: 'Select',
-    fieldName: 'creator',
-    label: '创建人',
+    fieldName: 'createType',
+    label: '创建',
     componentProps: {
-      placeholder: '请选择创建人',
-      options: creatorOptions,
+      placeholder: '请选择创建方式',
+      options: [
+        { label: '系统', value: 0 },
+        { label: '新增', value: 1 },
+      ],
     },
   },
   {
     component: 'Input',
-    fieldName: 'executor',
+    fieldName: 'executorName',
     label: '执行人',
     componentProps: {
       placeholder: '请输入执行人',
     },
   },
 ];
+

apps/web-ele/src/views/Archive/operationsManagement/competitivePricingSurvey/config-data.tsx

@@ -1,78 +1,116 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { DictEnum } from '@vben/constants';
-import { getDictOptions } from '#/utils/dict';
+
+import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
+import { getCompetitiveStationList } from '#/api/archive/operationsManagement/operationsManagement';
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      component: 'ApiSelect',
+      fieldName: 'stationId',
+      label: '油站',
+      componentProps: {
+        placeholder: '请选择油站',
+        clearable: true,
+        api: async () => {
+          const resp = await selectAllSysStationAreaList();
+          const data = resp || [];
+          return Array.isArray(data)
+            ? data.map((item: any) => ({
+                label: item.stationName,
+                value: item.id.toString(),
+              }))
+            : [];
+        },
+        labelField: 'label',
+        valueField: 'value',
+      },
     },
-    fieldName: 'IGasstationstatus',
-    label: '我方油站',
-  },
   {
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      api: async () => {
+        const resp = await getCompetitiveStationList({});
+        const data = resp?.rows || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({ label: item.competitorName, value: item.id }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
+      placeholder: '请选择竟对油站',
     },
-    fieldName: 'youGasstationstatus',
+    fieldName: 'competitorId',
     label: '竟对油站',
   },
   {
     component: 'Select',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      options: [
+        { label: '否', value: 0 },
+        { label: '是', value: 1 },
+      ],
     },
-    fieldName: 'Status',
-    label: '状态',
+    fieldName: 'isCompetitor',
+    label: '是否是竞争油站',
   },
   {
     component: 'DatePicker',
     componentProps: {
       type: 'daterange',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
       startPlaceholder: '开始日期',
       endPlaceholder: '结束日期',
     },
-    fieldName: 'Time',
-    label: '时间',
-  },
-  {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'Commentstatus',
-    label: '评论',
-  },
-  {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'PositionStatus',
-    label: '岗位',
-  },
-  {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'CreateStatus',
-    label: '创建',
-  },
-  {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'executorStatus',
-    label: '执行人',
+    fieldName: 'surveyDate',
+    label: '调查日期',
   },
 ];
 
+/**
+ * 映射表单字段到API字段
+ */
+export function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+  };
+  
+  // 我方油站
+  if (formValues.stationId) {
+    apiParams.stationId = formValues.stationId;
+  }
+  
+  // 竟对油站
+  if (formValues.competitorId) {
+    apiParams.competitorId = formValues.competitorId;
+  }
+  
+  // 是否是竞争油站
+  if (formValues.isCompetitor !== undefined) {
+    apiParams.isCompetitor = formValues.isCompetitor;
+  }
+  
+  // 调查日期
+  if (formValues.surveyDate) {
+    apiParams.surveyDateStart = formValues.surveyDate[0];
+    apiParams.surveyDateEnd = formValues.surveyDate[1];
+  }
+  
+  return apiParams;
+}
+
+/**
+ * 映射API响应数据到页面显示字段
+ */
+export function mapApiToView(data: any[]) {
+  return data.map(item => ({
+    ...item,
+    // 处理需要转换的字段
+  }));
+}
+
 export const columns: VxeGridProps['columns'] = [
   {
     field: 'action',
@@ -83,130 +121,77 @@ export const columns: VxeGridProps['columns'] = [
     width: 180,
   },
   {
-    title: '处理时间',
+    title: '调查日期',
     fixed: 'left',
-    field: 'ProcessingTime',
-    minWidth: 130,
+    field: 'surveyDate',
+    minWidth: 180,
   },
   {
     title: '我方油站',
     fixed: 'left',
-    field: 'IGasstationstatus',
+    field: 'stationId',
     minWidth: 130,
   },
   {
     title: '竟对油站',
     fixed: 'left',
-    field: 'youGasstationstatus',
+    field: 'competitorName',
     minWidth: 130,
   },
   {
-    title: '油站性质',
-    field: 'GasstationNature',
+    title: '是否是竞争油站',
+    field: 'isCompetitor',
+    minWidth: 130,
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '是' : '否';
+    },
+  },
+  {
+    title: '场站性质',
+    field: 'stationNatureCode',
     minWidth: 130,
   },
   {
     title: '竞争关系',
-    field: 'Competitiverelationship',
+    field: 'competitiveRelationCode',
     minWidth: 130,
   },
   {
     title: '距离（KM）',
-    field: 'Deadline',
+    field: 'distanceKm',
     minWidth: 130,
   },
   {
-    title: '挂牌价',
-    field: 'Deadline',
-    // minWidth: 130,
-    children: [
-      {
-        title: '95#',
-        field: '95#',
-        minWidth: 130,
-      },
-      {
-        title: '92#',
-        field: '92#',
-        minWidth: 130,
-      },
-      {
-        title: '92#专车',
-        field: 'Privatecar92#',
-        minWidth: 130,
-      },
-      {
-        title: '92#的士',
-        field: 'taxi92#',
-        minWidth: 130,
-      },
-      {
-        title: '92#油卡',
-        field: 'taxi92#',
-        minWidth: 130,
-      },
-    ],
+    title: '优惠活动描述',
+    field: 'promotionActivities',
+    minWidth: 200,
+  },
+  {
+    title: '增值服务',
+    field: 'valueAddedServices',
+    minWidth: 150,
+  },
+  {
+    title: '油站设备配置变化',
+    field: 'equipmentConfigChanges',
+    minWidth: 200,
   },
 ];
-export const mockData = [
-  {
-    ProcessingTime: '2024-06-01 08:00:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '促销中',
-    GasstationNature: '民营',
-    Competitiverelationship: '直接竞争',
-    Deadline: 1.2,
-    '95#': 7.85,
-    '92#': 7.45,
-    'Privatecar92#': 7.35,
-    'taxi92#': 7.25,
-  },
-  {
-    ProcessingTime: '2024-06-01 09:15:00',
-    IGasstationstatus: '库存预警',
-    youGasstationstatus: '正常营业',
-    GasstationNature: '国企',
-    Competitiverelationship: '间接竞争',
-    Deadline: 2.1,
-    '95#': 7.90,
-    '92#': 7.50,
-    'Privatecar92#': 7.40,
-    'taxi92#': 7.30,
-  },
-  {
-    ProcessingTime: '2024-06-01 10:30:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '降价促销',
-    GasstationNature: '合资',
-    Competitiverelationship: '直接竞争',
-    Deadline: 0.8,
-    '95#': 7.80,
-    '92#': 7.40,
-    'Privatecar92#': 7.30,
-    'taxi92#': 7.20,
-  },
-  {
-    ProcessingTime: '2024-06-01 11:45:00',
-    IGasstationstatus: '设备维护',
-    youGasstationstatus: '正常营业',
-    GasstationNature: '民营',
-    Competitiverelationship: '间接竞争',
-    Deadline: 1.5,
-    '95#': 7.95,
-    '92#': 7.55,
-    'Privatecar92#': 7.45,
-    'taxi92#': 7.35,
-  },
-  {
-    ProcessingTime: '2024-06-01 13:00:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '会员日',
-    GasstationNature: '国企',
-    Competitiverelationship: '直接竞争',
-    Deadline: 1.0,
-    '95#': 7.88,
-    '92#': 7.48,
-    'Privatecar92#': 7.38,
-    'taxi92#': 7.28,
+
+/**
+ * 油站油价记录表头配置
+ */
+export const oilPriceColumns: VxeGridProps['columns'] = [
+  {
+    title: '油品类型',
+    field: 'oilType',
+    minWidth: 100,
+  },
+  {
+    title: '价格',
+    field: 'price',
+    minWidth: 100,
   },
 ];
+
+

apps/web-ele/src/views/Archive/operationsManagement/competitivePricingSurvey/config-data2.tsx

@@ -0,0 +1,212 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+import { DictEnum } from '@vben/constants';
+import { getDictOptions } from '#/utils/dict';
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    },
+    fieldName: 'IGasstationstatus',
+    label: '我方油站',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    },
+    fieldName: 'youGasstationstatus',
+    label: '竟对油站',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    },
+    fieldName: 'Status',
+    label: '状态',
+  },
+  {
+    component: 'DatePicker',
+    componentProps: {
+      type: 'daterange',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      startPlaceholder: '开始日期',
+      endPlaceholder: '结束日期',
+    },
+    fieldName: 'Time',
+    label: '时间',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    },
+    fieldName: 'Commentstatus',
+    label: '评论',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    },
+    fieldName: 'PositionStatus',
+    label: '岗位',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    },
+    fieldName: 'CreateStatus',
+    label: '创建',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    },
+    fieldName: 'executorStatus',
+    label: '执行人',
+  },
+];
+
+export const columns: VxeGridProps['columns'] = [
+  {
+    field: 'action',
+    fixed: 'left',
+    slots: { default: 'action' },
+    resizable: false,
+    title: '操作',
+    width: 180,
+  },
+  {
+    title: '处理时间',
+    fixed: 'left',
+    field: 'ProcessingTime',
+    minWidth: 130,
+  },
+  {
+    title: '我方油站',
+    fixed: 'left',
+    field: 'IGasstationstatus',
+    minWidth: 130,
+  },
+  {
+    title: '竟对油站',
+    fixed: 'left',
+    field: 'youGasstationstatus',
+    minWidth: 130,
+  },
+  {
+    title: '油站性质',
+    field: 'GasstationNature',
+    minWidth: 130,
+  },
+  {
+    title: '竞争关系',
+    field: 'Competitiverelationship',
+    minWidth: 130,
+  },
+  {
+    title: '距离（KM）',
+    field: 'Deadline',
+    minWidth: 130,
+  },
+  {
+    title: '挂牌价',
+    field: 'Deadline',
+    // minWidth: 130,
+    children: [
+      {
+        title: '95#',
+        field: '95#',
+        minWidth: 130,
+      },
+      {
+        title: '92#',
+        field: '92#',
+        minWidth: 130,
+      },
+      {
+        title: '92#专车',
+        field: 'Privatecar92#',
+        minWidth: 130,
+      },
+      {
+        title: '92#的士',
+        field: 'taxi92#',
+        minWidth: 130,
+      },
+      {
+        title: '92#油卡',
+        field: 'taxi92#',
+        minWidth: 130,
+      },
+    ],
+  },
+];
+export const mockData = [
+  {
+    ProcessingTime: '2024-06-01 08:00:00',
+    IGasstationstatus: '正常营业',
+    youGasstationstatus: '促销中',
+    GasstationNature: '民营',
+    Competitiverelationship: '直接竞争',
+    Deadline: 1.2,
+    '95#': 7.85,
+    '92#': 7.45,
+    'Privatecar92#': 7.35,
+    'taxi92#': 7.25,
+  },
+  {
+    ProcessingTime: '2024-06-01 09:15:00',
+    IGasstationstatus: '库存预警',
+    youGasstationstatus: '正常营业',
+    GasstationNature: '国企',
+    Competitiverelationship: '间接竞争',
+    Deadline: 2.1,
+    '95#': 7.90,
+    '92#': 7.50,
+    'Privatecar92#': 7.40,
+    'taxi92#': 7.30,
+  },
+  {
+    ProcessingTime: '2024-06-01 10:30:00',
+    IGasstationstatus: '正常营业',
+    youGasstationstatus: '降价促销',
+    GasstationNature: '合资',
+    Competitiverelationship: '直接竞争',
+    Deadline: 0.8,
+    '95#': 7.80,
+    '92#': 7.40,
+    'Privatecar92#': 7.30,
+    'taxi92#': 7.20,
+  },
+  {
+    ProcessingTime: '2024-06-01 11:45:00',
+    IGasstationstatus: '设备维护',
+    youGasstationstatus: '正常营业',
+    GasstationNature: '民营',
+    Competitiverelationship: '间接竞争',
+    Deadline: 1.5,
+    '95#': 7.95,
+    '92#': 7.55,
+    'Privatecar92#': 7.45,
+    'taxi92#': 7.35,
+  },
+  {
+    ProcessingTime: '2024-06-01 13:00:00',
+    IGasstationstatus: '正常营业',
+    youGasstationstatus: '会员日',
+    GasstationNature: '国企',
+    Competitiverelationship: '直接竞争',
+    Deadline: 1.0,
+    '95#': 7.88,
+    '92#': 7.48,
+    'Privatecar92#': 7.38,
+    'taxi92#': 7.28,
+  },
+];

apps/web-ele/src/views/Archive/operationsManagement/competitivePricingSurvey/index.vue

@@ -2,7 +2,6 @@
   <Page :auto-content-height="true">
     <BasicTable>
       <template #toolbar-tools>
-        <el-button type="primary" plain>导出</el-button>
         <el-button @click="() => (showSearchForm = !showSearchForm)">
           展开/折叠
         </el-button>
@@ -24,9 +23,9 @@ import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
-import { columns, querySchema } from './config-data';
+import { columns, querySchema, mapFormToApi, mapApiToView } from './config-data';
 import type { VbenFormProps } from '@vben/common-ui';
-import { mockData } from './config-data';
+import { getCompetitorMarketingSurveyList } from '#/api/archive/operationsManagement/operationsManagement';
 const showSearchForm = ref(true) as any;
 const router = useRouter();
 const formOptions: VbenFormProps = {
@@ -57,33 +56,32 @@ const gridOptions: VxeGridProps = {
     reserve: true,
     // 点击行选中
     trigger: 'default',
-    checkMethod: ({ row }) => row?.roleId !== 1,
   },
   columns,
   size: 'medium',
   height: 'auto',
-  data: mockData,
-  // proxyConfig: {
-  //   ajax: {
-  //     query: async ({ page }, formValues = {}) => {
-  //       const resp = await getRoleList({
-  //         ...formValues,
-  //         pageNum: page.currentPage,
-  //         pageSize: page.pageSize,
-  //       });
-  //       return { items: resp.rows, total: resp.total };
-  //     },
-  //   },
-  // },
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        const apiParams = mapFormToApi(formValues, page);
+        const response = await getCompetitorMarketingSurveyList(apiParams);
+        const items = mapApiToView(response?.rows || []);
+        return {
+          items,
+          total: response?.total || 0,
+        };
+      },
+    },
+  },
   rowConfig: {
-    keyField: 'roleId',
+    keyField: 'id',
   },
   toolbarConfig: {
     custom: true,
     refresh: true,
     zoom: true,
   },
-  id: 'system-role-index',
+  id: 'competitive-pricing-survey-index',
 };
 const [BasicTable, BasicTableApi] = useVbenVxeGrid({
   showSearchForm,

apps/web-ele/src/views/Archive/operationsManagement/competitiveSalesSurvey/config-data.tsx

@@ -1,78 +1,192 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { DictEnum } from '@vben/constants';
-import { getDictOptions } from '#/utils/dict';
+import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+import { getCompetitiveStationList } from '#/api/archive/operationsManagement/operationsManagement';
+// 岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'IGasstationstatus',
-    label: '我方油站',
-  },
+        component: 'ApiSelect',
+        fieldName: 'stationId',
+        label: '油站',
+        componentProps: {
+          placeholder: '请选择油站',
+          clearable: true,
+          api: async () => {
+            const resp = await selectAllSysStationAreaList();
+            const data = resp || [];
+            return Array.isArray(data)
+              ? data.map((item: any) => ({
+                  label: item.stationName,
+                  value: item.id.toString(),
+                }))
+              : [];
+          },
+          labelField: 'label',
+          valueField: 'value',
+        },
+      },
   {
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      api: async () => {
+        const resp = await getCompetitiveStationList({});
+        const data = resp?.rows || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({ label: item.competitorName, value: item.id }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
+      placeholder: '请选择竟对油站',
     },
-    fieldName: 'youGasstationstatus',
+    fieldName: 'competitorId',
     label: '竟对油站',
   },
   {
     component: 'Select',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      options: [
+        { label: '按时完成', value: 0 },
+        { label: '逾期完成', value: 1 },
+      ],
     },
-    fieldName: 'Status',
+    fieldName: 'completionStatus',
     label: '状态',
   },
   {
     component: 'DatePicker',
     componentProps: {
       type: 'daterange',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
       startPlaceholder: '开始日期',
       endPlaceholder: '结束日期',
     },
-    fieldName: 'Time',
-    label: '时间',
+    fieldName: 'surveyStartTime',
+    label: '处理时间',
   },
   {
     component: 'Select',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      options: [
+        { label: '否', value: 0 },
+        { label: '是', value: 1 },
+      ],
     },
-    fieldName: 'Commentstatus',
+    fieldName: 'isComment',
     label: '评论',
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'position',
+    label: '岗位',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择岗位',
+      clearable: true,
+      api: async () => {
+        const data = await getPostList();
+        return Array.isArray(data.rows)
+          ? data.rows.map((item: any) => ({
+              label: item.postName || item.name,
+              value: item.postId,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'PositionStatus',
-    label: '岗位',
   },
   {
     component: 'Select',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      options: [
+        { label: '系统', value: 0 },
+        { label: '新增', value: 1 },
+      ],
     },
-    fieldName: 'CreateStatus',
+    fieldName: 'createType',
     label: '创建',
   },
   {
-    component: 'Select',
+    component: 'Input',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请输入执行人',
     },
-    fieldName: 'executorStatus',
+    fieldName: 'executorName',
     label: '执行人',
   },
 ];
 
+/**
+ * 映射表单字段到API字段
+ */
+export function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+  };
+  
+  // 我方油站
+  if (formValues.stationId) {
+    apiParams.stationId = formValues.stationId;
+  }
+  
+  // 竟对油站
+  if (formValues.competitorId) {
+    apiParams.competitorId = formValues.competitorId;
+  }
+  
+  // 完成状态
+  if (formValues.completionStatus !== undefined) {
+    apiParams.completionStatus = formValues.completionStatus;
+  }
+  
+  // 调查开始时间
+  if (formValues.surveyStartTime) {
+    apiParams.processStartTime = formValues.surveyStartTime[0];
+    apiParams.processEndTime = formValues.surveyStartTime[1];
+  }
+  
+  // 评论状态
+  if (formValues.isComment !== undefined) {
+    apiParams.isComment = formValues.isComment;
+  }
+  
+  // 岗位
+  if (formValues.position) {
+    apiParams.position = formValues.position;
+  }
+  
+  // 创建方式
+  if (formValues.createType !== undefined) {
+    apiParams.createType = formValues.createType;
+  }
+  
+  // 执行人
+  if (formValues.executorName) {
+    apiParams.executorName = formValues.executorName;
+  }
+  
+  return apiParams;
+}
+
+/**
+ * 映射API响应数据到页面显示字段
+ */
+export function mapApiToView(data: any[]) {
+  return data.map(item => ({
+    ...item,
+    // 处理需要转换的字段
+  }));
+}
+
 export const columns: VxeGridProps['columns'] = [
   {
     field: 'action',
@@ -85,165 +199,123 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '处理时间',
     fixed: 'left',
-    field: 'ProcessingTime',
-    minWidth: 130,
+    field: 'processTime',
+    minWidth: 180,
   },
   {
     title: '我方油站',
     fixed: 'left',
-    field: 'IGasstationstatus',
+    field: 'stationName',
     minWidth: 130,
   },
   {
     title: '竟对油站',
     fixed: 'left',
-    field: 'youGasstationstatus',
+    field: 'competitorName',
     minWidth: 130,
   },
-
+  {
+    title: '调查开始时间',
+    field: 'surveyStartTime',
+    minWidth: 180,
+  },
+  {
+    title: '调查结束时间',
+    field: 'surveyEndTime',
+    minWidth: 180,
+  },
   {
     title: '汽油车',
-    field: 'Gasolinecar',
-    // minWidth: 130,
+    field: 'gasoline',
     children: [
       {
         title: '进站车次',
-        field: 'GasArrivingTrains',
+        field: 'gasolineVehicleCount',
         minWidth: 130,
       },
       {
         title: '加油升数差',
-        field: 'GasOilNumber',
+        field: 'gasolineVolumeDiff',
         minWidth: 130,
       },
     ],
   },
   {
     title: '柴油车',
-    field: 'dieselcar',
-    // minWidth: 130,
+    field: 'diesel',
     children: [
       {
         title: '进站车次',
-        field: 'dieArrivingTrains',
+        field: 'dieselVehicleCount',
         minWidth: 130,
       },
       {
         title: '加油升数差',
-        field: 'dieOilNumber',
+        field: 'dieselVolumeDiff',
         minWidth: 130,
       },
     ],
   },
   {
     title: '摩托车',
-    field: 'Motorcycle',
-    // minWidth: 130,
+    field: 'motorcycle',
     children: [
       {
         title: '进站车次',
-        field: 'MotoArrivingTrains',
+        field: 'motorcycleCount',
         minWidth: 130,
       },
       {
         title: '加油升数差',
-        field: 'MotoOilNumber',
+        field: 'motorcycleVolumeDiff',
         minWidth: 130,
       },
     ],
   },
   {
     title: '气车',
-    field: 'pneumaticcar',
-    // minWidth: 130,
+    field: 'gas',
     children: [
       {
         title: '进站车次',
-        field: 'pneuArrivingTrains',
+        field: 'gasVehicleCount',
         minWidth: 130,
       },
       {
         title: '加油升数差',
-        field: 'pneuOilNumber',
+        field: 'gasVolumeDiff',
         minWidth: 130,
       },
     ],
   },
   {
     title: '时段预测销量差（升）',
-    field: 'TimePredictionSales',
+    field: 'periodForecastDiff',
     minWidth: 170,
   },
-];
-export const mockData = [
-  {
-    ProcessingTime: '2024-06-01 08:00:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '促销中',
-    GasArrivingTrains: 320,
-    GasOilNumber: -120,
-    dieArrivingTrains: 180,
-    dieOilNumber: -80,
-    MotoArrivingTrains: 90,
-    MotoOilNumber: -35,
-    pneuArrivingTrains: 50,
-    pneuOilNumber: -20,
-    TimePredictionSales: -355,
-  },
-  {
-    ProcessingTime: '2024-06-01 09:15:00',
-    IGasstationstatus: '库存预警',
-    youGasstationstatus: '正常营业',
-    GasArrivingTrains: 380,
-    GasOilNumber: -150,
-    dieArrivingTrains: 210,
-    dieOilNumber: -95,
-    MotoArrivingTrains: 105,
-    MotoOilNumber: -42,
-    pneuArrivingTrains: 60,
-    pneuOilNumber: -25,
-    TimePredictionSales: -312,
-  },
-  {
-    ProcessingTime: '2024-06-01 10:30:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '降价促销',
-    GasArrivingTrains: 310,
-    GasOilNumber: -135,
-    dieArrivingTrains: 170,
-    dieOilNumber: -78,
-    MotoArrivingTrains: 98,
-    MotoOilNumber: -40,
-    pneuArrivingTrains: 55,
-    pneuOilNumber: -22,
-    TimePredictionSales: -275,
-  },
-  {
-    ProcessingTime: '2024-06-01 11:45:00',
-    IGasstationstatus: '设备维护',
-    youGasstationstatus: '正常营业',
-    GasArrivingTrains: 340,
-    GasOilNumber: -160,
-    dieArrivingTrains: 200,
-    dieOilNumber: -88,
-    MotoArrivingTrains: 110,
-    MotoOilNumber: -45,
-    pneuArrivingTrains: 65,
-    pneuOilNumber: -28,
-    TimePredictionSales: -321,
-  },
-  {
-    ProcessingTime: '2024-06-01 13:00:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '会员日',
-    GasArrivingTrains: 410,
-    GasOilNumber: -185,
-    dieArrivingTrains: 225,
-    dieOilNumber: -105,
-    MotoArrivingTrains: 120,
-    MotoOilNumber: -52,
-    pneuArrivingTrains: 70,
-    pneuOilNumber: -30,
-    TimePredictionSales: -372,
+  {
+    title: '全天预测销量差（升）',
+    field: 'dailyForecastDiff',
+    minWidth: 170,
+  },
+  {
+    title: '汽油调查销量（升）',
+    field: 'gasolineSurveyVolume',
+    minWidth: 170,
+  },
+  {
+    title: '柴油调查销量（升）',
+    field: 'dieselSurveyVolume',
+    minWidth: 170,
+  },
+  {
+    title: '是否是竞争油站',
+    field: 'isCompetitor',
+    minWidth: 130,
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '是' : '否';
+    },
   },
 ];
+
+

apps/web-ele/src/views/Archive/operationsManagement/competitiveSalesSurvey/index.vue

@@ -2,7 +2,6 @@
   <Page :auto-content-height="true">
     <BasicTable>
       <template #toolbar-tools>
-        <el-button type="primary" plain>导出</el-button>
         <el-button @click="() => (showSearchForm = !showSearchForm)">
           展开/折叠
         </el-button>
@@ -21,14 +20,15 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
-import { columns, querySchema } from './config-data';
+import { columns, querySchema, mapFormToApi, mapApiToView } from './config-data';
 import type { VbenFormProps } from '@vben/common-ui';
-import { mockData } from './config-data';
+import { getCompetitorSalesSurveyList } from '#/api/archive/operationsManagement/operationsManagement';
 const showSearchForm = ref(true) as any;
 const router = useRouter();
+const route = useRoute();
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -57,41 +57,43 @@ const gridOptions: VxeGridProps = {
     reserve: true,
     // 点击行选中
     trigger: 'default',
-    checkMethod: ({ row }) => row?.roleId !== 1,
   },
   columns,
   size: 'medium',
   height: 'auto',
-  data: mockData,
-  // proxyConfig: {
-  //   ajax: {
-  //     query: async ({ page }, formValues = {}) => {
-  //       const resp = await getRoleList({
-  //         ...formValues,
-  //         pageNum: page.currentPage,
-  //         pageSize: page.pageSize,
-  //       });
-  //       return { items: resp.rows, total: resp.total };
-  //     },
-  //   },
-  // },
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        const apiParams = mapFormToApi(formValues, page);
+        apiParams.type = route.query.type || '';
+        apiParams.directoryType = route.query.directoryType || '';
+        console.log(apiParams);
+        const response = await getCompetitorSalesSurveyList(apiParams);
+        const items = mapApiToView(response?.rows || []);
+        return {
+          items,
+          total: response?.total || 0,
+        };
+      },
+    },
+  },
   rowConfig: {
-    keyField: 'roleId',
+    keyField: 'id',
   },
   toolbarConfig: {
     custom: true,
     refresh: true,
     zoom: true,
   },
-  id: 'system-role-index',
+  id: 'competitive-sales-survey-index',
 };
-const [BasicTable, BasicTableApi] = useVbenVxeGrid({
+const [BasicTable] = useVbenVxeGrid({
   showSearchForm,
   formOptions,
   gridOptions,
 });
 const handleTaskClick = (taskId: number) => {
-  router.push(`/schedule/detail/${taskId}`);
+  router.push(`/schedule/detail?id=${taskId}&type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`);
 };
 </script>
 <style scoped lang="scss">

apps/web-ele/src/views/Archive/operationsManagement/licenseTaskManagement/config-data.tsx

@@ -1,162 +1,203 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { DictEnum } from '@vben/constants';
-import { getDictOptions } from '#/utils/dict';
+
+import { selectAllSysAreaList, selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
+// 岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
+
+// 获取证件名称列表
+const getLicenseNameList = async () => {
+  const resp = await requestClient.get('/sysLicenseRule/rule/list');
+  return resp || [];
+};
+
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'areaId',
+    label: '片区',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择片区',
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.areaName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'areaStatus',
-    label: '片区',
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'stationId',
+    label: '油站',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择油站',
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.stationName,
+              value: item.id.toString(),
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'gasstationStatus',
-    label: '油站',
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'licenseRuleId',
+    label: '证件名称',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择证件名称',
+      clearable: true,
+      api: async () => {
+        const resp = await getLicenseNameList();
+        const data = resp?.rows || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.licenseName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'documentNameSelect',
-    label: '证件名称',
   },
   {
     component: 'DatePicker',
     componentProps: {
       type: 'daterange',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
       startPlaceholder: '开始日期',
       endPlaceholder: '结束日期',
     },
-    labelClass: 'text-xs',
-    fieldName: 'taskStartedTime',
-    label: '任务开始时间',
+    fieldName: 'surveyStartTime',
+    label: '处理时间',
   },
   {
     component: 'Select',
+    fieldName: 'completionStatus',
+    label: '状态',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择完成状态',
+      options: [
+        { label: '按时完成', value: 0 },
+        { label: '逾期完成', value: 1 },
+      ],
     },
-    fieldName: 'taskStatus',
-    label: '任务状态',
   },
+
   {
-    component: 'Select',
+    component: 'Input',
+    fieldName: 'executorName',
+    label: '执行人',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请输入执行人',
     },
-    fieldName: 'executorStatus',
-    label: '执行人',
   },
+
 ];
 
+
 export const columns: VxeGridProps['columns'] = [
   {
+    type: 'checkbox',
+    width: 80,
+  },
+  {
     field: 'action',
-    fixed: 'left',
+    fixed: 'right',
     slots: { default: 'action' },
-    resizable: false,
     title: '操作',
-    width: 180,
+    width: 150,
+  },
+  {
+    field: 'taskName',
+    title: '任务名称',
+    minWidth: 150,
   },
   {
+    field: 'stationId',
     title: '油站',
-    field: 'gasstation',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
+    field: 'licenseName',
     title: '证件名称',
-    field: 'documentName',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
-    title: '任务类型',
     field: 'taskType',
-    minWidth: 130,
+    title: '任务类型',
+    minWidth: 120,
   },
   {
-    title: '任务开始时间',
-    field: 'taskStartedTime',
-    minWidth: 130,
+    field: 'executorName',
+    title: '执行人',
+    minWidth: 120,
   },
   {
-    title: '任务结束时间',
-    field: 'taskCompletedTime',
-    minWidth: 130,
+    field: 'position',
+    title: '岗位',
+    minWidth: 120,
   },
   {
-    title: '执行人',
-    field: 'executor',
-    minWidth: 130,
+    field: 'isComment',
+    title: '评论',
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '已评' : '未评';
+    },
   },
   {
-    title: '任务状态',
-    field: 'taskStatus',
-    minWidth: 130,
+    field: 'deadline',
+    title: '截止时间',
+    minWidth: 180,
   },
   {
-    title: '操作人',
-    field: 'Operator',
-    minWidth: 130,
+    field: 'processTime',
+    title: '处理时间',
+    minWidth: 180,
   },
-];
-export const mockData = [
-  {
-    gasstation: '中山路加油站',
-    documentName: '营业执照年检',
-    taskType: '年度例行',
-    taskStartedTime: '2024-06-01 08:00',
-    taskCompletedTime: '2024-06-01 12:00',
-    executor: '王保瑞',
-    taskStatus: '已完成',
-    Operator: '李晴',
-  },
-  {
-    gasstation: '北环大道油站',
-    documentName: '消防器材检验',
-    taskType: '安全巡检',
-    taskStartedTime: '2024-06-01 09:15',
-    taskCompletedTime: '2024-06-01 11:30',
-    executor: '王凯',
-    taskStatus: '已完成',
-    Operator: '张敏',
-  },
-  {
-    gasstation: '城南综合能源站',
-    documentName: '油罐清洗记录',
-    taskType: '设备维护',
-    taskStartedTime: '2024-06-01 10:30',
-    taskCompletedTime: '',
-    executor: '李威',
-    taskStatus: '处理中',
-    Operator: '刘洋',
-  },
-  {
-    gasstation: '高速服务区东站',
-    documentName: '加油机校验报告',
-    taskType: '计量检定',
-    taskStartedTime: '2024-06-01 11:45',
-    taskCompletedTime: '2024-06-01 14:20',
-    executor: '张敏',
-    taskStatus: '已完成',
-    Operator: '王保瑞',
-  },
-  {
-    gasstation: '城西快充站',
-    documentName: '充电桩接地检测',
-    taskType: '安全检定',
-    taskStartedTime: '2024-06-01 13:00',
-    taskCompletedTime: '',
-    executor: '刘洋',
-    taskStatus: '处理中',
-    Operator: '李晴',
+  {
+    field: 'completionStatus',
+    title: '完成状态',
+    minWidth: 120,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '按时完成' : '逾期完成';
+    },
+  },
+  {
+    field: 'createType',
+    title: '创建',
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '系统' : '新增';
+    },
   },
 ];
+
+

apps/web-ele/src/views/Archive/operationsManagement/licenseTaskManagement/index.vue

@@ -1,12 +1,12 @@
 <template>
   <Page :auto-content-height="true">
-    <BasicTable>
+    <BasicTable table-title="证照任务管理列表">
       <template #action="{ row }">
         <el-button
           size="small"
           type="primary"
           plain
-          @click="() => handleTaskClick(row.taskId)"
+          @click="() => handleTaskClick(row.id)"
           >查看</el-button
         >
       </template>
@@ -14,13 +14,43 @@
   </Page>
 </template>
 <script setup lang="ts">
-import { useRouter } from 'vue-router';
+import { ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
 import { columns, querySchema } from './config-data';
 import type { VbenFormProps } from '@vben/common-ui';
-import { mockData } from './config-data';
+import { getLicenseTaskList } from '#/api/archive/operationsManagement/operationsManagement';
+
+const showSearchForm = ref(true) as any;
 const router = useRouter();
+const route = useRoute();
+
+// 表单字段到 API 字段的映射
+function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+    type: route.query.type || '',
+    directoryType: route.query.directoryType || '',
+  };
+  
+  // 处理调查开始时间
+  if (formValues.surveyStartTime) {
+    apiParams.processStartTime = formValues.surveyStartTime[0];
+    apiParams.processEndTime = formValues.surveyStartTime[1];
+  }
+  
+  // 其他字段
+  Object.keys(formValues).forEach(key => {
+    if (key !== 'surveyStartTime') {
+      apiParams[key] = formValues[key];
+    }
+  });
+  
+  return apiParams;
+}
+
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -30,14 +60,6 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 日期选择格式化
-  // fieldMappingTime: [
-  //   [
-  //     'createTime',
-  //     ['params[beginTime]', 'params[endTime]'],
-  //     ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //   ],
-  // ],
 };
 
 // 列表中显示配置
@@ -49,42 +71,50 @@ const gridOptions: VxeGridProps = {
     reserve: true,
     // 点击行选中
     trigger: 'default',
-    checkMethod: ({ row }) => row?.roleId !== 1,
   },
   columns,
   size: 'medium',
   height: 'auto',
-  data: mockData,
-  // proxyConfig: {
-  //   ajax: {
-  //     query: async ({ page }, formValues = {}) => {
-  //       const resp = await getRoleList({
-  //         ...formValues,
-  //         pageNum: page.currentPage,
-  //         pageSize: page.pageSize,
-  //       });
-  //       return { items: resp.rows, total: resp.total };
-  //     },
-  //   },
-  // },
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        // 映射表单字段到 API 字段
+        const apiParams = mapFormToApi(formValues, page);
+        
+        // 调用API
+        const response = await getLicenseTaskList(apiParams);
+        
+        // 映射 API 响应数据到页面显示字段
+        const items = response.rows;
+        
+        return {
+          items,
+          total: response.total,
+        };
+      },
+    },
+  },
   rowConfig: {
-    keyField: 'roleId',
+    keyField: 'id',
   },
   toolbarConfig: {
     custom: true,
     refresh: true,
     zoom: true,
   },
-  id: 'system-role-index',
+  id: 'license-task-management-index',
 };
-const [BasicTable, BasicTableApi] = useVbenVxeGrid({
+const [BasicTable] = useVbenVxeGrid({
+  showSearchForm,
   formOptions,
   gridOptions,
 });
 const handleTaskClick = (taskId: number) => {
-  router.push(`/schedule/detail/${taskId}`);
+  // 跳转到任务详情页面
+  router.push(`/schedule/detail/${taskId}?type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`);
 };
 </script>
+
 <style scoped lang="scss">
 :deep(.el-tooltip__trigger:focus) {
   outline: none;

apps/web-ele/src/views/Archive/operationsManagement/managementPlan/config-data.tsx

@@ -1,170 +1,201 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { DictEnum } from '@vben/constants';
-import { getDictOptions } from '#/utils/dict';
+
+import { selectAllSysAreaList, selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
+// 岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
+
+
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'areaStatus',
-    label: '片区',
-  },
-  {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'stationId',
+    label: '油站',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择油站',
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.stationName,
+              value: item.id.toString(),
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'gasStationStatus',
-    label: '油站',
   },
   {
     component: 'Select',
+    fieldName: 'completionStatus',
+    label: '完成状态',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择完成状态',
+      options: [
+        { label: '按时完成', value: 0 },
+        { label: '逾期完成', value: 1 },
+      ],
     },
-    fieldName: 'status',
-    label: '状态',
   },
   {
     component: 'DatePicker',
     componentProps: {
       type: 'daterange',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
       startPlaceholder: '开始日期',
       endPlaceholder: '结束日期',
     },
-    fieldName: 'handleTime',
+    fieldName: 'surveyStartTime',
     label: '处理时间',
   },
   {
     component: 'Select',
+    fieldName: 'isComment',
+    label: '评论',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择评论状态',
+      options: [
+        { label: '未评', value: 0 },
+        { label: '已评', value: 1 },
+      ],
     },
-    fieldName: 'commentStatus',
-    label: '评论',
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'position',
+    label: '岗位',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择岗位',
+      clearable: true,
+      api: async () => {
+        const data = await getPostList();
+        return Array.isArray(data.rows)
+          ? data.rows.map((item: any) => ({
+              label: item.postName || item.name,
+              value: item.postId,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'positionStatus',
-    label: '岗位',
   },
   {
     component: 'Select',
+    fieldName: 'createType',
+    label: '创建',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择创建方式',
+      options: [
+        { label: '系统', value: 0 },
+        { label: '新增', value: 1 },
+      ],
     },
-    fieldName: 'createStatus',
-    label: '创建',
   },
   {
-    component: 'Select',
+    component: 'Input',
+    fieldName: 'executorName',
+    label: '执行人',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请输入执行人',
+    },
+  },
+  {
+    component: 'Input',
+    fieldName: 'taskName',
+    label: '任务名称',
+    componentProps: {
+      placeholder: '请输入任务名称',
     },
-    fieldName: 'executorStatus',
-    label: '执行人',
   },
 ];
 
+
 export const columns: VxeGridProps['columns'] = [
   {
+    type: 'checkbox',
+    width: 80,
+  },
+  {
     field: 'action',
-    fixed: 'left',
+    fixed: 'right',
     slots: { default: 'action' },
-    resizable: false,
     title: '操作',
-    width: 180,
+    width: 220,
   },
   {
+    field: 'taskName',
+    title: '任务名称',
+    minWidth: 150,
+  },
+  {
+    field: 'stationName',
     title: '油站',
-    field: 'gasStation',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
+    field: 'executorName',
     title: '执行人',
-    field: 'executor',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
-    title: '岗位',
     field: 'position',
-    minWidth: 130,
+    title: '岗位',
+    minWidth: 120,
   },
   {
+    field: 'isComment',
     title: '评论',
-    field: 'comment',
-    minWidth: 130,
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '已评' : '未评';
+    },
   },
   {
-    title: '截止时间',
     field: 'deadline',
-    minWidth: 130,
+    title: '截止时间',
+    minWidth: 180,
   },
   {
+    field: 'processTime',
     title: '处理时间',
-    fixed: 'left',
-    field: 'processingTime',
-    minWidth: 130,
+    minWidth: 180,
   },
-
   {
-    title: '完成状态',
-    fixed: 'left',
     field: 'completionStatus',
-    minWidth: 130,
+    title: '完成状态',
+    minWidth: 120,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '按时完成' : '逾期完成';
+    },
   },
-];
-export const mockData = [
-  {
-    gasStation: '中山路加油站',
-    executor: '王保瑞',
-    position: '当班经理',
-    comment: '高峰期车流大，需增派人手',
-    deadline: '2024-06-10 18:00',
-    processingTime: '2024-06-01 08:00',
-    completionStatus: '处理中',
-  },
-  {
-    gasStation: '北环大道油站',
-    executor: '王凯',
-    position: '安全员',
-    comment: '液位传感器读数漂移',
-    deadline: '2024-06-05 12:00',
-    processingTime: '2024-06-01 09:15',
-    completionStatus: '已完成',
-  },
-  {
-    gasStation: '城南综合能源站',
-    executor: '李威',
-    position: '设备管理员',
-    comment: '滤芯堵塞超标，需更换',
-    deadline: '2024-06-08 17:00',
-    processingTime: '2024-06-01 10:30',
-    completionStatus: '已完成',
-  },
-  {
-    gasStation: '高速服务区东站',
-    executor: '张敏',
-    position: '收银员',
-    comment: '小票打印机卡纸',
-    deadline: '2024-06-07 20:00',
-    processingTime: '2024-06-01 11:45',
-    completionStatus: '处理中',
-  },
-  {
-    gasStation: '城西快充站',
-    executor: '刘洋',
-    position: '电工',
-    comment: '接地电阻偏高，需复检',
-    deadline: '2024-06-06 16:00',
-    processingTime: '2024-06-01 13:00',
-    completionStatus: '待处理',
+  {
+    field: 'createType',
+    title: '创建',
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '系统' : '新增';
+    },
+  },
+  {
+    field: 'month',
+    title: '月份',
+    minWidth: 120,
   },
 ];
+
+

apps/web-ele/src/views/Archive/operationsManagement/managementPlan/index.vue

@@ -1,11 +1,41 @@
 <script setup lang="ts">
-import { useRouter } from 'vue-router';
+import { ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
 import { columns, querySchema } from './config-data';
 import type { VbenFormProps } from '@vben/common-ui';
-import { mockData } from './config-data';
+import { getManagementPlanList } from '#/api/archive/operationsManagement/operationsManagement';
+
+const showSearchForm = ref(true) as any;
 const router = useRouter();
+const route = useRoute();
+
+// 表单字段到 API 字段的映射
+function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+    type: route.query.type || '',
+    directoryType: route.query.directoryType || '',
+  };
+  
+  // 处理调查开始时间
+  if (formValues.surveyStartTime) {
+    apiParams.processStartTime = formValues.surveyStartTime[0];
+    apiParams.processEndTime = formValues.surveyStartTime[1];
+  }
+  
+  // 其他字段
+  Object.keys(formValues).forEach(key => {
+    if (key !== 'surveyStartTime') {
+      apiParams[key] = formValues[key];
+    }
+  });
+  
+  return apiParams;
+}
+
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -15,14 +45,6 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 日期选择格式化
-  // fieldMappingTime: [
-  //   [
-  //     'createTime',
-  //     ['params[beginTime]', 'params[endTime]'],
-  //     ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //   ],
-  // ],
 };
 
 // 列表中显示配置
@@ -34,51 +56,59 @@ const gridOptions: VxeGridProps = {
     reserve: true,
     // 点击行选中
     trigger: 'default',
-    checkMethod: ({ row }) => row?.roleId !== 1,
   },
   columns,
   size: 'medium',
   height: 'auto',
-  data: mockData,
-  // proxyConfig: {
-  //   ajax: {
-  //     query: async ({ page }, formValues = {}) => {
-  //       const resp = await getRoleList({
-  //         ...formValues,
-  //         pageNum: page.currentPage,
-  //         pageSize: page.pageSize,
-  //       });
-  //       return { items: resp.rows, total: resp.total };
-  //     },
-  //   },
-  // },
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        // 映射表单字段到 API 字段
+        const apiParams = mapFormToApi(formValues, page);
+        
+        // 调用API
+        const response = await getManagementPlanList(apiParams);
+        
+        // 映射 API 响应数据到页面显示字段
+        const items = response.rows;
+        
+        return {
+          items,
+          total: response.total,
+        };
+      },
+    },
+  },
   rowConfig: {
-    keyField: 'roleId',
+    keyField: 'id',
   },
   toolbarConfig: {
     custom: true,
     refresh: true,
     zoom: true,
   },
-  id: 'system-role-index',
+  id: 'management-plan-index',
 };
 const [BasicTable, BasicTableApi] = useVbenVxeGrid({
+  showSearchForm,
   formOptions,
   gridOptions,
 });
 const handleTaskClick = (taskId: number) => {
-  router.push(`/schedule/detail/${taskId}`);
+  // 跳转到任务详情页面
+  router.push(`/schedule/detail/${taskId}?type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`); 
 };
 </script>
+
 <template>
   <Page :auto-content-height="true">
-    <BasicTable>
+    <BasicTable table-title="管理计划列表">
       <template #action="{ row }">
         <el-button
           size="small"
           type="primary"
           plain
-          @click="() => handleTaskClick(row.taskId)"
+          @click="() => handleTaskClick(row.id)"
           >查看</el-button
         >
         <el-button size="small" type="primary" plain>打印清洁计划</el-button>
@@ -86,6 +116,7 @@ const handleTaskClick = (taskId: number) => {
     </BasicTable>
   </Page>
 </template>
+
 <style scoped lang="scss">
 :deep(.el-tooltip__trigger:focus) {
   outline: none;

apps/web-ele/src/views/Archive/operationsManagement/operationsInspection/index.vue

@@ -15,13 +15,14 @@
   </Page>
 </template>
 <script setup lang="ts">
-import { useRouter } from 'vue-router';
+import { useRouter,operational } from 'vue-router';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
 import { columns, querySchema } from './config-data';
 import type { VbenFormProps } from '@vben/common-ui';
 import { mockData } from './config-data';
 const router = useRouter();
+const route = useRoute();
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -84,7 +85,7 @@ const gridOptions: VxeGridProps = {
   },
   id: 'system-role-index',
 };
-const [BasicTable, BasicTableApi] = useVbenVxeGrid({
+const [BasicTable] = useVbenVxeGrid({
   formOptions,
   gridOptions,
 });

apps/web-ele/src/views/Archive/operationsManagement/teamLog/config-data.tsx

@@ -1,177 +1,218 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { DictEnum } from '@vben/constants';
-import { getDictOptions } from '#/utils/dict';
+
+import { selectAllSysAreaList, selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
+// 岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
+
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'areaId',
+    label: '片区',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择片区',
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.areaName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'Areastatus',
-    label: '片区',
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'stationId',
+    label: '油站',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择油站',
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.stationName,
+              value: item.id.toString(),
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'Gasstationstatus',
-    label: '油站',
   },
   {
     component: 'Select',
+    fieldName: 'completionStatus',
+    label: '状态',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择完成状态',
+      options: [
+        { label: '按时完成', value: 0 },
+        { label: '逾期完成', value: 1 },
+      ],
     },
-    fieldName: 'Status',
-    label: '状态',
   },
   {
     component: 'DatePicker',
     componentProps: {
       type: 'daterange',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
       startPlaceholder: '开始日期',
       endPlaceholder: '结束日期',
     },
-    fieldName: 'SubmitTime',
+    fieldName: 'surveyStartTime',
     label: '提交时间',
   },
   {
     component: 'Select',
+    fieldName: 'isComment',
+    label: '评论',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择评论状态',
+      options: [
+        { label: '未评', value: 0 },
+        { label: '已评', value: 1 },
+      ],
     },
-    fieldName: 'Commentstatus',
-    label: '评论',
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
+    fieldName: 'position',
+    label: '岗位',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择岗位',
+      clearable: true,
+      api: async () => {
+        const data = await getPostList();
+        return Array.isArray(data.rows)
+          ? data.rows.map((item: any) => ({
+              label: item.postName || item.name,
+              value: item.postId,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
-    fieldName: 'PositionStatus',
-    label: '岗位',
   },
   {
     component: 'Select',
+    fieldName: 'createType',
+    label: '创建',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请选择创建方式',
+      options: [
+        { label: '系统', value: 0 },
+        { label: '新增', value: 1 },
+      ],
     },
-    fieldName: 'CreateStatus',
-    label: '创建',
   },
   {
-    component: 'Select',
+    component: 'Input',
+    fieldName: 'executorName',
+    label: '执行人',
     componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      placeholder: '请输入执行人',
     },
-    fieldName: 'executorStatus',
-    label: '执行人',
   },
 ];
 
+
 export const columns: VxeGridProps['columns'] = [
   {
+    type: 'checkbox',
+    width: 80,
+  },
+  {
     field: 'action',
-    fixed: 'left',
+    fixed: 'right',
     slots: { default: 'action' },
-    resizable: false,
     title: '操作',
-    width: 180,
+    width: 150,
+  },
+  {
+    field: 'taskName',
+    title: '任务名称',
+    minWidth: 150,
   },
   {
+    field: 'stationName',
     title: '油站',
-    field: 'Gasstation',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
+    field: 'executorName',
     title: '执行人',
-    field: 'Executor',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
+    field: 'position',
     title: '岗位',
-    field: 'Position',
-    minWidth: 130,
+    minWidth: 120,
   },
   {
+    field: 'isComment',
     title: '评论',
-    field: 'Comment',
-    minWidth: 130,
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '已评' : '未评';
+    },
   },
   {
+    field: 'deadline',
     title: '截止时间',
-    field: 'Deadline',
-    minWidth: 130,
+    minWidth: 180,
   },
   {
+    field: 'processTime',
     title: '提交时间',
-    field: 'SubmitTime',
-    minWidth: 130,
+    minWidth: 180,
   },
   {
+    field: 'completionStatus',
     title: '任务状态',
-    field: 'TaskStatus',
-    minWidth: 130,
+    minWidth: 120,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '按时完成' : '逾期完成';
+    },
   },
   {
+    field: 'createType',
     title: '创建',
-    field: 'create',
-    minWidth: 130,
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '系统' : '新增';
+    },
   },
-];
-export const mockData = [
-  {
-    Gasstation: '中山路加油站',
-    Executor: '王保瑞',
-    Position: '当班经理',
-    Comment: '高峰期车流大，需增派人手',
-    Deadline: '2024-06-10 18:00',
-    SubmitTime: '2024-06-01 08:15',
-    TaskStatus: '待处理',
-    create: '系统',
-  },
-  {
-    Gasstation: '北环大道油站',
-    Executor: '王凯',
-    Position: '安全员',
-    Comment: '油罐液位异常，需立即检查',
-    Deadline: '2024-06-05 12:00',
-    SubmitTime: '2024-06-01 09:30',
-    TaskStatus: '处理中',
-    create: '系统',
-  },
-  {
-    Gasstation: '城南综合能源站',
-    Executor: '李威',
-    Position: '设备管理员',
-    Comment: '加油机滤芯更换完成，请复核',
-    Deadline: '2024-06-08 17:00',
-    SubmitTime: '2024-06-01 10:45',
-    TaskStatus: '已完成',
-    create: '系统',
-  },
-  {
-    Gasstation: '高速服务区东站',
-    Executor: '张敏',
-    Position: '收银员',
-    Comment: 'POS 系统版本升级，测试支付流程',
-    Deadline: '2024-06-07 20:00',
-    SubmitTime: '2024-06-01 14:20',
-    TaskStatus: '待处理',
-    create: '系统',
-  },
-  {
-    Gasstation: '城西快充站',
-    Executor: '刘洋',
-    Position: '电工',
-    Comment: '充电桩接地电阻复检',
-    Deadline: '2024-06-06 16:00',
-    SubmitTime: '2024-06-01 15:10',
-    TaskStatus: '处理中',
-    create: '系统',
+  {
+    field: 'shiftDate',
+    title: '上班日期',
+    minWidth: 180,
+  },
+  {
+    field: 'shiftId',
+    title: '上班班次',
+    minWidth: 120,
   },
 ];
+
+

apps/web-ele/src/views/Archive/operationsManagement/teamLog/index.vue

@@ -1,12 +1,12 @@
 <template>
   <Page :auto-content-height="true">
-    <BasicTable>
+    <BasicTable table-title="团队日志列表">
       <template #action="{ row }">
         <el-button
           size="small"
           type="primary"
           plain
-          @click="() => handleTaskClick(row.taskId)"
+          @click="() => handleTaskClick(row.id)"
           >查看</el-button
         >
         <el-button size="small" type="primary" plain>打印</el-button>
@@ -14,14 +14,45 @@
     </BasicTable>
   </Page>
 </template>
+
 <script setup lang="ts">
-import { useRouter } from 'vue-router';
+import { ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
 import { columns, querySchema } from './config-data';
 import type { VbenFormProps } from '@vben/common-ui';
-import { mockData } from './config-data';
+import { getTeamShiftLogList } from '#/api/archive/operationsManagement/operationsManagement';
+
+const showSearchForm = ref(true) as any;
 const router = useRouter();
+const route = useRoute();
+
+// 表单字段到 API 字段的映射
+function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+    type: route.query.type || '',
+    directoryType: route.query.directoryType || '',
+  };
+  
+  // 处理调查开始时间
+  if (formValues.surveyStartTime) {
+    apiParams.processStartTime = formValues.surveyStartTime[0];
+    apiParams.processEndTime = formValues.surveyStartTime[1];
+  }
+  
+  // 其他字段
+  Object.keys(formValues).forEach(key => {
+    if (key !== 'surveyStartTime') {
+      apiParams[key] = formValues[key];
+    }
+  });
+  
+  return apiParams;
+}
+
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -32,14 +63,6 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 日期选择格式化
-  // fieldMappingTime: [
-  //   [
-  //     'createTime',
-  //     ['params[beginTime]', 'params[endTime]'],
-  //     ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //   ],
-  // ],
 };
 
 // 列表中显示配置
@@ -51,40 +74,47 @@ const gridOptions: VxeGridProps = {
     reserve: true,
     // 点击行选中
     trigger: 'default',
-    checkMethod: ({ row }) => row?.roleId !== 1,
   },
   columns,
   size: 'medium',
   height: 'auto',
-  data: mockData,
-  // proxyConfig: {
-  //   ajax: {
-  //     query: async ({ page }, formValues = {}) => {
-  //       const resp = await getRoleList({
-  //         ...formValues,
-  //         pageNum: page.currentPage,
-  //         pageSize: page.pageSize,
-  //       });
-  //       return { items: resp.rows, total: resp.total };
-  //     },
-  //   },
-  // },
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        // 映射表单字段到 API 字段
+        const apiParams = mapFormToApi(formValues, page);
+        
+        // 调用API
+        const response = await getTeamShiftLogList(apiParams);
+        
+        // 映射 API 响应数据到页面显示字段
+        const items = response.rows;
+        
+        return {
+          items,
+          total: response.total,
+        };
+      },
+    },
+  },
   rowConfig: {
-    keyField: 'roleId',
+    keyField: 'id',
   },
   toolbarConfig: {
     custom: true,
     refresh: true,
     zoom: true,
   },
-  id: 'system-role-index',
+  id: 'team-log-index',
 };
-const [BasicTable, BasicTableApi] = useVbenVxeGrid({
+const [BasicTable] = useVbenVxeGrid({
+  showSearchForm,
   formOptions,
   gridOptions,
 });
 const handleTaskClick = (taskId: number) => {
-  router.push(`/schedule/detail/${taskId}`);
+  // 跳转到任务详情页面
+  router.push(`/schedule/detail/${taskId}?type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`);
 };
 </script>
 <style scoped lang="scss">

apps/web-ele/src/views/Archive/operationsManagement/turningRateSurvey/config-data.tsx

@@ -1,242 +1,267 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { DictEnum } from '@vben/constants';
-import { getDictOptions } from '#/utils/dict';
+
+import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+import { getCompetitiveStationList } from '#/api/archive/operationsManagement/operationsManagement';
+
+// 岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      component: 'ApiSelect',
+      fieldName: 'stationId',
+      label: '油站',
+      componentProps: {
+        placeholder: '请选择油站',
+        clearable: true,
+        api: async () => {
+          const resp = await selectAllSysStationAreaList();
+          const data = resp || [];
+          return Array.isArray(data)
+            ? data.map((item: any) => ({
+                label: item.stationName,
+                value: item.id.toString(),
+              }))
+            : [];
+        },
+        labelField: 'label',
+        valueField: 'value',
+      },
     },
-    fieldName: 'IGasstationstatus',
-    label: '我方油站',
+   {
+     component: 'ApiSelect',
+     componentProps: {
+       api: async () => {
+         const resp = await getCompetitiveStationList({});
+         const data = resp?.rows || [];
+         return Array.isArray(data)
+           ? data.map((item: any) => ({ label: item.competitorName, value: item.id }))
+           : [];
+       },
+       labelField: 'label',
+       valueField: 'value',
+       placeholder: '请选择竟对油站',
+     },
+     fieldName: 'competitorId',
+     label: '竟对油站',
+   },
+   {
+     component: 'Select',
+     componentProps: {
+       options: [
+         { label: '按时完成', value: 0 },
+         { label: '逾期完成', value: 1 },
+       ],
+     },
+     fieldName: 'completionStatus',
+     label: '状态',
+   },
+   {
+     component: 'DatePicker',
+     componentProps: {
+       type: 'daterange',
+       format: 'YYYY-MM-DD HH:mm:ss',
+       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+       startPlaceholder: '开始日期',
+       endPlaceholder: '结束日期',
+     },
+     fieldName: 'surveyStartTime',
+     label: '处理时间',
+   },
+   {
+     component: 'Select',
+     componentProps: {
+       options: [
+         { label: '否', value: 0 },
+         { label: '是', value: 1 },
+       ],
+     },
+     fieldName: 'isComment',
+     label: '评论',
+   },
+   {
+     component: 'ApiSelect',
+     fieldName: 'position',
+     label: '岗位',
+     componentProps: {
+       placeholder: '请选择岗位',
+       clearable: true,
+       api: async () => {
+         const data = await getPostList();
+         return Array.isArray(data.rows)
+           ? data.rows.map((item: any) => ({
+               label: item.postName || item.name,
+               value: item.postId,
+             }))
+           : [];
+       },
+       labelField: 'label',
+       valueField: 'value',
+     },
+   },
+   {
+     component: 'Select',
+     componentProps: {
+       options: [
+         { label: '系统', value: 0 },
+         { label: '新增', value: 1 },
+       ],
+     },
+     fieldName: 'createType',
+     label: '创建',
+   },
+   {
+     component: 'Input',
+     componentProps: {
+       placeholder: '请输入执行人',
+     },
+     fieldName: 'executorName',
+     label: '执行人',
+   },
+];
+
+
+export const columns: VxeGridProps['columns'] = [
+  {
+    type: 'checkbox',
+    width: 80,
   },
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'youGasstationstatus',
-    label: '竟对油站',
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 150,
   },
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'Status',
-    label: '状态',
+    field: 'taskName',
+    title: '任务名称',
+    minWidth: 150,
   },
   {
-    component: 'DatePicker',
-    componentProps: {
-      type: 'daterange',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
-      startPlaceholder: '开始日期',
-      endPlaceholder: '结束日期',
-    },
-    fieldName: 'Time',
-    label: '时间',
+    field: 'stationId',
+    title: '油站',
+    minWidth: 120,
   },
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'Commentstatus',
-    label: '评论',
+    field: 'executorName',
+    title: '执行人',
+    minWidth: 120,
   },
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-    },
-    fieldName: 'PositionStatus',
-    label: '职位',
+    field: 'position',
+    title: '岗位',
+    minWidth: 120,
   },
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    field: 'isComment',
+    title: '评论',
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '已评' : '未评';
     },
-    fieldName: 'CreateStatus',
-    label: '创建',
   },
   {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+    field: 'deadline',
+    title: '截止时间',
+    minWidth: 180,
+  },
+  {
+    field: 'processTime',
+    title: '处理时间',
+    minWidth: 180,
+  },
+  {
+    field: 'completionStatus',
+    title: '完成状态',
+    minWidth: 120,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '按时完成' : '逾期完成';
     },
-    fieldName: 'executorStatus',
-    label: '执行人',
   },
-];
-
-export const columns: VxeGridProps['columns'] = [
   {
-    field: 'action',
-    fixed: 'left',
-    slots: { default: 'action' },
-    resizable: false,
-    title: '操作',
-    width: 180,
+    field: 'createType',
+    title: '创建',
+    minWidth: 100,
+    align: 'center',
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '系统' : '新增';
+    },
   },
   {
-    title: '处理时间',
-    fixed: 'left',
-    field: 'ProcessingTime',
-    minWidth: 130,
+    field: 'surveyStartTime',
+    title: '调查开始时间',
+    minWidth: 180,
   },
   {
-    title: '我方油站',
-    fixed: 'left',
-    field: 'IGasstationstatus',
-    minWidth: 130,
+    field: 'surveyEndTime',
+    title: '调查结束时间',
+    minWidth: 180,
   },
   {
-    title: '竟对油站',
-    fixed: 'left',
-    field: 'youGasstationstatus',
-    minWidth: 130,
+    field: 'competitorName',
+    title: '竞争油站名称',
+    minWidth: 150,
   },
-
   {
     title: '汽油车',
-    field: 'Gasolinecar',
-    // minWidth: 130,
     children: [
       {
         title: '路面车流',
-        field: 'GasRoadtraffic',
+        field: 'gasRoadFlow',
         minWidth: 130,
+        align: 'center',
       },
       {
         title: '进站车流',
-        field: 'GasIncomingtraffic',
-        minWidth: 130,
-      },
-      {
-        title: '拐入率',
-        field: 'GasTurninrate',
+        field: 'gasInFlow',
         minWidth: 130,
+        align: 'center',
       },
     ],
   },
   {
     title: '柴油车',
-    field: 'dieselcar',
-    // minWidth: 130,
     children: [
       {
         title: '路面车流',
-        field: 'DieselRoadtraffic',
+        field: 'dieselRoadFlow',
         minWidth: 130,
+        align: 'center',
       },
       {
         title: '进站车流',
-        field: 'DieselIncomingtraffic',
-        minWidth: 130,
-      },
-      {
-        title: '拐入率',
-        field: 'DieselTurninrate',
+        field: 'dieselInFlow',
         minWidth: 130,
+        align: 'center',
       },
     ],
   },
   {
     title: '摩托车',
-    field: 'Motorcycle',
-    // minWidth: 130,
     children: [
       {
         title: '路面车流',
-        field: 'MotoRoadtraffic',
+        field: 'motorcycleRoadFlow',
         minWidth: 130,
+        align: 'center',
       },
       {
         title: '进站车流',
-        field: 'MotoIncomingtraffic',
-        minWidth: 130,
-      },
-      {
-        title: '拐入率',
-        field: 'MotoTurninrate',
+        field: 'motorcycleInFlow',
         minWidth: 130,
+        align: 'center',
       },
     ],
   },
 ];
-export const mockData = [
-  {
-    ProcessingTime: '2024-06-01 08:00:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '促销中',
-    GasRoadtraffic: 1200,
-    GasIncomingtraffic: 320,
-    GasTurninrate: '26.7%',
-    DieselRoadtraffic: 800,
-    DieselIncomingtraffic: 180,
-    DieselTurninrate: '22.5%',
-    MotoRoadtraffic: 450,
-    MotoIncomingtraffic: 90,
-    MotoTurninrate: '20.0%',
-  },
-  {
-    ProcessingTime: '2024-06-01 09:15:00',
-    IGasstationstatus: '库存预警',
-    youGasstationstatus: '正常营业',
-    GasRoadtraffic: 1350,
-    GasIncomingtraffic: 380,
-    GasTurninrate: '28.1%',
-    DieselRoadtraffic: 920,
-    DieselIncomingtraffic: 210,
-    DieselTurninrate: '22.8%',
-    MotoRoadtraffic: 510,
-    MotoIncomingtraffic: 105,
-    MotoTurninrate: '20.6%',
-  },
-  {
-    ProcessingTime: '2024-06-01 10:30:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '降价促销',
-    GasRoadtraffic: 1100,
-    GasIncomingtraffic: 310,
-    GasTurninrate: '28.2%',
-    DieselRoadtraffic: 750,
-    DieselIncomingtraffic: 170,
-    DieselTurninrate: '22.7%',
-    MotoRoadtraffic: 480,
-    MotoIncomingtraffic: 98,
-    MotoTurninrate: '20.4%',
-  },
-  {
-    ProcessingTime: '2024-06-01 11:45:00',
-    IGasstationstatus: '设备维护',
-    youGasstationstatus: '正常营业',
-    GasRoadtraffic: 1250,
-    GasIncomingtraffic: 340,
-    GasTurninrate: '27.2%',
-    DieselRoadtraffic: 880,
-    DieselIncomingtraffic: 200,
-    DieselTurninrate: '22.7%',
-    MotoRoadtraffic: 520,
-    MotoIncomingtraffic: 110,
-    MotoTurninrate: '21.2%',
-  },
-  {
-    ProcessingTime: '2024-06-01 13:00:00',
-    IGasstationstatus: '正常营业',
-    youGasstationstatus: '会员日',
-    GasRoadtraffic: 1400,
-    GasIncomingtraffic: 410,
-    GasTurninrate: '29.3%',
-    DieselRoadtraffic: 950,
-    DieselIncomingtraffic: 225,
-    DieselTurninrate: '23.7%',
-    MotoRoadtraffic: 560,
-    MotoIncomingtraffic: 120,
-    MotoTurninrate: '21.4%',
-  },
-];
+
+

apps/web-ele/src/views/Archive/operationsManagement/turningRateSurvey/index.vue

@@ -1,28 +1,58 @@
 <template>
   <Page :auto-content-height="true">
-    <BasicTable>
+    <BasicTable table-title="拐入率调查列表">
       <template #action="{ row }">
         <el-button
           size="small"
           type="primary"
           plain
-          @click="() => handleTaskClick(row.taskId)"
+          @click="() => handleTaskClick(row.id)"
           >查看</el-button
         >
       </template>
     </BasicTable>
   </Page>
 </template>
+
 <script setup lang="ts">
 import { ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
 import { columns, querySchema } from './config-data';
 import type { VbenFormProps } from '@vben/common-ui';
-import { mockData } from './config-data';
+import { getTurnInRateSurveyList } from '#/api/archive/operationsManagement/operationsManagement';
+
 const showSearchForm = ref(true) as any;
 const router = useRouter();
+const route = useRoute();
+
+// 表单字段到 API 字段的映射
+function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+    type: route.query.type || '',
+    directoryType: route.query.directoryType || '',
+  };
+  
+  // 处理调查开始时间
+  if (formValues.surveyStartTime) {
+    apiParams.processStartTime = formValues.surveyStartTime[0];
+    apiParams.processEndTime = formValues.surveyStartTime[1];
+  }
+  
+  // 其他字段
+  Object.keys(formValues).forEach(key => {
+    if (key !== 'surveyStartTime') {
+      apiParams[key] = formValues[key];
+    }
+  });
+  
+  return apiParams;
+}
+
+
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -32,14 +62,6 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 日期选择格式化
-  // fieldMappingTime: [
-  //   [
-  //     'createTime',
-  //     ['params[beginTime]', 'params[endTime]'],
-  //     ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //   ],
-  // ],
 };
 
 // 列表中显示配置
@@ -47,47 +69,54 @@ const gridOptions: VxeGridProps = {
   checkboxConfig: {
     // 高亮
     highlight: true,
-    // 翻页时保留选中状态s
+    // 翻页时保留选中状态
     reserve: true,
     // 点击行选中
     trigger: 'default',
-    checkMethod: ({ row }) => row?.roleId !== 1,
   },
   columns,
   size: 'medium',
   height: 'auto',
-  data: mockData,
-  // proxyConfig: {
-  //   ajax: {
-  //     query: async ({ page }, formValues = {}) => {
-  //       const resp = await getRoleList({
-  //         ...formValues,
-  //         pageNum: page.currentPage,
-  //         pageSize: page.pageSize,
-  //       });
-  //       return { items: resp.rows, total: resp.total };
-  //     },
-  //   },
-  // },
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        // 映射表单字段到 API 字段
+        const apiParams = mapFormToApi(formValues, page);
+        
+        // 调用API
+        const response = await getTurnInRateSurveyList(apiParams);
+        
+        // 映射 API 响应数据到页面显示字段
+        const items = response.rows;
+        
+        return {
+          items,
+          total: response.total,
+        };
+      },
+    },
+  },
   rowConfig: {
-    keyField: 'roleId',
+    keyField: 'id',
   },
   toolbarConfig: {
     custom: true,
     refresh: true,
     zoom: true,
   },
-  id: 'system-role-index',
+  id: 'turning-rate-survey-index',
 };
-const [BasicTable, BasicTableApi] = useVbenVxeGrid({
+const [BasicTable] = useVbenVxeGrid({
   showSearchForm,
   formOptions,
   gridOptions,
 });
 const handleTaskClick = (taskId: number) => {
-  router.push(`/schedule/detail/${taskId}`);
+  // 跳转到任务详情页面
+  router.push(`/schedule/detail?id=${taskId}&type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`);
 };
 </script>
+
 <style scoped lang="scss">
 :deep(.el-tooltip__trigger:focus) {
   outline: none;

apps/web-ele/src/views/Archive/visitorFeedback/collectAttach/collectAttach-data.tsx

@@ -1,6 +1,18 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
+import { selectAllSysAreaList, selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
+// 岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
+
+
 export const drawerFormSchema: FormSchemaGetter = () => [
   {
     component: 'Input',
@@ -22,74 +34,116 @@ export const drawerFormSchema: FormSchemaGetter = () => [
 
 export const queryFormSchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
-    fieldName: 'area',
+    component: 'ApiSelect',
+    fieldName: 'areaId',
     label: '片区',
     componentProps: {
       placeholder: '请选择片区',
-      options: [
-        { label: '片区1', value: 'area1' },
-        { label: '片区2', value: 'area2' },
-        { label: '片区3', value: 'area3' },
-      ],
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.areaName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
-    component: 'Select',
-    fieldName: 'station',
+    component: 'ApiSelect',
+    fieldName: 'stationId',
     label: '油站',
     componentProps: {
       placeholder: '请选择油站',
-      options: [
-        { label: '油站1', value: 'station1' },
-        { label: '油站2', value: 'station2' },
-        { label: '油站3', value: 'station3' },
-      ],
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.stationName,
+              value: item.id.toString(),
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
     component: 'Select',
-    fieldName: 'status',
+    fieldName: 'completionStatus',
     label: '完成状态',
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 'onTime' },
-        { label: '逾期完成', value: 'overdue' },
+        { label: '按时完成', value: 0 },
+        { label: '逾期完成', value: 1 },
       ],
     },
   },
   {
     component: 'DatePicker',
-    fieldName: 'handleTime',
+    fieldName: 'processStartTime',
     label: '处理时间',
     componentProps: {
-      placeholder: '请选择处理时间',
+      placeholder: '请选择处理开始日期',
       type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      style: {
+        width: '100%',
+      },
     },
   },
   {
-    component: 'Select',
+    component: 'DatePicker',
+    fieldName: 'processEndTime',
+    label: '处理时间',
+    componentProps: {
+      placeholder: '请选择处理结束日期',
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      style: {
+        width: '100%',
+      },
+    },
+  },
+  {
+    component: 'ApiSelect',
     fieldName: 'position',
     label: '岗位',
     componentProps: {
       placeholder: '请选择岗位',
-      options: [
-        { label: '站长', value: 'manager' },
-        { label: '营业员', value: 'clerk' },
-        { label: '安全员', value: 'safety' },
-      ],
+      clearable: true,
+      api: async () => {
+        const data = await getPostList();
+        return Array.isArray(data.rows)
+          ? data.rows.map((item: any) => ({
+              label: item.postName || item.name,
+              value: item.postId,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
     component: 'Select',
-    fieldName: 'comment',
+    fieldName: 'isComment',
     label: '评论',
     componentProps: {
       placeholder: '请选择评论状态',
       options: [
-        { label: '未评', value: 'uncommented' },
-        { label: '已评', value: 'commented' },
+        { label: '未评', value: 0 },
+        { label: '已评', value: 1 },
       ],
     },
   },
@@ -100,14 +154,14 @@ export const queryFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择创建方式',
       options: [
-        { label: '系统', value: 'system' },
-        { label: '新增', value: 'manual' },
+        { label: '系统', value: 0 },
+        { label: '新增', value: 1 },
       ],
     },
   },
   {
     component: 'Input',
-    fieldName: 'executor',
+    fieldName: 'executorName',
     label: '执行人',
     componentProps: {
       placeholder: '请输入执行人',
@@ -123,6 +177,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
   },
 ];
 
+
 export const tableColumns: VxeGridProps['columns'] = [
   {
     type: 'checkbox',
@@ -134,28 +189,17 @@ export const tableColumns: VxeGridProps['columns'] = [
     minWidth: 150,
   },
   {
-    field: 'station',
+    field: 'stationName',
     title: '油站',
     minWidth: 120,
   },
   {
-    field: 'attachments',
-    title: '附件',
+    field: 'attachmentName',
+    title: '附件名称',
     minWidth: 150,
-    formatter: (cellValue: string[]) => {
-      if (!cellValue || cellValue.length === 0) {
-        return '无附件';
-      }
-      return `共 ${cellValue.length} 个附件`;
-    },
-  },
-  {
-    field: 'remark',
-    title: '备注',
-    minWidth: 180,
   },
   {
-    field: 'executor',
+    field: 'executorName',
     title: '执行人',
     minWidth: 120,
   },
@@ -163,21 +207,14 @@ export const tableColumns: VxeGridProps['columns'] = [
     field: 'position',
     title: '岗位',
     minWidth: 120,
-    formatter: (cellValue: string) => {
-      return cellValue === 'manager'
-        ? '站长'
-        : (cellValue === 'clerk'
-          ? '营业员'
-          : '安全员');
-    },
   },
   {
-    field: 'comment',
+    field: 'isComment',
     title: '评论',
     minWidth: 100,
     align: 'center',
-    formatter: (cellValue: string) => {
-      return cellValue === 'commented' ? '已评' : '未评';
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '已评' : '未评';
     },
   },
   {
@@ -186,17 +223,17 @@ export const tableColumns: VxeGridProps['columns'] = [
     minWidth: 180,
   },
   {
-    field: 'handleTime',
+    field: 'processTime',
     title: '处理时间',
     minWidth: 180,
   },
   {
-    field: 'status',
+    field: 'completionStatus',
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: string) => {
-      return cellValue === 'onTime' ? '按时完成' : '逾期完成';
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '按时完成' : '逾期完成';
     },
   },
   {
@@ -204,8 +241,8 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '创建',
     minWidth: 100,
     align: 'center',
-    formatter: (cellValue: string) => {
-      return cellValue === 'system' ? '系统' : '新增';
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '系统' : '新增';
     },
   },
   {
@@ -216,3 +253,4 @@ export const tableColumns: VxeGridProps['columns'] = [
     width: 150,
   },
 ];
+

apps/web-ele/src/views/Archive/visitorFeedback/collectAttach/index.vue

@@ -12,6 +12,7 @@ import { ElMessage } from 'element-plus';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 
 import { queryFormSchema, tableColumns } from './collectAttach-data';
+import { getTaskAttachmentList } from '#/api/archive/operationsManagement/operationsManagement';
 
 const router = useRouter();
 const route = useRoute();
@@ -19,6 +20,17 @@ const route = useRoute();
 // 打印当前路由和路由参数
 console.log('当前路由路径,参数:', route.path, route.query);
 
+// 表单字段到 API 字段的映射
+function mapFormToApi(formValues: any, page: any) {
+  const apiParams = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize,
+    type: route.query.type || '',
+    directoryType: route.query.directoryType || '',
+    ...formValues,
+  };
+  return apiParams;
+}
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -31,83 +43,6 @@ const formOptions: VbenFormProps = {
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4',
 };
 
-// 模拟访客检查任务数据
-const mockData = {
-  rows: [
-    {
-      id: '1',
-      taskName: '访客检查任务1',
-      station: '油站1',
-      attachments: ['附件1.pdf', '附件2.docx'],
-      remark: '这是一个重要的访客检查任务',
-      executor: '张三',
-      position: 'manager',
-      comment: 'commented',
-      deadline: '2024-05-01',
-      handleTime: '2024-04-30',
-      status: 'onTime',
-      createType: 'system',
-    },
-    {
-      id: '2',
-      taskName: '访客检查任务2',
-      station: '油站2',
-      attachments: ['附件3.jpg'],
-      remark: '需要重点检查安全措施',
-      executor: '李四',
-      position: 'clerk',
-      comment: 'uncommented',
-      deadline: '2024-05-02',
-      handleTime: '2024-05-03',
-      status: 'overdue',
-      createType: 'manual',
-    },
-    {
-      id: '3',
-      taskName: '访客检查任务3',
-      station: '油站3',
-      attachments: [],
-      remark: '常规访客检查',
-      executor: '王五',
-      position: 'safety',
-      comment: 'commented',
-      deadline: '2024-05-03',
-      handleTime: '2024-05-03',
-      status: 'onTime',
-      createType: 'system',
-    },
-    {
-      id: '4',
-      taskName: '访客检查任务4',
-      station: '油站1',
-      attachments: ['附件4.pdf', '附件5.pdf', '附件6.pdf'],
-      remark: '需要拍照记录',
-      executor: '赵六',
-      position: 'manager',
-      comment: 'uncommented',
-      deadline: '2024-05-04',
-      handleTime: '2024-05-05',
-      status: 'overdue',
-      createType: 'manual',
-    },
-    {
-      id: '5',
-      taskName: '访客检查任务5',
-      station: '油站2',
-      attachments: ['附件7.docx'],
-      remark: '检查访客登记情况',
-      executor: '孙七',
-      position: 'clerk',
-      comment: 'commented',
-      deadline: '2024-05-05',
-      handleTime: '2024-05-05',
-      status: 'onTime',
-      createType: 'system',
-    },
-  ],
-  total: 5,
-};
-
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
     highlight: true,
@@ -120,81 +55,18 @@ const gridOptions: VxeGridProps = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues = {}) => {
-        // 模拟API请求 - collectAttach 页面应调用 /api/visitorFeedback/collectAttach/list 接口
-        console.log('查询参数:', formValues, page);
-        // 模拟过滤
-        let filteredRows = [...mockData.rows];
-
-        // 片区过滤
-        if (formValues.area) {
-          filteredRows = filteredRows.filter(
-            (row) => row.area === formValues.area,
-          );
-        }
-
-        // 油站过滤
-        if (formValues.station) {
-          filteredRows = filteredRows.filter(
-            (row) => row.station === formValues.station,
-          );
-        }
-
-        // 完成状态过滤
-        if (formValues.status) {
-          filteredRows = filteredRows.filter(
-            (row) => row.status === formValues.status,
-          );
-        }
-
-        // 处理时间过滤
-        if (formValues.handleTime) {
-          filteredRows = filteredRows.filter((row) =>
-            row.handleTime.includes(formValues.handleTime),
-          );
-        }
-
-        // 岗位过滤
-        if (formValues.position) {
-          filteredRows = filteredRows.filter(
-            (row) => row.position === formValues.position,
-          );
-        }
-
-        // 评论过滤
-        if (formValues.comment) {
-          filteredRows = filteredRows.filter(
-            (row) => row.comment === formValues.comment,
-          );
-        }
-
-        // 创建方式过滤
-        if (formValues.createType) {
-          filteredRows = filteredRows.filter(
-            (row) => row.createType === formValues.createType,
-          );
-        }
-
-        // 执行人过滤
-        if (formValues.executor) {
-          filteredRows = filteredRows.filter((row) =>
-            row.executor.includes(formValues.executor),
-          );
-        }
-
-        // 任务名称过滤
-        if (formValues.taskName) {
-          filteredRows = filteredRows.filter((row) =>
-            row.taskName.includes(formValues.taskName),
-          );
-        }
-
-        // 模拟分页
-        const start = (page.currentPage - 1) * page.pageSize;
-        const end = start + page.pageSize;
-        const paginatedRows = filteredRows.slice(start, end);
+        // 映射表单字段到 API 字段
+        const apiParams = mapFormToApi(formValues, page);
+        
+        // 调用API
+        const response = await getTaskAttachmentList(apiParams);
+        
+        // 映射 API 响应数据到页面显示字段
+        const items = response.rows;
+        
         return {
-          items: paginatedRows,
-          total: filteredRows.length,
+          items,
+          total: response.total,
         };
       },
     },
@@ -231,15 +103,9 @@ function batchDownloadAttachments() {
 // 查看任务详情
 function viewDetail(row: any) {
   // 跳转到任务详情页面
-  router.push(`/schedule/detail/${row.id}`);
+  router.push(`/schedule/detail/${row.id}?type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`);
 }
 
-// 打印任务
-function printTask(row: any) {
-  // 打印功能暂未实现
-  console.log('打印任务:', row.id);
-  ElMessage.info('打印功能开发中');
-}
 </script>
 
 <template>
@@ -249,11 +115,8 @@ function printTask(row: any) {
         <ElSpace>
           <ElButton
             type="primary"
-            :disabled="
-              !(basicTableApi?.grid?.getCheckboxRecords?.()?.length > 0)
-            "
-            @click="batchDownloadAttachments"
-          >
+            :disabled="!(basicTableApi?.grid?.getCheckboxRecords?.()?.length > 0)"
+            @click="batchDownloadAttachments">
             批量下载附件
           </ElButton>
         </ElSpace>
@@ -263,9 +126,6 @@ function printTask(row: any) {
           <ElButton size="small" type="primary" plain @click="viewDetail(row)">
             查看
           </ElButton>
-          <ElButton size="small" type="primary" plain @click="printTask(row)">
-            打印
-          </ElButton>
         </ElSpace>
       </template>
     </BasicTable>

apps/web-ele/src/views/Archive/visitorFeedback/photoTask/index.vue

@@ -7,12 +7,12 @@ import { useRouter ,useRoute} from 'vue-router';
 
 import { Page } from '@vben/common-ui';
 
-import { ElMessage } from 'element-plus';
-
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 
 import { queryFormSchema, tableColumns } from './photoTask-data';
 
+import { getTaskPhotoList } from '#/api/archive/operationsManagement/operationsManagement';
+
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -27,77 +27,6 @@ const formOptions: VbenFormProps = {
 const router = useRouter();
 const route = useRoute();
 
-// 打印当前路由和路由参数
-console.log('当前路由路径,参数:', route.path, route.query);
-
-
-// 模拟访客检查任务数据
-const mockData = {
-  rows: [
-    {
-      id: '1',
-      taskName: '访客检查任务1',
-      station: '油站1',
-      executor: '张三',
-      position: 'manager',
-      comment: 'commented',
-      deadline: '2024-01-15 18:00:00',
-      handleTime: '2024-01-15 17:30:00',
-      status: 'onTime',
-      createType: 'system',
-    },
-    {
-      id: '2',
-      taskName: '访客检查任务2',
-      station: '油站2',
-      executor: '李四',
-      position: 'clerk',
-      comment: 'uncommented',
-      deadline: '2024-01-16 18:00:00',
-      handleTime: '2024-01-17 09:00:00',
-      status: 'overdue',
-      createType: 'manual',
-    },
-    {
-      id: '3',
-      taskName: '访客检查任务3',
-      station: '油站3',
-      executor: '王五',
-      position: 'safety',
-      comment: 'commented',
-      deadline: '2024-01-17 18:00:00',
-      handleTime: '2024-01-17 16:45:00',
-      status: 'onTime',
-      createType: 'system',
-    },
-    {
-      id: '4',
-      taskName: '访客检查任务4',
-      station: '油站1',
-      executor: '赵六',
-      position: 'manager',
-      comment: 'uncommented',
-      deadline: '2024-01-18 18:00:00',
-      handleTime: '2024-01-18 15:30:00',
-      status: 'onTime',
-      createType: 'manual',
-    },
-    {
-      id: '5',
-      taskName: '访客检查任务5',
-      station: '油站2',
-      executor: '孙七',
-      position: 'clerk',
-      comment: 'commented',
-      deadline: '2024-01-19 18:00:00',
-      handleTime: '2024-01-20 10:20:00',
-      status: 'overdue',
-      createType: 'system',
-    },
-  ],
-  total: 5,
-};
-
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
     highlight: true,
@@ -110,81 +39,23 @@ const gridOptions: VxeGridProps = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues = {}) => {
-        // 模拟API请求
-        console.log('查询参数:', formValues, page);
-        // 模拟过滤
-        let filteredRows = [...mockData.rows];
-
-        // 片区过滤
-        if (formValues.area) {
-          filteredRows = filteredRows.filter(
-            (item) => item.area === formValues.area,
-          );
-        }
-
-        // 油站过滤
-        if (formValues.station) {
-          filteredRows = filteredRows.filter(
-            (item) => item.station === formValues.station,
-          );
-        }
-
-        // 完成状态过滤
-        if (formValues.status) {
-          filteredRows = filteredRows.filter(
-            (item) => item.status === formValues.status,
-          );
-        }
-
-        // 处理时间过滤
-        if (formValues.handleTime) {
-          filteredRows = filteredRows.filter((item) =>
-            item.handleTime.includes(formValues.handleTime),
-          );
-        }
-
-        // 岗位过滤
-        if (formValues.position) {
-          filteredRows = filteredRows.filter(
-            (item) => item.position === formValues.position,
-          );
-        }
-
-        // 评论过滤
-        if (formValues.comment) {
-          filteredRows = filteredRows.filter(
-            (item) => item.comment === formValues.comment,
-          );
-        }
-
-        // 创建方式过滤
-        if (formValues.createType) {
-          filteredRows = filteredRows.filter(
-            (item) => item.createType === formValues.createType,
-          );
-        }
-
-        // 执行人过滤
-        if (formValues.executor) {
-          filteredRows = filteredRows.filter((item) =>
-            item.executor.includes(formValues.executor),
-          );
-        }
-
-        // 任务名称过滤
-        if (formValues.taskName) {
-          filteredRows = filteredRows.filter((item) =>
-            item.taskName.includes(formValues.taskName),
-          );
-        }
-
-        // 模拟分页
-        const start = (page.currentPage - 1) * page.pageSize;
-        const end = start + page.pageSize;
-        const paginatedRows = filteredRows.slice(start, end);
+        // 字段映射：页面表单字段 -> API字段
+        const apiParams = {
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          directoryType: route.query.directoryType || '',
+          type: route.query.type || '',
+          ...formValues,
+        };      
+        // 调用API
+        const response = await getTaskPhotoList(apiParams);
+        
+        // 映射 API 响应数据到页面显示字段
+        const items = response.rows || [];
+        
         return {
-          items: paginatedRows,
-          total: filteredRows.length,
+          items,
+          total: response.total,
         };
       },
     },
@@ -208,14 +79,10 @@ const [BasicTable, basicTableApi] = useVbenVxeGrid({
 // 查看任务详情
 function viewDetail(row: any) {
   // 跳转到任务详情页面
-  router.push(`/schedule/detail/${row.id}`);
+  router.push(`/schedule/detail?id=${row.id}&type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}`);
 }
 
-// 打印任务
-function printTask(row: any) {
-  // 打印功能（暂未实现）
-  ElMessage.info('打印功能开发中');
-}
+
 </script>
 
 <template>
@@ -232,8 +99,4 @@ function printTask(row: any) {
   </Page>
 </template>
 
-<style scoped lang="scss">
-:deep(.el-tooltip__trigger:focus) {
-  outline: none;
-}
-</style>
+

apps/web-ele/src/views/Archive/visitorFeedback/photoTask/photoTask-data.tsx

@@ -1,95 +1,129 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
-export const drawerFormSchema: FormSchemaGetter = () => [
-  {
-    component: 'Input',
-    fieldName: 'title',
-    label: '标题',
-    componentProps: {
-      placeholder: '请输入标题',
-    },
-  },
-  {
-    component: 'Input',
-    fieldName: 'content',
-    label: '内容',
-    componentProps: {
-      placeholder: '请输入内容',
-    },
-  },
-];
+import { selectAllSysAreaList, selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
+// 假设岗位列表接口
+import { requestClient } from '#/api/request';
+
+// 获取岗位列表
+const getPostList = async () => {
+  const resp = await requestClient.get('/system/post/list');
+  return resp || [];
+};
 
 export const queryFormSchema: FormSchemaGetter = () => [
   {
-    component: 'Select',
-    fieldName: 'area',
+    component: 'ApiSelect',
+    fieldName: 'areaId',
     label: '片区',
     componentProps: {
       placeholder: '请选择片区',
-      options: [
-        { label: '片区1', value: 'area1' },
-        { label: '片区2', value: 'area2' },
-        { label: '片区3', value: 'area3' },
-      ],
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.areaName,
+              value: item.id,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
-    component: 'Select',
-    fieldName: 'station',
+    component: 'ApiSelect',
+    fieldName: 'stationId',
     label: '油站',
     componentProps: {
       placeholder: '请选择油站',
-      options: [
-        { label: '油站1', value: 'station1' },
-        { label: '油站2', value: 'station2' },
-        { label: '油站3', value: 'station3' },
-      ],
+      clearable: true,
+      api: async () => {
+        const resp = await selectAllSysStationAreaList();
+        const data = resp || [];
+        return Array.isArray(data)
+          ? data.map((item: any) => ({
+              label: item.stationName,
+              value: item.id.toString(),
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
     component: 'Select',
-    fieldName: 'status',
+    fieldName: 'completionStatus',
     label: '完成状态',
     componentProps: {
       placeholder: '请选择完成状态',
       options: [
-        { label: '按时完成', value: 'onTime' },
-        { label: '逾期完成', value: 'overdue' },
+        { label: '按时完成', value: 0 },
+        { label: '逾期完成', value: 1 },
       ],
     },
   },
   {
     component: 'DatePicker',
-    fieldName: 'handleTime',
+    fieldName: 'processStartTime',
     label: '处理时间',
     componentProps: {
-      placeholder: '请选择处理时间',
+      placeholder: '请选择处理开始日期',
       type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      style: {
+        width: '100%'
+      }
     },
   },
   {
-    component: 'Select',
+    component: 'DatePicker',
+    fieldName: 'processEndTime',
+    label: '处理时间',
+    componentProps: {
+      placeholder: '请选择处理结束日期',
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      style: {
+        width: '100%'
+      }
+    },
+  },
+  {
+    component: 'ApiSelect',
     fieldName: 'position',
     label: '岗位',
     componentProps: {
       placeholder: '请选择岗位',
-      options: [
-        { label: '站长', value: 'manager' },
-        { label: '营业员', value: 'clerk' },
-        { label: '安全员', value: 'safety' },
-      ],
+      clearable: true,
+      api: async () => {
+        const data = await getPostList();
+        return Array.isArray(data.rows)
+          ? data.rows.map((item: any) => ({
+              label: item.postName || item.name,
+              value: item.postId,
+            }))
+          : [];
+      },
+      labelField: 'label',
+      valueField: 'value',
     },
   },
   {
     component: 'Select',
-    fieldName: 'comment',
+    fieldName: 'isComment',
     label: '评论',
     componentProps: {
       placeholder: '请选择评论状态',
       options: [
-        { label: '未评', value: 'uncommented' },
-        { label: '已评', value: 'commented' },
+        { label: '未评', value: 0 },
+        { label: '已评', value: 1 },
       ],
     },
   },
@@ -100,14 +134,14 @@ export const queryFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择创建方式',
       options: [
-        { label: '系统', value: 'system' },
-        { label: '新增', value: 'manual' },
+        { label: '系统', value: 0 },
+        { label: '新增', value: 1 },
       ],
     },
   },
   {
     component: 'Input',
-    fieldName: 'executor',
+    fieldName: 'executorName',
     label: '执行人',
     componentProps: {
       placeholder: '请输入执行人',
@@ -134,12 +168,12 @@ export const tableColumns: VxeGridProps['columns'] = [
     minWidth: 150,
   },
   {
-    field: 'station',
+    field: 'stationName',
     title: '油站',
     minWidth: 120,
   },
   {
-    field: 'executor',
+    field: 'executorName',
     title: '执行人',
     minWidth: 120,
   },
@@ -147,21 +181,14 @@ export const tableColumns: VxeGridProps['columns'] = [
     field: 'position',
     title: '岗位',
     minWidth: 120,
-    formatter: (cellValue: string) => {
-      return cellValue === 'manager'
-        ? '站长'
-        : (cellValue === 'clerk'
-          ? '营业员'
-          : '安全员');
-    },
   },
   {
-    field: 'comment',
+    field: 'isComment',
     title: '评论',
     minWidth: 100,
     align: 'center',
-    formatter: (cellValue: string) => {
-      return cellValue === 'commented' ? '已评' : '未评';
+    formatter: (cellValue: number) => {
+      return cellValue === 1 ? '已评' : '未评';
     },
   },
   {
@@ -170,17 +197,17 @@ export const tableColumns: VxeGridProps['columns'] = [
     minWidth: 180,
   },
   {
-    field: 'handleTime',
+    field: 'processTime',
     title: '处理时间',
     minWidth: 180,
   },
   {
-    field: 'status',
+    field: 'completionStatus',
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: string) => {
-      return cellValue === 'onTime' ? '按时完成' : '逾期完成';
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '逾期完成' : '按时完成';
     },
   },
   {
@@ -188,8 +215,8 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '创建',
     minWidth: 100,
     align: 'center',
-    formatter: (cellValue: string) => {
-      return cellValue === 'system' ? '系统' : '新增';
+    formatter: (cellValue: number) => {
+      return cellValue === 0 ? '系统' : '新增';
     },
   },
   {

apps/web-ele/src/views/Archive/visitorFeedback/visitorCheckTask/index.vue

@@ -22,6 +22,8 @@ function mapFormToApi(formValues: any, page: any) {
     pageNum: page.currentPage,
     pageSize: page.pageSize,
     type: route.query.type || '',
+    directoryType: route.query.directoryType || '',
+    isAbnormal: route.query.isAbnormal || '',
     ...formValues,
   };
   return apiParams;
@@ -83,8 +85,8 @@ const [BasicTable] = useVbenVxeGrid({
 });
 
 // 查看任务详情
-function handleView(row: any) {
-  router.push(`/schedule/detail/${row.id}`);
+function handleView(row: any) {  
+  router.push(`/schedule/detail?id=${row.id}&type=${route.query.type || ''}&directoryType=${route.query.directoryType || ''}&isAbnormal=${route.query.isAbnormal || ''}`);
 }
 </script>
 

apps/web-ele/src/views/Archive/visitorFeedback/visitorCheckTask/visitorCheckTask-data.tsx

@@ -4,7 +4,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import { selectAllSysAreaList,selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
 
 
-// 假设岗位列表接口
+// 岗位列表接口
 import { requestClient } from '#/api/request';
 
 // 获取岗位列表
@@ -221,7 +221,7 @@ export const tableColumns: VxeGridProps['columns'] = [
     minWidth: 120,
     align: 'center',
     formatter: (cellValue: number) => {
-      return cellValue === 0 ? '按时完成' : '逾期完成';
+      return cellValue === 0 ? '逾期完成' : '按时完成';
     },
   },
   {