From fce89affcbc15073f2e41b647239b3fff777006b Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期一, 27 二月 2023 14:20:27 +0800
Subject: [PATCH] 修改切换逻辑

---
 src/components/Screen/left.vue |   53 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/components/Screen/left.vue b/src/components/Screen/left.vue
index f643744..1faf631 100644
--- a/src/components/Screen/left.vue
+++ b/src/components/Screen/left.vue
@@ -4,45 +4,46 @@
       <img :src="leftImg" @click="ChangeLeft" />
     </div>
     <div class="leftContainer" v-if="ChartDisplay">
-      <div class="current1"  id="leftCurrent1">
+      <div class="current1" id="leftCurrent1">
         <div class="aside-title">鏁版嵁鐢宠娆℃暟</div>
-        <count-data-apply ></count-data-apply>
+        <count-data-apply></count-data-apply>
       </div>
-      <div class="current1"   id="leftCurrent2">
+      <div class="current1" id="leftCurrent2">
         <div class="aside-title">鐢ㄦ埛璁块棶閲�</div>
         <service-type></service-type>
       </div>
-      <div class="current1"  id="leftCurrent3">
+      <div class="current1" id="leftCurrent3">
         <div class="aside-title">椤圭洰瀛樺偍淇℃伅</div>
         <data-storage></data-storage>
       </div>
     </div>
     <!-- 鍏ㄧ悆缁熻娆℃暟 -->
     <div class="leftContainer" v-if="GlobleChartDisplay">
-      <div class="current1"  id="leftCurrent1">
+      <div class="current1" id="leftCurrent1">
         <div class="aside-title">鏁版嵁鐢宠娆℃暟</div>
-        <count-data-apply ></count-data-apply>
+        <base-bar-chart :project="currProject"></base-bar-chart>
+        <!-- <count-data-apply></count-data-apply> -->
       </div>
-      <div class="current1"   id="leftCurrent2">
+      <div class="current1" id="leftCurrent2">
         <div class="aside-title">鐢ㄦ埛璁块棶閲�</div>
         <service-type></service-type>
       </div>
-      <div class="current1"  id="leftCurrent3">
+      <div class="current1" id="leftCurrent3">
         <div class="aside-title">椤圭洰瀛樺偍淇℃伅</div>
         <data-storage></data-storage>
       </div>
     </div>
-<!-- 鍏ㄥ浗椤圭洰缁熻娆℃暟 -->
+    <!-- 鍏ㄥ浗椤圭洰缁熻娆℃暟 -->
     <div class="leftContainer" v-if="CountryChartDisplay">
-      <div class="current1"  id="leftCurrent1">
+      <div class="current1" id="leftCurrent1">
         <div class="aside-title">鏁版嵁鐢宠娆℃暟</div>
-        <count-data-apply ></count-data-apply>
+        <count-data-apply></count-data-apply>
       </div>
-      <div class="current1"   id="leftCurrent2">
+      <div class="current1" id="leftCurrent2">
         <div class="aside-title">鐢ㄦ埛璁块棶閲�</div>
         <service-type></service-type>
       </div>
-      <div class="current1"  id="leftCurrent3">
+      <div class="current1" id="leftCurrent3">
         <div class="aside-title">椤圭洰瀛樺偍淇℃伅</div>
         <data-storage></data-storage>
       </div>
@@ -57,26 +58,43 @@
 import countDataApply from "@/components/chart/CountDataApply.vue"
 import ServiceType from "../chart/ServiceType.vue"
 import DataStorage from "../chart/DataStorage.vue"
+import BaseBarChart from "../chart/BaseBarChart.vue"
 export default {
   components: {
     ProjectTree,
     countDataApply,
     ServiceType,
     DataStorage,
+    BaseBarChart,
   },
   data() {
     return {
       leftMessage: "init",
       ChartDisplay: true,
       ProjectreeDisplay: false,
-      GlobleChartDisplay:false,
-      CountryChartDisplay:false,
+      GlobleChartDisplay: false,
+      CountryChartDisplay: false,
       leftImg: require("../../assets/img/Screen/rightArrow.png"),
+      currProject: "鍏ㄧ悆椤圭洰",
     }
   },
   mounted() {
     this.OpenLeftInit()
     // this.OpenLeftInitChart();
+    this.$bus.$on("changeProject", name => {
+      this.currProject = name
+      this.GlobleChartDisplay = true
+      this.ChartDisplay = false
+      // if (name == "鍏ㄧ悆椤圭洰") {
+      //   this.GlobleChartDisplay = true
+      //   this.ChartDisplay = false
+
+      // } else {
+      //   this.ChartDisplay = true
+      //   this.GlobleChartDisplay = false
+
+      // }
+    })
   },
   methods: {
     ChangeLeft() {
@@ -107,10 +125,7 @@
       this.leftMessage = "init"
       // this.OpenLeftInitChart();
       this.$parent.ChangeWidth("leftView")
-
-      this.$bus.$on("changeProject", name => {
-        
-      })
+      this.GlobleChartDisplay = false
 
     },
     //鎵撳紑宸ョ▼鏍�

--
Gitblit v1.9.3