bug fix

src/modules/analysis/marking-progress/components/TotalProgress.vue

@@ -138,14 +138,15 @@ const totalColumns: EpTableColumn<TotalProgress>[] = [
   },
   {
     // label: '预计耗时(分)',
-    label: '小时',
+    label: '耗时',
     align: 'center',
-    minWidth: 120,
-    formatter(row) {
-      // return `${parseFloat((row.takeTime / 60 / 60).toFixed(2))}`
-      return `${parseFloat((row.takeTime / 60 / 60).toFixed(5))}`
-    },
-    sortable: true,
+    minWidth: 50,
+    prop: 'takeTime',
+    // formatter(row) {
+    //   // return `${parseFloat((row.takeTime / 60 / 60).toFixed(2))}`
+    //   return `${parseFloat((row.takeTime / 60 / 60).toFixed(5))}`
+    // },
+    // sortable: true,
   },
 ]
 

src/modules/analysis/personnel-statistics/components/StatisticsGroup.vue

@@ -108,11 +108,12 @@ const columns: EpTableColumn<ExtractArrayValue<ExtractApiResponse<'getStatistics
 })
 
 const data = computed(() => {
-  const arr = props.data?.map((v) => ({ ...v })) || []
-  const totalIndex = arr.findIndex((v) => !v.markingGroupNumber)
+  const arr = JSON.parse(JSON.stringify(props.data || []))?.map((v: any) => ({ ...v })) || []
+  const totalIndex = arr.findIndex((v: any) => !v.markingGroupNumber)
   if (totalIndex >= 0) {
     const [total] = arr.splice(totalIndex, 1)
-    total && arr.push(total)
+    // total && arr.push(total)
+    total && arr.unshift(total)
   }
   return arr
 })
@@ -120,21 +121,26 @@ const data = computed(() => {
 const { tableRef, tableData, current, onCurrentChange, elTableRef } = useTableCheck(data, false)
 const sortTableData = ref<any[]>([])
 const originalTableData = ref<any[]>([])
+function initSortTableData() {
+  if (tableData.value) {
+    sortTableData.value = JSON.parse(JSON.stringify(tableData.value))
+    originalTableData.value = JSON.parse(JSON.stringify(tableData.value))
+  }
+}
+initSortTableData()
 watch(tableData, () => {
   if (tableData.value) {
-    let data: any[] = tableData.value || []
-    if (data.length && data[data.length - 1].markingGroupNumber === 0) {
-      let last = data.splice(data.length - 1, 1)[0]
-      data.unshift(last)
-    }
-    sortTableData.value = JSON.parse(JSON.stringify(data))
-    originalTableData.value = JSON.parse(JSON.stringify(data))
+    // let data: any[] = JSON.parse(JSON.stringify(tableData.value)) || []
+    // if (data.length && data[data.length - 1].markingGroupNumber === 0) {
+    //   let last = data.splice(data.length - 1, 1)[0]
+    //   data.unshift(last)
+    // }
+    sortTableData.value = JSON.parse(JSON.stringify(tableData.value))
+    originalTableData.value = JSON.parse(JSON.stringify(tableData.value))
   }
 })
 const sortChange = (params: any) => {
   const { column, prop, order } = params
-  console.log('order:', order)
-  console.log('prop:', prop)
   if (order === 'ascending') {
     sortTableData.value.sort((a: any, b: any) => {
       if (a.markingGroupNumber == 0) {

src/modules/analysis/personnel-statistics/components/StatisticsPersonnel.vue

@@ -208,7 +208,7 @@ function forceAssessment(data: ExtractArrayValue<ExtractApiResponse<'getStatisti
   })
 }
 const data = computed(() => {
-  return props.data || []
+  return JSON.parse(JSON.stringify(props.data || [])) || []
 })
 
 const { tableRef, tableData, current, onCurrentChange, onDbClick, currentView, elTableRef } = useTableCheck(data, false)
@@ -216,8 +216,6 @@ const sortTableData = ref<any[]>([])
 const originalTableData = ref<any[]>([])
 const sortChange = (params: any) => {
   const { column, prop, order } = params
-  console.log('order:', order)
-  console.log('prop:', prop)
   if (order === 'ascending') {
     sortTableData.value.sort((a: any, b: any) => {
       if (a.markingGroupNumber == 0) {
@@ -256,7 +254,7 @@ const sortChange = (params: any) => {
 }
 function initSortTableData() {
   if (tableData.value) {
-    let data: any[] = tableData.value || []
+    let data: any[] = JSON.parse(JSON.stringify(tableData.value)) || []
     if (data.length && data[data.length - 1].markingGroupNumber === 0) {
       let last = data.splice(data.length - 1, 1)[0]
       data.unshift(last)
@@ -268,6 +266,7 @@ function initSortTableData() {
 initSortTableData()
 watch(tableData, () => {
   popovers.value = {}
+  initSortTableData()
 })
 
 watch(currentView, () => {

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

@@ -75,7 +75,7 @@
   <mark-history-list
     :id="currentViewHistory?.taskId"
     v-model="visibleHistory"
-    :taks="currentViewHistory"
+    :task="currentViewHistory"
   ></mark-history-list>
 </template>
 

src/modules/marking/mark/index.vue

@@ -231,13 +231,13 @@ const refreshTaskPool = (force = false, isRefresh = false) => {
  * @param isRefresh 是否有插队任务
  */
 const getNextTask = (force = false, isRefresh = false) => {
-  if (isRefresh) {
-    if (currentTaskPool.length && !!currentTaskPool[0].markerId) {
-      setCurrentTask()
-    }
-  } else {
-    setCurrentTask()
-  }
+  // if (isRefresh) {
+  //   if (currentTaskPool.length && !!currentTaskPool[0].markerId) {
+  //     setCurrentTask()
+  //   }
+  // } else {
+  setCurrentTask()
+  // }
 
   refreshTaskPool(force, isRefresh)
 }
@@ -372,11 +372,11 @@ const checkMarkStatus = async (): Promise<boolean> => {
   const { markDayCount, markTotalCount } = myUserInfo
   let res: any = await getMarkStatus()
   if (!!markTotalCount && res.personCount >= markTotalCount) {
-    ElMessage.success(`任务量${res.personCount}已完成`)
+    ElMessage.success(`任务量${markTotalCount}已完成`)
     clearTaskView()
     return false
   } else if (!!markDayCount && res.personDayCount >= markDayCount) {
-    ElMessage.success(`您当天的任务量${res.personDayCount}已完成`)
+    ElMessage.success(`您当天的任务量${markDayCount}已完成`)
     clearTaskView()
     return false
   } else {

src/modules/marking/training-record/index.vue

@@ -14,7 +14,7 @@
         <right-button class="next-button" @click="checkNext" />
         <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>
+          <p v-if="current" class="absolute mark-score">{{ current?.markScore }}</p>
         </div>
       </div>
       <div class="p-base radius-base fill-blank scroll-auto m-l-base table-view">