Explorar o código

评卷界面头部的 已评数量版块改造

刘洋 %!s(int64=2) %!d(string=hai) anos
pai
achega
9aa130bb28
Modificáronse 2 ficheiros con 13 adicións e 6 borrados
  1. 1 1
      src/components/shared/CurrentTime.vue
  2. 12 5
      src/modules/marking/mark/index.vue

+ 1 - 1
src/components/shared/CurrentTime.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="current-time-box">
     <div>停留: {{ time.joinTimeFormat }}</div>
-    <div>{{ time.serverTimeFormat }}</div>
+    <div class="m-t-mini">{{ time.serverTimeFormat }}</div>
   </div>
 </template>
 

+ 12 - 5
src/modules/marking/mark/index.vue

@@ -2,8 +2,15 @@
   <div class="flex direction-column full mark-page">
     <mark-header :exclude-operations="excludeOperations" :paper-path="currentTask?.url" @click="onOperationClick">
       <div class="data-item">
-        已评: {{ markStatus?.personCount || 0 }} /
-        {{ minus(markStatus?.totalCount || 0, markStatus?.markedCount || 0) }}
+        <!-- 已评: {{ markStatus?.personCount || 0 }} /
+        {{ minus(markStatus?.totalCount || 0, markStatus?.markedCount || 0) }} -->
+        <div>
+          <p>
+            今日已评:{{ markStatus?.personDayCount }}
+            {{ mainStore.myUserInfo?.markDayCount ? `/ ${mainStore.myUserInfo?.markDayCount}` : '' }}
+          </p>
+          <p class="m-t-mini">累计已评:{{ markStatus?.personCount }}</p>
+        </div>
       </div>
       <!-- <span v-show="currentTask" class="data-item">密号: {{ currentTask?.secretNumber }}</span> -->
       <div v-show="currentTask" class="data-item">
@@ -393,7 +400,9 @@ const checkMarkStatus = async (): Promise<boolean> => {
   if (currentTask.value?.taskType === 'FORCE') {
     return true
   }
-  let myUserInfo: any = await useFetch('getMyUserInfo').fetch()
+  // let myUserInfo: any = await useFetch('getMyUserInfo').fetch()
+  let myUserInfo: any = (await mainStore.getMyUserInfo()) || {}
+  //markDayCount表示该用户当天的任务量限制,markTotalCount表示该用户总任务量限制
   const { markDayCount, markTotalCount } = myUserInfo
   let res: any = await getMarkStatus()
   if (!!markTotalCount && res.personCount >= markTotalCount) {
@@ -414,7 +423,6 @@ const onRefreshNext = () => {
 }
 /** 刷新 */
 const onRefresh = async (refreshToNext?: boolean) => {
-  // await getMarkStatus()
   let bool = await checkMarkStatus()
   // if (!bool) {
   //   return false
@@ -499,7 +507,6 @@ const getEnableRemark = () => {
 // }
 let timer: any = null
 watch(currentTask, (newVal, oldVal) => {
-  // getMarkStatus()
   if (!oldVal && !!newVal) {
     getMarkStatus()
   }