bug fix

src/api/api-types/marking.d.ts

@@ -99,6 +99,7 @@ export namespace Marking {
     minMarkTime: number
     /** 试卷 path */
     url: string
+    rejectReason?: any
   }
 
   type GetMarkingTask = BaseDefine<null, Task[]>

src/modules/admin-data/marking/index.vue

@@ -17,6 +17,7 @@
             v-model="model.dayWeight[i]"
             class="day-dispatch-num"
             :step="0.1"
+            :max="1"
             step-strictly
             :controls="false"
           />

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

@@ -237,12 +237,12 @@ const tableModel = reactive<any>({
   pageSize: 100,
   subjectCode: query.subjectCode as string,
   mainNumber: query.questionMainNumber as string,
-  // today: true,
+  today: true,
 })
 watch(
   () => model.type,
   () => {
-    // tableModel.today = model.type === 'today'
+    tableModel.today = model.type === 'today'
   }
 )
 ;(window as any)._tableModel = tableModel

src/modules/marking/assess/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="p-base">
     <div class="m-b-base flex top-box">
-      <div class="flex-1 p-base radius-base fill-blank m-r-base form-card scroll-auto">
+      <div class="flex-1 p-base radius-base fill-blank m-r-base form-card scroll-auto left-form">
         <base-form
           ref="formRef"
           :label-width="'72px'"
@@ -254,7 +254,7 @@ const items = computed<EpFormItem[]>(() => {
       },
     }),
     Span12({
-      rowKey: 'row-2',
+      rowKey: 'row-1',
       label: '大题',
       prop: 'mainNumber',
       slotType: 'select',
@@ -404,6 +404,16 @@ const sendHandler = () => {
 </script>
 
 <style scoped lang="scss">
+.left-form {
+  :deep(.custom-block:not(:first-child)) {
+    .default-custom-block-title {
+      margin-bottom: 0;
+    }
+    .el-form-item {
+      margin-bottom: 5px;
+    }
+  }
+}
 .dialog-body-wrap {
   .choose-list-box {
     background-color: #f5f5f5;

src/modules/marking/inquiry/index.vue

@@ -463,6 +463,7 @@ const shortName = ref<string>('')
 /** 保存为快捷查询 */
 const toggleVisible = (show: boolean) => {
   visible.value = show
+  shortName.value = ''
 }
 const onSetCustomQueryConfig = async () => {
   try {
@@ -477,6 +478,7 @@ const onSetCustomQueryConfig = async () => {
     toggleVisible(false)
     elFormRef?.value?.resetFields()
     shortQueryConfigIndex.value = void 0
+    shortName.value = ''
     getCustomQueryConfigList()
   } catch (error) {
     console.error(error)

src/modules/marking/mark/index.vue

@@ -110,13 +110,22 @@
   <!-- <remark-list-modal v-model="remarkModalVisible" @task-change="historyTaskChange"></remark-list-modal> -->
   <!-- <image-preview v-if="currentTask" v-model="previewModalVisible" :url="currentTask?.url"></image-preview> -->
   <image-preview v-if="currentTask" v-model="previewModalVisible" :url="currentTask?.url"></image-preview>
+  <el-dialog v-model="showRejectReason" :title="`打回试卷（${rejectTask?.secretNumber}）`" width="500px">
+    <span style="font-size: 14px; font-weight: bold; color: #333">原因：</span
+    ><span style="font-size: 14px">{{ rejectTask?.rejectReason }}</span>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="showRejectReason = false"> 确定 </el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts" name="MarkingMark">
 /** 阅卷-正式评卷 */
 import { computed, nextTick, ref, watch, onBeforeUnmount, unref } from 'vue'
 import { useRouter } from 'vue-router'
-import { ElButton, ElRadioGroup, ElRadioButton, ElRadio, ElMessage } from 'element-plus'
+import { ElButton, ElRadioGroup, ElRadioButton, ElRadio, ElMessage, ElDialog } from 'element-plus'
 import { minus } from '@/utils/common'
 import { useSetImgBg } from '@/hooks/useSetImgBg'
 import useFetch from '@/hooks/useFetch'
@@ -545,6 +554,8 @@ const getEnableRemark = () => {
 //     imgWrap.value.scrollTop = 0
 //   }
 // }
+const showRejectReason = ref(false)
+const rejectTask = ref<any>(null)
 let timer: any = null
 watch(currentTask, (newVal, oldVal) => {
   if (!oldVal && !!newVal) {
@@ -553,6 +564,11 @@ watch(currentTask, (newVal, oldVal) => {
   resume()
   if (!currentTask.value) {
     getEnableRemark()
+  } else {
+    if (currentTask.value?.rejectReason) {
+      showRejectReason.value = true
+      rejectTask.value = currentTask.value
+    }
   }
   // clearScrollTop()
 })