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

Reviewed-on: #17

src/views/HomeView.vue

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

src/views/index.vue

@@ -61,7 +61,7 @@ export default {
             headerActive: 0,
             headerList: [
                 { 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-img2.png') },
                 //  history history