xsh %!s(int64=3) %!d(string=hai) anos
pai
achega
4ee8963644
Modificáronse 2 ficheiros con 11 adicións e 4 borrados
  1. 8 2
      src/views/deviceAdmin/deviceAdmin.vue
  2. 3 2
      src/views/pastureData/dayData.vue

+ 8 - 2
src/views/deviceAdmin/deviceAdmin.vue

@@ -152,6 +152,12 @@
           align="center">
         </el-table-column>
         <el-table-column
+            prop="unitName"
+            label="单元"
+            width="100"
+            align="center">
+        </el-table-column>
+        <el-table-column
           prop="serverIp"
           label="上传服务器地址"
           width="105"
@@ -249,7 +255,7 @@ export default {
         }
       ],
       farmList: [ // 查询条件 - 牧场选择
-        // 
+        //
       ],
       searchForm: { // 查询条件
         registerTime: [],
@@ -407,7 +413,7 @@ export default {
       this.pageIndex = val
       this.init()
     },
-    // 清空 el-form 
+    // 清空 el-form
     resetForm(form) {
       this.$refs[form].resetFields()
     },

+ 3 - 2
src/views/pastureData/dayData.vue

@@ -34,6 +34,7 @@
             <el-date-picker
                 v-model="value1"
                 type="date"
+                :clearable="false"
                 value-format="yyyy-MM-dd"
                 placeholder="选择日期">
             </el-date-picker>
@@ -245,12 +246,12 @@ export default {
     // 修改size
     sizeChange(val) {
       this.pageSize = val;
-      this.init()
+      this.initTable()
     },
     // 修改页数
     pageChange(val) {
       this.pageNum = val;
-      this.init()
+      this.initTable()
     },
     renderHeader(createElement, { column }) {
       const label = column.label