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/message/MessageHeadList.vue

@@ -82,7 +82,8 @@ watch(
   () => {
     getMessageList().then((res) => {
       if (res && Array.isArray(res)) {
-        let find = res.find((item) => item.sendUserId == currentMessage.value?.sendUserId)
+        // let find = res.find((item) => item.sendUserId == currentMessage.value?.sendUserId)
+        let find = res.find((item) => isActiveMessage(item, currentMessage.value))
         if (!!find) {
           currentMessage.value = find
           bus.emit('clickChangeMsg', find)

src/components/shared/message/MessageList.vue

@@ -174,28 +174,46 @@ watch(historyReverse, (newVal: any, oldVal: any) => {
 })
 watch(currentMessage, (newVal: any, oldVal: any) => {
   if (currentMessage.value) {
-    useFetch('handleReadMessage')
-      .fetch({ id: currentMessage.value.id })
-      .then(() => {
-        if (currentMessage.value?.unReadCount) {
-          // currentMessage.value.unReadCount--
-          currentMessage.value.unReadCount = 0
-        }
-        if (currentMessage.value?.sendUserId) {
-          getMessageHistory({
-            sendUserId:
-              currentMessage.value.sendUserId == mainStore?.myUserInfo?.id
-                ? currentMessage.value.receiveUserId
-                : currentMessage.value.sendUserId,
-          }).then(() => {
-            let newV = unref(newVal)
-            let oldV = unref(oldVal)
-            if (newV.id != oldV?.id) {
-              setTimeout(scrollToBottom, 1)
-            }
-          })
+    // useFetch('handleReadMessage')
+    //   .fetch({ id: currentMessage.value.id })
+    //   .then(() => {
+    //     if (currentMessage.value?.unReadCount) {
+    //       // currentMessage.value.unReadCount--
+    //       currentMessage.value.unReadCount = 0
+    //     }
+    //     if (currentMessage.value?.sendUserId) {
+    //       getMessageHistory({
+    //         sendUserId:
+    //           currentMessage.value.sendUserId == mainStore?.myUserInfo?.id
+    //             ? currentMessage.value.receiveUserId
+    //             : currentMessage.value.sendUserId,
+    //       }).then(() => {
+    //         let newV = unref(newVal)
+    //         let oldV = unref(oldVal)
+    //         if (newV.id != oldV?.id) {
+    //           setTimeout(scrollToBottom, 1)
+    //         }
+    //       })
+    //     }
+    //   })
+    if (currentMessage.value?.unReadCount) {
+      // currentMessage.value.unReadCount--
+      currentMessage.value.unReadCount = 0
+    }
+    if (currentMessage.value?.sendUserId) {
+      getMessageHistory({
+        sendUserId:
+          currentMessage.value.sendUserId == mainStore?.myUserInfo?.id
+            ? currentMessage.value.receiveUserId
+            : currentMessage.value.sendUserId,
+      }).then(() => {
+        let newV = unref(newVal)
+        let oldV = unref(oldVal)
+        if (newV.id != oldV?.id) {
+          setTimeout(scrollToBottom, 1)
         }
       })
+    }
   }
 })
 const allowSend = computed<boolean>(() => {

src/components/shared/message/MessageSend.vue

@@ -22,15 +22,16 @@
         <div class="flex items-center p-base message-info-header">
           <div class="flex flex-1 items-center overflow-hidden send-user">
             <span class="m-r-mini">收件人</span>
-            <span class="flex flex-1 overflow-hidden items-center justify-between radius-base m-r-base user-name">
+            <span class="flex flex-1 overflow-hidden items-center justify-between radius-base user-name">
               <p class="flex-1 checked-users flex" :class="{ big: showCheckUser }">
                 <span class="split-names">{{ viewCheckedUser }}</span>
-                <span v-if="checkedUsers.length > 3">共计{{ checkedUsers.length }}个人员</span>
+                <!-- <span v-if="checkedUsers.length > 3">共计{{ checkedUsers.length }}个人员</span> -->
               </p>
               <!-- <el-button v-if="!replyUserId" class="m-l-base" size="small" type="primary" @click="toggleCheckUser">
                 选择收件人
               </el-button> -->
             </span>
+            <span v-if="checkedUsers.length > 3" class="m-l-base">共计{{ checkedUsers.length }}个人员</span>
           </div>
           <!-- <div class="grid pointer m-l-auto close-icon" @click="$emit('close')">
             <el-icon><close /></el-icon>

src/modules/marking/marking-standard/index.vue

@@ -1,19 +1,74 @@
 <template>
   <div class="full p-base">
     <div class="full p-base radius-base fill-blank">
-      <iframe class="full view-frame" :src="result?.url" alt="" />
+      <base-form class="p-t-base" size="small" :model="formModel" :items="formItems" :label-width="'78px'">
+        <template #form-item-search>
+          <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
+        </template>
+      </base-form>
+      <iframe style="width: 100%; height: calc(100% - 60px)" class="full view-frame" :src="result?.url" alt="" />
     </div>
   </div>
 </template>
 
 <script setup lang="ts" name="MarkingStandardNav">
+import { reactive, watch, computed } from 'vue'
 /** 评分标准 */
 import useFetch from '@/hooks/useFetch'
 import useMainStore from '@/store/main'
+import BaseForm from '@/components/element/BaseForm.vue'
+import useOptions from '@/hooks/useOptions'
+import useForm from '@/hooks/useForm'
+import { ElButton } from 'element-plus'
 const mainStore = useMainStore()
-const { fetch, result } = useFetch('getMarkingStandard')
+const { fetch, result, loading } = useFetch('getMarkingStandard')
 
-fetch({ subjectCode: mainStore?.myUserInfo?.subjectCode, mainNumber: mainStore?.myUserInfo?.mainNumber })
+const { subjectList, mainQuestionList, dataModel, changeModelValue, onOptionInit, isExpert, isLeader } = useOptions([
+  'subject',
+  'question',
+])
+const formModel = reactive<any>({
+  mainNumber: dataModel.question,
+  subjectCode: dataModel.subject,
+})
+watch(dataModel, () => {
+  formModel.mainNumber = dataModel.question
+  formModel.subjectCode = dataModel.subject
+})
+const { defineColumn, _ } = useForm()
+
+const span10 = defineColumn(_, '', { span: 6 })
+
+const formItems = computed<any[]>(() => [
+  span10({
+    rowKey: 'row-1',
+    label: '科目',
+    prop: 'subjectCode',
+    slotType: 'select',
+    labelWidth: '46px',
+    slot: { options: subjectList.value, onChange: changeModelValue('subject'), disabled: !isExpert.value },
+  }),
+  span10({
+    rowKey: 'row-1',
+    label: '大题',
+    prop: 'mainNumber',
+    labelWidth: '46px',
+    slotType: 'select',
+    slot: {
+      options: mainQuestionList.value,
+      onChange: changeModelValue('question'),
+      disabled: !isExpert.value && !isLeader.value,
+    },
+  }),
+  { rowKey: 'row-1', slotName: 'search', labelWidth: '10px', colProp: { span: 4 } },
+])
+
+const onSearch = () => {
+  // fetch({ subjectCode: mainStore?.myUserInfo?.subjectCode, mainNumber: mainStore?.myUserInfo?.mainNumber })
+  fetch({ subjectCode: formModel.subjectCode, mainNumber: formModel.mainNumber })
+}
+
+onOptionInit(onSearch)
 </script>
 
 <style scoped lang="scss">