From 7a4eb580a96eb40af4d673485eb3ed99359b7203 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 12 Jun 2025 16:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/PanelGroup.vue |  7 +++---
 src/views/index_v1.vue             | 38 +++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index 73aefe0e..19dd66f1 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -10,7 +10,7 @@
         </div>
         <div>
           <div style="display: flex;justify-content: space-between;width: 70%;" v-if="Number(item.rate)>=0">
-            <div style="font-size: 12px;color: #07B78A;">
+            <div style="font-size: 14px;color: #07B78A;">
               同比上次  +{{item.rate}}％
             </div>
             <div>
@@ -18,7 +18,7 @@
             </div>
           </div>
           <div style="display: flex;justify-content: space-between;width: 70%;" v-if="Number(item.rate)<0">
-            <div style="font-size: 12px;color: #d81e06;">
+            <div style="font-size: 14px;color: #d81e06;">
               同比上次  {{item.rate}}％
             </div>
             <div>
@@ -220,6 +220,7 @@ export default {
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
     padding: 20px;
+    border-radius: 4px;
 
     // &:hover {  
     //   .icon-message {
@@ -245,7 +246,7 @@ export default {
       }
 
       .card-panel-num {
-        font-size: 24px;
+        font-size: 28px;
         color: #000;
       }
     }
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index 53757e3c..5d62da5f 100644
--- a/src/views/index_v1.vue
+++ b/src/views/index_v1.vue
@@ -4,7 +4,7 @@
     <panel-group :topData="topAreaOptions"/>
     <el-row>
       <el-col :span="16">
-        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;">
+        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;border-radius: 4px;">
           <div style="display: flex;justify-content: space-between;align-items: center;">
             <div style="border-left: 4px solid #00594F;padding-left: 10px;font-weight: 600;">食堂订单及销量趋势</div>
             <div>
@@ -16,7 +16,7 @@
           </div>
           <div id="lineChartOne" style="width: 100%;height: 300px;margin-bottom: 20px;"></div>  
         </div>
-        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;"> 
+        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;border-radius: 4px;"> 
           <div style="display: flex;justify-content: space-between;align-items: center;">
             <div style="border-left: 4px solid #00594F;padding-left: 10px;font-weight: 600;">商超订单及销量趋势</div>
             <div>
@@ -30,13 +30,21 @@
         </div>
       </el-col>
       <el-col :span="8">
-        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;">
-          <div style="border-left: 4px solid #00594F;padding-left: 10px;font-weight: 600">本月菜品销量排名</div>
-          <div id="lineChartThree" style="width: 100%;height: 410px;margin-bottom: 20px;"></div>  
+        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;border-radius: 4px;"> 
+          <div style="border-left: 4px solid #00594F;padding-left: 10px;font-weight: 600">近30天菜品销量排名</div> 
+          <div id="lineChartThree" style="width: 100%;height: 380px;margin-bottom: 20px;"></div>  
         </div>
-        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;">
-          <div style="border-left: 4px solid #00594F;padding-left: 10px;font-weight: 600">订单类型占比</div>
-          <div id="barChartFour" style="width: 100%;height: 220px;margin-bottom: 20px;"></div>  
+        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;border-radius: 4px;">
+          <div style="display: flex;justify-content: space-between;align-items: center;">
+            <div style="border-left: 4px solid #00594F;padding-left: 10px;font-weight: 600">订单类型占比</div>
+            <div>
+              <el-radio-group v-model="type3" @change="changType3">
+                <el-radio-button :label="1">近7日</el-radio-button>
+                <el-radio-button :label="2">近30日</el-radio-button> 
+              </el-radio-group>
+            </div>
+          </div>  
+          <div id="barChartFour" style="width: 100%;height: 235px;margin-bottom: 20px;"></div>  
         </div>
 
 
@@ -118,6 +126,7 @@ export default {
       ],
       type1:1,
       type2:1,
+      type3:1,
       myCharts1:null,
       myCharts2:null,
       myCharts3:null,
@@ -152,6 +161,7 @@ export default {
     changType1(e){
       console.log(this.type1)
       this.InitEChartsOne()
+      this.myCharts1.resize();
     },
     InitEChartsOne() {
       let chartData=[]
@@ -276,6 +286,7 @@ export default {
     changType2(e){
       console.log(this.type2)
       this.InitEChartsTwo()
+      this.myCharts2.resize();
     },
     InitEChartsTwo() {
       let chartData=[]
@@ -401,7 +412,7 @@ export default {
       var getName = [];
       var getValue = [];
       var chartData=[]
-      getThisMonthSDishSalesRankingApi({type:"2"}).then((response) => {
+      getThisMonthSDishSalesRankingApi().then((response) => {
           chartData = response.data;
           chartData.forEach((item,index)=>{
             getName.push(item.name)
@@ -418,7 +429,7 @@ export default {
               left: "10%",
               right: "2%",
               bottom: "2%",
-              top: "2%",
+              top: "10%",
               containLabel: true,
             },
             tooltip: {
@@ -607,9 +618,14 @@ export default {
           // });
       }); 
     },
+    changType3(e){
+      console.log(this.type3)
+      this.InitEChartsFour()
+      this.myCharts4.resize();
+    },
     InitEChartsFour() {
       var chartData=[]
-      getProportionOfOrderTypesApi({type:"2"}).then((response) => {
+      getProportionOfOrderTypesApi({type:this.type3}).then((response) => {
           chartData = response.data;
           var m2R2Data = []
           var sumNum = 0