浏览代码

配置修改

asd26269546 2 年之前
父节点
当前提交
42464a93f3
共有 4 个文件被更改,包括 14 次插入7 次删除
  1. 2 1
      public/index.html
  2. 5 2
      src/components/header-bar.vue
  3. 5 2
      src/views/main.vue
  4. 2 2
      vue.config.js

+ 2 - 1
public/index.html

@@ -4,7 +4,8 @@
     <meta charset="utf-8">
     <!-- <meta http-equiv="X-UA-Compatible" content="IE=edge"> -->
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
+    <!-- <meta http-equiv="Content-Security-Policy">  -->
     <link rel="icon" href="<%= BASE_URL %>bts.ico">
     <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
     <title>ByteSailing 管理系统</title>

+ 5 - 2
src/components/header-bar.vue

@@ -171,9 +171,12 @@ export default {
 		getData() {
 			const v = this
 			v.$get('/api/blade-system/menu/routes').then((res) => {
-				v.menuData = res.data.length >= 1 ? res.data[0] : []
+				res.data.map(item=>{
+					if(item.id === '1619633989348249601') this.menuData = item
+				})
+				
 				v.barData = res.data
-				console.log(v.menuData)
+				
 			})
 		},
 	},

+ 5 - 2
src/views/main.vue

@@ -98,6 +98,9 @@ import store from '../store'
 console.log(process.env.NODE_ENV)
 const state = getAll()
 state.router = router
+const isTest = window.location.host == '36.134.91.96:10003'
+const isServe = process.env.NODE_ENV === "development"
+console.log(isTest,isServe)
 registerMicroApps([
 	{
 		name: 'app-vue-hash',
@@ -105,12 +108,12 @@ registerMicroApps([
 		container: '#appContainer',
 		activeRule: '/main/app-vue-hash',
 		props:{
-			data:state,
+			
 		},
 	},
 	{
 		name: 'fjhxCloudVue',
-		entry: (process.env.NODE_ENV === "development") ?  'http://localhost:1777' : 'https://wdly.bytesail.cn:10002',
+		entry: isServe ? 'http://192.168.1.198:1777' :  'http://36.134.91.96:10002',
 		//entry: (process.env.NODE_ENV === "development") ?  'https://wdly.bytesail.cn:10002' : 'https://wdly.bytesail.cn:10002',
 		container: '#appContainer',
 		activeRule: '/main/fjhxCloudVue',

+ 2 - 2
vue.config.js

@@ -16,8 +16,8 @@ module.exports = {
         proxy: {
             '/api': {
 				//本地服务接口地址
-                //target: 'http://36.134.91.96:10001/api',
-				target: 'https://cfm.bytesail.cn/api',
+                target: 'http://36.134.91.96:10001/api',
+				//target: 'https://cfm.bytesail.cn/api',
 				//远程演示服务地址,可用于直接启动项目
 				//target: 'https://saber.bladex.vip/api',
 				ws: true,