zhangjie 8 luni în urmă
părinte
comite
2b461f8ba1

+ 4 - 4
src/render/ap/types/resultExport.ts

@@ -20,8 +20,8 @@ export interface MarkSiteListItem {
   subjectCode: string;
   subjectName: string;
   paperType: string;
-  oddNumber: number;
-  evenNumber: number;
+  oddNumber: string;
+  evenNumber: string;
 }
 
 export type MarkSiteListPageResult = PageResult<MarkSiteListItem>;
@@ -31,8 +31,8 @@ export interface MarkSiteSaveParams {
   examId: number;
   subjectCode: string;
   paperType: string;
-  oddNumber: number;
-  evenNumber: number;
+  oddNumber: string;
+  evenNumber: string;
 }
 
 export interface MarkSiteSetParams {

+ 1 - 0
src/render/components.d.ts

@@ -36,6 +36,7 @@ declare module 'vue' {
     ATabs: typeof import('@qmth/ui')['Tabs']
     ATag: typeof import('@qmth/ui')['Tag']
     ATextarea: typeof import('@qmth/ui')['Textarea']
+    ATooltip: typeof import('@qmth/ui')['Tooltip']
     AUpload: typeof import('@qmth/ui')['Upload']
     QmButton: typeof import('@qmth/ui')['QmButton']
     QmConfigProvider: typeof import('@qmth/ui')['QmConfigProvider']

+ 7 - 0
src/render/views/DataCheck/QuestionPanel.vue

@@ -51,11 +51,18 @@
       >
         <span>{{ getQuestionNo(index) }}:</span>
         <a-button
+          v-if="editable || item.length <= 1"
           :class="['ant-gray', { 'is-active': curQuestionIndex === index }]"
           :disabled="!editable"
           @click="onEditQuestion(index)"
           >{{ getQuesionCont(item) }}</a-button
         >
+        <a-tooltip v-else placement="top">
+          <template #title>
+            <span>{{ item.split("").join(",") }}</span>
+          </template>
+          <a-button disabled>{{ getQuesionCont(item) }}</a-button>
+        </a-tooltip>
       </div>
 
       <div

+ 8 - 12
src/render/views/ResultExport/ModifyMarkSite.vue

@@ -27,21 +27,17 @@
         ></a-input>
       </a-form-item>
       <a-form-item name="oddNumber" label="奇数考场评卷点代码">
-        <a-input-number
+        <a-input
           v-model:value="formData.oddNumber"
-          :min="1"
-          :max="10"
-          :precision="0"
-          :controls="false"
+          :maxlength="30"
+          placeholder="请输入"
         />
       </a-form-item>
       <a-form-item name="evenNumber" label="偶数考场评卷点代码">
-        <a-input-number
+        <a-input
           v-model:value="formData.evenNumber"
-          :min="1"
-          :max="10"
-          :precision="0"
-          :controls="false"
+          :maxlength="30"
+          placeholder="请输入"
         />
       </a-form-item>
     </a-form>
@@ -80,8 +76,8 @@ const defaultFormData = {
   examId: userStore.curExam.id as number,
   subjectCode: "",
   paperType: "",
-  oddNumber: 0,
-  evenNumber: 0,
+  oddNumber: "",
+  evenNumber: "",
 };
 
 const isEdit = computed(() => !!props.rowData.id);

+ 1 - 1
src/render/views/ScanManage/ImageView.vue

@@ -212,7 +212,7 @@ const fieldNames = computed(() => {
     level1: { label: "subjectName", value: "subjectCode" },
     level2: { label: "deviceName", value: "device" },
     level3: { label: "batchId", value: "batchId" },
-    level4: { label: "studentName", value: "studentId" },
+    level4: { label: "examNumber", value: "studentId" },
   };
   return obj[listType.value];
 });