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

@@ -14,6 +14,8 @@ import {
 // @ts-ignore
 import { addComment, querycomment } from '#/api/knowledge/comment';
 // @ts-ignore
+import AttachmentViewer from '#/components/AttachmentViewer.vue';
+// @ts-ignore
 import { getSingleImageUploadConfig } from '#/components/upload/config';
 
 // @ts-ignore
@@ -40,7 +42,6 @@ const commentImages = ref<any[]>([]);
 // 图片预览相关
 // const previewVisible = ref(false);
 // const previewImages = ref<string[]>([]);
-
 // 上传图片成功
 const handleUploadSuccess = (file: any) => {
   if (file.code === 200) {
@@ -95,60 +96,9 @@ const querycommentfn = async () => {
     commentsloading.value = false;
   }
 };
-// 添加记录
-// const addrecordfn = async () => {
-//   commentsloading.value = true;
-//   try {
-//     await addrecord({ contentId: classId });
-//   } catch (error) {
-//     console.log(error);
-//   } finally {
-//     commentsloading.value = false;
-//   }
-// };
-// const queryrecordfn = async () => {
-//   commentsloading.value = true;
-//   try {
-//     const res = await queryrecord({ contentId: classId, userId });
-//     viewRecords.value = res?.rows || [];
-//   } catch (error) {
-//     console.log(error);
-//   } finally {
-//     commentsloading.value = false;
-//   }
-// };
-
-// 关闭图片预览
-// const closePreview = () => {
-//   previewVisible.value = false;
-// };
 
 // 当前选中的tab
 const activeTab = ref('comment');
-// 评论模拟数据
-// const comments = ref([
-//   {
-//     name: '张三',
-//     content:
-//       '干的不错!12问题解决的很迅速干的不错问题解决的很迅速!干的不错，问题解决的很迅速!干的不错，问题解决的很迅速!',
-//     time: '一天前',
-//     child: [
-//       {
-//         name: '张三',
-//         content: '谢谢站长支持！',
-//       },
-//     ],
-//   },
-//   {
-//     name: '李四',
-//     content:
-//       '干的不错!12问题解决的很迅速干的不错问题解决的很迅速!干的不错，问题解决的很迅速!干的不错，问题解决的很迅速!',
-//     time: '三天前',
-//   },
-//   {
-//     name: '王五',
-//   },
-// ]);
 
 const replyOpen = ref({}) as any;
 const toggleReply = (index: any) => {
@@ -233,15 +183,12 @@ onMounted(() => {
               v-bind="getSingleImageUploadConfig()"
               :on-success="handleUploadSuccess"
             >
-              <img
+              <!-- <img
                 v-if="commentImages.length > 0"
                 :src="commentImages[0].url"
                 class="avatar"
-              />
-              <div
-                v-else
-                class="flex h-full w-full items-center justify-center"
-              >
+              /> -->
+              <div class="flex h-full w-full items-center justify-center">
                 <ElIcon class="el-upload__icon">
                   <Plus size="18" />
                 </ElIcon>
@@ -281,6 +228,9 @@ onMounted(() => {
                 item.username
               }}</span>
               <div>{{ item.content }}</div>
+              <div>
+                <AttachmentViewer :files="item.attachmentsUrl" />
+              </div>
               <div
                 style="
                   display: flex;

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

@@ -117,6 +117,24 @@ const tableColumns: any = [
     ],
   },
   {
+    field: 'sumErrorRate_t',
+    title: '合计检测升数',
+    width: 120,
+    children: [
+      {
+        field: 'sumErrorRate',
+        title: 'H=A+B',
+        width: 120,
+        formatter: ({ row }) => {
+          return (
+            Number(row.machineValueFirst) + Number(row.machineValueSecond) ||
+            '-'
+          );
+        },
+      },
+    ],
+  },
+  {
     field: 'remark',
     title: '备注',
     width: 150,

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

@@ -25,7 +25,7 @@ const tableColumns: any = [
   {
     field: 'oilProduct',
     title: '油品名称',
-    // minWidth: 120,
+    minWidth: 120,
   },
   {
     field: 'levelGauge',

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

@@ -106,12 +106,6 @@ const taskId = ref(Number(route.params.id));
 const previewVisible = ref(false);
 const previewImages = ref<string[]>([]);
 
-// 预览图片
-const previewImage = (imageUrl: string) => {
-  previewImages.value = [imageUrl];
-  previewVisible.value = true;
-};
-
 // 关闭图片预览
 const closePreview = () => {
   previewVisible.value = false;
@@ -949,6 +943,8 @@ onMounted(async () => {
 .boxdev {
   display: flex;
   gap: 20px;
+  height: 100%;
+  overflow: hidden;
 }
 .boxdev :deep(.el-card) {
   border: none !important;
@@ -971,9 +967,11 @@ onMounted(async () => {
 .boxdev > div:nth-child(1) {
   flex: 1;
   min-width: 0;
+  overflow-y: auto;
 }
 .boxdev > div:nth-child(2) {
   width: 28%;
+  overflow-y: auto;
 }
 .task-detail-container {
   width: 100%;

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

@@ -1,8 +1,10 @@
 import { h } from 'vue';
 
 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 { getPostList } from '#/api/system/post/post';
 import { querybaseApilist } from '#/api/system/tasksettings/tasktemplate';
 import { getFileUploadConfig } from '#/components/upload/config';
@@ -87,15 +89,16 @@ export const drawerFormSchema: any = (type: any) => [
     },
   },
   {
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
-      placeholder: '请选择场站',
-      options: (userStore.userInfo?.stations || []).map((item: any) => {
-        return {
-          label: item.stationName,
-          value: item.id,
-        };
-      }),
+      getPopupContainer,
+      api: async () => {
+        const data = await selectAllSysStationAreaList();
+        return data;
+      },
+      multiple: true,
+      labelField: 'stationName',
+      valueField: 'id',
     },
 
     fieldName: 'stationId',

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

@@ -380,7 +380,9 @@ const getAuthStatus = (task: any) => {
             class="flex h-8 items-center justify-center rounded-t text-sm font-medium text-white"
             :style="{
               backgroundColor: task.completeTime
-                ? '#339169'
+                ? task.status === 0
+                  ? '#86909C'
+                  : '#339169'
                 : task?.remainingTime?.dayobj?.day !== ''
                   ? task?.remainingTime?.dayobj?.topbackcolor
                   : task?.remainingTime?.hours?.hour !== ''
@@ -392,7 +394,7 @@ const getAuthStatus = (task: any) => {
           >
             {{
               task.completeTime
-                ? `${task.completeTime}${task.sataus === 0 ? '取消' : '完成'}`
+                ? `${task.completeTime}${task.status === 0 ? '取消' : '完成'}`
                 : task?.remainingTime?.dayobj?.day !== ''
                   ? task?.remainingTime?.dayobj?.day
                   : task?.remainingTime?.hours?.hour !== ''
@@ -406,7 +408,9 @@ const getAuthStatus = (task: any) => {
             class="flex h-[64px] items-center justify-between rounded-b border border-t-0 border-gray-200 p-4"
             :style="{
               backgroundColor: task.completeTime
-                ? '#D6EFE6'
+                ? task.status === 0
+                  ? '#F1F1F1'
+                  : '#D6EFE6'
                 : task?.remainingTime?.dayobj?.day !== ''
                   ? task?.remainingTime?.dayobj?.mainbackcolor
                   : task?.remainingTime?.hours?.hour !== ''

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

@@ -645,6 +645,7 @@ const createWorkOrderDrawerEvent = () => {
             <ElButton
               type="primary"
               class="w-full"
+              v-access:code="'schedule:view:addstationtask'"
               @click="createTaskDrawerEvent"
             >
               <template #icon>
@@ -657,6 +658,7 @@ const createWorkOrderDrawerEvent = () => {
             <ElButton
               type="default"
               class="w-full"
+              v-access:code="'schedule:view:addvisittask'"
               @click="createVisitorTaskDrawerEvent"
             >
               <template #icon>
@@ -669,6 +671,7 @@ const createWorkOrderDrawerEvent = () => {
             <ElButton
               type="default"
               class="w-full"
+              v-access:code="'schedule:view:addworktask'"
               @click="createWorkOrderDrawerEvent"
             >
               <template #icon>

apps/web-ele/src/views/system/infoEntry/districtInfo/districtInfo-data.tsx

@@ -26,11 +26,11 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '片区名称',
     minWidth: 150,
   },
-  {
-    field: 'address',
-    title: '详细地址',
-    minWidth: 200,
-  },
+  // {
+  //   field: 'address',
+  //   title: '详细地址',
+  //   minWidth: 200,
+  // },
   {
     field: 'manager',
     title: '片区经理',
@@ -80,16 +80,16 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     },
     rules: 'required',
   },
-  {
-    component: 'Input',
-    fieldName: 'address',
-    label: '详细地址',
-    componentProps: {
-      placeholder: '请输入详细地址',
-      maxlength: 200,
-    },
-    rules: 'required',
-  },
+  // {
+  //   component: 'Input',
+  //   fieldName: 'address',
+  //   label: '详细地址',
+  //   componentProps: {
+  //     placeholder: '请输入详细地址',
+  //     maxlength: 200,
+  //   },
+  //   rules: 'required',
+  // },
   {
     component: 'RadioGroup',
     componentProps: {

apps/web-ele/src/views/system/role/config-data.tsx

@@ -71,7 +71,9 @@ export const drawerSchema: FormSchemaGetter = () => [
     componentProps: {
       // getPopupContainer,
       api: async () => {
-        const { rows } = await getPostList();
+        const { rows } = await getPostList({
+          pageSize: 10_000,
+        });
         return rows;
       },
       multiple: true,
@@ -154,6 +156,12 @@ export const columns: VxeGridProps['columns'] = [
     minWidth: 130,
   },
   {
+    field: 'postIds',
+    title: '岗位',
+    slots: { default: 'postIds' },
+    minWidth: 130,
+  },
+  {
     field: 'roleKey',
     title: '权限字符',
     slots: { default: 'roleKey' },

apps/web-ele/src/views/system/user/user-drawer.vue

@@ -17,6 +17,7 @@ import { getPopupContainer } from '@vben/utils';
 import { useVbenForm, z } from '#/adapter/form';
 // @ts-ignore
 import { deptTree } from '#/api/system/dept/dept';
+import { selectAllSysAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
 // @ts-ignore
 import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
 // @ts-ignore
@@ -28,6 +29,9 @@ import { addUser, getUserOne, updateUser } from '#/api/system/user/user';
 import { getDictOptions } from '#/utils/dict';
 
 const emit = defineEmits<{ reload: [] }>();
+
+const postOptions: any = ref([]);
+
 const isUpdate = ref<boolean>(false);
 // 侧拉内置容器 Form表单的配置项
 const [Form, FormApi] = useVbenForm({
@@ -173,7 +177,10 @@ const [Form, FormApi] = useVbenForm({
       componentProps: {
         getPopupContainer,
         api: async () => {
-          const { rows } = await getPostList();
+          const { rows } = await getPostList({
+            pageSize: 10_000,
+          });
+          postOptions.value = rows;
           return rows;
         },
         // multiple: true,
@@ -189,6 +196,7 @@ const [Form, FormApi] = useVbenForm({
         getPopupContainer,
         api: async () => {
           const data = await selectAllSysStationAreaList();
+
           return data;
         },
         multiple: true,
@@ -197,6 +205,40 @@ const [Form, FormApi] = useVbenForm({
       },
       fieldName: 'stationIds',
       label: '所属场站',
+      dependencies: {
+        show: (values: any) => {
+          const post = postOptions.value.find(
+            (item: any) => item.postId === values.postId,
+          );
+          return ['employee', 'management'].includes(post?.type || '');
+        },
+        triggerFields: ['postId'],
+      },
+    },
+    {
+      component: 'ApiSelect',
+      componentProps: {
+        getPopupContainer,
+        api: async () => {
+          const resp = await selectAllSysAreaList();
+          const data = resp || [];
+          return data;
+        },
+        // multiple: true,
+        labelField: 'areaName',
+        valueField: 'id',
+      },
+      fieldName: 'areaId',
+      label: '所属片区',
+      dependencies: {
+        show: (values: any) => {
+          const post = postOptions.value.find(
+            (item: any) => item.postId === values.postId,
+          );
+          return ['region'].includes(post?.type || '');
+        },
+        triggerFields: ['postId'],
+      },
     },
     // {
     //   component: 'ApiSelect',
@@ -270,7 +312,7 @@ const [Drawer, DrawerApi] = useVbenDrawer({
 
       await FormApi.setValues(result.data);
       console.log(result);
-      
+
       await FormApi.setFieldValue('postId', result.data.post?.postId);
       await FormApi.setFieldValue('roleIds', result.roleIds);
       await FormApi.setFieldValue('stationIds', result.Stations);

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"
+    }
+  ]
+}