bug fix

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/components/shared/MarkHeader.vue

@@ -26,7 +26,7 @@
       </div>
       <div class="data-item">
         <div class="icon-item">
-          <lock-entry />
+          <lock-entry :in-layout="false" />
         </div>
         <div class="icon-item">
           <message :reply-user-id="props.replyUserId" :paper-path="props.paperPath"></message>
@@ -347,6 +347,13 @@ const willLogout = async () => {
 .common-mark-header {
   height: $MainLayoutHeaderHeight;
   background-color: $MainLayoutHeaderBg;
+  :deep(.message-icon) {
+    .msg-box {
+      .tip {
+        color: #999;
+      }
+    }
+  }
   .left-icons-wrap {
     position: relative;
     padding-right: 15px;

src/components/shared/UserInfo.vue

@@ -15,7 +15,7 @@
       <p class="tip">{{ info.userName }}</p>
     </div>
   </el-tooltip> -->
-  <div class="user-info flex items-center">
+  <div class="user-info flex items-center" :class="{ 'in-layout': inLayout }">
     <img v-if="props.inLayout" src="../../assets/images/icon-个人-蓝@2x.png" />
     <img v-else src="../../assets/images/icon-个人-灰@2x.png" />
     <div class="desc flex" :class="{ 'not-in-layout': !props.inLayout }">
@@ -54,6 +54,13 @@ const visibleUpdatePwd = ref<boolean>(false)
     height: 32x;
     margin-right: 10px;
   }
+  &.in-layout {
+    .desc {
+      .role {
+        color: #666;
+      }
+    }
+  }
   .desc {
     height: 34px;
     flex-direction: column;
@@ -64,7 +71,7 @@ const visibleUpdatePwd = ref<boolean>(false)
     }
     .role {
       font-size: 12px;
-      color: #666;
+      color: #8a8a8a;
       font-weight: normal;
     }
     &.not-in-layout {

src/components/shared/message/MessageList.vue

@@ -342,6 +342,7 @@ onUnmounted(() => {
         white-space: pre-wrap;
         color: #444;
         font-size: 12px;
+        font-weight: 500;
       }
     }
     .msg-content-box {

src/layout/main/MainHeader.vue

@@ -16,7 +16,7 @@
       </div>
       <div class="data-item flex">
         <div class="icon-item">
-          <lock-entry></lock-entry>
+          <lock-entry :in-layout="inLayout"></lock-entry>
         </div>
         <div v-if="mainStore?.myUserInfo?.role !== 'ADMIN'" class="icon-item">
           <message
@@ -72,6 +72,11 @@ const mainStore = useMainStore()
   :deep(p.tip) {
     color: #8a8a8a;
   }
+  &.in-layout {
+    :deep(p.tip) {
+      color: #666;
+    }
+  }
   &.in-layout {
     background-color: #fff;
     :deep(.user-info) {

src/modules/analysis/marking-progress/components/GroupProgress.vue

@@ -144,7 +144,7 @@ const columns = computed<TableColumn[]>(() => {
         formatter(row) {
           return row.dayFinishCounts.find((v) => v.date === d)?.count ?? ''
         },
-        minWidth: 100,
+        minWidth: 125,
         sortable: true,
         sortMethod: function (a, b) {
           let aCount = a.dayFinishCounts.find((v) => v.date === d)?.count ?? 0

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

@@ -148,7 +148,6 @@ const data = computed<ExtractApiResponse<'getStatisticsByGroup'>>(() => {
       }
     })
     .filter((v: any) => !!v)
-  console.log('groupList:', groupList)
   // alert(model.markingGroupNumber)
   const totalIndex = groupList.findIndex((v) => v.markingGroupNumber === 0)
   let expandData = groupList
@@ -176,7 +175,9 @@ function onSearch() {
 }
 
 onOptionInit(onSearch)
-
+watch([() => fetchModel.value.markingGroupNumber], () => {
+  onSearch()
+})
 const { fetch: exportStatisticsByGroup, loading: exporting } = useFetch('exportStatisticsByGroup', 'get')
 /**导出 */
 function onExport() {