v1.1.0 coding...

server.config.ts

@@ -3,11 +3,11 @@ import type { ServerOptions } from 'vite'
 const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
-      target: 'http://192.168.10.41:8200',
+      // target: 'http://192.168.10.41:8200',
       // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.108:8200',
       // target: 'http://cet-test.markingtool.cn',
-      // target: 'http://192.168.10.136:80',
+      target: 'http://192.168.10.136:80',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

src/hooks/useOptions.ts

@@ -66,6 +66,7 @@ const useOptions = (
 
   const changeModelValue = <T extends keyof DataModel>(key: T) => {
     return (v: DataModel[T]) => {
+      console.log('changeModelValue', key, v)
       dataModel[key] = v
     }
   }
@@ -194,7 +195,13 @@ const useOptions = (
           // if (!userInfo.value?.markingGroupNumber && res && res[0]) {
           //   changeModelValue('group')(res[0])
           // }
-          changeModelValue('group')(multGroup ? [] : void 0)
+          changeModelValue('group')(
+            multGroup
+              ? groupList.value?.length && (isAdmin.value || isChief.value || isExpert.value || isLeader.value)
+                ? [void 0]
+                : []
+              : void 0
+          )
         })
       }
     },

src/modules/analysis/personnel-compare/index.vue

@@ -97,16 +97,19 @@ const multLineXdatas = ref([])
 const { model, fetchModel, items, onOptionInit } = useCompareFilter()
 
 const { fetch, result: allResult, loading } = useFetch('getCompareList')
-const result = (allResult?.value || []).filter((item) => {
-  if (
-    !fetchModel.value.markingGroupNumber ||
-    fetchModel.value.markingGroupNumber?.length === 0 ||
-    (Array.isArray(fetchModel.value.markingGroupNumber) && fetchModel.value.markingGroupNumber.includes(undefined))
-  ) {
-    return item
-  } else {
-    return fetchModel.value.markingGroupNumber.includes(item.markingGroupNumber)
-  }
+const result = computed(() => {
+  let groups = (allResult.value?.groups || []).filter((item: any) => {
+    if (
+      !fetchModel.value.markingGroupNumber ||
+      fetchModel.value.markingGroupNumber?.length === 0 ||
+      (Array.isArray(fetchModel.value.markingGroupNumber) && fetchModel.value.markingGroupNumber.includes(undefined))
+    ) {
+      return item
+    } else {
+      return fetchModel.value.markingGroupNumber.includes(item.markingGroupNumber)
+    }
+  })
+  return { columns: allResult.value?.columns || [], groups }
 })
 const averageDatas = computed(() => {
   if (result.value) {
@@ -233,13 +236,11 @@ const columns2: any = computed(() => {
 const multipleSelection = ref<any[]>([])
 const handleSelectionChange = (val: any[]) => {
   multipleSelection.value = val
-  console.log('multipleSelection.value:', multipleSelection.value)
 }
 const rowChartOptions = computed(() => {
   if (!curRow.value) {
     return {}
   } else {
-    console.log('curRow.value:', curRow.value)
     if (dataType.value !== 'segmentScores') {
       const { dateItems } = curRow.value
       const xData = dateItems.map((v: any) => v.date)
@@ -403,9 +404,8 @@ const multLineChartOptions = computed(() => {
   }
 })
 const onSearch = () => {
-  console.log('search')
   fetch({ ...fetchModel.value, markingGroupNumber: undefined }).then((res) => {
-    console.log('rrr', result.value)
+    console.log('rrr', allResult.value, result.value)
   })
 }
 onOptionInit(onSearch)

src/modules/analysis/personnel-statistics/components/StatisticsPersonnel.vue

@@ -586,12 +586,12 @@ const clearCheck = () => {
       color: #333;
     }
     .fixed-row2 {
-      display: table-row;
-      position: sticky;
-      position: '-webkit-sticky';
-      top: 44px;
-      width: 100%;
-      z-index: 3;
+      // display: table-row;
+      // position: sticky;
+      // position: '-webkit-sticky';
+      // top: 44px;
+      // width: 100%;
+      // z-index: 3;
       font-weight: bold;
       color: #333;
     }

src/modules/analysis/personnel-statistics/index.vue

@@ -142,16 +142,19 @@ onMounted(() => {
 })
 
 const { fetch, result: allResult, loading } = useFetch('getStatisticsByGroup')
-const result = (allResult?.value || []).filter((item) => {
-  if (
-    !fetchModel.value.markingGroupNumber ||
-    fetchModel.value.markingGroupNumber?.length === 0 ||
-    (Array.isArray(fetchModel.value.markingGroupNumber) && fetchModel.value.markingGroupNumber.includes(undefined))
-  ) {
-    return item
-  } else {
-    return fetchModel.value.markingGroupNumber.includes(item.markingGroupNumber)
-  }
+const result = computed(() => {
+  return (allResult?.value || []).filter((item) => {
+    if (
+      !fetchModel.value.markingGroupNumber ||
+      fetchModel.value.markingGroupNumber?.length === 0 ||
+      item.markingGroupNumber == 0 ||
+      (Array.isArray(fetchModel.value.markingGroupNumber) && fetchModel.value.markingGroupNumber.includes(undefined))
+    ) {
+      return item
+    } else {
+      return fetchModel.value.markingGroupNumber.includes(item.markingGroupNumber)
+    }
+  })
 })
 
 const data = computed<ExtractApiResponse<'getStatisticsByGroup'>>(() => {
@@ -223,7 +226,7 @@ function onSearch() {
   }, 1)
 }
 
-// onOptionInit(onSearch)
+onOptionInit(onSearch)
 // watch([() => fetchModel.value.markingGroupNumber], () => {
 //   onSearch()
 // })