fix:

apps/web-ele/src/adapter/component/index.ts

@@ -3,12 +3,14 @@
  * 可用于 vben-form、vben-modal、vben-drawer 等组件使用,
  */
 
+import type { UploadFile } from 'element-plus';
+
 import type { Component } from 'vue';
 
 import type { BaseFormComponentType } from '@vben/common-ui';
 import type { Recordable } from '@vben/types';
 
-import { defineComponent, getCurrentInstance, h, ref } from 'vue';
+import { defineComponent, getCurrentInstance, h, ref, watch } from 'vue';
 
 import { ApiComponent, globalShareState, IconPicker } from '@vben/common-ui';
 import { $t } from '@vben/locales';
@@ -20,6 +22,7 @@ import {
   ElCheckboxGroup,
   ElDatePicker,
   ElDivider,
+  ElImageViewer,
   ElInput,
   ElInputNumber,
   ElInputTag,
@@ -37,6 +40,139 @@ import {
 
 import { Tinymce as RichTextarea } from '#/components/tinymce';
 
+const withPreviewUpload = () => {
+  return defineComponent({
+    name: 'UploadWithPreview',
+    emits: ['update:modelValue'],
+    setup: (
+      props: any,
+      { attrs, slots, emit }: { attrs: any; emit: any; slots: any },
+    ) => {
+      const previewVisible = ref<boolean>(false);
+      const previewImageUrl = ref<string>('');
+      const fileList = ref<UploadFile[]>(
+        attrs?.fileList || attrs?.['file-list'] || [],
+      );
+
+      const handleBeforeUpload = (file: UploadFile) => {
+        if (attrs.maxSize && (file.size || 0) / 1024 / 1024 > attrs.maxSize) {
+          ElNotification({
+            title: $t('ui.formRules.sizeLimitTitle'),
+            message: $t('ui.formRules.sizeLimit', [attrs.maxSize]),
+            type: 'error',
+          });
+          return false;
+        }
+        return attrs.beforeUpload?.(file) ?? true;
+      };
+
+      const handleChange = (
+        uploadFile: UploadFile,
+        uploadFiles: UploadFile[],
+      ) => {
+        fileList.value = uploadFiles.filter(
+          (file) => file.status !== 'removed',
+        );
+        emit(
+          'update:modelValue',
+          fileList.value.length > 0 ? fileList.value : undefined,
+        );
+      };
+
+      const handlePreview = (file: UploadFile) => {
+        // 阻止默认行为，避免新页面打开
+        event?.preventDefault();
+        event?.stopPropagation();
+
+        // 检查是否为图片文件
+        const isImageFile = (file: UploadFile): boolean => {
+          const imageExtensions = new Set([
+            'bmp',
+            'gif',
+            'jpeg',
+            'jpg',
+            'png',
+            'webp',
+          ]);
+
+          // 优先检查 file.type，对于 blob URL 来说，file.type 会包含正确的 MIME 类型
+          if (file.type && file.type.startsWith('image/')) {
+            return true;
+          }
+
+          // 检查 file.name 的扩展名
+          if (file.name) {
+            const ext = file.name.split('.').pop()?.toLowerCase();
+            if (ext && imageExtensions.has(ext)) {
+              return true;
+            }
+          }
+
+          // 最后检查 file.url 的扩展名（非 blob URL）
+          if (file.url && !file.url.startsWith('blob:')) {
+            const ext = file.url.split('.').pop()?.toLowerCase();
+            if (ext && imageExtensions.has(ext)) {
+              return true;
+            }
+          }
+
+          return false;
+        };
+
+        // 如果是图片文件，使用 ElImageViewer 预览
+        if (isImageFile(file)) {
+          previewImageUrl.value = file.url || file.preview || '';
+          previewVisible.value = true;
+        } else {
+          // 非图片文件直接在新窗口打开
+          if (file.url) {
+            window.open(file.url, '_blank');
+          } else if (file.preview) {
+            window.open(file.preview, '_blank');
+          } else {
+            ElNotification({
+              title: $t('ui.formRules.previewWarningTitle'),
+              message: $t('ui.formRules.previewWarning'),
+              type: 'warning',
+            });
+          }
+        }
+      };
+
+      // 监听表单 API 设置的值
+      watch(
+        () => attrs.modelValue,
+        (res) => {
+          fileList.value = res || [];
+        },
+      );
+
+      return () => {
+        const uploadProps = {
+          ...props,
+          ...attrs,
+          fileList: fileList.value,
+          beforeUpload: handleBeforeUpload,
+          onChange: handleChange,
+          onPreview: handlePreview,
+        };
+
+        return h('div', {}, [
+          h(ElUpload, uploadProps, slots),
+          previewVisible.value &&
+            h(ElImageViewer, {
+              urlList: [previewImageUrl.value],
+              showProgress: true,
+              onClose: () => {
+                previewVisible.value = false;
+              },
+            }),
+        ]);
+      };
+    },
+  });
+};
+
 const withDefaultPlaceholder = <T extends Component>(
   component: T,
   type: 'input' | 'select',
@@ -257,7 +393,7 @@ async function initComponentAdapter() {
       );
     },
     TreeSelect: withDefaultPlaceholder(ElTreeSelect, 'select'),
-    Upload: ElUpload,
+    Upload: withPreviewUpload(),
     RichTextarea,
     SectionTitle: (props, { attrs, slots }) => {
       // 获取标题文本，优先使用props.title，其次使用attrs.title，最后使用默认值

apps/web-ele/src/views/schedule/detail/components/emergency.vue

@@ -210,10 +210,6 @@ const formatDateTime = (dateTime: string) => {
     object-fit: cover;
     border-radius: 4px;
     transition: transform 0.2s;
-
-    &:hover {
-      transform: scale(1.05);
-    }
   }
 }
 </style>

apps/web-ele/src/views/schedule/detail/components/group-log.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 // @ts-ignore
 
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 
 import {
   ElCard,
@@ -168,6 +168,14 @@ const init = () => {
   basicTableApi.query();
 };
 
+// 监听一下状态变化，变化之后也加载 init
+watch(
+  () => props.taskDetail.status,
+  () => {
+    init();
+  },
+);
+
 // 组件挂载时，设置表格数据
 onMounted(() => {
   init();
@@ -370,11 +378,11 @@ onMounted(() => {
       <div class="mb-6">
         <BasicTable table-title="" class="w-full" />
       </div>
-      <ElDescriptions :column="4" class="mb-6">
+      <!-- <ElDescriptions :column="4" class="mb-6">
         <ElDescriptionsItem label="其它信息:" :span="4">
           {{ groupLogData.otherInfo || '-' }}
         </ElDescriptionsItem>
-      </ElDescriptions>
+      </ElDescriptions> -->
     </div>
   </ElCard>
 </template>
@@ -434,10 +442,6 @@ onMounted(() => {
     object-fit: cover;
     border-radius: 4px;
     transition: transform 0.2s;
-
-    &:hover {
-      transform: scale(1.05);
-    }
   }
 }
 </style>

apps/web-ele/src/views/schedule/detail/components/join-emergency.vue

@@ -130,10 +130,6 @@ defineProps<JoinEmergencyProps>();
     object-fit: cover;
     border-radius: 4px;
     transition: transform 0.2s;
-
-    &:hover {
-      transform: scale(1.05);
-    }
   }
 }
 </style>

apps/web-ele/src/views/schedule/detail/components/meeting.vue

@@ -211,10 +211,6 @@ const formatDateTime = (dateTime: string) => {
     object-fit: cover;
     border-radius: 4px;
     transition: transform 0.2s;
-
-    &:hover {
-      transform: scale(1.05);
-    }
   }
 }
 </style>

apps/web-ele/src/views/schedule/detail/components/plan.vue

@@ -434,10 +434,6 @@ onMounted(() => {
     object-fit: cover;
     border-radius: 4px;
     transition: transform 0.2s;
-
-    &:hover {
-      transform: scale(1.05);
-    }
   }
 }
 </style>

apps/web-ele/src/views/schedule/detail/components/weekly-report.vue

@@ -173,10 +173,6 @@ const weeklyReportData = computed(() => {
     object-fit: cover;
     border-radius: 4px;
     transition: transform 0.2s;
-
-    &:hover {
-      transform: scale(1.05);
-    }
   }
 }
 </style>

apps/web-ele/src/views/schedule/detail/drawer/groupLog/index.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="tsx">
 import type { ElIcon } from 'element-plus';
 
 // @ts-ignore
@@ -12,7 +12,7 @@ import { useVbenDrawer, useVbenForm, useVbenModal } from '@vben/common-ui';
 // @ts-ignore
 import { Delete } from '@element-plus/icons-vue';
 // @ts-ignore
-import { ElMessage } from 'element-plus';
+import { ElInputNumber, ElMessage } from 'element-plus';
 
 // @ts-ignore
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
@@ -252,8 +252,30 @@ const init = async () => {
       gridOptions.columns.push({
         field: `id_${item.id}`,
         title: `${item.itemName}（${item.standardScore}）`,
-        editRender: { name: 'input' },
+        // editRender: { name: 'input' },
         // cellType: 'number',
+        editRender: {
+          name: 'input',
+          immediate: true,
+          defaultValue: 20,
+        },
+        slots: {
+          // default: (data: any) => {
+          //   return data.row.machineValueFirst || '-';
+          // },
+          edit: (data: any) => {
+            return (
+              <ElInputNumber
+                controls-position="right"
+                max={item.standardScore}
+                min={0}
+                precision={3}
+                step={0.1}
+                v-model={data.row[`id_${item.id}`]}
+              />
+            );
+          },
+        },
         width: 150,
       });
     });

apps/web-ele/src/views/schedule/detail/index.vue

@@ -917,6 +917,10 @@ onMounted(async () => {
         :params="{
           stationId: taskInfo.stationId,
         }"
+        :only-users="true"
+        :user-params="{
+          stationId: taskInfo.stationId,
+        }"
       />
     </ExecutorModal>
 
@@ -1017,10 +1021,6 @@ onMounted(async () => {
     object-fit: cover;
     border-radius: 4px;
     transition: transform 0.2s;
-
-    &:hover {
-      transform: scale(1.05);
-    }
   }
 }
 

apps/web-ele/src/views/schedule/view/components/day/index.vue

@@ -122,7 +122,11 @@ const todaylist = computed(() => {
               mainbackcolor: '',
             },
           };
-          if (days > 0) {
+          if (item.status === 0) {
+            remainingTime.dayobj.day += `还剩${days}天截止`;
+            remainingTime.dayobj.topbackcolor = '#86909C';
+            remainingTime.dayobj.mainbackcolor = '#F1F1F1';
+          } else if (days > 0) {
             remainingTime.dayobj.day += `还剩${days}天截止`;
             if (days >= 30) {
               remainingTime.dayobj.topbackcolor = '#86909C';

apps/web-ele/src/views/schedule/view/components/month/index.vue

@@ -1,7 +1,8 @@
 <script setup>
-import { ref, computed, watch, defineEmits } from 'vue';
-import { ElCalendar, ElTooltip } from 'element-plus';
+import { computed, ref } from 'vue';
+
 import dayjs from 'dayjs';
+import { ElCalendar, ElTooltip } from 'element-plus';
 // Props from parent component
 const props = defineProps(['month', 'daylist', 'overduedaylist']);
 // const emit = defineEmits(['update:month']);
@@ -296,24 +297,50 @@ const moonlist = computed(() => {
   const daylists = [...props.daylist];
   return daylists
     .filter((item) => item.isOverdue !== '1')
-    .map((item) => ({
-      id: item.id,
-      name: item.taskName,
-      date: dayjs(new Date(item?.displayDate))
-        .format('YYYY-MM-DD HH:mm:ss')
-        .split(' ')[0],
-      start: dayjs(new Date(item?.displayDate))
-        .format('YYYY-MM-DD HH:mm:ss')
-        .split(' ')[1],
-      status:
-        item?.authStatus == '0' && item?.isLicensable == '1'
-          ? 'Authorizable'
-          : item?.authStatus == '2'
-            ? 'Authorized'
-            : item?.authStatus == '1'
-              ? 'Authorized1'
-              : '',
-    }));
+    .map((item) => {
+      let status = '#215acd';
+      switch (item.status) {
+        case 0: {
+          status = '#8c8c8c'; // 任务未开始或取消
+          break;
+        }
+        case 1: {
+          if (item?.endTime) {
+            const endTime = new Date(item.endTime).getTime();
+            const currentTime = Date.now();
+            if (endTime <= currentTime) {
+              status = '#d34b27';
+            } else if (
+              endTime > currentTime &&
+              endTime - currentTime <= 24 * 60 * 60 * 1000
+            ) {
+              status = '#ff9429';
+            }
+          }
+          break;
+        }
+        case 2: {
+          status = '#d34b27';
+          break;
+        }
+        case 3: {
+          status = '#339169';
+          break;
+        }
+        default: {
+          break;
+        }
+      }
+      return {
+        id: item.id,
+        name: item.taskName,
+        date: dayjs(new Date(item?.displayDate))
+          .format('YYYY-MM-DD HH:mm:ss')
+          .split(' ')[0],
+        start: dayjs(new Date(item?.displayDate)).format('HH:mm'),
+        status,
+      };
+    });
 });
 const overduelist = computed(() => {
   const daylists = [...props.overduedaylist];
@@ -332,29 +359,11 @@ const overduelist = computed(() => {
 const tasks = computed(() => {
   return [...moonlist.value, ...overduelist.value];
 });
-// const getTaskStatusClass = (task) => {
-//   switch (task.status) {
-//     case 'cancelled':
-//     case 'not-started': {
-//       return 'not-started';
-//     }
-//     case 'completed': {
-//       return 'completed';
-//     }
-//     case 'overdue': {
-//       return 'overdue';
-//     }
-//     case 'processable': {
-//       return 'processable';
-//     }
-//     default: {
-//       return 'not-started';
-//     }
-//   }
-// };
-// Get tasks for a specific date
+
 const getTasksForDate = (date) => {
-  const dateStr = date.toISOString().split('T')[0];
+  // console.log(date, 'data');
+  // const dateStr = date.toISOString().split('T')[0];
+  const dateStr = dayjs(date).format('YYYY-MM-DD');
   return tasks.value.filter((task) => {
     if (typeof task.date === 'string') {
       return task.date === dateStr;
@@ -384,21 +393,7 @@ const isDateExpanded = (date) => {
   const dateStr = date.toISOString().split('T')[0];
   return expandedDates.value[dateStr] || false;
 };
-// 左侧圆点颜色
-const statusColor = (status) => {
-  switch (status) {
-    case 'overdue': //逾期颜色
-      return '#D34B27';
-    case 'Authorizable': //可授权颜色
-      return '#215ACD';
-    case 'Authorized': //被授权颜色
-      return '#FF9428';
-    case 'Authorized1': //已授权颜色
-      return '#339169';
-    default:
-      return '#333333';
-  }
-};
+
 const todayWeek = computed(() => dayjs().day() - 1);
 </script>
 
@@ -421,13 +416,13 @@ const todayWeek = computed(() => dayjs().day() - 1);
               class="task-item"
             >
               <ElTooltip
-                :content="`${task.start ? task.start + ' ' : ''}${task.name}${task.department ? ' — ' + task.department : ''}`"
+                :content="`${task.start ? `${task.start} ` : ''}${task.name}${task.department ? ` — ${task.department}` : ''}`"
                 placement="top"
               >
                 <div class="task-row">
                   <span
                     class="task-dot"
-                    :style="{ backgroundColor: statusColor(task.status) }"
+                    :style="{ backgroundColor: task.status }"
                   ></span>
                   <span v-if="task.start || task.time" class="task-time">
                     {{ task.start || task.time }}
@@ -680,7 +675,7 @@ const todayWeek = computed(() => dayjs().day() - 1);
 
 .task-name {
   font-size: 12px;
-  color: #31373D;
+  color: #31373d;
   line-height: 1.2;
   text-overflow: ellipsis;
   overflow: hidden;
@@ -701,9 +696,9 @@ const todayWeek = computed(() => dayjs().day() - 1);
 .task-time {
   font-size: 11px;
   /* color: #666; */
-  color: #31373D;
-  width: 40px;
-  flex: 0 0 40px;
+  color: #31373d;
+  width: 30px;
+  /* flex: 0 0 40px; */
 }
 
 /* Expand button styles */

apps/web-ele/src/views/schedule/view/components/week/index.vue

@@ -1,6 +1,8 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
+
 import dayjs from 'dayjs';
+
 const props = defineProps({
   year: {
     type: Number,
@@ -31,24 +33,52 @@ const weeklist = computed(() => {
   const daylists = [...props.daylist];
   return daylists
     .filter((item) => item.isOverdue !== '1')
-    .map((item) => ({
-      id: item.id,
-      name: item.taskName,
-      date: dayjs(new Date(item?.displayDate))
-        .format('YYYY-MM-DD HH:mm:ss')
-        .split(' ')[0],
-      start: dayjs(new Date(item?.displayDate))
-        .format('YYYY-MM-DD HH:mm:ss')
-        .split(' ')[1],
-      status:
-        item?.authStatus == '0' && item?.isLicensable == '1'
-          ? 'Authorizable'
-          : item?.authStatus == '2'
-            ? 'Authorized'
-            : item?.authStatus == '1'
-              ? 'Authorized1'
-              : '',
-    }));
+    .map((item) => {
+      let status = 'Authorizable';
+      switch (item.status) {
+        case 0: {
+          status = ''; // 任务未开始或取消
+          break;
+        }
+        case 1: {
+          if (item?.endTime) {
+            const endTime = new Date(item.endTime).getTime();
+            const currentTime = Date.now();
+            if (endTime <= currentTime) {
+              status = 'overdue';
+            } else if (
+              endTime > currentTime &&
+              endTime - currentTime <= 24 * 60 * 60 * 1000
+            ) {
+              status = 'Authorized';
+            }
+          }
+          break;
+        }
+        case 2: {
+          status = 'overdue';
+          break;
+        }
+        case 3: {
+          status = 'Authorized1';
+          break;
+        }
+        default: {
+          break;
+        }
+      }
+      return {
+        id: item.id,
+        name: item.taskName,
+        date: dayjs(new Date(item?.displayDate))
+          .format('YYYY-MM-DD HH:mm:ss')
+          .split(' ')[0],
+        start: dayjs(new Date(item?.displayDate))
+          .format('YYYY-MM-DD HH:mm:ss')
+          .split(' ')[1],
+        status,
+      };
+    });
 });
 const overduelist = computed(() => {
   const daylists = [...props.overduedaylist];
@@ -115,8 +145,6 @@ const getTasksForDay = (date) => {
   const dayFull = weekDays.value.find((d) => d.date === date)?.fullDate;
   if (!dayFull) return { timeSlots: {}, allTasks: [] };
   const list = tasks.value.filter((task) => task.date === dayFull);
-  // 调试：打印任务数量
-  // console.log(`Date: ${date}, FullDate: ${dayFull}, Task count: ${list.length}`);
 
   // 对任务进行排序，将overdue状态的任务放在最前面，然后按start时间排序
   const sortedList = [...list].sort((a, b) => {
@@ -224,22 +252,6 @@ const getTasksForDay = (date) => {
 //     }
 //   }
 // };
-const getTaskStatusClass = (task) => {
-  switch (task.status) {
-    case 'Authorized1': {
-      return 'Authorized1'; //已授权
-    }
-    case 'overdue': {
-      return 'overdue'; // 已逾期
-    }
-    case 'Authorizable': {
-      return 'Authorizable'; //可授权
-    }
-    case 'Authorized': {
-      return 'Authorized'; //被授权
-    }
-  }
-};
 
 // 计算当前时间线的位置
 const currentTimeLineStyle = computed(() => {
@@ -249,7 +261,7 @@ const currentTimeLineStyle = computed(() => {
   const totalMinutes = hours * 60 + minutes;
   const top = (totalMinutes / (24 * 60)) * (hourHeight * 3); // 因为有3个小时槽
   return {
-    top: top + 'px',
+    top: `${top}px`,
   };
 });
 
@@ -302,13 +314,13 @@ const getExpandButtonPosition = (date, slotKey) => {
     '16:00': 720,
   }[slotKey];
 
-  if (!slotTasks.length) return slotStart;
+  if (slotTasks.length === 0) return slotStart;
 
   if (
     isExpanded(weekDays.value.find((d) => d.date === date)?.fullDate, slotKey)
   ) {
     // 如果展开，找到当前时间段最后一个任务的位置，在其下方放置按钮
-    const lastTask = allTasks.filter((task) => task.slotKey === slotKey).pop();
+    const lastTask = allTasks.findLast((task) => task.slotKey === slotKey);
     return lastTask.top + lastTask.height + 4; // 4px间距，使按钮更靠近任务
   } else {
     // 如果未展开，在当前时间段第8个任务下方放置按钮（如果有8个任务的话）
@@ -320,7 +332,7 @@ const getExpandButtonPosition = (date, slotKey) => {
     }
 
     // 如果任务不足8个（理论上不会发生，因为按钮只在>8时显示）
-    const lastTask = allTasks.filter((task) => task.slotKey === slotKey).pop();
+    const lastTask = allTasks.findLast((task) => task.slotKey === slotKey);
     return lastTask.top + lastTask.height + 4;
   }
 };
@@ -330,7 +342,7 @@ const getExpandedTimeSlotStyle = (date, slotKey) => {
   const { allTasks } = getTasksForDay(date);
   const slotTasks = allTasks.filter((task) => task.slotKey === slotKey);
 
-  if (!slotTasks.length) return {};
+  if (slotTasks.length === 0) return {};
 
   // 找到该时间段第一个任务的位置
   const firstTask = slotTasks[0];
@@ -351,9 +363,9 @@ const getExpandedTimeSlotStyle = (date, slotKey) => {
   }[slotKey];
 
   return {
-    top: top + 'px',
-    height: height + 'px',
-    width: width + 'px',
+    top: `${top}px`,
+    height: `${height}px`,
+    width: `${width}px`,
     zIndex: baseZIndex,
   };
 };
@@ -396,7 +408,7 @@ const getExpandedTimeSlotStyle = (date, slotKey) => {
                   v-for="(h, i) in hours"
                   :key="h"
                   class="hour-line"
-                  :style="{ height: hourHeight + 'px' }"
+                  :style="{ height: `${hourHeight}px` }"
                 ></div>
               </div>
               <!-- tasks positioned -->
@@ -424,10 +436,10 @@ const getExpandedTimeSlotStyle = (date, slotKey) => {
                       )"
                       :key="task.id"
                       class="task-block"
-                      :class="getTaskStatusClass(task)"
+                      :class="task.status"
                       :style="{
-                        top: task.top + 'px',
-                        height: task.height + 'px',
+                        top: `${task.top}px`,
+                        height: `${task.height}px`,
                         width: '160px',
                         color: '#333',
                         display:
@@ -440,7 +452,9 @@ const getExpandedTimeSlotStyle = (date, slotKey) => {
                       title="{{ task.name }}"
                     >
                       <div class="task-content">
-                        <div class="task-title">{{ task.name }}</div>
+                        <div class="task-title">
+                          {{ task.name }}
+                        </div>
                       </div>
                     </div>
 
@@ -452,7 +466,7 @@ const getExpandedTimeSlotStyle = (date, slotKey) => {
                       "
                       class="expand-btn"
                       :style="{
-                        top: getExpandButtonPosition(day.date, slotKey) + 'px',
+                        top: `${getExpandButtonPosition(day.date, slotKey)}px`,
                         width: '160px',
                       }"
                       @click="toggleExpand(day.fullDate, slotKey)"
@@ -649,12 +663,14 @@ const getExpandedTimeSlotStyle = (date, slotKey) => {
   border-left: 3px solid;
   background-clip: padding-box;
   margin-bottom: 2px;
+  background-color: #f1f1f1;
+  border-left-color: #8c8c8c;
 }
 
 /* Task status background colors */
 .task-block.Authorizable {
-  background-color: #e6f7ff;
-  border-left-color: #1890ff;
+  background-color: #e4edff;
+  border-left-color: #215acd;
 }
 
 .task-block.overdue {
@@ -663,12 +679,12 @@ const getExpandedTimeSlotStyle = (date, slotKey) => {
 }
 
 .task-block.Authorized1 {
-  background-color: #f6ffed;
-  border-left-color: #52c41a;
+  background-color: #d6efe6;
+  border-left-color: #339169;
 }
 .task-block.Authorized {
   background-color: #ffead6;
-  border-left-color: #ff9428;
+  border-left-color: #ff9429;
 }
 /* .task-block.not-started {
   background-color: #f5f5f5;

apps/web-ele/src/views/schedule/view/index.vue

@@ -628,26 +628,16 @@ const createWorkOrderDrawerEvent = () => {
               </el-checkbox-group>
             </div>
           </div>
-          <div
-            style="display: flex; flex-direction: column; gap: 12px"
-            v-if="searchParams.timeType === 'day'"
-          >
+
+          <!-- <div style="width: 50px;height: 50px; background-color: #339169;"></div> -->
+
+          <div style="display: flex; flex-direction: column; gap: 12px">
             <div style="color: #409eff">蓝色任务：任务可处理</div>
             <div style="color: #67c23a">绿色任务: 任务已完成</div>
             <div style="color: #e6a23c">黄色任务：即将到期任务</div>
             <div style="color: #909399">灰色任务：任务未开始/任务取消</div>
             <div style="color: #f56c6c">红色任务：任务过期未完成</div>
           </div>
-          <!-- <div style="width: 50px;height: 50px; background-color: #339169;"></div> -->
-          <div
-            style="display: flex; flex-direction: column; gap: 12px"
-            v-if="searchParams.timeType === 'month'"
-          >
-            <div style="color: #409eff">蓝色圆点：可授权任务</div>
-            <div style="color: #67c23a">绿色圆点：已授权任务</div>
-            <div style="color: #e6a23c">黄色圆点：被授权任务</div>
-            <div style="color: #f56c6c">红色圆点：已逾期任务</div>
-          </div>
         </div>
         <!--新增任务按钮固定在底部-->
         <div class="p-4">

apps/web-ele/src/views/system/taskDesign/formDesign/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { CheckItem, SubItem } from './formDesign-data';
 
-import { onMounted, reactive, ref, watch } from 'vue';
+import { computed, onMounted, reactive, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { Page } from '@vben/common-ui';
@@ -46,7 +46,7 @@ import { getUploadAction } from '#/components/upload/config';
 // import { tr } from 'element-plus/lib/locale/index.js';
 const accessStore = useAccessStore();
 const route = useRoute();
-const formId = ref((route.query.id as string) || '');
+const formId = computed(() => (route.query.id as string) || '');
 // const querydata = JSON.parse((route.query.data as string) || '{}');
 // console.log(querydata);
 const querydata: any = ref({});
@@ -61,7 +61,11 @@ const selectedSubItemId = ref<string>('');
 // 查询子项列表
 const querysubItemlist = async () => {
   try {
-    const res = await querysubItembaseApilist({ mainId: querydata.value.id });
+    const res = await querysubItembaseApilist({
+      mainId: querydata.value.id,
+      pageNum: 1,
+      pageSize: 1000,
+    });
     subItems.value = res.rows || [];
     if (subItems.value.length > 0 && !selectedSubItemId.value) {
       selectedSubItemId.value = subItems.value[0].id;
@@ -95,16 +99,37 @@ const getFormData = async () => {
   }
 };
 
-onMounted(() => {
-  getFormData();
-  querysubItemlist();
-  taglistfn();
+const init = async () => {
+  // 重置选中的子项ID，确保不会引用旧数据
+  selectedSubItemId.value = '';
+  await getFormData();
+  await querysubItemlist();
+  await taglistfn();
+};
+
+// 检测 id 变化
+watch(
+  () => route.query.id,
+  async (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      await init();
+    }
+  },
+  {
+    immediate: true,
+  },
+);
+
+onMounted(async () => {
+  await init();
 });
 const queryinspectionItemlist = async (subItemId: any) => {
   try {
     const res = await queryinspectionItemApilist({
       mainId: querydata.value.id,
       subItemId,
+      pageNum: 1,
+      pageSize: 1000,
     });
     checkItems.value = res.rows || [];
   } catch (error) {
@@ -620,7 +645,7 @@ function handleDrawerOpen() {
         </div>
 
         <!-- 表格内容 -->
-        <div class="space-y-0">
+        <div class="max-h-[calc(100vh-300px)] space-y-0 overflow-y-auto">
           <div
             v-for="subItem in subItems"
             :key="subItem.id"
@@ -708,7 +733,7 @@ function handleDrawerOpen() {
         </div>
 
         <!-- 表格内容 -->
-        <div class="space-y-0">
+        <div class="max-h-[calc(100vh-450px)] space-y-0 overflow-y-auto">
           <div
             v-for="checkItem in checkItems"
             :key="checkItem.id"