刘洋 2 жил өмнө
parent
commit
e2473d0ee4

+ 2 - 2
server.config.ts

@@ -4,10 +4,10 @@ const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
       // target: 'http://192.168.10.41:8200',
-      target: 'http://192.168.10.178:8200',
+      // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.107: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',
     },
   },

+ 1 - 1
src/modules/marking/mark/index.vue

@@ -17,7 +17,7 @@
     <div class="flex-1 overflow-hidden p-base mark-container">
       <div v-if="!enableRemark && !currentTask" class="waiting flex justify-center items-center">等待组长审核</div>
       <div
-        v-else
+        v-else-if="!!currentTask"
         class="p-base radius-base full fill-blank scroll-auto mark-content"
         :style="{ 'background-color': backgroundColor }"
       >

+ 2 - 1
src/modules/marking/training-record/index.vue

@@ -12,8 +12,9 @@
         :style="{ 'background-color': backgroundColor }"
       >
         <right-button class="next-button" @click="checkNext" />
-        <div class="flex-1 p-base scroll-auto mark-content-paper img-wrap">
+        <div class="flex-1 p-base scroll-auto mark-content-paper img-wrap relative">
           <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
+          <p v-if="current" class="absolute mark-score">{{ current?.score }}</p>
         </div>
       </div>
       <div class="p-base radius-base fill-blank scroll-auto m-l-base table-view">

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

@@ -20,8 +20,9 @@
         :style="{ 'background-color': backgroundColor }"
       >
         <right-button class="next-button" @click="checkNext" />
-        <div class="flex-1 p-base scroll-auto mark-content-paper img-wrap">
+        <div class="flex-1 p-base scroll-auto mark-content-paper img-wrap relative">
           <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
+          <p v-if="current" class="absolute mark-score">{{ current?.score }}</p>
         </div>
       </div>
       <div class="p-base radius-base fill-blank scroll-auto m-l-base table-view">