Merge branch 'master' of http://39.164.159.226:3000/hnsh-smart-steward/smart-steward-admin

apps/web-ele/src/api/knowledge/category.ts

@@ -11,7 +11,7 @@ export function addKnowledgeCategory(data: any) {
 }
 //查询知识库分类列表
 export function queryKnowledgeCategory(params: any) {
-  return requestClient.get(Api.queryknowledgeCategory, {params});
+  return requestClient.get(Api.queryknowledgeCategory, { params });
 }
 //修改知识库分类
 export function editKnowledgeCategory(data: any) {
@@ -20,8 +20,8 @@ export function editKnowledgeCategory(data: any) {
   });
 }
 //删除知识库分类
-export function deleteKnowledgeCategory(roleId: any) {
-  return requestClient.delete(`${Api.baseknowledgeCategory}/${roleId}`, {
+export function deleteKnowledgeCategory(ids: any) {
+  return requestClient.delete(`${Api.baseknowledgeCategory}/${ids}`, {
     successMessageMode: 'message',
   });
-}
+}

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

@@ -11,7 +11,7 @@ import {
   ElButton,
   ElIcon,
 } from 'element-plus';
-import { Upload, Plus } from '@element-plus/icons-vue';
+import { Upload, Plus, Delete } from '@element-plus/icons-vue';
 import '#/assets/iconfonts/font/iconfont.css';
 import { useAccessStore } from '@vben/stores';
 import { getUploadAction } from '#/components/upload/config';
@@ -188,6 +188,13 @@ const selectDefaultIcon = (icon: any) => {
   form.value.icon = `${icon.icon},${icon.color},${icon.iconValue}`;
 };
 
+// 删除上传的图标
+const handleDeleteIcon = () => {
+  form.value.icon = '';
+  form.value.upiconname = '';
+  ElMessage.success('图标已删除');
+};
+
 // 表单提交
 const submitForm = () => {
   // 这里可以添加表单提交逻辑
@@ -265,6 +272,9 @@ const closeForm = () => {
         class="icon-preview"
       >
         <img :src="form.icon" alt="预览" />
+        <div class="icon-delete" @click="handleDeleteIcon">
+          <ElIcon><Delete /></ElIcon>
+        </div>
       </div>
       <div class="icon-default">
         <div class="section-title">预览可选图标</div>
@@ -389,6 +399,7 @@ const closeForm = () => {
 
 .icon-preview {
   margin: 16px 0;
+  position: relative;
 
   img {
     width: 120px;
@@ -396,6 +407,26 @@ const closeForm = () => {
     object-fit: cover;
     border-radius: 6px;
   }
+
+  .icon-delete {
+    position: absolute;
+    top: -10px;
+    right: -10px;
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    background-color: rgba(0, 0, 0, 0.6);
+    color: white;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    &:hover {
+      background-color: rgba(0, 0, 0, 0.8);
+    }
+  }
 }
 
 .icon-default {

apps/web-ele/src/views/schedule/allot/config-data.tsx

@@ -27,7 +27,12 @@ export const querySchema: FormSchemaGetter = () => [
       valueField: 'postId',
       placeholder: '请选择岗位名称',
       resultField: 'rows',
-      clearable: true, // 添加一键清除功能
+      clearable: true,
+      afterFetch: (data: any) => {
+        return data.rows.filter(
+          (item: any) => item.postId === 4 || item.postId === 5,
+        );
+      },
     },
     fieldName: 'executePosition',
     label: '岗位名称',

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

@@ -58,6 +58,7 @@ const gridOptions: VxeGridProps = {
           ...formValues,
           pageNum: page.currentPage,
           pageSize: page.pageSize,
+          status: '1',
         });
         return { items: resp.rows, total: resp.total };
       },

apps/web-ele/src/views/schedule/work/class/config-data.tsx

@@ -1,51 +1,53 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
-// import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
-import { queryGasStationList } from '#/api/schedule/index';
+import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+// import { queryGasStationList } from '#/api/schedule/index';
 import { queryrclassesApilist } from '#/api/schedule/work/classes';
-import { useAuthStore } from '#/store/auth';
+import { useUserStore } from '@vben/stores';
+const userStore = useUserStore();
+const getstationId = userStore.userInfo?.stations?.[0]?.id;
 
-const getstationId = useAuthStore().userStore?.userInfo?.stations[0]?.id;
-export const querySchema: FormSchemaGetter = () => [
-  {
-    component: 'ApiSelect',
-    componentProps: {
-      api: queryGasStationList,
-      labelField: 'stationName',
-      valueField: 'stationId',
-      placeholder: '请选择油站',
-      clearable: true,
+export const querySchema: FormSchemaGetter = () => {
+  return [
+    {
+      component: 'ApiSelect',
+      componentProps: {
+        api: selectAllSysStationAreaList,
+        labelField: 'stationName',
+        valueField: 'id',
+        placeholder: '请选择油站',
+        clearable: true,
+      },
+      fieldName: 'stationName',
+      defaultValue: getstationId,
+      label: '油站',
     },
-    fieldName: 'stationId',
-    defaultValue: getstationId,
-    label: '油站',
-  },
-  {
-    component: 'ApiSelect',
-    componentProps: {
-      api: queryrclassesApilist,
-      labelField: 'shiftName',
-      valueField: 'shiftName',
-      placeholder: '请选择班次名称',
-      clearable: true,
-      resultField: 'rows',
+    {
+      component: 'ApiSelect',
+      componentProps: {
+        api: queryrclassesApilist,
+        labelField: 'shiftName',
+        valueField: 'shiftName',
+        placeholder: '请选择班次名称',
+        clearable: true,
+        resultField: 'rows',
+      },
+      fieldName: 'shiftName',
+      label: '班次名称',
     },
-    fieldName: 'shiftName',
-    label: '班次名称',
-  },
-  {
-    component: 'DatePicker',
-    componentProps: {
-      type: 'datetime',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      placeholder: '选择时间',
+    {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        format: 'YYYY-MM-DD',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '选择时间',
+      },
+      fieldName: 'startTime',
+      label: '上班时间',
     },
-    fieldName: 'startTime',
-    label: '上班时间',
-  },
-];
+  ];
+};
 
 export const columns: VxeGridProps['columns'] = [
   {

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

@@ -392,6 +392,7 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     label: '任务负责人',
     componentProps: {
       placeholder: '请选择任务来源',
+      clearable: true,
       api: async () => {
         const resp: any = await getUserList({
           pageNum: 1,