fix

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

@@ -41,10 +41,13 @@ export const useAuthStore = defineStore('auth', () => {
         // 获取用户信息并存储到 accessStore 中
         userInfo = await fetchUserInfo();
         userStore.setUserInfo(userInfo);
+        console.log(userInfo);
+        
         /**
          * 在这里设置权限
          */
-        accessStore.setAccessCodes(userInfo.permissions);
+        console.log(userInfo.buttons);
+        accessStore.setAccessCodes(userInfo.buttons);
         if (accessStore.loginExpired) {
           accessStore.setLoginExpired(false);
         } else {
@@ -91,10 +94,12 @@ export const useAuthStore = defineStore('auth', () => {
         // 获取用户信息并存储到 accessStore 中
         userInfo = await fetchUserInfo();
         userStore.setUserInfo(userInfo);
+        console.log(userInfo);
+        
         /**
          * 在这里设置权限
          */
-        accessStore.setAccessCodes(userInfo.permissions);
+        accessStore.setAccessCodes(userInfo.buttons);
         if (accessStore.loginExpired) {
           accessStore.setLoginExpired(false);
         } else {
@@ -147,13 +152,13 @@ export const useAuthStore = defineStore('auth', () => {
     if (!backUserInfo) {
       throw new Error('获取用户信息失败.');
     }
-    const { permissions = [], roles = [], user } = backUserInfo;
+    const { buttons = [], roles = [], user } = backUserInfo;
     /**
      * 从后台user -> vben user转换
      */
     const userInfo: UserInfo = {
       avatar: user.avatar ?? '',
-      permissions,
+      buttons,
       realName: user.nickName,
       roles,
       userId: user.userId.toString(),
@@ -162,6 +167,8 @@ export const useAuthStore = defineStore('auth', () => {
       // @ts-ignore
       stations: user.stations || [],
     };
+    console.log(userInfo);
+    
     userStore.setUserInfo(userInfo);
     return userInfo;
   }

apps/web-ele/src/views/Archive/figuresManage/addInventory/index.vue

@@ -85,7 +85,7 @@ const workReportGridOptions: VxeGridProps = {
     },
   },
   rowConfig: { keyField: 'id' },
-  pagerConfig: { enabled: true, pageSize: 100, pageSizes: [10, 20, 50, 100] },
+  pagerConfig: { enabled: true, pageSize: 10, pageSizes: [10, 20, 50, 100] },
   toolbarConfig: {
     custom: true,
     refresh: true,
@@ -118,7 +118,8 @@ const handleView = (row: any) => {
     queryParams.append(key, route.query[key] as string);
   });
   // 跳转到任务详情页面
-  router.push(`/schedule/detail?${queryParams.toString()}`);
+
+  router.push(`/schedule/detail/${row.id}`);
 };
 </script>
 <template>

apps/web-ele/src/views/Archive/operationsManagement/gasStationRegularMeeting/config-data.tsx

@@ -195,7 +195,7 @@ export const columns: VxeGridProps['columns'] = [
     minWidth: 100,
     align: 'center',
     formatter: (cellValue: number) => {
-      return cellValue === 0 ? '系统' : '新增';
+      return cellValue === 0 ? '新增' : '系统';
     },
   },
   {

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

@@ -8,6 +8,7 @@ import { onMounted, ref } from 'vue';
 import { Page, useVbenDrawer } from '@vben/common-ui';
 
 import { ElMessageBox } from 'element-plus';
+import { useAccess } from '@vben/access';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 // 将模拟API替换为实际API
@@ -98,6 +99,7 @@ const certificateTypes = ref<any[]>([]);
 const organizationTypes = ref<any[]>([]);
 const storageLocations = ref<any[]>([]);
 const statusOptions = ref<any[]>([]);
+const { hasAccessByCodes } = useAccess();
 
 // 加载字典数据
 onMounted(() => {
@@ -109,6 +111,7 @@ onMounted(() => {
     { label: '启用', value: 'enabled' },
     { label: '禁用', value: 'disabled' },
   ];
+
 });
 
 // 新增证照
@@ -177,7 +180,8 @@ async function exportHandle() {
           <ElButton
             type="primary"
             @click="openDrawer"
-            v-access:code="['oilstation:idphoto:add']"
+             v-access:code="['oilstation:idphoto:add']"
+            
           >
             新增证照
           </ElButton>

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

@@ -134,6 +134,10 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     fieldName: 'taskStartMonth',
     label: '任务开始时间',
     labelWidth: 120,
+    dependencies: {
+      show: (values) => values.annualReviewToTask === 1,
+      triggerFields: ['annualReviewToTask'],
+    },
     componentProps: {
       placeholder: '请选择任务开始时间',
       options: Array.from({ length: 12 }, (_, i) => ({
@@ -147,6 +151,10 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     fieldName: 'taskEndMonth',
     label: '任务截止时间',
     labelWidth: 120,
+    dependencies: {
+      show: (values) => values.annualReviewToTask === 1,
+      triggerFields: ['annualReviewToTask'],
+    },
     componentProps: {
       placeholder: '请选择任务截止时间',
       options: Array.from({ length: 12 }, (_, i) => ({
@@ -174,12 +182,20 @@ export const drawerFormSchema: FormSchemaGetter = () => [
       placeholder: '请选择换证频率',
       options: getDictOptions('renew_frequency'),
     },
+    dependencies: {
+      show: (values) => values.renewToTask === 1,
+      triggerFields: ['renewToTask'],
+    },
     fieldName: 'renewFrequency',
     label: '换证频率',
     labelWidth: 120,
   },
   {
     component: 'InputNumber',
+    dependencies: {
+      show: (values) => values.renewToTask === 1,
+      triggerFields: ['renewToTask'],
+    },
     fieldName: 'renewAdvanceMonths',
     label: '换证提前时间/月',
     labelWidth: 120,

apps/web-ele/src/views/system/infoEntry/certificateSetting/certificateSetting-drawer.vue

@@ -47,7 +47,17 @@ const [Drawer, drawerApi] = useVbenDrawer({
         return;
       }
       const data = await formApi.getValues();
-      
+
+      if (data.annualReviewToTask === 0) {
+        data.taskStartMonth = '';
+        data.taskEndMonth = '';
+      }
+
+      if (data.renewToTask === 0) {
+        data.renewFrequency = '';
+        data.renewAdvanceMonths = '';
+      }
+
       await (isUpdateRef.value
         ? updateCertificateSetting(data)
         : addCertificateSetting(data));

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

@@ -417,3 +417,5 @@ onMounted(async () => {
   outline: none;
 }
 </style>
+
+</style>

packages/effects/access/src/use-access.ts

@@ -27,6 +27,7 @@ function useAccess() {
    * @param codes
    */
   function hasAccessByCodes(codes: string[]) {
+    
     const userCodesSet = new Set(accessStore.accessCodes);
     /**
      * 管理员权限
@@ -34,7 +35,9 @@ function useAccess() {
     if (userCodesSet.has('*:*:*')) {
       return true;
     }
+     
     const intersection = codes.filter((item) => userCodesSet.has(item));
+    console.log('codes', codes, intersection);
     return intersection.length > 0;
   }
 

packages/stores/src/modules/access.ts

@@ -62,7 +62,9 @@ export const useAccessStore = defineStore('core-access', {
       return findMenu(this.accessMenus, path);
     },
     setAccessCodes(codes: string[]) {
-      this.accessCodes = codes;
+      // 去重
+      const uniqueCodes = [...new Set(codes)];
+      this.accessCodes = uniqueCodes;
     },
     setAccessMenus(menus: MenuRecordRaw[]) {
       this.accessMenus = menus;