diff --git a/ruoyi-ui/node_modules.zip b/ruoyi-ui/node_modules.zip
deleted file mode 100644
index 9fc2cd2..0000000
Binary files a/ruoyi-ui/node_modules.zip and /dev/null differ
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index f52ace5..92bbe25 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -50,6 +50,8 @@
"vuex": "3.6.0"
},
"devDependencies": {
+ "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6",
+ "@babel/plugin-transform-optional-chaining": "^7.28.6",
"@vue/cli-plugin-babel": "4.4.6",
"@vue/cli-service": "4.4.6",
"babel-plugin-dynamic-import-node": "2.3.3",
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index b66190b..d4ff8dd 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register']
+const whiteList = ['/login', '/register', '/selectRoom', '/childRoom']
const isWhiteList = (path) => {
return whiteList.some(pattern => isPathMatch(pattern, path))
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index b0ef65e..e5847c7 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -1260,9 +1260,9 @@ export default {
.main-toolbar {
position: absolute;
- top: 100px;
+ top: 365px;
/* left: 50px; */
- right: 20px;
+ left: 62px;
z-index: 1000;
display: flex;
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index e61d778..d8d61e7 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -53,6 +53,159 @@
>
+
+
+
暂无冲突
-