From 28bd61701bb409257ea0dd3c78f32bd0b45ebbd5 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 06 三月 2023 09:16:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW
---
src/components/Screen/top.vue | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/components/Screen/top.vue b/src/components/Screen/top.vue
index 0c98efb..7647ac6 100644
--- a/src/components/Screen/top.vue
+++ b/src/components/Screen/top.vue
@@ -1,21 +1,25 @@
<template>
<div class="top">
<div class="topleft">
- <div
+ <!-- <div
class="topleft1"
:class="currView == 'chart' ? 'active' : ''"
@click="OpenInitChart"
>
<img src="../../assets/img/Screen/bigST.png" />
<span>澶у睆瑙嗗浘</span>
- </div>
- <div
+ </div> -->
+ <!-- <div
class="topleft1"
@click="OpenProjectree"
:class="currView == 'tree' ? 'active' : ''"
>
<img src="../../assets/img/Screen/ptree.png" />
<span>宸ョ▼椤圭洰</span>
+ </div> -->
+ <div class="topleft__curr">
+ <img src="../../assets/img/Screen/ptree.png" />
+ <span :title="currentProject">{{ currentProject }}</span>
</div>
</div>
<div class="topCenter">
@@ -23,9 +27,14 @@
</div>
<div class="topRight">
<div
- class="topright1 toprightC"
- @click="ReturnLast"
+ class="topright1"
+ :class="currView == 'chart' ? 'active' : ''"
+ @click="OpenInitChart"
>
+ <img src="../../assets/img/Screen/bigST.png" />
+ <span>杩斿洖澶у睆</span>
+ </div>
+ <div class="topright1 toprightC" @click="ReturnLast">
<img src="../../assets/img/Screen/return.png" />
<span>杩斿洖涓婄骇</span>
</div>
@@ -39,18 +48,21 @@
tree: false,
screen: false,
currView: "chart",
+ currentProject: "澶у睆瑙嗗浘",
}
},
mounted() {
- this.$bus.$on('changeProject', name => {
- if (name == '鍏ㄥ浗椤圭洰' || name == '鍏ㄧ悆椤圭洰') {
- this.OpenProjectree()
- }
+ this.$bus.$on("changeProject", name => {
+ // if (name == '鍏ㄥ浗椤圭洰' || name == '鍏ㄧ悆椤圭洰') {
+ // this.OpenProjectree()
+ // }
+ this.currView = "tree"
+ this.currentProject = name
})
},
methods: {
ReturnLast() {
- sessionStorage.setItem("changeSelectStyle", 1);
+ sessionStorage.setItem("changeSelectStyle", 1)
this.$router.push("/Synthesis")
},
@@ -60,6 +72,7 @@
this.screen = true
this.$parent.$refs.mapleft.OpenLeftInit()
this.$parent.$refs.mapright.OpenLeftInit()
+ this.currentProject = "澶у睆瑙嗗浘"
},
//鎵撳紑宸ョ▼鏍�
@@ -68,7 +81,6 @@
this.currView = "tree"
this.$parent.$refs.mapleft.OpenLeftProjectTree()
this.$parent.$refs.mapright.OpenLeftProjectTree()
-
},
},
}
@@ -88,8 +100,24 @@
display: flex;
flex-direction: row;
align-items: flex-end;
- justify-content: space-around;
+ // justify-content: space-around;
cursor: pointer;
+ .topleft__curr {
+ // overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ height: 36px;
+ border-radius: 4px;
+ background-image: url(../../assets/img/Screen/btnbg.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ display: flex;
+ align-items: center;
+ margin-left: 5%;
+ span {
+ padding-right: 10px;
+ }
+ }
.topleft1 {
width: 127px;
height: 36px;
@@ -100,6 +128,7 @@
background-size: 100% 100%;
display: flex;
align-items: center;
+ margin-left: 10%;
}
.active {
background-image: url(../../assets/img/Screen/btnc.png);
@@ -143,13 +172,19 @@
.topright1 {
width: 131px;
height: 40px;
- background-image: url(../../assets/img/Screen/btnc.png);
+ background-image: url(../../assets/img/Screen/btnbg.png);
background-repeat: no-repeat;
background-size: 100% 100%;
display: flex;
align-items: center;
margin-right: 10%;
+ &.active {
+ background-image: url(../../assets/img/Screen/btnc.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ }
}
+
.toprightC {
width: 131px;
height: 40px;
--
Gitblit v1.9.3