登录的服务器ip还原成以前的从config.json读取，研究生第一张图片增加是否显示小题分的配置

config.json

@@ -28,16 +28,12 @@
             "host": "https://www.markingcloud.com"
         },
         {
-            "name": "线下环境",
-            "host": "http://192.168.10.224:80"
+            "name": "线下环境-224",
+            "host": "http://192.168.10.224"
         },
         {
-            "name": "线下环境-yt",
+            "name": "线下环境-225",
             "host": "http://192.168.10.225:8000"
-        },
-        {
-            "name": "线下环境-221",
-            "host": "http://192.168.10.221:80"
         }
     ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stmmsproxy",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "private": true,
   "scripts": {
     "start": "vue-cli-service serve",
@@ -67,4 +67,4 @@
     "typescript": "~4.1.5",
     "vue-cli-plugin-electron-builder": "~2.1.1"
   }
-}
+}

public/styles/style.css

@@ -357,7 +357,7 @@ input::placeholder{
 	padding: 80px;
 }
 .picture th {
-	width: 120px;
+	width: 130px;
 	font-size: 16px;
 	font-weight: 400;
 	color: #647A92;

src/features/Image/Image.vue

@@ -88,6 +88,17 @@
             </div>
           </td>
         </tr>
+        <tr>
+          <th>显示分组小题分：</th>
+          <td>
+            <div class="input-radio">
+              <a-radio-group name="radioGroup" v-model:value="showSubScore">
+                <a-radio :value="true">是</a-radio>
+                <a-radio :value="false">否</a-radio>
+              </a-radio-group>
+            </div>
+          </td>
+        </tr>
         <tr id="track-mode-select">
           <th>水印模式：</th>
           <td>
@@ -202,6 +213,7 @@ let pdf = ref("1");
 let append = ref(false);
 let failover = ref(true);
 let watermark = ref(true);
+let showSubScore = ref(false);
 let trackMode = ref("");
 let examNumber = ref("");
 let subjectCode = ref("");
@@ -217,6 +229,7 @@ if (config) {
   append.value = config.append;
   failover.value = config.failover;
   watermark.value = config.watermark;
+  showSubScore.value = config.showSubScore;
   trackMode.value = config.trackMode;
   examNumber.value = config.examNumber || "";
   subjectCode.value = config.subjectCode || "";
@@ -285,6 +298,7 @@ const start = (e: MouseEvent) => {
     append: append.value,
     failover: failover.value,
     watermark: watermark.value,
+    showSubScore: showSubScore.value,
     trackMode: trackMode.value,
     examNumber: examNumber.value.trim(),
     subjectCode: subjectCode.value.trim(),
@@ -297,6 +311,7 @@ const start = (e: MouseEvent) => {
 watch(type, () => {
   if (type.value === "2") {
     watermark.value = false;
+    showSubScore.value = false;
     trackMode.value = "";
     x.value = 0;
     y.value = 0;

src/features/Login/Login.vue

@@ -4,13 +4,20 @@
       <div class="logo"><img src="img/logo_blue.png" /></div>
       <a-form @submit="loginAction">
         <div class="form-item">
-          <a-select
+          <!-- <a-select
             style="width: 100%; text-align: left; padding: 0"
             mode="SECRET_COMBOBOX_MODE_DO_NOT_USE"
             v-model:value="server"
             :options="servers"
             placeholder="请选择服务地址(如 http://192.168.10.225:8000)"
           >
+          </a-select> -->
+          <a-select
+            style="width: 100%; text-align: left"
+            v-model:value="server"
+            :options="servers"
+            placeholder="请选择服务地址"
+          >
           </a-select>
         </div>
         <div class="form-item">
@@ -55,12 +62,12 @@ const router = useRouter();
 store.pageInputs = {} as Store["pageInputs"];
 
 let server = ref("");
-// const servers = store.config.servers.map((v) => {
-//   return { label: v.name, value: v.host };
-// });
-const servers = ref([
-  { label: "线上环境", value: "https://www.markingcloud.com" },
-]);
+const servers = store.config.servers.map((v) => {
+  return { label: v.name, value: v.host };
+});
+// const servers = ref([
+//   { label: "线上环境", value: "https://www.markingcloud.com" },
+// ]);
 
 let loginName = ref("");
 let password = ref("");
@@ -79,17 +86,47 @@ let password = ref("");
 // loginName.value = "admin-test";
 // password.value = "123456";
 
+// const loginAction = () => {
+//   if (!server.value.startsWith("http")) {
+//     server.value = `http://${server.value}`;
+//   }
+//   let curServer = servers.value.find((v: any) => v.host === server.value) || {
+//     host: server.value,
+//     name: "自定义环境",
+//   };
+//   Object.assign(store.env, {
+//     server:
+//       servers.value.find((v: any) => v.host === server.value) || curServer,
+//     loginName: loginName.value,
+//     password: password.value,
+//   });
+//   if (!server.value) {
+//     message.info("请选择服务地址");
+//     return;
+//   }
+//   if (!loginName.value) {
+//     message.info("请输入账号");
+//     return;
+//   }
+//   if (!password.value) {
+//     message.info("请输入密码");
+//     return;
+//   }
+//   login()
+//     .then((res) => {
+//       Object.assign(store.env.user, res.data);
+//       router.push("/exam-list");
+//     })
+//     .catch((err) => {
+//       if (!err.toString().includes("404")) {
+//         message.error("登录失败，用户名或密码错误");
+//       }
+//     });
+// };
+
 const loginAction = () => {
-  if (!server.value.startsWith("http")) {
-    server.value = `http://${server.value}`;
-  }
-  let curServer = servers.value.find((v: any) => v.host === server.value) || {
-    host: server.value,
-    name: "自定义环境",
-  };
   Object.assign(store.env, {
-    server:
-      servers.value.find((v: any) => v.host === server.value) || curServer,
+    server: store.config.servers.find((v) => v.host === server.value),
     loginName: loginName.value,
     password: password.value,
   });
@@ -111,9 +148,8 @@ const loginAction = () => {
       router.push("/exam-list");
     })
     .catch((err) => {
-      if (!err.toString().includes("404")) {
-        message.error("登录失败，用户名或密码错误");
-      }
+      console.log(err);
+      message.error("登陆失败，用户名或密码错误");
     });
 };
 </script>

src/lib/watermark.ts

@@ -199,10 +199,12 @@ export async function addWatermark(
               markerString: [],
               header: {},
               headerString: [],
+              subScores: [],
             };
             groups[detail.groupNumber] = group;
             maxGroupNumber = Math.max(maxGroupNumber, group.number);
           }
+          group.subScores.push(detail.score === -1 ? 0 : detail.score);
           group.score =
             (group.score * 1000 +
               (detail.score === -1 ? 0 : detail.score) * 1000) /
@@ -235,7 +237,10 @@ export async function addWatermark(
               group.titleString.join(",") +
               ")" +
               " " +
-              group.score +
+              // group.score +
+              (store.pageInputs["/image-download"].showSubScore
+                ? group.subScores.join("，")
+                : group.score) +
               " " +
               group.markerString.join(",") +
               " " +

src/types/index.ts

@@ -42,6 +42,7 @@ export interface Store {
       append: boolean;
       failover: boolean;
       watermark: boolean;
+      showSubScore: boolean;
       trackMode: string;
       examNumber?: string;
       subjectCode?: string;