bug fix

server.config.ts

@@ -4,8 +4,8 @@ const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
       // target: 'http://192.168.10.41:8200',
-      target: 'http://192.168.10.107:8200',
-      // target: 'http://cet-test.markingtool.cn',
+      // target: 'http://192.168.10.107:8200',
+      target: 'http://cet-test.markingtool.cn',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

src/api/system.ts

@@ -37,11 +37,12 @@ const SystemApi: DefineApiModule<System.ApiMap> = {
   /** CET成绩列表 */
   getCetScoreList: '/api/student/page',
   /** CET成绩导出接口 */
-  exportCetScoreList: {
-    url: '/api/student/export',
-    download: true,
-    timeout: 0,
-  },
+  exportCetScoreList: '/api/student/export',
+  // exportCetScoreList: {
+  //   url: '/api/student/export',
+  //   download: true,
+  //   timeout: 0,
+  // },
   /**删除单条导入导出的记录 */
   removeImportOrExport: '/api/operate/task/remove',
   /** 导入导出记录 */

src/components/shared/ScoringPanelWithConfirm.vue

@@ -98,6 +98,7 @@ const onCancelSubmit = () => {
 /** 确认提交 */
 const onConfirmSubmit = () => {
   if (!questionInfo.value) return
+  modalVisible.value = true
   submitModalVisible.value = false
   emit('submit', { question: questionInfo.value, scores: modelScore.value, totalScore: totalScore.value })
 }

src/hooks/useFetch.ts

@@ -66,6 +66,7 @@ function useFetch<K extends ApiKeys>(k: K, ...args: any[]) {
 
       option.data = { ...option.data, ...((useData && data) || {}) }
       option.params = { ...option.params, ...((!useData && data) || {}) }
+      console.log('oooooo', option)
 
       result.value = await request[method](option.url, useData ? option.data : option, option)
       return result.value

src/hooks/useMarkHeader.ts

@@ -13,7 +13,7 @@ const useMarkHeader = () => {
     rotate: 0,
     scale: 1,
     center: false,
-    frontColor: '#fff',
+    frontColor: 'transparent',
     backgroundColor: '#fff',
   })
 

src/hooks/useTable.ts

@@ -37,10 +37,10 @@ export type ModelType<T extends ApiKeys> = Omit<ExtractApiParams<T>, keyof BaseM
 export type MultipleResponseType<T extends ApiKeys> = ExtractMultipleApiResponse<T>
 export type ResponseType<T extends ApiKeys> = ExtractApiResponse<T>
 
-const DEFAULT_PARAMS: BaseMultiplePageQuery = {
-  pageNumber: 1,
-  pageSize: 10,
-}
+// const DEFAULT_PARAMS: BaseMultiplePageQuery = {
+//   pageNumber: 1,
+//   pageSize: 10,
+// }
 
 const DEFAULT_PAGINATION: Partial<PaginationProps> = {
   layout: 'prev,pager,next',
@@ -61,7 +61,11 @@ const useTable = <
   httpConfig: P[1] = 'post'
 ): ReturnTable<T, D> => {
   const tableRef = ref<InstanceTable>()
-
+  const DEFAULT_PARAMS: BaseMultiplePageQuery = {
+    pageNumber: 1,
+    pageSize: 10,
+  }
+  const modelChange = ref(false)
   const elTableRef = computed(() => {
     return tableRef?.value?.tableRef
   })
@@ -80,11 +84,19 @@ const useTable = <
     },
     set(n: number) {
       baseParams.pageNumber = n
+      fetchTable()
     },
   })
-  watch(currentPage, (val) => {
-    fetchTable()
-  })
+  // watch(currentPage, (val) => {
+  //   fetchTable()
+  // })
+  watch(
+    () => additional,
+    () => {
+      modelChange.value = true
+    },
+    { deep: true }
+  )
   const payload = computed(() => {
     return Object.assign({}, multipleType ? baseParams : {}, additional || {}) as ExtractApiParams<T>
   })
@@ -93,7 +105,11 @@ const useTable = <
 
   const fetchTable = () => {
     cancel()
+    if (modelChange.value) {
+      baseParams.pageNumber = 1
+    }
     fetch(payload.value)
+    modelChange.value = false
   }
 
   const pageCount = computed(() => {

src/modules/admin-data/export/index.vue

@@ -26,7 +26,7 @@
 <script setup lang="ts" name="DataExport">
 /** CET成绩导出 */
 import { reactive, watch, computed } from 'vue'
-import { ElButton, ElPagination } from 'element-plus'
+import { ElButton, ElPagination, ElMessage } from 'element-plus'
 import BaseForm from '@/components/element/BaseForm.vue'
 import BaseTable from '@/components/element/BaseTable.vue'
 import useForm from '@/hooks/useForm'
@@ -101,7 +101,10 @@ const onExport = async () => {
   try {
     const valid = await elFormRef?.value?.validate()
     if (valid) {
-      exportCetScoreList(model)
+      try {
+        await exportCetScoreList(model)
+        ElMessage.success('操作成功，后台导出中，您可以稍后去“任务信息报告”页面进行查询')
+      } catch (err) {}
     }
   } catch (error) {
     console.error(error)

src/modules/admin-data/imformation-report/index.vue

@@ -21,7 +21,7 @@
               @confirm="handleDeleteRecord(row)"
             >
               <template #reference>
-                <el-link style="margin-left: 15px" link type="primary">删除</el-link>
+                <el-link :style="{ marginLeft: !!row.filePath ? '15px' : '0' }" link type="primary">删除</el-link>
               </template>
             </el-popconfirm>
           </template>

src/modules/marking/mark/index.vue

@@ -23,7 +23,12 @@
           <svg-icon name="preview"></svg-icon>
         </span>
         <div :class="{ 'text-center': center }">
-          <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
+          <img
+            :src="frontColor === 'transparent' ? currentTask?.url : dataUrl"
+            alt=""
+            class="paper-img"
+            :style="{ 'background-color': frontColor }"
+          />
         </div>
       </div>
     </div>