linan-0110 5 rokov pred
rodič
commit
f2f581251e

+ 1 - 0
src/views/deliveryRoom/DeliveryRoom.vue

@@ -116,6 +116,7 @@ export default {
             display: flex;
             flex-direction: row;
             flex-wrap: wrap;
+            
             .li {
                 display: flex;
                 flex-direction: column;

+ 21 - 6
src/views/deliveryRoom/detail/Detail.vue

@@ -83,8 +83,12 @@
         </section>
 
         <footer class="footer">
-            <chart-a></chart-a>
-            <chart-b></chart-b>
+            <div class="h">
+                <chart-a></chart-a>
+            </div>
+            <div class="d">
+                <chart-b></chart-b>
+            </div>
         </footer>
     </div>
 </template>
@@ -149,7 +153,7 @@ export default {
             this.$message.warning("母猪详细信息正在开发中!!");
         },
         goBack() {
-            this.$router.go(-1)
+            this.$router.go(-1);
         }
     }
 };
@@ -177,7 +181,10 @@ export default {
     }
     .section {
         display: flex;
+        padding-bottom: 20px;
+        border-bottom: 2px solid #eee;
         .left {
+            padding-left: 70px;
             width: 40%;
             // border: 2px solid rgb(182, 63, 63);
             .ul {
@@ -185,11 +192,13 @@ export default {
                     margin: 5px 0 5px 10px;
                     .title {
                         font-size: 17px;
-                        color: #474444;
+                        font-weight: 600;
+                        color: rgb(136, 115, 115);
                     }
                     .content {
-                        font-size: 16px;
-                        color: #555;
+                        font-size: 18px;
+                        font-weight: 600;
+                        color: rgb(139, 138, 138);
                     }
                 }
             }
@@ -211,6 +220,12 @@ export default {
     }
     .footer {
         margin-top: 20px;
+        .h {
+            border-bottom: 2px solid #eee;
+        }
+        .d{
+            padding-top: 15px;
+        }
     }
 }
 

+ 21 - 3
src/views/deliveryRoom/detail/charts/chart_a.vue

@@ -54,11 +54,11 @@ export default {
                     colorStops: [
                         {
                             offset: 0,
-                            color: "red" // 0% 处的颜色
+                            color: "rgb(14,182,195)" // 0% 处的颜色
                         },
                         {
                             offset: 1,
-                            color: "blue" // 100% 处的颜色
+                            color: "rgb(14,182,195)" // 100% 处的颜色
                         }
                     ]
                 },
@@ -72,6 +72,24 @@ export default {
                         "四小时前",
                         "三小时前",
                         "两小时前",
+                        "七小时前",
+                        "六小时前",
+                        "五小时前",
+                        "四小时前",
+                        "三小时前",
+                        "两小时前",
+                        "七小时前",
+                        "六小时前",
+                        "五小时前",
+                        "四小时前",
+                        "三小时前",
+                        "两小时前",
+                        "七小时前",
+                        "六小时前",
+                        "五小时前",
+                        "四小时前",
+                        "三小时前",
+                        "两小时前",
                         "当前"
                     ]
                 },
@@ -86,7 +104,7 @@ export default {
                     {
                         name: "时间",
                         type: "line",
-                        data: [32.5,32.66,32.52, 32.6, 32.4, 32.5, 32.4, 32.6, 32.4],
+                        data: [32.5,32.66,32.52, 32.6, 32.4, 32.5, 32.4, 32.6, 32.4,32.66,32.52, 32.6, 32.4, 32.5,32.5, 32.4, 32.6, 32.4, 32.4, 32.5, 32.4, 32.6, 32.4,32.66,32.52, 32.6, 32.4],
                         markPoint: {
                             data: [
                                 { type: "max", name: "最大值" },

+ 28 - 9
src/views/deliveryRoom/detail/charts/chart_b.vue

@@ -57,11 +57,12 @@ export default {
                     colorStops: [
                         {
                             offset: 0,
-                            color: "red" // 0% 处的颜色
+                            // color: "rgb(251,132,32)" // 0% 处的颜色
+                            color: "rgb(14,182,195)" // 0% 处的颜色
                         },
                         {
                             offset: 1,
-                            color: "blue" // 100% 处的颜色
+                            color: "rgb(14,182,195)" // 100% 处的颜色
                         }
                     ]
                 },
@@ -69,12 +70,30 @@ export default {
                     type: "category",
                     boundaryGap: false,
                     data: [
-                        "七日前",
-                        "六日前",
-                        "五日前",
-                        "四日前",
-                        "三日前",
-                        "两日前",
+                       "七小时前",
+                        "六小时前",
+                        "五小时前",
+                        "四小时前",
+                        "三小时前",
+                        "两小时前",
+                        "七小时前",
+                        "六小时前",
+                        "五小时前",
+                        "四小时前",
+                        "三小时前",
+                        "两小时前",
+                        "七小时前",
+                        "六小时前",
+                        "五小时前",
+                        "四小时前",
+                        "三小时前",
+                        "两小时前",
+                        "七小时前",
+                        "六小时前",
+                        "五小时前",
+                        "四小时前",
+                        "三小时前",
+                        "两小时前",
                         "当前"
                     ]
                 },
@@ -89,7 +108,7 @@ export default {
                     {
                         name: "时间",
                         type: "line",
-                        data: [32.5, 32.6, 32.4, 32.5, 32.4, 32.6, 32.4],
+                        data: [32.6, 32.4, 32.5, 32.4, 32.5,32.66,32.6, 32.4, 32.4, 32.5, 32.4,32.52, 32.6, 32.4,32.69,32.52, 32.6, 32.4, 32.5,32.5, 32.4,  32.6, 32.4,32.6,32.52, 32.6, 32.4],
                         markPoint: {
                             data: [
                                 { type: "max", name: "最大值" },

+ 12 - 4
src/views/index/charts/chart_a.vue

@@ -57,8 +57,10 @@ export default {
                                 color: function(params) {
                                     //自定义颜色 89,212,212
                                     var colorList = [
-                                        "rgba(58,161,255,0.5)",
-                                        "rgba(54,203,203,0.7)",
+                                        "rgba(58,0,255,0.5)",
+                                        // "rgba(58,161,255,0.5)",
+
+                                        "rgba(54,203,203,0.7)"
                                     ];
                                     return colorList[params.dataIndex];
                                 }
@@ -86,9 +88,15 @@ export default {
                             normal: {
                                 color: function(params) {
                                     //自定义颜色  "rgb(255,0,0)",
+                                    // var colorList = [
+                                    //     "rgb(0,238,255)",
+                                    //     "rgb(149,162,255)",
+                                    //     "rgb(58,186,255)",
+                                    //     "rgba(54,203,203,0.7)"
+                                    // ];
                                     var colorList = [
-                                        "rgb(0,238,255)",
-                                        "rgb(149,162,255)",
+                                        "rgb(241,97,1)",
+                                        "rgb(255,162,255)",
                                         "rgb(58,186,255)",
                                         "rgba(54,203,203,0.7)"
                                     ];