bug fix

src/components/shared/ScoringPanelItem.vue

@@ -297,7 +297,7 @@ const onToggleClick = () => {
   font-size: $MediumFont;
   margin-bottom: 6px;
   &.mini {
-    padding: 12px 5px !important;
+    padding: 6px 5px !important;
   }
   &.modal-panel {
     padding: 10px 0;

src/components/shared/UserInfo.vue

@@ -11,12 +11,8 @@
         </div>
       </div>
     </template>
-    <div class="user-box">
-      <svg-icon
-        name="user"
-        style="font-size: 17px; position: relative; bottom: -2px"
-        @click="visibleUpdatePwd = true"
-      ></svg-icon>
+    <div class="user-box" @click="visibleUpdatePwd = true">
+      <svg-icon name="user" style="font-size: 17px; position: relative; bottom: -2px"></svg-icon>
       <p class="tip">个人</p>
     </div>
   </el-tooltip>

src/components/shared/message/MessageSend.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="flex radius-base overflow-hidden message-list-modal">
-    <slot></slot>
+    <template v-if="!!replyUserId">
+      <slot></slot>
+    </template>
     <div v-show="showCheckUser" class="flex direction-column p-base fill-lighter tree-box">
       <el-input v-model="filterText" placeholder="输入评卷员账号或名称筛选" clearable></el-input>
       <div class="flex-1 m-t-base scroll-y-auto">
@@ -15,7 +17,7 @@
         ></el-tree>
       </div>
     </div>
-    <div class="message-info-container" :class="{ big: !showCheckUser }">
+    <div class="message-info-container" :class="{ big: !showCheckUser && !replyUserId }">
       <div class="flex direction-column message-info">
         <div class="flex items-center p-base message-info-header">
           <div class="flex flex-1 items-center overflow-hidden send-user">
@@ -25,7 +27,9 @@
                 <span class="split-names">{{ viewCheckedUser }}</span>
                 <span v-if="checkedUsers.length > 3">共计{{ checkedUsers.length }}个人员</span>
               </p>
-              <el-button class="m-l-base" size="small" type="primary" @click="toggleCheckUser"> 选择收件人 </el-button>
+              <el-button v-if="!replyUserId" class="m-l-base" size="small" type="primary" @click="toggleCheckUser">
+                选择收件人
+              </el-button>
             </span>
           </div>
           <div class="grid pointer m-l-auto close-icon" @click="$emit('close')">
@@ -273,7 +277,7 @@ const toggleHistory = () => {
 <style scoped lang="scss">
 .message-list-modal {
   background-color: transparent;
-  width: 950px;
+  width: 750px;
   .tree-box {
     width: 260px;
     height: 446px;
@@ -316,9 +320,9 @@ const toggleHistory = () => {
   .message-info-container {
     // width: 600px;
     // flex: 1;
-    width: calc(100% - 520px);
+    width: calc(100% - 260px);
     &.big {
-      width: 690px;
+      width: 750px;
     }
     .message-info {
       height: 446px;

src/modules/marking/mark/index.vue

@@ -16,7 +16,7 @@
         <current-time></current-time>
       </div>
     </mark-header>
-    <div class="flex-1 overflow-hidden p-base mark-container">
+    <div class="flex-1 overflow-hidden mark-container">
       <div v-if="!enableRemark && !currentTask" class="waiting flex justify-center items-center">等待组长审核</div>
       <div
         v-else-if="!!currentTask"
@@ -380,6 +380,9 @@ const clearTaskView = () => {
   currentTask.value = undefined
 }
 const checkMarkStatus = async (): Promise<boolean> => {
+  if (currentTask.value?.taskType === 'FORCE') {
+    return true
+  }
   let myUserInfo: any = await useFetch('getMyUserInfo').fetch()
   const { markDayCount, markTotalCount } = myUserInfo
   let res: any = await getMarkStatus()

src/modules/quality/ending-check/components/EndCheck.vue

@@ -293,9 +293,9 @@ const onTaskChangeMarker2 = () => {
 }
 const onSubmitChangeMarker = async () => {
   try {
-    if (!currentTask.value) {
-      return ElMessage.error('点击表格行选择评卷任务')
-    }
+    // if (!currentTask.value) {
+    //   return ElMessage.error('点击表格行选择评卷任务')
+    // }
     const valid = await elFormRef?.value?.validate()
     if (valid) {
       await useFetch('changeTaskMarker').fetch({
@@ -312,9 +312,9 @@ const onSubmitChangeMarker = async () => {
 }
 const onSubmitChangeMarker2 = async () => {
   try {
-    if (!currentTask2.value) {
-      return ElMessage.error('点击表格行选择评卷任务')
-    }
+    // if (!currentTask2.value) {
+    //   return ElMessage.error('点击表格行选择评卷任务')
+    // }
     const valid = await elFormRef?.value?.validate()
     if (valid) {
       await useFetch('changeBackTaskMarker').fetch({