.

src/views/deliveryRoomManagement/detail/Detail.vue

@@ -8,16 +8,16 @@
                 </el-col>
                 <el-col :span="6" style="text-align:right;">
                     <div>
-                        <el-date-picker
+                        <!-- <el-date-picker
                             v-model="date"
                             @change="pickerChange"
                             type="date"
                             placeholder="选择日期"
-                        ></el-date-picker>
+                        ></el-date-picker>-->
                     </div>
                 </el-col>
                 <el-col :span="2" style="text-align:right;">
-                    <el-link type="primary" @click="toSowDetail">查看母猪信息</el-link>
+                    <!-- <el-link type="primary" @click="toSowDetail">查看母猪信息</el-link> -->
                 </el-col>
             </el-row>
         </header>
@@ -133,7 +133,8 @@
             </article>
             <article class="charts">
                 <div>
-                    <E-Con-T :dataArr="containerT" :timeArr="containertime"></E-Con-T>
+                    <!-- <E-Con-T :dataArr="containerT" :timeArr="containertime"></E-Con-T> -->
+                    <E-Con-T :dataArr="envTemp" :timeArr="time"></E-Con-T>
                 </div>
                 <div>
                     <E-Sow-T :dataArr="animalTemp" :timeArr="time"></E-Sow-T>
@@ -260,23 +261,6 @@ const pickerOptions = {
         }
     ]
 };
-const format = {
-    f1(percentage) {
-        return `产仔数:${14}`;
-    },
-    f2(percentage) {
-        return `活仔数:${14}`;
-    },
-    f3(percentage) {
-        return `存活率:${percentage}%`;
-    },
-    f4(percentage) {
-        return `预计断奶剩余天数:${30}`;
-    },
-    f5(percentage) {
-        return `仔猪日龄:${30}`;
-    }
-};
 
 export default {
     name: "Detail",
@@ -291,7 +275,23 @@ export default {
             active: 3,
             bed: null,
             date: "",
-            format,
+            format: {
+                f1: (percentage) => {
+                    return `产仔数:${this.bed.litter.deliverNumber}`;
+                },
+                f2:(percentage) => {
+                    return `活仔数:${this.bed.litter.deliverNumber}`;
+                },
+                f3:(percentage) => {
+                    return `存活率:${percentage}%`;
+                },
+                f4:(percentage) => {
+                    return `预计断奶剩余天数:${30}`;
+                },
+                f5:(percentage) => {
+                    return `仔猪日龄:${30}`;
+                }
+            },
             empty: [[], []],
             isShow: false,
             containerT: [],
@@ -314,9 +314,7 @@ export default {
             let data = { code };
             reqBedInfo(data)
                 .then(res => {
-                    console.log(res);
                     this.bed = res;
-                    console.log(99999999999999);
                     // 获取耳标温度
                     this.getEarTagTemp();
                     //加载分析系统 设备数据
@@ -335,17 +333,16 @@ export default {
                 end: new Date().getTime()
             })
                 .then(res => {
-                    console.log(res);
-                    this.time = []
-                    this.envTemp = []
-                    this.animalTemp = []
-                    this.battery = []
+                    this.time = [];
+                    this.envTemp = [];
+                    this.animalTemp = [];
+                    this.battery = [];
                     res.content.forEach(item => {
-                        this.time.unshift(item.time)
-                        this.envTemp.unshift(item.envTemp)
-                        this.animalTemp.unshift(item.animalTemp)
-                        this.battery.unshift(item.battery * 100)
-                    })
+                        this.time.unshift(item.time);
+                        this.envTemp.unshift(item.envTemp);
+                        this.animalTemp.unshift(item.animalTemp);
+                        this.battery.unshift(item.battery * 100);
+                    });
                 })
                 .catch(err => {
                     console.error(err);
@@ -365,7 +362,9 @@ export default {
                             this.loadImage(this.piggyData[i], i);
                             //
                             this.containerT.unshift(this.piggyData[i].temp);
-                            this.containertime.unshift(this.piggyData[i].created);
+                            this.containertime.unshift(
+                                this.piggyData[i].created
+                            );
                         }
                     }
                 })

src/views/deliveryRoomManagement/detail/charts/EConT.vue

@@ -14,9 +14,20 @@ export default {
     data() {
         return {};
     },
+    computed: {
+        // 原始温度上加 3
+        dataArr2() {
+            return this.dataArr.map(item => {
+                return item * 1 + 3.18
+            })
+        }
+    },
     watch: {
-        dataArr() {
+        dataArr(v) {
             this.drawChart();
+            return v.map(item => {
+                return item + 3
+            })
         }
     },
     mounted() {
@@ -82,7 +93,7 @@ export default {
                     {
                         name: "时间",
                         type: "line",
-                        data: this.dataArr,
+                        data: this.dataArr2,
                         markPoint: {
                             data: [
                                 { type: "max", name: "最大值" },

src/views/deliveryRoomManagement/detail/charts/EEleT.vue

@@ -25,9 +25,7 @@ export default {
     methods: {
         drawChart() {
             // 基于准备好的dom，初始化echarts实例
-            let myChart = this.$echarts.init(
-                document.getElementById("EEleT")
-            );
+            let myChart = this.$echarts.init(document.getElementById("EEleT"));
             // 指定图表的配置项和数据
             let option = {
                 title: {
@@ -76,7 +74,21 @@ export default {
                     axisLabel: {
                         formatter: "{value} %"
                     },
-                    scale: true
+                    scale: true,
+                    max: val => {
+                        if (val.max + 5 > 100) {
+                            return 100;
+                        } else {
+                            return val.max + 5;
+                        }
+                    },
+                    min: val => {
+                        if (val.min - 10 < 0) {
+                            return 0;
+                        } else {
+                            return val.min - 10;
+                        }
+                    }
                 },
                 series: [
                     {