Эх сурвалжийг харах

feat: mock数据转换为真实数据

chenhao 2 жил өмнө
parent
commit
4ea847dfcf

+ 1 - 1
src/hooks/useSetImgBg.ts

@@ -139,7 +139,7 @@ export const convertColor = (color: string) => {
 }
 
 export interface SetImgBgOption {
-  image: HTMLImageElement | string | null
+  image?: HTMLImageElement | string | null
   canvas?: HTMLCanvasElement | null
   basePoint?: Point[]
   useNaturalSize?: boolean

+ 3 - 9
src/modules/analysis/group-monitoring-detail/index.vue

@@ -38,7 +38,7 @@
     <div class="flex-1 p-base flex overflow-hidden">
       <div class="flex direction-column flex-1 radius-base fill-blank relative paper-view">
         <div class="flex-1 p-extra-small scroll-auto">
-          <img :src="MockImg" alt="" class="paper-img" />
+          <img :src="current?.filePath" alt="" class="paper-img" />
         </div>
         <span class="preview" @click="onPreview">
           <svg-icon name="preview"></svg-icon>
@@ -46,7 +46,7 @@
         <scoring-panel-with-confirm-vue
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
-          :main-number="mockTask.mainNumber"
+          :main-number="current?.mainNumber"
           @submit="onSubmit"
         ></scoring-panel-with-confirm-vue>
       </div>
@@ -55,7 +55,7 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
 </template>
 
 <script setup lang="ts" name="GroupMonitoringDetail">
@@ -75,8 +75,6 @@ import ImagePreview from '@/components/shared/ImagePreview.vue'
 import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
-
 import type { ExtractMultipleApiResponse } from 'api-type'
 import type { EpTableColumn } from 'global-type'
 
@@ -92,10 +90,6 @@ const previewModalVisible = ref<boolean>(false)
 /** 分数 */
 const modelScore = ref<number[]>([])
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 /** 预览试卷 */
 const onPreview = () => {
   previewModalVisible.value = true

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

@@ -49,11 +49,11 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
   <scoring-panel-with-confirm
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
-    :main-number="mockTask.mainNumber"
+    :main-number="current?.mainNumber"
     modal
     :toggle-modal="false"
     @submit="onSubmit"
@@ -63,7 +63,7 @@
 
 <script setup lang="ts" name="ViewMarkedDetail">
 /** 提取阅卷明细 */
-import { reactive, ref, computed } from 'vue'
+import { ref, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { ElButton } from 'element-plus'
 import { useSetImgBg } from '@/hooks/useSetImgBg'
@@ -79,8 +79,6 @@ import SvgIcon from '@/components/common/SvgIcon.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
-
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractApiParams, ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpTableColumn } from 'global-type'
@@ -102,10 +100,6 @@ const previewModalVisible = ref<boolean>(false)
 /** 分数 */
 const modelScore = ref<number[]>([])
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 const {
   rotate,
   scale,
@@ -123,7 +117,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: current?.value?.filePath || '',
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 4 - 9
src/modules/expert/assess/index.vue

@@ -38,11 +38,11 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentAssessPaper?.filePath"></image-preview>
   <scoring-panel-with-confirm
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
-    :main-number="mockTask.mainNumber"
+    :main-number="currentAssessPaper?.mainNumber"
     modal
     :toggle-modal="false"
     @submit="onSubmit"
@@ -52,7 +52,7 @@
 
 <script setup lang="ts" name="ExpertAssess">
 /** 专家卷浏览-强制考核卷 */
-import { reactive, ref, computed, watch, nextTick } from 'vue'
+import { reactive, ref, computed, watch } from 'vue'
 import { ElButton } from 'element-plus'
 import { useSetImgBg } from '@/hooks/useSetImgBg'
 import useFetch from '@/hooks/useFetch'
@@ -71,7 +71,6 @@ import SvgIcon from '@/components/common/SvgIcon.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractApiParams, ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -87,10 +86,6 @@ const previewModalVisible = ref<boolean>(false)
 /** 分数 */
 const modelScore = ref<number[]>([])
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 const {
   rotate,
   scale,
@@ -108,7 +103,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentAssessPaper?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 3 - 8
src/modules/expert/expert/index.vue

@@ -38,13 +38,13 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentExpertPaper?.filePath"></image-preview>
   <scoring-panel-with-confirm
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
     modal
     :toggle-modal="false"
-    :main-number="mockTask.mainNumber"
+    :main-number="currentExpertPaper?.mainNumber"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
   <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
@@ -72,7 +72,6 @@ import SvgIcon from '@/components/common/SvgIcon.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractApiParams, ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -87,10 +86,6 @@ const previewModalVisible = ref<boolean>(false)
 
 const modelScore = ref<number[]>([])
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 const {
   rotate,
   scale,
@@ -108,7 +103,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentExpertPaper?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 3 - 26
src/modules/expert/sample/index.vue

@@ -38,13 +38,13 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentRfPaper?.filePath"></image-preview>
   <scoring-panel-with-confirm
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
     modal
     :toggle-modal="false"
-    :main-number="mockTask.mainNumber"
+    :main-number="currentRfPaper?.mainNumber"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
   <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
@@ -72,7 +72,6 @@ import SvgIcon from '@/components/common/SvgIcon.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractApiParams, ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -91,28 +90,6 @@ const totalScore = computed(() => {
   return add(...modelScore.value)
 })
 
-const mockTask = ref<ExtractApiResponse<'getMarkingTask'>>({
-  mainNumber: 1,
-  secretNumber: 'xxx',
-  mainTitle: '第一大题',
-  questionList: [
-    {
-      intervalScore: 0.5,
-      subNumber: '1',
-      totalScore: 8,
-    },
-    {
-      intervalScore: 1,
-      subNumber: '2',
-      totalScore: 20,
-    },
-  ],
-  subjectCode: 'C0001',
-  taskId: 1,
-  taskType: 'FORMAL',
-  url: '',
-})
-
 const {
   rotate,
   scale,
@@ -130,7 +107,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentRfPaper?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 2 - 4
src/modules/expert/standard/index.vue

@@ -34,7 +34,7 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentStandardPaper?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
 </template>
 
@@ -58,8 +58,6 @@ import SvgIcon from '@/components/common/SvgIcon.vue'
 import MarkHeader from '@/components/shared/MarkHeader.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
-
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractApiParams } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -73,7 +71,7 @@ const { onBack } = useMarkHeader()
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentStandardPaper?.value?.filePath,
     immediate: true,
   }
 })

+ 2 - 3
src/modules/expert/training/index.vue

@@ -39,7 +39,7 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
 </template>
 
@@ -63,7 +63,6 @@ import RightButton from '@/components/shared/RightButton.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractMultipleApiParams, ExtractApiParams } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -90,7 +89,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: current?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 3 - 9
src/modules/marking/arbitration/index.vue

@@ -20,7 +20,7 @@
         <scoring-panel-with-confirm
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
-          :main-number="mockTask.mainNumber"
+          :main-number="currentArbitration?.mainNumber"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>
@@ -45,7 +45,7 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentArbitration?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
 </template>
 
@@ -70,8 +70,6 @@ import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
-
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiParams, ExtractApiResponse, ExtractMultipleApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -103,7 +101,7 @@ const modelScore = ref<number[]>([])
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentArbitration?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,
@@ -112,10 +110,6 @@ const imgOption = computed<SetImgBgOption>(() => {
 
 const { drawing, dataUrl } = useSetImgBg(imgOption)
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 /** 刷新 */
 const onRefresh = () => {
   onSearch()

+ 2 - 4
src/modules/marking/inquiry-result/index.vue

@@ -14,7 +14,7 @@
         </span>
         <right-button class="next-button" @click="checkNext" />
         <div class="flex-1 p-base scroll-auto mark-content-paper">
-          <img :src="current?.filePath" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
+          <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
         </div>
       </div>
       <div class="p-base radius-base fill-blank scroll-auto m-l-base table-view">
@@ -91,8 +91,6 @@ import SvgIcon from '@/components/common/SvgIcon.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
-
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractApiParams, ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpTableColumn, EpFormItem } from 'global-type'
@@ -130,7 +128,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: current?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 3 - 8
src/modules/marking/mark/index.vue

@@ -27,7 +27,7 @@
     <scoring-panel-with-confirm
       v-model:visible="scoringPanelVisible"
       v-model:score="modelScore"
-      :main-number="mockTask.mainNumber"
+      :main-number="currentTask?.mainNumber"
       @submit="onSubmit"
     ></scoring-panel-with-confirm>
   </div>
@@ -56,7 +56,7 @@
     </template>
   </base-dialog>
   <remark-list-modal v-model="remarkModalVisible" @task-change="historyTaskChange"></remark-list-modal>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentTask?.url"></image-preview>
 </template>
 
 <script setup lang="ts" name="MarkingMark">
@@ -76,7 +76,6 @@ import ImagePreview from '@/components/shared/ImagePreview.vue'
 import RemarkListModal from '@/components/shared/RemarkListModal.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import MarkingStatus from '@/assets/images/status-marking.png'
 import ReMarkingStatus from '@/assets/images/status-remarking.png'
 import SampleAStatus from '@/assets/images/status-sample-a.png'
@@ -123,7 +122,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentTask?.value?.url,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,
@@ -132,10 +131,6 @@ const imgOption = computed<SetImgBgOption>(() => {
 
 const { drawing, dataUrl } = useSetImgBg(imgOption)
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 type TaskInfoType = ExtractApiResponse<'getMarkingTask'> | ExtractArrayValue<ExtractApiResponse<'getMarkHistory'>>
 
 const currentTask = ref<TaskInfoType>()

+ 3 - 8
src/modules/marking/problem/index.vue

@@ -19,7 +19,7 @@
         <scoring-panel-with-confirm
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
-          :main-number="mockTask.mainNumber"
+          :main-number="currentProblem?.mainNumber"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>
@@ -44,7 +44,7 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentProblem?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
   <send-back-mark :id="currentProblem?.id" v-model="sendBackVisible" @rejected="onRejected"></send-back-mark>
 </template>
@@ -71,7 +71,6 @@ import SendBackMark from '@/components/shared/SendBackMark.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiParams, ExtractApiResponse, ExtractMultipleApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -106,7 +105,7 @@ const modelScore = ref<number[]>([])
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentProblem?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,
@@ -115,10 +114,6 @@ const imgOption = computed<SetImgBgOption>(() => {
 
 const { drawing, dataUrl } = useSetImgBg(imgOption)
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 /** 刷新 */
 const onRefresh = () => {
   onSearch()

+ 3 - 8
src/modules/marking/repeat/index.vue

@@ -19,7 +19,7 @@
         <scoring-panel-with-confirm
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
-          :main-number="mockTask.mainNumber"
+          :main-number="currentReMarkPaper?.mainNumber"
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>
@@ -44,7 +44,7 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentReMarkPaper?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
 </template>
 
@@ -70,7 +70,6 @@ import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiParams, ExtractApiResponse, ExtractMultipleApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -102,7 +101,7 @@ const modelScore = ref<number[]>([])
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentReMarkPaper?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,
@@ -111,10 +110,6 @@ const imgOption = computed<SetImgBgOption>(() => {
 
 const { drawing, dataUrl } = useSetImgBg(imgOption)
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 /** 刷新 */
 const onRefresh = () => {
   onSearch()

+ 1 - 3
src/modules/marking/similar/index.vue

@@ -57,8 +57,6 @@ import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import MarkHeader from '@/components/shared/MarkHeader.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
-
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractApiParams } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -69,7 +67,7 @@ const { onBack } = useMarkHeader()
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentSamePaper?.value?.filePath,
     immediate: true,
   }
 })

+ 1 - 3
src/modules/marking/submit-similar/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex p-base full submit-similar">
     <div class="flex-1 full-y p-extra-small fill-blank radius-base scroll-auto view-paper">
-      <img :src="current?.url || MockImg" alt="" />
+      <img :src="current?.url" alt="" />
     </div>
     <div class="m-l-base p-base fill-blank radius-base history-view">
       <mark-history-list :id="props.taskId" #default="{ data }" :modal="false">
@@ -38,8 +38,6 @@ import BaseTable from '@/components/element/BaseTable.vue'
 import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import ConfirmButton from '@/components/common/ConfirmButton.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
-
 import type { ExtractApiResponse } from 'api-type'
 import type { EpTableColumn } from 'global-type'
 

+ 3 - 4
src/modules/marking/training-record/index.vue

@@ -32,7 +32,7 @@
 
 <script setup lang="ts" name="MarkingTrainingRecord">
 /** 查看培训记录 */
-import { reactive, ref, computed, watch, nextTick } from 'vue'
+import { computed } from 'vue'
 import { useSetImgBg } from '@/hooks/useSetImgBg'
 import useFetch from '@/hooks/useFetch'
 import useMarkHeader from '@/hooks/useMarkHeader'
@@ -42,10 +42,9 @@ import BaseTable from '@/components/element/BaseTable.vue'
 import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiResponse } from 'api-type'
-import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
+import type { MarkHeaderInstance, EpTableColumn } from 'global-type'
 
 type RowType = ExtractArrayValue<ExtractApiResponse<'viewTrainingRecord'>> & { index: number }
 
@@ -66,7 +65,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: current?.value?.url,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 1 - 2
src/modules/marking/view-sample/index.vue

@@ -42,7 +42,6 @@ import BaseTable from '@/components/element/BaseTable.vue'
 import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpTableColumn } from 'global-type'
@@ -66,7 +65,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: current?.value?.url,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

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

@@ -41,13 +41,13 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentSystemCheckPaper?.filePath"></image-preview>
   <scoring-panel-with-confirm
     v-model:visible="scoringPanelVisible"
     v-model:score="modelScore"
     modal
     :toggle-modal="false"
-    :main-number="mockTask.mainNumber"
+    :main-number="currentSystemCheckPaper?.mainNumber"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
   <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
@@ -56,9 +56,8 @@
 
 <script setup lang="ts" name="SystemCheck">
 /** 系统抽查卷 */
-import { reactive, ref, computed, watch, nextTick } from 'vue'
+import { reactive, ref, computed, watch } from 'vue'
 import { ElButton } from 'element-plus'
-import { add } from '@/utils/common'
 import { useSetImgBg } from '@/hooks/useSetImgBg'
 import useVW from '@/hooks/useVW'
 import useFetch from '@/hooks/useFetch'
@@ -77,7 +76,6 @@ import RightButton from '@/components/shared/RightButton.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiParams, ExtractApiResponse, ExtractMultipleApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -112,7 +110,7 @@ const modelScore = ref<number[]>([])
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentSystemCheckPaper?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,
@@ -121,10 +119,6 @@ const imgOption = computed<SetImgBgOption>(() => {
 
 const { drawing, dataUrl } = useSetImgBg(imgOption)
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 /** 刷新 */
 const onRefresh = () => {
   onSearch()

+ 2 - 3
src/modules/monitor/training-monitoring-detail/index.vue

@@ -34,7 +34,7 @@
       </div>
     </div>
   </div>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
 </template>
 
@@ -53,7 +53,6 @@ import ImagePreview from '@/components/shared/ImagePreview.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpTableColumn } from 'global-type'
@@ -82,7 +81,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: current?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 3 - 8
src/modules/quality/self-check-detail/index.vue

@@ -39,12 +39,12 @@
   <scoring-panel-with-confirm
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
-    :main-number="mockTask.mainNumber"
+    :main-number="current?.mainNumber"
     modal
     :toggle-modal="false"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
   <send-back-mark :id="current?.taskId" v-model="sendBackVisible" @rejected="onRejected"></send-back-mark>
 </template>
@@ -67,7 +67,6 @@ import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm
 import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import SendBackMark from '@/components/shared/SendBackMark.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance, EpTableColumn } from 'global-type'
@@ -88,10 +87,6 @@ const sendBackVisible = ref<boolean>(false)
 /** 分数 */
 const modelScore = ref<number[]>([])
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 const {
   rotate,
   scale,
@@ -109,7 +104,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: current?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,

+ 3 - 8
src/modules/quality/subjective-check/index.vue

@@ -53,12 +53,12 @@
   <scoring-panel-with-confirm
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
-    :main-number="mockTask.mainNumber"
+    :main-number="currentSubjectiveCheck?.mainNumber"
     modal
     :toggle-modal="false"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
-  <image-preview v-model="previewModalVisible" :url="MockImg"></image-preview>
+  <image-preview v-model="previewModalVisible" :url="currentSubjectiveCheck?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
 </template>
 
@@ -82,7 +82,6 @@ import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 
-import MockImg from '@/assets/mock/SAMPA-1.jpg'
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
 import type { ExtractMultipleApiResponse, ExtractApiParams } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
@@ -98,10 +97,6 @@ const previewModalVisible = ref<boolean>(false)
 /** 分数 */
 const modelScore = ref<number[]>([])
 
-const mockTask = ref<{ mainNumber: number }>({
-  mainNumber: 1,
-})
-
 const {
   rotate,
   scale,
@@ -119,7 +114,7 @@ const {
 
 const imgOption = computed<SetImgBgOption>(() => {
   return {
-    image: MockImg,
+    image: currentSubjectiveCheck?.value?.filePath,
     immediate: true,
     rotate: rotate.value,
     scale: scale.value,