From 13f87b980adfcaa0a3f5b0854c75bdc7deec8301 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期六, 25 二月 2023 09:35:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/Screen/right.vue | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/src/components/Screen/right.vue b/src/components/Screen/right.vue
index 090c5f5..bb7186f 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="width: 100%;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,67 @@
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: [],
}
+ },
+
+ mounted() {
+ 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")
+ 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
}
- this.ChartDisplay = !this.ChartDisplay
+
+ if (this.leftMessage == "projectree") {
+ if (this.CourtyDisplay) {
+ this.RightImg = require("../../assets/img/Screen/leftArrow.png")
+ } else {
+ this.RightImg = require("../../assets/img/Screen/rightArrow.png")
+ }
+ this.CourtyDisplay = !this.CourtyDisplay
+ }
+
+ // 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")
},
},
}
@@ -81,14 +149,31 @@
}
.rightContainer {
height: 100%;
- width: calc(100% - 7px);
+ width: calc(100% - 45px);
display: flex;
flex-direction: column;
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% - 45px);
+
+ 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%;
@@ -97,7 +182,7 @@
}
}
.content {
- width: 377px;
+ width: 100%;
background: url(../../assets/img/Screen/contentBg.png);
background-size: 100% 100%;
background-repeat: no-repeat;
--
Gitblit v1.9.3