修复bug

apps/web-ele/src/views/knowledge/edit/index.vue

@@ -42,6 +42,7 @@ const centerloading = ref(false);
 const chapterData = ref([]) as any;
 // 附件列表
 const attachments = ref({}) as any;
+// @ts-ignore
 const { action, headers } = getFileUploadConfig();
 // 查询章节数据
 const chapterDatafn = async (ID: any) => {
@@ -88,6 +89,8 @@ const saveDraft = () => {
 
 // 发布
 const publish = () => {
+  console.log('发布的附件',attachments.value[selectedChapter.value.id]);
+  
   centerloading.value = true;
   editKnowledgeContent({
     categoryId: selectedChapter.value?.categoryId,
@@ -97,7 +100,7 @@ const publish = () => {
     title: selectedChapter.value?.label,
     content: selectedChapter.value?.content,
     attachment: attachments.value[selectedChapter.value.id]
-      .map((item: any) => item.response.data.fileName)
+      ?.map((item: any) => item.response.data.fileName)
       .join(','),
   })
     .then(() => {
@@ -133,12 +136,15 @@ const publish = () => {
 const handleAttachmentSuccess = (response: any, file: any, fileList: any[]) => {
   console.log('上传成功:', response, file, fileList);
   attachments.value[selectedChapter.value.id] = fileList;
-  console.log(fileList);
 };
 // 移除附件
 const handleAttachmentRemove = (file: any, fileList: any[]) => {
-  console.log('移除文件:', file, fileList);
   attachments.value[selectedChapter.value.id] = fileList;
+  console.log(
+    '移除文件:',
+    fileList,
+    attachments.value[selectedChapter.value.id],
+  );
 };
 
 // 点击章节
@@ -159,7 +165,7 @@ const handleChapterClick = async (node: any) => {
       if (res.data.attachment) {
         attachments.value[res.data.id] = res.data.attachment
           .split(',')
-          .map((item, index) => {
+          .map((item: any, index: any) => {
             return {
               name: item,
               response: {
@@ -172,7 +178,6 @@ const handleChapterClick = async (node: any) => {
               raw: item,
             };
           });
-        // console.log(res.data.attachment);
       }
     }
   } catch (error) {

apps/web-ele/src/views/knowledge/type/index.vue

@@ -280,6 +280,8 @@ const deleteCategory = async (id: any) => {
   padding: 16px;
   background-color: #fff;
   border-radius: 6px;
+  width: 100%;
+  box-sizing: border-box;
 }
 
 .header {
@@ -293,12 +295,30 @@ const deleteCategory = async (id: any) => {
   grid-template-columns: repeat(3, 1fr);
   gap: 16px;
   margin-bottom: 24px;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+/* 响应式布局调整 */
+@media (max-width: 1200px) {
+  .card-list {
+    grid-template-columns: repeat(2, 1fr);
+  }
+}
+
+@media (max-width: 768px) {
+  .card-list {
+    grid-template-columns: 1fr;
+  }
 }
 
 .category-card {
   height: 100%;
   cursor: pointer;
   transition: all 0.3s ease;
+  width: 100%;
+  box-sizing: border-box;
+  min-width: 0;
 }
 
 .category-card:hover {
@@ -318,11 +338,19 @@ const deleteCategory = async (id: any) => {
   display: flex;
 }
 
+.card-item {
+  width: 100%;
+  box-sizing: border-box;
+  min-width: 0;
+}
+
 .card-content {
   display: flex;
   gap: 12px;
   align-items: center;
   padding: 10px 0;
+  width: 100%;
+  box-sizing: border-box;
 }
 
 .card-icon {
@@ -332,11 +360,14 @@ const deleteCategory = async (id: any) => {
   width: 48px;
   height: 48px;
   border-radius: 6px;
+  flex-shrink: 0;
+  box-sizing: border-box;
 }
 
 .card-main {
   flex: 1;
   min-width: 0;
+  box-sizing: border-box;
 }
 
 .card-title {
@@ -347,6 +378,7 @@ const deleteCategory = async (id: any) => {
   text-overflow: ellipsis;
   white-space: nowrap;
   transition: color 0.3s ease;
+  box-sizing: border-box;
 }
 
 .card-description {
@@ -356,11 +388,14 @@ const deleteCategory = async (id: any) => {
   color: #666;
   text-overflow: ellipsis;
   white-space: nowrap;
+  box-sizing: border-box;
 }
 
 .card-info {
-  min-width: 80px;
+  flex: 0 0 auto;
   text-align: right;
+  box-sizing: border-box;
+  min-width: 0;
 }
 
 .creator {

apps/web-ele/src/views/schedule/view/components/create/config-data.tsx

@@ -41,8 +41,10 @@ let templateList = [] as any; // 任务模板下拉
 
 const getUserListfn = async () => {
   const res = await queryExecutorList({});
+  console.log('获取执行人列表', res);
+
   getUserListOptions = res.map((item: any, index: number) => ({
-    label: `${item.userName}-${item.postName}-${item.stationName}`,
+    label: `${item.userName}-${item.postName}${item.stationName ? `-` + item.stationName : ''}`,
     value: index.toString(),
     data: item,
   }));
@@ -92,43 +94,20 @@ export const drawerFormSchema: any = (type: any) => [
   },
   {
     component: 'ApiSelect',
-    componentProps: {
-      getPopupContainer,
-      api: async () => {
-        const data = await selectAllSysStation({
-          isAll: true,
-        });
-        return data;
-      },
-      multiple: true,
-      labelField: 'stationName',
-      valueField: 'id',
-    },
-
-    fieldName: 'stationId',
-    label: '场站',
-    rules: 'required',
-    dependencies: {
-      show: () => {
-        return type !== 3;
-      },
-      required: () => {
-        return type !== 3;
-      },
-      disabled: false,
-      triggerFields: ['stationId'],
-    },
-  },
-  {
-    component: 'ApiSelect',
     fieldName: 'executors',
     label: '执行人名称',
     rules: 'required',
+    dependencies: {
+      disabled: (values: any) => !values.executePosition,
+      triggerFields: ['executePosition'],
+    },
     componentProps: (data: any, formApi: any) => {
-      const options =
-        type === 3
-          ? getUserListOptions.filter((item: any) => item.data.postId === 3)
-          : getUserListOptions;
+      const executePosition = data.executePosition;
+      const options = executePosition
+        ? getUserListOptions.filter(
+            (item: any) => item.data.postId === executePosition,
+          )
+        : [];
       return {
         placeholder: '请选择执行人',
         clearable: true,
@@ -152,6 +131,44 @@ export const drawerFormSchema: any = (type: any) => [
     },
   },
   {
+    component: 'ApiSelect',
+    fieldName: 'stationId',
+    label: '场站',
+    rules: 'required',
+    componentProps: (data: any) => {
+      const executorValues = data.executorIds || [];
+      const userIds = executorValues.map((value: any) => value?.userId);
+      return {
+        getPopupContainer,
+        api: async () => {
+          if (userIds.length === 0) {
+            return [];
+          }
+          const data = await selectAllSysStation({
+            // userIds: userIds.join(','),
+          });
+          return data;
+        },
+        multiple: true,
+        labelField: 'stationName',
+        valueField: 'id',
+        key: executorValues.map((v: any) => v?.userId).join(','), // 当执行人变化时，重新初始化组件
+        immediate: true, // 立即执行api
+      };
+    },
+    dependencies: {
+      show: () => {
+        return type !== 3;
+      },
+      required: () => {
+        return type !== 3;
+      },
+      disabled: (values: any) =>
+        !values.executors || values.executors.length === 0,
+      triggerFields: ['executors'],
+    },
+  },
+  {
     component: 'RadioGroup',
     fieldName: 'formType',
     label: '任务名称',

apps/web-ele/src/views/schedule/work/class/component/addandedit.vue

@@ -2,7 +2,7 @@
 import type { FormInstance, FormRules } from 'element-plus';
 
 import { onMounted, reactive, ref, watch } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 // @ts-ignore
 import { Page } from '@vben/common-ui';
@@ -28,6 +28,7 @@ import { getDictOptions } from '#/utils/dict';
 // const emits = defineEmits(['submit']);
 const stationName = ref('');
 const route = useRoute();
+const router = useRouter();
 const ruleFormRef = ref<FormInstance>();
 const querydata = route.query as any;
 const tableData = ref([]) as any;
@@ -174,9 +175,9 @@ const submitForm = (formEl: FormInstance | undefined) => {
           workDate: dayjs(ruleForm.value.workDate).format('YYYY-MM-DD'),
           workNum: tableData.value.length,
         });
-        // router.replace({
-        //   path: '/schedule/work/class',
-        // });
+        router.replace({
+          path: '/schedule/work/class',
+        });
       } catch (error: any) {
         ElMessage.error(error.message);
       }

apps/web-ele/src/views/schedule/work/class/index.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { onMounted, watch } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useRouter } from 'vue-router';
 import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
@@ -70,7 +71,9 @@ const formOptions: VbenFormProps = {
     ],
   ],
 };
-
+onMounted(() => {
+  console.log(router);
+});
 // 列表中显示配置
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
@@ -127,11 +130,11 @@ const handleAddClick = async () => {
     },
   });
 };
-const handleViewClick =  (data: any) => {
-    router.push({
+const handleViewClick = (data: any) => {
+  router.push({
     path: '/schedule/work/class/addandedit',
     query: {
-      stationId:data.stationId,
+      stationId: data.stationId,
       Detailsid: data.id,
     },
   });
@@ -140,6 +143,15 @@ const handleViewClick =  (data: any) => {
 // const handleEditClick = (row: any) => {
 //   console.log(row);
 // };
+
+watch(
+  () => router.currentRoute.value.path,
+  (newPath, oldPath) => {
+    if (newPath === '/schedule/work/class' && oldPath === '/schedule/work/class/addandedit') {
+      BasicTableApi.reload();
+    }
+  }
+);
 </script>
 <template>
   <Page :auto-content-height="true">

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

@@ -298,7 +298,8 @@ async function editCheckItem(checkItem: any) {
   // console.log(checkItem);
   // const aa = "http://192.168.1.33:19000/smart-steward-bucket/comment/20260206/ca63ff81.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=root%2F20260206%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20260206T100201Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=99e33fd4c65189bc90e60ca65dad1149f316847d69325484dc6850129427c5d4"
   // console.log(aa.split('?')[0].split('/').slice(-3).join('/'));
-  
+  // console.log('编辑内容', checkItem);
+
   try {
     await queryinspectionItemDetail(checkItem.id);
   } catch (error) {
@@ -321,26 +322,26 @@ async function editCheckItem(checkItem: any) {
   editForm.photoPrompt = checkItem?.photoPrompt || '';
   editForm.checkResult = String(checkItem?.checkResult) || '';
   editForm.limitScore = checkItem?.limitScore || '';
-  // fileList.value = checkItem?.exampleImageUrl.map(
-  //   (item: any, index: number) => {
-  //     return {
-  //       name: item.split('?')[0].split('/').slice(-3).join('/'),
-  //       response: {
-  //         code: 200,
-  //         data: {
-  //           fileName: item.split('?')[0].split('/').slice(-3).join('/'),
-  //           url: item,
-  //         },
-  //         msg: '操作成功',
-  //       },
-  //       url: item,
-  //       status: 'success',
-  //       uid: index + Math.random().toString(36).substring(2),
-  //     };
-  //   },
-  // );
+  fileList.value = checkItem?.exampleImageUrl.map(
+    (item: any, index: number) => {
+      return {
+        name: item.split('?')[0].split('/').slice(-3).join('/'),
+        response: {
+          code: 200,
+          data: {
+            fileName: item.split('?')[0].split('/').slice(-3).join('/'),
+            url: item,
+          },
+          msg: '操作成功',
+        },
+        url: item,
+        status: 'success',
+        uid: index + Math.random().toString(36).substring(2),
+      };
+    },
+  );
   // console.log(fileList.value);
-  
+
   editForm.checkDescription = checkItem?.checkDescription || '';
 }
 
@@ -352,7 +353,7 @@ function saveEdit() {
       switch (editType.value) {
         case 'addcheck': {
           // console.log(editForm);
-          console.log(fileList.value);
+          // console.log(fileList.value);
           // 新增检查项
           try {
             await addinspectionItemApi({
@@ -372,7 +373,7 @@ function saveEdit() {
               limitScore: editForm?.limitScore || '',
               exampleImage: fileList.value
                 .map((file: any) => file?.response?.data?.fileName)
-                .join(';'),
+                .join(','),
               // exampleImagelist: fileList.value,
               checkDescription: editForm?.checkDescription || '',
             });
@@ -424,7 +425,7 @@ function saveEdit() {
                 limitScore: editForm?.limitScore || '',
                 exampleImage: fileList.value
                   .map((file: any) => file?.response?.data?.fileName)
-                  .join(';'),
+                  .join(','),
                 checkDescription: editForm?.checkDescription || '',
               });
               await queryinspectionItemlist(selectedSubItemId.value);
@@ -557,18 +558,18 @@ async function onDrop(
       item.order = index + 1;
     });
 
-    console.log(
-      '拖拽排序完成:',
-      itemId,
-      '到',
-      targetItem.id,
-      '新顺序:',
-      items.map((item: any) => ({
-        id: item.id,
-        name: item.name,
-        order: item.order,
-      })),
-    );
+    // console.log(
+    //   '拖拽排序完成:',
+    //   itemId,
+    //   '到',
+    //   targetItem.id,
+    //   '新顺序:',
+    //   items.map((item: any) => ({
+    //     id: item.id,
+    //     name: item.name,
+    //     order: item.order,
+    //   })),
+    // );
 
     // 保存排序结果到后端（只处理子项）
     if (type === 'sub') {
@@ -617,7 +618,7 @@ const handlePictureCardPreview = (uploadFile: any) => {
 };
 // 抽屉打开后处理函数
 function handleDrawerOpen() {
-  console.log('抽屉打开后处理函数');
+  // console.log('抽屉打开后处理函数');
 
   const drawerContent = document.querySelector('.el-drawer__body');
   if (drawerContent) {
@@ -625,7 +626,7 @@ function handleDrawerOpen() {
   }
 }
 const closeEditDrawer = () => {
-  console.log('关闭了');
+  // console.log('关闭了');
   editForm.id = '';
   editForm.name = '';
   // 关联子项
@@ -653,10 +654,17 @@ const closeEditDrawer = () => {
   fileList.value = [];
 };
 
-const handleUpload = ()=>{
+const handleUpload = () => {
   console.log(fileList.value);
-  
-}
+};
+//上传前校验
+const beforeUpload = (file: any) => {
+  const maxSize = 10485760;
+  if (file.size > maxSize) {
+    ElMessage.error('文件大小不能超过10MB');
+    return false;
+  }
+};
 </script>
 
 <template>
@@ -1032,6 +1040,7 @@ const handleUpload = ()=>{
             :headers="{ Authorization: `Bearer ${accessStore.accessToken}` }"
             :limit="3"
             list-type="picture-card"
+            :before-upload="beforeUpload"
             :on-preview="handlePictureCardPreview"
             :on-remove="handleRemove"
             :on-success="handleUpload"

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

@@ -125,12 +125,13 @@ async function handleView(row: any) {
 async function handleEdit(row: any) {
   try {
     const res = await xiangqigApi(row.id);
+    console.log('编辑数据', res);
     drawerApi
       .setData({
         ...res,
         isUpdate: true,
         executePosition: Number(res.executePosition),
-        taskLeader: Number(res.taskLeader),
+        taskLeader: String(res.taskLeader),
         isLicensable: String(res.isLicensable),
         isRating: String(res.isRating),
         isMust: String(res.isMust),

apps/web-ele/src/views/system/taskDesign/taskTemplate/taskTemplate-drawer.vue

@@ -75,124 +75,7 @@ const formOptions = computed(() => {
 const handleTaskFrequencyChange = (value: string) => {
   taskFrequency.value = value;
 };
-// 每天一次 daily
-// 每周一次 weekly
-// 每月一次 monthly
-// 每两月一次 every_two_months
-// 每三月一次 every_three_months
-// 每六月一次 every_six_months
-// 每年一次 yearly
-// const startTimeDayOptions = ref<any[]>([]);
-// const endTimeDayOptions = ref<any[]>([]);
-// const startTimeHourOptions = ref<any[]>([]);
-// const endTimeHourOptions = ref<any[]>([]);
-// watch(
-//   () => taskFrequency.value,
-//   (newValue) => {
-//     if (newValue === 'daily') {
-//       startTimeDayOptions.value = [
-//         {
-//           label: '每天一次',
-//           value: 'daily',
-//         },
-//       ];
-//       endTimeDayOptions.value = [];
-//       startTimeHourOptions.value = [];
-//       endTimeHourOptions.value = [];
-//     } else if (newValue === 'weekly') {
-//       startTimeDayOptions.value = [
-//         {
-//           label: '每周一次',
-//           value: 'weekly',
-//         },
-//       ];
-//       endTimeDayOptions.value = [];
-//       startTimeHourOptions.value = [];
-//       endTimeHourOptions.value = [];
-//     } else if (newValue === 'monthly') {
-//       startTimeDayOptions.value = [
-//         {
-//           label: '每月一次',
-//           value: 'monthly',
-//         },
-//       ];
-//       endTimeDayOptions.value = [];
-//       startTimeHourOptions.value = [];
-//       endTimeHourOptions.value = [];
-//     } else if (newValue === 'every_two_months') {
-//       startTimeDayOptions.value = [
-//         {
-//           label: '每两月一次',
-//           value: 'every_two_months',
-//         },
-//       ];
-//       endTimeDayOptions.value = [];
-//       startTimeHourOptions.value = [];
-//       endTimeHourOptions.value = [];
-//     } else if (newValue === 'every_three_months') {
-//       startTimeDayOptions.value = [
-//         {
-//           label: '每三月一次',
-//           value: 'every_three_months',
-//         },
-//       ];
-//       endTimeDayOptions.value = [];
-//       startTimeHourOptions.value = [];
-//       endTimeHourOptions.value = [];
-//     } else if (newValue === 'every_six_months') {
-//       startTimeDayOptions.value = [
-//         {
-//           label: '每六月一次',
-//           value: 'every_six_months',
-//         },
-//       ];
-//       endTimeDayOptions.value = [];
-//       startTimeHourOptions.value = [];
-//       endTimeHourOptions.value = [];
-//     } else if (newValue === 'yearly') {
-//       startTimeDayOptions.value = [
-//         {
-//           label: '每年一次',
-//           value: 'yearly',
-//         },
-//       ];
-//       endTimeDayOptions.value = [];
-//       startTimeHourOptions.value = [];
-//       endTimeHourOptions.value = [];
-//     } else {
-//       startTimeDayOptions.value = [];
-//     }
-//   },
-//   { immediate: true }, // 立即执行一次，设置初始值
-// );
-// watch(
-//   () => taskFrequency.value,
-//   (newValue) => {
-//     console.log('taskFrequency changed:', newValue);
-//   },
-// );
 const [Form, formApi] = useVbenForm(formOptions.value);
-
-// 存储表单值的响应式变量
-const formValues = ref({});
-
-// 更新表单值的函数
-// const updateFormValues = async () => {
-//   try {
-//     formValues.value = await formApi.getValues();
-//   } catch (error) {
-//     console.error('获取表单值失败:', error);
-//   }
-// };
-
-// // 监听表单值变化
-// Form.onValuesChange(() => {
-//   updateFormValues();
-// });
-
-// // 初始化时获取表单值
-// updateFormValues();
-
 const drawerTitle = computed(() => {
   if (isViewRef.value) return '查看任务';
   if (isUpdateRef.value) return '编辑任务';
@@ -449,12 +332,6 @@ const selectIcon = (val: any, item: any) => {
           :options="{ auto_focus: 'false' }"
         />
       </template>
-      <!-- // postId 1  管理部
-// postId 2  片区经理
-// postId 3  站长
-// postId 4  当班经理
-// postId 5  测试
-// postId 6  安全管理部 -->
       <!-- v-if="formApi.getValues().then(res)=>res.executePosition==='0'" -->
       <template #distributionMethod="scope">
         <div style="display: flex; gap: 16px; align-items: center">