package.json

@@ -120,6 +120,7 @@
     "dayjs": "1.11.10",
     "echarts": "^6.0.0",
     "js-cookie": "^3.0.5",
+    "lodash-es": "^4.17.23",
     "pinia": "2.0.36",
     "pinia-plugin-persistedstate": "3.2.1",
     "uni-echarts": "^2.4.1",

pnpm-lock.yaml

@@ -81,6 +81,9 @@ importers:
       js-cookie:
         specifier: ^3.0.5
         version: 3.0.5
+      lodash-es:
+        specifier: ^4.17.23
+        version: 4.17.23
       pinia:
         specifier: 2.0.36
         version: 2.0.36(typescript@5.8.3)(vue@3.4.21(typescript@5.8.3))
@@ -4657,6 +4660,9 @@ packages:
     resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  lodash-es@4.17.23:
+    resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==}
+
   lodash.camelcase@4.3.0:
     resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
 
@@ -12453,6 +12459,8 @@ snapshots:
     dependencies:
       p-locate: 6.0.0
 
+  lodash-es@4.17.23: {}
+
   lodash.camelcase@4.3.0: {}
 
   lodash.debounce@4.0.8: {}

src/api/schedule/check.ts

@@ -0,0 +1,26 @@
+import { http as requestClient } from '@/http/http'
+
+enum Api {
+  base = '/taskCheckItem/item',
+  childBase = '/taskCheckSubItem/item',
+  handle = '/taskCheck/check/handle',
+}
+// 查询任务检查项列表
+export function getChecktItemsByTaskId(params: any) {
+  return requestClient.get(`${Api.base}/list`, params)
+}
+
+// 查询任务检查子项列表
+export function getCheckSubItemsByTaskId(params: any) {
+  return requestClient.get(`${Api.childBase}/list`, params)
+}
+
+// 提交任务检查子项日志
+export function submitCheckLogs(checkId: number, params: any) {
+  return requestClient.put(`${Api.childBase}/handle/${checkId}`, params)
+}
+
+// 处理任务检查项
+export function handleCheckTask(checkId: number) {
+  return requestClient.put(`${Api.handle}/${checkId}`)
+}

src/api/schedule/issue.ts

@@ -0,0 +1,9 @@
+import { http as requestClient } from '@/http/http'
+
+enum Api {
+  base = '/formOperationIssue/issue',
+}
+
+export function submitIssue(params: any) {
+  return requestClient.post(`${Api.base}`, params)
+}

src/api/schedule/task.ts

@@ -2,20 +2,41 @@ import { http } from '@/http/http'
 
 enum Api {
   base = '/scheduleTasks/tasks',
+  confirmBase = '/scheduleTasks/tasks/confirm',
+  uploadBase = '/taskAttachment/attachment',
+  photoBase = '/taskPhoto/photo',
 }
 
 export function transferTask(data: any) {
-  return http.put(`${Api.base}/forward`, data, {
-    successMessageMode: 'message',
-  })
+  return http.put(`${Api.base}/forward`, data)
 }
 // 关闭任务
 export function closeTask(data: any) {
-  return http.put(`${Api.base}/cancel`, data, {
-    successMessageMode: 'message',
-  })
+  return http.put(`${Api.base}/cancel`, data)
 }
 
 export function getTaskDetail(id: number) {
   return http.get(`${Api.base}/${id}`)
 }
+
+/**
+ * 确认完成任务
+ * @param id 任务id
+ * @returns
+ */
+export function confirmDoneTask(id: number) {
+  return http.put(`${Api.confirmBase}/${id}`)
+}
+
+/**
+ * 处理任务附件
+ * @param params
+ * @returns
+ */
+export function dealUploadTask(params: any) {
+  return http.put(`${Api.uploadBase}/handle`, params)
+}
+
+export function dealPhotoTask(params: any) {
+  return http.put(`${Api.photoBase}/handle`, params)
+}

src/api/system/tags.ts

@@ -0,0 +1,14 @@
+import { http as requestClient } from '@/http/http'
+
+enum Api {
+  base = '/inspectionTag/tag',
+}
+
+/**
+ * 获取标签列表
+ * @param params
+ * @returns
+ */
+export function getTags(params: any) {
+  return requestClient.get(`${Api.base}/list`, params)
+}

src/api/system/users.ts

@@ -0,0 +1,15 @@
+import { http as requestClient } from '@/http/http'
+
+enum Api {
+  all = '/system/user/allList',
+  station = '/system/user/stationList',
+}
+
+/**
+ * 获取所有用户列表
+ * @param params
+ * @returns
+ */
+export function getAllUsers(params: any) {
+  return requestClient.get(`${Api.station}`, params)
+}

src/components/AttachmentList.vue

@@ -0,0 +1,212 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+
+// 组件属性定义
+interface Props {
+  files: string[] // 文件URL数组
+  fileNames?: string[] // 文件名数组，可选
+  size?: number // 卡片大小（默认50）
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  fileNames: () => [],
+  size: 50,
+})
+
+// 图片文件扩展名
+const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp']
+
+/**
+ * 获取文件名
+ * @param url 文件URL
+ * @param index 文件索引
+ * @returns 文件名
+ */
+function getFileName(url: string, index: number): string {
+  if (props.fileNames && props.fileNames[index]) {
+    return props.fileNames[index]
+  }
+  // 从URL中提取文件名
+  const parts = url.split('/')
+  return parts[parts.length - 1] || `file${index + 1}`
+}
+
+/**
+ * 判断是否为图片文件
+ * @param fileName 文件名
+ * @returns 是否为图片
+ */
+function isImage(fileName: string): boolean {
+  const extension = fileName.split('.').pop()?.toLowerCase()
+  return extension ? imageExtensions.includes(extension) : false
+}
+
+/**
+ * 获取文件扩展名
+ * @param fileName 文件名
+ * @returns 文件扩展名（大写）
+ */
+function getFileExtension(fileName: string): string {
+  const extension = fileName.split('.').pop()?.toUpperCase()
+  return extension || 'FILE'
+}
+
+/**
+ * 处理文件下载
+ * @param url 文件URL
+ * @param fileName 文件名
+ */
+function handleFileDownload(url: string, fileName: string) {
+  // #ifdef H5
+  // H5平台使用a标签下载
+  const link = document.createElement('a')
+  link.href = url
+  link.download = fileName
+  link.target = '_blank'
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+  // #endif
+
+  // #ifndef H5
+  // 非H5平台使用uni.downloadFile
+  uni.downloadFile({
+    url,
+    success: (res) => {
+      if (res.statusCode === 200) {
+        uni.saveFile({
+          tempFilePath: res.tempFilePath,
+          success: (saveRes) => {
+            uni.showToast({
+              title: '下载成功',
+              icon: 'success',
+            })
+          },
+          fail: (err) => {
+            console.error('保存文件失败:', err)
+            uni.showToast({
+              title: '保存文件失败',
+              icon: 'error',
+            })
+          },
+        })
+      }
+    },
+    fail: (err) => {
+      console.error('下载文件失败:', err)
+      uni.showToast({
+        title: '下载文件失败',
+        icon: 'error',
+      })
+    },
+  })
+  // #endif
+}
+</script>
+
+<template>
+  <view class="attachment-list">
+    <view
+      v-for="(file, index) in files"
+      :key="index"
+      class="attachment-item"
+      :style="{ width: `${size * 4}rpx`, height: `${size * 4}rpx` }"
+    >
+      <!-- 图片文件 -->
+      <view v-if="isImage(getFileName(file, index))" class="image-container">
+        <wd-img
+          :width="size * 4"
+          :height="size * 4"
+          :src="file"
+          :enable-preview="true"
+        />
+      </view>
+
+      <!-- 其他文件 -->
+      <view
+        v-else
+        class="file-container"
+        @tap="handleFileDownload(file, getFileName(file, index))"
+      >
+        <view class="file-icon">
+          <wd-icon name="document" size="64rpx" />
+        </view>
+        <view class="file-extension">
+          {{ getFileExtension(getFileName(file, index)) }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.attachment-list {
+  width: 100%;
+  display: flex;
+  overflow-x: auto;
+  padding: 10rpx 0;
+  scrollbar-width: thin;
+  scrollbar-color: #c1c1c1 #f5f5f5;
+
+  &::-webkit-scrollbar {
+    height: 6rpx;
+  }
+
+  &::-webkit-scrollbar-track {
+    background: #f5f5f5;
+    border-radius: 3rpx;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #c1c1c1;
+    border-radius: 3rpx;
+  }
+
+  &::-webkit-scrollbar-thumb:hover {
+    background: #a8a8a8;
+  }
+}
+
+.attachment-item {
+  margin-right: 20rpx;
+  border-radius: 12rpx;
+  overflow: hidden;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+  transition: transform 0.3s, box-shadow 0.3s;
+  flex-shrink: 0;
+  
+  &:hover {
+    transform: translateY(-4rpx);
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);
+  }
+}
+
+.image-container {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.file-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f7fa;
+  cursor: pointer;
+}
+
+.file-icon {
+  margin-bottom: 16rpx;
+  color: #215acd;
+}
+
+.file-extension {
+  font-size: 24rpx;
+  font-weight: 500;
+  color: #31373d;
+  text-transform: uppercase;
+}
+</style>

src/hooks/useUpload.ts

@@ -1,7 +1,7 @@
 import { ref } from 'vue'
 import { getEnvBaseUrl } from '@/utils/index'
 
-const VITE_UPLOAD_BASEURL = `${getEnvBaseUrl()}/upload`
+const VITE_UPLOAD_BASEURL = `${getEnvBaseUrl()}/common/upload`
 
 type TfileType = 'image' | 'file'
 type TImage = 'png' | 'jpg' | 'jpeg' | 'webp' | '*'
@@ -16,6 +16,18 @@ interface TOptions<T extends TfileType> {
   error?: (err: any) => void
 }
 
+// 定义上传方法类型，与 wotui 的 UploadMethod 兼容
+export interface UploadMethodOptions {
+  header?: Record<string, string>
+  name?: string
+  fileName?: string
+  fileType?: string
+  statusCode?: number
+  onSuccess: (response: any, file: any, formData: any) => void
+  onError: (error: any, file: any, formData: any) => void
+  onProgress: (progress: any, file: any) => void
+}
+
 export default function useUpload<T extends TfileType>(options: TOptions<T> = {} as TOptions<T>) {
   const {
     formData = {},
@@ -130,7 +142,59 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
     }
   }
 
-  return { loading, error, data, run }
+  /**
+   * 自定义上传函数，用于 wotui 的 upload 组件
+   * @param file 上传的文件对象
+   * @param formData 表单数据
+   * @param options 上传选项
+   * @returns 上传任务对象
+   */
+  const customUpload = (file: any, formData: any, options: UploadMethodOptions) => {
+    const uploadTask = uni.uploadFile({
+      url: VITE_UPLOAD_BASEURL,
+      header: options.header,
+      name: options.name || 'file',
+      fileName: options.fileName || 'file',
+      fileType: options.fileType,
+      formData,
+      filePath: file.url,
+      success(res) {
+        if (res.statusCode === (options.statusCode || 200)) {
+          // 尝试解析响应数据
+          let parsedData: any = res.data
+          try {
+            const jsonData = JSON.parse(res.data)
+            parsedData = jsonData.data || jsonData
+            file.url = parsedData.url || ''
+            file.name = parsedData.fileName || parsedData.name || ''
+          }
+          catch (e) {
+            console.log('Response is not JSON, using raw data:', res.data)
+          }
+
+          // 设置上传成功
+          options.onSuccess(parsedData, file, formData)
+        }
+        else {
+          // 设置上传失败
+          options.onError({ ...res, errMsg: res.errMsg || '' }, file, formData)
+        }
+      },
+      fail(err) {
+        // 设置上传失败
+        options.onError(err, file, formData)
+      },
+    })
+
+    // 设置当前文件加载的百分比
+    uploadTask.onProgressUpdate((res) => {
+      options.onProgress(res, file)
+    })
+
+    return uploadTask
+  }
+
+  return { loading, error, data, run, customUpload }
 }
 
 async function uploadFile({

src/pages/schedule/details/taskmanagement/index2.vue

@@ -9,7 +9,7 @@
             style="margin-left: 10rpx; transform: translateY(6rpx)"
             name="arrow-down"
             size="20px"
-          ></wd-icon>
+          />
         </text>
       </view>
       <view>
@@ -22,32 +22,33 @@
     </view>
     <scroll-view class="task-container" scroll-y>
       <view class="content-main">
-        <view style="font-size: 36rpx; font-weight: 500; margin-bottom: 50rpx"
-          >油品：0#</view
-        >
+        <view style="font-size: 36rpx; font-weight: 500; margin-bottom: 50rpx">
+          油品：0#
+        </view>
         <wd-form ref="form" :model="model">
           <view style="display: flex; flex-direction: column; gap: 90rpx">
             <view>
               <view
                 style="font-size: 32rpx; font-weight: 500; margin-bottom: 30rpx"
-                >液位仪数据</view
               >
+                液位仪数据
+              </view>
               <wd-input
+                v-model="model.value1"
                 label="油高 h1(mm)"
                 label-width="100%"
                 prop="value1"
                 clearable
-                v-model="model.value1"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写发现问题' }]"
                 custom-class="custom-vertical-input"
               />
               <wd-input
+                v-model="model.value2"
                 label="水高(mm)"
                 label-width="100%"
                 prop="value2"
                 clearable
-                v-model="model.value2"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写处理措施' }]"
                 custom-class="custom-vertical-input"
@@ -56,34 +57,35 @@
             <view>
               <view
                 style="font-size: 32rpx; font-weight: 500; margin-bottom: 30rpx"
-                >手工量缸数据</view
               >
+                手工量缸数据
+              </view>
               <wd-input
+                v-model="model.value1"
                 label="油高 h1(mm)"
                 label-width="100%"
                 prop="value1"
                 clearable
-                v-model="model.value1"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写发现问题' }]"
                 custom-class="custom-vertical-input"
               />
               <wd-input
+                v-model="model.value2"
                 label="水高(mm)"
                 label-width="100%"
                 prop="value2"
                 clearable
-                v-model="model.value2"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写处理措施' }]"
                 custom-class="custom-vertical-input"
               />
               <wd-input
+                v-model="model.value2"
                 label="水高高度差(mm)(h1-h2)"
                 label-width="100%"
                 prop="value2"
                 clearable
-                v-model="model.value2"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写处理措施' }]"
                 custom-class="custom-vertical-input"
@@ -92,11 +94,12 @@
             <view>
               <view
                 style="font-size: 32rpx; font-weight: 500; margin-bottom: 30rpx"
-                >异常记录</view
               >
+                异常记录
+              </view>
               <wd-textarea
-                prop="value1"
                 v-model="model.value1"
+                prop="value1"
                 placeholder="请填写异常记录"
                 :rules="[{ required: true, message: '请填写异常记录' }]"
                 :auto-height="false"
@@ -110,19 +113,23 @@
     </scroll-view>
     <!-- 确定按钮 -->
     <view class="confirm-btn">
-      <button class="btn" @click="submitTasks">确 定</button>
+      <button class="btn" @click="submitTasks">
+        确 定
+      </button>
     </view>
     <calendar
-      v-model:datePickerVisible="datePickerVisible"
-      @confirmDate="onconfirmDate"
+      v-model:date-picker-visible="datePickerVisible"
       :detailedtime="true"
+      @confirm-date="onconfirmDate"
     />
   </view>
 </template>
+
 <script lang="ts" setup>
-import { ref, reactive, onMounted } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
 import calendar from '@/utils/calendar.vue'
+
 const tab = ref('1缸')
 const tabs = ['1缸', '2缸', '3缸', '4缸']
 const { success: showSuccess } = useToast()
@@ -140,10 +147,10 @@ function formatDateTime() {
 
   currentDateTime.value = `${year}-${month}-${day} ${hours}:${minutes}`
 }
-const handleClickCalendar = () => {
+function handleClickCalendar() {
   datePickerVisible.value = true
 }
-const onconfirmDate = (date: string) => {
+function onconfirmDate(date: string) {
   currentDateTime.value = date
 }
 onMounted(() => {
@@ -172,6 +179,7 @@ function submitTasks() {
     })
 }
 </script>
+
 <style lang="scss" scoped>
 .task-management {
   display: flex;

src/pages/schedule/details/deal/inspection.vue

@@ -0,0 +1,818 @@
+<script lang="ts" setup>
+import { cloneDeep, isArray } from 'lodash-es'
+import { onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+import { getCheckSubItemsByTaskId, getChecktItemsByTaskId, handleCheckTask, submitCheckLogs } from '@/api/schedule/check'
+import { getTaskDetail } from '@/api/schedule/task'
+import useUpload from '@/hooks/useUpload'
+import anomalyPop from '../popup/anomaly.vue'
+
+const route = useRoute()
+const taskId = ref(Number(route.query.id))
+const checkId = ref(Number(route.query.checkId))
+const anomalyPopRef = ref<any>(null)
+const popShow = ref({
+  centerShow: false,
+  anomalyShow: false,
+})
+// const popShow = ref({})
+const taskInfo: any = ref({})
+const checkSubItems: any = ref([])
+
+const currentCheckList: any = ref([])
+const activeArea: any = ref(0)
+
+// 定义任务类型
+interface Task {
+  id: string
+  type: string
+  description: string
+  icon?: string
+  instructions: string
+  examples: string[]
+  images: string[]
+  status: 'normal' | 'abnormal'
+  isimages: boolean
+  details?: {
+    name: string
+    status: 'normal' | 'abnormal'
+  }[]
+}
+
+// 选择图片
+function chooseImage(index: number) {
+  // 为每个上传请求创建独立的upload实例，确保能正确处理对应的任务索引
+  const { run: uploadImage } = useUpload({
+    fileType: 'image',
+    success: (res) => {
+      console.log('上传成功', res)
+      const imageUrl = res.url || ''
+      if (imageUrl) {
+        console.log('currentCheckList.value[index]', currentCheckList.value[index], imageUrl)
+        if (!currentCheckList.value[index]?.photoUrl) {
+          currentCheckList.value[index].photoUrl = []
+        }
+        nextTick(() => {
+          currentCheckList.value[index].photoUrl.push({
+            url: imageUrl,
+            name: res.fileName,
+          })
+        })
+      }
+    },
+    error: (err) => {
+      console.error('上传失败', err)
+    },
+  })
+  uploadImage()
+}
+const selectTask = ref<any>({})
+const anomalyData = ref<any>({})
+// 切换任务状态
+async function toggleTaskStatus(task: any) {
+  selectTask.value = task
+  // 初始化异常数据
+  console.log('task.formOperationIssue', task.formOperationIssue)
+  anomalyData.value = task.formOperationIssue || {}
+  popShow.value.anomalyShow = true
+  await nextTick()
+  let problemPhoto = cloneDeep(anomalyData.value.problemPhoto)
+  if (problemPhoto && !isArray(problemPhoto)) {
+    problemPhoto = problemPhoto.split(',').map((url: string, index: number) => ({
+      name: url.trim(),
+      url: anomalyData.value.problemPhotoUrl[index],
+    }))
+  }
+  const data = {
+    ...anomalyData.value,
+    problemPhoto,
+  }
+  console.log('data123', data)
+  anomalyPopRef.value?.updateModelData(data)
+}
+
+// 处理异常信息提交
+function handleAnomalySubmitted({ checkItemId, data }: { checkItemId: number, data: any }) {
+  // 在 currentCheckList 中找到对应的任务
+  const taskIndex = currentCheckList.value.findIndex((item: any) => item.id === checkItemId)
+  console.log('taskIndex', taskIndex)
+  if (taskIndex !== -1) {
+    // 在任务对象中添加标记，表明异常信息已填写
+    // currentCheckList.value[taskIndex].hasAnomalyInfo = true
+    // 保存提交的异常数据
+    currentCheckList.value[taskIndex].formOperationIssue = data
+  }
+
+  popShow.value.anomalyShow = false
+}
+
+// 处理 dealResult 变化
+function handleDealResultChange(task: any) {
+  // 当用户选择异常时，自动弹出异常信息填写抽屉
+  if (task.result === 2) {
+    anomalyData.value = task.formOperationIssue || {}
+    toggleTaskStatus(task)
+  }
+}
+
+// 切换分数选择
+function toggleScore(taskIndex: number, score: number | null) {
+  const task = currentCheckList.value[taskIndex]
+  task.score = score
+  // 当分数小于 5 时，设置任务状态为异常
+  if (score !== null && score < 5) {
+    task.status = 'abnormal'
+  }
+  else {
+    task.status = 'normal'
+  }
+}
+
+const lastIndex = ref(0)
+
+async function saveCheckLog({ index }: { index: number }) {
+  try {
+    // 获取当前数据
+    const logs = []
+    const items = checkSubItems.value[index]?.items || []
+    currentCheckList.value.forEach((item: any, index: number) => {
+      let result = 1
+      if (item.dealHasScore) {
+        result = (item.dealScore || 0) === item.limitScore ? 1 : 2
+      }
+      else {
+        result = item.result || 1
+      }
+      const logInfo = {
+        inputItem: item.inputItem || '', // 输入内容
+        itemId: item.id || '', // 检查项ID
+        photo: item.photoUrl?.map((photo: any) => photo.name).join(',') || '', // 照片
+        result, // 检查结果1正常2异常3不适用
+        score: item.dealHasScore ? item.dealScore || 0 : 0, // 分数
+      }
+
+      // 做一些判断，比如必填项
+      if (item.hasPhoto === 2 && !item.photoUrl?.length) {
+        throw new Error('请上传照片')
+      }
+
+      if (item.hasInput === 1 && !item.inputItem) {
+        throw new Error('请输入内容')
+      }
+
+      if (logInfo.result === 2) {
+      // 判断是否输入异常项
+      // if (!item.dealScore) {
+      //   uni.showToast({
+      //     title: '请输入分数',
+      //     icon: 'none',
+      //   })
+      //   return
+      // }
+      }
+
+      logs.push(logInfo)
+    })
+
+    const res: any = await submitCheckLogs(checkId.value, logs)
+    console.log('提交检查子项日志', res)
+    if (res.code === 200) {
+      // uni.showToast({
+      //   title: '提交成功',
+      //   icon: 'success',
+      // })
+      lastIndex.value = index
+      currentCheckList.value = checkSubItems.value[index]?.items || []
+    }
+    else {
+      uni.showToast({
+        title: '提交失败',
+        icon: 'none',
+      })
+    }
+  }
+  catch (error) {
+    uni.showToast({
+      title: error.message || '提交失败',
+      icon: 'none',
+    })
+    console.log('lastIndex.value', lastIndex.value)
+    nextTick(() => {
+      activeArea.value = lastIndex.value
+    })
+  }
+}
+
+// 提交任务
+function submitTasks() {
+  saveCheckLog({ index: activeArea.value }).then(() => {
+    // 提交任务
+    handleCheckTask(checkId.value).then(() => {
+      uni.showToast({
+        title: '提交成功',
+        icon: 'success',
+      })
+    }).catch(() => {
+      uni.showToast({
+        title: '提交失败',
+        icon: 'none',
+      })
+    })
+  })
+}
+
+function init() {
+  // 并发获取数据
+  Promise.all([
+    getTaskDetail(taskId.value),
+    getChecktItemsByTaskId({
+      checkId: checkId.value,
+      pageSize: 100,
+    }),
+    getCheckSubItemsByTaskId({
+      checkId: checkId.value,
+      pageSize: 100,
+    }),
+  ]).then(([taskDetailRes, checkItemsRes, checkSubItemsRes]: any) => {
+    if (taskDetailRes.data) {
+      taskInfo.value = taskDetailRes.data
+    }
+    // 处理检查项数据
+    checkSubItems.value = checkSubItemsRes?.rows || []
+    checkSubItems.value.forEach((item: any) => {
+      item.items
+        = checkItemsRes?.rows?.filter(
+          (subItem: any) => subItem.subItemId === item.id,
+        ) || []
+      // 为每个任务添加 score 字段
+      item.items.forEach((task: any) => {
+        task.score = task.score || null
+        task.photoUrl = (task.photoUrl || []).map((url: string, index: number) => ({
+          url,
+          name: task.photo.split(',')[index],
+        }))
+      })
+    })
+    // 更新检查项数据
+    console.log('checkSubItems', checkSubItems.value)
+    activeArea.value = 0
+    currentCheckList.value = checkSubItems.value[0]?.items || []
+  })
+}
+
+onMounted(async () => {
+  await init()
+})
+</script>
+
+<template>
+  <view class="task-management">
+    <view class="fixed-area">
+      <view class="title">
+        <text class="title-text">
+          {{ taskInfo.stationName || '' }}
+        </text>
+      </view>
+      <view>
+        <wd-tabs v-model="activeArea" @click="saveCheckLog">
+          <block v-for="(item, index) in checkSubItems" :key="index">
+            <wd-tab :title="`${item.name}`" :name="index" />
+          </block>
+        </wd-tabs>
+      </view>
+    </view>
+
+    <scroll-view class="task-container" scroll-y>
+      <view class="tasks">
+        <view
+          v-for="(task, index) in currentCheckList"
+          :key="index"
+          class="task-item"
+        >
+          <!-- 任务描述 -->
+          <view class="task-description">
+            <text class="task-number">{{ +index + 1 }}.</text>
+            <text class="task-text">
+              {{ task.itemName }}
+              <wd-icon
+                v-if="task?.icon"
+                :name="task?.icon"
+                size="32rpx"
+                @click="() => (popShow.centerShow = true)"
+              />
+            </text>
+          </view>
+
+          <view v-if="task.hasInput > 0" class="input-container" style="margin-right: 1rem;">
+            <wd-textarea v-model="task.inputItem" :placeholder="task.inputContent || '请输入内容'" :maxlength="100" show-word-limit />
+          </view>
+
+          <!-- 操作说明 -->
+          <view v-if="task.hasPhoto > 0" class="task-instructions">
+            <text v-if="task.photoPrompt" class="instructions-text">
+              {{ `拍照：${task.photoPrompt}` || '' }}
+            </text>
+            <text v-if="task.hasPhoto === 2 && !task.photoPrompt" class="instructions-text">
+              <span style="color: red;">*</span>必拍
+            </text>
+          </view>
+
+          <!-- 示例图片 -->
+          <view v-if="task.hasPhoto > 0" class="example-images">
+            <view
+              v-for="(img, idx) in task.exampleImageUrl"
+              :key="idx"
+              class="example-image"
+            >
+              <image :src="img" mode="aspectFill" />
+              <text class="example-text">示例</text>
+            </view>
+          </view>
+
+          <!-- 图片上传区域 -->
+          <view v-if="task.hasPhoto > 0 || (task?.images?.length > 0)" class="image-upload-container">
+            <!-- 上传按钮 -->
+            <view
+              v-if="task.hasPhoto > 0"
+              class="upload-btn"
+              @tap="chooseImage(+index)"
+            >
+              <view class="btn-content">
+                <text class="btn-icon">+</text>
+                <text class="btn-text">拍照</text>
+              </view>
+            </view>
+
+            <!-- 已上传图片 -->
+            <view v-if="task?.photoUrl?.length > 0" class="uploaded-images">
+              <view
+                v-for="(image, idx) in task.photoUrl"
+                :key="idx"
+                class="uploaded-image"
+              >
+                <image :src="image.url" mode="aspectFill" />
+              </view>
+            </view>
+          </view>
+          <view v-if="task.checkResult === 1" style="margin-left: 1rem;">
+            <wd-radio-group v-model="task.result" shape="dot" inline @change="handleDealResultChange(task)">
+              <wd-radio :value="1">
+                正常
+              </wd-radio>
+              <wd-radio :value="2">
+                异常
+              </wd-radio>
+              <wd-radio :value="3">
+                不适用
+              </wd-radio>
+            </wd-radio-group>
+            <view v-if="task.result === 2" style="margin-top: 8rpx;">
+              <text class="link-text" @tap="toggleTaskStatus(task)">{{ task.formOperationIssue ? '点击查看异常' : '点击填写异常' }}</text>
+            </view>
+          </view>
+
+          <!-- 打分组件 -->
+          <view v-if="[2, 3].includes(task.checkResult)" class="score-container">
+            <view class="score-row">
+              <view class="score-label">
+                打分
+              </view>
+              <wd-checkbox v-model="task.dealHasScore">
+                不适用
+              </wd-checkbox>
+              <wd-input-number v-model="task.dealScore" :min="0" :max="task.limitScore" :disabled="task.dealHasScore" />
+              <view class="score-tip">
+                满分为{{ task.limitScore }}分
+              </view>
+            </view>
+            <view v-if="task.dealScore !== null && task.dealScore < task.limitScore && !task.dealHasScore" class="abnormal-link">
+              <text class="link-text" @tap="toggleTaskStatus(task)">{{ task.formOperationIssue ? '点击查看异常' : '点击填写异常（未满分必填）' }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <wd-popup
+      v-model="popShow.anomalyShow"
+      custom-style="border-radius: 32rpx 32rpx 0 0; height: 80%;z-index: 100;"
+      position="bottom"
+      :safe-area-inset-bottom="true"
+      closable
+    >
+      <anomalyPop v-if="popShow.anomalyShow" ref="anomalyPopRef" :task-id="taskId" :station-id="taskInfo.stationId" :check-item-id="selectTask.id" :anomaly-data="anomalyData.value" @anomaly-submitted="handleAnomalySubmitted" />
+    </wd-popup>
+    <!-- 确定按钮 -->
+    <view class="confirm-btn">
+      <button class="btn" @click="submitTasks">
+        提交
+      </button>
+      <button class="btn" @click="saveCheckLog({ index: activeArea.value })">
+        保存
+      </button>
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.task-management {
+  display: flex;
+  flex-direction: column;
+  height: 1500rpx;
+  overflow: hidden;
+
+  // 全局链接文本样式
+  .link-text {
+    font-size: 24rpx;
+    color: red;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+
+  .fixed-area {
+    flex-shrink: 0; // 不让它被压缩
+    background-color: #fff;
+    position: sticky; // 若想随外层滚就 sticky；想完全固定用 fixed 即可
+    top: 0;
+    z-index: 10;
+  }
+  .title {
+    width: 100%;
+    height: 128rpx;
+    background-color: #4a80c3;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    padding-left: 46rpx;
+  }
+
+  .title-text {
+    font-size: 36rpx;
+    font-weight: 500;
+    color: #fff;
+  }
+
+  // // 任务容器
+  // .task-container {
+  //   flex: 1;
+  //   padding: 0 30rpx;
+
+  //   .tasks {
+  //     padding: 20rpx 0;
+  //   }
+  // }
+  .task-container {
+    flex: 1; // 占剩余高度
+    overflow-y: auto; // 仅这里滚动
+    padding: 0 30rpx 120rpx; // 为底部固定按钮留出空间
+  }
+  // 任务项
+  .task-item {
+    margin-bottom: 40rpx;
+
+    // 任务描述
+    .task-description {
+      display: flex;
+      margin-bottom: 16rpx;
+
+      .task-number {
+        font-size: 28rpx;
+        color: #333;
+        margin-right: 8rpx;
+        font-weight: 500;
+      }
+
+      .task-text {
+        font-size: 28rpx;
+        font-weight: 400;
+        color: #333;
+        line-height: 44rpx;
+      }
+    }
+
+    // 操作说明
+    .task-instructions {
+      margin-bottom: 20rpx;
+      margin-left: 1rem;
+
+      .instructions-text {
+        font-size: 24rpx;
+        color: #666;
+        line-height: 36rpx;
+      }
+    }
+
+    // 示例图片
+    .example-images {
+      display: flex;
+      gap: 16rpx;
+      margin-bottom: 20rpx;
+      margin-left: 1rem;
+
+      .example-image {
+        width: 140rpx;
+        height: 100rpx;
+        position: relative;
+
+        image {
+          width: 100%;
+          height: 100%;
+          border-radius: 8rpx;
+        }
+
+        .example-text {
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          right: 0;
+          background-color: rgba(0, 0, 0, 0.5);
+          color: white;
+          font-size: 20rpx;
+          text-align: center;
+          padding: 4rpx 0;
+          border-radius: 0 0 8rpx 8rpx;
+        }
+      }
+    }
+
+    // 已上传图片
+    .uploaded-images {
+      display: flex;
+      gap: 16rpx;
+      margin-bottom: 20rpx;
+
+      .uploaded-image {
+        width: 140rpx;
+        height: 100rpx;
+
+        image {
+          width: 100%;
+          height: 100%;
+          border-radius: 8rpx;
+        }
+      }
+    }
+
+    // 图片上传区域容器
+    .image-upload-container {
+      display: flex;
+      gap: 16rpx;
+      margin-bottom: 24rpx;
+      margin-left: 1rem;
+      overflow-x: auto;
+      padding-bottom: 8rpx;
+      white-space: nowrap;
+      -webkit-overflow-scrolling: touch;
+
+      &::-webkit-scrollbar {
+        height: 4rpx;
+      }
+
+      &::-webkit-scrollbar-track {
+        background: #f1f1f1;
+        border-radius: 2rpx;
+      }
+
+      &::-webkit-scrollbar-thumb {
+        background: #ccc;
+        border-radius: 2rpx;
+      }
+    }
+
+    // 上传按钮
+    .upload-btn {
+      width: 140rpx;
+      height: 100rpx;
+      border: 2rpx dashed #ccc;
+      border-radius: 8rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+
+      .btn-content {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .btn-icon {
+          font-size: 40rpx;
+          color: #999;
+          line-height: 40rpx;
+        }
+
+        .btn-text {
+          font-size: 24rpx;
+          color: #999;
+          margin-top: 4rpx;
+        }
+      }
+    }
+
+    // 已上传图片
+    .uploaded-images {
+      display: flex;
+      gap: 16rpx;
+      flex-shrink: 0;
+
+      .uploaded-image {
+        width: 140rpx;
+        height: 100rpx;
+        flex-shrink: 0;
+
+        image {
+          width: 100%;
+          height: 100%;
+          border-radius: 8rpx;
+        }
+      }
+    }
+
+    // 状态选择
+    .status-select {
+      margin-bottom: 20rpx;
+
+      .radio-group {
+        display: flex;
+        gap: 40rpx;
+      }
+    }
+
+    // 带详情的状态选择
+    .detail-status {
+      margin-bottom: 20rpx;
+
+      .detail-name {
+        font-size: 28rpx;
+        color: #333;
+        margin-right: 20rpx;
+        // margin-bottom: 10rpx;
+      }
+
+      .radio-group {
+        display: flex;
+        gap: 40rpx;
+      }
+
+      .detail-items {
+        margin-top: 16rpx;
+        display: flex;
+        flex-wrap: wrap;
+        gap: 40rpx;
+      }
+    }
+
+    // 单选按钮
+    .radio-group {
+      .radio-item {
+        // margin-top: 50rpx;
+        display: flex;
+        align-items: center;
+        gap: 8rpx;
+
+        .radio {
+          width: 32rpx;
+          height: 32rpx;
+          border: 2rpx solid #ccc;
+          border-radius: 50%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          &.selected {
+            border-color: #215acd;
+            // background-color: #4a80c3;
+
+            &::after {
+              content: '';
+              width: 16rpx;
+              height: 16rpx;
+              border-radius: 50%;
+              background-color: #215acd;
+            }
+          }
+        }
+
+        .radio-text {
+          font-size: 28rpx;
+          color: #333;
+        }
+      }
+    }
+
+    // 打分组件
+    .score-select {
+      margin-bottom: 20rpx;
+
+      .score-label {
+        font-size: 28rpx;
+        color: #333;
+        margin-bottom: 12rpx;
+      }
+
+      .score-container {
+        display: flex;
+        align-items: center;
+        gap: 40rpx;
+        margin-bottom: 16rpx;
+      }
+
+      .score-buttons {
+        display: flex;
+        gap: 20rpx;
+      }
+
+      .score-button {
+        width: 60rpx;
+        height: 60rpx;
+        border: 2rpx solid #ccc;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 28rpx;
+        color: #333;
+        background-color: #fff;
+        transition: all 0.2s ease;
+
+        &.selected {
+          border-color: #215acd;
+          background-color: #215acd;
+          color: #fff;
+        }
+      }
+
+      .abnormal-link {
+        margin-top: 12rpx;
+      }
+
+      .link-text {
+        font-size: 24rpx;
+        color: red;
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
+    // 新打分组件样式
+    .score-container {
+      margin-bottom: 20rpx;
+      margin-left: 1rem;
+      .score-row {
+        display: flex;
+        align-items: center;
+        gap: 20rpx;
+        margin-bottom: 12rpx;
+      }
+
+      .score-label {
+        font-size: 28rpx;
+        color: #333;
+        white-space: nowrap;
+      }
+
+      .score-tip {
+        font-size: 24rpx;
+        color: #666;
+        margin-bottom: 12rpx;
+      }
+
+      .abnormal-link {
+        margin-top: 8rpx;
+      }
+
+      .link-text {
+        font-size: 24rpx;
+        color: red;
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+  }
+
+  // 确定按钮
+  .confirm-btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 20rpx 30rpx;
+    background-color: white;
+    border-top: 1rpx solid #eee;
+    display: flex;
+    gap: 20rpx;
+    z-index: 90;
+
+    .btn {
+      flex: 1;
+      height: 80rpx;
+      background-color: #215acd;
+      color: white;
+      font-size: 32rpx;
+      border-radius: 12rpx;
+      font-weight: 400;
+      border: none;
+      outline: none;
+    }
+  }
+}
+</style>

src/pages/schedule/details/deal/photo.vue

@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import { useToast } from 'wot-design-uni'
+import { dealPhotoTask } from '@/api/schedule/task'
+import useUpload from '@/hooks/useUpload'
+
+const toast = useToast()
+
+definePage({
+  style: {
+    navigationBarTitleText: '拍照任务',
+  },
+})
+
+// 任务和检查项ID
+const taskId = ref('')
+const checkId = ref('')
+
+// 表单数据
+const formData = ref({
+  attachments: '',
+  remark: '',
+})
+
+// 上传图片列表
+const fileList = ref<any[]>([])
+
+// 上传状态
+const loading = ref(false)
+
+// 上传问题照片
+const uploadProblemPhoto: any = (file, formData, options) => {
+  const { customUpload } = useUpload({
+    fileType: 'image',
+  })
+  return customUpload(file, formData, options)
+}
+
+// 删除问题照片
+function deleteProblemPhoto(index: number) {
+  fileList.value.splice(index, 1)
+
+  // 更新附件字段
+  const fileNames = fileList.value.map((item: any) => item.name).filter(Boolean)
+  formData.value.attachments = fileNames.join(',')
+}
+
+// 提交表单
+async function submitForm() {
+  // 检查是否有图片上传
+  if (fileList.value.length === 0) {
+    toast.info('请上传图片')
+    return
+  }
+
+  // 构建请求参数
+  const params = {
+    id: taskId.value,
+    attachment: fileList.value.map((item: any) => item.name).join(','),
+    result: formData.value.remark,
+  }
+
+  // 开始提交，显示 loading
+  loading.value = true
+
+  // 调用处理任务附件接口
+  try {
+    const res: any = await dealPhotoTask(params)
+    if (res.code === 200) {
+      toast.success('提交成功')
+      // 跳转回上一页
+      setTimeout(() => {
+        uni.navigateBack()
+      }, 1500)
+    }
+    else {
+      toast.error(res.msg || '提交失败，请重试')
+      return
+    }
+  }
+  catch (error) {
+    toast.error('提交失败，请重试')
+    return
+  }
+  finally {
+    // 提交完成，隐藏 loading
+    loading.value = false
+  }
+}
+
+// 页面加载时获取参数
+onMounted(() => {
+  // 获取页面参数
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  // 使用类型断言获取options
+  const options = (currentPage as any).options || {}
+  taskId.value = options.id || ''
+  checkId.value = options.checkId || ''
+})
+</script>
+
+<template>
+  <view class="page min-h-screen bg-gray-100 p-4">
+    <view class="rounded-lg bg-white p-4 shadow-sm">
+      <!-- 上传图片 -->
+      <view class="mb-6">
+        <view class="mb-4 flex items-center justify-between">
+          <text class="font-medium">上传图片</text>
+        </view>
+        <view>
+          <wd-upload
+            v-model:file-list="fileList"
+            image-mode="aspectFill"
+            :upload-method="uploadProblemPhoto"
+            @delete="deleteProblemPhoto"
+          />
+        </view>
+      </view>
+
+      <!-- 备注 -->
+      <view class="mb-6">
+        <text class="mb-2 block font-medium">处理结果</text>
+        <wd-textarea v-model="formData.remark" placeholder="请填写处理结果" auto-height :maxlength="120" clearable show-word-limit />
+      </view>
+
+      <!-- 提交按钮 -->
+      <view class="mt-8 flex justify-center">
+        <wd-button
+          type="primary"
+          size="large"
+          :loading="loading"
+          @click="submitForm"
+        >
+          提交
+        </wd-button>
+      </view>
+    </view>
+    <wd-toast />
+  </view>
+</template>
+
+<style lang="scss" scoped>
+// 保持与upload.vue一致的样式
+</style>

src/pages/schedule/details/deal/upload.vue

@@ -0,0 +1,170 @@
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import { useToast } from 'wot-design-uni'
+import { dealUploadTask } from '@/api/schedule/task'
+import useUpload from '@/hooks/useUpload'
+
+const toast = useToast()
+
+const taskId = ref('')
+const checkId = ref('')
+
+// 表单数据
+const formData = ref({
+  attachments: '',
+  remark: '',
+})
+
+// 上传文件列表
+const uploadFiles = ref<any[]>([])
+
+// 初始化useUpload
+const { run: uploadRun, loading: uploadLoading } = useUpload({
+  fileType: 'file',
+  success: (data) => {
+    console.log('上传成功:', data)
+
+    // 构建文件对象
+    const fileObj = {
+      url: data.url || '',
+      originalFilename: data.originalFilename || data.name || '',
+      name: data.fileName || data.name || '',
+    }
+
+    // 添加到上传文件列表
+    uploadFiles.value.push(fileObj)
+
+    // 更新附件字段
+    const fileNames = uploadFiles.value.map((f) => {
+      try {
+        const response = JSON.parse(f.response)
+        return response.data.fileName
+      }
+      catch (error) {
+        console.error('解析文件响应失败:', error)
+        return ''
+      }
+    }).filter(Boolean)
+
+    formData.value.attachments = fileNames.join(',')
+    console.log('文件名称:', formData.value.attachments)
+  },
+  error: (err) => {
+    console.error('上传失败:', err)
+    toast.error('上传失败，请重试')
+  },
+})
+
+// 处理删除文件
+function handleRemoveFile(file: any) {
+  const index = uploadFiles.value.findIndex(f => f.url === file.url)
+  if (index !== -1) {
+    uploadFiles.value.splice(index, 1)
+
+    // 更新附件字段
+    const fileNames = uploadFiles.value.map((f) => {
+      try {
+        const response = JSON.parse(f.response)
+        return response.data.fileName
+      }
+      catch (error) {
+        console.error('解析文件响应失败:', error)
+        return ''
+      }
+    }).filter(Boolean)
+
+    formData.value.attachments = fileNames.join(',')
+  }
+}
+
+// 提交表单
+async function submitForm() {
+  // 这里可以添加表单验证逻辑
+
+  // 检查是否有文件上传
+  if (uploadFiles.value.length === 0) {
+    toast.info('请上传附件')
+    return
+  }
+
+  // 构建请求参数
+  const params = {
+    taskId: Number(taskId.value),
+    checkId: Number(checkId.value),
+    ...formData.value,
+    id: taskId.value,
+    attachment: uploadFiles.value.map(f => f.name).join(','),
+    attachmentName: uploadFiles.value.map(f => f.originalFilename).join(','),
+    remark: formData.value.remark,
+  }
+
+  // 调用处理任务附件接口
+  try {
+    const res: any = await dealUploadTask(params)
+    if (res.code === 200) {
+      toast.success('提交成功')
+      // 跳转回上一页
+      setTimeout(() => {
+        uni.navigateBack()
+      }, 1500)
+    }
+    else {
+      toast.error(res.msg || '提交失败，请重试')
+      return
+    }
+  }
+  catch (error) {
+    toast.error('提交失败，请重试')
+    return
+  }
+}
+
+// 页面加载时获取参数
+onMounted(() => {
+  // 获取页面参数
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  // 使用类型断言获取options
+  const options = (currentPage as any).options || {}
+  taskId.value = options.id || ''
+  checkId.value = options.checkId || ''
+})
+</script>
+
+<template>
+  <view class="page min-h-screen bg-gray-100 p-4">
+    <view class="rounded-lg bg-white p-4 shadow-sm">
+      <!-- 上传附件 -->
+      <view class="mb-6">
+        <view class="flex items-center justify-between">
+          <text class="font-medium">上传附件</text>
+          <wd-button type="text" @click="uploadRun">
+            点击上传附件
+          </wd-button>
+        </view>
+        <view v-for="(file, index) in uploadFiles" :key="index" class="mt-2 flex items-center justify-between">
+          <wd-icon name="close-circle" class="mr-2 text-red-500" @click="handleRemoveFile(file)" />
+          <wd-text :text="file.originalFilename" class="flex-1" />
+        </view>
+      </view>
+
+      <!-- 备注 -->
+      <view class="mb-6">
+        <text class="mb-2 block font-medium">备注</text>
+        <wd-textarea v-model="formData.remark" placeholder="请填写备注" auto-height :maxlength="120" clearable show-word-limit />
+      </view>
+
+      <!-- 提交按钮 -->
+      <view class="mt-8 flex justify-center">
+        <wd-button
+          type="primary"
+          size="large"
+          @click="submitForm"
+        >
+          提交
+        </wd-button>
+      </view>
+      <wd-toast />
+    </view>
+  </view>
+</template>

src/pages/schedule/details/taskdetails/index.vue

@@ -1,32 +1,148 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+
+import { useRoute } from 'vue-router'
+import { getCheckSubItemsByTaskId, getChecktItemsByTaskId } from '@/api/schedule/check'
+import { getTaskDetail } from '@/api/schedule/task'
+
+const route = useRoute()
+const taskId = ref(Number(route.query.id))
+const checkId = ref(Number(route.query.checkId))
+const taskInfo = ref<any>({})
+const checkSubItems = ref<any[]>([])
+const activeArea = ref(0)
+const popupShow = ref({
+  centerShow: false,
+  bottomShow: false,
+})
+
+const currentCheckItem = ref<any>({})
+
+const statics = ref({
+  score: 0,
+  totalScore: 0,
+  totalItems: 0,
+  photoCount: 0,
+})
+
+function init() {
+  // 并发获取数据
+  Promise.all([
+    getTaskDetail(taskId.value),
+    getChecktItemsByTaskId({
+      checkId: checkId.value,
+      pageSize: 100,
+    }),
+    getCheckSubItemsByTaskId({
+      checkId: checkId.value,
+      pageSize: 100,
+    }),
+  ]).then(([taskDetailRes, checkItemsRes, checkSubItemsRes]: any) => {
+    if (taskDetailRes.data) {
+      taskInfo.value = taskDetailRes.data
+    }
+    // 处理检查项数据
+    checkSubItems.value = checkSubItemsRes?.rows || []
+    checkSubItems.value.forEach((item: any) => {
+      item.statics = {
+        score: 0,
+        totalScore: 0,
+        totalItems: 0,
+        photoCount: 0,
+      }
+      item.items
+        = checkItemsRes?.rows?.filter(
+          (subItem: any) => subItem.subItemId === item.id,
+        ) || []
+      // 为每个任务添加 score 字段
+      item.items.forEach((task: any) => {
+        if (task.checkResult === 2) {
+          item.statics.score += task.score || 0
+          item.statics.totalScore += (task.limitScore || 0).length
+        }
+        if (task?.result === 2) {
+          item.statics.totalItems += 1
+        }
+        if (task?.hasPhoto > 0 && (!task?.photoUrl || task?.photoUrl?.length === 0)) {
+          item.statics.photoCount += 1
+        }
+        task.score = task.score || null
+        task.photoUrl = (task.photoUrl || []).map((url: string, index: number) => ({
+          url,
+          name: task.photo.split(',')[index],
+        }))
+      })
+      // 计算总得分
+      statics.value.score += item.statics.score
+      statics.value.totalScore += item.statics.totalScore
+      statics.value.totalItems += item.statics.totalItems
+      statics.value.photoCount += item.statics.photoCount
+    })
+    // 更新检查项数据
+    activeArea.value = 0
+    currentCheckItem.value = checkSubItems.value[0] || {}
+  })
+}
+const toastHtml = ref('')
+function helpClick(task: any) {
+  toastHtml.value = task.checkDescription
+  popupShow.value.centerShow = true
+}
+
+function helpClose() {
+  toastHtml.value = ''
+  popupShow.value.centerShow = false
+}
+
+async function changeTab({ index }: { index: number }) {
+  currentCheckItem.value = checkSubItems.value[index] || {}
+}
+
+onMounted(async () => {
+  await init()
+})
+</script>
+
 <template>
   <view class="task-management">
     <view class="fixed-area">
       <view class="head-Card">
-        <view class="head-Card-title">未来路加油站</view>
+        <view class="head-Card-title">
+          {{ taskInfo.stationName || '' }}
+        </view>
         <view class="head-Card-tab">
           <view class="head-Card-tab-item">
-            <view class="tab-item-num">0</view>
-            <view class="tab-item-text">无拍照</view>
+            <view class="tab-item-num">
+              {{ statics.photoCount || 0 }}
+            </view>
+            <view class="tab-item-text">
+              无拍照
+            </view>
           </view>
           <view class="head-Card-tab-item">
             <view class="tab-item-Middle">
-              <view class="tab-item-num">0</view>
-              <view class="tab-item-text">异常总数</view>
+              <view class="tab-item-num">
+                {{ statics.totalItems || 0 }}
+              </view>
+              <view class="tab-item-text">
+                异常总数
+              </view>
             </view>
           </view>
           <view class="head-Card-tab-item">
-            <view class="tab-item-num"
-              >0 /
-              <text style="font-size: 24rpx; font-weight: 500">10</text>
+            <view class="tab-item-num">
+              {{ statics.score || 0 }} / {{ statics.totalScore || 0 }}
+            </view>
+            <view class="tab-item-text">
+              总得分
             </view>
-            <view class="tab-item-text">总得分</view>
           </view>
         </view>
       </view>
       <view>
-        <wd-tabs v-model="tab">
-          <block v-for="item in tabs" :key="item">
-            <wd-tab :title="`${item}`" :name="item" />
+        <wd-tabs v-model="activeArea" @click="changeTab">
+          <block v-for="(item, index) in checkSubItems" :key="index">
+            <wd-tab :title="`${item.name}`" :name="index" />
           </block>
         </wd-tabs>
       </view>
@@ -34,207 +150,117 @@
 
     <scroll-view class="task-container" scroll-y>
       <view class="task-top-left">
-        <text
-          >异常数<text style="color: #31373d; font-weight: 600"> 0</text></text
-        >
-        <text style="color: #31373d; font-weight: 600">|</text>
-        <text
-          >得分<text style="color: #31373d; font-weight: 600"> 0/0</text></text
-        >
+        <text>
+          异常数 <text style="color: #31373d; font-weight: 600">
+            {{ currentCheckItem?.statics?.totalItems || 0 }}
+          </text>
+        </text>
+        <text style="color: #31373d; font-weight: 600"> | </text>
+        <text>
+          得分 <text style="color: #31373d; font-weight: 600">
+            {{ currentCheckItem?.statics?.score || 0 }} / {{ currentCheckItem?.statics?.totalScore || 0 }}
+          </text>
+        </text>
       </view>
       <view class="tasks">
         <view
-          v-for="(task, index) in currentTasks"
+          v-for="(task, index) in currentCheckItem?.items || []"
           :key="index"
           class="task-item"
         >
           <!-- 任务描述 -->
           <view class="task-description">
-            <text class="task-number">{{ index + 1 }}.</text>
-            <text class="task-text"
-              >{{ task.description }}
-              <wd-icon
-                v-if="task?.questionicon"
-                :name="task?.questionicon"
-                size="32rpx"
-                @click="() => (popupshow.centershow = true)"
-              ></wd-icon>
+            <text class="task-number">{{ +index + 1 }}.</text>
+            <text class="task-text">
+              {{ task.tagName ? `【${task.tagName.replace(/,/g, '|')}】` : '' }}
+              {{ task.itemName }}
+              <wd-icon v-if="task?.checkDescription" name="help-circle" size="16px" @click="helpClick(task)" />
             </text>
           </view>
           <!-- 操作说明-图片示例 -->
           <view
+            v-if="task.exampleImageUrl.length > 0"
             class="task-instructions-example"
-            v-if="task.instructions && task.examples.length > 0"
           >
-            <view class="task-instructions">
-              <text class="instructions-text">{{ task.instructions }}</text>
+            <view v-if="task.photoPrompt" class="task-instructions">
+              <text class="instructions-text">{{ `拍照：${task.photoPrompt}` }}</text>
             </view>
             <view class="example-images">
               <view
-                v-for="(example, idx) in task.examples"
+                v-for="(example, idx) in task.exampleImageUrl"
                 :key="idx"
                 class="example-image"
               >
-                <image :src="example" mode="aspectFill"></image>
+                <image :src="example" mode="aspectFill" />
                 <text class="example-text">示例</text>
               </view>
             </view>
           </view>
           <!-- 已上传图片 -->
-          <view v-if="task.images.length > 0" class="uploaded-images">
+          <view v-if="task?.photoUrl?.length > 0" class="uploaded-images">
             <view
-              v-for="(image, idx) in task.images"
+              v-for="(image, idx) in task.photoUrl"
               :key="idx"
               class="uploaded-image"
             >
-              <image :src="image" mode="aspectFill"></image>
+              <!-- <image :src="image" mode="aspectFill" /> -->
+              <wd-img style="width: 100%; height: 100%" :src="image.url" :enable-preview="true" />
             </view>
           </view>
           <!-- 几号枪 -->
-          <view class="jihaoqiang" v-if="task.jihaoqiang">
-            <text class="jihaoqiang-text">{{ task.jihaoqiang }}</text>
+          <view v-if="task?.inputItem" class="whichGun">
+            <text class="whichGun-text">{{ task.inputItem }}</text>
           </view>
           <!-- 状态 -->
           <view class="task-status">
             <view>
-              <text class="status-text"
-                >整体：{{ task.status === 'normal' ? '正常' : '异常' }}</text
-              >
+              <text class="status-text">
+                整体：{{ task.result === 1 ? '正常' : task.result === 2 ? '异常' : '不适用' }}
+              </text>
             </view>
           </view>
-          <view class="exceptiondescription" v-if="task.exceptiondescription">
-            <view class="exceptiondescription-title">异常描述：</view>
-            <view class="exceptiondescription-content">
-              {{ task.exceptiondescription }}
+          <view v-if="task?.formOperationIssue?.id" class="anomalyDescription">
+            <view class="anomalyDescription-title">
+              异常描述：
+            </view>
+            <view class="anomalyDescription-content">
+              {{ task.formOperationIssue?.problemDescription || '' }}
             </view>
           </view>
         </view>
       </view>
     </scroll-view>
-    <centerpopup v-model:centershow="popupshow.centershow" />
-    <bottompopup v-model:bottomshow="popupshow.bottomshow" />
-    <!-- 确定按钮 -->
+
+    <wd-popup
+      v-model="popupShow.centerShow"
+      custom-style="border-radius:32rpx;"
+      @close="helpClose"
+    >
+      <view class="popup-content">
+        <view style="font-size: 36rpx; font-weight: 500; color: #020917">
+          说明
+        </view>
+        <view style="font-size: 32rpx; font-weight: 400; color: #343a45" v-html="toastHtml" />
+        <view style="width: 100%">
+          <button class="btn" @click="helpClose">
+            我 知 道 了
+          </button>
+        </view>
+      </view>
+    </wd-popup>
     <view class="confirm-btn">
-      <button class="btn" @click="submitTasks">评 论</button>
+      <button class="btn" @click="submitTasks">
+        评 论
+      </button>
     </view>
   </view>
 </template>
-<script lang="ts" setup>
-import { ref, computed } from 'vue'
-import useUpload from '@/hooks/useUpload'
-import centerpopup from '../popup/centerpopup.vue'
-import bottompopup from '../popup/bottompopup.vue'
-const popupshow = ref({
-  centershow: false,
-  bottomshow: false,
-})
-// const popupshow = ref({})
-const tab = ref('前庭')
-const tabs = ['前庭', '自助服务区', '罐区', '便利店']
-
-// 定义任务类型
-interface Task {
-  id: string
-  type: string
-  description: string
-  icon?: string
-  instructions: string
-  examples: string[]
-  images: string[]
-  jihaoqiang: string
-  status: 'normal' | 'abnormal'
-  questionicon: string
-  exceptiondescription: string
-}
-
-// 任务数据
-const tasks = ref<Task[]>([
-  {
-    id: '1',
-    type: '前庭',
-    description:
-      '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-    instructions: '拍照：按照示例图拍摄前庭内海报宣传物，可上传多张照片',
-    examples: [
-      'https://picsum.photos/id/1018/200/150',
-      'https://picsum.photos/id/1019/200/150',
-    ],
-    images: [
-      'https://picsum.photos/id/1028/200/150',
-      'https://picsum.photos/id/1022/200/150',
-      'https://picsum.photos/id/1023/200/150',
-      'https://picsum.photos/id/1026/200/150',
-      'https://picsum.photos/id/1025/200/150',
-      'https://picsum.photos/id/1029/200/150',
-      'https://picsum.photos/id/1025/200/150',
-    ],
-    questionicon: 'help-circle',
-    jihaoqiang: '',
-    status: 'normal',
-    exceptiondescription: '',
-  },
-  {
-    id: '2',
-    type: '前庭',
-    description: '[卫生] 抽油枪栓是否出现空转或存在明显渗油。',
-    icon: 'help-circle',
-    instructions: '',
-    examples: [],
-    images: [],
-    questionicon: 'help-circle',
-    jihaoqiang: '12号枪',
-
-    status: 'normal',
-    exceptiondescription: '',
-  },
-  {
-    id: '3',
-    type: '前庭',
-    description:
-      '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-    instructions: '',
-    examples: [],
-    images: [],
-    questionicon: 'help-circle',
-    jihaoqiang: '13号枪',
-    status: 'abnormal',
-    exceptiondescription:
-      '异常描述异常描述异常描述异常描述异常描述异常描述异常描述异常描述异常描述异常描述异常描述',
-  },
-  {
-    id: '4',
-    type: '前庭',
-    description:
-      '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-    instructions: '',
-    examples: [],
-    images: [],
-    questionicon: 'help-circle',
-    jihaoqiang: '',
-    status: 'normal',
-    exceptiondescription: '',
-  },
-])
 
-// 根据当前标签筛选任务
-const currentTasks = computed(() => {
-  return tasks.value.filter((task) => task.type === tab.value)
-})
-// 提交任务
-const submitTasks = () => {
-  console.log('提交任务', tasks.value)
-  // 这里可以添加提交逻辑
-  uni.showToast({
-    title: '提交成功',
-    icon: 'success',
-  })
-}
-</script>
 <style lang="scss" scoped>
 .task-management {
   display: flex;
   flex-direction: column;
-  height: 1500rpx;
+  min-height: 100vh;
   overflow: hidden;
   .fixed-area {
     flex-shrink: 0;
@@ -307,7 +333,7 @@ const submitTasks = () => {
     // padding: 0 30rpx;
     .task-top-left {
       margin-left: 30rpx;
-      width: 230rpx;
+      width: 250rpx;
       height: 52rpx;
       background-color: #e8f3ff;
       border-radius: 12rpx;
@@ -397,7 +423,7 @@ const submitTasks = () => {
           }
         }
       }
-      .jihaoqiang {
+      .whichGun {
         width: 100%;
         height: 96rpx;
         background-color: #f5f5f5;
@@ -409,7 +435,7 @@ const submitTasks = () => {
         box-sizing: border-box;
         margin-bottom: 10rpx;
         border-radius: 20rpx;
-        .jihaoqiang-text {
+        .whichGun-text {
           font-size: 28rpx;
           color: #4e5969;
           font-weight: 500;
@@ -427,16 +453,16 @@ const submitTasks = () => {
           color: #31373d;
         }
       }
-      .exceptiondescription {
+      .anomalyDescription {
         width: 100%;
         border-bottom: 1px solid #eeeeee;
         font-size: 28rpx;
         padding-bottom: 40rpx;
-        .exceptiondescription-title {
+        .anomalyDescription-title {
           font-weight: 500;
           color: #31373d;
         }
-        .exceptiondescription-content {
+        .anomalyDescription-content {
           font-weight: 400;
           color: #4e5969;
         }
@@ -464,9 +490,14 @@ const submitTasks = () => {
 
   // 确定按钮
   .confirm-btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
     padding: 20rpx 30rpx;
     background-color: white;
     border-top: 1rpx solid #eee;
+    z-index: 100;
 
     .btn {
       width: 100%;
@@ -481,4 +512,34 @@ const submitTasks = () => {
     }
   }
 }
+
+.custom-txt {
+  width: 400rpx;
+  height: 400rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 32rpx;
+}
+.popup-content {
+  width: 600rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  padding: 40rpx;
+  box-sizing: border-box;
+  gap: 40rpx;
+  .btn {
+    width: 100%;
+    height: 80rpx;
+    background-color: #215acd;
+    color: white;
+    font-size: 32rpx;
+    border-radius: 12rpx;
+    font-weight: 400;
+    border: none;
+    outline: none;
+  }
+}
 </style>

src/pages/schedule/details/index.vue

@@ -1,22 +1,371 @@
+<script setup lang="ts">
+import dayjs from 'dayjs'
+import { keyBy } from 'lodash-es'
+import { storeToRefs } from 'pinia'
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { useMessage, useToast } from 'wot-design-uni'
+import { closeTask, confirmDoneTask, getTaskDetail, transferTask } from '@/api/schedule/task'
+import { getAllUsers } from '@/api/system/users'
+
+import AttachmentList from '@/components/AttachmentList.vue'
+import { useUserStore } from '@/store'
+import { authStatusOptions, taskLevelOptions, taskStatusOptions } from '@/utils/dicts'
+
+const userStore = useUserStore()
+
+const { userInfo } = storeToRefs(userStore)
+
+const wotMessage = useMessage()
+const toast = useToast()
+
+// 定义页面配置，注册路由
+definePage({
+  excludeLoginPath: true,
+})
+
+// 状态管理
+const isExpanded = ref(false)
+const router = useRouter()
+
+const route = useRoute()
+const taskId = ref(Number(route.query.id))
+
+const taskInfo: any = ref({})
+const taskOther: any = ref({})
+const taskResult: any = ref({})
+
+// 转交功能相关
+const users = ref<any[]>([])
+const value = ref<string[]>([])
+const customShow = ref<string>('')
+
+// 切换更多内容显示/隐藏
+function toggleMore() {
+  isExpanded.value = !isExpanded.value
+}
+
+async function dealConfirmTaskEvent() {
+// 二次弹框确认
+  wotMessage.confirm({
+    msg: `确认完成任务 ${taskInfo.value.taskName} 吗？`,
+    title: '确认完成',
+  }).then(async () => {
+    try {
+      await confirmDoneTask(taskInfo.value.id || 0)
+
+      toast.success('确认完成任务成功')
+      await init()
+    }
+    catch {
+      toast.error('操作失败')
+    }
+  }).catch(() => {
+    return
+  })
+}
+
+// 查看详情按钮点击事件
+async function dealTaskEvent() {
+  // 根据任务类型进行判断
+  let params: any = {}
+  let isModelPage = false
+  switch (taskInfo.value.formType) {
+    case 'inspection': {
+      uni.navigateTo({
+        url: `/pages/schedule/details/deal/inspection?id=${taskId.value}&checkId=${taskInfo.value.taskList[0].id}`,
+      })
+      return
+    }
+    case 'photo': {
+      uni.navigateTo({
+        url: `/pages/schedule/details/deal/photo?id=${taskInfo.value.taskList?.[0]?.id}`,
+      })
+      return
+    }
+    case 'confirm': {
+      await dealConfirmTaskEvent()
+
+      return
+    }
+    case 'form': {
+      if (
+        ['annualExamination_task', 'replacement_task'].includes(
+          taskInfo.value.subFormType,
+        )
+      ) {
+        try {
+          // await dealAnnualExaminationTask()
+        }
+        catch {
+          // ElMessage.error('处理任务失败')
+        }
+        return
+      }
+
+      params = {
+        taskId: taskInfo.value.taskList?.[0]?.id || '',
+        taskName: taskInfo.value.taskName,
+        taskList: taskInfo.value.taskList || [],
+        remark: taskResult.value.content,
+        stationId: taskInfo.value.stationId || 0,
+        subFormType: taskInfo.value.subFormType,
+        attachmentUrl: taskResult.value.images,
+      }
+
+      if (
+        [
+          'ambulance_check',
+          'emergency_protection_monthly_check',
+          'filter_maintenance',
+          'fire_extinguisher_check',
+        ].includes(taskInfo.value.subFormType)
+      ) {
+        isModelPage = true
+      }
+
+      break
+    }
+    case 'upload': {
+      uni.navigateTo({
+        url: `/pages/schedule/details/deal/upload?id=${taskInfo.value.taskList?.[0]?.id}`,
+      })
+      return
+    }
+    default: {
+      // return ElMessage.error('当前任务无法处理')
+    }
+  }
+  // if (isModelPage) {
+  //   pageModalApi.open()
+  // }
+  // else {
+  //   dealDrawerApi.setData(params).open()
+  // }
+}
+// 查看详情按钮点击事件2
+function viewDetails2() {
+  uni.navigateTo({
+    url: '/pages/schedule/details/taskmanagement/index2',
+  })
+}
+function viewDetails3() {
+  uni.navigateTo({
+    url: '/pages/schedule/details/taskdetails/index',
+  })
+}
+
+// 获取用户列表
+async function getUserList() {
+  console.log('调用getAllUsers时的stationId:', taskInfo.value.stationId)
+  const res: any = await getAllUsers({
+    pageNum: 10000,
+    stationId: taskInfo.value.stationId,
+  })
+  if (res.code === 200) {
+    users.value = res.data.map((item: any) => ({
+      label: item.nickName,
+      value: item.userId,
+    }))
+  }
+}
+
+// 选择器确认事件
+function handleTransferTask({ value, selectedItems }: any) {
+  console.log('value:', value[0], taskInfo.value.executorId)
+  if (value.length === 0) {
+    toast.error('请选择执行人')
+    return
+  }
+
+  if (value[0] === taskInfo.value.executorId) {
+    toast.error('不能将任务转交给当前执行人')
+    console.log('不能将任务转交给当前执行人', toast)
+
+    return
+  }
+
+  wotMessage.confirm({
+    msg: `确认将任务 ${taskInfo.value.taskName} 转交给 ${selectedItems.map((item: any) => item.label).join(', ')} 吗？`,
+    title: '确认转交',
+  }).then(async () => {
+    try {
+      const res: any = await transferTask({
+        id: taskInfo.value.id || 0,
+        executorId: value[0],
+      })
+      if (res.code !== 200) {
+        toast.error(res.msg || '操作失败')
+        return
+      }
+
+      toast.success('转交任务成功')
+      await init()
+    }
+    catch {
+      toast.error('操作失败')
+    }
+  }).catch(() => {
+    return
+  })
+}
+
+/**
+ * 获取任务时间
+ * @returns 任务时间字符串
+ */
+function getTaskTime() {
+  return `${dayjs(taskInfo.value.startTime).format('MM-DD HH:mm')}~${dayjs(taskInfo.value.endTime).format('MM-DD HH:mm')}`
+}
+
+/**
+ * 下载文件
+ * @param file 文件对象或链接
+ * @param fileName 文件名
+ */
+function downloadFile(file: any, fileName: string) {
+  // 这里实现文件下载逻辑
+  console.log('downloadFile:', file, fileName)
+}
+
+const buttons = ref({
+  deal: false,
+  transfer: false,
+  close: false,
+})
+
+async function init() {
+  const res: any = await getTaskDetail(taskId.value)
+  taskInfo.value = res.data || {}
+  if (!taskInfo.value.status) {
+    taskInfo.value.status = 0
+  }
+  console.log(userInfo.value)
+
+  if (taskInfo.value.status === 1) {
+    if (taskInfo.value.executorId === userInfo.value.user?.userId) {
+      buttons.value.deal = true
+    }
+    if (userInfo.value.user?.createBy === taskInfo.value.createBy || userInfo.value.user?.post?.type === '"headquarters"' || (taskInfo.value?.taskTemplate?.isMust === 0 && taskInfo.value.executorId === userInfo.value.user?.userId)) {
+      buttons.value.close = true
+
+      if (taskInfo.value.authStatus === 0) {
+        buttons.value.transfer = true
+      }
+    }
+  }
+
+  // 假设从接口返回数据中获取taskOther和taskResult
+  taskOther.value.taskTypeName = taskInfo.value?.formTypeName || '-'
+
+  if (!taskInfo.value.executorName && taskInfo.value.taskList?.length) {
+    taskInfo.value.executorName = taskInfo.value.taskList[0].executorName
+  }
+
+  if (taskInfo.value.formType === 'photo') {
+    const result = taskInfo.value?.taskList?.[0] || {}
+    if (result.remark) {
+      taskResult.value.content = result.remark
+    }
+    if (result?.attachmentUrl?.length) {
+      taskResult.value.images = result.attachmentUrl
+    }
+  }
+  else if (taskInfo.value.formType === 'upload') {
+    // attachmentUrl
+    const result = taskInfo.value?.taskList?.[0] || {}
+    if (result.remark) {
+      taskResult.value.content = result.remark
+    }
+    if (result?.attachmentUrl?.length) {
+      taskResult.value.files = result.attachmentUrl
+      taskResult.value.fileNames = result.attachmentName.split(',')
+    }
+  }
+  else {
+    // taskResult.value = taskInfo.value?.taskList?.[0] || {};
+  }
+
+  if (taskInfo.value?.taskTemplate) {
+    taskOther.value.taskFrequencyName
+      = taskInfo.value?.taskTemplate?.taskFrequencyName || '-'
+  }
+
+  // 获取用户列表
+  if (taskInfo.value.stationId) {
+    await getUserList()
+  }
+}
+
+// 状态标签配置
+const statusConfig: any = keyBy(taskStatusOptions, 'value')
+
+// 优先级标签配置
+const priorityConfig: any = keyBy(taskLevelOptions, 'value')
+
+// 授权状态标签配置
+const authStatusConfig: any = keyBy(authStatusOptions, 'value')
+
+function goDetail() {
+  uni.navigateTo({
+    url: `/pages/schedule/details/detail/inspection?id=${taskId.value}&checkId=${taskInfo.value.taskList[0].id}`,
+  })
+}
+
+/**
+ * 关闭任务按钮点击事件
+ */
+async function closeTaskEvent() {
+  // 二次弹框确认
+  wotMessage.confirm({
+    msg: `确认关闭任务 ${taskInfo.value.taskName} 吗？`,
+    title: '确认关闭',
+  }).then(async () => {
+    try {
+      await closeTask({
+        id: taskInfo.value.id || 0,
+      })
+
+      toast.success('关闭任务成功')
+      await init()
+    }
+    catch {
+      toast.error('操作失败')
+    }
+  }).catch(() => {
+    return
+  })
+}
+
+onShow(async () => {
+  await init()
+})
+
+onMounted(async () => {
+  // await init()
+})
+</script>
+
 <template>
   <view class="details-box">
     <!-- 标题区域 -->
     <view class="details-box-title">
       <view class="details-box-title-text">
-        巡站日检 AI
+        {{ taskInfo.taskName || '任务详情' }}
       </view>
     </view>
 
     <!-- 标签区域 -->
     <view class="tags-box">
-      <view class="tag tag-mandatory">
-        必做
+      <view class="tag">
+        {{ priorityConfig[taskInfo.level]?.label || taskInfo.level }}
       </view>
-      <view class="tag tag-authorize">
-        可授权
+
+      <view class="tag">
+        {{ statusConfig[`${taskInfo.status || 0}`]?.label || taskInfo.status }}
       </view>
-      <view class="tag tag-time">
-        按时完成
+      <view class="tag">
+        {{ authStatusConfig[taskInfo.authStatus || 0]?.label || taskInfo.authStatus }}
       </view>
     </view>
 
@@ -25,34 +374,46 @@
       <view class="section-title">
         任务描述
       </view>
-      <view class="task-description">
-        <view class="task-item">
-          1、每日到站第一事，巡视油站；
-        </view>
-        <view class="task-item">
-          2、了解人、财、物情况；
-        </view>
-        <view class="task-item">
-          3、可随手解决当场解决，其他后续跟进，直到解决；
-        </view>
-        <view class="task-item">
-          4、检查标识识：AI的不需要人为判断异常，默认正常即可。
-        </view>
-      </view>
+      <view class="task-description" v-html="taskInfo.description || '暂无'" />
     </view>
 
     <!-- 标准指引 -->
     <view class="section">
       <view class="section-title">
-        标准指引
+        基础信息
       </view>
       <view class="standard-guide">
         <view class="guide-item">
           <view class="guide-label">
-            执行人
+            场站
+          </view>
+          <view class="guide-value">
+            {{ taskInfo.stationName || '-' }}
+          </view>
+        </view>
+        <view class="guide-item">
+          <view class="guide-label">
+            标准指引
           </view>
           <view class="guide-value">
-            李玫玮（站长）
+            {{ taskInfo.standardGuide || '-' }}
+          </view>
+        </view>
+        <view class="guide-item">
+          <view class="guide-label">
+            执行人
+          </view>
+          <view class="guide-value flex items-center justify-between">
+            {{ taskInfo.executorName || '-' }}
+            <wd-select-picker
+              v-model="value"
+              title="选择转交人"
+              filterable :max="1" use-default-slot :columns="users" style="z-index:101" @confirm="handleTransferTask"
+            >
+              <wd-button v-if="buttons.transfer" type="text">
+                转交
+              </wd-button>
+            </wd-select-picker>
           </view>
         </view>
         <view class="guide-item">
@@ -60,7 +421,39 @@
             计划时间
           </view>
           <view class="guide-value">
-            12月5日
+            {{ taskInfo.displayDate || '-' }}
+          </view>
+        </view>
+        <view class="guide-item">
+          <view class="guide-label">
+            创建
+          </view>
+          <view class="guide-value">
+            {{ taskInfo.createBy || '' }}
+          </view>
+        </view>
+        <view class="guide-item">
+          <view class="guide-label">
+            任务类型
+          </view>
+          <view class="guide-value">
+            {{ taskInfo.subFormTypeName || taskOther.taskTypeName || '-' }}
+          </view>
+        </view>
+        <view class="guide-item">
+          <view class="guide-label">
+            任务负责人
+          </view>
+          <view class="guide-value">
+            {{ taskInfo.taskLeaderName || '-' }}
+          </view>
+        </view>
+        <view class="guide-item">
+          <view class="guide-label">
+            任务频率
+          </view>
+          <view class="guide-value">
+            {{ taskOther.taskFrequencyName || '-' }}
           </view>
         </view>
         <view class="guide-item">
@@ -68,29 +461,71 @@
             任务时间
           </view>
           <view class="guide-value">
-            12月5日 00:00-12月5日 18:00
+            {{ getTaskTime() || '-' }}
+          </view>
+        </view>
+
+        <view v-if="taskInfo.descriptionFilesUrl && taskInfo.descriptionFilesUrl.length > 0" class="guide-item attachment-guide-item">
+          <view class="guide-label">
+            详情附件
+          </view>
+          <view class="guide-value">
+            <!-- 使用附件列表组件显示附件 -->
+            <AttachmentList
+              :files="taskInfo.descriptionFilesUrl"
+              :size="30"
+            />
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view v-if="taskInfo.status === 3" class="section">
+      <view class="section-title">
+        处理结果
+      </view>
+      <view class="standard-guide">
+        <view v-if="taskResult.handleContent || taskInfo.cancelReason" class="guide-item">
+          <view class="guide-label">
+            处理情况
+          </view>
+          <view class="guide-value">
+            {{ taskResult.handleContent || taskInfo.cancelReason || '' }}
           </view>
         </view>
         <view class="guide-item">
           <view class="guide-label">
-            完成时间
+            处理时间
+          </view>
+          <view class="guide-value">
+            {{ taskInfo.completeTime || taskInfo.cancelTime || '-' }}
+          </view>
+        </view>
+        <view v-if="taskResult.files && taskResult.files.length > 0" class="guide-item attachment-guide-item">
+          <view class="guide-label">
+            处理附件
           </view>
           <view class="guide-value">
-            12月5日
+            <!-- 使用附件列表组件显示附件 -->
+            <AttachmentList
+              :files="taskResult.files"
+              :file-names="taskResult.fileNames"
+              :size="30"
+            />
           </view>
         </view>
       </view>
     </view>
 
     <!-- 查看更多 -->
-    <view class="more-btn" @tap="toggleMore">
+    <!-- <view class="more-btn" @tap="toggleMore">
       <text class="arrow">点击查看更多</text>
       <wd-icon
         class="arrow"
         :name="isExpanded ? 'arrow-up' : 'arrow-down'"
         size="20px"
       />
-    </view>
+    </view> -->
 
     <!-- 更多内容（默认隐藏） -->
     <view v-if="isExpanded" class="more-content">
@@ -112,84 +547,62 @@
       </view>
     </view>
 
-    <view class="detail-btn" @tap="viewDetails1">
-      <text>查 看 详 情1</text>
+    <!-- 按钮容器 -->
+    <view class="btn-container">
+      <!-- 关闭任务按钮 -->
+      <wd-button
+        v-if="buttons.close"
+        type="error"
+        class="close-btn"
+        @click="closeTaskEvent"
+      >
+        关闭任务
+      </wd-button>
+      <!-- 处理任务按钮 -->
+      <wd-button
+        v-if="buttons.deal"
+        type="primary"
+        class="deal-btn"
+        @click="dealTaskEvent"
+      >
+        处理任务
+      </wd-button>
+    </view>
+
+    <!-- 查看详情按钮 -->
+    <view class="view-detail-container">
+      <wd-button
+        v-if="[3].includes(taskInfo.status)"
+        type="primary"
+        class="view-detail-btn"
+        @click="goDetail"
+      >
+        查看详情
+      </wd-button>
     </view>
-    <view class="detail-btn" @tap="viewDetails2">
+    <!-- <view class="detail-btn" @tap="viewDetails2">
       <text>查 看 详 情2</text>
     </view>
     <view class="detail-btn" @tap="viewDetails3">
       <text>查 看 详 情3</text>
-    </view>
+    </view> -->
+    <wd-message-box />
+    <wd-toast />
   </view>
 </template>
 
-<script setup lang="ts">
-import { ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-
-import { getTaskDetail } from '@/api/schedule/task'
-
-// 定义页面配置，注册路由
-definePage({
-  excludeLoginPath: true,
-})
-
-// 状态管理
-const isExpanded = ref(false)
-const router = useRouter()
-
-const route = useRoute()
-const taskId = ref(Number(route.params.id))
-
-// 切换更多内容显示/隐藏
-function toggleMore() {
-  isExpanded.value = !isExpanded.value
-}
-
-// 查看详情按钮点击事件
-function viewDetails1() {
-  uni.navigateTo({
-    url: '/pages/schedule/details/taskmanagement/index1',
-  })
-}
-// 查看详情按钮点击事件2
-function viewDetails2() {
-  uni.navigateTo({
-    url: '/pages/schedule/details/taskmanagement/index2',
-  })
-}
-function viewDetails3() {
-  uni.navigateTo({
-    url: '/pages/schedule/details/taskdetails/index',
-  })
-}
-
-async function init() {
-  const res = await getTaskDetail(taskId.value)
-  taskInfo.value = res
-  if (!taskInfo.value.status) {
-    taskInfo.value.status = 0
-  }
-}
-
-onMounted(async () => {
-  await init()
-})
-</script>
-
 <style lang="scss" scoped>
 .details-box {
   display: flex;
   flex-direction: column;
-  padding: 30rpx 24rpx;
+  padding: 30rpx 24rpx 160rpx;
   background-color: #ffffff;
 
   .details-box-title {
     margin-bottom: 24rpx;
 
     .details-box-title-text {
-      font-size: 38rpx;
+      font-size: 48rpx;
       font-weight: 500;
       color: #31373d;
     }
@@ -198,29 +611,16 @@ onMounted(async () => {
   // 标签样式
   .tags-box {
     display: flex;
-    gap: 16rpx;
-    margin-bottom: 32rpx;
+    gap: 12rpx;
+    margin-bottom: 24rpx;
 
     .tag {
       padding: 8rpx 16rpx;
       border-radius: 14rpx;
       font-size: 24rpx;
       font-weight: 400;
-
-      &.tag-mandatory {
-        color: #215acd;
-        background-color: #e8f3ff;
-      }
-
-      &.tag-authorize {
-        color: #215acd;
-        background-color: #e8f3ff;
-      }
-
-      &.tag-time {
-        color: #215acd;
-        background-color: #e8f3ff;
-      }
+      color: #215acd;
+      background-color: #e8f3ff;
     }
   }
 
@@ -238,20 +638,30 @@ onMounted(async () => {
 
   // 任务描述样式
   .task-description {
-    background-color: #f8f9fa;
-    padding: 24rpx;
-    border-radius: 12rpx;
+    padding: 0 0 24rpx 0;
+    border-bottom: 1rpx solid #e5e5e5;
+
+    // 针对HTML内容的样式
+    & :deep(ol),
+    & :deep(ul) {
+      padding-left: 32rpx;
+      margin: 0;
+    }
 
-    .task-item {
-      font-size: 27rpx;
+    & :deep(li) {
+      font-size: 28rpx;
       font-weight: 400;
-      color: #4e5969;
+      color: #31373d;
       line-height: 52rpx;
-      margin-bottom: 12rpx;
+      margin-bottom: 8rpx;
+    }
 
-      &:last-child {
-        margin-bottom: 0;
-      }
+    & :deep(p) {
+      font-size: 28rpx;
+      font-weight: 400;
+      color: #31373d;
+      line-height: 52rpx;
+      margin: 0 0 12rpx 0;
     }
   }
 
@@ -259,6 +669,7 @@ onMounted(async () => {
   .standard-guide {
     .guide-item {
       display: flex;
+      align-items: center;
       margin-bottom: 24rpx;
 
       &:last-child {
@@ -270,6 +681,7 @@ onMounted(async () => {
         font-size: 28rpx;
         color: #6c757d;
         font-weight: 400;
+        line-height: 52rpx;
       }
 
       .guide-value {
@@ -277,6 +689,35 @@ onMounted(async () => {
         font-size: 28rpx;
         font-weight: 400;
         color: #31373d;
+        line-height: 52rpx;
+      }
+
+      // 调整转交按钮样式，确保不改变行高
+      .guide-value :deep(.wd-button) {
+        margin: 0;
+        padding: 0;
+        height: auto;
+        line-height: 52rpx;
+      }
+
+      .guide-value :deep(.wd-button__text) {
+        margin: 0;
+        padding: 0;
+        line-height: 52rpx;
+      }
+    }
+
+    // 附件列表特殊样式
+    .attachment-guide-item {
+      flex-direction: column;
+      align-items: flex-start;
+
+      .guide-label {
+        margin-bottom: 12rpx;
+      }
+
+      .guide-value {
+        width: 100%;
       }
     }
   }
@@ -300,20 +741,38 @@ onMounted(async () => {
     }
   }
 
-  // 查看详情按钮
-  .detail-btn {
+  // 按钮容器
+  .btn-container {
     display: flex;
-    align-items: center;
-    justify-content: center;
+    gap: 16rpx;
+    position: fixed;
+    bottom: 32rpx;
+    left: 24rpx;
+    right: 24rpx;
+    z-index: 100;
+  }
+
+  // 并排放置的按钮样式
+  .btn-container .wd-button {
+    flex: 1;
     height: 96rpx;
-    background-color: #215acd;
-    border-radius: 14rpx;
-    margin-bottom: 32rpx;
-    text {
-      font-size: 32rpx;
-      color: #ffffff;
-      font-weight: 500;
-    }
+    font-size: 32rpx;
+  }
+
+  // 查看详情按钮容器
+  .view-detail-container {
+    position: fixed;
+    bottom: 32rpx;
+    left: 24rpx;
+    right: 24rpx;
+    z-index: 100;
+  }
+
+  // 查看详情按钮样式
+  .view-detail-btn {
+    width: 100%;
+    height: 96rpx;
+    font-size: 32rpx;
   }
 
   // 更多内容样式
@@ -337,5 +796,20 @@ onMounted(async () => {
       }
     }
   }
+
+  // 附件列表样式
+  .attachment-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 12rpx;
+
+    .attachment-tag {
+      margin-bottom: 12rpx;
+    }
+  }
+}
+:deep(.attachment-tag) {
+  margin-right: 12rpx;
+  margin-bottom: 12rpx;
 }
 </style>

src/pages/schedule/details/popup/anomaly.vue

@@ -0,0 +1,497 @@
+<script setup lang="ts">
+import dayjs from 'dayjs'
+// import { storeToRefs } from 'pinia'
+import { onMounted, reactive, ref, watch } from 'vue'
+import { useToast } from 'wot-design-uni'
+import { submitIssue } from '@/api/schedule/issue'
+import { getTags } from '@/api/system/tags'
+import { getAllUsers } from '@/api/system/users'
+import useUpload from '@/hooks/useUpload'
+// import { useUserStore } from '@/store'
+// import calendar from '@/utils/calendar.vue'
+
+const props = defineProps({
+  taskId: {
+    type: Number,
+    default: 0,
+  },
+  stationId: {
+    type: Number,
+    default: 0,
+  },
+  checkItemId: {
+    type: Number,
+    default: 0,
+  },
+  anomalyData: {
+    type: Object,
+    default: () => ({}),
+  },
+})
+const emit = defineEmits(['update:anomalyShow', 'anomaly-submitted'])
+console.log(props.stationId)
+const tags = ref<any[]>([])
+const users = ref<any[]>([])
+// const userStore = useUserStore()
+// const { userInfo } = storeToRefs(userStore)
+
+async function getUserList() {
+  console.log('调用getAllUsers时的stationId:', props.stationId)
+  const res: any = await getAllUsers({
+    pageNum: 10000,
+    stationId: props.stationId,
+  })
+  if (res.code === 200) {
+    users.value = res.data.map((item: any) => ({
+      label: item.nickName,
+      value: item.userId,
+    }))
+  }
+}
+
+async function getTagsList(name: string = '') {
+  const params: any = {
+    pageNum: 10000,
+  }
+  if (name) {
+    params.tagName = name
+  }
+  const res: any = await getTags(params)
+  if (res.code === 200) {
+    tags.value = res.rows.map((item: any) => ({
+      label: item.tagName,
+      value: item.id,
+    }))
+  }
+}
+
+const { success: showSuccess } = useToast()
+
+const model = reactive<{
+  isTransferTask: string
+  problemDescription: string
+  handlingSuggestion: string
+  deadline: string
+  executorId: string
+  ccTo: string[]
+  handlingMeasure: string
+  handlingPhoto: string[]
+  problemPhoto: any
+  tags: string[]
+  correlationTaskId: string
+}>({
+  isTransferTask: '1',
+  problemDescription: '',
+  handlingSuggestion: '',
+  deadline: '',
+  executorId: '',
+  ccTo: [],
+  handlingMeasure: '',
+  handlingPhoto: [],
+  problemPhoto: [],
+  tags: [],
+  correlationTaskId: '',
+})
+
+// 更新 model 数据
+function updateModelData(data: any) {
+  if (!data)
+    return
+
+  model.isTransferTask = data.isTransferTask?.toString() || '1'
+  model.problemDescription = data.problemDescription || ''
+  model.handlingSuggestion = data.handlingSuggestion || ''
+  model.deadline = data.deadline || ''
+  model.executorId = data.executorId ? [Number(data.executorId)] : []
+  model.ccTo = data.ccTo ? data.ccTo.split(',').map((item: string) => Number(item.trim())) : []
+  model.problemPhoto = data.problemPhoto || []
+  model.tags = data.tags ? data.tags.split(',').map((item: string) => Number(item.trim())) : []
+  model.correlationTaskId = data.correlationTaskId?.toString() || ''
+}
+
+const form = ref()
+const loading = ref(false)
+
+// 上传问题照片
+const uploadProblemPhoto: any = (file, formData, options) => {
+  const { customUpload } = useUpload({
+    fileType: 'image',
+  })
+  return customUpload(file, formData, options)
+}
+
+// 删除问题照片
+function deleteProblemPhoto(index: number) {
+  model.problemPhoto.splice(index, 1)
+}
+
+function handleSubmit() {
+  form.value
+    .validate()
+    .then(({ valid, errors }) => {
+      if (valid) {
+        // 准备提交数据
+        const submitData = {
+          isTransferTask: Number.parseInt(model.isTransferTask),
+          problemDescription: model.problemDescription,
+          handlingSuggestion: model.handlingSuggestion,
+          deadline: dayjs(model.deadline).format('YYYY-MM-DD 23:59:59'),
+          executorId: model.executorId?.[0] || '',
+          ccTo: model?.ccTo?.join(',') || '',
+          tags: model?.tags?.join(',') || '',
+          problemPhoto: (model.problemPhoto?.map((item: any) => item.name) || []).join(','),
+          correlationTaskId: props.taskId,
+          checkItemId: props.checkItemId,
+          // 其他字段根据实际情况处理
+        }
+
+        console.log('提交数据:', submitData)
+
+        // 开始提交，显示 loading
+        loading.value = true
+
+        submitIssue(submitData)
+          .then((res) => {
+            // 提交成功后向父组件传递数据
+            emit('anomaly-submitted', { checkItemId: props.checkItemId, data: {
+              ...submitData,
+              problemPhoto: model.problemPhoto,
+            } })
+
+            console.log(res, 'res')
+            // 重置表单数据
+            model.isTransferTask = '1'
+            model.problemDescription = ''
+            model.handlingSuggestion = ''
+            model.deadline = ''
+            model.executorId = ''
+            model.ccTo = []
+            model.handlingMeasure = ''
+            model.handlingPhoto = []
+            model.problemPhoto = []
+            model.tags = []
+            model.correlationTaskId = ''
+          })
+          .catch((error) => {
+            console.log(error, 'error')
+          })
+          .finally(() => {
+            // 提交完成，隐藏 loading
+            loading.value = false
+            emit('update:anomalyShow', false)
+          })
+      }
+    })
+    .catch((error) => {
+      console.log(error, 'error')
+    })
+}
+
+onMounted(() => {
+  getTagsList()
+  getUserList()
+})
+
+// 监听stationId变化，当stationId从0变为实际值时重新获取用户列表
+watch(() => props.stationId, (newStationId) => {
+  console.log('stationId变化:', newStationId)
+  if (newStationId > 0) {
+    getUserList()
+  }
+}, { immediate: false })
+
+defineExpose({
+  updateModelData,
+})
+</script>
+
+<template>
+  <view>
+    <view class="popup-content">
+      <view class="content-header">
+        <text style="font-size: 34rpx; font-weight: 500; color: #464c51">
+          异常情况
+        </text>
+      </view>
+      <view class="content-main">
+        <wd-form ref="form" :model="model">
+          <view style="display: flex; flex-direction: column; gap: 40rpx; padding-bottom: 100rpx;">
+            <view>
+              <view style="font-size: 32rpx; font-weight: 500; color: #31373d">
+                是否转任务
+              </view>
+              <view
+                style="
+                    font-size: 28rpx;
+                    font-weight: 400;
+                    color: #4e5969;
+                    margin-bottom: 20rpx;
+                  "
+              >
+                转任务后会出现在执行人的任务日程视图中
+              </view>
+              <wd-radio-group v-model="model.isTransferTask" shape="dot" inline>
+                <view style="display: flex; gap: 260rpx">
+                  <wd-radio value="1">
+                    是
+                  </wd-radio>
+                  <wd-radio value="0">
+                    否
+                  </wd-radio>
+                </view>
+              </wd-radio-group>
+            </view>
+            <wd-input
+              v-model="model.problemDescription"
+              label="问题描述"
+              label-width="100%"
+              prop="problemDescription"
+              clearable
+              placeholder="请输入"
+              :rules="[{ required: true, message: '请填写问题描述' }]"
+              custom-class="custom-vertical-input"
+            />
+            <view class="custom-vertical-select">
+              <view
+                style="
+                    margin-bottom: 10rpx;
+                    font-size: 28rpx;
+                    font-weight: 500;
+                    color: #333;
+                  "
+              >
+                标签
+              </view>
+              <wd-select-picker
+                v-model="model.tags" :columns="tags" filterable
+                :max="1"
+                placeholder="请选择"
+              />
+            </view>
+            <wd-input
+              v-model="model.handlingSuggestion"
+              label="处理建议"
+              label-width="100%"
+              prop="handlingSuggestion"
+              clearable
+              placeholder="请输入"
+              custom-class="custom-vertical-input"
+            />
+            <view class="custom-vertical-select">
+              <view
+                style="
+                    margin-bottom: 10rpx;
+                    font-size: 28rpx;
+                    font-weight: 500;
+                    color: #333;
+                  "
+              >
+                <text style="color: red; margin-right: 4rpx; font-size: 28rpx;">* </text>截止时间
+              </view>
+              <wd-datetime-picker
+                v-model="model.deadline"
+                type="date"
+                use-second
+                :min-date="new Date().getTime()"
+                :max-date="new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).getTime()"
+                prop="deadline"
+                :rules="[{ required: true, message: '请选择截止时间' }]"
+              />
+            </view>
+            <view>
+              <view
+                style="
+                    margin-bottom: 10rpx;
+                    font-size: 28rpx;
+                    font-weight: 500;
+                    color: #333;
+                  "
+              >
+                问题照片
+              </view>
+              <view>
+                <wd-upload
+                  v-model:file-list="model.problemPhoto"
+                  image-mode="aspectFill"
+                  :upload-method="uploadProblemPhoto"
+                  @delete="deleteProblemPhoto"
+                />
+              </view>
+            </view>
+            <view class="custom-vertical-select">
+              <view
+                style="
+                    margin-bottom: 10rpx;
+                    font-size: 28rpx;
+                    font-weight: 500;
+                    color: #333;
+                  "
+              >
+                <text style="color: red; margin-right: 4rpx; font-size: 28rpx;">* </text>执行人
+              </view>
+              <wd-select-picker
+                v-model="model.executorId" :columns="users" filterable
+                placeholder="请选择"
+                prop="executorId"
+                :max="1"
+                :rules="[{ required: true, message: '请选择执行人' }]"
+              />
+            </view>
+            <view class="custom-vertical-select">
+              <view
+                style="
+                    margin-bottom: 10rpx;
+                    font-size: 28rpx;
+                    font-weight: 500;
+                    color: #333;
+                  "
+              >
+                抄送人
+              </view>
+              <wd-select-picker
+                v-model="model.ccTo" :columns="users" filterable
+                placeholder="请选择"
+              />
+            </view>
+          </view>
+        </wd-form>
+      </view>
+      <view class="footer">
+        <button class="btn" :disabled="loading" @click="handleSubmit">
+          <wd-loading v-if="loading" size="20px" color="#ffffff" />
+          <text v-else>提 交</text>
+        </button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.custom-txt {
+  width: 400rpx;
+  height: 400rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 32rpx;
+}
+.popup-content {
+  min-height: 500rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 30rpx;
+  // padding: 0 30rpx 30rpx 30rpx;
+  box-sizing: border-box;
+  overflow-y: auto;
+  .content-header {
+    // height: 80rpx;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 30rpx;
+    // position: sticky;
+    // top: 50rpx;
+    // background-color: #fff;
+    // border: 1px solid red;
+    // z-index: 50;
+    text {
+      font-size: 32rpx;
+      font-weight: 600;
+    }
+  }
+  .content-main {
+    width: 100%;
+    .wd-select-picker,
+    .wd-datetime-picker {
+      width: 100%;
+      & .wd-cell {
+        padding: 0;
+      }
+      & .wd-cell__right {
+        width: 100%;
+        & .wd-cell__value {
+          width: 100%;
+          & .wd-select-picker__input,
+          & .wd-datetime-picker__input {
+            width: 100%;
+            height: 70rpx;
+            border: 1px solid #e5e5e5;
+            border-radius: 8rpx;
+            padding: 0 20rpx;
+            font-size: 28rpx;
+          }
+        }
+      }
+    }
+    .custom-vertical-select {
+      margin-bottom: 30rpx;
+    }
+    .wd-input {
+      // margin-bottom: 30rpx;
+      padding: 0px;
+      &.custom-vertical-input {
+        display: flex;
+        flex-direction: column;
+        gap: 10rpx;
+        margin-bottom: 30rpx;
+
+        .wd-input__label {
+          width: 100% !important;
+          margin-bottom: 10rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .wd-input__body {
+          width: 100%;
+          position: relative;
+        }
+
+        /* 使用Vue 3深度选择器确保样式能正确应用到输入框 */
+        :deep(.wd-input__inner) {
+          width: 20rem !important;
+          height: 70rpx !important;
+          border: 1px solid #e5e5e5 !important;
+          border-radius: 8rpx !important;
+          padding: 0 60rpx 0 20rpx !important;
+          font-size: 28rpx !important;
+        }
+
+        /* 确保图标容器在输入框内部 */
+        :deep(.wd-input__suffix) {
+          position: absolute;
+          right: 20rpx;
+          top: 50%;
+          transform: translateY(-50%);
+          z-index: 1;
+        }
+      }
+    }
+  }
+}
+.footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 30rpx;
+  padding-bottom: calc(30rpx + env(safe-area-inset-bottom));
+  background-color: white;
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
+  z-index: 10;
+  .btn {
+    width: 100%;
+    height: 80rpx;
+    background-color: #215acd;
+    color: white;
+    font-size: 32rpx;
+    border-radius: 12rpx;
+    font-weight: 400;
+    border: none;
+    outline: none;
+  }
+}
+</style>

src/pages/schedule/details/popup/bottompopup.vue

@@ -1,374 +0,0 @@
-<template>
-  <view>
-    <wd-popup
-      v-model="props.bottomshow"
-      custom-style="border-radius: 32rpx 32rpx 0 0; "
-      @close="handleClose"
-      position="bottom"
-    >
-      <view class="popup-content">
-        <view class="content-header">
-          <text style="font-size: 34rpx; font-weight: 500; color: #464c51"
-            >异常情况</text
-          >
-          <wd-icon
-            style="position: absolute; right: 20rpx; color: #464c51"
-            name="close"
-            size="18px"
-            @tap="handleClose"
-          ></wd-icon>
-        </view>
-        <view class="content-main">
-          <wd-form ref="form" :model="model">
-            <view style="display: flex; flex-direction: column; gap: 40rpx">
-              <view>
-                <view style="font-size: 32rpx; font-weight: 500; color: #31373d"
-                  >是否转任务</view
-                >
-                <view
-                  style="
-                    font-size: 28rpx;
-                    font-weight: 400;
-                    color: #4e5969;
-                    margin-bottom: 20rpx;
-                  "
-                >
-                  转任务后会出现在执行人的任务日程视图中</view
-                >
-                <wd-radio-group v-model="model.radioValue" shape="dot" inline>
-                  <view style="display: flex; gap: 260rpx">
-                    <wd-radio value="1">是</wd-radio>
-                    <wd-radio value="2">否</wd-radio>
-                  </view>
-                </wd-radio-group>
-              </view>
-              <wd-input
-                label="发现问题"
-                label-width="100%"
-                prop="value1"
-                clearable
-                v-model="model.value1"
-                placeholder="请输入"
-                :rules="[{ required: true, message: '请填写发现问题' }]"
-                custom-class="custom-vertical-input"
-              />
-              <wd-input
-                label="处理措施"
-                label-width="100%"
-                prop="value2"
-                clearable
-                v-model="model.value2"
-                placeholder="请输入"
-                :rules="[{ required: true, message: '请填写处理措施' }]"
-                custom-class="custom-vertical-input"
-              />
-              <wd-input
-                label="处理时间"
-                label-width="100%"
-                prop="value3"
-                clearable
-                v-model="model.value3"
-                placeholder="请选择"
-                :rules="[{ required: true, message: '请填写处理时间' }]"
-                custom-class="custom-vertical-input"
-                suffix-icon="calendar"
-                @click="handleClickCalendar"
-              />
-              <view>
-                <view
-                  style="
-                    margin-bottom: 10rpx;
-                    font-size: 28rpx;
-                    font-weight: 500;
-                    color: #333;
-                  "
-                  >拍照</view
-                >
-                <view>
-                  <wd-upload
-                    v-model:file-list="model.fileList"
-                    image-mode="aspectFill"
-                    :action="action"
-                  ></wd-upload>
-                </view>
-              </view>
-              <wd-input
-                label="执行人"
-                label-width="100%"
-                prop="value3"
-                clearable
-                v-model="model.value4"
-                placeholder="请选择"
-                :rules="[{ required: true, message: '请填写执行人' }]"
-                custom-class="custom-vertical-input"
-                @click="handleselect"
-              />
-              <view class="footer">
-                <button class="btn" @click="handleSubmit">提 交</button>
-              </view>
-            </view>
-          </wd-form>
-        </view>
-      </view>
-    </wd-popup>
-    <calendar
-      v-model:datePickerVisible="datePickerVisible"
-      @confirmDate="onconfirmDate"
-      :detailedtime="false"
-    />
-    <!-- 执行人选择器 -->
-    <wd-popup
-      v-model="isexecutorselect"
-      custom-style="border-radius: 32rpx 32rpx 0 0;"
-      position="bottom"
-    >
-      <view style="padding: 30rpx; width: 100%; box-sizing: border-box">
-        <view
-          style="
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 30rpx;
-            width: 100%;
-          "
-        >
-          <text
-            style="
-              font-size: 30rpx;
-              color: #333;
-              font-weight: 500;
-              flex: 1;
-              text-align: left;
-            "
-            @click="isexecutorselect = false"
-            >选择执行人</text
-          >
-        </view>
-        <!-- 执行人列表 -->
-        <view class="executor-list">
-          <view
-            v-for="(item, index) in selectcontent"
-            :key="index"
-            class="executor-item"
-            :class="{ selected: model.value4 === item }"
-            @click="selectExecutor(item)"
-          >
-            <text class="executor-name">{{ item }}</text>
-            <wd-icon
-              v-if="model.value4 === item"
-              name="check"
-              color="#215acd"
-              size="28rpx"
-              style="position: absolute; right: 30rpx"
-            />
-          </view>
-        </view>
-      </view>
-    </wd-popup>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, defineProps, defineEmits, computed } from 'vue'
-import { useToast } from 'wot-design-uni'
-import calendar from '@/utils/calendar.vue'
-const props = defineProps({
-  bottomshow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['update:bottomshow'])
-const handleClose = () => {
-  emit('update:bottomshow', false)
-}
-
-const { success: showSuccess } = useToast()
-
-const model = reactive<{
-  radioValue: string
-  value1: string
-  value2: string
-  value3: string
-  fileList: any[]
-  value4: string
-}>({
-  radioValue: '1',
-  value1: '',
-  value2: '',
-  value3: '',
-  fileList: [
-    {
-      url: 'https://img12.360buyimg.com//n0/jfs/t1/29118/6/4823/55969/5c35c16bE7c262192/c9fdecec4b419355.jpg',
-    },
-  ],
-  value4: '',
-})
-
-const form = ref()
-const action: string =
-  'https://mockapi.eolink.com/zhTuw2P8c29bc981a741931bdd86eb04dc1e8fd64865cb5/upload'
-const isexecutorselect = ref(false)
-const selectcontent = [
-  '张三',
-  '李四',
-  '王五',
-  '赵六',
-  '王二',
-  '王三',
-  '王四',
-  '王五',
-  '李飞',
-]
-const datePickerVisible = ref(false)
-//执行人选择
-const handleselect = () => {
-  isexecutorselect.value = !isexecutorselect.value
-}
-
-// 选择执行人
-function selectExecutor(executor: string) {
-  model.value4 = executor
-  isexecutorselect.value = false
-}
-function handleClickCalendar() {
-  datePickerVisible.value = true
-}
-const onconfirmDate = (date: string) => {
-  model.value3 = date
-}
-function handleSubmit() {
-  form.value
-    .validate()
-    .then(({ valid, errors }) => {
-      if (valid) {
-        showSuccess({
-          msg: '校验通过',
-        })
-      }
-    })
-    .catch((error) => {
-      console.log(error, 'error')
-    })
-}
-</script>
-<style lang="scss" scoped>
-.custom-txt {
-  width: 400rpx;
-  height: 400rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: 32rpx;
-}
-.popup-content {
-  min-height: 500rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 30rpx;
-  // padding: 0 30rpx 30rpx 30rpx;
-  box-sizing: border-box;
-  overflow-y: auto;
-  .content-header {
-    // height: 80rpx;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-bottom: 30rpx;
-    // position: sticky;
-    // top: 50rpx;
-    // background-color: #fff;
-    // border: 1px solid red;
-    // z-index: 50;
-    text {
-      font-size: 32rpx;
-      font-weight: 600;
-    }
-  }
-  .content-main {
-    width: 100%;
-    .wd-input {
-      // margin-bottom: 30rpx;
-      padding: 0px;
-      &.custom-vertical-input {
-        display: flex;
-        flex-direction: column;
-        gap: 10rpx;
-
-        .wd-input__label {
-          width: 100% !important;
-          margin-bottom: 10rpx;
-          font-size: 28rpx;
-          font-weight: 500;
-          color: #333;
-        }
-
-        .wd-input__body {
-          width: 100%;
-          position: relative;
-        }
-
-        /* 使用Vue 3深度选择器确保样式能正确应用到输入框 */
-        :deep(.wd-input__inner) {
-          width: 20rem !important;
-          height: 70rpx !important;
-          border: 1px solid #e5e5e5 !important;
-          border-radius: 8rpx !important;
-          padding: 0 60rpx 0 20rpx !important;
-          font-size: 28rpx !important;
-        }
-
-        /* 确保图标容器在输入框内部 */
-        :deep(.wd-input__suffix) {
-          position: absolute;
-          right: 20rpx;
-          top: 50%;
-          transform: translateY(-50%);
-          z-index: 1;
-        }
-      }
-    }
-  }
-}
-.footer {
-  .btn {
-    width: 100%;
-    height: 80rpx;
-    background-color: #215acd;
-    color: white;
-    font-size: 32rpx;
-    border-radius: 12rpx;
-    font-weight: 400;
-    border: none;
-    outline: none;
-  }
-}
-
-/* 执行人选择器样式 */
-.executor-list {
-  max-height: 500rpx;
-  overflow-y: auto;
-}
-
-.executor-item {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 24rpx 0;
-  border-bottom: 1rpx solid #f5f5f5;
-  font-size: 28rpx;
-  color: #333;
-  position: relative;
-}
-
-.executor-item.selected {
-  color: #215acd;
-}
-
-.executor-name {
-  font-size: 28rpx;
-  color: inherit;
-}
-</style>

src/pages/schedule/details/popup/centerpopup.vue

@@ -1,72 +0,0 @@
-<template>
-  <view>
-    <wd-popup
-      v-model="props.centershow"
-      custom-style="border-radius:32rpx;"
-      @close="handleClose"
-    >
-      <view class="popup-content">
-        <view style="font-size: 36rpx; font-weight: 500; color: #020917"
-          >说明</view
-        >
-        <view style="font-size: 32rpx; font-weight: 400; color: #343a45">
-          出入口清洁:【运营手册-第九章-第 2节】<br />
-          1、清洁要求:绿化带修葺良好，草地清洁;<br />
-          2、清洁频率:绿化带每非天繁忙时间至少检查清洁一次。
-        </view>
-        <view style="width: 100%">
-          <button class="btn" @click="handleClose">我 知 道 了</button>
-        </view>
-      </view>
-    </wd-popup>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { defineProps, defineEmits } from 'vue'
-const props = defineProps({
-  centershow: {
-    type: Boolean,
-    default: false,
-  },
-  bottomshow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['update:centershow', 'update:bottomshow'])
-const handleClose = () => {
-  emit('update:centershow', false)
-}
-</script>
-<style lang="scss" scoped>
-.custom-txt {
-  width: 400rpx;
-  height: 400rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: 32rpx;
-}
-.popup-content {
-  width: 600rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-  padding: 40rpx;
-  box-sizing: border-box;
-  gap: 40rpx;
-  .btn {
-    width: 100%;
-    height: 80rpx;
-    background-color: #215acd;
-    color: white;
-    font-size: 32rpx;
-    border-radius: 12rpx;
-    font-weight: 400;
-    border: none;
-    outline: none;
-  }
-}
-</style>

src/pages/schedule/details/taskmanagement/index1.vue

@@ -1,541 +0,0 @@
-<template>
-  <view class="task-management">
-    <view class="fixed-area">
-      <view class="title">
-        <text class="title-text">龙飞街加油站</text>
-      </view>
-      <view>
-        <wd-tabs v-model="tab">
-          <block v-for="item in tabs" :key="item">
-            <wd-tab :title="`${item}`" :name="item" />
-          </block>
-        </wd-tabs>
-      </view>
-    </view>
-
-    <scroll-view class="task-container" scroll-y>
-      <view class="tasks">
-        <view
-          v-for="(task, index) in currentTasks"
-          :key="index"
-          class="task-item"
-        >
-          <!-- 任务描述 -->
-          <view class="task-description">
-            <text class="task-number">{{ index + 1 }}.</text>
-            <text class="task-text"
-              >{{ task.description }}
-              <wd-icon
-                v-if="task?.icon"
-                :name="task?.icon"
-                size="32rpx"
-                @click="() => (popupshow.centershow = true)"
-              ></wd-icon>
-            </text>
-          </view>
-
-          <!-- 操作说明 -->
-          <view v-if="task.instructions" class="task-instructions">
-            <text class="instructions-text">{{ task.instructions }}</text>
-          </view>
-
-          <!-- 示例图片 -->
-          <view v-if="task.examples.length > 0" class="example-images">
-            <view
-              v-for="(example, idx) in task.examples"
-              :key="idx"
-              class="example-image"
-            >
-              <image :src="example" mode="aspectFill"></image>
-              <text class="example-text">示例</text>
-            </view>
-          </view>
-
-          <!-- 已上传图片 -->
-          <view v-if="task.images.length > 0" class="uploaded-images">
-            <view
-              v-for="(image, idx) in task.images"
-              :key="idx"
-              class="uploaded-image"
-            >
-              <image :src="image" mode="aspectFill"></image>
-            </view>
-          </view>
-
-          <!-- 上传按钮 -->
-          <view
-            v-if="task.isimages"
-            class="upload-btn"
-            @tap="chooseImage(index)"
-          >
-            <view class="btn-content">
-              <text class="btn-icon">+</text>
-              <text class="btn-text">拍照</text>
-            </view>
-          </view>
-
-          <!-- 状态选择 -->
-          <view v-if="!task.details" class="status-select">
-            <view class="radio-group">
-              <view class="radio-item" @tap="toggleTaskStatus(index)">
-                <view
-                  class="radio"
-                  :class="{ selected: task.status === 'normal' }"
-                ></view>
-                <text class="radio-text">正常</text>
-              </view>
-              <view class="radio-item" @tap="toggleTaskStatus(index)">
-                <view
-                  class="radio"
-                  :class="{ selected: task.status === 'abnormal' }"
-                ></view>
-                <text class="radio-text">异常</text>
-              </view>
-            </view>
-          </view>
-
-          <!-- 带详情的状态选择 -->
-          <view v-if="task.details" class="detail-status">
-            <text class="detail-name">{{ task.details[0].name }}</text>
-            <view class="radio-group">
-              <view class="radio-item" @tap="toggleTaskStatus(index, 0)">
-                <view
-                  class="radio"
-                  :class="{ selected: task.details[0].status === 'normal' }"
-                ></view>
-                <text class="radio-text">正常</text>
-              </view>
-              <view class="radio-item" @tap="toggleTaskStatus(index, 0)">
-                <view
-                  class="radio"
-                  :class="{ selected: task.details[0].status === 'abnormal' }"
-                ></view>
-                <text class="radio-text">异常</text>
-              </view>
-            </view>
-            <view class="detail-items">
-              <view
-                v-for="(detail, idx) in task.details.slice(1)"
-                :key="idx"
-                class="detail-item"
-              >
-                <view class="detail-name">{{ detail.name }}</view>
-                <view
-                  class="radio-item"
-                  @tap="toggleTaskStatus(index, idx + 1)"
-                >
-                  <view
-                    class="radio"
-                    :class="{ selected: detail.status === 'normal' }"
-                  ></view>
-                  <text class="radio-text">正常</text>
-                </view>
-                <view
-                  class="radio-item"
-                  @tap="toggleTaskStatus(index, idx + 1)"
-                >
-                  <view
-                    class="radio"
-                    :class="{ selected: detail.status === 'abnormal' }"
-                  ></view>
-                  <text class="radio-text">异常</text>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </scroll-view>
-    <centerpopup v-model:centershow="popupshow.centershow" />
-    <bottompopup v-model:bottomshow="popupshow.bottomshow" />
-    <!-- 确定按钮 -->
-    <view class="confirm-btn">
-      <button class="btn" @click="submitTasks">确 定</button>
-    </view>
-  </view>
-</template>
-<script lang="ts" setup>
-import { ref, computed } from 'vue'
-import useUpload from '@/hooks/useUpload'
-import centerpopup from '../popup/centerpopup.vue'
-import bottompopup from '../popup/bottompopup.vue'
-const popupshow = ref({
-  centershow: false,
-  bottomshow: false,
-})
-// const popupshow = ref({})
-const tab = ref('前庭')
-const tabs = ['营销', '出入口', '前庭', '便利店', '洗手间']
-
-// 定义任务类型
-interface Task {
-  id: string
-  type: string
-  description: string
-  icon?: string
-  instructions: string
-  examples: string[]
-  images: string[]
-  status: 'normal' | 'abnormal'
-  isimages: boolean
-  details?: {
-    name: string
-    status: 'normal' | 'abnormal'
-  }[]
-}
-
-// 任务数据
-const tasks = ref<Task[]>([
-  {
-    id: '1',
-    type: '前庭',
-    description:
-      '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-    instructions: '拍照：按照示例图拍摄前庭内海报宣传物，可上传多张照片',
-    examples: [
-      'https://picsum.photos/id/1018/200/150',
-      'https://picsum.photos/id/1019/200/150',
-    ],
-    images: [],
-    isimages: true,
-    status: 'normal',
-  },
-  {
-    id: '2',
-    type: '前庭',
-    description: '[卫生] 抽油枪栓是否出现空转或存在明显渗油。',
-    icon: 'help-circle',
-    instructions: '',
-    examples: [],
-    images: [],
-    isimages: false,
-    status: 'normal',
-    details: [{ name: '12号枪', status: 'normal' }],
-  },
-  {
-    id: '3',
-    type: '前庭',
-    description:
-      '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-    instructions: '拍照：按照示例图拍摄前庭内海报宣传物，可上传多张照片',
-    examples: [
-      'https://picsum.photos/id/1018/200/150',
-      'https://picsum.photos/id/1019/200/150',
-    ],
-    images: ['https://picsum.photos/id/1025/200/150'],
-    isimages: true,
-    status: 'normal',
-  },
-])
-
-// 根据当前标签筛选任务
-const currentTasks = computed(() => {
-  return tasks.value.filter((task) => task.type === tab.value)
-})
-
-// 选择图片
-const chooseImage = (index: number) => {
-  // 为每个上传请求创建独立的upload实例，确保能正确处理对应的任务索引
-  const { run: uploadImage } = useUpload({
-    fileType: 'image',
-    success: (res) => {
-      console.log('上传成功', res)
-      // 将上传成功的图片URL添加到对应任务的images数组中
-      // 假设res包含图片URL，实际结构需要根据后端返回调整
-      const imageUrl = typeof res === 'string' ? res : res.url || ''
-      if (imageUrl) {
-        tasks.value[index].images.push(imageUrl)
-      }
-    },
-    error: (err) => {
-      console.error('上传失败', err)
-    },
-  })
-  uploadImage()
-}
-
-// 切换任务状态
-const toggleTaskStatus = (taskIndex: number, detailIndex?: number) => {
-  const task = tasks.value[taskIndex]
-  if (detailIndex !== undefined && task.details) {
-    // 有子项的任务
-    const detail = task.details[detailIndex]
-    detail.status = detail.status === 'normal' ? 'abnormal' : 'normal'
-    // 检查是否有任一子项异常
-    task.status = task.details.some((d) => d.status === 'abnormal')
-      ? 'abnormal'
-      : 'normal'
-  } else {
-    // 无子项的任务
-    task.status = task.status === 'normal' ? 'abnormal' : 'normal'
-  }
-  if (task.status === 'abnormal') {
-    popupshow.value.bottomshow = true
-  }
-}
-
-// 提交任务
-const submitTasks = () => {
-  console.log('提交任务', tasks.value)
-  // 这里可以添加提交逻辑
-  uni.showToast({
-    title: '提交成功',
-    icon: 'success',
-  })
-}
-// 关闭弹窗按钮
-// const handleClose = () => {
-//   popupshow.value = false
-// }
-</script>
-<style lang="scss" scoped>
-.task-management {
-  display: flex;
-  flex-direction: column;
-  height: 1500rpx;
-  overflow: hidden;
-  .fixed-area {
-    flex-shrink: 0; // 不让它被压缩
-    background-color: #fff;
-    position: sticky; // 若想随外层滚就 sticky；想完全固定用 fixed 即可
-    top: 0;
-    z-index: 10;
-  }
-  .title {
-    width: 100%;
-    height: 128rpx;
-    background-color: #4a80c3;
-    display: flex;
-    align-items: center;
-    box-sizing: border-box;
-    padding-left: 46rpx;
-  }
-
-  .title-text {
-    font-size: 36rpx;
-    font-weight: 500;
-    color: #fff;
-  }
-
-  // // 任务容器
-  // .task-container {
-  //   flex: 1;
-  //   padding: 0 30rpx;
-
-  //   .tasks {
-  //     padding: 20rpx 0;
-  //   }
-  // }
-  .task-container {
-    flex: 1; // 占剩余高度
-    overflow-y: auto; // 仅这里滚动
-    padding: 0 30rpx;
-  }
-  // 任务项
-  .task-item {
-    margin-bottom: 40rpx;
-
-    // 任务描述
-    .task-description {
-      display: flex;
-      margin-bottom: 16rpx;
-
-      .task-number {
-        font-size: 28rpx;
-        color: #333;
-        margin-right: 8rpx;
-        font-weight: 500;
-      }
-
-      .task-text {
-        font-size: 28rpx;
-        font-weight: 400;
-        color: #333;
-        line-height: 44rpx;
-      }
-    }
-
-    // 操作说明
-    .task-instructions {
-      margin-bottom: 20rpx;
-
-      .instructions-text {
-        font-size: 24rpx;
-        color: #666;
-        line-height: 36rpx;
-      }
-    }
-
-    // 示例图片
-    .example-images {
-      display: flex;
-      gap: 16rpx;
-      margin-bottom: 20rpx;
-
-      .example-image {
-        width: 140rpx;
-        height: 100rpx;
-        position: relative;
-
-        image {
-          width: 100%;
-          height: 100%;
-          border-radius: 8rpx;
-        }
-
-        .example-text {
-          position: absolute;
-          bottom: 0;
-          left: 0;
-          right: 0;
-          background-color: rgba(0, 0, 0, 0.5);
-          color: white;
-          font-size: 20rpx;
-          text-align: center;
-          padding: 4rpx 0;
-          border-radius: 0 0 8rpx 8rpx;
-        }
-      }
-    }
-
-    // 已上传图片
-    .uploaded-images {
-      display: flex;
-      gap: 16rpx;
-      margin-bottom: 20rpx;
-
-      .uploaded-image {
-        width: 140rpx;
-        height: 100rpx;
-
-        image {
-          width: 100%;
-          height: 100%;
-          border-radius: 8rpx;
-        }
-      }
-    }
-
-    // 上传按钮
-    .upload-btn {
-      width: 140rpx;
-      height: 100rpx;
-      border: 2rpx dashed #ccc;
-      border-radius: 8rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-bottom: 24rpx;
-
-      .btn-content {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-
-        .btn-icon {
-          font-size: 40rpx;
-          color: #999;
-          line-height: 40rpx;
-        }
-
-        .btn-text {
-          font-size: 24rpx;
-          color: #999;
-          margin-top: 4rpx;
-        }
-      }
-    }
-
-    // 状态选择
-    .status-select {
-      margin-bottom: 20rpx;
-
-      .radio-group {
-        display: flex;
-        gap: 40rpx;
-      }
-    }
-
-    // 带详情的状态选择
-    .detail-status {
-      margin-bottom: 20rpx;
-
-      .detail-name {
-        font-size: 28rpx;
-        color: #333;
-        margin-right: 20rpx;
-        // margin-bottom: 10rpx;
-      }
-
-      .radio-group {
-        display: flex;
-        gap: 40rpx;
-      }
-
-      .detail-items {
-        margin-top: 16rpx;
-        display: flex;
-        flex-wrap: wrap;
-        gap: 40rpx;
-      }
-    }
-
-    // 单选按钮
-    .radio-group {
-      .radio-item {
-        // margin-top: 50rpx;
-        display: flex;
-        align-items: center;
-        gap: 8rpx;
-
-        .radio {
-          width: 32rpx;
-          height: 32rpx;
-          border: 2rpx solid #ccc;
-          border-radius: 50%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          &.selected {
-            border-color: #215acd;
-            // background-color: #4a80c3;
-
-            &::after {
-              content: '';
-              width: 16rpx;
-              height: 16rpx;
-              border-radius: 50%;
-              background-color: #215acd;
-            }
-          }
-        }
-
-        .radio-text {
-          font-size: 28rpx;
-          color: #333;
-        }
-      }
-    }
-  }
-
-  // 确定按钮
-  .confirm-btn {
-    padding: 20rpx 30rpx;
-    background-color: white;
-    border-top: 1rpx solid #eee;
-
-    .btn {
-      width: 100%;
-      height: 80rpx;
-      background-color: #215acd;
-      color: white;
-      font-size: 32rpx;
-      border-radius: 12rpx;
-      font-weight: 400;
-      border: none;
-      outline: none;
-    }
-  }
-}
-</style>

src/utils/dicts.ts

@@ -0,0 +1,55 @@
+/**
+ * 题目类型
+ */
+export const questionTypes = [
+  { label: '单选题', value: 'single_choice' },
+  { label: '多选题', value: 'multiple_choice' },
+  { label: '填空题', value: 'fill_blank' },
+  { label: '简答题', value: 'essay' },
+  { label: '判断题', value: 'judgment' },
+]
+
+// 试题难度选项 easy-简单、medium-中等、hard-困难
+export const difficultyOptions = [
+  { label: '简单', value: 'easy', color: '' },
+  { label: '中等', value: 'medium', color: 'yellow' },
+  { label: '困难', value: 'hard', color: 'red' },
+]
+
+// p=pending-待发布、ongoing-已发布、finished-已结束、cancelled-已关闭
+export const examStatusOptions = [
+  { label: '已发布', value: 'ongoing', color: 'success' },
+  { label: '待发布', value: 'pending', color: 'primary' },
+  { label: '已关闭', value: 'cancelled', color: 'danger' },
+  { label: '已结束', value: 'finished', color: 'info' },
+]
+
+export const reviewStatusOptions = [
+  { label: '待批改', value: 'unreviewed', color: '#EB5E12' },
+  { label: '批改中', value: 'reviewing', color: '#FFC107' },
+  { label: '已批改', value: 'reviewed', color: '#38B865' },
+]
+
+export const taskLevelOptions = [
+  { label: '常规', value: 0, color: '#409EFF' },
+  { label: '选做', value: 1, color: '#E6A23C' },
+  { label: '必做', value: 2, color: '#67C23A' },
+]
+
+export const taskStatusOptions: any = [
+  { label: '已取消', value: 0, color: '#409EFF' },
+  { label: '待处理', value: 1, color: '#E6A23C' },
+  { label: '超期未处理', value: 2, color: '#F56C6C' },
+  { label: '已处理', value: 3, color: '#909399' },
+]
+
+export const authStatusOptions = [
+  { label: '可授权', value: 0, color: '#215ACD' },
+  { label: '已授权', value: 1, color: '#339169' },
+  { label: '被授权', value: 2, color: '#EB5E12' },
+]
+
+export function getLabel(dict: any[], value: string) {
+  const item = dict.find(item => item.value === value)
+  return item?.label || value
+}

vite.config.ts

@@ -67,7 +67,8 @@ export default defineConfig(({ command, mode }) => {
     plugins: [
       UniLayouts(),
       UniPlatform(),
-      UniManifest(),
+      // 暂时禁用 UniManifest 插件，以解决权限错误
+      // UniManifest(),
       UniEcharts(),
       UniPages({
         exclude: ['**/components/**/**.*'],
@@ -79,17 +80,18 @@ export default defineConfig(({ command, mode }) => {
         dts: 'src/types/uni-pages.d.ts',
       }),
       // Optimization 插件需要 page.json 文件，故应在 UniPages 插件之后执行
-      Optimization({
-        enable: {
-          optimization: true,
-          'async-import': true,
-          'async-component': true,
-        },
-        dts: {
-          base: 'src/types',
-        },
-        logger: false,
-      }),
+      // 暂时禁用 Optimization 插件，以解决导入错误
+      // Optimization({
+      //   enable: {
+      //     optimization: true,
+      //     'async-import': true,
+      //     'async-component': true,
+      //   },
+      //   dts: {
+      //     base: 'src/types',
+      //   },
+      //   logger: false,
+      // }),
       // UniXXX 需要在 Uni 之前引入
       // 若存在改变 pages.json 的插件，请将 UniKuRoot 放置其后
       UniKuRoot({