2021-08-12

src/views/deviceAdmin/addOrUpdateUnit.vue

@@ -175,7 +175,8 @@ export default {
               'pigpenName': pigpenNames.join(','),
               'parentId': this.form.parentId,
               'type': 2,
-              'creatTime': utils.timeDate(new Date().getTime())
+              'creatTime': utils.timeDate(new Date().getTime()),
+              'farmCode': '330703010000422'
             })
           }).then(({data}) => {
             if (data && data.code === 0) {

src/views/deviceAdmin/deviceAdmin.vue

@@ -388,14 +388,6 @@ export default {
           'canStatus': this.searchForm.canStatus?? undefined
         }, false)
       }).then(({data}) => {
-        // let res = await this.$http({
-        //   url: this.$http.adornUrl(`${this.baseUrl}/manager/collectorregister/selectPcEveryStatusCollectors`),
-        //   method: 'get'
-        // })
-        // this.boxList[0].value = res.data.data.total
-        // this.boxList[1].value = res.data.data.normal
-        // this.boxList[2].value = res.data.data.abnormal
-        // this.boxList[3].value = res.data.data.logout
         this.tableData = data.page.list
         this.totalPages = data.page.totalCount
         this.dataListLoading = false

src/views/deviceAdmin/houseManage.vue

@@ -164,6 +164,7 @@ export default {
       this.$refs[form].resetFields()
     },
     // 初始化
+    // TODO: 牧场被写死了，需要后期修正
     init() {
       this.$http({
         url: this.$http.adornUrl(`${this.baseUrl}/manager/basepigpen/list`),
@@ -173,7 +174,7 @@ export default {
           'limit': this.pageSize,
           'farmCode': '330703010000422',
           'registerStartTime': this.searchForm.registerTime[0] || undefined,
-          'registerEndTime': this.searchForm.registerTime[1] || undefined,
+          'registerEndTime': this.searchForm.registerTime[1]? this.searchForm.registerTime[1] + '23:59:59': undefined,
           'stage': this.searchForm.stage || undefined,
           'pigpenName': this.searchForm.pigpenName || undefined
         }, false)