asd26269546 2 жил өмнө
parent
commit
fa603cc128

+ 1 - 1
src/router/index.js

@@ -40,7 +40,7 @@ const router = new VueRouter({
   routes
 })
 
-const childRoute = ['/app-vue-hash','/app-vue-history','/main/fjhxCloudVue'];
+const childRoute = ['/app-vue-hash','/app-vue-history','/main/fjhxCloudVue','/main/iotPlatformRoom'];
 const isChildRoute = path => childRoute.some(item => path.startsWith(item))
 const rawAppendChild = HTMLHeadElement.prototype.appendChild;
 const rawAddEventListener = window.addEventListener;

+ 10 - 8
src/views/main.vue

@@ -4,7 +4,7 @@
       <ul class="nav">
         <img class="logo" src="../assets/logo.png" alt=""></img>
         <li>
-          <router-link to="/main/app-vue-hash/">dingding</router-link>
+          <router-link to="/main/fjhxCloudVue/#/wel/index">针筒</router-link>
         </li>
         <li class="active">
           <router-link to="/main/canvas/">canvas</router-link>
@@ -78,9 +78,7 @@ registerMicroApps([
 		container: '#appContainer',
 		activeRule: '/main/app-vue-hash',
 		props:{
-			data:getAll(),
-			router:router,
-			store:store,
+			data:state,
 		},
 	},
 	{
@@ -89,9 +87,7 @@ registerMicroApps([
 		container: '#appContainer',
 		activeRule: '/main/fjhxCloudVue',
 		props:{
-			data:getAll(),
-			router:router,
-			store:store,
+			data:state,
 		},
 	},
 	{
@@ -113,7 +109,6 @@ registerMicroApps([
 		},
 	},
 ]);
-
 start();
 export default {
 	components:{
@@ -133,6 +128,13 @@ export default {
 		changeParentState() {
 			this.$store.commit('setCommonData', { parent: 1 })
 		},
+		getData(){
+
+		},
+	},
+	created(){
+		this.getData()
+		this.getData()
 	},
 }
 </script>