feat: 接口调试

card/components/CardView.vue

@@ -125,7 +125,10 @@ export default {
   },
   methods: {
     getPreviewTemp(htmlContent) {
-      return previewTemp(htmlContent);
+      const { fontName } = this.$ls.get("user", {
+        fontResult: {},
+      }).fontResult;
+      return previewTemp(htmlContent, fontName);
     },
   },
 };

card/modules/free/components/CardFreeView.vue

@@ -116,7 +116,10 @@ export default {
       return getPageModel(cardData);
     },
     getPreviewTemp(htmlContent) {
-      return previewTemp(htmlContent);
+      const { fontName } = this.$ls.get("user", {
+        fontResult: {},
+      }).fontResult;
+      return previewTemp(htmlContent, fontName);
     },
   },
 };

src/modules/admin/api.js

@@ -189,11 +189,11 @@ export const schoolSetFontInfo = (schoolId) => {
 };
 export const schoolSetFontUpdate = (datas) => {
   // schoolId,attachmentId
-  return $postParam("/api/admin/set/font/save", datas);
+  return $postParam("/api/admin/set/font/update", datas);
 };
 export const schoolSetFontAdd = (datas) => {
   // schoolId,attachmentId
-  return $postParam("/api/admin/set/font/update", datas);
+  return $postParam("/api/admin/set/font/save", datas);
 };
 export const schoolSetFontDelete = (datas) => {
   // schoolId,attachmentId
@@ -247,5 +247,5 @@ export const versionSave = (datas) => {
   return $post("/api/admin/version/save", datas);
 };
 export const versionDelete = (id) => {
-  return $post("/api/admin/version/delete", { id });
+  return $postParam("/api/admin/version/delete", { id });
 };

src/modules/admin/components/ModifyVersion.vue

@@ -46,6 +46,7 @@
 import { versionSave } from "@/modules/admin/api";
 
 const initModalForm = {
+  id: "",
   clientVersion: "",
   softVersion: "",
 };

src/modules/admin/components/school/SchoolSetFont.vue

@@ -35,7 +35,13 @@
           label="名称"
           min-width="200"
         ></el-table-column>
-        <el-table-column prop="format" label="格式"></el-table-column>
+        <el-table-column prop="format" label="格式">
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.format === "null" ? "" : scope.row.format
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="choose" label="是否选中" width="100">
           <template slot-scope="scope">
             <i
@@ -50,11 +56,11 @@
           fixed="right"
           width="120"
         >
-          <template slot-scope="scope" v-if="scope.row.attachmentId !== -1">
+          <template slot-scope="scope" v-if="scope.row.attachmentId !== '-1'">
             <el-button
-              v-if="!scope.row.choose"
               class="btn-primary"
               type="text"
+              :disabled="scope.row.choose"
               @click="toSelect(scope.row)"
               >选中</el-button
             >
@@ -108,7 +114,7 @@ export default {
         ],
       },
       // upload
-      format: ["ttf", "ttc"],
+      format: ["ttf", "woff", "otf", "eot"],
       uploadUrl: "/api/admin/common/file/upload",
       uploadData: {
         type: "UPLOAD",
@@ -128,14 +134,17 @@ export default {
     },
     validError(errorData) {
       this.$message.error(errorData.message);
+      this.$refs.modalFormComp.validateField("attachmentId");
     },
     async uploadSuccess(data) {
       this.modalForm.attachmentId = data.id;
+      this.$refs.modalFormComp.validateField("attachmentId");
 
       if (this.loading) return;
       this.loading = true;
       const res = await schoolSetFontAdd(this.modalForm).catch(() => {});
       this.loading = false;
+      this.$refs.UploadFileView.setAttachmentName("");
       if (!res) return;
 
       this.$message.success("上传字体成功！");
@@ -158,7 +167,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).catch(() => {});
-      if (!confirm !== "confirm") return;
+      if (confirm !== "confirm") return;
 
       if (this.loading) return;
       this.loading = true;

src/modules/admin/components/school/SchoolSetRecognition.vue

@@ -1,12 +1,12 @@
 <template>
-  <div>
+  <div class="school-set-recognition part-box part-box-pad">
     <el-form
       ref="modalFormComp"
       :model="modalForm"
       :rules="rules"
-      label-width="120px"
+      label-width="160px"
     >
-      <el-form-item label="扩展算法" prop="extendAlgorithm">
+      <el-form-item label="扩展算法：" prop="extendAlgorithm">
         <el-radio-group v-model="modalForm.extendAlgorithm">
           <el-radio
             v-for="item in OPEN_STATUS"
@@ -24,7 +24,7 @@
           <el-radio :key="2" :label="2">识别全部答题卡</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="客观题检查扩展条件">
+      <el-form-item label="客观题检查扩展条件：">
         <el-checkbox v-model="modalForm.avoidSingleChoice">
           单选题有且仅有一个识别答案不进客观题检查
         </el-checkbox>

src/modules/admin/views/VersionManage.vue

@@ -51,7 +51,11 @@
       </div>
     </div>
 
-    <modify-version ref="modifyVersion"></modify-version>
+    <modify-version
+      ref="ModifyVersion"
+      :instance="curRow"
+      @modified="getList"
+    ></modify-version>
   </div>
 </template>
 
@@ -92,11 +96,11 @@ export default {
     },
     addVersion() {
       this.curRow = {};
-      this.$refs.modifyVersion.open();
+      this.$refs.ModifyVersion.open();
     },
     toEdit(row) {
       this.curRow = row;
-      this.$refs.modifyVersion.open();
+      this.$refs.ModifyVersion.open();
     },
     toDelete(row) {
       this.$confirm("确定删除该版本吗？", "提示", {

src/modules/login/fontMixins.js

@@ -0,0 +1,23 @@
+export default {
+  methods: {
+    setSchoolFont() {
+      const { fontName } = this.$ls.get("user", {
+        fontResult: {},
+      }).fontResult;
+
+      const defaultFonts = '"宋体","宋体-简",Arial,sans-serif';
+      const ff = fontName ? `${fontName},${defaultFonts}` : defaultFonts;
+      const fontStyleCont = `.page-box{font-family:${ff}}`;
+
+      const fontStyle = document.querySelector('style[class="fontStyle"]');
+      if (fontStyle) {
+        fontStyle.innerHTML = fontStyleCont;
+      } else {
+        const style = document.createElement("style");
+        style.innerHTML = fontStyleCont;
+        style.setAttribute("class", "fontStyle");
+        document.head.appendChild(style);
+      }
+    },
+  },
+};

src/modules/login/views/Login.vue

@@ -133,11 +133,12 @@ import { MD5 } from "@/plugins/md5";
 import ResetPwd from "@/modules/base/components/ResetPwd.vue";
 import { getOrgCode } from "@/constants/app";
 import fetchSmsMixins from "../fetchSmsMixins";
+import fontMixins from "../fontMixins";
 
 export default {
   name: "login",
   components: { ResetPwd },
-  mixins: [fetchSmsMixins],
+  mixins: [fetchSmsMixins, fontMixins],
   data() {
     return {
       nameWaitTime: "login",
@@ -319,6 +320,7 @@ export default {
           name: "SelectSchool",
         });
       } else {
+        this.setSchoolFont();
         this.$router.push({
           name: "HomePage",
         });

src/modules/mark/components/markDetail/MarkDetailArbitration.vue

@@ -200,9 +200,6 @@ export default {
     toDone(row) {
       this.toMarkArbitrate({
         arbitrateId: row.id,
-        // examId: row.examId,
-        // paperNumber: row.paperNumber,
-        // questionId: row.questionId,
       });
     },
     toBatchDone() {
@@ -220,7 +217,6 @@ export default {
       this.toMarkArbitrate({
         examId: this.baseInfo.examId,
         paperNumber: this.baseInfo.paperNumber,
-        questionId: this.selectQuestionId,
       });
     },
   },

src/modules/mark/components/markParam/ModifyMarkType.vue

@@ -80,7 +80,7 @@ import { mapState } from "vuex";
 
 const initModalForm = {
   doubleEnable: false,
-  doubleRate: null,
+  doubleRate: 100,
   arbitrateThreshold: null,
   scorePolicy: "AVG",
 };