闪电 3 semanas atrás
pai
commit
7d3e9f6dcb

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

27
  * 查询所有油站信息
27
  * 查询所有油站信息
28
  * @returns 油站列表
28
  * @returns 油站列表
29
  */
29
  */
30
-export function selectAllSysStationAreaList() {
30
+export function selectAllSysStationAreaList(params: any) {
31
   return requestClient.get<BaseResult<StationInfoModel[]>>(
31
   return requestClient.get<BaseResult<StationInfoModel[]>>(
32
-    Api.selectAllSysStation,
32
+    Api.selectAllSysStationAreaList,
33
+    {
34
+      params,
35
+    },
33
   );
36
   );
34
 }
37
 }
35
 
38
 
37
  * 查询所有油站信息
40
  * 查询所有油站信息
38
  * @returns 油站列表
41
  * @returns 油站列表
39
  */
42
  */
40
-export function selectAllSysStation() {
43
+export function selectAllSysStation(params: any) {
41
   return requestClient.get<BaseResult<StationInfoModel[]>>(
44
   return requestClient.get<BaseResult<StationInfoModel[]>>(
42
     Api.selectAllSysStation,
45
     Api.selectAllSysStation,
46
+    {
47
+      params,
48
+    },
43
   );
49
   );
44
 }
50
 }
45
 /**
51
 /**

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

69
       targetType: 'task',
69
       targetType: 'task',
70
       attachments: commentImages.value.map((item) => item.fileName).join(','),
70
       attachments: commentImages.value.map((item) => item.fileName).join(','),
71
       content: commentContent.value,
71
       content: commentContent.value,
72
+      score: rating.value,
72
     });
73
     });
73
     commentContent.value = '';
74
     commentContent.value = '';
74
     commentImages.value = [];
75
     commentImages.value = [];
218
           <div
219
           <div
219
             v-for="(item, index) in comments"
220
             v-for="(item, index) in comments"
220
             :key="index"
221
             :key="index"
221
-            class="comment_item"
222
+            class="comment-item"
222
           >
223
           >
223
             <div class="reader-item mb-2 mr-2" style="flex-shrink: 0">
224
             <div class="reader-item mb-2 mr-2" style="flex-shrink: 0">
224
               {{ getLastTwoChars(item.username) }}
225
               {{ getLastTwoChars(item.username) }}
225
             </div>
226
             </div>
226
-            <div class="comment_content">
227
-              <span style="font-size: 15px; font-weight: 900">{{
228
-                item.username
229
-              }}</span>
227
+            <div class="comment-content">
228
+              <div style="display: flex; align-items: center; gap: 8px">
229
+                <span style="font-size: 15px; font-weight: 900">{{
230
+                  item.username
231
+                }}</span>
232
+                <ElRate v-model="item.score" size="small" disabled />
233
+              </div>
230
               <div>{{ item.content }}</div>
234
               <div>{{ item.content }}</div>
231
               <div>
235
               <div>
232
                 <AttachmentViewer :files="item.attachmentsUrl" />
236
                 <AttachmentViewer :files="item.attachmentsUrl" />
239
                 "
243
                 "
240
               >
244
               >
241
                 <span style="color: #a4aab2">{{ item.createTime }}</span>
245
                 <span style="color: #a4aab2">{{ item.createTime }}</span>
242
-                <span class="reply_btn" @click="toggleReply(index)">回复</span>
246
+                <span class="reply-btn" @click="toggleReply(index)">回复</span>
243
               </div>
247
               </div>
244
               <div
248
               <div
245
                 v-if="item.children && item.children.length > 0"
249
                 v-if="item.children && item.children.length > 0"
571
   }
575
   }
572
 }
576
 }
573
 
577
 
574
-.comment_item {
578
+.comment-item {
575
   display: flex;
579
   display: flex;
576
   // align-items: center;
580
   // align-items: center;
577
   // justify-content: space-between;
581
   // justify-content: space-between;
583
   font-size: 12px;
587
   font-size: 12px;
584
   color: #606266;
588
   color: #606266;
585
 
589
 
586
-  .comment_content {
590
+  .comment-content {
587
     margin-top: 6px;
591
     margin-top: 6px;
588
     display: flex;
592
     display: flex;
589
     flex-direction: column;
593
     flex-direction: column;
590
     gap: 8px;
594
     gap: 8px;
591
-    .reply_btn {
595
+    .reply-btn {
592
       color: #409eff;
596
       color: #409eff;
593
       cursor: pointer;
597
       cursor: pointer;
594
       &:hover {
598
       &:hover {

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

241
 
241
 
242
 const init = async () => {
242
 const init = async () => {
243
   const res: any = await employeeSettingsList({});
243
   const res: any = await employeeSettingsList({});
244
-  gridOptions.columns = [];
244
+  // gridOptions.columns = [];
245
   gridOptions.columns = defautTableColumns;
245
   gridOptions.columns = defautTableColumns;
246
-  if (res.rows?.length) {
246
+  if (
247
+    res.rows?.length &&
248
+    !(gridOptions && gridOptions.columns && gridOptions.columns?.length > 1)
249
+  ) {
247
     res.rows.forEach((item: any) => {
250
     res.rows.forEach((item: any) => {
248
       evaluationItems.value.push(item.dictCode);
251
       evaluationItems.value.push(item.dictCode);
249
       // @ts-ignore
252
       // @ts-ignore
250
       gridOptions.columns.push({
253
       gridOptions.columns.push({
251
         field: `id_${item.id}`,
254
         field: `id_${item.id}`,
252
         title: `${item.itemName}(${item.standardScore})`,
255
         title: `${item.itemName}(${item.standardScore})`,
253
-        // editRender: { name: 'input' },
254
-        // cellType: 'number',
255
         editRender: {
256
         editRender: {
256
           name: 'input',
257
           name: 'input',
257
           immediate: true,
258
           immediate: true,
258
           defaultValue: 20,
259
           defaultValue: 20,
259
         },
260
         },
260
         slots: {
261
         slots: {
261
-          // default: (data: any) => {
262
-          //   return data.row.machineValueFirst || '-';
263
-          // },
264
           edit: (data: any) => {
262
           edit: (data: any) => {
265
             return (
263
             return (
266
               <ElInputNumber
264
               <ElInputNumber
274
             );
272
             );
275
           },
273
           },
276
         },
274
         },
277
-        width: 150,
275
+        width: 200,
278
       });
276
       });
279
     });
277
     });
278
+    // @ts-ignore
279
+    gridOptions.columns.push({
280
+      field: 'evaluationWords',
281
+      title: `评语`,
282
+      editRender: { name: 'textarea' },
283
+      // cellType: 'number',
284
+      width: 200,
285
+    });
280
   }
286
   }
281
 
287
 
282
-  // @ts-ignore
283
-  gridOptions.columns.push({
284
-    field: 'evaluationWords',
285
-    title: `评语`,
286
-    editRender: { name: 'textarea' },
287
-    // cellType: 'number',
288
-    width: 200,
289
-  });
290
   basicTableApi.setGridOptions(gridOptions);
288
   basicTableApi.setGridOptions(gridOptions);
291
 };
289
 };
292
 
290
 
293
 onMounted(async () => {
291
 onMounted(async () => {
292
+  console.log('gridOptions', gridOptions);
294
   await init();
293
   await init();
295
   // gridOptions.columns = await tableColumns();
294
   // gridOptions.columns = await tableColumns();
296
 });
295
 });

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

1
 import { h } from 'vue';
1
 import { h } from 'vue';
2
 
2
 
3
-import { useUserStore } from '@vben/stores';
3
+// import { useUserStore } from '@vben/stores';
4
 import { getPopupContainer } from '@vben/utils';
4
 import { getPopupContainer } from '@vben/utils';
5
 
5
 
6
 import { queryExecutorList } from '#/api/schedule/index';
6
 import { queryExecutorList } from '#/api/schedule/index';
7
-import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
7
+import { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
8
 import { getPostList } from '#/api/system/post/post';
8
 import { getPostList } from '#/api/system/post/post';
9
 import { querybaseApilist } from '#/api/system/tasksettings/tasktemplate';
9
 import { querybaseApilist } from '#/api/system/tasksettings/tasktemplate';
10
 import { getFileUploadConfig } from '#/components/upload/config';
10
 import { getFileUploadConfig } from '#/components/upload/config';
11
 import { getDictOptions } from '#/utils/dict';
11
 import { getDictOptions } from '#/utils/dict';
12
 
12
 
13
-const userStore = useUserStore();
13
+// const userStore = useUserStore();
14
 // 字典标识常量
14
 // 字典标识常量
15
 const DICT_KEYS = {
15
 const DICT_KEYS = {
16
   // 任务类型字典标识
16
   // 任务类型字典标识
27
 let getPostListOptions = [] as any; // 执行岗位下拉
27
 let getPostListOptions = [] as any; // 执行岗位下拉
28
 let getUserListOptions = [] as any; // 执行人下拉
28
 let getUserListOptions = [] as any; // 执行人下拉
29
 const getPostListfn = async () => {
29
 const getPostListfn = async () => {
30
-  const { rows } = await getPostList({});
30
+  const { rows } = await getPostList({
31
+    pageSize: 10_000,
32
+  });
31
   getPostListOptions = rows.map((item: any) => ({
33
   getPostListOptions = rows.map((item: any) => ({
32
     label: item.postName,
34
     label: item.postName,
33
     value: item.postId,
35
     value: item.postId,
93
     componentProps: {
95
     componentProps: {
94
       getPopupContainer,
96
       getPopupContainer,
95
       api: async () => {
97
       api: async () => {
96
-        const data = await selectAllSysStationAreaList();
98
+        const data = await selectAllSysStation({
99
+          isAll: true,
100
+        });
97
         return data;
101
         return data;
98
       },
102
       },
99
       multiple: true,
103
       multiple: true,

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

31
     slots: { default: 'action' },
31
     slots: { default: 'action' },
32
     resizable: false,
32
     resizable: false,
33
     title: '操作',
33
     title: '操作',
34
-    width: 180,
34
+    width: 230,
35
   },
35
   },
36
 ];
36
 ];
37
 
37
 
65
       checkStrictly: true,
65
       checkStrictly: true,
66
     },
66
     },
67
     dependencies: {
67
     dependencies: {
68
-      if(values) {
69
-        // 总是显示上级分类选择框,无论是新增还是编辑
70
-        return true;
71
-      },
68
+      // if(values) {
69
+      //   // 总是显示上级分类选择框,无论是新增还是编辑
70
+      //   return true;
71
+      // },
72
       triggerFields: ['parentId'],
72
       triggerFields: ['parentId'],
73
     },
73
     },
74
     fieldName: 'parentId',
74
     fieldName: 'parentId',

+ 40 - 40
vben-admin.code-workspace

2
   "folders": [
2
   "folders": [
3
     {
3
     {
4
       "name": "@vben/web-ele",
4
       "name": "@vben/web-ele",
5
-      "path": "apps/web-ele"
5
+      "path": "apps/web-ele",
6
     },
6
     },
7
     {
7
     {
8
       "name": "@vben/commitlint-config",
8
       "name": "@vben/commitlint-config",
9
-      "path": "internal/lint-configs/commitlint-config"
9
+      "path": "internal/lint-configs/commitlint-config",
10
     },
10
     },
11
     {
11
     {
12
       "name": "@vben/eslint-config",
12
       "name": "@vben/eslint-config",
13
-      "path": "internal/lint-configs/eslint-config"
13
+      "path": "internal/lint-configs/eslint-config",
14
     },
14
     },
15
     {
15
     {
16
       "name": "@vben/prettier-config",
16
       "name": "@vben/prettier-config",
17
-      "path": "internal/lint-configs/prettier-config"
17
+      "path": "internal/lint-configs/prettier-config",
18
     },
18
     },
19
     {
19
     {
20
       "name": "@vben/stylelint-config",
20
       "name": "@vben/stylelint-config",
21
-      "path": "internal/lint-configs/stylelint-config"
21
+      "path": "internal/lint-configs/stylelint-config",
22
     },
22
     },
23
     {
23
     {
24
       "name": "@vben/node-utils",
24
       "name": "@vben/node-utils",
25
-      "path": "internal/node-utils"
25
+      "path": "internal/node-utils",
26
     },
26
     },
27
     {
27
     {
28
       "name": "@vben/tailwind-config",
28
       "name": "@vben/tailwind-config",
29
-      "path": "internal/tailwind-config"
29
+      "path": "internal/tailwind-config",
30
     },
30
     },
31
     {
31
     {
32
       "name": "@vben/tsconfig",
32
       "name": "@vben/tsconfig",
33
-      "path": "internal/tsconfig"
33
+      "path": "internal/tsconfig",
34
     },
34
     },
35
     {
35
     {
36
       "name": "@vben/vite-config",
36
       "name": "@vben/vite-config",
37
-      "path": "internal/vite-config"
37
+      "path": "internal/vite-config",
38
     },
38
     },
39
     {
39
     {
40
       "name": "@vben-core/design",
40
       "name": "@vben-core/design",
41
-      "path": "packages/@core/base/design"
41
+      "path": "packages/@core/base/design",
42
     },
42
     },
43
     {
43
     {
44
       "name": "@vben-core/icons",
44
       "name": "@vben-core/icons",
45
-      "path": "packages/@core/base/icons"
45
+      "path": "packages/@core/base/icons",
46
     },
46
     },
47
     {
47
     {
48
       "name": "@vben-core/shared",
48
       "name": "@vben-core/shared",
49
-      "path": "packages/@core/base/shared"
49
+      "path": "packages/@core/base/shared",
50
     },
50
     },
51
     {
51
     {
52
       "name": "@vben-core/typings",
52
       "name": "@vben-core/typings",
53
-      "path": "packages/@core/base/typings"
53
+      "path": "packages/@core/base/typings",
54
     },
54
     },
55
     {
55
     {
56
       "name": "@vben-core/composables",
56
       "name": "@vben-core/composables",
57
-      "path": "packages/@core/composables"
57
+      "path": "packages/@core/composables",
58
     },
58
     },
59
     {
59
     {
60
       "name": "@vben-core/preferences",
60
       "name": "@vben-core/preferences",
61
-      "path": "packages/@core/preferences"
61
+      "path": "packages/@core/preferences",
62
     },
62
     },
63
     {
63
     {
64
       "name": "@vben-core/form-ui",
64
       "name": "@vben-core/form-ui",
65
-      "path": "packages/@core/ui-kit/form-ui"
65
+      "path": "packages/@core/ui-kit/form-ui",
66
     },
66
     },
67
     {
67
     {
68
       "name": "@vben-core/layout-ui",
68
       "name": "@vben-core/layout-ui",
69
-      "path": "packages/@core/ui-kit/layout-ui"
69
+      "path": "packages/@core/ui-kit/layout-ui",
70
     },
70
     },
71
     {
71
     {
72
       "name": "@vben-core/menu-ui",
72
       "name": "@vben-core/menu-ui",
73
-      "path": "packages/@core/ui-kit/menu-ui"
73
+      "path": "packages/@core/ui-kit/menu-ui",
74
     },
74
     },
75
     {
75
     {
76
       "name": "@vben-core/popup-ui",
76
       "name": "@vben-core/popup-ui",
77
-      "path": "packages/@core/ui-kit/popup-ui"
77
+      "path": "packages/@core/ui-kit/popup-ui",
78
     },
78
     },
79
     {
79
     {
80
       "name": "@vben-core/shadcn-ui",
80
       "name": "@vben-core/shadcn-ui",
81
-      "path": "packages/@core/ui-kit/shadcn-ui"
81
+      "path": "packages/@core/ui-kit/shadcn-ui",
82
     },
82
     },
83
     {
83
     {
84
       "name": "@vben-core/tabs-ui",
84
       "name": "@vben-core/tabs-ui",
85
-      "path": "packages/@core/ui-kit/tabs-ui"
85
+      "path": "packages/@core/ui-kit/tabs-ui",
86
     },
86
     },
87
     {
87
     {
88
       "name": "@vben/constants",
88
       "name": "@vben/constants",
89
-      "path": "packages/constants"
89
+      "path": "packages/constants",
90
     },
90
     },
91
     {
91
     {
92
       "name": "@vben/access",
92
       "name": "@vben/access",
93
-      "path": "packages/effects/access"
93
+      "path": "packages/effects/access",
94
     },
94
     },
95
     {
95
     {
96
       "name": "@vben/common-ui",
96
       "name": "@vben/common-ui",
97
-      "path": "packages/effects/common-ui"
97
+      "path": "packages/effects/common-ui",
98
     },
98
     },
99
     {
99
     {
100
       "name": "@vben/hooks",
100
       "name": "@vben/hooks",
101
-      "path": "packages/effects/hooks"
101
+      "path": "packages/effects/hooks",
102
     },
102
     },
103
     {
103
     {
104
       "name": "@vben/layouts",
104
       "name": "@vben/layouts",
105
-      "path": "packages/effects/layouts"
105
+      "path": "packages/effects/layouts",
106
     },
106
     },
107
     {
107
     {
108
       "name": "@vben/plugins",
108
       "name": "@vben/plugins",
109
-      "path": "packages/effects/plugins"
109
+      "path": "packages/effects/plugins",
110
     },
110
     },
111
     {
111
     {
112
       "name": "@vben/request",
112
       "name": "@vben/request",
113
-      "path": "packages/effects/request"
113
+      "path": "packages/effects/request",
114
     },
114
     },
115
     {
115
     {
116
       "name": "@vben/icons",
116
       "name": "@vben/icons",
117
-      "path": "packages/icons"
117
+      "path": "packages/icons",
118
     },
118
     },
119
     {
119
     {
120
       "name": "@vben/locales",
120
       "name": "@vben/locales",
121
-      "path": "packages/locales"
121
+      "path": "packages/locales",
122
     },
122
     },
123
     {
123
     {
124
       "name": "@vben/preferences",
124
       "name": "@vben/preferences",
125
-      "path": "packages/preferences"
125
+      "path": "packages/preferences",
126
     },
126
     },
127
     {
127
     {
128
       "name": "@vben/stores",
128
       "name": "@vben/stores",
129
-      "path": "packages/stores"
129
+      "path": "packages/stores",
130
     },
130
     },
131
     {
131
     {
132
       "name": "@vben/styles",
132
       "name": "@vben/styles",
133
-      "path": "packages/styles"
133
+      "path": "packages/styles",
134
     },
134
     },
135
     {
135
     {
136
       "name": "@vben/types",
136
       "name": "@vben/types",
137
-      "path": "packages/types"
137
+      "path": "packages/types",
138
     },
138
     },
139
     {
139
     {
140
       "name": "@vben/utils",
140
       "name": "@vben/utils",
141
-      "path": "packages/utils"
141
+      "path": "packages/utils",
142
     },
142
     },
143
     {
143
     {
144
       "name": "@vben/turbo-run",
144
       "name": "@vben/turbo-run",
145
-      "path": "scripts/turbo-run"
145
+      "path": "scripts/turbo-run",
146
     },
146
     },
147
     {
147
     {
148
       "name": "@vben/vsh",
148
       "name": "@vben/vsh",
149
-      "path": "scripts/vsh"
150
-    }
151
-  ]
152
-}
149
+      "path": "scripts/vsh",
150
+    },
151
+  ],
152
+}