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

2025-06-15 16:11:34 +08:00 · 2025-06-15 16:11:34 +08:00 · 9c86cfe045
parent c90c2c589b e0f790647f
commit 9c86cfe045
1 changed files with 6 additions and 0 deletions
--- a/yanzhu-bigscreen/src/components/header.vue
+++ b/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");