李楠 4 years ago
parent
commit
7bcb42a3e7

+ 1 - 1
src/views/Butcher/Butcher.vue

@@ -39,7 +39,7 @@
             <div class="center">
                 <div class="top">
                     <article class="upper">
-                        <div class="date">2020-10-12</div>
+                        <div class="date">{{ `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}` }}</div>
                         <div class="title">首 页</div>
                         <img class="icon" src="../../assets/chilun.png" />
                     </article>

+ 1 - 9
src/views/Butcher/charts/EBottom1.vue

@@ -57,15 +57,7 @@ export default {
                     },
                 },
                 xAxis: {
-                    data: [
-                        "9-24",
-                        "9-25",
-                        "9-26",
-                        "9-27",
-                        "9-28",
-                        "9-29",
-                        "9-30",
-                    ],
+                    data: ["5月", "6月", "7月", "8月", "9月", "10月", "11月"],
                     axisLabel: {
                         textStyle: {
                             color: "#fff",

+ 1 - 9
src/views/Butcher/charts/ELeft2.vue

@@ -71,15 +71,7 @@ export default {
                             fontSize: 20,
                         },
                     },
-                    data: [
-                        "08-01",
-                        "08-02",
-                        "08-03",
-                        "08-04",
-                        "08-05",
-                        "08-06",
-                        "08-07",
-                    ],
+                    data: ["5月", "6月", "7月", "8月", "9月", "10月", "11月"],
                 },
                 yAxis: [
                     {

+ 1 - 9
src/views/LvShanXiang/charts/ERight2.vue

@@ -74,15 +74,7 @@ export default {
                             fontSize: 18,
                         },
                     },
-                    data: [
-                        "08-01",
-                        "08-02",
-                        "08-03",
-                        "08-04",
-                        "08-05",
-                        "08-06",
-                        "08-07",
-                    ],
+                    data: ["5月", "6月", "7月", "8月", "9月", "10月", "11月"],
                 },
                 yAxis: [
                     {

+ 1 - 9
src/views/LvShanXiang/charts/ERight3.vue

@@ -73,15 +73,7 @@ export default {
                             fontSize: 20,
                         },
                     },
-                    data: [
-                        "08-01",
-                        "08-02",
-                        "08-03",
-                        "08-04",
-                        "08-05",
-                        "08-06",
-                        "08-07",
-                    ],
+                    data: ["5月", "6月", "7月", "8月", "9月", "10月", "11月"],
                 },
                 yAxis: [
                     {

+ 7 - 11
src/views/Yield/charts/EBottom1.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <div id="EBottom1" style="height:100%;"></div>
+        <div id="EBottom1" style="height: 100%"></div>
     </div>
 </template>
 
@@ -73,15 +73,7 @@ export default {
                             fontSize: 20,
                         },
                     },
-                    data: [
-                        "08-01",
-                        "08-02",
-                        "08-03",
-                        "08-04",
-                        "08-05",
-                        "08-06",
-                        "08-07",
-                    ],
+                    data: ["5月", "6月", "7月", "8月", "9月", "10月", "11月"],
                 },
                 yAxis: [
                     {
@@ -89,6 +81,10 @@ export default {
                         nameTextStyle: {
                             fontSize: 20,
                         },
+                        scale: true,
+                        min(val) {
+                            return Number((val.min * 0.9).toFixed(0));
+                        },
                         axisLine: {
                             show: true,
                             lineStyle: {
@@ -144,7 +140,7 @@ export default {
                         },
                         symbol: "circle",
                         symbolSize: 15, //折线点的大小
-                        data: [33, 43.4, 46, 41, 42, 38, 46],
+                        data: [252.6, 255.5, 252.4, 249.8, 252.6, 250.8, 251.9],
                     },
                 ],
             };

+ 9 - 13
src/views/Yield/charts/EBottom2.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <div id="EBottom2" style="height:100%;"></div>
+        <div id="EBottom2" style="height: 100%"></div>
     </div>
 </template>
 
@@ -37,8 +37,8 @@ export default {
                     trigger: "axis",
                     textStyle: {
                         fontSize: 25,
-                        color: "#fff"
-                    }
+                        color: "#fff",
+                    },
                 },
                 grid: {
                     x: "5%",
@@ -73,15 +73,7 @@ export default {
                             fontSize: 20,
                         },
                     },
-                    data: [
-                        "08-01",
-                        "08-02",
-                        "08-03",
-                        "08-04",
-                        "08-05",
-                        "08-06",
-                        "08-07",
-                    ],
+                    data: ["5月", "6月", "7月", "8月", "9月", "10月", "11月"],
                 },
                 yAxis: [
                     {
@@ -89,6 +81,10 @@ export default {
                         nameTextStyle: {
                             fontSize: 20,
                         },
+                        scale: true,
+                        min(val) {
+                            return Number((val.min * 0.9).toFixed(0));
+                        },
                         axisLine: {
                             show: true,
                             lineStyle: {
@@ -144,7 +140,7 @@ export default {
                         },
                         symbol: "circle",
                         symbolSize: 15, //折线点的大小
-                        data: [33, 43.4, 46, 41, 42, 38, 46],
+                        data: [52.6, 52.8, 52.4, 52.2, 53.4, 53.6, 52.8],
                     },
                 ],
             };

+ 2 - 2
src/views/Yield/charts/ERight2.vue

@@ -9,8 +9,8 @@ export default {
     name: "ERight2",
     data() {
         return {
-            data: [220, 182, 191, 234, 290],
-            time: ["四月", "五月", "六月", "七月", "九月"]
+            data: [220, 182, 191, 234, 290, 265],
+            time: ["五月", "六月", "七月", "九月", "十月", "十一月"]
         };
     },
     mounted() {