000

src/views/collectData/collectData.vue

@@ -75,9 +75,107 @@
       </div>
       <div class="chartDiv">
         <div class="title">
-          <span>综合实力排名</span>
+          <span>牧场排名</span>
+        </div>
+        <!-- 查询 -->
+        <div class="form_item">
+          <el-form :inline="true" size="mini">
+            <el-form-item label="母猪存栏:">
+              <el-input style="width: 50px;" v-model="searchForm.pigAllMin"></el-input>
+              &nbsp;至&nbsp;
+              <el-input style="width: 50px;" v-model="searchForm.pigAllMax"></el-input>
+            </el-form-item>
+            <el-form-item label="母猪新增:">
+              <el-input style="width: 50px;" v-model="searchForm.pigAddMin"></el-input>
+              &nbsp;至&nbsp;
+              <el-input style="width: 50px;" v-model="searchForm.pigAddMax"></el-input>
+            </el-form-item>
+            <el-form-item label="耳标离线:">
+              <el-input style="width: 50px;" v-model="searchForm.eartagMin"></el-input>
+              &nbsp;至&nbsp;
+              <el-input style="width: 50px;" v-model="searchForm.eartagMax"></el-input>
+            </el-form-item>
+            <el-form-item label="能繁母猪:">
+              <el-input style="width: 50px;" v-model="searchForm.bearPigMin"></el-input>
+              &nbsp;至&nbsp;
+              <el-input style="width: 50px;" v-model="searchForm.bearPigMax"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="search">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="box_table">
+          <el-table
+            :data="tableData"
+            border
+            stripe
+            :header-cell-style="{'text-align':'center', 'background-color': '#F9FAFC', 'padding': '5px 0', 'color': '#666666'}"
+            :cell-style="{'text-align':'center', 'padding': '5px 0'}"
+            height="700"
+            row-key="name"
+            default-expand-all
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+            style="width: 100%;"
+            @row-click="rowClick">
+            <el-table-column
+              label="牧场名"
+              prop="name">
+              <template slot-scope="scope">
+                <span style="cursor: pointer;" @click="onSelect(scope.row)">{{scope.row.name}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="母猪存栏">
+              <el-table-column
+                label="存栏量">
+              </el-table-column>
+              <el-table-column
+                label="省排名">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column
+              prop="eartagNew"
+              label="母猪存栏月增长">
+              <el-table-column
+                label="存栏月环比增长量">
+              </el-table-column>
+              <el-table-column
+                label="省排名">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column
+              prop="eartagNew"
+              label="MSY">
+              <el-table-column
+                label="MSY">
+              </el-table-column>
+              <el-table-column
+                label="省排名">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column
+              prop="eartagOffone"
+              label="今年累计出栏量">
+            </el-table-column>
+            <el-table-column
+              prop="sowStock"
+              label="预计年出栏量">
+            </el-table-column>
+            <el-table-column
+              prop="stock1"
+              label="目标年出栏量">
+            </el-table-column>
+            <el-table-column
+              prop="stock2"
+              label="目标完成度">
+            </el-table-column>
+          </el-table>
+          <table-footer
+            :totals="totalPages"
+            :size="pageSize"
+            @sizeChange="sizeChange"
+            @pageChange="pageChange"></table-footer>
         </div>
-        <div>表格</div>
       </div>
     </div>
     <el-button @click="toCollectDay">每日汇总</el-button>
@@ -88,6 +186,7 @@
 import lineChart from './charts/lineChart.vue'
 import hisChart from './charts/hisChart.vue'
 import areaZz from '../../components/areaZz.vue'
+import TableFooter from "../../components/TableFooter"
 export default {
   name: "collectData",
   data () {
@@ -124,12 +223,27 @@ export default {
       lineList: [],
       // 母猪存栏比较
       hisList: [],
+      searchForm: {
+        pigAllMin: '', // 母猪存栏
+        pigAllMax: '',
+        pigAddMin: '', // 母猪新增
+        pigAddMax: '',
+        eartagMin: '', // 耳标离线
+        eartagMax: '',
+        bearPigMin: '', // 能繁母猪
+        bearPigMax: ''
+      },
+      tableData: [],
+      totalPages: 0,
+      pageNum: 1,
+      pageSize: 20
     }
   },
   components: {
     lineChart,
     hisChart,
-    areaZz
+    areaZz,
+    TableFooter
   },
   methods: {
     /* 年月日选择 */
@@ -152,6 +266,14 @@ export default {
     toCollectDay () {
       this.$router.push('/collectDay')
     },
+    // 修改size
+    sizeChange(val) {
+      this.pageSize = val;
+    },
+    // 修改页数
+    pageChange(val) {
+      this.pageNum = val;
+    },
     // echarts 图的数据
     initEchart () {
       let data = {}
@@ -187,17 +309,32 @@ export default {
         }
       })
     },
+    // 牧场排名的查询
+    search () {
+      console.log('查询');
+    },
+    // 牧场排名 - 表格
     init () {
-      // this.$http({
-      //   url: this.$http.adornUrl(`http://192.168.1.57:8220/dataAnalysis/getPigStockByRegionCode`),
-      //   method: 'post',
-      //   data: this.$http.adornData({
-      //     'regionCode': this.form.id || undefined,
-      //     'start': this.form.registerTime + ' 00:00:00',
-      //     'end': this.form.deviceCode,
-      //     'type': this.form.countyName
-      //   })
-      // })
+      this.$http({
+        url: this.$http.adornUrl(`http://192.168.1.171:8210/management/sowranktable/list`),
+        method: 'post',
+        data: this.$http.adornData({
+          'page': this.pageNum,
+          'limit': this.pageSize
+        })
+      }).then(res => {
+      //   if(data.code === 0) {
+        console.log(res);
+      //     this.tableData = data.
+      //   } else {
+      //     this.hisList = [];
+      //   }
+      })
+    },
+    // 点击表格的某一行
+    rowClick (row) {
+      console.log(row);
+      console.log('点击了某一行');
     },
     // 省市县
     getCityCode (val) {
@@ -242,6 +379,7 @@ export default {
   mounted() {
     this.initEchart();
     this.initCom();
+    // this.init()
   },
 }
 </script>
@@ -317,4 +455,21 @@ export default {
   color: #fff;
   border: 1px solid #1abc9c;
 }
+.form_item {
+  width: 100%;
+  height: 60px;
+  background-color: #fff;
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
+  box-sizing: border-box;
+  padding: 15px;
+  margin-top: 15px;
+}
+.box_table {
+  width: 100%;
+  box-sizing: border-box;
+  margin-top: 15px;
+  padding-right: 10px;
+  /*padding: 10px;*/
+}
 </style>

src/views/deviceAdmin/deviceAdmin.vue

@@ -150,6 +150,7 @@
         align="center">
         <template slot-scope="scope">
           <span>{{ stageList[scope.row.stage - 1].label }}</span>
+          <!-- <span>{{ scope.row.stage }}</span> -->
         </template>
       </el-table-column>
       <el-table-column
@@ -292,7 +293,7 @@ export default {
       totalPages: 0, // 共 n 条数据
       pageIndex: 1, // 表格当前页数
       dataListLoading: true,
-      stageList: [ // 状态
+      stageList: [ // 阶段
         {
           value: 1,
           label: '配怀'
@@ -303,15 +304,31 @@ export default {
         },
         {
           value: 3,
-          label: '后备'
+          label: '保育'
         },
         {
           value: 4,
-          label: '空怀'
+          label: '育成育肥'
         },
         {
           value: 5,
+          label: '空怀'
+        },
+        {
+          value: 6,
+          label: '后备母猪'
+        },
+        {
+          value: 7,
           label: '公猪'
+        },
+        {
+          value: 8,
+          label: '病死猪场内收集'
+        },
+        {
+          value: 9,
+          label: '病死猪无害化'
         }
       ],
       networkList: [ // 网络通信状态 —— 查询条件 + 表格通用