Explorar el Código

升级iview 3.x

Michael Wang hace 6 años
padre
commit
425813d5ef
Se han modificado 5 ficheros con 26 adiciones y 18 borrados
  1. 12 6
      package-lock.json
  2. 4 3
      package.json
  3. 3 6
      src/components/FaceRecognition/FaceRecognition.vue
  4. 1 3
      src/main.js
  5. 6 0
      src/plugins/iview.js

+ 12 - 6
package-lock.json

@@ -8191,9 +8191,9 @@
       }
     },
     "iview": {
-      "version": "2.14.3",
-      "resolved": "https://registry.npmjs.org/iview/-/iview-2.14.3.tgz",
-      "integrity": "sha512-jK5CBNuNBKUZWooCVlipBIUkNnGeZHRtypeuMo9VhQmJ9cCXmuI6BalrtxBFkBCnuUXRdFD34/kSevF9Cc2kpg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/iview/-/iview-3.1.0.tgz",
+      "integrity": "sha512-c45nrOt/wxi9JT7zxo5wlE/aLwkdDn+kAx+aoLn58yPhhKhEjZGSopaS79SgMkpx+k8Yd4FAbr5Xb3sXnF0CrA==",
       "requires": {
         "async-validator": "^1.8.2",
         "deepmerge": "^2.1.0",
@@ -14763,9 +14763,9 @@
       "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "v-click-outside-x": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/v-click-outside-x/-/v-click-outside-x-3.0.3.tgz",
-      "integrity": "sha512-3nPkT+rOsLyy1qkDRp3nAY0a9gXlhKlCaqs5dGAZa5oUe3h5+VOUmkKh9zyGiakQ2kDZriqOUx3YNaUjJVVsjg=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/v-click-outside-x/-/v-click-outside-x-3.2.2.tgz",
+      "integrity": "sha512-lAeSsh5EaYO3yLlNnpBlABeE93/Y8P9aBOzm4I+NOTWW7qmiw9YzQmdclorLBLvd9fCP1wsViRWymiZRm4m3Nw=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -14812,6 +14812,12 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.17.tgz",
       "integrity": "sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ=="
     },
+    "vue-cli-plugin-iview": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/vue-cli-plugin-iview/-/vue-cli-plugin-iview-1.0.6.tgz",
+      "integrity": "sha512-cCjEgTD4nO5YQeRgdrrOqN7Qc2MzBx2u90J/CJ3Gp4PZ2sUONZE67/Qy+zWNHCWVCYsSEIvbnPSuiiQeEr1KSQ==",
+      "dev": true
+    },
     "vue-eslint-parser": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",

+ 4 - 3
package.json

@@ -3,17 +3,17 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "start": "vue-cli-service serve",
     "serve": "vue-cli-service serve",
+    "lint": "vue-cli-service lint",
+    "start": "vue-cli-service serve",
     "mock": "json-server --watch mock/db.json",
     "build:staging": "NODE_ENV=production vue-cli-service build --mode staging",
     "build:prod": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
     "axios": "^0.18.0",
-    "iview": "^2.14.3",
+    "iview": "^3.0.1",
     "json-server": "^0.14.0",
     "moment": "^2.22.2",
     "register-service-worker": "^1.0.0",
@@ -32,6 +32,7 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^23.0.1",
     "iview-loader": "^1.2.1",
+    "vue-cli-plugin-iview": "^1.0.6",
     "vue-template-compiler": "^2.5.17"
   },
   "browserslist": [

+ 3 - 6
src/components/FaceRecognition/FaceRecognition.vue

@@ -109,12 +109,9 @@ export default {
       await this.faceCompare(captureFilePath);
     },
     async faceCompare(captureFilePath) {
-      const res = await this.$http.get("/api/ecs_core/student/getStudentInfo", {
-        params: {
-          identityNumber: this.user.identityNumber,
-          orgId: this.user.rootOrgId
-        }
-      });
+      const res = await this.$http.get(
+        "/api/ecs_core/face/studentFace/" + this.user.userId
+      );
       const faceToken = res.data.faceToken;
       console.log(faceToken);
       console.log(captureFilePath);

+ 1 - 3
src/main.js

@@ -4,15 +4,13 @@ import router from "./router";
 import store from "./store";
 import "./registerServiceWorker";
 
-import iView from "iview";
-import "iview/dist/styles/iview.css";
+import "./plugins/iview.js";
 import "./styles/global.css";
 
 import axiosPlugin from "./utils/axios";
 
 import MainLayout from "@/components/MainLayout/MainLayout.vue";
 
-Vue.use(iView);
 Vue.use(axiosPlugin);
 
 Vue.config.productionTip = process.env.NODE_ENV !== "production";

+ 6 - 0
src/plugins/iview.js

@@ -0,0 +1,6 @@
+import Vue from "vue";
+import iView from "iview";
+
+Vue.use(iView);
+
+import "iview/dist/styles/iview.css";