Merge remote-tracking branch 'origin/master'

device-manager-ui/admin/src/components/Header.vue

@@ -10,9 +10,7 @@
           </i> -->
           <img
             class="logo"
-            :src="
-              sysLogo ? api + sysLogo : require('../assets/images/logo2.png')
-            "
+            :src="sysLogo ? sysLogo : require('../assets/images/logo2.png')"
           />
           <h1 class="title">
             {{ sysName ? sysName : systemName }}
@@ -102,7 +100,6 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_IMG_URL,
       systemName: process.env.VUE_APP_sysName,
       showMobileMenu: false,
     };
@@ -242,7 +239,7 @@ export default {
         margin: auto;
       }
       .logo {
-        width: 32px;
+        height: 32px;
         margin-right: 10px;
       }
     }

device-manager-ui/admin/vue.config.js

 module.exports = {
-	productionSourceMap: false,
-	assetsDir: 's',
-	configureWebpack: {
-		externals: {
-			vue: "Vue",
-			vuex: "Vuex",
-			"vue-router": "VueRouter",
-			"element-ui": "ELEMENT"
-		},
-	},
-	lintOnSave:false,
-	devServer: {
-		inline: true,
-		disableHostCheck: true,
-		port: 8085,
-		hot: true,//自动保存
-		proxy: {
-			'/m': {
-				target: 'http://192.168.0.98:11078',
-				//target: 'http://127.0.0.1:18222',
-				changeOrigin: true,
-				secure: false,
-				cookieDomainRewrite: 'plm.testnew.com',
-			}
-		}
-	}
-}
+  productionSourceMap: false,
+  assetsDir: "s",
+  configureWebpack: {
+    externals: {
+      vue: "Vue",
+      vuex: "Vuex",
+      "vue-router": "VueRouter",
+      "element-ui": "ELEMENT",
+    },
+  },
+  lintOnSave: false,
+  devServer: {
+    inline: true,
+    disableHostCheck: true,
+    port: 8085,
+    hot: true, //自动保存
+    proxy: {
+      "/m": {
+        target: "http://192.168.0.98:11078",
+        //target: 'http://127.0.0.1:18222',
+        changeOrigin: true,
+        secure: false,
+        cookieDomainRewrite: "plm.testnew.com",
+      },
+      "/file": {
+        target: "http://192.168.0.98:11078",
+        //target: 'http://127.0.0.1:18222',
+        changeOrigin: true,
+      },
+    },
+  },
+};