.

src/main.js

@@ -10,19 +10,19 @@ import vueModuleLoader from 'vue-module-loader'
 import localModule from './module'
 import './assets/css/reset.scss'
 
-// import echarts from "echarts";
-// Vue.prototype.$echarts = echarts;
-
-/* 按需导入 */
-import echarts from 'echarts/lib/echarts'
- // 引入折线图/柱状图等组件
-import 'echarts/lib/chart/line'
-import 'echarts/lib/chart/bar'
-import 'echarts/lib/component/title'
-import 'echarts/lib/component/toolbox'
-import 'echarts/lib/component/markPoint' // 最值
-import 'echarts/lib/component/markLine' // 平均值
-import 'echarts/lib/component/legendScroll'
+import echarts from "echarts";
+
+
+// /* 按需导入 */
+// import echarts from 'echarts/lib/echarts'
+//  // 引入折线图/柱状图等组件
+// import 'echarts/lib/chart/line'
+// import 'echarts/lib/chart/bar'
+// import 'echarts/lib/component/title'
+// import 'echarts/lib/component/toolbox'
+// import 'echarts/lib/component/markPoint' // 最值
+// import 'echarts/lib/component/markLine' // 平均值
+// import 'echarts/lib/component/legendScroll'
 
 Vue.prototype.$echarts = echarts
 

src/views/Home/Home.vue

@@ -286,6 +286,7 @@ export default {
                     position: fixed;
                     .item {
                         margin-right: 8px;
+                        cursor: pointer;
                     }
                 }
                 .warp {

src/views/groupManagment/GroupRecord.vue

@@ -63,18 +63,18 @@ export default {
         return {
             value: "",
             tableData: [
-                {
-                    date: "2020-05-02",
-                    name: "可用",
-                    id: '853',
-                    address: "6895564457554"
-                },
-                {
-                    date: "2020-05-04",
-                    name: "不可用",
-                    id: '854',
-                    address: "6895564456725"
-                },
+                // {
+                //     date: "2020-05-02",
+                //     name: "可用",
+                //     id: '853',
+                //     address: "6895564457554"
+                // },
+                // {
+                //     date: "2020-05-04",
+                //     name: "不可用",
+                //     id: '854',
+                //     address: "6895564456725"
+                // },
                 {
                     date: "2020-05-04",
                     name: "不可用",
@@ -87,12 +87,6 @@ export default {
                     id: '858',
                     address: "6895564456725"
                 },
-                // {
-                //     date: "2020-05-03",
-                //     name: "可用",
-                //     id: '830',
-                //     address: "6895564457594"
-                // }
             ]
         };
     },

src/views/groupManagment/UnityTrace/UnityTrace.vue

@@ -9,8 +9,8 @@
                         <span class="content">1540</span>
                     </el-col>
                     <el-col class="col">
-                        <span class="title">出生天数：</span>
-                        <span class="content">51</span>
+                        <span class="title">日龄：</span>
+                        <span class="content">421</span>
                     </el-col>
                 </el-row>
                 <el-row type="flex" class="row">
@@ -30,7 +30,7 @@
                     </el-col>
                     <el-col class="col">
                         <span class="title">当前位置：</span>
-                        <span class="content">育肥舍四栋</span>
+                        <span class="content">产房</span>
                     </el-col>
                 </el-row>
                 <el-row type="flex" class="row">
@@ -40,7 +40,7 @@
                     </el-col>
                     <el-col class="col">
                         <span class="title">饲养员：</span>
-                        <span class="content">某某某</span>
+                        <span class="content">曹东华</span>
                     </el-col>
                 </el-row>
             </ul>
@@ -181,12 +181,17 @@ export default {
                     if(this.mainInfo.id == 853) tt = 0.83
                     if(this.mainInfo.id == 854) tt = 0.9
                     if(this.mainInfo.id == 857) tt = 0.91
-                    if(this.mainInfo.id == 858) tt = 0.89
+                    if(this.mainInfo.id == 858) tt = 0.88
                     res.forEach((item, index) => {
                         dateArr.push(item.created)
                         
                         animalTempArr.push((item.animalTemp * tt).toFixed(2))
-                        batteryArr.push(item.battery*100)
+                        if(item.battery*100 >= 100) {
+                            batteryArr.push(100)
+                        }else {
+                            batteryArr.push(item.battery*100)
+                        }
+                        
                         envTempArr.push((item.envTemp * tt).toFixed(2))
                     });
                     this.dateArr = dateArr

src/views/groupManagment/UnityTrace/charts/chart_a.vue

@@ -42,7 +42,7 @@ export default {
                     left: 100
                 },
                 tooltip: {
-                    trigger: "axis"
+                    trigger: "axis",
                 },
                 toolbox: {
                     show: true,
@@ -96,6 +96,7 @@ export default {
                                 { type: "min", name: "最小值" }
                             ]
                         },
+                        symbol: '',
                         markLine: {
                             data: [{ type: "average", name: "平均值" }]
                         }