fix: 184

apps/web-ele/src/api/oilstation/filter/filter.ts

@@ -12,7 +12,7 @@ enum Api {
   filterImport = '/gasOilFilter/filter/import',
   filterInfo = '/gasOilFilter/filter/',
   filterList = '/gasOilFilter/filter/list',
-  filterLogs = '/gasFilterMaintenanceLog/log/list',
+  filterLogs = '/gasOilFilter/filter/log/list',
 }
 
 // 返回日志

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

@@ -15,7 +15,7 @@ import { ElMessage } from 'element-plus';
 import { deptTree } from '#/api/system/dept/dept';
 // 场站相关API
 // @ts-ignore
-import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+import { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
 // 岗位相关API
 // @ts-ignore
 import { getPostList } from '#/api/system/post/post';
@@ -213,9 +213,16 @@ async function initData() {
     // 并行请求所有数据，提高加载效率
     const [deptRes, roleRes, postRes, stationRes] = await Promise.all([
       deptTree(),
-      getRoleList(),
-      getPostList(),
-      selectAllSysStationAreaList(),
+      getRoleList({
+        pageSize: 10_000,
+      }),
+      getPostList({
+        pageSize: 10_000,
+      }),
+      selectAllSysStation({
+        isAll: true,
+        pageSize: 10_000,
+      }),
     ]);
 
     deptTreeData.value = deptRes || [];
@@ -496,7 +503,7 @@ function handleStationChange() {
         selectedItems.value.push({
           id: stationId,
           key: `${stationId}-station`,
-          name: station.areaName,
+          name: station.stationName,
           type: 'station',
         });
       }
@@ -730,7 +737,7 @@ defineExpose({
               :label="station.id"
               class="checkbox-item"
             >
-              {{ station.areaName }}
+              {{ station.stationName }}
             </ElCheckbox>
           </ElCheckboxGroup>
         </div>

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

@@ -259,8 +259,8 @@ const submitForm = () => {
     if (valid) {
       emit('save', {
         ...form.value,
-        visiblePositions: form.value.visiblePositions.join(','),
-        visibleRole: form.value.visibleRole.join(','),
+        visiblePositions: form.value?.visiblePositions?.join(','),
+        visibleRole: form.value?.visibleRole?.join(','),
       });
       ElMessage.success(props.mode === 'create' ? '创建成功' : '编辑成功');
     } else {

apps/web-ele/src/views/oilstation/extinguisher/extinguisher-data.tsx

@@ -15,7 +15,7 @@ export const queryFormSchema: FormSchemaGetter = () => [
       placeholder: '请选择场站',
       clearable: true,
       api: async () => {
-        const resp = await selectAllSysStation();
+        const resp = await selectAllSysStation({});
         const data = resp || [];
         return Array.isArray(data)
           ? data.map((item: any) => ({
@@ -139,7 +139,7 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     componentProps: {
       placeholder: '请选择场站',
       api: async () => {
-        const resp = await selectAllSysStation();
+        const resp = await selectAllSysStation({});
         const data = resp || [];
         return Array.isArray(data)
           ? data.map((item: any) => ({
@@ -198,7 +198,7 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     componentProps: {
       type: 'date',
       format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD',
       placeholder: '生产日期',
       style: {
         width: '100%',
@@ -213,7 +213,7 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     componentProps: {
       type: 'date',
       format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD',
       placeholder: '有效日期',
       style: {
         width: '100%',

apps/web-ele/src/views/oilstation/extinguisher/extinguisher-drawer.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 
+// @ts-ignore
 import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
 
 import {
@@ -28,7 +29,8 @@ onMounted(() => {
 const isUpdateRef = ref<boolean>(false);
 
 const [Drawer, drawerApi] = useVbenDrawer({
-  async onOpenChange(isOpen) {
+  // @ts-ignore
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       return;
     }
@@ -37,8 +39,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
       const { id, isUpdate } = drawerApi.getData();
       isUpdateRef.value = isUpdate;
       if (isUpdate && id) {
-        const res = await getExtinguisherDetail(id);
-        console.log('获取灭火器详情数据:', res);
+        const res: any = await getExtinguisherDetail(id);
         // 确保从正确的响应结构中获取数据
         const detailData = res?.data || res;
         await formApi.setValues(detailData);
@@ -61,10 +62,9 @@ const [Drawer, drawerApi] = useVbenDrawer({
 
       // 确保使用正确的字段名提交数据
       const submitData = {
-        ...data
+        ...data,
       };
 
-      console.log('提交数据:', submitData);
       await (isUpdateRef.value
         ? updateExtinguisher(submitData)
         : addExtinguisher(submitData));

apps/web-ele/src/views/oilstation/filter/detail.vue

@@ -29,7 +29,7 @@ const filterId = ref(Number(route.params.id));
 // 表格列配置
 const tableColumns: any = [
   {
-    field: 'operatedAt',
+    field: 'createTime',
     title: '操作时间',
     width: 200,
   },
@@ -54,7 +54,7 @@ const tableColumns: any = [
     // width: 150,
   },
   {
-    field: 'operatorName',
+    field: 'createByName',
     title: '操作员',
   },
 ];
@@ -68,14 +68,17 @@ const gridOptions: any = {
     zoom: false,
   },
   pagerConfig: {
-    enabled: false,
+    enabled: true,
   },
   proxyConfig: {
     ajax: {
-      query: async () => {
-        return {
-          items: operationRecords.value || [],
-        };
+      query: async ({ page }: any) => {
+        const resp = await getFilterLogs({
+          oilId: filterId.value,
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+        });
+        return { items: resp.rows, total: resp.total };
       },
     },
   },
@@ -94,10 +97,6 @@ const init = async () => {
   // console.log('获取过滤器详情:', filterId.value);
   const res: any = await getFilterDetail(filterId.value);
   filterInfo.value = res || {};
-
-  // 获取操作记录
-  const logRes: any = await getFilterLogs({ filterId: filterId.value });
-  operationRecords.value = logRes.rows || [];
 };
 
 onMounted(async () => {

apps/web-ele/src/views/oilstation/filter/index.vue

@@ -166,7 +166,7 @@ async function exportHandle() {
             v-access:code="['oilstation:filter:add']"
             @click="handleAdd"
           >
-            新增过滤器
+            新增记录
           </ElButton>
           <ElButton
             type="primary"

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

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, defineComponent, h, onMounted, ref } from 'vue';
+import { defineComponent, h, onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 // @ts-ignore
@@ -173,12 +173,13 @@ const handleCloseTask = () => {
     closeTask({
       taskId: taskId.value,
       cancelReason: reason.value,
-    }).then(() => {
+    }).then(async () => {
       ElMessage.success('任务关闭成功');
       // 刷新任务详情
-      getTaskDetail(taskId.value).then((res) => {
-        taskInfo.value = res;
-      });
+      // getTaskDetail(taskId.value).then((res) => {
+      //   taskInfo.value = res;
+      // });
+      await init();
     });
   });
 };
@@ -222,9 +223,10 @@ const [ExecutorModal, executorModalApi] = useVbenModal({
       }).then(() => {
         ElMessage.success('任务转交成功');
         // 刷新任务详情
-        getTaskDetail(taskId.value).then((res) => {
-          taskInfo.value = res;
-        });
+        // getTaskDetail(taskId.value).then((res) => {
+        //   taskInfo.value = res;
+        // });
+        init();
       });
 
       executorModalApi.close();
@@ -250,9 +252,9 @@ const taskResult: any = ref({
   fileNames: [],
 });
 
-const oneSelf = computed(() => {
-  return taskInfo.value.executorId === Number(userStore.userInfo?.userId);
-});
+// const oneSelf = computed(() => {
+//   return taskInfo.value.executorId === Number(userStore.userInfo?.userId);
+// });
 
 const buttons = ref({
   deal: false,
@@ -261,6 +263,11 @@ const buttons = ref({
 });
 
 const init = async () => {
+  buttons.value = {
+    deal: false,
+    transfer: false,
+    close: false,
+  };
   const res = await getTaskDetail(taskId.value);
   taskInfo.value = res;
   if (!taskInfo.value.status) {
@@ -437,8 +444,8 @@ const dealAnnualExaminationTask = async () => {
   try {
     await handleLicense(taskInfo.value.id || 0);
 
-    init();
     ElMessage.success('处理任务成功');
+    await init();
   } catch {
     ElMessage.error('处理任务失败');
   }
@@ -461,9 +468,8 @@ const dealTaskEvent = async () => {
 
   try {
     await confirmDoneTask(taskInfo.value.id || 0);
-
-    init();
     ElMessage.success('确认完成任务成功');
+    await init();
   } catch {
     ElMessage.error('确认完成任务失败');
   }
@@ -570,8 +576,9 @@ const [PlannedTimeModal, plannedTimeModalApi] = useVbenModal({
         taskId: taskId.value,
         planTime: PlannedTimeValue.value,
       });
-      await init();
       ElMessage.success('修改计划时间成功');
+      await init();
+
       plannedTimeModalApi.close();
     } catch {
       ElMessage.error('修改计划时间失败');

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

@@ -3,10 +3,8 @@ import { h } from 'vue';
 // import { useUserStore } from '@vben/stores';
 import { getPopupContainer } from '@vben/utils';
 
-import {
-  queryExecutorList,
-  queryStationListByExecutor,
-} from '#/api/schedule/index';
+import { queryExecutorList } from '#/api/schedule/index';
+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';
@@ -118,6 +116,7 @@ export const drawerFormSchema: any = (type: any) => [
         placeholder: '请选择执行人',
         clearable: true,
         multiple: true,
+        multipleLimit: type === 3 ? 0 : 1,
         options,
         labelField: 'label',
         immediate: true,
@@ -144,20 +143,25 @@ export const drawerFormSchema: any = (type: any) => [
     componentProps: (data: any) => {
       const executorValues = data.executorIds || [];
       const userIds = executorValues.map((value: any) => value?.userId);
+      const executePosition = data.executePosition;
+      const postTypeInfo = getPostListOptions.find(
+        (item: any) => item.value === executePosition,
+      );
       return {
         getPopupContainer,
         api: async () => {
           if (userIds.length === 0) {
             return [];
           }
-          const data = await queryStationListByExecutor({
-            userIds: userIds.join(','),
+          const data = await selectAllSysStation({
+            userId: userIds[0],
+            postType: postTypeInfo?.type,
           });
           return data;
         },
         multiple: true,
         labelField: 'stationName',
-        valueField: 'stationId',
+        valueField: 'id',
         key: executorValues.map((v: any) => v?.userId).join(','), // 当执行人变化时，重新初始化组件
         immediate: true, // 立即执行api
       };

apps/web-ele/src/views/schedule/work/classes/components/CreateClasses.vue

@@ -1,113 +1,10 @@
-<template>
-  <el-drawer
-    :model-value="isdrawer"
-    @update:model-value="emit('update:modelValue', $event)"
-    :title="isdrawertitle"
-    direction="rtl"
-    :close-on-click-modal="false"
-    @close="handleClose"
-  >
-    <div v-loading="isdrawerloading" style="width: 100%; height: 100%">
-      <el-form
-        ref="ruleFormRef"
-        style="max-width: 600px"
-        :model="ruleForm"
-        :rules="rules"
-        label-width="auto"
-      >
-        <el-form-item label="班次名称" prop="name">
-          <el-input v-model="ruleForm.name" placeholder="请输入班次名称" />
-        </el-form-item>
-        <div style="display: flex; justify-content: space-between; gap: 20px">
-          <el-form-item label="第一次上班时间" prop="firstWorkTime">
-            <el-date-picker
-              v-model="ruleForm.firstWorkTime"
-              type="datetime"
-              placeholder="请选择"
-              @change="calculateFirstWorkDuration"
-            />
-          </el-form-item>
-          <el-form-item label="第一次下班时间" prop="lastWorkTime">
-            <el-date-picker
-              v-model="ruleForm.lastWorkTime"
-              type="datetime"
-              placeholder="请选择"
-              @change="calculateFirstWorkDuration"
-            />
-          </el-form-item>
-        </div>
-        <el-form-item label="第一次上班时长" prop="firstWorkDuration">
-          <el-input v-model="ruleForm.firstWorkDuration" disabled />
-        </el-form-item>
-        <div style="display: flex; justify-content: space-between; gap: 20px">
-          <el-form-item label="第二次上班时间" prop="secondWorkTime">
-            <el-date-picker
-              v-model="ruleForm.secondWorkTime"
-              type="datetime"
-              placeholder="请选择"
-              @change="calculateSecondWorkDuration"
-            />
-          </el-form-item>
-          <el-form-item label="第二次下班时间" prop="secondLastWorkTime">
-            <el-date-picker
-              v-model="ruleForm.secondLastWorkTime"
-              type="datetime"
-              placeholder="请选择"
-              @change="calculateSecondWorkDuration"
-            />
-          </el-form-item>
-        </div>
-        <el-form-item label="第二次上班时长" prop="secondWorkDuration">
-          <el-input v-model="ruleForm.secondWorkDuration" disabled />
-        </el-form-item>
-        <el-form-item label="常用" prop="common">
-          <el-radio-group v-model="ruleForm.common">
-            <el-radio value="1" size="large">是</el-radio>
-            <el-radio value="0" size="large">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="适用场站" prop="stationIds">
-          <div style="display: flex; gap: 20px">
-            <el-select
-              v-model="ruleForm.stationIds"
-              multiple
-              placeholder="请选择"
-              style="width: 240px"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-            <el-button type="primary" @click="SelectAll"> 全选 </el-button>
-          </div>
-        </el-form-item>
-        <el-form-item>
-          <div
-            style="
-              width: 100%;
-              display: flex;
-              justify-content: flex-end;
-              gap: 20px;
-            "
-          >
-            <el-button type="primary" @click="submitForm(ruleFormRef)">
-              提交
-            </el-button>
-            <el-button @click="handleClose">取消</el-button>
-          </div>
-        </el-form-item>
-      </el-form>
-    </div>
-  </el-drawer>
-</template>
-
 <script lang="ts" setup>
-import { reactive, ref, onMounted, watch } from 'vue';
-import type { FormInstance, FormRules } from 'element-plus';
-import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+import type { FormInstance } from 'element-plus';
+
+import { onMounted, reactive, ref, watch } from 'vue';
+
+import { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
+
 const props = defineProps({
   isdrawer: {
     type: Boolean,
@@ -164,8 +61,13 @@ const ruleFormRef = ref();
 const options = ref([]) as any;
 onMounted(async () => {
   try {
-    //@ts-ignore
-    options.value = (await selectAllSysStationAreaList()).map((item) => ({
+    // @ts-ignore
+    options.value = (
+      await selectAllSysStation({
+        isAll: 1,
+        pageSize: 10_000,
+      })
+    ).map((item) => ({
       value: item?.id,
       label: item?.stationName,
     }));
@@ -215,7 +117,7 @@ watch(
       if (newEditData.applicableStations) {
         ruleForm.value.stationIds = newEditData.applicableStations
           .split(',')
-          .map((id: any) => Number(id));
+          .map(Number);
       }
     }
   },
@@ -255,10 +157,13 @@ const rules = reactive({
 });
 const SelectAll = async () => {
   try {
-    //@ts-ignore
-    ruleForm.value.stationIds = (await selectAllSysStationAreaList()).map(
-      (item: any) => item?.id,
-    );
+    // @ts-ignore
+    ruleForm.value.stationIds = (
+      await selectAllSysStation({
+        isAll: 1,
+        pageSize: 10_000,
+      })
+    ).map((item: any) => item?.id);
   } catch (error) {
     console.log(error);
   }
@@ -276,8 +181,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
 
 // 计算工作时长
 const calculateWorkDuration = (
-  startTime: string | Date,
-  endTime: string | Date,
+  startTime: Date | string,
+  endTime: Date | string,
 ): string => {
   if (!startTime || !endTime) return '';
 
@@ -316,3 +221,109 @@ const calculateSecondWorkDuration = () => {
 //   formEl.resetFields();
 // };
 </script>
+
+<template>
+  <el-drawer
+    :model-value="isdrawer"
+    @update:model-value="emit('update:modelValue', $event)"
+    :title="isdrawertitle"
+    direction="rtl"
+    :close-on-click-modal="false"
+    @close="handleClose"
+  >
+    <div v-loading="isdrawerloading" style="width: 100%; height: 100%">
+      <el-form
+        ref="ruleFormRef"
+        style="max-width: 600px"
+        :model="ruleForm"
+        :rules="rules"
+        label-width="auto"
+      >
+        <el-form-item label="班次名称" prop="name">
+          <el-input v-model="ruleForm.name" placeholder="请输入班次名称" />
+        </el-form-item>
+        <div style="display: flex; justify-content: space-between; gap: 20px">
+          <el-form-item label="第一次上班时间" prop="firstWorkTime">
+            <el-date-picker
+              v-model="ruleForm.firstWorkTime"
+              type="datetime"
+              placeholder="请选择"
+              @change="calculateFirstWorkDuration"
+            />
+          </el-form-item>
+          <el-form-item label="第一次下班时间" prop="lastWorkTime">
+            <el-date-picker
+              v-model="ruleForm.lastWorkTime"
+              type="datetime"
+              placeholder="请选择"
+              @change="calculateFirstWorkDuration"
+            />
+          </el-form-item>
+        </div>
+        <el-form-item label="第一次上班时长" prop="firstWorkDuration">
+          <el-input v-model="ruleForm.firstWorkDuration" disabled />
+        </el-form-item>
+        <div style="display: flex; justify-content: space-between; gap: 20px">
+          <el-form-item label="第二次上班时间" prop="secondWorkTime">
+            <el-date-picker
+              v-model="ruleForm.secondWorkTime"
+              type="datetime"
+              placeholder="请选择"
+              @change="calculateSecondWorkDuration"
+            />
+          </el-form-item>
+          <el-form-item label="第二次下班时间" prop="secondLastWorkTime">
+            <el-date-picker
+              v-model="ruleForm.secondLastWorkTime"
+              type="datetime"
+              placeholder="请选择"
+              @change="calculateSecondWorkDuration"
+            />
+          </el-form-item>
+        </div>
+        <el-form-item label="第二次上班时长" prop="secondWorkDuration">
+          <el-input v-model="ruleForm.secondWorkDuration" disabled />
+        </el-form-item>
+        <el-form-item label="常用" prop="common">
+          <el-radio-group v-model="ruleForm.common">
+            <el-radio value="1" size="large">是</el-radio>
+            <el-radio value="0" size="large">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="适用场站" prop="stationIds">
+          <div style="display: flex; gap: 20px">
+            <el-select
+              v-model="ruleForm.stationIds"
+              multiple
+              placeholder="请选择"
+              style="width: 240px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <el-button type="primary" @click="SelectAll"> 全选 </el-button>
+          </div>
+        </el-form-item>
+        <el-form-item>
+          <div
+            style="
+              width: 100%;
+              display: flex;
+              justify-content: flex-end;
+              gap: 20px;
+            "
+          >
+            <el-button type="primary" @click="submitForm(ruleFormRef)">
+              提交
+            </el-button>
+            <el-button @click="handleClose">取消</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+  </el-drawer>
+</template>

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

@@ -1,5 +1,7 @@
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
+import dayjs from 'dayjs';
+
 export const columns: VxeGridProps['columns'] = [
   {
     field: 'action',
@@ -18,11 +20,19 @@ export const columns: VxeGridProps['columns'] = [
     title: '第一次上班时间',
     field: 'firstStartTime',
     minWidth: 130,
+    formatter: ({ row }) => {
+      return row.firstStartTime
+        ? dayjs(row.firstStartTime).format('HH:mm')
+        : '';
+    },
   },
   {
     title: '第一次下班时间',
     field: 'firstEndTime',
     minWidth: 130,
+    formatter: ({ row }) => {
+      return row.firstEndTime ? dayjs(row.firstEndTime).format('HH:mm') : '';
+    },
   },
   {
     title: '第一次上班时长',
@@ -33,11 +43,19 @@ export const columns: VxeGridProps['columns'] = [
     title: '第二次上班时间',
     field: 'secondStartTime',
     minWidth: 130,
+    formatter: ({ row }) => {
+      return row.secondStartTime
+        ? dayjs(row.secondStartTime).format('HH:mm')
+        : '';
+    },
   },
   {
     title: '第二次下班时间',
     field: 'secondEndTime',
     minWidth: 130,
+    formatter: ({ row }) => {
+      return row.secondEndTime ? dayjs(row.secondEndTime).format('HH:mm') : '';
+    },
   },
   {
     title: '第二次上班时长',

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

@@ -470,7 +470,9 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
       placeholder: '请选择油站',
       clearable: true,
       api: async () => {
-        const resp = await queryCheckFormList();
+        const resp = await queryCheckFormList({
+          pageSize: 10_000,
+        });
         const data = resp?.rows || [];
         return Array.isArray(data)
           ? data.map((item: any) => ({