From bb39cbe30cf530a7554c5813e21ffaba9307a035 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期五, 24 二月 2023 15:39:29 +0800
Subject: [PATCH] 修改部分图表显示效果

---
 src/components/Screen/bottom.vue        |   10 +
 src/assets/img/Screen/fileTypeBar.png   |    0 
 src/components/Screen/top.vue           |    5 
 src/components/chart/FileFormat.vue     |    6 
 src/views/Thematic/index.vue            |    1 
 src/components/chart/DataStorage.vue    |   69 ++++++++-----
 src/components/Screen/left.vue          |   10 +-
 src/components/Screen/right.vue         |  133 +++++++++++++++++++++++--
 src/components/chart/CountDataApply.vue |    9 +
 9 files changed, 188 insertions(+), 55 deletions(-)

diff --git a/src/assets/img/Screen/fileTypeBar.png b/src/assets/img/Screen/fileTypeBar.png
new file mode 100644
index 0000000..2070eb3
--- /dev/null
+++ b/src/assets/img/Screen/fileTypeBar.png
Binary files differ
diff --git a/src/components/Screen/bottom.vue b/src/components/Screen/bottom.vue
index 4c7faa0..71a50c9 100644
--- a/src/components/Screen/bottom.vue
+++ b/src/components/Screen/bottom.vue
@@ -202,6 +202,9 @@
         case "宸ョ▼灞曠ず":
           this.DisplayCurrentProject(child)
           break
+        case "椤圭洰灞曠ず":
+          this.changeProject(child)
+          break
         default:
           break
       }
@@ -285,7 +288,7 @@
             wkt: item.st_astext,
           }
         })
-        console.log(menu.children.length)
+    
       }
     },
     async getCountProjectTour() {
@@ -299,9 +302,12 @@
             wkt: item.wkt,
           }
         })
-        console.log(menu.children.length)
+      
       }
     },
+    changeProject(params) {
+      this.$bus.$emit('changeProject', params.name)
+    }
   },
 }
 </script>
diff --git a/src/components/Screen/left.vue b/src/components/Screen/left.vue
index cf51f3c..97ee516 100644
--- a/src/components/Screen/left.vue
+++ b/src/components/Screen/left.vue
@@ -3,22 +3,22 @@
     <div class="leftarrow">
       <img :src="leftImg" @click="ChangeLeft" />
     </div>
-    <div class="leftContainer" v-show="ChartDisplay">
-      <div class="current1" id="leftCurrent1">
+    <div class="leftContainer" v-if="ChartDisplay">
+      <div class="current1" style="height: 27%;" id="leftCurrent1">
         <div class="aside-title">鏁版嵁鐢宠娆℃暟</div>
         <count-data-apply ></count-data-apply>
       </div>
-      <div class="current1" id="leftCurrent2">
+      <div class="current1" style="height: 27%;"  id="leftCurrent2">
         <div class="aside-title">鏈嶅姟绫诲埆</div>
 
         <service-type></service-type>
       </div>
-      <div class="current1" id="leftCurrent3">
+      <div class="current1" style="height: 36%;" id="leftCurrent3">
         <div class="aside-title">瀛樺偍淇℃伅</div>
         <data-storage></data-storage>
       </div>
     </div>
-    <div class="leftContainer" v-show="ProjectreeDisplay">
+    <div class="leftContainer" v-if="ProjectreeDisplay">
       <project-tree></project-tree>
     </div>
   </div>
diff --git a/src/components/Screen/right.vue b/src/components/Screen/right.vue
index 090c5f5..5e9e2f5 100644
--- a/src/components/Screen/right.vue
+++ b/src/components/Screen/right.vue
@@ -1,23 +1,42 @@
 <template>
   <div class="current">
-    <div class="rightContainer" v-show="ChartDisplay">
+    <div class="rightContainer" v-if="ChartDisplay">
       <div class="current1">
         <div class="aside-title">宸ョ▼绉嶇被</div>
         <project-category></project-category>
       </div>
-      <!-- <div class="current1">
-        <div class="aside-title">鏁版嵁鍙婃湇鍔℃彁浜�</div>
-        <echart12></echart12>
-      </div> -->
-      <div class="" >
+      <div class="" style="height: 60%">
         <div class="aside-title">鏂囦欢鏍煎紡</div>
-        <div class="content" style="height: 542px">
+        <div class="content" style="height: calc(100% - 30px)">
           <div class="header">
             <div>鏍煎紡</div>
             <div>鏁伴噺</div>
           </div>
           <file-format></file-format>
         </div>
+      </div>
+    </div>
+    <div
+      class="rightContainer2"
+      v-if="CourtyDisplay && currentProject =='鍏ㄧ悆椤圭洰'"
+    >
+      <div class="current1">
+        <div class="aside-title">椤圭洰鏁伴噺鏌辩姸鍥�</div>
+        <country-dimension-bar ref="barRef"></country-dimension-bar>
+      </div>
+      <div class="current1">
+        <div class="aside-title">椤圭洰鏁伴噺楗肩姸鍥�</div>
+        <country-dimension-pie ref="pieRef"></country-dimension-pie>
+      </div>
+    </div>
+    <div class="rightContainer2" v-if="CourtyDisplay && currentProject =='鍏ㄥ浗椤圭洰'">
+      <div class="current1">
+        <div class="aside-title">椤圭洰鏁伴噺鏌辩姸鍥�</div>
+        <province-dimension-bar ref="barRef"></province-dimension-bar>
+      </div>
+      <div class="current1">
+        <div class="aside-title">椤圭洰鏁伴噺楗肩姸鍥�</div>
+        <province-dimension-pie ref="pieRef"></province-dimension-pie>
       </div>
     </div>
     <div class="rightarrow">
@@ -31,6 +50,11 @@
 import echart13 from "@/components/echart13.vue"
 import FileFormat from "@/components/chart/FileFormat.vue"
 import ProjectCategory from "../chart/ProjectCategory.vue"
+import CountryDimensionBar from "../chart/CountryDimensionBar.vue"
+import CountryDimensionPie from "../chart/CountryDimensionPie.vue"
+import ProvinceDimensionBar from "../chart/CountryProvinceBar.vue"
+import ProvinceDimensionPie from "../chart/CountryProvincePie.vue"
+import { countCountryDimension, countProvinceDimension } from "@/api/screen.js"
 
 export default {
   components: {
@@ -38,23 +62,87 @@
     echart12,
     echart13,
     FileFormat,
-    ProjectCategory
+    ProjectCategory,
+    CountryDimensionBar,
+    CountryDimensionPie,
+    ProvinceDimensionBar,
+    ProvinceDimensionPie
   },
   data() {
     return {
       ChartDisplay: true,
+      CourtyDisplay: false,
       RightImg: require("../../assets/img/Screen/leftArrow.png"),
+      leftMessage: "init",
+      currentProject: "鍏ㄧ悆椤圭洰",
+      countryData: [],
+      provinceData: [],
     }
   },
+  created() {
+    // this.getCountryData()
+    // this.getProvinceData()
+  },
+  mounted() {
+    // const countryData = this.countryData
+    // const provinceData = this.provinceData
+
+    // this.$refs.barRef.initChart(countryData)
+    // this.$refs.pieRef.initChart(countryData)
+    this.$bus.$on("changeProject", name => {
+      this.currentProject = name
+    })
+  },
   methods: {
-    ChangeRight() {
-      if (this.ChartDisplay) {
-        this.RightImg = require("../../assets/img/Screen/rightArrow.png")
-      } else {
-        this.RightImg = require("../../assets/img/Screen/leftArrow.png")
+    async getCountryData() {
+      const res = await countCountryDimension()
+      if (res.code == 200) {
+        this.countryData = res.result
       }
+    },
+    async getProvinceData() {
+      const res = await countProvinceDimension()
+      if (res.code == 200) {
+        this.provinceData = res.result
+      }
+    },
+    ChangeRight() {
+      if (this.leftMessage == "init") {
+        if (this.ChartDisplay) {
+          this.RightImg = require("../../assets/img/Screen/rightArrow.png")
+        } else {
+          this.RightImg = require("../../assets/img/Screen/leftArrow.png")
+        }
+        this.ChartDisplay = !this.ChartDisplay
+      }
+
+      if (this.leftMessage == "projectree") {
+        if (this.ProjectreeDisplay) {
+          this.RightImg = require("../../assets/img/Screen/leftArrow.png")
+        } else {
+          this.RightImg = require("../../assets/img/Screen/rightArrow.png")
+        }
+        this.ProjectreeDisplay = !this.ProjectreeDisplay
+      }
+
       this.ChartDisplay = !this.ChartDisplay
       this.$parent.ChangeWidth("right")
+    },
+    //鎵撳紑澶у睆宸︿晶鐣岄潰
+    OpenLeftInit() {
+      this.ChartDisplay = true
+      this.CourtyDisplay = false
+      this.leftMessage = "init"
+      // this.OpenLeftInitChart();
+      this.$parent.ChangeWidth("leftTree")
+    },
+
+    //鎵撳紑宸ョ▼鏍�
+    OpenLeftProjectTree() {
+      this.ChartDisplay = false
+      this.CourtyDisplay = true
+      this.leftMessage = "projectree"
+      this.$parent.ChangeWidth("leftTree")
     },
   },
 }
@@ -88,7 +176,24 @@
     align-items: center;
     justify-content: space-around;
     .current1 {
-      height: 30%;
+      height: 32%;
+      width: 100%;
+      background: url(../../assets/img/Screen/chartbg.png);
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+    }
+  }
+  .rightContainer2 {
+    height: 100%;
+    width: calc(100% - 7px);
+
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .current1 {
+      margin-top: 10px;
+      margin-bottom: 30px;
+      height: 32%;
       width: 100%;
       background: url(../../assets/img/Screen/chartbg.png);
       background-size: 100% 100%;
diff --git a/src/components/Screen/top.vue b/src/components/Screen/top.vue
index f79dc91..8257b80 100644
--- a/src/components/Screen/top.vue
+++ b/src/components/Screen/top.vue
@@ -49,15 +49,16 @@
       this.currView = "chart"
       this.screen = true
       this.$parent.$refs.mapleft.OpenLeftInit()
+      this.$parent.$refs.mapright.OpenLeftInit()
     },
 
     //鎵撳紑宸ョ▼鏍�
     OpenProjectree() {
       this.screen = false
-
       this.currView = "tree"
-
       this.$parent.$refs.mapleft.OpenLeftProjectTree()
+      this.$parent.$refs.mapright.OpenLeftProjectTree()
+
     },
   },
 }
diff --git a/src/components/chart/CountDataApply.vue b/src/components/chart/CountDataApply.vue
index ac948f4..0728704 100644
--- a/src/components/chart/CountDataApply.vue
+++ b/src/components/chart/CountDataApply.vue
@@ -27,7 +27,7 @@
         xAxis.push(item.name)
         yAxis.push(item.number)
       })
- 
+
       // let data = [220, 182, 191, 234, 290, 330, 310]
       // const sideData = data.map(item => {
       //   return {
@@ -46,6 +46,13 @@
             type: "shadow", // 榛樿涓虹洿绾匡紝鍙�変负锛�'line' | 'shadow'
           },
         },
+        grid: {
+          top: "10%",
+          bottom: "15%",
+          right: "5%",
+          left: "5%",
+          containLabel: true,
+        },
         xAxis: {
           data: xAxis,
           //鍧愭爣杞�
diff --git a/src/components/chart/DataStorage.vue b/src/components/chart/DataStorage.vue
index ce7a550..5814017 100644
--- a/src/components/chart/DataStorage.vue
+++ b/src/components/chart/DataStorage.vue
@@ -45,7 +45,16 @@
           </el-table-column>
           <el-table-column align="center" prop="name" label="鍚嶇О">
             <template slot-scope="scope">
-              <div>{{ scope.row.name }}</div>
+              <div
+                style="
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
+                "
+                :title="scope.row.name"
+              >
+                {{ scope.row.name }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column prop="num" label="鏂囦欢鏁�" width="70">
@@ -181,36 +190,38 @@
 </style>
 
 <style lang="scss">
-.index-wrap {
-  margin: 0 auto;
-  width: 14px;
-  height: 14px;
-  background: rgba(180, 188, 235, 0.25);
-}
-.scrollbar {
-  width: 100%;
-  overflow-x: hidden;
-  height: 200px;
-  .el-scrollbar__wrap {
-    overflow-x: hidden;
+.data-storage {
+  .index-wrap {
+    margin: 0 auto;
+    width: 14px;
+    height: 14px;
+    background: rgba(180, 188, 235, 0.25);
   }
-  .el-table {
-    height: 100%;
+  .scrollbar {
     width: 100%;
-    background-color: transparent;
-    color: #fff;
-  }
-  .el-table th.el-table__cell.is-leaf,
-  .el-table td.el-table__cell {
-    border: none;
-  }
-  .el-table--group::after,
-  .el-table--border::after,
-  .el-table::before {
-    border: none;
-  }
-  .el-table::before {
-    height: 0;
+    overflow-x: hidden;
+    height: 200px;
+    .el-scrollbar__wrap {
+      overflow-x: hidden;
+    }
+    .el-table {
+      height: 100%;
+      width: 100%;
+      background-color: transparent;
+      color: #fff;
+    }
+    .el-table th.el-table__cell.is-leaf,
+    .el-table td.el-table__cell {
+      border: none;
+    }
+    .el-table--group::after,
+    .el-table--border::after,
+    .el-table::before {
+      border: none;
+    }
+    .el-table::before {
+      height: 0;
+    }
   }
 }
 </style>
diff --git a/src/components/chart/FileFormat.vue b/src/components/chart/FileFormat.vue
index b1ad261..2b5be35 100644
--- a/src/components/chart/FileFormat.vue
+++ b/src/components/chart/FileFormat.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+const fileTypeBar = require("@/assets/img/Screen/fileTypeBar.png")
 import * as echarts from "echarts"
 import { countFileFormat } from "@/api/screen.js"
 export default {
@@ -173,9 +174,10 @@
           {
             name: "XXX",
             type: "pictorialBar",
+
             symbol:
-              "image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAA6CAMAAADWZboaAAAAZlBMVEUAAABe3uVe3+Vf3uVf3+Zf3uVg3+Zg3+Zf3+Vi4OZh4OZg3+Z86/Bh3+Zi4Odj4Odi4OZ86/B76/B86/Bj4ed56+9x5+xn4umB7/N87PB36e+A7/N+7fF/7vJ/7vJ+7fGA7/OB7/PReX+lAAAAIXRSTlMABQkVDREmIhk3MR10LEFFPHh7cUprXE35h2XnqMLAp+mHAG9cAAAB5ElEQVRIx83WjU7CMBQFYIoiKMqU/XUboHv/l/Tce7t2XamDNSacETEmX86tlK2rx4py150o+MstMBLwWRfHKo6JCVxLnvmFGBjFQ58oF1//sUZhGy/ClSTWObgnL4O+bkeN4nY2okfNMbkRt9/vtxz8InoTsWplJSCzFxPmO8+GpSIByX3YQAuGDWtRKhKjCnxDXhF6Z4yxnZ20Wgko7BMRDmxtSGVaI4kdTIgb+zTYoJQlIMlDlmUFgrcDWWC201qSayqlTkiCddWWeV62VU0YlnpRi9VOKaSUsiyq/N0krwq2Ugt7lVpZl5BfHNiytjagMi+XYp0kCR45hMlivVQrE/uU5pXSrCB5bM6d1t2lOZItMqmliT3q5uVxqxzyW/ccfYLNKx7ZTeykMvNyac2yt2Fbc61MHLSC0rwoxbiNdlQ3GBm1NLHQsHUrtEXppR/ljNpW6DbSCoqlFiVoN6YdaFlgsSFVPs1BdT8OaB5QyQzVcaqWDows/zepxR8ObLglTrdtCRVuRNj4Rrxh+//0ke2f8KVL+Kon3GCSbmsJN9OUW3j6g0Ns+LgCij2u0h+Sghc8mlMPBMgdx5DFh59VmOVHrvmDnoNxCz3J7MFWsMuaLyR089xz/xhlfijvwutR8gv3zk6BLUUeCgAAAABJRU5ErkJggg==",
-            symbolSize: [35, 35],
+              "image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAAAxCAYAAABznEEcAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlFNDgzRTBDQjNFNzExRURCRDc5RTVGRkQxNDc0MjUxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlFNDgzRTBEQjNFNzExRURCRDc5RTVGRkQxNDc0MjUxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OUU0ODNFMEFCM0U3MTFFREJENzlFNUZGRDE0NzQyNTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6OUU0ODNFMEJCM0U3MTFFREJENzlFNUZGRDE0NzQyNTEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5DGVZNAAAOOElEQVR42qxa+Y8c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",
+            symbolSize: [25, 25],
             symbolOffset: [20, 0],
             z: 5,
             data: getSymbolData(data),
diff --git a/src/views/Thematic/index.vue b/src/views/Thematic/index.vue
index d3b7ca7..ccb777b 100644
--- a/src/views/Thematic/index.vue
+++ b/src/views/Thematic/index.vue
@@ -42,6 +42,7 @@
       }
       if (parm == "leftView" || parm == "leftTree") {
         this.leftWidth = "20%"
+        this.rightWidth = "20%"
       }
 
       if (parm == "right") {

--
Gitblit v1.9.3