主页

src/views/collectData/collectData.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="header_title">数据分析</div>
     <div class="collectData">
-      
+
       <!-- 汇总数据的 nav -->
       <div class="box">
         <div class="box_item" v-for="item in boxList" :key="item.id">
@@ -10,7 +10,7 @@
           <p>{{item.value}}</p>
         </div>
       </div>
-              
+
       <div class="conditions">
         <el-form inline size="mini" label-width="110px">
           <el-form-item label="区域选择：" style="width: 310px">
@@ -216,7 +216,7 @@
                 <!-- 被选中的牧场 -->
                 <div class="card_body">
                   <ul class="card_ul">
-                    <li 
+                    <li
                       v-for="item in cardFarms"
                       :key="item.id">
                       {{ item.farmName }}
@@ -425,7 +425,7 @@ export default {
       this.updateSelected(1);
       this.$router.push({
         path: '/',
-        query: {farmCode: row.farmCode, type: 4}
+        query: {farmCode: row.farmCode, type: 4, isColl: true}
       })
     },
     // 牧场对比

src/views/pastureData/Home.vue

@@ -5,7 +5,7 @@
     <!-- 区级   -->
     <district v-if="!isProvince && type === 2" :title="distitle" :distCode="distCode" @goFarm="goFarm" @backBtn="backBtn"></district>
     <!-- 牧场级   -->
-    <farm v-if="!isProvince && type === 4" :farmCode="farmCode" :farmName="farmName" @backBtn="backBtn"></farm>
+    <farm v-if="!isProvince && type === 4" :farmCode="farmCode" :isColl="isColl" :farmName="farmName" @backBtn="backBtn"></farm>
     <!-- 省级  -->
     <proinvce v-if="isProvince" @getCountyCode="getCountyCode"></proinvce>
   </div>
@@ -44,6 +44,7 @@ export default {
       title: '',
       farmName: '',
       distitle: '',
+      isColl: false,
     }
   },
   methods: {
@@ -91,6 +92,7 @@ export default {
       this.farmCode = farmCode;
       this.type = Number(type);
       this.isProvince = false;
+      this.isColl = this.$route.query.isColl;
       console.log(this.type);
     }
   }

src/views/pastureData/homeComponent/farm.vue

@@ -167,7 +167,7 @@ export default {
   components: {
     TableFooter
   },
-  props: ['farmCode', 'farmName'],
+  props: ['farmCode', 'farmName', 'isColl'],
   data() {
     return {
       boxList: {},
@@ -317,7 +317,11 @@ export default {
           })
     },
     backBtn() {
-      this.$emit('backBtn', 4);
+      if(this.isColl == false) {
+        this.$emit('backBtn', 4);
+      } else {
+        this.$router.replace('/collectData');
+      }
     }
   },
   mounted() {