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

@@ -27,9 +27,12 @@ export function selectAllSysAreaList() {
  * 查询所有油站信息
  * @returns 油站列表
  */
-export function selectAllSysStationAreaList() {
+export function selectAllSysStationAreaList(params: any) {
   return requestClient.get<BaseResult<StationInfoModel[]>>(
-    Api.selectAllSysStation,
+    Api.selectAllSysStationAreaList,
+    {
+      params,
+    },
   );
 }
 
@@ -37,9 +40,12 @@ export function selectAllSysStationAreaList() {
  * 查询所有油站信息
  * @returns 油站列表
  */
-export function selectAllSysStation() {
+export function selectAllSysStation(params: any) {
   return requestClient.get<BaseResult<StationInfoModel[]>>(
     Api.selectAllSysStation,
+    {
+      params,
+    },
   );
 }
 /**

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

@@ -69,6 +69,7 @@ const submitComment = async () => {
       targetType: 'task',
       attachments: commentImages.value.map((item) => item.fileName).join(','),
       content: commentContent.value,
+      score: rating.value,
     });
     commentContent.value = '';
     commentImages.value = [];
@@ -218,15 +219,18 @@ onMounted(() => {
           <div
             v-for="(item, index) in comments"
             :key="index"
-            class="comment_item"
+            class="comment-item"
           >
             <div class="reader-item mb-2 mr-2" style="flex-shrink: 0">
               {{ getLastTwoChars(item.username) }}
             </div>
-            <div class="comment_content">
-              <span style="font-size: 15px; font-weight: 900">{{
-                item.username
-              }}</span>
+            <div class="comment-content">
+              <div style="display: flex; align-items: center; gap: 8px">
+                <span style="font-size: 15px; font-weight: 900">{{
+                  item.username
+                }}</span>
+                <ElRate v-model="item.score" size="small" disabled />
+              </div>
               <div>{{ item.content }}</div>
               <div>
                 <AttachmentViewer :files="item.attachmentsUrl" />
@@ -239,7 +243,7 @@ onMounted(() => {
                 "
               >
                 <span style="color: #a4aab2">{{ item.createTime }}</span>
-                <span class="reply_btn" @click="toggleReply(index)">回复</span>
+                <span class="reply-btn" @click="toggleReply(index)">回复</span>
               </div>
               <div
                 v-if="item.children && item.children.length > 0"
@@ -571,7 +575,7 @@ onMounted(() => {
   }
 }
 
-.comment_item {
+.comment-item {
   display: flex;
   // align-items: center;
   // justify-content: space-between;
@@ -583,12 +587,12 @@ onMounted(() => {
   font-size: 12px;
   color: #606266;
 
-  .comment_content {
+  .comment-content {
     margin-top: 6px;
     display: flex;
     flex-direction: column;
     gap: 8px;
-    .reply_btn {
+    .reply-btn {
       color: #409eff;
       cursor: pointer;
       &:hover {

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

@@ -241,26 +241,24 @@ const evaluationItems = ref<string[]>([]);
 
 const init = async () => {
   const res: any = await employeeSettingsList({});
-  gridOptions.columns = [];
+  // gridOptions.columns = [];
   gridOptions.columns = defautTableColumns;
-  if (res.rows?.length) {
+  if (
+    res.rows?.length &&
+    !(gridOptions && gridOptions.columns && gridOptions.columns?.length > 1)
+  ) {
     res.rows.forEach((item: any) => {
       evaluationItems.value.push(item.dictCode);
       // @ts-ignore
       gridOptions.columns.push({
         field: `id_${item.id}`,
         title: `${item.itemName}（${item.standardScore}）`,
-        // 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
@@ -274,23 +272,24 @@ const init = async () => {
             );
           },
         },
-        width: 150,
+        width: 200,
       });
     });
+    // @ts-ignore
+    gridOptions.columns.push({
+      field: 'evaluationWords',
+      title: `评语`,
+      editRender: { name: 'textarea' },
+      // cellType: 'number',
+      width: 200,
+    });
   }
 
-  // @ts-ignore
-  gridOptions.columns.push({
-    field: 'evaluationWords',
-    title: `评语`,
-    editRender: { name: 'textarea' },
-    // cellType: 'number',
-    width: 200,
-  });
   basicTableApi.setGridOptions(gridOptions);
 };
 
 onMounted(async () => {
+  console.log('gridOptions', gridOptions);
   await init();
   // gridOptions.columns = await tableColumns();
 });

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

@@ -1,16 +1,16 @@
 import { h } from 'vue';
 
-import { useUserStore } from '@vben/stores';
+// import { useUserStore } from '@vben/stores';
 import { getPopupContainer } from '@vben/utils';
 
 import { queryExecutorList } from '#/api/schedule/index';
-import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+import { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
 import { getPostList } from '#/api/system/post/post';
 import { querybaseApilist } from '#/api/system/tasksettings/tasktemplate';
 import { getFileUploadConfig } from '#/components/upload/config';
 import { getDictOptions } from '#/utils/dict';
 
-const userStore = useUserStore();
+// const userStore = useUserStore();
 // 字典标识常量
 const DICT_KEYS = {
   // 任务类型字典标识
@@ -27,7 +27,9 @@ const getTaskTypeOptions = () => getDictOptions(DICT_KEYS.TASK_TYPE);
 let getPostListOptions = [] as any; // 执行岗位下拉
 let getUserListOptions = [] as any; // 执行人下拉
 const getPostListfn = async () => {
-  const { rows } = await getPostList({});
+  const { rows } = await getPostList({
+    pageSize: 10_000,
+  });
   getPostListOptions = rows.map((item: any) => ({
     label: item.postName,
     value: item.postId,
@@ -93,7 +95,9 @@ export const drawerFormSchema: any = (type: any) => [
     componentProps: {
       getPopupContainer,
       api: async () => {
-        const data = await selectAllSysStationAreaList();
+        const data = await selectAllSysStation({
+          isAll: true,
+        });
         return data;
       },
       multiple: true,

apps/web-ele/src/views/workflow/category/config-data.ts

@@ -31,7 +31,7 @@ export const tableColumns: VxeGridProps['columns'] = [
     slots: { default: 'action' },
     resizable: false,
     title: '操作',
-    width: 180,
+    width: 230,
   },
 ];
 
@@ -65,10 +65,10 @@ export const drawerFormSchema: FormSchemaGetter = () => [
       checkStrictly: true,
     },
     dependencies: {
-      if(values) {
-        // 总是显示上级分类选择框，无论是新增还是编辑
-        return true;
-      },
+      // if(values) {
+      //   // 总是显示上级分类选择框，无论是新增还是编辑
+      //   return true;
+      // },
       triggerFields: ['parentId'],
     },
     fieldName: 'parentId',

vben-admin.code-workspace

@@ -2,151 +2,151 @@
   "folders": [
     {
       "name": "@vben/web-ele",
-      "path": "apps/web-ele"
+      "path": "apps/web-ele",
     },
     {
       "name": "@vben/commitlint-config",
-      "path": "internal/lint-configs/commitlint-config"
+      "path": "internal/lint-configs/commitlint-config",
     },
     {
       "name": "@vben/eslint-config",
-      "path": "internal/lint-configs/eslint-config"
+      "path": "internal/lint-configs/eslint-config",
     },
     {
       "name": "@vben/prettier-config",
-      "path": "internal/lint-configs/prettier-config"
+      "path": "internal/lint-configs/prettier-config",
     },
     {
       "name": "@vben/stylelint-config",
-      "path": "internal/lint-configs/stylelint-config"
+      "path": "internal/lint-configs/stylelint-config",
     },
     {
       "name": "@vben/node-utils",
-      "path": "internal/node-utils"
+      "path": "internal/node-utils",
     },
     {
       "name": "@vben/tailwind-config",
-      "path": "internal/tailwind-config"
+      "path": "internal/tailwind-config",
     },
     {
       "name": "@vben/tsconfig",
-      "path": "internal/tsconfig"
+      "path": "internal/tsconfig",
     },
     {
       "name": "@vben/vite-config",
-      "path": "internal/vite-config"
+      "path": "internal/vite-config",
     },
     {
       "name": "@vben-core/design",
-      "path": "packages/@core/base/design"
+      "path": "packages/@core/base/design",
     },
     {
       "name": "@vben-core/icons",
-      "path": "packages/@core/base/icons"
+      "path": "packages/@core/base/icons",
     },
     {
       "name": "@vben-core/shared",
-      "path": "packages/@core/base/shared"
+      "path": "packages/@core/base/shared",
     },
     {
       "name": "@vben-core/typings",
-      "path": "packages/@core/base/typings"
+      "path": "packages/@core/base/typings",
     },
     {
       "name": "@vben-core/composables",
-      "path": "packages/@core/composables"
+      "path": "packages/@core/composables",
     },
     {
       "name": "@vben-core/preferences",
-      "path": "packages/@core/preferences"
+      "path": "packages/@core/preferences",
     },
     {
       "name": "@vben-core/form-ui",
-      "path": "packages/@core/ui-kit/form-ui"
+      "path": "packages/@core/ui-kit/form-ui",
     },
     {
       "name": "@vben-core/layout-ui",
-      "path": "packages/@core/ui-kit/layout-ui"
+      "path": "packages/@core/ui-kit/layout-ui",
     },
     {
       "name": "@vben-core/menu-ui",
-      "path": "packages/@core/ui-kit/menu-ui"
+      "path": "packages/@core/ui-kit/menu-ui",
     },
     {
       "name": "@vben-core/popup-ui",
-      "path": "packages/@core/ui-kit/popup-ui"
+      "path": "packages/@core/ui-kit/popup-ui",
     },
     {
       "name": "@vben-core/shadcn-ui",
-      "path": "packages/@core/ui-kit/shadcn-ui"
+      "path": "packages/@core/ui-kit/shadcn-ui",
     },
     {
       "name": "@vben-core/tabs-ui",
-      "path": "packages/@core/ui-kit/tabs-ui"
+      "path": "packages/@core/ui-kit/tabs-ui",
     },
     {
       "name": "@vben/constants",
-      "path": "packages/constants"
+      "path": "packages/constants",
     },
     {
       "name": "@vben/access",
-      "path": "packages/effects/access"
+      "path": "packages/effects/access",
     },
     {
       "name": "@vben/common-ui",
-      "path": "packages/effects/common-ui"
+      "path": "packages/effects/common-ui",
     },
     {
       "name": "@vben/hooks",
-      "path": "packages/effects/hooks"
+      "path": "packages/effects/hooks",
     },
     {
       "name": "@vben/layouts",
-      "path": "packages/effects/layouts"
+      "path": "packages/effects/layouts",
     },
     {
       "name": "@vben/plugins",
-      "path": "packages/effects/plugins"
+      "path": "packages/effects/plugins",
     },
     {
       "name": "@vben/request",
-      "path": "packages/effects/request"
+      "path": "packages/effects/request",
     },
     {
       "name": "@vben/icons",
-      "path": "packages/icons"
+      "path": "packages/icons",
     },
     {
       "name": "@vben/locales",
-      "path": "packages/locales"
+      "path": "packages/locales",
     },
     {
       "name": "@vben/preferences",
-      "path": "packages/preferences"
+      "path": "packages/preferences",
     },
     {
       "name": "@vben/stores",
-      "path": "packages/stores"
+      "path": "packages/stores",
     },
     {
       "name": "@vben/styles",
-      "path": "packages/styles"
+      "path": "packages/styles",
     },
     {
       "name": "@vben/types",
-      "path": "packages/types"
+      "path": "packages/types",
     },
     {
       "name": "@vben/utils",
-      "path": "packages/utils"
+      "path": "packages/utils",
     },
     {
       "name": "@vben/turbo-run",
-      "path": "scripts/turbo-run"
+      "path": "scripts/turbo-run",
     },
     {
       "name": "@vben/vsh",
-      "path": "scripts/vsh"
-    }
-  ]
-}
+      "path": "scripts/vsh",
+    },
+  ],
+}