xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '页面跳转逻辑修改' (#17) from pc-master into portal 

Reviewed-on: #17
pull/34/head^2
xiaomeng 2023-10-17 09:48:34 +00:00
parent 72c593b4de 6a78b68d8a
commit ceba1f0b47
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/HomeView.vue
View File

@ -4,7 +4,7 @@
<div class="header-left"> <div class="header-left">
<div> <div>
<div class="return-btn" @click="returnRouter()">返回</div> <div class="return-btn" @click="returnRouter()">返回设定值参数</div>
<div class="return-btn" @click="refreshData()">数据刷新</div> <div class="return-btn" @click="refreshData()">数据刷新</div>
<!-- <div class="router-list" @click="toRouter(item)" :class="routerAct == item.router ? 'active' : ''" <!-- <div class="router-list" @click="toRouter(item)" :class="routerAct == item.router ? 'active' : ''"
v-for="item, index in routerList" :key="index"> v-for="item, index in routerList" :key="index">
@ -81,7 +81,8 @@ export default {
}) })
}, },
returnRouter(){ returnRouter(){
this.$router.go(-1) // this.$router.go(-1)
this.$router.push({ path: `/irrigateSet?id=1` })
}, },
toRouter(item) { toRouter(item) {
if (item.router) { if (item.router) {
@ -117,8 +118,9 @@ export default {
background-size: 1920px 1080px; background-size: 1920px 1080px;
background-position: center top; background-position: center top;
.return-btn { .return-btn {
width: 120px; // width: 120px;
margin: 0 8px; margin: 0 8px;
min-width: 120px;
padding: 0 20px; padding: 0 20px;
border-radius: 3px; border-radius: 3px;
height: 40px; height: 40px;

2
src/views/index.vue
View File

@ -61,7 +61,7 @@ export default {
headerActive: 0, headerActive: 0,
headerList: [ headerList: [
{ name: '实时数据', router: 'realTime', routerList: ['realTime'], img: require('../assets/image/header-img1.png') }, { name: '实时数据', router: 'realTime', routerList: ['realTime'], img: require('../assets/image/header-img1.png') },
{ name: '设定值参数', router: 'irrigateSet', index: 1, routerList: ['formula', 'irrigateSet', 'PIDSet', 'systemSet', 'upload', 'sensorSet'], img: require('../assets/image/header-img0.png') }, { name: '设定值参数', router: 'status', index: 1, routerList: ['formula', 'irrigateSet', 'PIDSet', 'systemSet', 'upload', 'sensorSet'], img: require('../assets/image/header-img0.png') },
{ name: '设备菜单', router: '', routerList: [], img: require('../assets/image/header-img1.png') }, { name: '设备菜单', router: '', routerList: [], img: require('../assets/image/header-img1.png') },
{ name: '视频监控', router: '', routerList: [], img: require('../assets/image/header-img2.png') }, { name: '视频监控', router: '', routerList: [], img: require('../assets/image/header-img2.png') },
// history history // history history