From 2a095a9b3c05787d4ea08d12dbac364d3162e106 Mon Sep 17 00:00:00 2001
From: wangqiujuan0808 <578331299@qq.com>
Date: Mon, 30 Oct 2023 19:24:32 +0800
Subject: [PATCH] 123

---
 src/components/Header.vue  | 14 +++++++++-----
 src/components/Report.vue  |  7 +++++++
 src/components/Zhibiao.vue |  8 ++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index e7f4da4..271575f 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="header">
-    <div class="left" @click="back" style="cursor: pointer">
+    <div class="div30 left" @click="back" style="cursor: pointer">
       <i v-if="hasBack" class="el-icon-back" ></i>
-      <span style="font-size: 20px">{{ modelName }}</span>
+      <span style="font-size: 20px">{{ name  }}</span>
     </div>
-    <div style="font-size: 24px">{{name}}</div>
-    <div class="right">
+    <div class="div30" style="font-size: 24px;text-align: center;">{{modelName}}</div>
+    <div class="right div30">
       <el-popover
         placement="bottom"
         :width="320"
@@ -63,6 +63,7 @@ export default {
     }
     const back = () => {
       router.push('/home')
+      store.commit("setModelName", '');
     }
     router.afterEach((to) => {
       console.log('to', to)
@@ -80,7 +81,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   .header {
     height: 50px;
     border-bottom: 1px solid #e9e9e9;
@@ -88,6 +89,9 @@ export default {
     justify-content: space-between;
     align-items: center;
     padding: 0 20px;
+    .div30 {
+      width: 33%;
+    }
   }
   .el-icon-back {
     border: 1px solid #e9e9e9;
diff --git a/src/components/Report.vue b/src/components/Report.vue
index 2420d52..3f3c010 100644
--- a/src/components/Report.vue
+++ b/src/components/Report.vue
@@ -145,6 +145,13 @@ export default {
         title: {
           text: '未来一周天气图'
         },
+        grid: {
+          left: "3%", //画布左移位置
+          right: '3%',
+          top: "20%",
+          width: "90%", //画布宽度
+          height: "65%", //画布高度
+        },
         tooltip: {
           trigger: 'axis'
         },
diff --git a/src/components/Zhibiao.vue b/src/components/Zhibiao.vue
index bcfd74c..f95b9d9 100644
--- a/src/components/Zhibiao.vue
+++ b/src/components/Zhibiao.vue
@@ -26,10 +26,10 @@ export default {
     });
     onMounted(async () => { 
       getChartsZfl("echartDiv1", '蒸腾量');
-      getChartsZfl("echartDiv2", 'COD')
+      getChartsZfl("echartDiv2", 'COD');
       getChartsZfl("echartDiv3", '氨氮');
-      getChartsZfl("echartDiv4", 'SS')
-      getChartsZfl("echartDiv5", '屋面温度')
+      getChartsZfl("echartDiv4", 'SS');
+      getChartsZfl("echartDiv5", '屋面温度');
      });
     const getChartsZfl = (id, text) => {
       var dom = document.getElementById(id);
@@ -267,7 +267,7 @@ export default {
     width: 100%;
     height: 20%;
     margin: 0 auto;
-    // border: 1px solid red;
+    border: 1px solid red;
   }
 }
 </style>