刘洋 8 mēneši atpakaļ
vecāks
revīzija
7675b9aae7

+ 1 - 1
src/render/components/SelectSubject/index.vue

@@ -20,7 +20,7 @@ import { getSubjectList } from "@/ap/system";
 const props = withDefaults(
   defineProps<{
     examId: any;
-    modelValue: string;
+    modelValue: string | number;
     placeholder?: string;
   }>(),
   {

+ 2 - 1
src/render/styles/pages.less

@@ -785,7 +785,8 @@
   .remain-time {
     margin-right: 16px;
     color: @error-color;
-    min-width: 30px;
+    // min-width: 30px;
+    width: 80px;
     display: inline-block;
   }
   .audit-body {

+ 5 - 4
src/render/views/Audit/ImageCheck/index.vue

@@ -115,11 +115,13 @@ const loopImageStoped = ref(false);
 const remainTime = ref(0);
 const { start: startLoopRemainTime, stop: stopLoopRemainTime } = useLoop(
   updateRemainTime,
-  1000
+  100
 );
 
 function updateRemainTime() {
-  remainTime.value--;
+  // remainTime.value--;
+  remainTime.value =
+    remainTime.value - 0.1 < 0 ? 0 : (remainTime.value * 1000 - 100) / 1000;
 
   if (remainTime.value <= 0) {
     stopLoopRemainTime();
@@ -201,11 +203,10 @@ function setCurImage(index: number) {
   curImageIndex.value = index;
   curImage.value = imageList.value[curImageIndex.value];
   stopLoopRemainTime();
-
   remainTime.value = imageCheckLoopTime.value;
   if (!loopImageStoped.value) {
     // 开启loop时会调用一次action,所这里提前加1
-    remainTime.value++;
+    // remainTime.value++;
     startLoopRemainTime();
   }
 }

+ 1 - 0
src/render/views/Audit/Main/index.vue

@@ -93,6 +93,7 @@
                 :min="0"
                 :max="999"
                 :controls="false"
+                :precision="1"
               ></a-input-number>
               <span>秒/张</span>
               <a-button type="primary" @click="onSetLoopTime">设置</a-button>

+ 17 - 2
src/render/views/ResultExport/BreachImport.vue

@@ -31,7 +31,21 @@
     download-btn-title="违纪导入模版"
     :download-handle="downloadHandle"
     @upload-success="uploadSuccessHandle"
-  />
+  >
+    <a-form-item
+      label="科目"
+      :label-col="{ style: { width: '80px' } }"
+      label-align="left"
+    >
+      <SelectSubject
+        v-model="uploadData.subjectCode"
+        :exam-id="userStore.curExam?.id"
+      ></SelectSubject>
+      <template #help v-if="showTip">
+        <p class="tips-info tips-error">请选择科目</p>
+      </template>
+    </a-form-item>
+  </ImportDialog>
 
   <!-- TaskProgressDialog -->
   <TaskProgressDialog ref="taskProgressDialogRef" :task="curExportTask" />
@@ -42,6 +56,7 @@ import { ref, onMounted } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import type { TableProps } from "ant-design-vue";
 import { message } from "ant-design-vue";
+import SelectSubject from "@/components/SelectSubject/index.vue";
 
 import { BreachListItem } from "@/ap/types/resultExport";
 import { breachList, breachTemplateDownload } from "@/ap/resultExport";
@@ -54,7 +69,7 @@ defineOptions({
   name: "BreachImport",
 });
 const userStore = useUserStore();
-
+const showTip = ref(false);
 const loading = ref(false);
 const dataList = ref<BreachListItem[]>([]);