刘洋 2 年之前
父節點
當前提交
e57fe942f5

+ 10 - 4
src/components/shared/ScoringPanelItem.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="flex scoring-panel" :class="[getClass('modal-panel', 'sticky'), { mini: !props.large && !props.modal }]">
-    <!-- <toggle-dialog-render>
+    <toggle-dialog-render v-if="isMarkerPage">
       <svg-icon name="question"></svg-icon>
       <span class="m-l-mini" style="max-width: 200px"
         >{{ question.mainNumber }} - {{ question.subNumber }}{{ question.mainTitle }}</span
       >
-      <template #callback>
+      <!-- <template #callback>
         <div class="grid radius-base dialog-name">
           <div class="text-center">
             <p>{{ question.mainNumber }} - {{ question.subNumber }}</p>
             <p>{{ question.mainTitle }}</p>
           </div>
         </div>
-      </template> 
-    </toggle-dialog-render>-->
+      </template> -->
+    </toggle-dialog-render>
     <div class="flex flex-1 flex-wrap score-list">
       <div
         v-for="scoreItem in scoreList"
@@ -72,6 +72,12 @@ import SvgIcon from '@/components/common/SvgIcon.vue'
 import useVModel from '@/hooks/useVModel'
 import { getNumbers } from '@/utils/common'
 import { debounce } from 'lodash-es'
+import { useRoute } from 'vue-router'
+
+const route = useRoute()
+const isMarkerPage = computed(() => {
+  return route.path === '/marking/mark'
+})
 
 interface QuestionInfo {
   mainNumber: number

+ 4 - 2
src/modules/analysis/view-marked-detail/index.vue

@@ -209,10 +209,12 @@ const { fetch: updatePersonalMarkDetailScore } = useFetch('updatePersonalMarkDet
 
 const onSubmit = async () => {
   if (current.value) {
+    const scores = JSON.parse(JSON.stringify(modelScore.value))
     await updatePersonalMarkDetailScore({ taskId: current.value.taskId, scores: modelScore.value })
-    // current.value.markerScore = add(...modelScore.value)
+    current.value.markerScore = add(...scores)
     ElMessage.success('修改成功')
-    onRefresh()
+    editScoreVisible.value = false
+    // onRefresh()
   }
 }
 // watch(current, () => {

+ 1 - 0
src/modules/expert/assess/index.vue

@@ -238,6 +238,7 @@ const onSubmit = async () => {
     await updateMarkScore({ id: currentAssessPaper.value.id, scores: modelScore.value })
     currentAssessPaper.value.score = add(...scores)
     ElMessage.success('修改成功')
+    editScoreVisible.value = false
     // onSearch()
   }
 }

+ 1 - 0
src/modules/expert/expert/index.vue

@@ -302,6 +302,7 @@ const onSubmit = async () => {
     await updateMarkScore({ id: currentExpertPaper.value.id, scores: modelScore.value })
     currentExpertPaper.value.score = add(...scores)
     ElMessage.success('修改成功')
+    editScoreVisible.value = false
     // onSearch()
   }
 }

+ 1 - 0
src/modules/expert/sample/index.vue

@@ -217,6 +217,7 @@ const onSubmit = async () => {
       await updateMarkScore({ id: currentRfPaper.value.id, scores: modelScore.value })
       currentRfPaper.value.score = add(...scores)
       ElMessage.success('修改成功')
+      editScoreVisible.value = false
       // onSearch()
     }
   } catch (error) {

+ 3 - 0
src/modules/marking/inquiry-result/index.vue

@@ -192,6 +192,7 @@ const onPreview = () => {
 
 const onEditScore = () => {
   editScoreVisible.value = true
+  modelScore.value = current.value.markScores
 }
 
 type OperationClick = MarkHeaderInstance['onClick']
@@ -371,8 +372,10 @@ const onSubmit = async () => {
     await useFetch('updateCustomPaperScore').fetch({ taskId: current.value.taskId, scores: modelScore.value })
 
     current.value.headerScore = add(...scores)
+    current.value.markScores = scores
     // onRefresh()
     ElMessage.success('修改成功')
+    editScoreVisible.value = false
   }
 }
 

+ 4 - 1
src/modules/monitor/system-check/index.vue

@@ -6,7 +6,7 @@
       @click="onOperationClick"
     >
       <template v-if="!hideHeaderButtons">
-        <el-button class="m-l-base" size="small" type="primary" plain @click="onEditScore">修改给分</el-button>
+        <el-button class="m-l-base" size="small" type="primary" @click="onEditScore">修改给分</el-button>
         <el-button class="m-l-base m-r-auto" size="small" type="primary" @click="onSendBack">打回</el-button>
       </template>
     </mark-header>
@@ -169,6 +169,7 @@ const onPreview = () => {
 /** 修改给分 */
 const onEditScore = () => {
   scoringPanelVisible.value = true
+  modelScore.value = currentSystemCheckPaper.value.markScores
 }
 
 /** 打回 */
@@ -316,7 +317,9 @@ const onSubmit = async () => {
     const scores = JSON.parse(JSON.stringify(modelScore.value))
     await markSystemSpotPaper({ id: currentSystemCheckPaper.value.id, scores: modelScore.value })
     currentSystemCheckPaper.value.headerScore = add(...scores)
+    currentSystemCheckPaper.value.markScores = scores
     ElMessage.success('修改成功')
+    scoringPanelVisible.value = false
     // onSearch()
     // fetchTable()
   }

+ 2 - 1
src/modules/quality/self-check-detail/index.vue

@@ -5,7 +5,7 @@
       :paper-path="current?.filePath"
       @click="onOperationClick"
     >
-      <el-button class="m-l-base" size="small" type="primary" plain @click="onEditScore">修改给分</el-button>
+      <el-button class="m-l-base" size="small" type="primary" @click="onEditScore">修改给分</el-button>
       <el-button class="m-l-base m-r-auto" size="small" type="primary" @click="onSendBack">打回</el-button>
     </mark-header>
     <div class="flex flex-1 overflow-hidden p-base mark-container">
@@ -209,6 +209,7 @@ const onSubmit = async () => {
     await markSelfCheckData({ taskId: current.value.taskId, scores: modelScore.value })
     // current.value.markerScore = add(...modelScore.value)
     ElMessage.success('修改成功')
+    editScoreVisible.value = false
   }
 }
 

+ 2 - 1
src/modules/quality/subjective-check/index.vue

@@ -5,7 +5,7 @@
       :paper-path="currentSubjectiveCheck?.filePath"
       @click="onOperationClick"
     >
-      <el-button type="primary" size="small" class="m-l-base" plain @click="onEditScore">修改给分</el-button>
+      <el-button type="primary" size="small" class="m-l-base" @click="onEditScore">修改给分</el-button>
       <el-button type="primary" size="small" class="m-l-base m-r-auto" @click="onConfirm">提交确认</el-button>
     </mark-header>
     <div class="flex flex-1 overflow-hidden p-base mark-container">
@@ -304,6 +304,7 @@ const onSubmit = async () => {
     await subjectiveCheckMark({ taskId: currentSubjectiveCheck.value.taskId, scores: modelScore.value })
     currentSubjectiveCheck.value.markScore = add(...scores)
     ElMessage.success('修改成功')
+    editScoreVisible.value = false
     // onSearch()
   }
 }