Merge remote-tracking branch 'origin/dev_xd' into dev_xd

yanzhu-bigscreen/src/components/header.vue

@@ -244,9 +244,15 @@ export default {
           break;
         case 6:
           this.$router.push("/greenCarbon");
+<<<<<<< HEAD
+          break;  
+        case 702:
+          this.$router.push("/bimRoaming");
+=======
           break;
         case 701:
           this.$router.push("/bimManage");
+>>>>>>> origin/dev_xd
           break;
         case 102:
           this.$router.push("/labor");

yanzhu-bigscreen/src/router/index.js

@@ -60,6 +60,13 @@ const routes = [
     component: () =>
       import(/* webpackChunkName: "bimManage" */ "../views/bimManage.vue"),
   },
+  {
+    path: "/bimRoaming",
+    name: "bimRoaming",
+    meta: { nav: 702 },
+    component: () =>
+      import(/* webpackChunkName: "bimRoaming" */ "../views/bimRoaming.vue"),
+  },
   {
     path: "/videoMonitor",
     name: "videoMonitor",

yanzhu-bigscreen/src/views/bimManage.vue

@@ -353,6 +353,7 @@ export default {
       devicTypes: [1],
       viewPoint: null,
       project: null,
+      selProject:null,
       addLabels: [],
       devices: [],
       showDevices: [],

yanzhu-bigscreen/src/views/bimRoaming.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="bim-roaming main-page">
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BIMRoaming',
+  data(){
+    return {
+         dpi: "",
+         selProject:null,
+    }
+  },
+  mounted(){
+   this.$store.dispatch("ChangeNav", 702);
+    this.dpi = this.$dpi();
+     window.addEventListener("resize", () => {
+      if (this.dpi != this.$dpi()) {
+        this.dpi = this.$dpi();
+      }
+    });
+    this.$bus.$on(
+      "projectChange",
+      debounce((prj) => {
+        this.selProject = prj;
+        this.elId++;
+      })
+    );
+    this.selProject = this.$store.getters.selProject;
+  },
+  methods:{
+    
+  }
+}
+</script>
+
+<style lang="less">
+.bim-roaming{
+
+}
+</style>