bug fix

server.config.ts

@@ -3,9 +3,9 @@ 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.107:8200',
-      // target: 'http://cet-test.markingtool.cn',
+      target: 'http://cet-test.markingtool.cn',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

src/components/shared/message/Message.vue

@@ -25,7 +25,7 @@
             v-for="message in unReadMessages?.messages?.slice(0, 2)"
             :key="message.sendUserId"
             class="message-row"
-            @click="onReceiveMessage"
+            @click="onReceiveMessage(message)"
           >
             <!-- <div class="message-send-user">
               <div class="user-name" :title="message.sendUserName">{{ message.sendUserName }}</div>
@@ -33,7 +33,8 @@
             </div>
             <pre class="flex-1 message-content" v-html="message.content"></pre> -->
             <div class="send-user truncate">{{ message.sendUserName }}</div>
-            <div class="send-content truncate">{{ message.content }}</div>
+            <!-- <div class="send-content truncate">{{ message.content }}</div> -->
+            <div class="send-content truncate" v-html="message.content"></div>
           </div>
         </div>
         <confirm-button
@@ -159,7 +160,7 @@ watch(replyUserId, () => {
 })
 
 /** 收消息 */
-const onReceiveMessage = () => {
+const onReceiveMessage = (message: any) => {
   messageWindowType.value = 'view'
   visibleMessageWindow.value = true
 }

src/components/shared/message/MessageList.vue

@@ -122,7 +122,14 @@ getMessageList().then((result) => (currentMessage.value = result?.[0]))
 watch(
   () => mainStore.newMsgs,
   () => {
-    getMessageList()
+    getMessageList().then((res) => {
+      if (res && Array.isArray(res)) {
+        let find = res.find((item) => item.sendUserId == currentMessage.value?.sendUserId)
+        if (!!find) {
+          currentMessage.value = find
+        }
+      }
+    })
   }
 )
 onUnmounted(() => {

src/layout/main/LeftMenu.vue

@@ -67,4 +67,9 @@ const onHandle = () => {
   padding: $BaseGapSpace 0;
   border-right: none;
 }
+.main-layout-left-menu {
+  :deep(.el-sub-menu .el-menu-item) {
+    height: 34px !important;
+  }
+}
 </style>

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

@@ -104,6 +104,11 @@ const columns = computed<TableColumn[]>(() => {
         },
         minWidth: 100,
         sortable: true,
+        sortMethod: function (a, b) {
+          let aCount = a.dayFinishCounts.find((v) => v.date === d)?.count ?? 0
+          let bCount = b.dayFinishCounts.find((v) => v.date === d)?.count ?? 0
+          return aCount - bCount
+        },
       } as TableColumn
     }),
     { label: '合计', prop: 'totalFinishCount', align: 'center', minWidth: 100, sortable: true, fixed: 'right' },

src/modules/analysis/monitoring/index.vue

@@ -18,7 +18,6 @@
             <div class="p-l-extra-base p-r-mini p-b-extra-small flex-1 overflow-hidden">
               <base-table
                 border
-                stripe
                 v-bind="getTableProps(card.hasAll)"
                 size="small"
                 height="100%"
@@ -388,10 +387,10 @@ watch([interval, initFinish], () => {
     .el-table__body-wrapper {
       .el-table__body {
         .top-three-row {
-          background: rgba(0, 186, 151, 0.03);
+          // background: rgba(0, 186, 151, 0.09);
         }
         .last-three-row {
-          background: rgba(255, 114, 59, 0.03);
+          // background: rgba(255, 114, 59, 0.09);
         }
         .el-table__cell {
           padding: 4px 0;

src/modules/marking/inquiry/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="p-base full mark-inquiry-view">
     <div class="full radius-base fill-blank p-large scroll-auto">
-      <base-form ref="formRef" :disabled="saving" :label-width="useVW(88)" :rules="rules" :items="items" :model="model">
+      <base-form ref="formRef" :disabled="saving" :label-width="90" :rules="rules" :items="items" :model="model">
         <template #form-item-button-group>
           <el-button type="primary" @click="onSearch">抽查</el-button>
           <!-- <el-button type="primary">高级抽查</el-button> -->
@@ -125,11 +125,12 @@ watch(shortQueryConfig, () => {
 
 const Span7 = defineColumn(_, _, { span: 7 })
 const Span6 = defineColumn(_, _, { span: 6 })
+const Span8 = defineColumn(_, _, { span: 8 })
 const OneRow = Span7(_, 'row-1')
 const TwoRow = Span7(_, 'row-2')
 const ThreeRow = Span7(_, 'row-3')
 const FourRow = Span7(_, 'row-4')
-const ElevenRow = Span6(_, 'row-11')
+const ElevenRow = Span8(_, 'row-11')
 
 const rules: EpFormRules = {
   subjectCode: [{ required: true, message: '请选择科目' }],