From a66356743c9edda7e0f21eb37c3f7111e1359879 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 7 Dec 2022 11:01:26 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/OperateGoodsInfo/indexjs.js  | 3 ++-
 src/views/system/station/stationjs.js         | 3 ++-
 src/views/system/stationItem/stationItemjs.js | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/system/OperateGoodsInfo/indexjs.js b/src/views/system/OperateGoodsInfo/indexjs.js
index 2d72626..18e05fc 100644
--- a/src/views/system/OperateGoodsInfo/indexjs.js
+++ b/src/views/system/OperateGoodsInfo/indexjs.js
@@ -393,6 +393,7 @@ export default {
                             if (this.imgone != this.form.goodsPictureUrl) {
                                 obj.pictureUrlList.push(this.imgone);
                             }
+                            this.imgsurl={pictureUrlList:[]};
                             if (obj.pictureUrlList.length > 0) {
                                 updatePicture(obj).then((res) => {
                                     console.log(res);
@@ -481,4 +482,4 @@ export default {
             });
         },
     },
-};
\ No newline at end of file
+};
diff --git a/src/views/system/station/stationjs.js b/src/views/system/station/stationjs.js
index b4421fc..54279fd 100644
--- a/src/views/system/station/stationjs.js
+++ b/src/views/system/station/stationjs.js
@@ -373,6 +373,7 @@ export default {
                             if (this.imgtwo != this.form.stationPictureUrl) {
                                 obj.pictureUrlList.push(this.imgtwo);
                             }
+                            this.imgsurl={pictureUrlList:[]};
                             if (obj.pictureUrlList.length > 0) {
                                 updatePicture(obj).then((res) => {});
                             }
@@ -457,4 +458,4 @@ export default {
             this.upload.isUploading = true;
         },
     },
-};
\ No newline at end of file
+};
diff --git a/src/views/system/stationItem/stationItemjs.js b/src/views/system/stationItem/stationItemjs.js
index aebe204..1464d88 100644
--- a/src/views/system/stationItem/stationItemjs.js
+++ b/src/views/system/stationItem/stationItemjs.js
@@ -473,6 +473,7 @@ export default {
                         if (obj.pictureUrlList.length > 0) {
                             updatePicture(obj).then((res) => { });
                         }
+                        this.imgsurl={pictureUrlList:[]};
                         this.form.nurseStationItemPrices.forEach(e => {
                             e.price = Number(e.price)
                         })
@@ -520,4 +521,4 @@ export default {
             this.upload.open = true;
         },
     },
-};
\ No newline at end of file
+};

From 320f22bf07d60542f97be0e173165f002e367de3 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 7 Dec 2022 17:25:42 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/index.js |  20 +++
 src/views/index.vue     | 264 ++++++++++++++++++++++++++++++----------
 2 files changed, 220 insertions(+), 64 deletions(-)
 create mode 100644 src/api/system/index.js

diff --git a/src/api/system/index.js b/src/api/system/index.js
new file mode 100644
index 0000000..6290c61
--- /dev/null
+++ b/src/api/system/index.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+// 查询首页基本信息
+
+export function informationStatistics(query) {
+  return request({
+    url: '/system/homeStatistics/informationStatistics',
+    method: 'get',
+    params: query
+  })
+}
+// 查询首页今日概述
+export function summaryToday(query) {
+    return request({
+      url: '/system/homeStatistics/summaryToday',
+      method: 'get',
+      params: query
+    })
+  }
+
diff --git a/src/views/index.vue b/src/views/index.vue
index f5ff6d3..a0321bf 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,5 +1,49 @@
 <template>
   <div class="app-container home">
+    <div class="homes">
+      <div class="count" @click="goodsCount">
+        <div class="el-icon-picture-outline icons"></div>
+        <div class="counts">{{List.goodsCount}}</div>
+        <div class="total">商品总数量</div>
+      </div>
+      <div class="count member" @click="patientCount">
+        <div class="el-icon-user-solid icons"></div>
+        <div class="counts">{{List.patientCount}}</div>
+        <div class="total">会员总数量</div>
+      </div>
+      <div class="count order" @click="appointmentOrderCount">
+        <div class="el-icon-shopping-cart-2 icons"></div>
+        <div class="counts">{{List.appointmentOrderCount}}</div>
+        <div class="total">预约订单总数量</div>
+      </div>
+      <div class="count shop"  @click="goodsOrderCount">
+        <div class="el-icon-s-data icons"></div>
+        <div class="counts">{{List.goodsOrderCount}}</div>
+        <div class="total">商品订单总数量</div>
+      </div>
+    </div>
+    <div class="today">
+      <!-- 今日概括 -->
+        <div class="todayitem">
+        今日上架商品数量
+        <span>{{summaryTodayList.goodsCount}}</span>
+      </div>
+       <div class="todayitem">
+        今日新增会员数
+        <span>{{summaryTodayList.patientCount}}</span>
+      </div>
+      <div class="todayitem">
+        今日订单数
+        <span>{{summaryTodayList.orderCount}}</span>
+      </div>
+      <div class="todayitem">
+        今日交易额
+        <span>{{summaryTodayList.totalPrice}}</span>
+      </div>
+     
+    
+    </div>
+
     <!-- <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
         <h2>新医路后台管理框架</h2>
@@ -61,91 +105,183 @@
 </template>
 
 <script>
+import {
+  informationStatistics,
+  summaryToday
+} from "@/api/system/index";
 export default {
   name: "index",
   data() {
     return {
+      queryParams: {
+        goodsCount: null,
+        patientCount: null,
+        orderCount: null,
+        storeCount: null,
+      },
+      // 基本信息查询
+      List:[],
+      // 概述查询
+      summaryTodayList:[],
       // 版本号
       version: "0.0.1",
     };
   },
+  created() {
+    this.getList();
+  },
   methods: {
+    goodsCount() {
+      this.$router.push('/Shopping/operateGoodsInfo');
+    },
+    patientCount(){
+       this.$router.push('/patient/patientArchives');
+    },
+    appointmentOrderCount(){
+      this.$router.push('/order/order');
+    },
+    goodsOrderCount(){
+       this.$router.push('/order/goodsOrder');
+    },
+
+    getList() {
+      informationStatistics(this.queryParams).then((response) => {
+        console.log(response)
+        this.List = response.data;
+
+      });
+      summaryToday(this.queryParams).then((response) => {
+        console.log(response)
+        this.summaryTodayList = response.data;
+
+      });
+    },
     goTarget(href) {
       window.open(href, "_blank");
     },
+
   },
 };
 </script>
 
 <style scoped lang="scss">
+.count {
+  color: white;
+  width: 30%;
+  background-image: linear-gradient(
+    109.6deg,
+    rgba(255, 113, 113, 0.6) 11.2%,
+    #ff7171 100.2%
+  );
+  transition: 0.35s;
+  -webkit-box-shadow: 1px 3px 12px rgb(255 113 113 / 30%);
+  height: 84px;
+  border-radius: 0.4em;
+  font-weight: 700;
+  margin-right: 20px;
+}
+.count:hover {
+  cursor: pointer;
+  -webkit-transform: translateY(-10px);
+  transform: translateY(-10px);
+  z-index: 99;
+}
+.member {
+  background-image: linear-gradient(
+    109.6deg,
+    rgba(255, 170, 113, 0.6) 11.2%,
+    #ffaa71 100.2%
+  );
+  -webkit-box-shadow: 1px 3px 12px rgb(255 170 113 / 30%);
+  box-shadow: 1px 3px 12px rgb(255 170 113 / 30%);
+}
+.order {
+  background-image: linear-gradient(
+    109.6deg,
+    rgba(147, 181, 225, 0.6) 11.2%,
+    #93b5e1 100.2%
+  );
+  -webkit-box-shadow: 1px 3px 12px rgb(147 181 225 / 30%);
+  box-shadow: 1px 3px 12px rgb(147 181 225 / 30%);
+}
+.shop {
+  background-image: linear-gradient(
+    109.6deg,
+    rgba(132, 140, 207, 0.6) 11.2%,
+    #848ccf 100.2%
+  );
+  -webkit-box-shadow: 1px 3px 12px rgb(132 140 207 / 30%);
+  box-shadow: 1px 3px 12px rgb(132 140 207 / 30%);
+}
+.counts {
+  margin-top: 20px;
+  margin-left: 35%;
+  line-height: 1;
+  font-size: 21px;
+}
+.total {
+  margin-top: 5px;
+  margin-left: 35%;
+  font-size: 13px;
+}
+.icons {
+  // display:inline-block;
+  margin-top: 30px;
+  margin-left: 35px;
+  position: absolute;
+  font-size: 31px;
+  // font-family: Ionicons;
+  // speak: none;
+  // font-style: normal;
+  // font-weight: 400;
+  // font-variant: normal;
+  // text-transform: none;
+  // text-rendering: optimizeLegibility;
+  // line-height: 1;
+  // -webkit-font-smoothing: antialiased;
+  // -moz-osx-font-smoothing: grayscale;
+  // vertical-align: -0.125em;
+  // text-align: center;
+}
+.today {
+  // background: #ff7171;
+  // padding: 0 30px;
+  width: 100%;
+  height: 300px;
+  display: flex;
+
+  margin-top: 10px;
+  margin-left: -10px;
+}
+.todayitem {
+  transition: 0.35s;
+  margin: 10px;
+  width: 30%;
+  height: 100px;
+  margin-bottom: 20px;
+  border-radius: 0.4em;
+  font-weight: 700;
+  background: hsla(0, 0%, 92.2%, 0.5333333333333333);
+  padding: 20px;
+  span {
+    display: block;
+    color: #ff5c58;
+    font-size: 21px;
+  }
+}
+.todayitem:hover {
+  cursor: pointer;
+  -webkit-transform: translateY(-10px);
+  transform: translateY(-10px);
+  z-index: 99;
+}
 .home {
-  // display: flex;
-  // justify-content: center;
-  // align-items: center;
   height: 100%;
   width: 100%;
   background-size: cover;
-  // margin-top: 300px;
-  //  background-image: url("../assets/images/mian.png");
-  // blockquote {
-  //   padding: 10px 20px;
-  //   margin: 0 0 20px;
-  //   font-size: 17.5px;
-  //   border-left: 5px solid #eee;
-  // }
-  // hr {
-  //   margin-top: 20px;
-  //   margin-bottom: 20px;
-  //   border: 0;
-  //   border-top: 1px solid #eee;
-  // }
-  // .col-item {
-  //   margin-bottom: 20px;
-  // }
-
-  // ul {
-  //   padding: 0;
-  //   margin: 0;
-  // }
-
-  // font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  // font-size: 13px;
-  // color: #676a6c;
-  // overflow-x: hidden;
-
-  // ul {
-  //   list-style-type: none;
-  // }
-
-  // h4 {
-  //   margin-top: 0px;
-  // }
-
-  // h2 {
-  //   margin-top: 10px;
-  //   font-size: 26px;
-  //   font-weight: 100;
-  // }
-
-  // p {
-  //   margin-top: 10px;
-
-  //   b {
-  //     font-weight: 700;
-  //   }
-  // }
-
-  // .update-log {
-  //   ol {
-  //     display: block;
-  //     list-style-type: decimal;
-  //     margin-block-start: 1em;
-  //     margin-block-end: 1em;
-  //     margin-inline-start: 0;
-  //     margin-inline-end: 0;
-  //     padding-inline-start: 40px;
-  //   }
-  // }
+}
+.homes {
+  display: flex;
 }
 </style>
 

From fd3c54e928ca2bdfc41700a7514600c4d032f32e Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 7 Dec 2022 17:28:32 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index c41bd8b..de6dd7f 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -92,7 +92,7 @@ export default {
   @import "~@/assets/styles/mixin.scss";
   @import "~@/assets/styles/variables.scss";
   .bj {
-  background-image: url("../assets/images/body.png");
+  // background-image: url("../assets/images/body.png");
   -moz-background-size: 100% 100%;
   background-size: 100% 100%;
 }

From cb2ef67ac5ce026f8ed4cef736859c64e9f8715d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 8 Dec 2022 10:22:18 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json               |   2 +-
 src/api/system/homepage.js |  24 +++
 src/views/index.vue        | 407 +++++++++++++++++++++++++++++--------
 3 files changed, 346 insertions(+), 87 deletions(-)
 create mode 100644 src/api/system/homepage.js

diff --git a/package.json b/package.json
index e04d775..de46b2e 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.19.1",
-    "echarts": "4.9.0",
+    "echarts": "^4.9.0",
     "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
diff --git a/src/api/system/homepage.js b/src/api/system/homepage.js
new file mode 100644
index 0000000..0f571c5
--- /dev/null
+++ b/src/api/system/homepage.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+//最近一周每天的商品交易趋势
+export function selectGodWeekTransactionGoodsVO() {
+    return request({
+        url: '/system/homeStatistics/selectGodWeekTransactionGoodsVO',
+        method: 'get',
+    })
+}
+//首页新增最近一周每天的预约订单交易趋势
+export function selectAodWeekTransactionAppointmentOrderVO() {
+    return request({
+        url: '/system/homeStatistics/selectAodWeekTransactionAppointmentOrderVO',
+        method: 'get',
+    })
+}
+
+//首页新增热卖商品Top10排名榜功能
+export function selectHotGoodsList() {
+    return request({
+        url: '/system/homeStatistics/selectHotGoodsList',
+        method: 'get',
+    })
+}
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index a0321bf..869a0fb 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -3,112 +3,77 @@
     <div class="homes">
       <div class="count" @click="goodsCount">
         <div class="el-icon-picture-outline icons"></div>
-        <div class="counts">{{List.goodsCount}}</div>
+        <div class="counts">{{ List.goodsCount }}</div>
         <div class="total">商品总数量</div>
       </div>
       <div class="count member" @click="patientCount">
         <div class="el-icon-user-solid icons"></div>
-        <div class="counts">{{List.patientCount}}</div>
+        <div class="counts">{{ List.patientCount }}</div>
         <div class="total">会员总数量</div>
       </div>
       <div class="count order" @click="appointmentOrderCount">
         <div class="el-icon-shopping-cart-2 icons"></div>
-        <div class="counts">{{List.appointmentOrderCount}}</div>
+        <div class="counts">{{ List.appointmentOrderCount }}</div>
         <div class="total">预约订单总数量</div>
       </div>
-      <div class="count shop"  @click="goodsOrderCount">
+      <div class="count shop" @click="goodsOrderCount">
         <div class="el-icon-s-data icons"></div>
-        <div class="counts">{{List.goodsOrderCount}}</div>
+        <div class="counts">{{ List.goodsOrderCount }}</div>
         <div class="total">商品订单总数量</div>
       </div>
     </div>
     <div class="today">
       <!-- 今日概括 -->
-        <div class="todayitem">
+      <div class="todayitem">
         今日上架商品数量
-        <span>{{summaryTodayList.goodsCount}}</span>
+        <span>{{ summaryTodayList.goodsCount }}</span>
       </div>
-       <div class="todayitem">
+      <div class="todayitem">
         今日新增会员数
-        <span>{{summaryTodayList.patientCount}}</span>
+        <span>{{ summaryTodayList.patientCount }}</span>
       </div>
       <div class="todayitem">
         今日订单数
-        <span>{{summaryTodayList.orderCount}}</span>
+        <span>{{ summaryTodayList.orderCount }}</span>
       </div>
       <div class="todayitem">
         今日交易额
-        <span>{{summaryTodayList.totalPrice}}</span>
+        <span>{{ summaryTodayList.totalPrice }}</span>
       </div>
-     
-    
     </div>
-
-    <!-- <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>新医路后台管理框架</h2>
-        <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了新医路管理系统。，它可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
-        <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
-        </p>
+    <el-row>
+      <el-col :span="12">
+        <div class="main2" id="main2" style="width: 100%; height: 500px"></div>
       </el-col>
-
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="8">
-            <h2>技术选型</h2>
-          </el-col>
-          <el-col :span="4">
-            <h2>联系方式</h2>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>SpringCloud</li>
-              <li>Nacos</li>
-              <li>Sentinel</li>
-              <li>MyBatis-plus</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="4">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="4">
-            <h4></h4>
-            <ul>
-              <li><i class="el-icon-chat-dot-round"></i> 山东新医路信息科技有限公司：<a
-                href="javascript:;"
-                >0531-69900398</a></li>
-            </ul>
-          </el-col>
-        </el-row>
+      <el-col :span="12">
+        <div class="main" id="main" style="width: 100%; height: 500px"></div>
       </el-col>
     </el-row>
-    <el-divider /> -->
+    <el-row>
+      <div class="title">热卖商品TOP10</div>
+      <el-table :data="list" style="width: 96%; margin: 0 auto">
+        <el-table-column label="排名" type="index" width="130" align="center" />
+        <el-table-column label="商品名称" align="center" prop="goodsName" />
+        <el-table-column label="价格" align="center" prop="sumTotalPrice" />
+        <el-table-column
+          label="销量"
+          align="center"
+          width="130"
+          prop="sumGoodsCount"
+        />
+      </el-table>
+    </el-row>
   </div>
 </template>
 
 <script>
+import { informationStatistics, summaryToday } from "@/api/system/index";
+import * as echarts from "echarts";
 import {
-  informationStatistics,
-  summaryToday
-} from "@/api/system/index";
+  selectGodWeekTransactionGoodsVO,
+  selectAodWeekTransactionAppointmentOrderVO,
+  selectHotGoodsList,
+} from "@/api/system/homepage.js";
 export default {
   name: "index",
   data() {
@@ -120,51 +85,322 @@ export default {
         storeCount: null,
       },
       // 基本信息查询
-      List:[],
+      List: [],
       // 概述查询
-      summaryTodayList:[],
+      summaryTodayList: [],
       // 版本号
       version: "0.0.1",
+      list: [],
     };
   },
+  mounted() {
+    this.info();
+  },
   created() {
     this.getList();
+    this.tableinfo();
   },
   methods: {
+    tableinfo() {
+      selectHotGoodsList().then((res) => {
+        this.list = res.data;
+      });
+    },
+    info() {
+      selectAodWeekTransactionAppointmentOrderVO().then((res) => {
+        if (res.code == 200) {
+          var timedata = [];
+          res.data.forEach((e) => {
+            timedata.push(e.clickDate);
+          });
+          var numberdata = [];
+          res.data.forEach((e) => {
+            numberdata.push(e.count);
+          });
+          var chartDom = document.getElementById("main2");
+          var myChart = echarts.init(chartDom);
+          var option;
+          option = {
+            title: {
+              text: "预约订单交易走势",
+              left: "50%",
+              textAlign: "center",
+            },
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                lineStyle: {
+                  color: "#ddd",
+                },
+              },
+              backgroundColor: "rgba(255,255,255,1)",
+              padding: [5, 10],
+              textStyle: {
+                color: "#7588E4",
+              },
+              extraCssText: "box-shadow: 0 0 5px rgba(0,0,0,0.3)",
+            },
+            xAxis: {
+              type: "category",
+              data: timedata,
+              boundaryGap: false,
+              splitLine: {
+                show: true,
+                interval: "auto",
+                lineStyle: {
+                  color: ["#ffffff"],
+                },
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLine: {
+                lineStyle: {
+                  color: "#609ee9",
+                },
+              },
+              axisLabel: {
+                margin: 10,
+                textStyle: {
+                  fontSize: 14,
+                },
+              },
+            },
+            yAxis: {
+              type: "value",
+              splitLine: {
+                lineStyle: {
+                  color: ["#f0f0f0"],
+                },
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLine: {
+                lineStyle: {
+                  color: "#609ee9",
+                },
+              },
+              axisLabel: {
+                margin: 10,
+                textStyle: {
+                  fontSize: 14,
+                },
+              },
+            },
+            series: [
+              {
+                name: "订单数量",
+                type: "line",
+                smooth: true,
+                showSymbol: false,
+                symbol: "circle",
+                symbolSize: 6,
+                data: numberdata,
+                areaStyle: {
+                  normal: {
+                    color: new echarts.graphic.LinearGradient(
+                      0,
+                      0,
+                      0,
+                      1,
+                      [
+                        {
+                          offset: 0,
+                          color: "#d6e3fd",
+                        },
+                        {
+                          offset: 1,
+                          color: "#d6e3fd",
+                        },
+                      ],
+                      false
+                    ),
+                  },
+                },
+                itemStyle: {
+                  normal: {
+                    color: "#6194f9",
+                  },
+                },
+                lineStyle: {
+                  normal: {
+                    width: 3,
+                  },
+                },
+              },
+            ],
+          };
+          option && myChart.setOption(option);
+        } else {
+        }
+      });
+      selectGodWeekTransactionGoodsVO().then((res) => {
+        if (res.code == 200) {
+          var timedata = [];
+          res.data.forEach((e) => {
+            timedata.push(e.clickDate);
+          });
+          var numberdata = [];
+          res.data.forEach((e) => {
+            numberdata.push(e.count);
+          });
+          var chartDom = document.getElementById("main");
+          var myChart = echarts.init(chartDom);
+          var option;
+          option = {
+            title: {
+              text: "商品订单交易走势",
+              left: "50%",
+              textAlign: "center",
+            },
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                lineStyle: {
+                  color: "#ddd",
+                },
+              },
+              backgroundColor: "rgba(255,255,255,1)",
+              padding: [5, 10],
+              textStyle: {
+                color: "#7588E4",
+              },
+              extraCssText: "box-shadow: 0 0 5px rgba(0,0,0,0.3)",
+            },
+            xAxis: {
+              type: "category",
+              data: timedata,
+              boundaryGap: false,
+              splitLine: {
+                show: true,
+                interval: "auto",
+                lineStyle: {
+                  color: ["#e4f7f9"],
+                },
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLine: {
+                lineStyle: {
+                  color: "#609ee9",
+                },
+              },
+              axisLabel: {
+                margin: 10,
+                textStyle: {
+                  fontSize: 14,
+                },
+              },
+            },
+            yAxis: {
+              type: "value",
+              splitLine: {
+                lineStyle: {
+                  color: ["#D4DFF5"],
+                },
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLine: {
+                lineStyle: {
+                  color: "#609ee9",
+                },
+              },
+              axisLabel: {
+                margin: 10,
+                textStyle: {
+                  fontSize: 14,
+                },
+              },
+            },
+            series: [
+              {
+                name: "订单数量",
+                type: "line",
+                smooth: true,
+                showSymbol: false,
+                symbol: "circle",
+                symbolSize: 6,
+                data: numberdata,
+                areaStyle: {
+                  normal: {
+                    color: new echarts.graphic.LinearGradient(
+                      0,
+                      0,
+                      0,
+                      1,
+                      [
+                        {
+                          offset: 0,
+                          color: "rgba(216, 244, 247,1)",
+                        },
+                        {
+                          offset: 1,
+                          color: "rgba(216, 244, 247,1)",
+                        },
+                      ],
+                      false
+                    ),
+                  },
+                },
+                itemStyle: {
+                  normal: {
+                    color: "#58c8da",
+                  },
+                },
+                lineStyle: {
+                  normal: {
+                    width: 3,
+                  },
+                },
+              },
+            ],
+          };
+          option && myChart.setOption(option);
+        } else {
+        }
+      });
+    },
+
     goodsCount() {
-      this.$router.push('/Shopping/operateGoodsInfo');
+      this.$router.push("/Shopping/operateGoodsInfo");
     },
-    patientCount(){
-       this.$router.push('/patient/patientArchives');
+    patientCount() {
+      this.$router.push("/patient/patientArchives");
     },
-    appointmentOrderCount(){
-      this.$router.push('/order/order');
+    appointmentOrderCount() {
+      this.$router.push("/order/order");
     },
-    goodsOrderCount(){
-       this.$router.push('/order/goodsOrder');
+    goodsOrderCount() {
+      this.$router.push("/order/goodsOrder");
     },
 
     getList() {
       informationStatistics(this.queryParams).then((response) => {
-        console.log(response)
+        console.log(response);
         this.List = response.data;
-
       });
       summaryToday(this.queryParams).then((response) => {
-        console.log(response)
+        console.log(response);
         this.summaryTodayList = response.data;
-
       });
     },
     goTarget(href) {
       window.open(href, "_blank");
     },
-
   },
 };
 </script>
 
 <style scoped lang="scss">
+.title {
+  margin: 20px 0 20px 2%;
+  font-size: 18px;
+  font-weight: 600;
+}
 .count {
   color: white;
   width: 30%;
@@ -247,7 +483,6 @@ export default {
   // background: #ff7171;
   // padding: 0 30px;
   width: 100%;
-  height: 300px;
   display: flex;
 
   margin-top: 10px;

From 47533c713ed9bbf0ce7532b6ecb57d655045dc6e Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Thu, 8 Dec 2022 14:50:03 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 71 +++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 869a0fb..a01b868 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -25,21 +25,27 @@
     <div class="today">
       <!-- 今日概括 -->
       <div class="todayitem">
-        今日上架商品数量
-        <span>{{ summaryTodayList.goodsCount }}</span>
+        <div class="el-icon-sell icon"></div>
+        <div class="goodsinfo">今日上架商品数量</div>
+        <div class="totals">{{ summaryTodayList.goodsCount }}</div>
       </div>
       <div class="todayitem">
-        今日新增会员数
-        <span>{{ summaryTodayList.patientCount }}</span>
+        <div class="el-icon-user icon"></div>
+        <div class="goodsinfo">今日新增会员数</div>
+        <div class="totals">{{ summaryTodayList.patientCount }}</div>
       </div>
       <div class="todayitem">
-        今日订单数
-        <span>{{ summaryTodayList.orderCount }}</span>
+        <div class="el-icon-shopping-cart-full icon"></div>
+        <div class="goodsinfo">今日订单数</div>
+        <div class="totals">{{ summaryTodayList.orderCount }}</div>
       </div>
       <div class="todayitem">
-        今日交易额
-        <span>{{ summaryTodayList.totalPrice }}</span>
+         <div class="el-icon-money icon"></div>
+         <div class="goodsinfo">今日交易额</div>
+        <div class="totals">{{ summaryTodayList.totalPrice }}</div>
       </div>
+
+
     </div>
     <el-row>
       <el-col :span="12">
@@ -406,8 +412,8 @@ export default {
   width: 30%;
   background-image: linear-gradient(
     109.6deg,
-    rgba(255, 113, 113, 0.6) 11.2%,
-    #ff7171 100.2%
+    rgba(111, 167, 183, 0.6) 11.2%,
+    #b3e9d8 100.2%
   );
   transition: 0.35s;
   -webkit-box-shadow: 1px 3px 12px rgb(255 113 113 / 30%);
@@ -425,8 +431,8 @@ export default {
 .member {
   background-image: linear-gradient(
     109.6deg,
-    rgba(255, 170, 113, 0.6) 11.2%,
-    #ffaa71 100.2%
+    rgba(161, 191, 239, 0.6) 11.2%,
+    #86c5e2 100.2%
   );
   -webkit-box-shadow: 1px 3px 12px rgb(255 170 113 / 30%);
   box-shadow: 1px 3px 12px rgb(255 170 113 / 30%);
@@ -434,8 +440,8 @@ export default {
 .order {
   background-image: linear-gradient(
     109.6deg,
-    rgba(147, 181, 225, 0.6) 11.2%,
-    #93b5e1 100.2%
+    rgba(161, 191, 214, 0.6) 11.2%,
+    #688eab 100.2%
   );
   -webkit-box-shadow: 1px 3px 12px rgb(147 181 225 / 30%);
   box-shadow: 1px 3px 12px rgb(147 181 225 / 30%);
@@ -443,8 +449,8 @@ export default {
 .shop {
   background-image: linear-gradient(
     109.6deg,
-    rgba(132, 140, 207, 0.6) 11.2%,
-    #848ccf 100.2%
+    rgba(138, 203, 158, 0.6) 11.2%,
+    #81c195 100.2%
   );
   -webkit-box-shadow: 1px 3px 12px rgb(132 140 207 / 30%);
   box-shadow: 1px 3px 12px rgb(132 140 207 / 30%);
@@ -460,31 +466,21 @@ export default {
   margin-left: 35%;
   font-size: 13px;
 }
+.icon {
+  margin-top: 10px;
+  margin-left: 16px;
+  font-size: 31px;
+  position: absolute;
+}
 .icons {
-  // display:inline-block;
   margin-top: 30px;
   margin-left: 35px;
   position: absolute;
   font-size: 31px;
-  // font-family: Ionicons;
-  // speak: none;
-  // font-style: normal;
-  // font-weight: 400;
-  // font-variant: normal;
-  // text-transform: none;
-  // text-rendering: optimizeLegibility;
-  // line-height: 1;
-  // -webkit-font-smoothing: antialiased;
-  // -moz-osx-font-smoothing: grayscale;
-  // vertical-align: -0.125em;
-  // text-align: center;
 }
 .today {
-  // background: #ff7171;
-  // padding: 0 30px;
   width: 100%;
   display: flex;
-
   margin-top: 10px;
   margin-left: -10px;
 }
@@ -496,11 +492,16 @@ export default {
   margin-bottom: 20px;
   border-radius: 0.4em;
   font-weight: 700;
-  background: hsla(0, 0%, 92.2%, 0.5333333333333333);
+  background: hsla(0,0%,92.2%,.5333333333333333);
   padding: 20px;
-  span {
-    display: block;
+  .goodsinfo {
+    margin-top: 5px;
+    margin-left: 32%;
+  }
+  .totals {
     color: #ff5c58;
+    margin-left: 32%;
+    margin-top: 5px;
     font-size: 21px;
   }
 }

From 0474b8fd4f1b5fca25b7b8d72464fccb46ae9622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 9 Dec 2022 09:48:14 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/homepage.js | 8 ++++----
 src/views/index.vue        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/system/homepage.js b/src/api/system/homepage.js
index 0f571c5..c5021a6 100644
--- a/src/api/system/homepage.js
+++ b/src/api/system/homepage.js
@@ -1,16 +1,16 @@
 import request from '@/utils/request'
 
 //最近一周每天的商品交易趋势
-export function selectGodWeekTransactionGoodsVO() {
+export function getWeekGoodsTradeTrend () {
     return request({
-        url: '/system/homeStatistics/selectGodWeekTransactionGoodsVO',
+        url: '/system/homeStatistics/getWeekGoodsTradeTrend ',
         method: 'get',
     })
 }
 //首页新增最近一周每天的预约订单交易趋势
-export function selectAodWeekTransactionAppointmentOrderVO() {
+export function  getWeekTradeAppointmentTrend() {
     return request({
-        url: '/system/homeStatistics/selectAodWeekTransactionAppointmentOrderVO',
+        url: '/system/homeStatistics/getWeekTradeAppointmentTrend',
         method: 'get',
     })
 }
diff --git a/src/views/index.vue b/src/views/index.vue
index a01b868..016d26d 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -76,8 +76,8 @@
 import { informationStatistics, summaryToday } from "@/api/system/index";
 import * as echarts from "echarts";
 import {
-  selectGodWeekTransactionGoodsVO,
-  selectAodWeekTransactionAppointmentOrderVO,
+  getWeekGoodsTradeTrend,
+  getWeekTradeAppointmentTrend,
   selectHotGoodsList,
 } from "@/api/system/homepage.js";
 export default {
@@ -113,7 +113,7 @@ export default {
       });
     },
     info() {
-      selectAodWeekTransactionAppointmentOrderVO().then((res) => {
+      getWeekTradeAppointmentTrend().then((res) => {
         if (res.code == 200) {
           var timedata = [];
           res.data.forEach((e) => {
@@ -241,7 +241,7 @@ export default {
         } else {
         }
       });
-      selectGodWeekTransactionGoodsVO().then((res) => {
+      getWeekGoodsTradeTrend().then((res) => {
         if (res.code == 200) {
           var timedata = [];
           res.data.forEach((e) => {

From 5f413ed0d939ed91ea66ca2224b65ffba60ba6dc Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Fri, 9 Dec 2022 10:55:51 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=20=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 92 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 90 insertions(+), 2 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 016d26d..2451860 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -119,7 +119,11 @@ export default {
           res.data.forEach((e) => {
             timedata.push(e.clickDate);
           });
-          var numberdata = [];
+          var totalPricedata = [];
+          res.data.forEach((e) => {
+            totalPricedata.push(e.totalPrice);
+          });
+            var numberdata = [];
           res.data.forEach((e) => {
             numberdata.push(e.count);
           });
@@ -235,13 +239,53 @@ export default {
                   },
                 },
               },
+              {
+                name: "订单金额",
+                type: "line",
+                smooth: true,
+                showSymbol: false,
+                symbol: "circle",
+                symbolSize: 6,
+                data: totalPricedata,
+                areaStyle: {
+                  normal: {
+                    color: new echarts.graphic.LinearGradient(
+                      0,
+                      0,
+                      0,
+                      1,
+                      [
+                        {
+                          offset: 0,
+                          color: "#d6e3fd",
+                        },
+                        {
+                          offset: 1,
+                          color: "#d6e3fd",
+                        },
+                      ],
+                      false
+                    ),
+                  },
+                },
+                itemStyle: {
+                  normal: {
+                    color: "#6194f9",
+                  },
+                },
+                lineStyle: {
+                  normal: {
+                    width: 3,
+                  },
+                },
+              },
             ],
           };
           option && myChart.setOption(option);
         } else {
         }
       });
-      getWeekGoodsTradeTrend().then((res) => {
+      getWeekGoodsTradeTrend ().then((res) => {
         if (res.code == 200) {
           var timedata = [];
           res.data.forEach((e) => {
@@ -250,6 +294,10 @@ export default {
           var numberdata = [];
           res.data.forEach((e) => {
             numberdata.push(e.count);
+          });
+           var totalPricedata = [];
+          res.data.forEach((e) => {
+            totalPricedata.push(e.totalPrice);
           });
           var chartDom = document.getElementById("main");
           var myChart = echarts.init(chartDom);
@@ -363,6 +411,46 @@ export default {
                   },
                 },
               },
+              {
+                name: "订单金额",
+                type: "line",
+                smooth: true,
+                showSymbol: false,
+                symbol: "circle",
+                symbolSize: 6,
+                data: totalPricedata,
+                areaStyle: {
+                  normal: {
+                    color: new echarts.graphic.LinearGradient(
+                      0,
+                      0,
+                      0,
+                      1,
+                      [
+                        {
+                          offset: 0,
+                          color: "rgba(216, 244, 247,1)",
+                        },
+                        {
+                          offset: 1,
+                          color: "rgba(216, 244, 247,1)",
+                        },
+                      ],
+                      false
+                    ),
+                  },
+                },
+                itemStyle: {
+                  normal: {
+                    color: "#58c8da",
+                  },
+                },
+                lineStyle: {
+                  normal: {
+                    width: 3,
+                  },
+                },
+              },
             ],
           };
           option && myChart.setOption(option);

From 8d3b15bea274091050fbdb9f4d6edc034077ae4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 9 Dec 2022 11:34:22 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 50 +++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 2451860..0dbde71 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -40,12 +40,10 @@
         <div class="totals">{{ summaryTodayList.orderCount }}</div>
       </div>
       <div class="todayitem">
-         <div class="el-icon-money icon"></div>
-         <div class="goodsinfo">今日交易额</div>
+        <div class="el-icon-money icon"></div>
+        <div class="goodsinfo">今日交易额</div>
         <div class="totals">{{ summaryTodayList.totalPrice }}</div>
       </div>
-
-
     </div>
     <el-row>
       <el-col :span="12">
@@ -123,7 +121,7 @@ export default {
           res.data.forEach((e) => {
             totalPricedata.push(e.totalPrice);
           });
-            var numberdata = [];
+          var numberdata = [];
           res.data.forEach((e) => {
             numberdata.push(e.count);
           });
@@ -143,6 +141,7 @@ export default {
                   color: "#ddd",
                 },
               },
+             
               backgroundColor: "rgba(255,255,255,1)",
               padding: [5, 10],
               textStyle: {
@@ -150,6 +149,11 @@ export default {
               },
               extraCssText: "box-shadow: 0 0 5px rgba(0,0,0,0.3)",
             },
+            legend: {
+                right: 20,
+                orient: "vertical",
+                data: ["订单数量", "订单金额"],
+              },
             xAxis: {
               type: "category",
               data: timedata,
@@ -230,7 +234,7 @@ export default {
                 },
                 itemStyle: {
                   normal: {
-                    color: "#6194f9",
+                    color: "#87B1F7",
                   },
                 },
                 lineStyle: {
@@ -257,11 +261,11 @@ export default {
                       [
                         {
                           offset: 0,
-                          color: "#d6e3fd",
+                          color: "#D6F5E9",
                         },
                         {
                           offset: 1,
-                          color: "#d6e3fd",
+                          color: "#D6F5E9",
                         },
                       ],
                       false
@@ -270,7 +274,7 @@ export default {
                 },
                 itemStyle: {
                   normal: {
-                    color: "#6194f9",
+                    color: "#57D1A0",
                   },
                 },
                 lineStyle: {
@@ -285,7 +289,7 @@ export default {
         } else {
         }
       });
-      getWeekGoodsTradeTrend ().then((res) => {
+      getWeekGoodsTradeTrend().then((res) => {
         if (res.code == 200) {
           var timedata = [];
           res.data.forEach((e) => {
@@ -295,10 +299,14 @@ export default {
           res.data.forEach((e) => {
             numberdata.push(e.count);
           });
-           var totalPricedata = [];
+          var totalPricedata = [];
           res.data.forEach((e) => {
             totalPricedata.push(e.totalPrice);
           });
+          var moneydata = [];
+          res.data.forEach((e) => {
+            numberdata.push(e.count);
+          });
           var chartDom = document.getElementById("main");
           var myChart = echarts.init(chartDom);
           var option;
@@ -315,6 +323,7 @@ export default {
                   color: "#ddd",
                 },
               },
+              
               backgroundColor: "rgba(255,255,255,1)",
               padding: [5, 10],
               textStyle: {
@@ -322,6 +331,11 @@ export default {
               },
               extraCssText: "box-shadow: 0 0 5px rgba(0,0,0,0.3)",
             },
+            legend: {
+                right: 20,
+                orient: "vertical",
+                data: ["订单数量", "订单金额"],
+              },
             xAxis: {
               type: "category",
               data: timedata,
@@ -389,11 +403,11 @@ export default {
                       [
                         {
                           offset: 0,
-                          color: "rgba(216, 244, 247,1)",
+                          color: "#d6e3fd",
                         },
                         {
                           offset: 1,
-                          color: "rgba(216, 244, 247,1)",
+                          color: "#d6e3fd",
                         },
                       ],
                       false
@@ -402,7 +416,7 @@ export default {
                 },
                 itemStyle: {
                   normal: {
-                    color: "#58c8da",
+                    color: "#87B1F7",
                   },
                 },
                 lineStyle: {
@@ -429,11 +443,11 @@ export default {
                       [
                         {
                           offset: 0,
-                          color: "rgba(216, 244, 247,1)",
+                          color: "#D6F5E9",
                         },
                         {
                           offset: 1,
-                          color: "rgba(216, 244, 247,1)",
+                          color: "#D6F5E9",
                         },
                       ],
                       false
@@ -442,7 +456,7 @@ export default {
                 },
                 itemStyle: {
                   normal: {
-                    color: "#58c8da",
+                    color: "#57D1A0",
                   },
                 },
                 lineStyle: {
@@ -580,7 +594,7 @@ export default {
   margin-bottom: 20px;
   border-radius: 0.4em;
   font-weight: 700;
-  background: hsla(0,0%,92.2%,.5333333333333333);
+  background: hsla(0, 0%, 92.2%, 0.5333333333333333);
   padding: 20px;
   .goodsinfo {
     margin-top: 5px;

From 3f79f791a0a2c61742830f7a37332d33f9721eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 9 Dec 2022 11:46:45 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 0dbde71..3159e8f 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -344,7 +344,7 @@ export default {
                 show: true,
                 interval: "auto",
                 lineStyle: {
-                  color: ["#e4f7f9"],
+                  color: ["#ffffff"],
                 },
               },
               axisTick: {

From fcdebbd779d977e0d7bcdbd3dcf75cccb80afb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 27 Dec 2022 16:10:48 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 3159e8f..db37288 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -45,14 +45,8 @@
         <div class="totals">{{ summaryTodayList.totalPrice }}</div>
       </div>
     </div>
-    <el-row>
-      <el-col :span="12">
-        <div class="main2" id="main2" style="width: 100%; height: 500px"></div>
-      </el-col>
-      <el-col :span="12">
-        <div class="main" id="main" style="width: 100%; height: 500px"></div>
-      </el-col>
-    </el-row>
+    <div class="main2" id="main2" style="width: 1200px; height: 500px"></div>
+    <div class="main" id="main" style="width: 1200px; height: 500px"></div>
     <el-row>
       <div class="title">热卖商品TOP10</div>
       <el-table :data="list" style="width: 96%; margin: 0 auto">
@@ -141,7 +135,7 @@ export default {
                   color: "#ddd",
                 },
               },
-             
+
               backgroundColor: "rgba(255,255,255,1)",
               padding: [5, 10],
               textStyle: {
@@ -150,10 +144,10 @@ export default {
               extraCssText: "box-shadow: 0 0 5px rgba(0,0,0,0.3)",
             },
             legend: {
-                right: 20,
-                orient: "vertical",
-                data: ["订单数量", "订单金额"],
-              },
+              right: 20,
+              orient: "vertical",
+              data: ["订单数量", "订单金额"],
+            },
             xAxis: {
               type: "category",
               data: timedata,
@@ -323,7 +317,7 @@ export default {
                   color: "#ddd",
                 },
               },
-              
+
               backgroundColor: "rgba(255,255,255,1)",
               padding: [5, 10],
               textStyle: {
@@ -332,10 +326,10 @@ export default {
               extraCssText: "box-shadow: 0 0 5px rgba(0,0,0,0.3)",
             },
             legend: {
-                right: 20,
-                orient: "vertical",
-                data: ["订单数量", "订单金额"],
-              },
+              right: 20,
+              orient: "vertical",
+              data: ["订单数量", "订单金额"],
+            },
             xAxis: {
               type: "category",
               data: timedata,
@@ -504,6 +498,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.main2{
+  margin: 0 auto;
+}
+.main{
+  margin: 0 auto;
+}
 .title {
   margin: 20px 0 20px 2%;
   font-size: 18px;

From 57f26e2df007e4fa648c02e589c9f7057b812a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 27 Dec 2022 16:24:42 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index db37288..e2b51bd 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -146,6 +146,8 @@ export default {
             legend: {
               right: 20,
               orient: "vertical",
+              x: "left",
+              y: "top",
               data: ["订单数量", "订单金额"],
             },
             xAxis: {
@@ -328,6 +330,8 @@ export default {
             legend: {
               right: 20,
               orient: "vertical",
+              x: "left",
+              y: "top",
               data: ["订单数量", "订单金额"],
             },
             xAxis: {
@@ -498,10 +502,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.main2{
+.main2 {
   margin: 0 auto;
 }
-.main{
+.main {
   margin: 0 auto;
 }
 .title {