fix:

apps/web-ele/src/api/system/user/user.ts

@@ -12,12 +12,13 @@ import { commonExport, ContentTypeEnum } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
 enum Api {
-  allUserList = '/system/user/stationList',
+  allUserList = '/system/user/allList',
   baseUser = '/system/user',
   downLoadTemplate = '/system/user/importTemplate',
   exportUser = '/system/user/export',
   menuList = '/system/user/list',
   modifyPwd = '/system/user/resetPwd',
+  stationUserList = '/system/user/stationList',
   updateAvatar = '/system/user/profile/avatar',
   updateProfilePwd = '/system/user/profile/updatePwd',
   updateUser = '/system/user/changeStatus',
@@ -36,11 +37,15 @@ export function getStationUserCount(stationId: number) {
 }
 
 export function getAllUserList(params?: any) {
-  return requestClient.get<BaseResult<User[]>>(Api.allUserList, {
+  return requestClient.get<BaseResult<User[]>>(Api.stationUserList, {
     params,
   });
 }
 
+export function getList(params?: any) {
+  return requestClient.get<BaseResult<User[]>>(Api.allUserList, { params });
+}
+
 // 用户列表接口
 export function getUserList(params?: any) {
   return requestClient.get<BaseResult<User[]>>(Api.menuList, { params });

apps/web-ele/src/api/task/index.ts

@@ -8,7 +8,7 @@ enum Api {
   groupLogBase = '/formTeamShiftLog/log/handle',
   gunCheckHeightHandle = '/formGunSelfCheck/check/height/handle',
   handleGunCheck = '/formGunSelfCheck/check/handle',
-  joinEmergencyHandle = '/formEmergencyDrillParticipation/participation/handle',
+  joinEmergencyHandle = '/formParticipationRecord/record/handle',
   marketingSurveyHandle = '/formCompetitorMarketingSurvey/survey/handle',
   meetingBase = '/formMeetingRecords/records/handle',
   operationalWeeklyReportHandle = '/formOperationalWeeklyReport/report/handle',

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

@@ -25,7 +25,7 @@ import { getRoleList } from '#/api/system/role/role';
 // API导入 - 按模块分组
 // 用户相关API
 // @ts-ignore
-import { getAllUserList, selectUserList } from '#/api/system/user/user';
+import { getList, selectUserList } from '#/api/system/user/user';
 
 // 定义组件属性
 interface Props {
@@ -244,7 +244,7 @@ async function loadAllUsers() {
       params = { ...params, ...props.userParams };
     }
 
-    const res: any = await getAllUserList(params);
+    const res: any = await getList(params);
     allUserList.value = res || [];
   } catch (error_) {
     error.value = '加载用户列表失败';
@@ -287,7 +287,7 @@ function updateSelectedItems(keepType?: string) {
       const existingIndex = newSelectedItems.findIndex((item) => {
         return item.id === user.userId && item.type === 'user';
       });
-      
+
       if (existingIndex === -1) {
         newSelectedItems.push({
           id: user.userId,
@@ -310,7 +310,7 @@ function updateSelectedItems(keepType?: string) {
         const existingIndex = newSelectedItems.findIndex((item) => {
           return item.id === postId && item.type === 'post';
         });
-        
+
         if (existingIndex === -1) {
           newSelectedItems.push({
             id: postId,
@@ -332,7 +332,7 @@ function updateSelectedItems(keepType?: string) {
         const existingIndex = newSelectedItems.findIndex((item) => {
           return item.id === roleId && item.type === 'role';
         });
-        
+
         if (existingIndex === -1) {
           newSelectedItems.push({
             id: roleId,
@@ -354,7 +354,7 @@ function updateSelectedItems(keepType?: string) {
         const existingIndex = newSelectedItems.findIndex((item) => {
           return item.id === stationId && item.type === 'station';
         });
-        
+
         if (existingIndex === -1) {
           newSelectedItems.push({
             id: stationId,

apps/web-ele/src/store/auth.ts

@@ -41,12 +41,10 @@ export const useAuthStore = defineStore('auth', () => {
         // 获取用户信息并存储到 accessStore 中
         userInfo = await fetchUserInfo();
         userStore.setUserInfo(userInfo);
-        console.log(userInfo);
-        
+
         /**
          * 在这里设置权限
          */
-        console.log(userInfo.buttons);
         accessStore.setAccessCodes(userInfo.buttons);
         if (accessStore.loginExpired) {
           accessStore.setLoginExpired(false);
@@ -95,7 +93,7 @@ export const useAuthStore = defineStore('auth', () => {
         userInfo = await fetchUserInfo();
         userStore.setUserInfo(userInfo);
         console.log(userInfo);
-        
+
         /**
          * 在这里设置权限
          */
@@ -152,7 +150,7 @@ export const useAuthStore = defineStore('auth', () => {
     if (!backUserInfo) {
       throw new Error('获取用户信息失败.');
     }
-    const { buttons = [], roles = [], user } = backUserInfo;
+    const { buttons = [], roles = [], user = {} } = backUserInfo;
     /**
      * 从后台user -> vben user转换
      */
@@ -164,11 +162,12 @@ export const useAuthStore = defineStore('auth', () => {
       userId: user.userId.toString(),
       username: user.userName,
       phoneNumber: user.phonenumber,
+      post: user.post,
       // @ts-ignore
       stations: user.stations || [],
     };
     console.log(userInfo);
-    
+
     userStore.setUserInfo(userInfo);
     return userInfo;
   }

apps/web-ele/src/views/examManage/paperManage/index.vue

@@ -232,6 +232,10 @@ const [PreviewModal, previewModalApi] = useVbenModal({
   width: 800,
   height: 600,
   showCancelBtn: false,
+  onConfirm: () => {
+    // 预览试卷
+    previewModalApi.close();
+  },
 });
 
 const previewExam = (row: any) => {

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

@@ -116,12 +116,11 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    component: 'Select',
+    component: 'Input',
     fieldName: 'gunNo',
     label: '油枪编号',
     componentProps: {
-      placeholder: '请选择油枪编号',
-      options: getDictOptions('oil_gun'),
+      placeholder: '请输入油枪编号',
     },
     rules: 'required',
   },

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

@@ -8,7 +8,7 @@ import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
 
 // @ts-ignore
 // 这里需要替换为实际的API，如果没有可以先注释
-import { handleAttendanceMeeting, handleJoinEmergency } from '#/api/task';
+import { handleJoinEmergency } from '#/api/task';
 
 // @ts-ignore
 import { drawerFormSchema } from './config-data';
@@ -78,13 +78,14 @@ const [Drawer, drawerApi] = useVbenDrawer({
       };
 
       // 调用API提交数据
-      if (taskParams.value.subFormType === 'participate_emergency_wy') {
-        await handleJoinEmergency(params);
-      } else if (
-        taskParams.value.subFormType === 'participate_oil_station_meeting'
-      ) {
-        await handleAttendanceMeeting(params);
-      }
+      // if (taskParams.value.subFormType === 'participate_emergency_wy') {
+      //   await handleJoinEmergency(params);
+      // } else if (
+      //   taskParams.value.subFormType === 'participate_oil_station_meeting'
+      // ) {
+      //   await handleAttendanceMeeting(params);
+      // }
+      await handleJoinEmergency(params);
 
       // 触发刷新事件
       emit('reload');

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

@@ -249,12 +249,43 @@ const oneSelf = computed(() => {
   return taskInfo.value.executorId === Number(userStore.userInfo?.userId);
 });
 
+const buttons = ref({
+  deal: false,
+  transfer: false,
+  close: false,
+});
+
 const init = async () => {
   const res = await getTaskDetail(taskId.value);
   taskInfo.value = res;
   if (!taskInfo.value.status) {
     taskInfo.value.status = 0;
   }
+  if (taskInfo.value.status === 1) {
+    const userId = Number(userStore.userInfo?.userId);
+    const isExecutor = taskInfo.value.executorId === userId;
+    const isCreator = userStore?.userInfo?.username === taskInfo.value.createBy;
+    const isHeadquarters = userStore?.userInfo?.post?.type === '"headquarters"';
+    const isMobileTask = mobileTaskTypes.includes(taskInfo.value.formType);
+
+    if (isExecutor && !isMobileTask) {
+      buttons.value.deal = true;
+    }
+
+    if (isCreator || isHeadquarters || isExecutor) {
+      if (taskInfo.value.executorId !== userId) {
+        buttons.value.close = true;
+      }
+
+      if (taskInfo.value.taskTemplate?.isMust === 0) {
+        buttons.value.close = true;
+      }
+
+      if (taskInfo.value.authStatus === 0 && taskInfo.value.isLicensable) {
+        buttons.value.transfer = true;
+      }
+    }
+  }
 
   taskOther.value.taskTypeName = taskInfo.value?.formTypeName || '-';
 
@@ -587,35 +618,17 @@ onMounted(async () => {
           </div>
         </div>
         <div class="flex items-center space-x-4">
-          <ElButton
-            v-if="
-              oneSelf &&
-              [1].includes(taskInfo.status) &&
-              !mobileTaskTypes.includes(taskInfo.formType)
-            "
-            type="danger"
-            @click="dealEvent"
-          >
+          <ElButton v-if="buttons.deal" type="primary" @click="dealEvent">
             处理任务
           </ElButton>
           <ElButton
             type="primary"
-            v-if="
-              oneSelf && [1].includes(taskInfo.status) && taskInfo.isLicensable
-            "
+            v-if="buttons.transfer"
             @click="handleTransferTask"
           >
             转交任务
           </ElButton>
-          <ElButton
-            v-if="
-              oneSelf &&
-              [1].includes(taskInfo.status) &&
-              (taskInfo.level < 2 || !taskInfo.taskTemplate?.isMust)
-            "
-            type="danger"
-            @click="handleCloseTask"
-          >
+          <ElButton v-if="buttons.close" type="danger" @click="handleCloseTask">
             关闭任务
           </ElButton>
         </div>
@@ -674,7 +687,7 @@ onMounted(async () => {
             </ElDescriptionsItem>
 
             <ElDescriptionsItem label="任务描述:" :span="4">
-              {{ taskInfo.description || '-' }}
+              <div v-html="taskInfo.description"></div>
             </ElDescriptionsItem>
             <ElDescriptionsItem
               v-if="

packages/stores/src/modules/user.ts

@@ -6,6 +6,7 @@ interface BasicUserInfo {
    * 头像
    */
   avatar: string;
+  post?: any;
   /**
    * 用户昵称
    */