fix: 156

apps/web-ele/src/components/selectUsers/src/index.vue

     const res: any = await getList(params);
     allUserList.value = res || [];
     console.log('加载用户列表成功:', res);
-    
   } catch (error_) {
     error.value = '加载用户列表失败';
     console.error('加载用户列表失败:', error_);
         selectedItems.value.push({
           id: stationId,
           key: `${stationId}-station`,
-          name: station.stationName,
+          name: station.areaName,
           type: 'station',
         });
       }
               :label="station.id"
               class="checkbox-item"
             >
-              {{ station.stationName }}
+              {{ station.areaName }}
             </ElCheckbox>
           </ElCheckboxGroup>
         </div>

apps/web-ele/src/components/tinymce/src/tinymce.ts

 //   'preview importcss searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link media codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount help charmap emoticons accordion';
 
 export const plugins =
-  'preview importcss searchreplace autolink autosave save directionality visualblocks visualchars fullscreen image link charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount charmap emoticons accordion';
+  'preview importcss searchreplace autolink autosave save directionality visualblocks visualchars fullscreen image link table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount charmap emoticons accordion';
 
 // export const toolbar =
 //   'undo redo | accordion accordionremove | blocks fontfamily fontsize | bold italic underline strikethrough | align numlist bullist | link image | table media | lineheight outdent indent| forecolor backcolor removeformat | charmap emoticons | code fullscreen preview | save print | pagebreak anchor codesample | ltr rtl';
 
 export const toolbar =
-  'undo redo | accordion accordionremove | blocks fontfamily fontsize | bold italic underline strikethrough | align numlist bullist | link image | lineheight outdent indent| forecolor backcolor removeformat | charmap emoticons | fullscreen preview';
+  'undo redo | accordion accordionremove | blocks fontfamily fontsize | bold italic underline strikethrough | align numlist bullist | link image | table | lineheight outdent indent| forecolor backcolor removeformat | charmap emoticons | fullscreen preview';

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

   ElUpload,
 } from 'element-plus';
 
+import { queryKnowledgeCategoryDetail } from '#/api/knowledge/category';
 import { addComment, querycomment } from '#/api/knowledge/comment';
 import {
   addKnowledgeContent,
   getKnowledgeContentDetail,
   queryKnowledgeContentlist,
 } from '#/api/knowledge/content';
-import { queryKnowledgeCategoryDetail } from '#/api/knowledge/category';
 import {
   addrecord,
   queryPublishRecordlist,
                     fontSize: '30px',
                   }"
                 ></span>
-                <img v-else :src="KnowledgeDetails?.iconUrl?.[0] || ''" alt="" />
+                <img
+                  v-else
+                  :src="KnowledgeDetails?.iconUrl?.[0] || ''"
+                  alt=""
+                />
               </div>
               <div class="knowledge-title">{{ KnowledgeDetails?.name }}</div>
             </div>
                 :data="chapterData"
                 node-key="id"
                 :props="{ label: 'title', children: 'children' }"
-                default-expand-all
                 :expand-on-click-node="false"
                 :current-node-key="chapterData[0]?.id"
                 highlight-current
                   1 明确指出问题;<br />
                   2 分点详细简述;<br />
                   3 最好配图;<br />
-                  4 提出可行性建议;</template
-                >
-                <el-icon><Warning /></el-icon>
+                  4 提出可行性建议;
+                </template>
+                <ElIcon><Warning /></ElIcon>
               </el-tooltip>
             </div>
 
 /* 左侧边栏 */
 .left-sidebar {
   position: relative;
-  width: 250px;
+  width: 300px;
   overflow: hidden;
   background-color: #fff;
   border-radius: 8px;
 
 .chapter-label {
   display: inline-block;
-  max-width: 80px;
+  // max-width: 80px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;

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

 <script lang="ts" setup>
-import { ref, onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
+
 import { Page } from '@vben/common-ui';
+
+import { DArrowLeft, Expand, HomeFilled, Plus } from '@element-plus/icons-vue';
+import { ElButton, ElIcon, ElInput, ElTree, ElUpload } from 'element-plus';
+
 import {
-  HomeFilled,
-  Plus,
-  Edit,
-  Delete,
-  DArrowLeft,
-  Expand,
-  Notification,
-} from '@element-plus/icons-vue';
-import {
-  ElButton,
-  ElIcon,
-  ElTree,
-  ElMessage,
-  ElInput,
-  ElUpload,
-} from 'element-plus';
-import {
-  queryKnowledgeContentlist,
-  addKnowledgeContent,
   editKnowledgeContent,
-  deleteKnowledgeContent,
   getKnowledgeContentDetail,
+  queryKnowledgeContentlist,
 } from '#/api/knowledge/content';
 import TinymceEditor from '#/components/tinymce/src/editor.vue';
 import { getFileUploadConfig } from '#/components/upload/config';
 
 // 发布
 const publish = () => {
-  console.log('发布的附件',attachments.value[selectedChapter.value.id]);
-  
+  console.log('发布的附件', attachments.value[selectedChapter.value.id]);
+
   centerloading.value = true;
   editKnowledgeContent({
     categoryId: selectedChapter.value?.categoryId,
                 },
               },
               status: 'success',
-              uid: index + Math.random().toString(36).substring(2),
+              uid: index + Math.random().toString(36).slice(2),
               raw: item,
             };
           });
               <div class="knowledge-icon">
                 <ElIcon class="icon-large"><HomeFilled /></ElIcon>
               </div>
-              <div class="knowledge-title">知识库示例</div>
+              <!-- <div class="knowledge-title">知识库示例</div> -->
             </div>
 
             <!-- 主页按钮 -->
             :size="20"
             class="collapse-control-btn"
             @click="isCollapse = false"
-            ><Expand
-          /></ElIcon>
+          >
+            <Expand />
+          </ElIcon>
           <!-- 内容表单 -->
           <div class="content-form">
             <!-- 第一行：标题 -->
 /* 左侧边栏 */
 .left-sidebar {
   position: relative;
-  width: 250px;
+  width: 300px;
   overflow: hidden;
   background-color: #fff;
   border-radius: 8px;
 }
 .chapter-label {
   display: inline-block;
-  max-width: 80px;
+  // max-width: 80px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;

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

 <script setup lang="ts">
-import { Page } from '@vben/common-ui';
-import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
-import { onMounted, ref, watch } from 'vue';
-import { generateColumns, querySchema } from './config-data';
-import { queryGasStationList } from '#/api/schedule/index';
-//@ts-ignore
+// @ts-ignore
 import type { VbenFormProps } from '@vben/common-ui';
+
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+import { onMounted } from 'vue';
+
+import { Page } from '@vben/common-ui';
+
+import dayjs from 'dayjs';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
   queryrallotApilist,
   saveeditApilist,
 } from '#/api/schedule/allot/index';
+
+import { generateColumns, querySchema } from './config-data';
+
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
   // 自定义重置逻辑：重置表单后把月份设为当前月份（避免清空日期选择器），然后触发查询
   BasicTableApi.setState((prev) => ({
     formOptions: {
-      ...(prev.formOptions || {}),
+      ...prev.formOptions,
       handleReset: async () => {
         try {
           // 先执行默认的重置行为
             // 触发 reload，触发时会走我们包装后的 reload，从而更新列
             await BasicTableApi.reload(vals);
           }
-        } catch (err) {
+        } catch {
           // 忽略错误，防止阻塞 UI
           // console.error(err);
         }
   row.isEditing = false;
 };
 
+const disabledStatus = (day: string) => {
+  day = day.replace('day', '');
+  const inputDate = new Date(
+    `${currentMonth}-${Number(day) > 9 ? day : `0${day}`}`,
+  );
+  return inputDate < new Date(dayjs().format('YYYY-MM-DD'));
+};
+
 // 在页面加载时设置默认月份
 onMounted(() => {
   // 添加安全检查，确保BasicTableApi.formApi可用
           type="primary"
           plain
           @click="() => (row.isEditing = true)"
-          >编辑</el-button
         >
+          编辑
+        </el-button>
         <template v-else>
-          <el-button size="small" type="primary" @click="handleSave(row)"
-            >保存</el-button
-          >
-          <el-button size="small" plain @click="() => (row.isEditing = false)"
-            >取消</el-button
-          >
+          <el-button size="small" type="primary" @click="handleSave(row)">
+            保存
+          </el-button>
+          <el-button size="small" plain @click="() => (row.isEditing = false)">
+            取消
+          </el-button>
         </template>
       </template>
       <template #Select="{ row, column }">
         <el-select
           v-model="row[column.field]"
           v-if="row.isEditing"
+          :disabled="disabledStatus(column.field)"
           placeholder="请选择"
         >
           <el-option

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

 // import { useUserStore } from '@vben/stores';
 import { getPopupContainer } from '@vben/utils';
 
-import { queryExecutorList,queryStationListByExecutor } from '#/api/schedule/index';
-import { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
+import {
+  queryExecutorList,
+  queryStationListByExecutor,
+} from '#/api/schedule/index';
 import { getPostList } from '#/api/system/post/post';
 import { querybaseApilist } from '#/api/system/tasksettings/tasktemplate';
 import { getFileUploadConfig } from '#/components/upload/config';
   console.log('获取执行人列表', res);
 
   getUserListOptions = res.map((item: any, index: number) => ({
-    label: `${item.userName}-${item.postName}${item.stationName ? `-` + item.stationName : ''}`,
+    label: `${item.userName}-${item.postName}${item.stationName ? `-${item.stationName}` : ''}`,
     value: index.toString(),
     data: item,
   }));
     },
     componentProps: (data: any, formApi: any) => {
       const executePosition = data.executePosition;
-      const options = executePosition ? getUserListOptions.filter((item:any) => item.data.postId === executePosition): [];
+      const options = executePosition
+        ? getUserListOptions.filter(
+            (item: any) => item.data.postId === executePosition,
+          )
+        : [];
       return {
         placeholder: '请选择执行人',
         clearable: true,
             return [];
           }
           const data = await queryStationListByExecutor({
-             userIds: userIds.join(','),
+            userIds: userIds.join(','),
           });
           return data;
         },
         valueField: 'id',
         onChange: (value: any) => {
           if (value) {
-            const selectedTemplate = templateList.find((item: any) => item.id === value);
+            const selectedTemplate = templateList.find(
+              (item: any) => item.id === value,
+            );
             if (selectedTemplate) {
               formApi.setFieldValue('taskName', selectedTemplate.taskName);
             }
     component: 'ApiSelect',
     fieldName: 'ccReceiversName',
     label: '抄送人',
-    rules: 'required',
+    // rules: 'required',
     componentProps: (data: any, formApi: any) => {
       return {
         placeholder: '请选择抄送人',

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

               mainbackcolor: '',
             },
           };
-          if (item.status === 0) {
+          if (item.status === 0 || item.status === -1) {
             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';
-              remainingTime.dayobj.mainbackcolor = '#F1F1F1';
-            } else {
-              remainingTime.dayobj.topbackcolor = '#215ACD';
-              remainingTime.dayobj.mainbackcolor = '#E4EDFF';
-            }
+            // if (days >= 30) {
+            //   remainingTime.dayobj.topbackcolor = '#86909C';
+            //   remainingTime.dayobj.mainbackcolor = '#F1F1F1';
+            // } else {
+            remainingTime.dayobj.topbackcolor = '#215ACD';
+            remainingTime.dayobj.mainbackcolor = '#E4EDFF';
+            // }
           } else if (hours > 0) {
             remainingTime.hours.hour += `还剩${hours}小时截止`;
             remainingTime.hours.topbackcolor = '#FF9428';

apps/web-ele/src/views/system/role/index.vue

 });
 // 数据权限配置侧拉
 function openDataScopeDrawer(role: Role) {
-  permDrawerApi.setData(role).open();
+  permDrawerApi
+    .setData({
+      ...role,
+      isUpdate: true,
+    })
+    .open();
 }
 const router = useRouter();
 function jumpRoute(role: Role) {
             </ElButton>
             <template #dropdown>
               <ElDropdownMenu>
-                <ElDropdownItem @click="openDataScopeDrawer(row)">
+                <!-- <ElDropdownItem @click="openDataScopeDrawer(row)">
                   数据权限
-                </ElDropdownItem>
+                </ElDropdownItem> -->
                 <ElDropdownItem @click="jumpRoute(row)">
                   分配用户
                 </ElDropdownItem>

apps/web-ele/src/views/system/role/perm-drawer.vue

 <script lang="ts" setup>
 import type { DeptResp, DeptTree, Role } from '#/api/system/role/model';
 
+// @ts-ignore
 import { defineEmits, ref } from 'vue';
 
+// @ts-ignore
 import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
 
 import { ElTree } from 'element-plus';
         // 设置属性节点选中回显
         treeRef.value!.setCheckedKeys(deptRef.value.checkedKeys, false);
       }
-      const { valid } = await formApi.validate();
-      if (!valid) {
-        return;
-      }
-      const data = await formApi.getValues<Role>();
-      // 是否是否关联
-      data.deptCheckStrictly = roleRef.value.deptCheckStrictly;
-      if (data.dataScope === '2') {
-        // 获取全选节点
-        const checkedKeys = treeRef.value!.getCheckedKeys(false);
-        // 获取半选节点
-        const halfCheckKeys = treeRef.value!.getHalfCheckedKeys();
-        // 组装
-        checkedKeys.unshift(...halfCheckKeys);
-        data.deptIds = checkedKeys;
-      } else {
-        data.deptIds = [];
-      }
-      // 调用数据权限更新接口
-      await updateRolePerms(data);
-      // 发射刷新列表
-      emit('reload');
-      drawerApi.close();
     } catch (error) {
       console.error(error);
     } finally {
       drawerApi.drawerLoading(false);
     }
   },
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    const data = await formApi.getValues<Role>();
+    // 是否是否关联
+    data.deptCheckStrictly = roleRef.value.deptCheckStrictly;
+    if (data.dataScope === '2') {
+      // 获取全选节点
+      const checkedKeys = treeRef.value!.getCheckedKeys(false);
+      // 获取半选节点
+      const halfCheckKeys = treeRef.value!.getHalfCheckedKeys();
+      // 组装
+      checkedKeys.unshift(...halfCheckKeys);
+      data.deptIds = checkedKeys;
+    } else {
+      data.deptIds = [];
+    }
+    // 调用数据权限更新接口
+    await updateRolePerms(data);
+    // 发射刷新列表
+    emit('reload');
+    drawerApi.close();
+  },
 });
 // 展开/收起
 const treeRef = ref<InstanceType<typeof ElTree>>();

apps/web-ele/src/views/system/taskDesign/taskTemplate/taskTemplate-data.tsx

 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { ElButton } from 'element-plus';
-import { getPopupContainer } from '@vben/utils';
+
 // @ts-ignore
-import { useVbenModal } from '@vben/common-ui';
-import { ElMessage } from 'element-plus';
+import { ElButton, ElMessage } from 'element-plus';
 
 // import type { SelectProps } from '#/adapter/form';
 import { getPostList } from '#/api/system/post/post';
       return {
         allowClear: true,
         placeholder: '请选择表单类型',
-        options: getFormTypeOptions()?.filter((item: any) => item?.value !== 'form'),
+        options: getFormTypeOptions()?.filter(
+          (item: any) => item?.value !== 'form',
+        ),
         clearable: true,
       };
     },
     componentProps: (data: any) => {
       return {
         placeholder: '请选择表单类型',
-        options: getFormTypeOptions().filter((item: any) => item.value !== 'form'),
+        options: getFormTypeOptions().filter(
+          (item: any) => item.value !== 'form',
+        ),
         clearable: true,
         disabled: data.isUpdate,
       };
         clearable: true,
         onChange: (value: any) => {
           // 重置时间相关字段
-          if (value !== 'yearly') {
-            formApi.setFieldValue('startTimeDay', '1');
-            formApi.setFieldValue('startTimeHour', '0');
-            formApi.setFieldValue('endTimeDay', '1');
-            formApi.setFieldValue('endTimeHour', '23');
-          } else {
-            formApi.setFieldValue('startTimeMonth', '1');
-            formApi.setFieldValue('startTimeYearDay', '1');
-            formApi.setFieldValue('endTimeMonth', '1');
-            formApi.setFieldValue('endTimeYearDay', '1');
-          }
+          // if (value === 'yearly') {
+          //   formApi.setFieldValue('startTimeMonth', '1');
+          //   formApi.setFieldValue('startTimeYearDay', '1');
+          //   formApi.setFieldValue('endTimeMonth', '1');
+          //   formApi.setFieldValue('endTimeYearDay', '1');
+          // } else {
+          formApi.setFieldValue('startTimeDay', '1');
+          formApi.setFieldValue('startTimeHour', '0');
+          formApi.setFieldValue('endTimeDay', '1');
+          formApi.setFieldValue('endTimeHour', '23');
+          // }
           // 重置其他字段
           formApi.setFieldValue('planTime', 1);
           formApi.setFieldValue('invalidDays', 0);
       show: (values: any) => values.taskFrequency !== 'yearly',
       componentProps(values: any, formApi: any) {
         let options = [];
-        let defaultValue = '1';
+        const defaultValue = '1';
 
         if (values.taskFrequency === 'daily') {
           options = [
           Array.isArray(values.isCycleEnd) &&
           values.isCycleEnd[0] === true),
       componentProps(values: any) {
-        const startDay = parseInt(values.startTimeDay) || 1;
+        const startDay = Number.parseInt(values.startTimeDay) || 1;
 
-        if (values.taskFrequency === 'daily') {
-          return {
-            options: [
-              { label: '1', value: '1' },
-              { label: '2', value: '2' },
-            ],
-            defaultValue: '1',
-          };
-        } else if (values.taskFrequency === 'weekly') {
-          return {
-            options: Array.from({ length: 7 - startDay + 1 }, (_, i) => ({
-              label: (startDay + i).toString(),
-              value: startDay + i,
-            })),
-            defaultValue: startDay.toString(),
-          };
-        } else if (values.taskFrequency === 'monthly') {
-          const count = 30 - startDay + 1;
-          return {
-            options: Array.from({ length: count }, (_, i) => ({
-              label: (startDay + i).toString(),
-              value: startDay + i,
-            })),
-            defaultValue: startDay.toString(),
-          };
-        } else if (values.taskFrequency === 'every_two_months') {
-          const count = 60 - startDay + 1;
-          return {
-            options: Array.from({ length: count }, (_, i) => ({
-              label: (startDay + i).toString(),
-              value: startDay + i,
-            })),
-            defaultValue: startDay.toString(),
-          };
-        } else if (values.taskFrequency === 'every_three_months') {
-          const count = 90 - startDay + 1;
-          return {
-            options: Array.from({ length: count }, (_, i) => ({
-              label: (startDay + i).toString(),
-              value: startDay + i,
-            })),
-            defaultValue: startDay.toString(),
-          };
-        } else if (values.taskFrequency === 'every_six_months') {
-          const count = 180 - startDay + 1;
-          return {
-            options: Array.from({ length: count }, (_, i) => ({
-              label: (startDay + i).toString(),
-              value: startDay + i,
-            })),
-            defaultValue: startDay.toString(),
-          };
+        switch (values.taskFrequency) {
+          case 'daily': {
+            return {
+              options: [
+                { label: '1', value: '1' },
+                { label: '2', value: '2' },
+              ],
+              defaultValue: '1',
+            };
+          }
+          case 'every_six_months': {
+            const count = 180 - startDay + 1;
+            return {
+              options: Array.from({ length: count }, (_, i) => ({
+                label: (startDay + i).toString(),
+                value: startDay + i,
+              })),
+              defaultValue: startDay.toString(),
+            };
+          }
+          case 'every_three_months': {
+            const count = 90 - startDay + 1;
+            return {
+              options: Array.from({ length: count }, (_, i) => ({
+                label: (startDay + i).toString(),
+                value: startDay + i,
+              })),
+              defaultValue: startDay.toString(),
+            };
+          }
+          case 'every_two_months': {
+            const count = 60 - startDay + 1;
+            return {
+              options: Array.from({ length: count }, (_, i) => ({
+                label: (startDay + i).toString(),
+                value: startDay + i,
+              })),
+              defaultValue: startDay.toString(),
+            };
+          }
+          case 'monthly': {
+            const count = 30 - startDay + 1;
+            return {
+              options: Array.from({ length: count }, (_, i) => ({
+                label: (startDay + i).toString(),
+                value: startDay + i,
+              })),
+              defaultValue: startDay.toString(),
+            };
+          }
+          case 'weekly': {
+            return {
+              options: Array.from({ length: 7 - startDay + 1 }, (_, i) => ({
+                label: (startDay + i).toString(),
+                value: startDay + i,
+              })),
+              defaultValue: startDay.toString(),
+            };
+          }
+          // No default
         }
         return {
           defaultValue: '1',
           Array.isArray(values.isCycleEnd) &&
           values.isCycleEnd[0] === true),
       componentProps(values: any) {
-        const startMonth = parseInt(values.startTimeMonth) || 1;
-        const startDay = parseInt(values.startTimeYearDay) || 1;
+        const startMonth = Number.parseInt(values.startTimeMonth) || 1;
+        const startDay = Number.parseInt(values.startTimeYearDay) || 1;
 
         return {
           options: Array.from({ length: 12 - startMonth + 1 }, (_, i) => ({
           Array.isArray(values.isCycleEnd) &&
           values.isCycleEnd[0] === true),
       componentProps(values: any) {
-        const startDay = parseInt(values.startTimeYearDay) || 1;
-        const month = parseInt(values.endTimeMonth) || 1;
+        const startDay = Number.parseInt(values.startTimeYearDay) || 1;
+        const month = Number.parseInt(values.endTimeMonth) || 1;
 
         // 计算每个月的天数
         let daysInMonth = 31;
     },
     // rules: 'required',
   },
-  //是否周期末0否1是
+  // 是否周期末0否1是
   {
     component: 'CheckboxGroup',
     fieldName: 'isCycleEnd',
       disabled: (values: any) =>
         values.taskFrequency === 'daily' || values.taskFrequency === 'yearly',
       componentProps(values: any) {
-        let min = parseInt(values.startTimeDay) || 1;
-        let max = parseInt(values.endTimeDay) || 365;
+        const min = Number.parseInt(values.startTimeDay) || 1;
+        const max = Number.parseInt(values.endTimeDay) || 365;
 
         return {
           min,
     slot: 'description',
     formItemClass: 'col-span-2 items-baseline',
   },
-  //知识库
-    {
+  // 知识库
+  {
     component: 'Input',
     dependencies: {
       show: () => false,
     fieldName: 'knowledge',
     formItemClass: 'col-span-2 items-baseline',
   },
-  //知识库类别
+  // 知识库类别
   {
     component: 'Input',
     dependencies: {