.

src/views/deviceAdmin/deviceAdmin.vue

@@ -42,16 +42,6 @@
         <el-button plain size="mini" class="button-margin">批量上传</el-button>
         <el-button type="primary" plain size="mini">新增设备</el-button>
       </div>
-      <!-- <div class="title-right">
-        <el-select v-model="pageSize" size="mini" style="width: 70%">
-          <el-option
-            v-for="item in pageSizeList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </div> -->
     </div>
     <!-- 表格 -->
     <el-table
@@ -65,8 +55,87 @@
         width="55">
       </el-table-column>
       <el-table-column
-        prop="date"
-        label="日期"
+        prop="id"
+        label="注册ID"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="registerTime"
+        label="注册时间"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="deviceCode"
+        label="设备编码"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="countyName"
+        label="省市县"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="countyCode"
+        label="省市县编码"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="farmName"
+        label="牧场名称"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="farmCode"
+        label="牧场编码"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="stage"
+        label="阶段"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="pigpenName"
+        label="栋舍"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="serverIp"
+        label="上传服务器地址"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="port"
+        label="端口"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="lastTime"
+        label="最后上传时间"
+        sortable
+        width="180">
+      </el-table-column>
+      <!-- 这里需要修改 -->
+      <el-table-column
+        prop="delStatus"
+        label="状态"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="id"
+        label="操作"
         sortable
         width="180">
       </el-table-column>
@@ -110,12 +179,14 @@ export default {
         }
       ],
       searchForm: {
-        registerTime: '',
+        farmCode: '',
+        registerStartTime: '',
+        registerEndTime: '',
         deviceCode: '',
-        county: '',
-        farm: '',
-        pigsty: '',
-        status: ''
+        countyName: '',
+        farmName: '',
+        acqStatus: '',
+        sortord: ''
       },
       pageSizeList: [ // 表格显示条数
         {
@@ -157,24 +228,30 @@ export default {
         params: this.$http.adornParams({
           'page': this.pageIndex,
           'limit': this.pageSize,
-          // 'farmCode': this.form.farmCode || undefined,
-          // 'registerStartTime': this.form.registerStartTime || undefined,
-          // 'registerEndTime': this.form.registerEndTime || undefined,
-          // 'deviceCode': this.form.deviceCode || undefined,
-          // 'countyName': this.form.countyName || undefined,
-          // 'farmName': this.form.farmName || undefined,
-          // 'acqStatus': this.form.acqStatus || undefined,
-          // 'sortord': this.form.sortord || undefined,
+          'farmCode': this.searchForm.farmCode || undefined,
+          'registerStartTime': this.searchForm.registerStartTime || undefined,
+          'registerEndTime': this.searchForm.registerEndTime || undefined,
+          'deviceCode': this.searchForm.deviceCode || undefined,
+          'countyName': this.searchForm.countyName || undefined,
+          'farmName': this.searchForm.farmName || undefined,
+          'acqStatus': this.searchForm.acqStatus || undefined,
+          'sortord': this.searchForm.sortord || undefined
         }, false)
       }).then(async({data}) => {
         console.log(data);
+        this.tableData = data.page.list
+        this.totalPages = data.page.totalPage
         this.dataListLoading = false
       })
     },
     // 显示条数改变
-    sizeChange () {},
+    sizeChange (val) {
+      this.pageSize = val
+    },
     // 页数改变
-    pageChange () {}
+    pageChange (val) {
+      this.pageIndex = val
+    }
   },
   mounted() {
     this.init()