From 59a0af5ae9c127d39c95c64ec08b01510207dca4 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期五, 17 二月 2023 11:11:04 +0800
Subject: [PATCH] 大屏视图和工程树切换问题修改
---
src/assets/element-variables.scss | 20 ++++++++-
src/assets/fonts/PANGMENZHENGDAOBIAOTITI-1.TTF | 0
src/components/Screen/top.vue | 46 ++++++++++++----------
src/assets/fonts/HYLingXinTiJ.otf | 0
src/assets/fonts/优设标题黑.TTF | 0
src/components/Screen/ProjectTree.vue | 17 +++++++-
src/components/Screen/right.vue | 5 ++
7 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/src/assets/element-variables.scss b/src/assets/element-variables.scss
index 65a6966..78b7c22 100644
--- a/src/assets/element-variables.scss
+++ b/src/assets/element-variables.scss
@@ -1,11 +1,25 @@
/* 鏀瑰彉涓婚鑹插彉閲� */
-$--color-primary: #1890FF;
+$--color-primary: #1890ff;
/* 鏀瑰彉 icon 瀛椾綋璺緞鍙橀噺锛屽繀闇� */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
+$--font-path: "~element-ui/lib/theme-chalk/fonts";
@import "~element-ui/packages/theme-chalk/src/index";
:export {
- theme: $--color-primary;
+ theme: $--color-primary;
+}
+
+@font-face {
+ font-family: "PangMenZhengDao";
+ src: url("~@/assets/fonts/PANGMENZHENGDAOBIAOTITI-1.TTF");
+}
+
+@font-face {
+ font-family: "YouSheBiaoTiHei";
+ src: url("~@/assets/fonts/浼樿鏍囬榛�.TTF");
+}
+@font-face {
+ font-family: "HYLingXinJ";
+ src: url("~@/assets/fonts/HYLingXinTiJ.otf");
}
diff --git a/src/assets/fonts/HYLingXinTiJ.otf b/src/assets/fonts/HYLingXinTiJ.otf
new file mode 100644
index 0000000..ed000b0
--- /dev/null
+++ b/src/assets/fonts/HYLingXinTiJ.otf
Binary files differ
diff --git a/src/assets/fonts/PANGMENZHENGDAOBIAOTITI-1.TTF b/src/assets/fonts/PANGMENZHENGDAOBIAOTITI-1.TTF
new file mode 100644
index 0000000..7680de3
--- /dev/null
+++ b/src/assets/fonts/PANGMENZHENGDAOBIAOTITI-1.TTF
Binary files differ
diff --git "a/src/assets/fonts/\344\274\230\350\256\276\346\240\207\351\242\230\351\273\221.TTF" "b/src/assets/fonts/\344\274\230\350\256\276\346\240\207\351\242\230\351\273\221.TTF"
new file mode 100644
index 0000000..3729151
--- /dev/null
+++ "b/src/assets/fonts/\344\274\230\350\256\276\346\240\207\351\242\230\351\273\221.TTF"
Binary files differ
diff --git a/src/components/Screen/ProjectTree.vue b/src/components/Screen/ProjectTree.vue
index c55483c..e2478cf 100644
--- a/src/components/Screen/ProjectTree.vue
+++ b/src/components/Screen/ProjectTree.vue
@@ -92,7 +92,7 @@
isActive: false,
isMenuLayer: true,
openEcharts: false,
- filterText: '',
+ filterText: "",
}
},
@@ -221,8 +221,19 @@
font-size: 20px;
width: 130px;
text-align: center;
- padding-top: 10px;
- font-weight: bold;
+ width: 140px;
+ padding-top: 15px;
+ color: #fff;
+ background: linear-gradient(
+ 0deg,
+ rgba(81, 192, 243, 0.65) 0%,
+ rgba(255, 255, 255, 0.65) 86%
+ );
+ -webkit-background-clip: text;
+ font-size: 17.5px;
+ font-family: HYLingXinJ, HYLingXinJ-regular;
+ font-weight: normal;
+ letter-spacing: 1.05px;
}
.el-input {
width: 80%;
diff --git a/src/components/Screen/right.vue b/src/components/Screen/right.vue
index 8735e92..ddbb73c 100644
--- a/src/components/Screen/right.vue
+++ b/src/components/Screen/right.vue
@@ -87,7 +87,10 @@
padding-left: 30px;
height: 27px;
line-height: 27px;
- font-size: 16px;
+ background: linear-gradient(0deg, #9cd2ff 0%, #ffffff 100%);
+ font-size: 15px;
+ font-family: YouSheBiaoTiHei, YouSheBiaoTiHei-Regular;
+ -webkit-background-clip: text;
color: #fff;
}
}
diff --git a/src/components/Screen/top.vue b/src/components/Screen/top.vue
index aa97331..0c4a8b1 100644
--- a/src/components/Screen/top.vue
+++ b/src/components/Screen/top.vue
@@ -2,15 +2,17 @@
<div class="top">
<div class="topleft">
<div
- class="topleft1 topleftC" @click="OpenInitChart"
- :class="{ topleft1: screen == false, topleftC: screen == true }"
+ class="topleft1"
+ :class="currView == 'chart' ? 'active' : ''"
+ @click="OpenInitChart"
>
<img src="../../assets/img/Screen/bigST.png" />
<span>澶у睆瑙嗗浘</span>
</div>
<div
- class="topleft1 topleftC" @click="OpenProjectree"
- :class="{ topleft1: tree == false, topleftC: tree == true }"
+ class="topleft1"
+ @click="OpenProjectree"
+ :class="currView == 'tree' ? 'active' : ''"
>
<img src="../../assets/img/Screen/ptree.png" />
<span>宸ョ▼椤圭洰</span>
@@ -33,6 +35,7 @@
return {
tree: false,
screen: false,
+ currView: "chart",
}
},
mounted() {},
@@ -42,17 +45,20 @@
},
//鎵撳紑澶у睆
- OpenInitChart(){
- this.$parent.$refs.mapleft.OpenLeftInit();
+ OpenInitChart() {
+ this.currView = "chart"
+ this.screen = true
+ this.$parent.$refs.mapleft.OpenLeftInit()
},
//鎵撳紑宸ョ▼鏍�
- OpenProjectree(){
- this.$parent.$refs.mapleft.OpenLeftProjectTree();
- }
+ OpenProjectree() {
+ this.screen = false
+ this.currView = "tree"
-
+ this.$parent.$refs.mapleft.OpenLeftProjectTree()
+ },
},
}
</script>
@@ -74,23 +80,21 @@
justify-content: space-around;
cursor: pointer;
.topleft1 {
- width: 131px;
- height: 40px;
- background-image: url(../../assets/img/Screen/btnc.png);
- background-repeat: no-repeat;
- background-size: 100% 100%;
- display: flex;
- align-items: center;
- }
- .topleftC {
- width: 131px;
- height: 40px;
+ width: 127px;
+ height: 36px;
+ // border: 1px solid #30acff;
+ border-radius: 4px;
background-image: url(../../assets/img/Screen/btnbg.png);
background-repeat: no-repeat;
background-size: 100% 100%;
display: flex;
align-items: center;
}
+ .active {
+ background-image: url(../../assets/img/Screen/btnc.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ }
img {
height: 26px;
width: 32px;
--
Gitblit v1.9.3