2021-07-22

src/views/modules/breed/beartag-dialog.vue

@@ -2,7 +2,8 @@
   <el-dialog
     :title="'猪只耳标：' + eartag"
     :visible.sync="visible"
-    :fullscreen="true">
+    :fullscreen="true"
+    @close="close">
     <div style="height: 90vh">
       <div id="line1" style="height: 20%;"></div>
       <div id="line2" style="height: 20%; margin-top: 30px"></div>
@@ -18,7 +19,8 @@ export default {
     return {
       visible: false,
       eartag: '',
-      data: null
+      data: null,
+      load: null
     }
   },
   props: ['time'],
@@ -125,7 +127,7 @@ export default {
       } else {
         options = {
           title: {
-            text: '暂无数据',
+            text: '温度 - 暂无数据',
             x: 'center',
             y: 'center',
             textStyle: {
@@ -249,7 +251,7 @@ export default {
       } else {
         options1 = {
           title: {
-            text: '暂无数据',
+            text: '耳标电量 - 暂无数据',
             x: 'center',
             y: 'center',
             textStyle: {
@@ -375,7 +377,7 @@ export default {
       } else {
         options2 = {
           title: {
-            text: '暂无数据',
+            text: '运动量 - 暂无数据',
             x: 'center',
             y: 'center',
             textStyle: {
@@ -428,7 +430,7 @@ export default {
         };
       }
       // 睡眠
-      if (this.data.temp.length > 0) {
+      if (this.data.sleeptime.length > 0) {
         options3 = {
           title: {
             text: '睡眠',
@@ -521,7 +523,7 @@ export default {
       } else {
         options3 = {
           title: {
-            text: '暂无数据',
+            text: '睡眠 - 暂无数据',
             x: 'center',
             y: 'center',
             textStyle: {
@@ -582,7 +584,7 @@ export default {
     init (eartag) {
       console.log(this.time);
       this.visible = true
-      const load = this.$loading({
+      this.load = this.$loading({
         lock: true,
         text: '加载中...',
         spinner: 'el-icon-loading',
@@ -590,7 +592,7 @@ export default {
       })
       this.eartag = eartag
       this.$http({
-        url: this.$http.adornUrl('/management/eartagdate/searchDateByCondition'),
+        url: this.$http.adornUrl('/management/eartagdata/searchDataByCondition'),
         method: 'get',
         params: this.$http.adornParams({
           'eartag': this.eartag,
@@ -600,10 +602,24 @@ export default {
       }).then(({data}) => {
         if (data && data.code === 0) {
           this.data = data.page
+          this.load.close()
+        } else {
+          this.data = {
+            temp: [],
+            electric: [],
+            sports: [],
+            sleeptime: []
+          }
           this.drawChart()
-          load.close()
         }
       })
+    },
+    // 点击关闭图标
+    close () {
+      this.visible = false
+      if (this.load) {
+        this.load.close()
+      }
     }
   },
 }

src/views/modules/breed/beartag.vue

@@ -110,6 +110,7 @@
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
                 @change="timeChange"
+                ref="timePicker"
                 value-format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
             </el-form-item>
@@ -295,7 +296,7 @@
         unitSelectedList: [], // 根据栋舍限制的单元
         labelPosition: 'right',
         dialogVisible: false, // 控制 耳标信息dialog 的显示
-        time: [new Date(new Date().getTime() - 7*3600*1000*24), new Date()] // 查看耳标信息时要传入的值，默认七天之内的数据
+        time: [new Date((new Date()).getTime() - 7*24*3600*1000), new Date()] // 查看耳标信息时要传入的值，默认七天之内的数据
       }
     },
     components: {
@@ -305,6 +306,20 @@
       this.getDataList()
     },
     methods: {
+      timeFormat (date) {
+        let y = date.getFullYear();  
+        let m = date.getMonth() + 1;  
+        m = m < 10 ? ('0' + m) : m;  
+        let d = date.getDate();  
+        d = d < 10 ? ('0' + d) : d;  
+        let h = date.getHours();  
+        h=h < 10 ? ('0' + h) : h;  
+        let minute = date.getMinutes();  
+        minute = minute < 10 ? ('0' + minute) : minute;  
+        let second=date.getSeconds();  
+        second=second < 10 ? ('0' + second) : second;  
+        return y + '-' + m + '-' + d+' '+h+':'+minute+':'+second;
+      },
       // 获取数据列表
       getDataList (val) {
         // Date.prototype.format = function(fmt) { 
@@ -330,6 +345,13 @@
         // let now = new Date()
         // this.time[0] = new Date(now.getTime() - 7*24*3600*1000).format('yyyy-MM-dd hh:mm:ss')
         // this.time[1] = now.format('yyyy-MM-dd hh:mm:ss')
+        
+        // 默认时间设置
+        let now = new Date()
+        this.time[0] = this.timeFormat(new Date(now.getTime() - 7*24*3600*1000))
+        this.time[1] = this.timeFormat(new Date())
+        console.log(this.time);
+
         this.dataListLoading = true
         
         // 对 新增or删除 操作，当前页为最后一页
@@ -498,6 +520,7 @@
         this.$nextTick(() => {
           this.$refs.eartagDialog.init(eartag)
         })
+        console.log(this.time);
       }
     },
     watch: {