刘洋 1 жил өмнө
parent
commit
cb4267cd12

+ 12 - 12
src/modules/analysis/personnel-statistics/hooks/useStatisticsFilter.ts

@@ -95,18 +95,18 @@ const useStatisticsFilter = () => {
       immediate: true,
     }
   )
-  watch(
-    () => model.expand,
-    (val) => {
-      setUserConfigByType('expandByPerson', val?.length ? '1' : '0')
-    }
-  )
-  watch(
-    () => model.hasGroupLeaderScore,
-    (val) => {
-      setUserConfigByType('includeLeaderScore', val?.length == 1 ? '1' : '0')
-    }
-  )
+  // watch(
+  //   () => model.expand,
+  //   (val) => {
+  //     setUserConfigByType('expandByPerson', val?.length ? '1' : '0')
+  //   }
+  // )
+  // watch(
+  //   () => model.hasGroupLeaderScore,
+  //   (val) => {
+  //     setUserConfigByType('includeLeaderScore', val?.length == 1 ? '1' : '0')
+  //   }
+  // )
 
   // const fetchModel = computed<ExtractApiParams<'getStatisticsByGroup'> & { expand: boolean }>(() => {
   const fetchModel = computed<any>(() => {

+ 6 - 5
src/modules/analysis/personnel-statistics/index.vue

@@ -142,14 +142,15 @@ watch(groupListWithAll, () => {
 
 onMounted(() => {
   if (
-    (mainStore.myUserInfo && mainStore.myUserInfo.role === 'DEPUTY') ||
-    getUserConfigByType('expandByPerson') == '1'
+    mainStore.myUserInfo &&
+    mainStore.myUserInfo.role === 'DEPUTY'
+    // || getUserConfigByType('expandByPerson') == '1'
   ) {
     model.expand = ['按人员展开']
   }
-  if (getUserConfigByType('includeLeaderScore') == '1') {
-    model.hasGroupLeaderScore = ['true']
-  }
+  // if (getUserConfigByType('includeLeaderScore') == '1') {
+  //   model.hasGroupLeaderScore = ['true']
+  // }
 })
 
 const { fetch, result: allResult, loading } = useFetch('getStatisticsByGroup')

+ 3 - 3
src/modules/expert/expert/index.vue

@@ -127,9 +127,9 @@ useFetch('getAllRoleList')
         label: item.roleName,
       }
     })
-    if (ROLE_OPTION.value.length) {
-      formModel.role = ROLE_OPTION.value[0].value
-    }
+    // if (ROLE_OPTION.value.length) {
+    //   formModel.role = ROLE_OPTION.value[0].value
+    // }
   })
 /** 给分板 */
 const editScoreVisible = ref<boolean>(true)

+ 2 - 2
src/utils/common.ts

@@ -309,8 +309,8 @@ export const preloadImg = (url: any) => {
 export const initConfigModelData = (): any => {
   return {
     draft: { other: '' }, //消息草稿信息
-    expandByPerson: '0', //人员数据统计-按人员展开
-    includeLeaderScore: '0', //人员数据统计-是否包含组长给分
+    // expandByPerson: '0', //人员数据统计-按人员展开
+    // includeLeaderScore: '0', //人员数据统计-是否包含组长给分
     personnelStatisticsColumns: null,
   }
 }