Merge branch 'slj' into 'traffic-front-sam'

Slj

See merge request !1

package-lock.json

@@ -1602,13 +1602,14 @@
       "dev": true
     },
     "@vue/test-utils": {
-      "version": "1.0.0-beta.29",
-      "resolved": "https://registry.npm.taobao.org/@vue/test-utils/download/@vue/test-utils-1.0.0-beta.29.tgz",
-      "integrity": "sha1-yULPJeiRzwgbagMzK0rh70MHJvA=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.1.2.tgz",
+      "integrity": "sha512-utbIL7zn9c+SjhybPwh48lpWCiluFCbP1yyRNAy1fQsw/6hiNFioaWy05FoVAFIZXC5WwBf+5r4ypfM1j/nI4A==",
       "dev": true,
       "requires": {
-        "dom--types": "^1.0.0",
-        "lodash": "^4.17.4"
+        "dom-event-types": "^1.0.0",
+        "lodash": "^4.17.15",
+        "pretty": "^2.0.0"
       }
     },
     "@vue/web-component-wrapper": {

package.json

@@ -31,7 +31,7 @@
     "@vue/cli-plugin-unit-jest": "^3.12.1",
     "@vue/cli-service": "^3.12.1",
     "@vue/eslint-config-airbnb": "^4.0.1",
-    "@vue/test-utils": "1.0.0-beta.29",
+    "@vue/test-utils": "^1.1.2",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^23.6.0",

src/config.js

-const address = 'http://localhost:8088/traffic/';
+const address = 'http://localhost:8080/traffic/';
 const videoAddress = 'http://152.136.233.116:8000';
 const photoAddress = 'http://152.136.233.116:8000';
-const title = '公路平台';
+const imgAddress = '/traffic/';// 测试环境
 export {
-  address, photoAddress, title, videoAddress,
+  address, photoAddress, imgAddress, videoAddress,
 };
+
 // 这个是 本地配置 打包时把 config-prod.js的内容复制过来

src/views/Home.vue

@@ -11,10 +11,10 @@
           class="el-menu-vertical-demo"
         >
           <div class="logo">
-              <img v-show="companyId==1 && authId!=11" style="width:180px;height:45px" src="../assets/logo_chuhang.png" alt />
-              <img style="width:144px;height:36px" src="../assets/logo_new.png" alt />
+              <!-- <img v-show="companyId !=1 && authId!=11" style="width:180px;height:45px" src="../assets/logo_chuhang.png" alt /> -->
+              <img v-show="companyId != 4 && authId != 14" style="width:144px;height:36px" src="../assets/logo_new.png" alt />
           </div>
-
+      
           <div v-show="companyId">
             <el-menu-item
               index="1-1"