From a1a432b6364f96dfb2ecadef509458b2bd78f0a8 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 2 Sep 2025 18:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=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/assets/images/eleIcon.png                 | Bin 0 -> 5882 bytes
 src/assets/images/waterIcon.png               | Bin 0 -> 5912 bytes
 src/views/canteen/dish/dish/index.vue         |   2 +-
 .../material/components/MaterialDialog.vue    |   1 +
 src/views/canteen/dish/material/index.vue     |  17 +-
 src/views/canteen/dish/menu/detail.vue        |   4 +-
 src/views/canteen/dish/menu/edit.vue          |  27 +-
 src/views/energySaving/components/count.vue   |  25 +
 src/views/energySaving/dashboard/BarChart.vue | 102 +++
 .../energySaving/dashboard/LineChart.vue      | 135 +++
 .../energySaving/dashboard/PanelGroup.vue     | 259 ++++++
 src/views/energySaving/dashboard/PieChart.vue |  79 ++
 .../energySaving/dashboard/RaddarChart.vue    | 116 +++
 .../energySaving/dashboard/mixins/resize.js   |  56 ++
 src/views/energySaving/index.vue              | 798 ++++++++++++++++++
 .../kitchen/foodSafety/sampleManage/index.vue |   3 +-
 vue.config.js                                 |   4 +-
 17 files changed, 1603 insertions(+), 25 deletions(-)
 create mode 100644 src/assets/images/eleIcon.png
 create mode 100644 src/assets/images/waterIcon.png
 create mode 100644 src/views/energySaving/components/count.vue
 create mode 100644 src/views/energySaving/dashboard/BarChart.vue
 create mode 100644 src/views/energySaving/dashboard/LineChart.vue
 create mode 100644 src/views/energySaving/dashboard/PanelGroup.vue
 create mode 100644 src/views/energySaving/dashboard/PieChart.vue
 create mode 100644 src/views/energySaving/dashboard/RaddarChart.vue
 create mode 100644 src/views/energySaving/dashboard/mixins/resize.js
 create mode 100644 src/views/energySaving/index.vue

diff --git a/src/assets/images/eleIcon.png b/src/assets/images/eleIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a0c2e13b80ab4fdd05d3c26c989db9a7517cf72
GIT binary patch
literal 5882
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
Q{{R3007*qoM6N<$g2;A4f&c&j

literal 0
HcmV?d00001

diff --git a/src/assets/images/waterIcon.png b/src/assets/images/waterIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..900a851d036d8348e21e54bd6cb78cd5a839c6d2
GIT binary patch
literal 5912
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

literal 0
HcmV?d00001

diff --git a/src/views/canteen/dish/dish/index.vue b/src/views/canteen/dish/dish/index.vue
index 3cab22f9..11c78388 100644
--- a/src/views/canteen/dish/dish/index.vue
+++ b/src/views/canteen/dish/dish/index.vue
@@ -1370,7 +1370,7 @@
       }, 
       /** 删除按钮操作 */
       handleDelete(row) {
-         if (Number(row.hasInventory) === 1) {
+        if (Number(row.hasInventory) === 1) {
           this.$modal.msgWarning("该物料仍有库存，无法删除！");
           return;
         }
diff --git a/src/views/canteen/dish/material/components/MaterialDialog.vue b/src/views/canteen/dish/material/components/MaterialDialog.vue
index 2bb6df6b..9631b985 100644
--- a/src/views/canteen/dish/material/components/MaterialDialog.vue
+++ b/src/views/canteen/dish/material/components/MaterialDialog.vue
@@ -347,6 +347,7 @@ export default {
     this.getAreaTreeData();//获取区域树
     this.getTypeTreeData();//获取原料类别树
     this.getDrpUnitList();//获取单位类型下拉 
+    this.getNutritionTypeList();//获取类型下拉 
   },
   methods: {
     //区域树
diff --git a/src/views/canteen/dish/material/index.vue b/src/views/canteen/dish/material/index.vue
index 12c27932..5bb47c42 100644
--- a/src/views/canteen/dish/material/index.vue
+++ b/src/views/canteen/dish/material/index.vue
@@ -605,23 +605,20 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) { 
-       if (Number(row.hasInventory) === 1) {
+        if (Number(row.hasInventory) === 1) {
           this.$modal.msgWarning("该物料仍有库存，无法删除！");
           return;
         }
-       this.$modal
+        this.$modal
         .confirm("是否确认删除数据项？")
-        .then(() => {
-          // 使用箭头函数保持 this 上下文
-          return removeMaterialApi({ materialId: row.materialId });
+        .then(function () {
+          return removeMaterialApi({materialId:row.materialId});
         })
         .then(() => {
           this.$modal.msgSuccess("删除成功");
           this.getList();
         })
-        .catch(() => {
-          // 用户取消或异常
-        });
+        .catch(() => {});
     }, 
     handleSelectionChange(selection){
       this.multipleSelection = selection
@@ -642,9 +639,9 @@ export default {
         return;
       }
       removeMaterialApi({"materialId":this.batchIds.join(",")}).then(response => {
-        this.$modal.msgSuccess("删除成功"); 
-        this.$refs.multipleTable.clearSelection()
         this.getList();
+        this.$refs.multipleTable.clearSelection()
+        this.$modal.msgSuccess("删除成功"); 
       });
     },
     //批量修改
diff --git a/src/views/canteen/dish/menu/detail.vue b/src/views/canteen/dish/menu/detail.vue
index c7f2aa3c..e90e3d30 100644
--- a/src/views/canteen/dish/menu/detail.vue
+++ b/src/views/canteen/dish/menu/detail.vue
@@ -200,14 +200,14 @@
                                 <el-input  v-model="scope.row.limitNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.limitNum=v.replace(/[^\d]/g,''))"/>
                             </template>
                         </el-table-column>
-                        <el-table-column label="移动端推荐" align="center" prop="recommendFlag">
+                        <!-- <el-table-column label="移动端推荐" align="center" prop="recommendFlag">
                             <template slot-scope="scope">
                                 <el-switch v-model="scope.row.recommendFlag"
                                     active-text="是" inactive-text="否"
                                     :active-value="1" :inactive-value="2">
                                 </el-switch>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="text" style="color: red;"
diff --git a/src/views/canteen/dish/menu/edit.vue b/src/views/canteen/dish/menu/edit.vue
index 22b61e31..517e60c6 100644
--- a/src/views/canteen/dish/menu/edit.vue
+++ b/src/views/canteen/dish/menu/edit.vue
@@ -200,14 +200,14 @@
                                 <el-input  v-model="scope.row.limitNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.limitNum=v.replace(/[^\d]/g,''))"/>
                             </template>
                         </el-table-column>
-                        <el-table-column label="移动端推荐" align="center" prop="recommendFlag">
+                        <!-- <el-table-column label="移动端推荐" align="center" prop="recommendFlag">
                             <template slot-scope="scope">
                                 <el-switch v-model="scope.row.recommendFlag"
                                     active-text="是" inactive-text="否"
                                     :active-value="1" :inactive-value="2">
                                 </el-switch>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="text" style="color: red;"
@@ -958,6 +958,7 @@ export default {
             let index = this.dateRangeList.findIndex(v=>v.applyDate==this.dateRangeRadio)
             this.dateRangeIndex = index
             this.detailList = this.dateRangeList[index].detailList;
+            this.dateRangeList[index].editStatus=true
             let hasDishes = false
             this.detailList.forEach(item=>{
                 if(item.dishesList.length>0){
@@ -1014,6 +1015,7 @@ export default {
         choseWeekDate(item,index){
             this.weekId = item.applyWeek;
             this.detailList = this.weekDateList[index].detailList;
+            this.weekDateList[index].editStatus=true
             let hasDishes2 = false
             this.detailList.forEach(item=>{
                 if(item.dishesList.length>0){
@@ -1157,9 +1159,9 @@ export default {
                 let index = type.dishesList.findIndex(v=>v.dishesId==dish.dishesId)
                 this.detailList.forEach(item=>{
                     if(item.mealtimeType==type.mealtimeType){
-                        item.dishesList.splice(index,1)
+                        item.dishesList.splice(index,1) 
                     }
-                })
+                }) 
             }).catch(() => {}); 
         },
         // 提交按钮
@@ -1168,13 +1170,17 @@ export default {
                 if (valid) {  
                     let param = this.baseInfo
                     if(this.baseInfo.recipeType==1){
-                        param.recipeDateList = []
+                        param.recipeDateList = [] 
                         this.dateRangeList.forEach(item=>{
                             let index = item.detailList.findIndex(subItem=>subItem.dishesList.length>0)
                             if(index>-1){
                                 param.recipeDateList.push(item)
-                            }
-                        })
+                            }else{
+                                if(item.editStatus){
+                                    param.recipeDateList.push(item)
+                                } 
+                            } 
+                         })
                     }
                     if(this.baseInfo.recipeType==2){ 
                         param.recipeDateList = [{
@@ -1188,7 +1194,12 @@ export default {
                             let index = item.detailList.findIndex(subItem=>subItem.dishesList.length>0)
                             if(index>-1){
                                 param.recipeDateList.push(item)
+                            }else{
+                                if(item.editStatus){
+                                    param.recipeDateList.push(item)
+                                } 
                             }
+                            
                         })
                     }
                     this.noDishes = true;
@@ -1792,7 +1803,7 @@ export default {
                         dishesList:[]
                     }
                 ];
-                this.detailList = this.dateRangeList[this.dateRangeIndex].detailList;
+                this.detailList = this.dateRangeList[this.dateRangeIndex].detailList; 
                 this.$modal.msgSuccess("清空成功");
             }).catch(() => {});
             
diff --git a/src/views/energySaving/components/count.vue b/src/views/energySaving/components/count.vue
new file mode 100644
index 00000000..31297e5e
--- /dev/null
+++ b/src/views/energySaving/components/count.vue
@@ -0,0 +1,25 @@
+<template>
+  <div>
+     
+  </div>
+</template>
+
+<script> 
+
+export default {
+  props: {
+    topData: {
+      type: Array,
+      default: []
+    }
+  },
+  methods: {
+
+
+    
+  }
+}
+</script>
+<style lang="scss" scoped>
+ 
+</style>
diff --git a/src/views/energySaving/dashboard/BarChart.vue b/src/views/energySaving/dashboard/BarChart.vue
new file mode 100644
index 00000000..88e7ef64
--- /dev/null
+++ b/src/views/energySaving/dashboard/BarChart.vue
@@ -0,0 +1,102 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 6000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          top: 10,
+          left: '2%',
+          right: '2%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [{
+          type: 'category',
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          axisTick: {
+            alignWithLabel: true
+          }
+        }],
+        yAxis: [{
+          type: 'value',
+          axisTick: {
+            show: false
+          }
+        }],
+        series: [{
+          name: 'pageA',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [79, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageB',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [80, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageC',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [30, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/energySaving/dashboard/LineChart.vue b/src/views/energySaving/dashboard/LineChart.vue
new file mode 100644
index 00000000..702ff73f
--- /dev/null
+++ b/src/views/energySaving/dashboard/LineChart.vue
@@ -0,0 +1,135 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '350px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+    },
+    setOptions({ expectedData, actualData } = {}) {
+      this.chart.setOption({
+        xAxis: {
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          boundaryGap: false,
+          axisTick: {
+            show: false
+          }
+        },
+        grid: {
+          left: 10,
+          right: 10,
+          bottom: 20,
+          top: 30,
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          },
+          padding: [5, 10]
+        },
+        yAxis: {
+          axisTick: {
+            show: false
+          }
+        },
+        legend: {
+          data: ['expected', 'actual']
+        },
+        series: [{
+          name: 'expected', itemStyle: {
+            normal: {
+              color: '#FF005A',
+              lineStyle: {
+                color: '#FF005A',
+                width: 2
+              }
+            }
+          },
+          smooth: true,
+          type: 'line',
+          data: expectedData,
+          animationDuration: 2800,
+          animationEasing: 'cubicInOut'
+        },
+        {
+          name: 'actual',
+          smooth: true,
+          type: 'line',
+          itemStyle: {
+            normal: {
+              color: '#3888fa',
+              lineStyle: {
+                color: '#3888fa',
+                width: 2
+              },
+              areaStyle: {
+                color: '#f3f8ff'
+              }
+            }
+          },
+          data: actualData,
+          animationDuration: 2800,
+          animationEasing: 'quadraticOut'
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/energySaving/dashboard/PanelGroup.vue b/src/views/energySaving/dashboard/PanelGroup.vue
new file mode 100644
index 00000000..2b6a44d2
--- /dev/null
+++ b/src/views/energySaving/dashboard/PanelGroup.vue
@@ -0,0 +1,259 @@
+<template>
+  <el-row :gutter="36" class="panel-group">
+    <el-col :span="4" class="card-panel-col" v-for="(item,index) in topData" :key="index">
+      <div class="card-panel"> 
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            {{item.name}}
+          </div>
+          <count-to :start-val="0" :end-val="item.num" :duration="2000" class="card-panel-num" />
+        </div>
+        <div>
+          <div style="display: flex;justify-content: space-between;width: 70%;" v-if="Number(item.rate)>=0">
+            <div style="font-size: 0.75rem;color: #07B78A;">
+              同比昨日  +{{item.rate}}％
+            </div>
+            <div>
+              <img src="@/assets/images/up.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+          <div style="display: flex;justify-content: space-between;width: 70%;" v-if="Number(item.rate)<0">
+            <div style="font-size: 0.75rem;color: #d81e06;">
+              同比昨日  {{item.rate}}％
+            </div>
+            <div>
+              <img src="@/assets/images/down.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+        </div>
+        
+      </div>
+    </el-col>
+    <!-- <el-col :span="4" class="card-panel-col">
+      <div class="card-panel"> 
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            今日食堂订单量（个）
+          </div>
+          <count-to :start-val="0" :end-val="360" :duration="2000" class="card-panel-num" />
+        </div>
+        <div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #07B78A;">
+              同比昨日  +1.6％
+            </div>
+            <div>
+              <img src="@/assets/images/up.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #d81e06;">
+              同比昨日  -05％
+            </div>
+            <div>
+              <img src="@/assets/images/down.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+        </div>
+        
+      </div>
+    </el-col>
+    <el-col :span="4" class="card-panel-col">
+      <div class="card-panel"> 
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            今日就餐人数（人）
+          </div>
+          <count-to :start-val="0" :end-val="211" :duration="2000" class="card-panel-num" />
+        </div>
+        <div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #07B78A;">
+              同比昨日  +1.6％
+            </div>
+            <div>
+              <img src="@/assets/images/up.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #d81e06;">
+              同比昨日  -05％
+            </div>
+            <div>
+              <img src="@/assets/images/down.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+        </div>
+        
+      </div>
+    </el-col>
+    <el-col :span="4" class="card-panel-col">
+      <div class="card-panel"> 
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            今日菜品数量（个）
+          </div>
+          <count-to :start-val="0" :end-val="14" :duration="2000" class="card-panel-num" />
+        </div>
+        <div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #07B78A;">
+              同比昨日  +1.6％
+            </div>
+            <div>
+              <img src="@/assets/images/up.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #d81e06;">
+              同比昨日  -05％
+            </div>
+            <div>
+              <img src="@/assets/images/down.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+        </div>
+        
+      </div>
+    </el-col>
+    <el-col :span="4" class="card-panel-col">
+      <div class="card-panel"> 
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            今日商超营业额（元）
+          </div>
+          <count-to :start-val="0" :end-val="5200" :duration="2000" class="card-panel-num" />
+        </div>
+        <div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #07B78A;">
+              同比昨日  +1.6％
+            </div>
+            <div>
+              <img src="@/assets/images/up.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #d81e06;">
+              同比昨日  -05％
+            </div>
+            <div>
+              <img src="@/assets/images/down.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+        </div>
+        
+      </div>
+    </el-col>
+    <el-col :span="4" class="card-panel-col">
+      <div class="card-panel"> 
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            今日商超订单
+          </div>
+          <count-to :start-val="0" :end-val="435" :duration="2000" class="card-panel-num" />
+        </div>
+        <div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #07B78A;">
+              同比昨日  +1.6％
+            </div>
+            <div>
+              <img src="@/assets/images/up.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+          <div style="display: flex;justify-content: space-between;width: 70%;">
+            <div style="font-size: 12px;color: #d81e06;">
+              同比昨日  -05％
+            </div>
+            <div>
+              <img src="@/assets/images/down.png" style="width: 18px;height: 18px;">
+            </div>
+          </div>
+        </div>
+        
+      </div>
+    </el-col> -->
+     
+  </el-row>
+</template>
+
+<script>
+import CountTo from 'vue-count-to'
+
+export default {
+  components: {
+    CountTo
+  },
+  props: {
+    topData: {
+      type: Array,
+      default: []
+    }
+  },
+  methods: {
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.panel-group {
+  // margin-top: 5px;
+  padding-left: 15px;
+  padding-right: 15px;
+
+  .card-panel-col {
+    margin-bottom: 10px;
+    padding-left: 8px!important;
+    padding-right: 8px!important;
+  }
+
+  .card-panel {
+    height: 140px;
+    // cursor: pointer;
+    font-size: 0.75rem;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    padding: 15px;
+    border-radius: 4px;
+
+    // &:hover {  
+    //   .icon-message {
+    //     background: #36a3f7;
+    //   } 
+    // } 
+
+    // .icon-message {
+    //   color: #36a3f7;
+    // }   
+    .card-panel-description {
+      font-weight: bold;
+      margin: 0px;
+      margin-left: 0px;
+      margin-bottom: 10px;
+
+      .card-panel-text {
+        line-height: 18px;
+        // color: rgba(0, 0, 0, 0.5);
+        font-weight: normal;
+        font-size: 1rem;
+        margin-bottom: 15px;
+      }
+
+      .card-panel-num {
+        font-size: 1.5rem;
+        color: #000;
+      }
+    }
+
+
+
+
+  }
+} 
+</style>
diff --git a/src/views/energySaving/dashboard/PieChart.vue b/src/views/energySaving/dashboard/PieChart.vue
new file mode 100644
index 00000000..63f0d849
--- /dev/null
+++ b/src/views/energySaving/dashboard/PieChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+        },
+        series: [
+          {
+            name: 'WEEKLY WRITE ARTICLES',
+            type: 'pie',
+            roseType: 'radius',
+            radius: [15, 95],
+            center: ['50%', '38%'],
+            data: [
+              { value: 320, name: 'Industries' },
+              { value: 240, name: 'Technology' },
+              { value: 149, name: 'Forex' },
+              { value: 100, name: 'Gold' },
+              { value: 59, name: 'Forecasts' }
+            ],
+            animationEasing: 'cubicInOut',
+            animationDuration: 2600
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/energySaving/dashboard/RaddarChart.vue b/src/views/energySaving/dashboard/RaddarChart.vue
new file mode 100644
index 00000000..312e018a
--- /dev/null
+++ b/src/views/energySaving/dashboard/RaddarChart.vue
@@ -0,0 +1,116 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 3000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        radar: {
+          radius: '66%',
+          center: ['50%', '42%'],
+          splitNumber: 8,
+          splitArea: {
+            areaStyle: {
+              color: 'rgba(127,95,132,.3)',
+              opacity: 1,
+              shadowBlur: 45,
+              shadowColor: 'rgba(0,0,0,.5)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 15
+            }
+          },
+          indicator: [
+            { name: 'Sales', max: 10000 },
+            { name: 'Administration', max: 20000 },
+            { name: 'Information Techology', max: 20000 },
+            { name: 'Customer Support', max: 20000 },
+            { name: 'Development', max: 20000 },
+            { name: 'Marketing', max: 20000 }
+          ]
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
+        },
+        series: [{
+          type: 'radar',
+          symbolSize: 0,
+          areaStyle: {
+            normal: {
+              shadowBlur: 13,
+              shadowColor: 'rgba(0,0,0,.2)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 10,
+              opacity: 1
+            }
+          },
+          data: [
+            {
+              value: [5000, 7000, 12000, 11000, 15000, 14000],
+              name: 'Allocated Budget'
+            },
+            {
+              value: [4000, 9000, 15000, 15000, 13000, 11000],
+              name: 'Expected Spending'
+            },
+            {
+              value: [5500, 11000, 12000, 15000, 12000, 12000],
+              name: 'Actual Spending'
+            }
+          ],
+          animationDuration: animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/energySaving/dashboard/mixins/resize.js b/src/views/energySaving/dashboard/mixins/resize.js
new file mode 100644
index 00000000..b1e76e94
--- /dev/null
+++ b/src/views/energySaving/dashboard/mixins/resize.js
@@ -0,0 +1,56 @@
+import { debounce } from '@/utils'
+
+export default {
+  data() {
+    return {
+      $_sidebarElm: null,
+      $_resizeHandler: null
+    }
+  },
+  mounted() {
+    this.initListener()
+  },
+  activated() {
+    if (!this.$_resizeHandler) {
+      // avoid duplication init
+      this.initListener()
+    }
+
+    // when keep-alive chart activated, auto resize
+    this.resize()
+  },
+  beforeDestroy() {
+    this.destroyListener()
+  },
+  deactivated() {
+    this.destroyListener()
+  },
+  methods: {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_sidebarResizeHandler(e) {
+      if (e.propertyName === 'width') {
+        this.$_resizeHandler()
+      }
+    },
+    initListener() {
+      this.$_resizeHandler = debounce(() => {
+        this.resize()
+      }, 100)
+      window.addEventListener('resize', this.$_resizeHandler)
+
+      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    destroyListener() {
+      window.removeEventListener('resize', this.$_resizeHandler)
+      this.$_resizeHandler = null
+
+      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    resize() {
+      const { chart } = this
+      chart && chart.resize()
+    }
+  }
+}
diff --git a/src/views/energySaving/index.vue b/src/views/energySaving/index.vue
new file mode 100644
index 00000000..3d9aa558
--- /dev/null
+++ b/src/views/energySaving/index.vue
@@ -0,0 +1,798 @@
+<template>
+  <div class="dashboard-editor-container">
+    <el-row>
+      <el-col :span="12">
+        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;border-radius: 4px;">
+          <div style="display: flex;align-items: center;">
+            <img src="@/assets/images/waterIcon.png" style="width: 60px;height: 60px;">
+            <div style="font-size: 24px;font-weight: 600;">
+              智慧用水
+            </div>
+          </div>
+          <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;padding:0 20px;">
+            <div style="width: 50%;display: flex;align-items: center;font-size: 18px;">
+              <div style="margin-right: 10px;">日用水量</div>
+              <count-to :start-val="0" :end-val="53" :duration="2000" class="card-panel-num" />
+              <div style="margin-left: 10px;">m³</div>
+            </div>
+            <div style="width: 50%;display: flex;align-items: center;">
+              <div style="margin-right: 10px;">累计用水量</div>
+              <count-to :start-val="0" :end-val="53" :duration="2000" class="card-panel-num" />
+              <div style="margin-left: 10px;">m³</div>
+            </div>
+          </div>
+        </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>
+          <div id="lineChartOne" style="width: 100%;height: 200px;margin-bottom: 20px;"></div>  
+        </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>
+          <div id="lineChartTwo" style="width: 100%;height: 200px;margin-bottom: 20px;"></div>  
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;border-radius: 4px;">
+          <div style="display: flex;align-items: center;">
+            <img src="@/assets/images/waterIcon.png" style="width: 60px;height: 60px;">
+            <div style="font-size: 24px;font-weight: 600;">
+              智慧用水
+            </div>
+          </div>
+          <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;padding:0 20px;">
+            <div style="width: 50%;display: flex;align-items: center;font-size: 18px;">
+              <div style="margin-right: 10px;">日用水量</div>
+              <count-to :start-val="0" :end-val="53" :duration="2000" class="card-panel-num" />
+              <div style="margin-left: 10px;">m³</div>
+            </div>
+            <div style="width: 50%;display: flex;align-items: center;">
+              <div style="margin-right: 10px;">累计用水量</div>
+              <count-to :start-val="0" :end-val="53" :duration="2000" class="card-panel-num" />
+              <div style="margin-left: 10px;">m³</div>
+            </div>
+          </div>
+        </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>
+          <div id="lineChartOne" style="width: 100%;height: 200px;margin-bottom: 20px;"></div>  
+        </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>
+          <div id="lineChartTwo" style="width: 100%;height: 200px;margin-bottom: 20px;"></div>  
+        </div>
+      </el-col>
+    </el-row> 
+
+
+  </div>
+</template>
+
+<script>
+import CountTo from 'vue-count-to'
+import * as echarts from 'echarts' 
+import {  getDataScreeningModelApi,
+          getCanteenOrdersAndSalesTrendsApi,
+          getSupermarketOrderAndSalesTrendApi,
+          getThisMonthSDishSalesRankingApi,
+          getProportionOfOrderTypesApi 
+        } from "@/api/index";  
+export default { 
+  name: 'Index',
+  components: {
+    CountTo
+  },
+  data() {
+    return {
+      topAreaOptions:[
+        {
+          "num": 0,
+          "rate": "0.00",
+          "name": "今日食堂营业额（元）",
+          "lastDate": "2025-05-15"
+        },{
+          "num": 0,
+          "rate": "0.00",
+          "name": "今日食堂订单量（个）",
+          "lastDate": "2025-05-15"
+        },
+        {
+          "num": 0,
+          "rate": "0.00",
+          "name": "今日就餐人数（个）",
+          "lastDate": "2025-05-15"
+        },
+        {
+          "num": 0,
+          "rate": "0.00",
+          "name": "今日菜品数量（个）",
+          "lastDate": "2025-05-15"
+        },
+        {
+          "num": 0,
+          "rate": "0.0",
+          "name": "今日超市营业额（元）",
+          "lastDate": "2025-05-15"
+        },
+        {
+          "num": 0,
+          "rate": "0.0",
+          "name": "今日超市订单量（个）",
+          "lastDate": "2025-05-15"
+        }
+      ],
+      type1:1,
+      type2:1,
+      type3:1,
+      myCharts1:null,
+      myCharts2:null,
+      myCharts3:null,
+      myCharts4:null,
+    }
+  },
+  mounted(){
+    this.getTopData()
+    this.InitEChartsOne()
+    this.InitEChartsTwo()
+    this.InitEChartsThree()
+    this.InitEChartsFour()
+    window.addEventListener('transitionend', this.$_sidebarResizeHandler) 
+  },
+  methods: {
+    $_sidebarResizeHandler(e) {
+      if (e.propertyName === 'width') {
+        console.log(e)
+        setTimeout(() => {
+          this.myCharts1.resize();
+          this.myCharts2.resize();
+          this.myCharts3.resize();
+          this.myCharts4.resize();
+        }, 500);
+      }
+    },
+    getTopData(){ 
+      getDataScreeningModelApi({}).then((response) => {
+          this.topAreaOptions = response.data.data; 
+      }); 
+    },
+    changType1(e){
+      console.log(this.type1)
+      this.InitEChartsOne()
+      this.myCharts1.resize();
+    },
+    InitEChartsOne() {
+      let chartData=[]
+      // let weekDate=["周一","周二","周三","周四","周五","周六","周日"]
+      let weekDate=[]
+      let monthDate = []
+      let xDate = []
+      let salesData = []
+      let orderData = []
+      getCanteenOrdersAndSalesTrendsApi({type:this.type1}).then((response) => {
+          chartData = response.data;
+          chartData.forEach((item,index)=>{
+            weekDate.push(item.weekday)
+            monthDate.push(item.orderDate)
+            salesData.push(item.salesValue)
+            orderData.push(item.orderValue) 
+          })
+          if(this.type1==1){
+            xDate= weekDate
+          }else{
+            xDate = monthDate
+          }
+          var option = {
+            // title: {
+            //   text: "食品经营情况", 
+            // },
+            tooltip: {
+              trigger: "axis",
+            },
+            legend: {
+              data: ["销售额", "订单量"],
+              icon:"rect",
+              bottom: "0%",
+            },
+            grid: {
+              left: "5%",
+              right: "5%",
+              top: "20%",
+              bottom: "10%",
+              containLabel: true,
+            },
+            color: ["#4FA7FF", "#58F5CE"], 
+            calculable: true,
+            xAxis: [
+              {
+                type: "category",
+                boundaryGap: false,
+                data: xDate,
+              },
+            ],
+            yAxis: {
+              name: "销售额/订单量",
+              type: "value",
+            },
+            series: [
+              {
+                name: "销售额",
+                type: "line",
+                areaStyle: {
+                  normal: {
+                    type: "default",
+                    color: new echarts.graphic.LinearGradient(
+                      0,
+                      0,
+                      0,
+                      1,
+                      [
+                        {
+                          offset: 0,
+                          color: "rgba(79, 167, 255, 1)",
+                        },
+                        {
+                          offset: 1,
+                          color: "rgba(79, 167, 255, 1)",
+                        },
+                      ],
+                      false
+                    ),
+                  },
+                },
+                smooth: true,
+                itemStyle: {
+                  normal: { areaStyle: { type: "default" } },
+                },
+                data: salesData,
+              },
+              {
+                name: "订单量",
+                type: "line",
+                areaStyle: {
+                  normal: {
+                    type: "default",
+                    color: new echarts.graphic.LinearGradient(
+                      0,
+                      0,
+                      0,
+                      1,
+                      [
+                        {
+                          offset: 0,
+                          color: "rgba(92, 255, 214, 1)",
+                        },
+                        {
+                          offset: 1,
+                          color: "rgba(92, 255, 214, 1)",
+                        },
+                      ],
+                      false
+                    ),
+                  },
+                },
+                smooth: true,
+                itemStyle: { normal: { areaStyle: { type: "default" } } },
+                data: orderData,
+              },
+            ],
+          };
+          this.myCharts1 = echarts.init(document.querySelector('#lineChartOne'));
+          this.myCharts1.setOption(option)   
+      }); 
+    },
+    changType2(e){
+      console.log(this.type2)
+      this.InitEChartsTwo()
+      this.myCharts2.resize();
+    },
+    InitEChartsTwo() {
+      let chartData=[]
+      // let weekDate=["周一","周二","周三","周四","周五","周六","周日"]
+      let weekDate=[]
+      let monthDate = []
+      let xDate = []
+      let salesData = []
+      let orderData = []
+      getSupermarketOrderAndSalesTrendApi({type:this.type2}).then((response) => {
+          chartData = response.data;
+          chartData.forEach((item,index)=>{
+            weekDate.push(item.weekday)
+            monthDate.push(item.orderDate)
+            salesData.push(item.salesValue)
+            orderData.push(item.orderValue) 
+          })
+          if(this.type2==1){
+            xDate= weekDate
+          }else{
+            xDate = monthDate
+          }
+          var option = {
+            // title: {
+            //   text: "食品经营情况", 
+            // },
+            tooltip: {
+              trigger: "axis",
+            },
+            legend: {
+              data: ["销售额", "订单量"],
+              icon:"rect",
+              bottom: "0%",
+            },
+            grid: {
+              left: "5%",
+              right: "5%",
+              top: "20%",
+              bottom: "10%",
+              containLabel: true,
+            },
+            color: ["#4FA7FF", "#58F5CE"], 
+            calculable: true,
+            xAxis: [
+              {
+                type: "category",
+                boundaryGap: false,
+                data: xDate,
+              },
+            ],
+            yAxis: {
+              name: "销售额/订单量",
+              type: "value",
+            },
+            series: [
+              {
+                name: "销售额",
+                type: "line",
+                areaStyle: {
+                  normal: {
+                    type: "default",
+                    color: new echarts.graphic.LinearGradient(
+                      0,
+                      0,
+                      0,
+                      1,
+                      [
+                        {
+                          offset: 0,
+                          color: "rgba(79, 167, 255, 1)",
+                        },
+                        {
+                          offset: 1,
+                          color: "rgba(79, 167, 255, 1)",
+                        },
+                      ],
+                      false
+                    ),
+                  },
+                },
+                smooth: true,
+                itemStyle: {
+                  normal: { areaStyle: { type: "default" } },
+                },
+                data: salesData,
+              },
+              {
+                name: "订单量",
+                type: "line",
+                areaStyle: {
+                  normal: {
+                    type: "default",
+                    color: new echarts.graphic.LinearGradient(
+                      0,
+                      0,
+                      0,
+                      1,
+                      [
+                        {
+                          offset: 0,
+                          color: "rgba(92, 255, 214, 1)",
+                        },
+                        {
+                          offset: 1,
+                          color: "rgba(92, 255, 214, 1)",
+                        },
+                      ],
+                      false
+                    ),
+                  },
+                },
+                smooth: true,
+                itemStyle: { normal: { areaStyle: { type: "default" } } },
+                data: orderData,
+              },
+            ],
+          };
+          this.myCharts2 = echarts.init(document.querySelector('#lineChartTwo'));
+          this.myCharts2.setOption(option)  
+      }); 
+    },
+    InitEChartsThree() { 
+      var getName = [];
+      var getValue = [];
+      var chartData=[]
+      getThisMonthSDishSalesRankingApi().then((response) => {
+          chartData = response.data.slice(0, 10);
+          chartData.forEach((item,index)=>{
+            getName.push(item.name)
+            getValue.push(item.num) 
+          })  
+          var max = Math.max.apply(null, getValue);
+          var getMax = [];
+          for (var i = 0; i < getName.length; i++) {
+            getMax.push(max+20);
+          } 
+          var option = {
+            backgroundColor: "#fff",
+            grid: {
+              left: "5%",
+              right: "2%",
+              bottom: "2%",
+              top: "10%",
+              containLabel: true,
+            },
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                type: "none",
+              },
+              formatter: function (params) {
+                return params[0].name + " : " + params[0].value;
+              },
+            },
+            xAxis: {
+              show: false,
+              type: "value",
+            },
+            yAxis: [
+              {
+                type: "category",
+                inverse: true,
+                offset: 100, 
+                axisLabel: {
+                  show: true,
+                  align: "left",
+                  textStyle: {
+                    color: "#66cc00",
+                  },
+                  formatter: function (value, index) {
+                    var num = "";
+                    var str = "";
+                    var no = "NO.";
+                    num = index + 1;
+                    value = value.length > 8 ? value.slice(0, 8) + '...' : value
+                    if (index === 0) {
+                      str = " {num1|" + num + "} {title1|" + value + "}";
+                    } else if (index === 1) {
+                      str = " {num2|" + num + "} {title2|" + value + "}";
+                    } else if (index === 2) {
+                      str = " {num3|" + num + "} {title3|" + value + "}";
+                    } else {
+                      str = " {num|" + num + "} {title|" + value + "}";
+                    }
+                    return str;
+                  },
+                  rich: {
+                    no: {
+                      color: "#333",
+                      fontSize: 14,
+                    },
+                    no1: {
+                      color: "#333",
+                      fontSize: 14,
+                    },
+                    no2: {
+                      color: "#333",
+                      fontSize: 14,
+                    },
+                    no3: {
+                      color: "#333",
+                      fontSize: 14,
+                    },
+                    num: {
+                      color: "#fff",
+                      backgroundColor: "#5281F8",
+                      width: 20,
+                      height: 20,
+                      fontSize: 14,
+                      align: "center",
+                      borderRadius: 100,
+                    },
+                    num1: {
+                      color: "#fff",
+                      backgroundColor: "#EDA54F",
+                      width: 20,
+                      height: 20,
+                      fontSize: 14,
+                      align: "center",
+                      borderRadius: 100,
+                    },
+                    num2: {
+                      color: "#fff",
+                      backgroundColor: "#EDA54F",
+                      width: 20,
+                      height: 20,
+                      fontSize: 14,
+                      align: "center",
+                      borderRadius: 100,
+                    },
+                    num3: {
+                      color: "#fff",
+                      backgroundColor: "#EDA54F",
+                      width: 20,
+                      height: 20,
+                      fontSize: 14,
+                      align: "center",
+                      borderRadius: 100,
+                    },
+                    title: {
+                      color: "#333333",
+                    },
+                    title1: {
+                      color: "#333333",
+                    },
+                    title2: {
+                      color: "#333333",
+                    },
+                    title3: {
+                      color: "#333333",
+                    },
+                  },
+                },
+                splitLine: {
+                  show: false,
+                },
+                axisTick: {
+                  show: false,
+                },
+                axisLine: {
+                  show: false,
+                },
+                data: getName,
+              },
+              {
+                type: "category",
+                inverse: true,
+                offset: -20,
+                axisTick: "none",
+                axisLine: "none",
+                show: true,
+                axisLabel: {
+                  interval: 0,
+                  color: "#666",
+                  align: "left",
+                  margin: 20,
+                  fontSize: 13,
+                  formatter: function (value, index) {
+                    return (
+                      getValue[index]
+                    );
+                  },
+                },
+                data: getValue,
+              },
+            ],
+            series: [
+              {
+                name: "值",
+                type: "bar",
+                zlevel: 1,
+                itemStyle: {
+                  normal: {
+                    barBorderRadius: 30,
+                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                      {
+                        offset: 0,
+                        color: "rgb(0, 111, 104, 1)",
+                      },
+                      {
+                        offset: 1,
+                        color: "rgb(0, 111, 104, 1)",
+                      },
+                    ]),
+                  },
+                },
+                barWidth: 14,
+                data: getValue,
+              },
+              {
+                name: "背景",
+                type: "bar",
+                barWidth: 14,
+                barGap: "-100%",
+                data: getMax,
+                itemStyle: {
+                  normal: {
+                    color: "rgba(224, 233, 255, 1)",
+                    barBorderRadius: 30,
+                  },
+                },
+              },
+            ],
+          }; 
+          this.myCharts3 = echarts.init(document.querySelector('#lineChartThree'));
+          this.myCharts3.setOption(option)  
+          // // 根据页面大小自动响应图表大小
+          // window.addEventListener("resize3", function () {
+          //     myCharts3.resize();
+          // });
+      }); 
+    },
+    changType3(e){
+      console.log(this.type3)
+      this.InitEChartsFour()
+      this.myCharts4.resize();
+    },
+    InitEChartsFour() {
+      var chartData=[]
+      getProportionOfOrderTypesApi({type:this.type3}).then((response) => {
+          chartData = response.data;
+          var m2R2Data = []
+          var sumNum = 0
+          chartData.forEach((item,index)=>{
+            let obj = {}
+            sumNum=sumNum+item.num
+            if(index==0){
+              obj = {
+                value: item.num,
+                legendname: item.name,
+                name: item.name+' '+  item.num,
+                itemStyle: { color: "#5085f2" },
+              }
+            }
+            if(index==1){
+              obj = {
+                value: item.num,
+                legendname: item.name,
+                name: item.name+' '+  item.num,
+                itemStyle: { color: "#f2719a" },
+              }
+            }
+            if(index==2){
+              obj = {
+                value: item.num,
+                legendname: item.name,
+                name: item.name+' '+  item.num,
+                itemStyle: { color: "#fdb301" },
+              }
+            }
+            m2R2Data.push(obj)
+          }) 
+
+          // var m2R2Data = [
+          //   {
+          //     value: 310,
+          //     legendname: "种类02",
+          //     name: "种类02  310",
+          //     itemStyle: { color: "#5085f2" },
+          //   }, 
+          //   {
+          //     value: 335,
+          //     legendname: "种类05",
+          //     name: "种类05  335",
+          //     itemStyle: { color: "#f2719a" },
+          //   }, 
+          //   {
+          //     value: 335,
+          //     legendname: "种类08",
+          //     name: "种类08  335",
+          //     itemStyle: { color: "#fdb301" },
+          //   }
+          // ];
+
+          var option = {
+            title: [
+              {
+                text: "订单总数",
+                subtext: sumNum + "个",
+                textStyle: {
+                  fontSize: 20,
+                  color: "black",
+                },
+                subtextStyle: {
+                  fontSize: 20,
+                  color: "black",
+                },
+                textAlign: "center",
+                x: "34.5%",
+                y: "44%",
+              },
+            ],
+            tooltip: {
+              trigger: "item",
+              formatter: function (parms) {
+                var str =
+                  parms.seriesName +
+                  "</br>" +
+                  parms.marker +
+                  "" +
+                  parms.data.legendname +
+                  "</br>" +
+                  "数量：" +
+                  parms.data.value +
+                  "</br>" +
+                  "占比：" +
+                  parms.percent +
+                  "%";
+                return str;
+              },
+            },
+            legend: {
+              type: "scroll",
+              orient: "vertical",
+              left: "70%",
+              align: "left",
+              top: "middle",
+              textStyle: {
+                color: "#8C8C8C",
+              },
+              height: 250,
+            },
+            series: [
+              {
+                name: "标题",
+                type: "pie",
+                center: ["35%", "50%"],
+                radius: ["65%", "90%"],
+                clockwise: false, //饼图的扇区是否是顺时针排布
+                avoidLabelOverlap: false,
+                label: {
+                  normal: {
+                    show: false,
+                    position: "outter",
+                    formatter: function (parms) {
+                      return parms.data.legendname;
+                    },
+                  },
+                },
+                labelLine: {
+                  normal: {
+                    length: 5,
+                    length2: 3,
+                    smooth: true,
+                  },
+                },
+                data: m2R2Data,
+              },
+            ],
+          }; 
+          this.myCharts4 = echarts.init(document.querySelector('#barChartFour'));
+          this.myCharts4.setOption(option)  
+          // 根据页面大小自动响应图表大小
+          // window.addEventListener("resize4", function () {
+          //     myCharts4.resize();
+          // });
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dashboard-editor-container {
+  padding: 15px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
+
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
+  }
+}
+.card-panel-num {
+  font-size: 1.5rem;
+  font-weight: 600;
+  color: #000;
+}
+@media (max-width:1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}
+</style>
diff --git a/src/views/kitchen/foodSafety/sampleManage/index.vue b/src/views/kitchen/foodSafety/sampleManage/index.vue
index d6cecdef..59c5adf3 100644
--- a/src/views/kitchen/foodSafety/sampleManage/index.vue
+++ b/src/views/kitchen/foodSafety/sampleManage/index.vue
@@ -67,8 +67,7 @@
         </template>
       </el-table-column>
       <el-table-column label="日期" align="center" prop="sampleSaveTime" :show-overflow-tooltip="true"  width="150"/>
-      <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"  />
-      <el-table-column label="关联食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"  />
+      <el-table-column label="关联食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"  width="150"/>
       <el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true" />
       <el-table-column label="餐次" align="center" prop="mealtimeType" :show-overflow-tooltip="true">
         <template slot-scope="scope">
diff --git a/vue.config.js b/vue.config.js
index 3235d83b..ef8f33b1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,9 @@ module.exports = {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://192.168.2.75:48380`,//旭
-                target: `http://192.168.0.34:48380`,//测试
+                target: `http://192.168.0.244:48380`,//测试
                 // target: `http://192.168.1.176:48380`,//测试
-                // target: `http://192.168.0.44:48380`,//测试
+                // target: `http://192.168.0.34:48380`,//测试
                 // target: `http://192.168.0.176:48380`,//
                 changeOrigin: true,
                 pathRewrite: {