Merge branch 'master' of http://124.70.32.114:3100/woka/cesium-map-object into ctw

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "cesium-map-object",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

ruoyi-ui/src/router/index.js

@@ -46,6 +46,18 @@ export const constantRoutes = [
     component: () => import('@/views/login'),
     hidden: true
   },
+  // 登录跳转选择房间
+  {
+    path: '/selectRoom',
+    component: () => import('@/views/selectRoom'),
+    hidden: true
+  },
+  // 选择房间跳转
+  {
+    path: '/childRoom',
+    component: () => import('@/views/childRoom'),
+    hidden: true
+  },
   {
     path: '/cesiumMap',
     component: () => import('@/views/cesiumMap'),

ruoyi-ui/src/views/login.vue

@@ -144,7 +144,9 @@ export default {
             Cookies.remove('rememberMe')
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
+            // this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
+            // 跳转选择房间
+            this.$router.push({ path: this.redirect || "/selectRoom" }).catch(()=>{})
           }).catch(() => {
             this.loading = false
             if (this.captchaEnabled) {

ruoyi-ui/src/views/selectRoom/index.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    <el-button @click="go()">跳转</el-button>
+    <el-button @click="goHome()">跳转</el-button>
+  </div>
+</template>
+
+<script>
+//登录后跳转的页面
+export default {
+
+  data() {
+    return {
+ 
+    }
+  },
+ 
+  methods: {
+    go(){
+        this.$router.push({ path: this.redirect || "/childRoom" }).catch(()=>{})
+    },
+    // 返回首页
+    goHome(){
+      this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
+    }
+  }
+}
+</script>