Merge branch 'lmm' into develop

package-lock.json

@@ -2716,9 +2716,9 @@
       }
     },
     "crypto-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz",
-      "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
+      "version": "3.3.0",
+      "resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-3.3.0.tgz?cache=0&sync_timestamp=1626954954639&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcrypto-js%2Fdownload%2Fcrypto-js-3.3.0.tgz",
+      "integrity": "sha1-hG3RzOL2iqz6FWyFePkmpgm3l2s="
     },
     "css-parse": {
       "version": "1.7.0",

package.json

@@ -25,7 +25,7 @@
     "@types/crypto-js": "^3.1.47",
     "@types/overlayscrollbars": "^1.12.1",
     "core-js": "^3.15.2",
-    "crypto-js": "^4.0.0",
+    "crypto-js": "^3.3.0",
     "datatables.net": "^1.10.25",
     "date-fns": "^2.22.1",
     "echarts": "^4.6.0",
@@ -67,8 +67,5 @@
     "typescript": "~3.4.3",
     "webpack-bundle-analyzer": "^3.7.0",
     "zone.js": "^0.9.1"
-  },
-  "browser": {
-    "crypto": false
   }
 }

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.87",
+    "target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/inspect-auto/inspect-auto.component.ts

@@ -84,7 +84,7 @@ export class InspectAutoComponent implements OnInit {
    *
    * @param classId 班次Id
    */
-  loading2 = false;
+  loading2 = true;
   getRules() {
     let postData = {
       idx: 0,