From 00bf2a7e27491ef55b7d5f7742a322010a1fec11 Mon Sep 17 00:00:00 2001 From: ZhangXianQiang <1135831638@qq.com> Date: 星期三, 20 三月 2024 14:16:20 +0800 Subject: [PATCH] fix:修改路由 --- src/views/login.vue | 3 + src/views/home/data-view/index.vue | 39 +++++++++++++++++-- src/views/screen/components/screen-wrapper/index.vue | 4 +- src/views/screen/components/select-item/index.vue | 6 +- src/router/index.js | 30 +++++++++++---- 5 files changed, 64 insertions(+), 18 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 8850356..58389a7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -51,13 +51,13 @@ component: Layout, hidden: true, children: [ - { - path: 'index', - name: 'vehicle-data-monitor', - component: () => import('@/views/system/vehicle-data-monitor/index'), - meta: { title: '杞﹁締杩囧崱鍙f暟鎹竴鑷存��', activeMenu: '/system/vehicle-data-monitor' } - } - ] + { + path: 'index', + name: 'vehicle-data-monitor', + component: () => import('@/views/system/vehicle-data-monitor/index'), + meta: { title: '杞﹁締杩囧崱鍙f暟鎹竴鑷存��', activeMenu: '/system/vehicle-data-monitor' } + } + ] }, { path: '/register', @@ -77,7 +77,7 @@ { path: '', component: Layout, - redirect: 'index', + redirect: 'screen', children: [ { path: 'index', @@ -87,6 +87,20 @@ } ] }, + + // { + // path: '', + // component: Layout, + // redirect: 'index', + // children: [ + // { + // path: 'index', + // component: () => import('@/views/index'), + // name: 'Index', + // meta: { title: '棣栭〉', icon: 'dashboard', affix: true } + // } + // ] + // }, { path: '/screen', hidden: true, diff --git a/src/views/home/data-view/index.vue b/src/views/home/data-view/index.vue index 54e595c..d3c7752 100644 --- a/src/views/home/data-view/index.vue +++ b/src/views/home/data-view/index.vue @@ -9,11 +9,20 @@ <el-card class="map-wrapper"> <el-row> - <el-col :offset="21" :span="3"> - <el-select v-model="selectOption" placeholder="璇烽�夋嫨"> - <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> - </el-option> - </el-select> + <el-col :span="5"> + <div class="select-container"> + <div class="select-label"> + 鏁版嵁婧� + </div> + <el-select v-model="selectOption" placeholder="璇烽�夋嫨"> + <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> + </div> + + </el-col> + <el-col :span="2"> + <el-button type="primary" @click="toScreen">鍙鍖栧ぇ灞�</el-button> </el-col> </el-row> <el-row :gutter="40" class="data-plane" style="height: 100%;"> @@ -123,6 +132,10 @@ value: 2, label: '甯傚眬鏁版嵁' }, + { + value: 3, + label: '鍏畨閮ㄦ暟鎹�' + }, ], selectOption: 1 } @@ -145,6 +158,12 @@ }); data.name = '鑷础甯�'; this.activeData = data; + }, + + toScreen() { + this.$router.push({ + path: '/screen' + }) } }, created() { @@ -179,6 +198,16 @@ aspect-ratio: 6/2; } +.select-container { + display: flex; + align-items: center; + .select-label { + color: #666; + margin-right: 20px; + font-size: 16px; + } +} + @media screen and (min-width: 1200px) { .el-col-md-6 { width: 20%; diff --git a/src/views/login.vue b/src/views/login.vue index e604abf..e855493 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -149,6 +149,7 @@ watch: { $route: { handler: function(route) { + console.log(route); this.redirect = route.query && route.query.redirect; }, immediate: true @@ -198,6 +199,8 @@ this.loginInfo = loginInfo.user //濡傛灉杩斿洖涓�1姝e父璺宠浆 if(this.loginInfo.firstLogin == 1){ + this.$router.push({ path: "/" }).catch(()=>{}); + return; this.$router.push({ path: this.redirect || "/" }).catch(()=>{}); } else { localStorage.setItem('firstLogin',0) diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue index 6cbb50e..35e0763 100644 --- a/src/views/screen/components/screen-wrapper/index.vue +++ b/src/views/screen/components/screen-wrapper/index.vue @@ -2,7 +2,7 @@ <div class="wrapper-container"> <select-item></select-item> <div class="return-button"> - <el-button type="primary" @click="returnPath">杩斿洖</el-button> + <el-button type="primary" @click="returnPath">绠$悊绯荤粺</el-button> </div> <div class="wrapper-content"> <div class="left-container wrapper"> @@ -43,7 +43,7 @@ }, methods: { returnPath() { - this.$router.go(-1); + this.$router.push('/index'); } } } diff --git a/src/views/screen/components/select-item/index.vue b/src/views/screen/components/select-item/index.vue index 4bd541b..168db2c 100644 --- a/src/views/screen/components/select-item/index.vue +++ b/src/views/screen/components/select-item/index.vue @@ -24,15 +24,15 @@ dateValue: new Date(), testData1: [ { - name: '鐪佸巺', + name: '鐪佸巺鏁版嵁', value: 1 }, { - name: '甯傚巺', + name: '甯傚眬鏁版嵁', value: 2 }, { - name: '鍏畨閮�', + name: '鍏畨閮ㄦ暟鎹�', value: 3 } ] -- Gitblit v1.8.0