From 27c5590aab433687c58dbf41e9271f71008834f0 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期一, 27 二月 2023 11:48:05 +0800
Subject: [PATCH] 修改大屏首页
---
src/components/Screen/right.vue | 117 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 63 insertions(+), 54 deletions(-)
diff --git a/src/components/Screen/right.vue b/src/components/Screen/right.vue
index bb7186f..47b45a5 100644
--- a/src/components/Screen/right.vue
+++ b/src/components/Screen/right.vue
@@ -2,21 +2,27 @@
<div class="current">
<div class="rightContainer" v-if="ChartDisplay">
<div class="current1">
- <div class="aside-title">宸ョ▼绉嶇被</div>
+ <div class="aside-title">椤圭洰缁熻</div>
<project-category></project-category>
</div>
- <div class="" style="width: 100%;height: 60%">
- <div class="aside-title">鏂囦欢鏍煎紡</div>
- <div class="content" style="height: calc(100% - 30px)">
+ <div class="current1">
+ <div class="aside-title">鏁版嵁缁熻</div>
+ <!-- <div class="content" style="height:30px">
<div class="header">
<div>鏍煎紡</div>
<div>鏁伴噺</div>
</div>
- <file-format></file-format>
- </div>
+ </div> -->
+ <file-format></file-format>
+ </div>
+ <div class="current1">
+ <div class="aside-title">鏈嶅姟璁块棶娆℃暟</div>
+
+ <Service-Get></Service-Get>
</div>
</div>
- <div
+
+ <!-- <div
class="rightContainer2"
v-if="CourtyDisplay && currentProject =='鍏ㄧ悆椤圭洰'"
>
@@ -29,6 +35,8 @@
<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>
@@ -38,7 +46,7 @@
<div class="aside-title">椤圭洰鏁伴噺楗肩姸鍥�</div>
<province-dimension-pie ref="pieRef"></province-dimension-pie>
</div>
- </div>
+ </div> -->
<div class="rightarrow">
<img :src="RightImg" @click="ChangeRight" />
</div>
@@ -54,6 +62,7 @@
import CountryDimensionPie from "../chart/CountryDimensionPie.vue"
import ProvinceDimensionBar from "../chart/CountryProvinceBar.vue"
import ProvinceDimensionPie from "../chart/CountryProvincePie.vue"
+import ServiceGet from "../chart/ServiceGet.vue"
import { countCountryDimension, countProvinceDimension } from "@/api/screen.js"
export default {
@@ -66,7 +75,8 @@
CountryDimensionBar,
CountryDimensionPie,
ProvinceDimensionBar,
- ProvinceDimensionPie
+ ProvinceDimensionPie,
+ ServiceGet,
},
data() {
return {
@@ -96,14 +106,14 @@
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
- }
+ // 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")
@@ -118,16 +128,16 @@
},
//鎵撳紑宸ョ▼鏍�
- OpenLeftProjectTree() {
- this.ChartDisplay = false
- this.CourtyDisplay = true
- this.leftMessage = "projectree"
- this.$parent.ChangeWidth("leftTree")
- },
+ // OpenLeftProjectTree() {
+ // this.ChartDisplay = false
+ // this.CourtyDisplay = true
+ // this.leftMessage = "projectree"
+ // this.$parent.ChangeWidth("leftTree")
+ // },
},
}
</script>
-<style lang="less">
+<style lang="less" sc>
.current {
height: 100%;
width: 100%;
@@ -150,7 +160,6 @@
.rightContainer {
height: 100%;
width: calc(100% - 45px);
-
display: flex;
flex-direction: column;
align-items: center;
@@ -163,37 +172,37 @@
background-repeat: no-repeat;
}
}
- .rightContainer2 {
- height: 100%;
- width: calc(100% - 45px);
+ // .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%;
- background-repeat: no-repeat;
+ // display: flex;
+ // flex-direction: column;
+ // align-items: center;
+ // .current1 {
+ // margin-top: 10px;
+ // margin-bottom: 30px;
+ // height: 30%;
+ // width: 100%;
+ // background: url(../../assets/img/Screen/chartbg.png);
+ // background-size: 100% 100%;
+ // background-repeat: no-repeat;
+ // }
+ // }
+ .content {
+ width: 100%;
+ background: url(../../assets/img/Screen/contentBg.png);
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ .header {
+ margin: 0px auto;
+ padding: 10px 0;
+ width: 80%;
+ display: flex;
+ justify-content: space-between;
+ color: #fff;
+ font-size: 13px;
}
- }
-}
-.content {
- width: 100%;
- background: url(../../assets/img/Screen/contentBg.png);
- background-size: 100% 100%;
- background-repeat: no-repeat;
- .header {
- margin: 0px auto;
- padding: 10px 0;
- width: 80%;
- display: flex;
- justify-content: space-between;
- color: #fff;
- font-size: 13px;
}
}
</style>
--
Gitblit v1.9.3