From 6995a96cc2380db13bb2295de107294258ae4c63 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期一, 04 九月 2023 17:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web
---
src/views/menus.vue | 134 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 117 insertions(+), 17 deletions(-)
diff --git a/src/views/menus.vue b/src/views/menus.vue
index 32a610a..99684b7 100644
--- a/src/views/menus.vue
+++ b/src/views/menus.vue
@@ -1,10 +1,21 @@
<template>
- <div class="menus" v-show="fullScreen">
+ <div
+ class="menus"
+ v-show="fullScreen"
+ >
<div class="logo_box">
- <img src="../assets/img/logo.png" alt="" class="logo" />
+ <img
+ src="../assets/img/logo.png"
+ alt=""
+ class="logo"
+ />
<div class="logo_name">
<h3>鏈堢悆澶ф暟鎹湴鐞嗙┖闂村垎鏋愬睍绀哄钩鍙�</h3>
- <img src="../assets/img/logob.png" alt="" class="logo_name_b" />
+ <img
+ src="../assets/img/logob.png"
+ alt=""
+ class="logo_name_b"
+ />
</div>
</div>
<div class="menus_box">
@@ -29,27 +40,41 @@
</div>
</div>
</div>
- <div class="content_box" v-show="fullScreen">
+ <div
+ class="content_box"
+ v-show="fullScreen"
+ >
<div
v-show="checkMenuFlag == 'l1'"
style="position: relative; display: flex"
>
- <layer-manage @setCloseLayer="setCloseLayer"> </layer-manage>
+
</div>
- <div v-show="checkMenuFlag == 'l2'">
- <plotting> </plotting>
+ <div
+ style="position: relative; display: flex"
+ v-show="store.state.setLayerManager"
+ >
+ <layer-manage @setCloseLayer="setCloseLayer"></layer-manage>
+ </div>
+
+ <div
+ style="position: relative; display: flex"
+ v-show="checkMenuFlag == 'l2'"
+ >
+ <plotting @setCloseplotting="setCloseplotting"> </plotting>
</div>
<div v-show="checkMenuFlag == 'l5'">
- <baseMapSwitching> </baseMapSwitching>
+ <baseMapSwitching @setCloseBaseMap="setCloseBaseMap"> </baseMapSwitching>
</div>
<search v-if="thematicMapBtnState"> </search>
</div>
- <top-btn v-show="fullScreen" v-if="thematicMapBtnState"></top-btn>
-
- <thematic-map v-show="!thematicMapBtnState"></thematic-map>
- <div class="fullScreen_btn" v-show="!fullScreen" @click="screen"></div>
+ <div
+ class="fullScreen_btn"
+ v-show="!fullScreen"
+ @click="screen"
+ ></div>
<div
v-show="store.state.doubleMenu"
class="setDobuleMap"
@@ -63,6 +88,31 @@
>
<double-layer></double-layer>
</div>
+ <div style="display: flex; position: absolute; z-index: 30; top: 23px; right: 23px;">
+ <thematic-map v-show="!thematicMapBtnState"></thematic-map>
+ <top-btn
+ v-show="fullScreen"
+ v-if="thematicMapBtnState"
+ ></top-btn>
+ <div>
+ <div
+ class="setUserLogo"
+ @click="setLogMeu =!setLogMeu"
+ >
+ <div class="setUserImage"></div>
+ <div class="setUserTitle"> {{store.state.uname}} </div>
+ </div>
+ <div
+ v-show="setLogMeu"
+ class="setLogContent"
+ @click="setUserLogOut"
+ >
+ 閫�鍑�
+ </div>
+ </div>
+
+ </div>
+
</template>
<script lang="ts" setup>
@@ -92,15 +142,23 @@
import baseMapSwitching from "@/views/baseMapSwitching/baseMapSwitching.vue";
//鍒嗗睆鑿滃崟
import doubleLayer from "@/views/layer/doubleLayer.vue";
+import { removeToken } from "@/utils/auth";
import store from "@/store";
+//Router
+import router from "@/router";
const menuOptions = ref([]);
const checkMenuFlag = ref("");
let fullScreen = ref(true);
let thematicMapState = ref(true);
let thematicMapBtnState = ref(true);
+const setLogMeu = ref(false);
const setDoubleScreenMap = () => {
store.state.doubleMenu = false;
store.state.doubleMap = true;
+};
+const setUserLogOut = () => {
+ removeToken();
+ router.push("/Login");
};
const setDobuleCloseLayer = () => {
store.state.doubleMenu = true;
@@ -109,10 +167,8 @@
const setShowMapChange = (res) => {
switch (res.id) {
case "15":
- debugger;
break;
default:
- debugger;
break;
}
// store.state.isShowMap = res;
@@ -122,11 +178,10 @@
// fullScreen.value = !fullScreen.value;
screen();
}
-
if (res.id == "l3") {
thematicMapState.value = false;
thematicMapBtnState.value = false;
- } else {
+ } else if (res.id != "11") {
thematicMapState.value = true;
thematicMapBtnState.value = true;
}
@@ -136,10 +191,23 @@
checkMenuFlag.value = res.id;
menuTool.leftTools(res);
}
+ if (res.id == "l1") {
+ store.state.setLayerManager = !store.state.setLayerManager;
+ } else {
+ store.state.setLayerManager = false;
+ }
};
const setCloseLayer = (res) => {
+ store.state.setLayerManager = false;
+};
+const setCloseplotting = (res) => {
checkMenuFlag.value = null;
};
+
+const setCloseBaseMap = (res) => {
+ checkMenuFlag.value = null;
+};
+
// 鍒囨崲娴忚鍣ㄥ叏灞�
const screen = () => {
fullScreen.value = !fullScreen.value;
@@ -171,7 +239,6 @@
if (!isFullScreen()) {
if (!fullScreen.value) {
fullScreen.value = !fullScreen.value;
- console.log(fullScreen.value);
}
}
});
@@ -279,4 +346,37 @@
background-size: 100% 100%;
cursor: pointer;
}
+.setUserLogo {
+ height: 46px;
+
+ display: flex;
+ .setUserImage {
+ width: 46px;
+ height: 46px;
+ background: url("../assets/img/鍥惧眰 18.png") no-repeat center;
+ background-size: 100% 100%;
+ cursor: pointer;
+ }
+ .setUserTitle {
+ height: 100%;
+ align-items: center;
+ display: flex;
+ font-size: 15px;
+ font-family: Microsoft YaHei;
+ font-weight: 400;
+ color: #d6e4ff;
+ margin-left: 10px;
+ }
+}
+.setLogContent {
+ width: calc(100% - 10px);
+ padding: 5px;
+ background: rgba(7, 8, 14, 0.8);
+ box-shadow: inset 0px 10px 40px 10px rgba(38, 47, 71, 1);
+ margin-top: 10px;
+ font-size: 14px;
+ font-family: Microsoft YaHei;
+ font-weight: 400;
+ color: #d6e4ff;
+}
</style>
--
Gitblit v1.9.3