feat: 给分记录组件调整

src/api/marking.ts

@@ -41,8 +41,6 @@ const MarkingApi: DefineApiModule<Marking.ApiMap> = {
   markProblemPaper: '/api/problem/history/mark',
   /** 通过taskId 查询给分记录 */
   getMarkScoreHistoryListWithTask: '/api/mark/history/task',
-  /** 通过secretNumber 查询给分记录 */
-  getMarkScoreHistoryListWithSecret: '/api/mark/history/secretNumber',
   /** 打回 */
   rejectMarkHistory: '/api/problem/history/reject',
   /** 仲裁卷 */

src/components/shared/CurrentServerTime.vue

@@ -1,9 +0,0 @@
-<template>
-  <div class=""></div>
-</template>
-
-<script setup lang="ts" name="">
-import { reactive, ref } from 'vue'
-</script>
-
-<style scoped lang="scss"></style>

src/components/shared/CurrentTime.vue

@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <div>停留: {{ time.joinTimeFormat }}</div>
+    <div>{{ time.serverTimeFormat }}</div>
+  </div>
+</template>
+
+<script setup lang="ts" name="CurrentTime">
+import useTime from '@/hooks/useTime'
+
+const time = useTime()
+</script>
+
+<style scoped lang="scss"></style>

src/components/shared/MarkHeader.vue

@@ -193,7 +193,7 @@ const emitEvent = (type: EventType, val?: string | number | boolean | number[])
     font-size: $SmallFont;
     ::v-deep(.data-item) {
       padding-left: 20px;
-      display: inline-flex;
+      display: flex;
       align-items: center;
       &:first-child {
         margin-left: auto;

src/components/shared/MarkHistoryList.vue

@@ -22,13 +22,11 @@ import type { EpTableColumn } from 'global-type'
 const props = withDefaults(
   defineProps<{
     modelValue?: boolean
-    type?: 'task' | 'secret'
     id: number | string | undefined
     modal?: boolean
     showLevel?: boolean
   }>(),
   {
-    type: 'task',
     modelValue: true,
     modal: true,
     showLevel: false,
@@ -57,24 +55,18 @@ const ScoringPanelContainer = computed(() => {
 
 const { fetch: getMarkScoreHistoryListWithTask, result: scoreHistoryList } = useFetch('getMarkScoreHistoryListWithTask')
 
-const { fetch: getMarkScoreHistoryListWithSecret, result: scoreHistoryListWithSecret } = useFetch(
-  'getMarkScoreHistoryListWithSecret'
-)
-
 watch(
   () => props.id,
   () => {
     if (props.id) {
-      props.type === 'task'
-        ? getMarkScoreHistoryListWithTask({ taskId: props.id })
-        : getMarkScoreHistoryListWithSecret({ secretNumber: props.id })
+      getMarkScoreHistoryListWithTask({ taskId: props.id })
     }
   },
   { immediate: true }
 )
 
 const tableData = computed(() => {
-  return props.type === 'task' ? scoreHistoryList.value : scoreHistoryListWithSecret.value
+  return scoreHistoryList.value
 })
 
 const columns = computed<EpTableColumn<ExtractArrayValue<ExtractApiResponse<'getMarkScoreHistoryListWithTask'>>>[]>(

src/components/shared/RemarkListModal.vue

@@ -9,11 +9,11 @@
       :max-height="useVW(620)"
       @current-change="onCurrentChange"
     ></base-table>
-    <div v-else class="flex flex-wrap justify-between preview-list">
+    <div v-else class="flex flex-wrap preview-list">
       <div
         v-for="markHistory in markHistoryList"
         :key="markHistory.taskId"
-        class="preview-item"
+        class="m-l-base preview-item"
         :class="{ current: task?.taskId === markHistory.taskId }"
         @click="onCurrentChange(markHistory)"
       >

src/hooks/useSpentTime.ts

@@ -0,0 +1,20 @@
+import { ref } from 'vue'
+import { useTimestamp } from '@vueuse/core'
+
+const useSpentTime = () => {
+  const timeStart = ref<number>(Date.now())
+
+  const timeEnd = useTimestamp()
+
+  const resume = () => {
+    timeStart.value = Date.now()
+  }
+
+  const getSpentTime = () => {
+    return timeEnd.value - timeStart.value
+  }
+
+  return { getSpentTime, resume }
+}
+
+export default useSpentTime

src/hooks/useTime.ts

@@ -1,20 +1,18 @@
-import { ref } from 'vue'
+import { computed } from 'vue'
+import dayjs from 'dayjs'
+import useMainStore from '@/store/main'
 import { useTimestamp } from '@vueuse/core'
+import { timeFormat } from '@/utils/common'
 
 const useTime = () => {
-  const timeStart = ref<number>(Date.now())
-
-  const timeEnd = useTimestamp()
-
-  const resume = () => {
-    timeStart.value = Date.now()
-  }
-
-  const getSpentTime = () => {
-    return timeEnd.value - timeStart.value
-  }
-
-  return { getSpentTime, resume }
+  const mainStore = useMainStore()
+  const timestamp = useTimestamp()
+  return computed(() => {
+    return {
+      serverTimeFormat: dayjs(timestamp.value - mainStore.diffTime).format('YYYY-MM-DD HH:mm:ss'),
+      joinTimeFormat: timeFormat(timestamp.value - mainStore.loginSuccessTime),
+    }
+  })
 }
 
 export default useTime

src/layout/main/MainHeader.vue

@@ -8,7 +8,8 @@
     </div>
     <div class="flex-1 flex items-center header-info-view">
       <div>当前考试: {{ mainStore?.myUserInfo?.examName }}</div>
-      <div class="m-l-auto m-r-base">
+      <current-time class="m-l-auto m-r-base"></current-time>
+      <div class="m-r-base">
         <message :reply-user-id="props.replyUserId" :message-visible="props.messageVisible"></message>
       </div>
       <div class="m-r-base">
@@ -27,6 +28,7 @@ import { Fold, Expand, Close } from '@element-plus/icons-vue'
 import { logout } from '@/utils/shared'
 import useMainLayoutStore from '@/store/layout'
 import useMainStore from '@/store/main'
+import CurrentTime from '@/components/shared/CurrentTime.vue'
 import Message from '@/components/shared/message/Message.vue'
 import UserInfo from '@/components/shared/UserInfo.vue'
 

src/modules/analysis/view-marked-detail/index.vue

@@ -62,7 +62,7 @@
     :toggle-modal="false"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
-  <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
+  <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
 </template>
 
 <script setup lang="ts" name="ViewMarkedDetail">

src/modules/bootstrap/login/index.vue

@@ -92,6 +92,8 @@ function loginSuccess(loginInfo: ExtractApiResponse<'userLogin'>) {
   /** pinia store 存储 login result */
   mainStore.loginInfo = loginInfo
 
+  mainStore.loginSuccessTime = Date.now()
+
   mainLayoutStore.getRenderMenuList()
   /**
    * 超级管理员每次登录完成之后需要选择考试批次

src/modules/expert/assess/index.vue

@@ -37,7 +37,6 @@
           :data="tableData"
           :columns="columns"
           @current-change="onCurrentChange"
-          @row-dblclick="onDbClick"
         ></base-table>
       </div>
     </div>
@@ -51,7 +50,6 @@
     :toggle-modal="false"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
-  <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
 </template>
 
 <script setup lang="ts" name="ExpertAssess">
@@ -69,7 +67,6 @@ import useTableCheck from '@/hooks/useTableCheck'
 import MarkHeader from '@/components/shared/MarkHeader.vue'
 import BaseForm from '@/components/element/BaseForm.vue'
 import BaseTable from '@/components/element/BaseTable.vue'
-import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
@@ -204,10 +201,7 @@ const {
   tableRef,
   tableData,
   current: currentAssessPaper,
-  currentView: currentViewHistory,
   next: checkNext,
-  visibleHistory,
-  onDbClick,
   onCurrentChange,
 } = useTableCheck(rfSampleList)
 

src/modules/expert/expert/index.vue

@@ -37,7 +37,6 @@
           :data="tableData"
           :columns="columns"
           @current-change="onCurrentChange"
-          @row-dblclick="onDbClick"
         ></base-table>
       </div>
     </div>
@@ -51,7 +50,6 @@
     :main-number="currentExpertPaper?.mainNumber"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
-  <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
 </template>
 
 <script setup lang="ts" name="ExpertExpert">
@@ -70,7 +68,6 @@ import useTableCheck from '@/hooks/useTableCheck'
 import MarkHeader from '@/components/shared/MarkHeader.vue'
 import BaseForm from '@/components/element/BaseForm.vue'
 import BaseTable from '@/components/element/BaseTable.vue'
-import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
@@ -256,10 +253,7 @@ const {
   tableRef,
   tableData,
   current: currentExpertPaper,
-  currentView: currentViewHistory,
   next: checkNext,
-  visibleHistory,
-  onDbClick,
   onCurrentChange,
 } = useTableCheck(expertPaperList)
 

src/modules/expert/sample/index.vue

@@ -51,7 +51,6 @@
     :main-number="currentRfPaper?.mainNumber"
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
-  <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
 </template>
 
 <script setup lang="ts" name="ExpertSample">
@@ -70,7 +69,6 @@ import useTableCheck from '@/hooks/useTableCheck'
 import MarkHeader from '@/components/shared/MarkHeader.vue'
 import BaseForm from '@/components/element/BaseForm.vue'
 import BaseTable from '@/components/element/BaseTable.vue'
-import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
@@ -188,9 +186,7 @@ const {
   tableRef,
   tableData,
   current: currentRfPaper,
-  currentView: currentViewHistory,
   next: checkNext,
-  visibleHistory,
   onDbClick,
   onCurrentChange,
 } = useTableCheck(rfSampleList)

src/modules/expert/standard/index.vue

@@ -29,18 +29,16 @@
           :data="tableData"
           :columns="columns"
           @current-change="onCurrentChange"
-          @row-dblclick="onDbClick"
         ></base-table>
       </div>
     </div>
   </div>
   <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>
 
 <script setup lang="ts" name="ExpertStandard">
 /** 专家卷浏览-标准卷 */
-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'
@@ -52,7 +50,6 @@ import useMainStore from '@/store/main'
 import useTableCheck from '@/hooks/useTableCheck'
 import BaseForm from '@/components/element/BaseForm.vue'
 import BaseTable from '@/components/element/BaseTable.vue'
-import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 import MarkHeader from '@/components/shared/MarkHeader.vue'
@@ -160,10 +157,7 @@ const {
   tableRef,
   tableData,
   current: currentStandardPaper,
-  currentView: currentViewHistory,
   next: checkNext,
-  visibleHistory,
-  onDbClick,
   onCurrentChange,
 } = useTableCheck(standardList)
 

src/modules/expert/training/index.vue

@@ -35,13 +35,11 @@
           :data="tableData"
           :columns="columns"
           @current-change="onCurrentChange"
-          @row-dblclick="onDbClick"
         ></base-table>
       </div>
     </div>
   </div>
   <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>
 
 <script setup lang="ts" name="ExpertTraining">
@@ -59,13 +57,12 @@ import useTableCheck from '@/hooks/useTableCheck'
 import MarkHeader from '@/components/shared/MarkHeader.vue'
 import BaseForm from '@/components/element/BaseForm.vue'
 import BaseTable from '@/components/element/BaseTable.vue'
-import MarkHistoryList from '@/components/shared/MarkHistoryList.vue'
 import RightButton from '@/components/shared/RightButton.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 
 import type { SetImgBgOption } from '@/hooks/useSetImgBg'
-import type { ExtractMultipleApiResponse, ExtractMultipleApiParams, ExtractApiParams } from 'api-type'
+import type { ExtractMultipleApiResponse, ExtractApiParams } from 'api-type'
 import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
 
 type RowType = ExtractMultipleApiResponse<'getSampleList'> & { index: number }
@@ -173,16 +170,7 @@ const columns: EpTableColumn<RowType>[] = [
 
 const { fetch: getSampleList, result: sampleList } = useFetch('getSampleList')
 
-const {
-  tableRef,
-  tableData,
-  current,
-  currentView: currentViewHistory,
-  next: checkNext,
-  visibleHistory,
-  onDbClick,
-  onCurrentChange,
-} = useTableCheck(sampleList)
+const { tableRef, tableData, current, next: checkNext, onCurrentChange } = useTableCheck(sampleList)
 
 const onSearch = async () => {
   getSampleList(formModel)

src/modules/marking/mark/index.vue

@@ -1,16 +1,15 @@
 <template>
   <div class="flex direction-column full">
     <mark-header :exclude-operations="['delete', 'bookmark']" :paper-path="currentTask?.url" @click="onOperationClick">
-      <div class="flex items-center m-l-auto">
-        <span class="data-item">
-          已评: {{ markStatus?.personCount || 0 }} /
-          {{ minus(markStatus?.totalCount || 0, markStatus?.markedCount || 0) }}
-        </span>
-        <span v-show="currentTask" class="data-item">密号: {{ currentTask?.secretNumber }}</span>
-        <span v-show="currentTask" lass="data-item">{{ currentTask?.mainNumber }}-{{ currentTask?.mainTitle }}</span>
-        <span class="data-item">停留: {{}}</span>
-        <span class="data-item">北京时间: {{}}</span>
-      </div>
+      <span class="data-item">
+        已评: {{ markStatus?.personCount || 0 }} /
+        {{ minus(markStatus?.totalCount || 0, markStatus?.markedCount || 0) }}
+      </span>
+      <span v-show="currentTask" class="data-item">密号: {{ currentTask?.secretNumber }}</span>
+      <span v-show="currentTask" class="data-item">{{ currentTask?.mainNumber }}-{{ currentTask?.mainTitle }}</span>
+      <span class="data-item">
+        <current-time></current-time>
+      </span>
     </mark-header>
     <div class="flex-1 overflow-hidden p-base mark-container">
       <div
@@ -72,13 +71,14 @@ import { minus } from '@/utils/common'
 import { useSetImgBg } from '@/hooks/useSetImgBg'
 import useFetch from '@/hooks/useFetch'
 import useVW from '@/hooks/useVW'
-import useTime from '@/hooks/useTime'
+import useSpentTime from '@/hooks/useSpentTime'
 import useMarkHeader from '@/hooks/useMarkHeader'
 import BaseDialog from '@/components/element/BaseDialog.vue'
 import MarkHeader from '@/components/shared/MarkHeader.vue'
 import ScoringPanelWithConfirm from '@/components/shared/ScoringPanelWithConfirm.vue'
 import ImagePreview from '@/components/shared/ImagePreview.vue'
 import RemarkListModal from '@/components/shared/RemarkListModal.vue'
+import CurrentTime from '@/components/shared/CurrentTime.vue'
 import SvgIcon from '@/components/common/SvgIcon.vue'
 
 import MarkingStatus from '@/assets/images/status-marking.png'
@@ -90,7 +90,7 @@ import type { ExtractApiResponse } from 'api-type'
 import type { MarkHeaderInstance } from 'global-type'
 const { push, replace } = useRouter()
 
-const { getSpentTime, resume } = useTime()
+const { getSpentTime, resume } = useSpentTime()
 
 type TaskType = ExtractArrayValue<ExtractApiResponse<'getMarkingTask'>>['taskType'] | 'default' | 'remarking'
 
@@ -197,7 +197,6 @@ const onSubmit: InstanceType<typeof ScoringPanelWithConfirm>['onSubmit'] = async
       taskId: currentTask.value.taskId,
     })
     await getNextTask(true)
-    await getMarkStatus()
   } catch (error) {
     console.error(error)
     scoringPanelVisible.value = true
@@ -234,7 +233,6 @@ const onSubmitProblem = async () => {
     taskId: currentTask.value.taskId,
   })
   await getNextTask(true)
-  await getMarkStatus()
 }
 
 /** 提交问题卷 & 雷同卷 */
@@ -320,6 +318,7 @@ const imgOption = computed<SetImgBgOption>(() => {
 const { drawing, dataUrl } = useSetImgBg(imgOption)
 
 watch(currentTask, () => {
+  getMarkStatus()
   resume()
 })
 

src/modules/marking/similar/index.vue

@@ -36,7 +36,7 @@
       </div>
     </div>
   </div>
-  <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
+  <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
 </template>
 
 <script setup lang="ts" name="MarkingSimilar">

src/modules/marking/view-sample/index.vue

@@ -23,17 +23,15 @@
           :data="tableData"
           :columns="columns"
           @current-change="onCurrentChange"
-          @row-dblclick="onDbClick"
         ></base-table>
       </div>
     </div>
   </div>
-  <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
 </template>
 
 <script setup lang="ts" name="MarkingViewSample">
 /** 查看样卷 */
-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'
@@ -99,16 +97,7 @@ const columns: EpTableColumn<RowType>[] = [
 ]
 const { fetch: viewSamplePaper, result: samplePaperList } = useFetch('viewSamplePaper')
 
-const {
-  tableRef,
-  tableData,
-  current,
-  currentView: currentViewHistory,
-  next: checkNext,
-  visibleHistory,
-  onDbClick,
-  onCurrentChange,
-} = useTableCheck(samplePaperList)
+const { tableRef, tableData, current, next: checkNext, onCurrentChange } = useTableCheck(samplePaperList)
 
 viewSamplePaper()
 

src/modules/quality/self-check-detail/index.vue

@@ -49,7 +49,7 @@
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
   <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
-  <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
+  <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
   <send-back-mark :id="current?.taskId" v-model="sendBackVisible" @rejected="onRejected"></send-back-mark>
 </template>
 

src/modules/quality/subjective-check/index.vue

@@ -63,7 +63,7 @@
     @submit="onSubmit"
   ></scoring-panel-with-confirm>
   <image-preview v-model="previewModalVisible" :url="currentSubjectiveCheck?.filePath"></image-preview>
-  <mark-history-list :id="currentViewHistory?.secretNumber" v-model="visibleHistory" type="secret"></mark-history-list>
+  <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
 </template>
 
 <script setup lang="ts" name="QualitySubjectiveCheck">

src/store/main.ts

@@ -22,9 +22,9 @@ const useMainStore = defineStore<'main', MainStoreState, Record<string, any>, Ma
       /** 进入系统的时间 */
       bootstrapTime: Date.now(),
       /** 登录成功时间 */
-      loginSuccessTime: 0,
+      loginSuccessTime: Date.now(),
       /** 服务器时间 */
-      serverTime: 0,
+      serverTime: Date.now(),
       /** 时间差 */
       diffTime: 0,
       /** 用户登录信息 */

src/utils/common.ts

@@ -172,3 +172,39 @@ export const isDom = <T extends HTMLElement>(val: any): val is T => {
     ? val instanceof HTMLElement
     : val && typeof val === 'object' && val.nodeType === 1 && typeof val.nodeName === 'string'
 }
+
+/**
+ * @param { Number } time
+ * @return { Object }
+ */
+
+export const timeFormat = (time: number) => {
+  if (!time) {
+    return ''
+  }
+  const DAY = 24 * 60 * 60 * 1000
+  const HOUR = 60 * 60 * 100
+  const MINUTE = 60 * 1000
+  const SECOND = 1000
+
+  const timeObject: Record<string, number> = {
+    d: (time / DAY) | 0,
+    h: ((time % DAY) / HOUR) | 0,
+    m: ((time % HOUR) / MINUTE) | 0,
+    s: ((time % MINUTE) / SECOND) | 0,
+  }
+
+  const unitMap: Record<keyof typeof timeObject, string> = {
+    d: '天',
+    h: '时',
+    m: '分',
+    s: '秒',
+  }
+
+  return Object.entries(unitMap).reduce((format, [key, unit]) => {
+    if (timeObject[key] || format) {
+      format += `${timeObject[key]} ${unit}`
+    }
+    return format
+  }, '')
+}

types/api.d.ts

@@ -570,8 +570,6 @@ declare module 'api-type' {
 
     type GetMarkScoreHistoryListWithTask = BaseDefine<{ taskId: number | string }, MarkScoreHistory[]>
 
-    type GetMarkScoreHistoryListWithSecret = BaseDefine<{ secretNumber: number | string }, MarkScoreHistory[]>
-
     type RejectMarkHistory = BaseDefine<{ description: string; id: number; reason: string }>
 
     interface ArbitrationListItem {
@@ -725,8 +723,6 @@ declare module 'api-type' {
       markProblemPaper: MarkProblemPaper
       /** 通过taskId 查询给分记录 */
       getMarkScoreHistoryListWithTask: GetMarkScoreHistoryListWithTask
-      /** 通过secretNumber 查询给分记录 */
-      getMarkScoreHistoryListWithSecret: GetMarkScoreHistoryListWithSecret
       /** 打回 */
       rejectMarkHistory: RejectMarkHistory
       /** 仲裁卷列表 */