主页

src/router/childrenRouters.js

@@ -18,6 +18,7 @@ const childrenRouters = [
     meta: {
       title: '存栏走势',
       defaultUrl: false,
+      id: 1
     }
   },
   {
@@ -27,6 +28,7 @@ const childrenRouters = [
     meta: {
       title: '每日数据',
       defaultUrl: false,
+      id: 1
     }
   },
   {
@@ -36,6 +38,7 @@ const childrenRouters = [
     meta: {
       title: '数据详情',
       defaultUrl: false,
+      id: 1
     }
   },
   {
@@ -55,7 +58,7 @@ const childrenRouters = [
     meta: {
       title: '牧场对比',
       defaultUrl: false,
-      id: 3,
+      id: 2,
     }
   },
   {
@@ -74,7 +77,8 @@ const childrenRouters = [
     component: () => import('../views/deviceAdmin/deviceInfo.vue'),
     meta: {
       title: '设备详情',
-      defaultUrl: false
+      defaultUrl: false,
+      id: 3,
     }
   }
 ]

src/views/MainLayout.vue

@@ -62,7 +62,7 @@ export default {
           children: [
             {
               id: "10",
-              name: '牧场概况',
+              name: '每日汇总',
               url: '/'
             },
             {
@@ -72,7 +72,7 @@ export default {
             },
             {
               id: '30',
-              name: '每日数据',
+              name: '耳标数据',
               url: '/dayData'
             }
           ]
@@ -123,13 +123,12 @@ export default {
     }
   },
   mounted() {
-    console.log(this.$route);
-    this.title = this.$route.meta.title;
     this.defaultUrl = this.$route.path;
-    if(this.$route.meta.defaultUrl) {
-      this.defaultUrl = this.$route.path;
-      this.navIndex = this.$route.meta.id;
-    }
+    this.updateSelected(this.$route.meta.id);
+    // this.navIndex = this.$route.meta.id;
+    // if(this.$route.meta.defaultUrl) {
+    //   this.defaultUrl = this.$route.path;
+    // }
   }
 }
 </script>

src/views/pastureData/chart/chartMzxz.vue

@@ -35,6 +35,7 @@ export default {
         legend: {
           data: ['母猪新增', '母猪离线']
         },
+        color: ['#8594DF', '#68C0DF'],
         grid: {
           left: '3%',
           right: '4%',
@@ -53,14 +54,26 @@ export default {
           {
             name: '母猪新增',
             type: 'line',
-            stack: '总量',
-            data: [120, 132, 101, 134, 90, 230, 210]
+            data: [120, 132, 101, 134, 90, 230, 210],
+            itemStyle: {
+              normal: {
+                label: { // 显示数值
+                  show: true
+                }
+              },
+            },
           },
           {
             name: '母猪离线',
             type: 'line',
-            stack: '总量',
-            data: [220, 182, 191, 234, 290, 330, 310]
+            data: [220, 182, 191, 234, 290, 330, 310],
+            itemStyle: {
+              normal: {
+                label: { // 显示数值
+                  show: true
+                }
+              },
+            },
           },
         ]
       }

src/views/pastureData/chart/chartTemp.vue

@@ -95,9 +95,9 @@ export default {
               itemStyle: {
                 normal: {
                   color: '#7ED3F4', // 改变折线点的颜色
-                  label: { // 显示数值
-                    show: true
-                  }
+                  // label: { // 显示数值
+                  //   show: true
+                  // }
                 },
               },
               data: that.tempList[1],
@@ -110,9 +110,9 @@ export default {
               itemStyle: {
                 normal: {
                   color: '#6EE9CF', // 改变折线点的颜色
-                  label: { // 显示数值
-                    show: true
-                  }
+                  // label: { // 显示数值
+                  //   show: true
+                  // }
                 },
               },
               data: that.tempList[2],

src/views/pastureData/dayData.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="home">
+    <div class="header_title">耳标数据</div>
     <div class="box" v-if="show">
       <div class="box_item">
         <p>母猪存栏</p>
@@ -295,24 +296,32 @@ export default {
       this.loading = true;
       let starttime = String(`${this.value1} 00:00:00`);
       let endtime = String(`${this.value1} 23:59:59`);
-      let data = {
-        farmID: this.farmCode,
-        starttime: starttime,
-        endtime: endtime,
-        page: this.pageNum,
-        limit: this.pageSize
-      }
+      let fromData = new FormData();
+      fromData.append('farmID', this.farmCode);
+      fromData.append('starttime', starttime);
+      fromData.append('endtime', endtime);
+      fromData.append('page', this.pageNum);
+      fromData.append('limit', this.pageSize);
+      // let data = {
+      //   farmID: this.farmCode,
+      //   starttime: starttime,
+      //   endtime: endtime,
+      //   page: this.pageNum,
+      //   limit: this.pageSize
+      // }
       if(this.eartagNo !== ''){
-        data.eartagNo = this.eartagNo;
+        fromData.append('eartagNo', this.eartagNo);
+        // data.eartagNo = this.eartagNo;
       }
       if(this.deviceCode !=='') {
-        data.deviceCode = this.deviceCode;
+        fromData.append('deviceCode', this.deviceCode);
+        // data.deviceCode = this.deviceCode;
       }
       //http://122.112.224.199:9500/manager/eartagdata/findByConditions
       this.$http({
         url: this.$http.adornUrl("http://122.112.224.199:9500/manager/eartagdata/findByConditions"),
         method: 'post',
-        data: this.$http.adornData(data),
+        data: fromData,
       }).then(res => {
         this.loading = false;
         if(res.data.code === 0) {
@@ -385,4 +394,13 @@ export default {
   box-sizing: border-box;
   padding: 10px;
 }
+.header_title {
+  height: 40px;
+  background-color: #F7F7F7;
+  border: 1px solid #ddd;
+  line-height: 40px;
+  color: #6FA8C8;
+  margin-bottom: 10px;
+  padding-left: 20px;
+}
 </style>

src/views/pastureData/hand.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="band">
+    <div class="header_title">存栏走势</div>
     <div class="box">
       <div class="box_header">
         <span>母猪存栏统计</span>
@@ -241,7 +242,7 @@ export default {
   .band {
     width: 100%;
     box-sizing: border-box;
-    padding: 20px 0;
+    /*padding: 20px 0;*/
   }
   .box {
     border: 1px solid #ddd;
@@ -296,4 +297,13 @@ export default {
     color: #fff;
     border: 1px solid #1abc9c;
   }
+  .header_title {
+    height: 40px;
+    background-color: #F7F7F7;
+    border: 1px solid #ddd;
+    line-height: 40px;
+    color: #6FA8C8;
+    margin-bottom: 10px;
+    padding-left: 20px;
+  }
 </style>

src/views/pastureData/homeComponent/city.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="header_title">牧场概况--{{title}}
+    <div class="header_title">每日汇总--{{title}}
       <div class="right_float" @click="backBtn">返回上一页</div>
     </div>
     <div>
@@ -51,26 +51,26 @@
                 align="right">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="母猪存栏:">
-            <el-input style="width: 50px;" v-model="minStockTotal"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxStockTotal"></el-input>
-          </el-form-item>
-          <el-form-item label="母猪新增:">
-            <el-input style="width: 50px;" v-model="minStockNew"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxStockNew"></el-input>
-          </el-form-item>
-          <el-form-item label="耳标离线:">
-            <el-input style="width: 50px;" v-model="minOfflineNo"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxOfflineNo"></el-input>
-          </el-form-item>
-          <el-form-item label="能繁母猪:">
-            <el-input style="width: 50px;" v-model="minSowStock"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxSowStock"></el-input>
-          </el-form-item>
+<!--          <el-form-item label="母猪存栏:">-->
+<!--            <el-input style="width: 50px;" v-model="minStockTotal"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxStockTotal"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="母猪新增:">-->
+<!--            <el-input style="width: 50px;" v-model="minStockNew"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxStockNew"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="耳标离线:">-->
+<!--            <el-input style="width: 50px;" v-model="minOfflineNo"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxOfflineNo"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="能繁母猪:">-->
+<!--            <el-input style="width: 50px;" v-model="minSowStock"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxSowStock"></el-input>-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" @click="search">查询</el-button>
           </el-form-item>
@@ -133,11 +133,11 @@
               label="公猪存栏">
           </el-table-column>
         </el-table>
-        <table-footer
-            :totals="totalPages"
-            :size="pageSize"
-            @sizeChange="sizeChange"
-            @pageChange="pageChange"></table-footer>
+<!--        <table-footer-->
+<!--            :totals="totalPages"-->
+<!--            :size="pageSize"-->
+<!--            @sizeChange="sizeChange"-->
+<!--            @pageChange="pageChange"></table-footer>-->
       </div>
     </div>
   </div>
@@ -145,13 +145,13 @@
 
 <script>
 import areaZz from "../../../components/areaZz";
-import TableFooter from "../../../components/TableFooter";
+// import TableFooter from "../../../components/TableFooter";
 import {mapState} from "vuex";
 export default {
   name: "city",
   components: {
     areaZz,
-    TableFooter
+    // TableFooter
   },
   data() {
     return {

src/views/pastureData/homeComponent/district.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="header_title">牧场概况--{{title}}
+    <div class="header_title">每日汇总--{{title}}
       <div class="right_float" @click="backBtn">返回上一页</div>
     </div>
     <div>
@@ -39,26 +39,26 @@
           <el-form-item label="牧场名:">
             <el-input v-model="farmName"></el-input>
           </el-form-item>
-          <el-form-item label="母猪存栏:">
-            <el-input style="width: 50px;" v-model="minStockTotal"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxStockTotal"></el-input>
-          </el-form-item>
-          <el-form-item label="母猪新增:">
-            <el-input style="width: 50px;" v-model="minStockNew"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxStockNew"></el-input>
-          </el-form-item>
-          <el-form-item label="耳标离线:">
-            <el-input style="width: 50px;" v-model="minOfflineNo"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxOfflineNo"></el-input>
-          </el-form-item>
-          <el-form-item label="能繁母猪:">
-            <el-input style="width: 50px;" v-model="minSowStock"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxSowStock"></el-input>
-          </el-form-item>
+<!--          <el-form-item label="母猪存栏:">-->
+<!--            <el-input style="width: 50px;" v-model="minStockTotal"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxStockTotal"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="母猪新增:">-->
+<!--            <el-input style="width: 50px;" v-model="minStockNew"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxStockNew"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="耳标离线:">-->
+<!--            <el-input style="width: 50px;" v-model="minOfflineNo"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxOfflineNo"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="能繁母猪:">-->
+<!--            <el-input style="width: 50px;" v-model="minSowStock"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxSowStock"></el-input>-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" @click="search">查询</el-button>
           </el-form-item>
@@ -198,10 +198,12 @@ export default {
     // 修改size
     sizeChange(val) {
       this.pageSize = val;
+      this.initCounty();
     },
     // 修改页数
     pageChange(val) {
       this.pageNum = val;
+      this.initCounty();
     },
     search() {
       this.initCounty();
@@ -233,7 +235,9 @@ export default {
         minOfflineNo: this.minOfflineNo,
         maxOfflineNo: this.maxOfflineNo,
         minSowStock: this.minSowStock,
-        maxSowStock: this.maxSowStock
+        maxSowStock: this.maxSowStock,
+        page: this.pageNum,
+        limit: this.pageSize,
       }
       this.$http({
         url: this.$http.adornUrl(`${this.baseUrl}/manager/farmstock/list`),
@@ -243,6 +247,7 @@ export default {
           .then(res => {
             if(res.data.code === 0) {
               this.tableData = res.data.page.list;
+              this.totalPages = res.data.page.totalCount;
             }
           })
     },
@@ -252,14 +257,20 @@ export default {
     },
     // 统计
     initState() {
+      let params = {
+        countyCode: this.distCode,
+        page: this.pageNum,
+        limit: this.pageSize,
+      }
       this.$http({
         url: this.$http.adornUrl('http://122.112.224.199:9000/manager/dailytabulatedata/countAllsow'),
         method: 'get',
-        params: this.$http.adornParams({countyCode: this.distCode})
+        params: this.$http.adornParams(params)
       })
           .then(res => {
             if(res.data.code === 0) {
               this.boxList = res.data.data;
+              // this.totalPages = res.data.
             }
           })
     },

src/views/pastureData/homeComponent/farm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="header_title">牧场概况--{{farmName}}
+    <div class="header_title">每日汇总--{{farmName}}
       <div class="right_float" @click="backBtn">返回上一页</div>
     </div>
     <div>
@@ -47,26 +47,26 @@
                 align="right">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="母猪存栏:">
-            <el-input style="width: 50px;" v-model="minStockTotal"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxStockTotal"></el-input>
-          </el-form-item>
-          <el-form-item label="母猪新增:">
-            <el-input style="width: 50px;" v-model="minStockNew"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxStockNew"></el-input>
-          </el-form-item>
-          <el-form-item label="耳标离线:">
-            <el-input style="width: 50px;" v-model="minOfflineNo"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxOfflineNo"></el-input>
-          </el-form-item>
-          <el-form-item label="能繁母猪:">
-            <el-input style="width: 50px;" v-model="minSowStock"></el-input>
-            &nbsp;至&nbsp;
-            <el-input style="width: 50px;" v-model="maxSowStock"></el-input>
-          </el-form-item>
+<!--          <el-form-item label="母猪存栏:">-->
+<!--            <el-input style="width: 50px;" v-model="minStockTotal"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxStockTotal"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="母猪新增:">-->
+<!--            <el-input style="width: 50px;" v-model="minStockNew"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxStockNew"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="耳标离线:">-->
+<!--            <el-input style="width: 50px;" v-model="minOfflineNo"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxOfflineNo"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="能繁母猪:">-->
+<!--            <el-input style="width: 50px;" v-model="minSowStock"></el-input>-->
+<!--            &nbsp;至&nbsp;-->
+<!--            <el-input style="width: 50px;" v-model="maxSowStock"></el-input>-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" @click="search">查询</el-button>
           </el-form-item>
@@ -228,10 +228,12 @@ export default {
     // 修改size
     sizeChange(val) {
       this.pageSize = val;
+      this.onFarm();
     },
     // 修改页数
     pageChange(val) {
       this.pageNum = val;
+      this.onFarm();
     },
     search() {
       // this.init();
@@ -266,6 +268,8 @@ export default {
         maxOfflineNo: this.maxOfflineNo,
         minSowStock: this.minSowStock,
         maxSowStock: this.maxSowStock,
+        page: this.pageNum,
+        limit: this.pageSize
       }
       this.$http({
         url: this.$http.adornUrl(`${this.baseUrl}/manager/dailytabulatedata/list`),
@@ -275,8 +279,8 @@ export default {
           .then(res => {
             if(res.data.code === 0) {
               this.tableData = res.data.page.list;
+              this.totalPages = res.data.page.totalCount;
             }
-            console.log(res);
           })
     },
     // 选择

src/views/pastureData/homeComponent/proinvce.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="header_title">牧场概况--浙江省</div>
+    <div class="header_title">每日汇总--浙江省</div>
     <div class="box">
       <div class="box_item">
         <p>母猪总存栏</p>
@@ -48,26 +48,26 @@
               align="right">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="母猪存栏:">
-          <el-input style="width: 50px;" v-model="minStockTotal"></el-input>
-          &nbsp;至&nbsp;
-          <el-input style="width: 50px;" v-model="maxStockTotal"></el-input>
-        </el-form-item>
-        <el-form-item label="母猪新增:">
-          <el-input style="width: 50px;" v-model="minStockNew"></el-input>
-          &nbsp;至&nbsp;
-          <el-input style="width: 50px;" v-model="maxStockNew"></el-input>
-        </el-form-item>
-        <el-form-item label="耳标离线:">
-          <el-input style="width: 50px;" v-model="minOfflineNo"></el-input>
-          &nbsp;至&nbsp;
-          <el-input style="width: 50px;" v-model="maxOfflineNo"></el-input>
-        </el-form-item>
-        <el-form-item label="能繁母猪:">
-          <el-input style="width: 50px;" v-model="minSowStock"></el-input>
-          &nbsp;至&nbsp;
-          <el-input style="width: 50px;" v-model="maxSowStock"></el-input>
-        </el-form-item>
+<!--        <el-form-item label="母猪存栏:">-->
+<!--          <el-input style="width: 50px;" v-model="minStockTotal"></el-input>-->
+<!--          &nbsp;至&nbsp;-->
+<!--          <el-input style="width: 50px;" v-model="maxStockTotal"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="母猪新增:">-->
+<!--          <el-input style="width: 50px;" v-model="minStockNew"></el-input>-->
+<!--          &nbsp;至&nbsp;-->
+<!--          <el-input style="width: 50px;" v-model="maxStockNew"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="耳标离线:">-->
+<!--          <el-input style="width: 50px;" v-model="minOfflineNo"></el-input>-->
+<!--          &nbsp;至&nbsp;-->
+<!--          <el-input style="width: 50px;" v-model="maxOfflineNo"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="能繁母猪:">-->
+<!--          <el-input style="width: 50px;" v-model="minSowStock"></el-input>-->
+<!--          &nbsp;至&nbsp;-->
+<!--          <el-input style="width: 50px;" v-model="maxSowStock"></el-input>-->
+<!--        </el-form-item>-->
         <el-form-item>
           <el-button type="primary" @click="search">查询</el-button>
         </el-form-item>
@@ -130,24 +130,24 @@
             label="公猪存栏">
         </el-table-column>
       </el-table>
-      <table-footer
-          :totals="totalPages"
-          :size="pageSize"
-          @sizeChange="sizeChange"
-          @pageChange="pageChange"></table-footer>
+<!--      <table-footer-->
+<!--          :totals="totalPages"-->
+<!--          :size="pageSize"-->
+<!--          @sizeChange="sizeChange"-->
+<!--          @pageChange="pageChange"></table-footer>-->
     </div>
   </div>
 </template>
 
 <script>
 import areaZz from "../../../components/areaZz";
-import TableFooter from "../../../components/TableFooter";
+// import TableFooter from "../../../components/TableFooter";
 import {mapState} from "vuex";
 export default {
   name: "proinvce",
   components: {
     areaZz,
-    TableFooter
+    // TableFooter
   },
   data() {
     return {