Michael Wang 4 vuotta sitten
vanhempi
commit
4c6ceb8383
6 muutettua tiedostoa jossa 97 lisäystä ja 75 poistoa
  1. 2 2
      electronStart.js
  2. 3 0
      prettier.config.js
  3. 1 1
      src/App.vue
  4. 2 2
      src/main.js
  5. 56 59
      src/views/index.vue
  6. 33 11
      src/views/login.vue

+ 2 - 2
electronStart.js

@@ -10,8 +10,8 @@ function createWindow() {
     width: 1000,
     height: 720,
     webPreferences: {
-      preload: require("path").join(__dirname, "faceSetMysql.js")
-    }
+      preload: require("path").join(__dirname, "faceSetMysql.js"),
+    },
   });
 
   // and load the index.html of the app.

+ 3 - 0
prettier.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  trailingComma: "es5",
+};

+ 1 - 1
src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view/>
+    <router-view />
   </div>
 </template>
 <style>

+ 2 - 2
src/main.js

@@ -146,7 +146,7 @@ qmInstance.defaults.timeout = 10000; //超时时间
 qmInstance.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest"; //标识这是一个 ajax 请求
 
 axiosRetry(qmInstance, {
-  retries: 3 // 重试3次
+  retries: 3, // 重试3次
   // retryCondition: err => {
   //   // 根据err的特征来执行请求,目前是全部请求
   //   console.log(
@@ -160,5 +160,5 @@ axiosRetry(qmInstance, {
 Vue.prototype.$http = qmInstance;
 new Vue({
   router,
-  render: h => h(App)
+  render: h => h(App),
 }).$mount("#app");

+ 56 - 59
src/views/index.vue

@@ -1,24 +1,15 @@
 <template>
-  <div style='height: 100%;'>
-    <div class='import-header'>
-      <img
-        src='./images/nav_images.png'
-        alt=''
-      >照片批量上传工具 - {{server}}
-      <button
-        class='exit-btn'
-        @click='logout'
-        title="退出"
-      ></button>
+  <div style="height: 100%;">
+    <div class="import-header">
+      <img src="./images/nav_images.png" alt="" />照片批量上传工具 -
+      {{ server }}
+      <button class="exit-btn" @click="logout" title="退出"></button>
     </div>
-    <div class='import-body'>
-      <div class='import-div'>
-        <a href='javascript:;'>
+    <div class="import-body">
+      <div class="import-div">
+        <a href="javascript:;">
           <!-- webkitdirectory-->
-          <button
-            class='import-btn'
-            @click="importPhotos"
-          >
+          <button class="import-btn" @click="importPhotos">
             上传照片
           </button>
         </a>
@@ -28,63 +19,69 @@
             type="text"
             v-model="baseID"
             placeholder="不处理小于此数字的身份证照片"
-          >
-          
-          <br>
+          />
 
-          覆盖底照:<input type="checkbox" v-model="overridePhoto" title="选中后,即使学生已存在底照,会被本次的照片覆盖">
+          <br />
+
+          覆盖底照:<input
+            type="checkbox"
+            v-model="overridePhoto"
+            title="选中后,即使学生已存在底照,会被本次的照片覆盖"
+          />
         </div>
-        <div class='progress-div'>
+        <div class="progress-div">
           <div>
             <span>
               成功(含跳过):
-              <span style="color:green;">{{successNum}}({{skipNum}})</span>/{{allNum}}
+              <span style="color:green;">{{ successNum }}({{ skipNum }})</span
+              >/{{ allNum }}
             </span>
             <span>
               失败:
-              <span style="color:red;">{{errorNum}}</span>/{{allNum}}
+              <span style="color:red;">{{ errorNum }}</span
+              >/{{ allNum }}
             </span>
             <span>
               并发参数:
-              <span style="color:black;">{{batchConcurrency}}</span>
+              <span style="color:black;">{{ batchConcurrency }}</span>
             </span>
             <span>
               实时并发:
-              <span style="color:black;">{{reqNum}}</span>
+              <span style="color:black;">{{ reqNum }}</span>
             </span>
             <span>
               并发报警:
-              <span style="color:red;">{{faceppConcurrencyErrorNum}}</span>
+              <span style="color:red;">{{ faceppConcurrencyErrorNum }}</span>
             </span>
             <span>
               报警频率:
-              <span style="color:red;">{{faceppConcurrencyErrorNumPerMinute}}个/分</span>
+              <span style="color:red;"
+                >{{ faceppConcurrencyErrorNumPerMinute }}个/分</span
+              >
             </span>
           </div>
           <div>
-            <span>开始时间:{{startProcessTimeFormat}} </span>
-            <span>结束时间:{{endProcessTimeFormat}} </span>
-            <span>处理速度:{{(1000*processSpeed).toFixed(2)}}个/秒</span>
+            <span>开始时间:{{ startProcessTimeFormat }} </span>
+            <span>结束时间:{{ endProcessTimeFormat }} </span>
+            <span>处理速度:{{ (1000 * processSpeed).toFixed(2) }}个/秒</span>
           </div>
           <div>
+            <span v-show="completeShow" style="color: green;font-weight: bold;"
+              >全部处理完成</span
+            >
             <span
-              v-show="completeShow"
-              style="color: green;font-weight: bold;"
-            >全部处理完成</span>
-            <span
-              v-show="!completeShow&&(successNum>0||errorNum>0)"
+              v-show="!completeShow && (successNum > 0 || errorNum > 0)"
               style="color: red;font-weight: bold;"
-            >处理中...</span>
+              >处理中...</span
+            >
           </div>
         </div>
       </div>
-      <div class='console-panel'>
-        <div
-          v-for='msgInfo in returnMsgList200'
-          :key="msgInfo.fileName"
-        >
-          <p class='console-line'>
-            <span class="filename">{{msgInfo.fileName}}</span><span>{{msgInfo.msg}}</span>
+      <div class="console-panel">
+        <div v-for="msgInfo in returnMsgList200" :key="msgInfo.fileName">
+          <p class="console-line">
+            <span class="filename">{{ msgInfo.fileName }}</span
+            ><span>{{ msgInfo.msg }}</span>
           </p>
         </div>
       </div>
@@ -158,7 +155,7 @@ export default {
       endProcessTime: null, // 结束处理的时间
       processSpeed: 0, // 处理的速度:个/秒
       batchConcurrency: 0,
-      faceppConcurrencyErrorNumPerMinute: 0 // 报警频率
+      faceppConcurrencyErrorNumPerMinute: 0, // 报警频率
     };
   },
   methods: {
@@ -184,7 +181,7 @@ export default {
       dialog.showOpenDialog(
         {
           title: "选择照片所在目录",
-          properties: ["openDirectory"]
+          properties: ["openDirectory"],
         },
         folderPaths => {
           if (folderPaths) {
@@ -378,8 +375,8 @@ export default {
     async saveStudentBasePhoto(file, filename) {
       let config = {
         headers: {
-          "Content-Type": "multipart/form-data"
-        }
+          "Content-Type": "multipart/form-data",
+        },
       };
 
       let formData = new FormData();
@@ -424,8 +421,8 @@ export default {
       const headers = {
         headers: {
           Authorization: authorization,
-          "Content-Type": "image/jpeg"
-        }
+          "Content-Type": "image/jpeg",
+        },
       };
       return this.$http.put(url, photoFile, headers).catch(err => {
         console.log(err);
@@ -532,7 +529,7 @@ export default {
       faceSetToken,
       faceToken,
       faceCount,
-      photoName
+      photoName,
     }) {
       return this.$http
         .post("/api/ecs_core/face/saveStudentFace", {
@@ -542,7 +539,7 @@ export default {
           faceToken,
           faceCount,
           photoName,
-          operator: "客户端工具上传-" + localStorage.getItem("userName")
+          operator: "客户端工具上传-" + localStorage.getItem("userName"),
         })
         .catch(err => {
           console.log(err);
@@ -556,7 +553,7 @@ export default {
         this.returnMsgList.push({
           success: false,
           fileName,
-          msg
+          msg,
         });
         this.errorNum++;
 
@@ -583,7 +580,7 @@ export default {
       this.returnMsgList.push({
         success: true,
         fileName: path.basename(studentPhotoPath),
-        msg: msg
+        msg: msg,
       });
       this.successNum++;
       fs.appendFileSync(
@@ -597,12 +594,12 @@ export default {
       localStorage.removeItem("key");
       localStorage.removeItem("token");
       this.$router.push({
-        path: "/login"
+        path: "/login",
       });
     },
     lessThanBaseID(identityNumber) {
       return identityNumber < this.baseID; //字符串比较,从第一个字符比较起
-    }
+    },
   },
   computed: {
     returnMsgList200() {
@@ -617,8 +614,8 @@ export default {
       return this.endProcessTime
         ? moment(this.endProcessTime).format("YYYY-MM-DD HH:mm:ss")
         : "-";
-    }
-  }
+    },
+  },
 };
 </script>
 

+ 33 - 11
src/views/login.vue

@@ -2,19 +2,41 @@
   <div class="main_bg">
     <div class="login-main">
       <div class="env">
-        <div>环境: {{server}}</div>
+        <div>环境: {{ server }}</div>
       </div>
       <div class="username">
-        <input class="comminput" @keyup.enter="login" type="text" ref="name" id="accountValue" v-model="loginInfo.accountValue" placeholder="账号" />
+        <input
+          class="comminput"
+          @keyup.enter="login"
+          type="text"
+          ref="name"
+          id="accountValue"
+          v-model="loginInfo.accountValue"
+          placeholder="账号"
+        />
       </div>
       <div class="password">
-        <input class="comminput" @keyup.enter="login" type="password" id="password" v-model="loginInfo.password" placeholder="密码" />
+        <input
+          class="comminput"
+          @keyup.enter="login"
+          type="password"
+          id="password"
+          v-model="loginInfo.password"
+          placeholder="密码"
+        />
       </div>
       <div class="domain">
-        <input class="comminput" @keyup.enter="login" type="text" id="domain" v-model="loginInfo.domain" placeholder="机构域名" />
+        <input
+          class="comminput"
+          @keyup.enter="login"
+          type="text"
+          id="domain"
+          v-model="loginInfo.domain"
+          placeholder="机构域名"
+        />
       </div>
       <input type="button" value="登 录" class="btn comminput" @click="login" />
-      <div class="errorInfo">{{errorInfo}}</div>
+      <div class="errorInfo">{{ errorInfo }}</div>
     </div>
   </div>
 </template>
@@ -31,8 +53,8 @@ export default {
         domain: "",
         accountType: "COMMON_LOGIN_NAME",
         accountValue: "",
-        password: ""
-      }
+        password: "",
+      },
     };
   },
   beforeRouteEnter(from, to, next) {
@@ -40,13 +62,13 @@ export default {
       if (localStorage.getItem("accountValue")) {
         vm.loginInfo = {
           ...vm.loginInfo,
-          ...{ accountValue: localStorage.getItem("accountValue") }
+          ...{ accountValue: localStorage.getItem("accountValue") },
         };
       }
       if (localStorage.getItem("domain")) {
         vm.loginInfo = {
           ...vm.loginInfo,
-          ...{ domain: localStorage.getItem("domain") }
+          ...{ domain: localStorage.getItem("domain") },
         };
       }
     });
@@ -116,7 +138,7 @@ export default {
           this.pending = false;
           this.errorInfo += error.response.data.desc;
         });
-    }
+    },
   },
   created() {
     var params = this.$route.query;
@@ -124,7 +146,7 @@ export default {
   },
   mounted() {
     this.$refs.name.focus();
-  }
+  },
 };
 </script>