Merge branch 'dev-sen-20200717' into 'release'

Dev sen 20200717



See merge request !2

package-lock.json

@@ -505,7 +505,8 @@
       "version": "1.0.0",
       "resolved": "http://192.168.110.93:4873/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -2113,6 +2114,7 @@
       "resolved": "http://192.168.110.93:4873/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=",
       "dev": true,
+      "optional": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -2637,7 +2639,8 @@
       "version": "1.0.0",
       "resolved": "http://192.168.110.93:4873/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "depd": {
       "version": "1.1.2",
@@ -3081,7 +3084,8 @@
       "version": "1.3.0",
       "resolved": "http://192.168.110.93:4873/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fast-deep-equal": {
       "version": "1.1.0",
@@ -3313,7 +3317,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3334,12 +3339,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3354,17 +3361,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3481,7 +3491,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3493,6 +3504,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3507,6 +3519,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3514,12 +3527,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -3538,6 +3553,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3618,7 +3634,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3630,6 +3647,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3715,7 +3733,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3751,6 +3770,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3770,6 +3790,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3813,12 +3834,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -4723,7 +4746,8 @@
       "version": "0.1.1",
       "resolved": "http://192.168.110.93:4873/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "jsesc": {
       "version": "1.3.0",
@@ -7096,7 +7120,8 @@
       "version": "2.1.2",
       "resolved": "http://192.168.110.93:4873/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "sax": {
       "version": "1.2.4",
@@ -7905,7 +7930,8 @@
       "version": "0.14.5",
       "resolved": "http://192.168.110.93:4873/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "type-is": {
       "version": "1.6.16",

src/api/menu.js

@@ -11,6 +11,7 @@ const menu = {
         let headers = {
             headers: {
                 'token': localStorage.getItem('token') || null
+                // 'token': '9606E40DDB704396AB532B2AE771048E',
                 // header('Access-Control-Allow-Origin:*')
             }
         };

src/common/env.js

@@ -39,7 +39,7 @@ export const getAddress = () => {
     let qiniuResourceUrl = "";//qiniu存储域名
 
     //本地
-    if (ipAddress.indexOf("localhost") > -1 || ipAddress.indexOf("127.0.0.1") > -1 || ipAddress.indexOf("test-kf") > -1) {
+    if (ipAddress.indexOf("localhost") > -1 || ipAddress.indexOf("10.177.10.118") > -1 || ipAddress.indexOf("test-kf") > -1) {
         ipAddress = "http://localhost:7070";
         preViewUrl = "http://localhost:9090/#/template";
         qiniuImgUrl = "https://test1-file.yunqueyi.com";

src/common/fetch.js

@@ -32,8 +32,9 @@ export default async(url = '', data = {}, type = 'POST', method = 'fetch',server
                 // 'Access-Control-Allow-Origin': '*',
                 'Accept': '*',
                 'Content-Type': 'application/json',
-                // 'token': localStorage.getItem('token') || null, //固定传header：
-                // 'system_code': 'todo'   //固定传header：系统编号
+                'token': localStorage.getItem('token') || null, //固定传header：
+				// 'system_code': 'todo'   //固定传header：系统编号
+				// 'token': '9606E40DDB704396AB532B2AE771048E',
             },
         }
 

src/components/common/Header.vue

@@ -66,6 +66,7 @@
                 let headers = {
                     headers: {
                         'token': localStorage.getItem('token') || null
+                        // 'token': '9606E40DDB704396AB532B2AE771048E',
                     }
                 };
 //                let headData = menuApi.headList(req,self);

src/components/common/Home.vue

@@ -58,12 +58,6 @@
                         ssoLogin(href, paramMap);
                     }
                 }
-                // else if (localStorage.getItem("token")) {
-                //     debugger
-                //     Vue.prototype.$axios = self.$axios.create({
-                //         headers: {'token': localStorage.getItem("token")}
-                //     });
-                // }
             }
         },
         components: {

src/components/common/Sidebar.vue

@@ -48,6 +48,7 @@
                 let headers = {
                     headers: {
                         'token': localStorage.getItem('token') || null
+                        // 'token': '9606E40DDB704396AB532B2AE771048E',
                     }
                 };
                 self.$axios.post(localStorage.getItem("msUrl") + 'login/menu/list', req, headers).then(function (res) {

src/router/index.js

@@ -23,7 +23,10 @@ export default new Router({
                 },{ // 数据导入
                     path: '/data-in',
                     component: resolve => require(['../views/sensitive-control/data-in.vue'], resolve),
-          
+                }, { // 数据统计
+                    path: '/data-statistic',
+                    component: resolve => require(['../views/sensitive-control/data-statistic.vue'], resolve),
+
                 },{ // 数据查看
                     path: '/data-view',
                     component: resolve => require(['../views/sensitive-control/data-view.vue'], resolve)