刘洋 преди 8 месеца
родител
ревизия
65250374a4

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
   "main": "dist/main.js",
   "dependencies": {
     "@ant-design/icons-vue": "^7.0.1",
-    "@qmth/ui": "^1.0.18",
+    "@qmth/ui": "^1.0.21",
     "@vueuse/core": "^10.11.0",
     "axios": "^1.5.0",
     "core-js": "^3.32.2",

+ 0 - 4
src/render/App.vue

@@ -19,10 +19,6 @@ userStore.initHeatBeat();
 if (userStore.userInfo) {
   userStore.startHeatBeat();
 }
-document.addEventListener("keydown", (e: any) => {
-  console.log(e.code + "...........", e.keyCode);
-  console.log("e", e);
-});
 </script>
 <style lang="less">
 .app-in {

+ 21 - 2
src/render/views/DataCheck/ModifyPaperType.vue

@@ -10,7 +10,15 @@
 
     <a-form ref="formRef" :label-col="{ style: { width: '90px' } }">
       <a-form-item label="识别结果">
-        <span class="color-brand">{{ areaResult || "#" }}</span>
+        <a-input
+          v-if="editing"
+          v-model:value="paperType"
+          style="width: 100px"
+        />
+        <span v-else class="color-brand">{{ areaResult || "#" }}</span>
+        <qm-button class="ml-15px" @click="toggleEditing">{{
+          editing ? "取消" : "编辑"
+        }}</qm-button>
       </a-form-item>
       <a-form-item label="识别图片">
         <div class="paper-type-img">
@@ -51,6 +59,7 @@ defineOptions({
   name: "ModifyPaperType",
 });
 
+const editing = ref(false);
 /* modal */
 const { visible, open, close } = useModal();
 defineExpose({ open, close });
@@ -74,13 +83,23 @@ async function getConfig() {
 function selectPaperType(val: string) {
   paperType.value = val;
 }
-
+let oldPaperType: string = "";
+const toggleEditing = () => {
+  if (!editing.value) {
+    oldPaperType = paperType.value;
+  } else {
+    paperType.value = oldPaperType;
+  }
+  editing.value = !editing.value;
+};
 function confirm() {
   if (!paperType.value) {
     message.error("请选择卷型");
     return;
   }
   emit("confirm", paperType.value);
+  editing.value = false;
+  oldPaperType = "";
   close();
 }
 

+ 6 - 2
src/render/views/DataCheck/QuestionPanel.vue

@@ -230,10 +230,14 @@ async function onEditPaperType() {
   }
   modifyPaperTypeRef.value?.open();
 }
-
+const curPage = computed(() => dataCheckStore.curPage);
 async function paperTypeModified(paperType: string) {
   if (!dataCheckStore.curPage) return;
-
+  dataCheckStore.modifyPaperType({
+    paperIndex: curPage.value?.paperIndex as number,
+    pageIndex: curPage.value?.pageIndex as number,
+    paperType,
+  });
   await dataCheckStore.updateField({
     field: "PAPER_TYPE",
     value: JSON.stringify({

+ 1 - 4
src/render/views/DataCheck/ScanImage/index.vue

@@ -170,10 +170,7 @@ function initImageSize() {
     },
     rotate: 0,
   });
-  console.log(
-    "getTemporaryImgViewConfig(route.path)",
-    getTemporaryImgViewConfig(route.path)
-  );
+
   imageSize.value =
     getTemporaryImgViewConfig(route.path) ||
     objAssign(imageSize.value, imgSize);

+ 3 - 3
src/render/views/Login/AdminLogin.vue

@@ -29,9 +29,9 @@ const userStore = useUserStore();
 const loginForm = ref();
 const emit = defineEmits(["toIndex"]);
 const params = reactive({ loginName: "", password: "" });
-if (process.env?.VITE_USER_NAME) {
-  params.loginName = process.env.VITE_USER_NAME;
-  params.password = process.env.VITE_PASSWORD;
+if (process.env?.VITE_USER_NAME && import.meta.env?.MODE==='development') {
+  params.loginName = process.env.VITE_USER_NAME || "";
+  params.password = process.env.VITE_PASSWORD || "";
 }
 const router = useRouter();
 const rules = {

+ 1 - 2
src/render/views/ScanManage/StuInfo.vue

@@ -85,8 +85,7 @@ const fields = computed(() => {
       colSpan: 3,
       label: "考点",
       attrs: {
-        // options: examSiteOptions.value || [],
-        options: [{ code: 1, name: "啊好的所发生的发生的发撒代发阿斯蒂芬" }],
+        options: examSiteOptions.value || [],
         fieldNames: { label: "name", value: "code" },
         allowClear: true,
       },