From 773e59cdc3571ad0815f286bb8895a3f27a28961 Mon Sep 17 00:00:00 2001 From: ZhangXianQiang <1135831638@qq.com> Date: 星期五, 01 三月 2024 16:01:23 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/~xiaohui/daoAnOffice --- src/views/daoAnOffice/index.vue | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/views/daoAnOffice/index.vue b/src/views/daoAnOffice/index.vue index 80fcc67..7e22a4d 100644 --- a/src/views/daoAnOffice/index.vue +++ b/src/views/daoAnOffice/index.vue @@ -1,10 +1,9 @@ -<script setup lang="ts"> +<script setup> import ItemWrap from "@/components/item-wrap"; // import MenuHeader from "@/components/menu-header.vue"; import LeftTop from "./left-top.vue"; import LeftCenter from "./left-center.vue"; import LeftBottom from "./left-bottom.vue"; -import CenterMap from "./center-map.vue"; import CenterBottom from "./center-bottom.vue"; import RightTop from "./right-top.vue"; import RightTop1 from "./right-top2.vue"; @@ -18,7 +17,14 @@ import Danger from './right/danger/index.vue'; import Publicize from './right/publicize/index.vue'; import Chartgd from "@/views/index/chartgd.vue"; -import {ref} from "vue"; + +// 灞呬腑map +import CenterMap from "./center-map.vue"; + +// 鎺у埗鍦板浘鏄剧ず +import {mapState} from '@/stores/map.js'; + +import { ref } from "vue"; const config = { header: ['<span style="color:#42C3E8;font-size: 16px">鎺掑悕</span>', '<span style="color:#42C3E8;font-size: 16px">琛屾斂鍖哄垝</span>', '<span style="color:#42C3E8;font-size: 16px">鏁板��</span>'], @@ -77,15 +83,17 @@ title: '澶栧崗婧簮琚煡鑾锋暟', length: 9, }] -const dtFig=ref(0) -const handlechan=()=>{ + + +const mapChange = () => { + mapState.value = !mapState.value; } </script> <template> <div class="index-box"> -<!-- <chartgd @changeDt="handlechan" v-if="dtFig ==0" class="gddt"></chartgd>--> + <!-- <chartgd @changeDt="handlechan" v-if="dtFig ==0" class="gddt"></chartgd>--> <div class="contetn_left"> <ItemWrap class="contetn_left-top contetn_lr-item" title="杩�3骞翠氦閫氫簨鏁呮寚鏁�"> <LeftTop /> @@ -106,8 +114,16 @@ </div> <div class="contetn_center"> - <CenterMap class="contetn_center_top" title="璁惧鍒嗗竷鍥�" /> + <!-- echart鍦板浘 --> + <CenterMap class="contetn_center_top" v-show="mapState" /> + + <div class="map-change-button" @click="mapChange"> + <div class="button-title">鍦板浘鍒囨崲</div> + <div class="button-img"> + <img src="@/assets/img/dtqh.png" alt=""> + </div> + </div> </div> <!-- 鍙宠竟鍖哄煙 --> @@ -250,12 +266,25 @@ </template> <style scoped lang="scss"> -.gddt{ +.map-change-button { + width: 94px; + position: absolute; + bottom: 120px; + right: 0; + font-size: 16px; + color: #FFFFFF; + z-index: 99; + text-align: center; + cursor: pointer; +} + +.gddt { position: absolute; z-index: 0; width: 3840px; height: 1080px; } + .index-box { width: 100%; display: flex; @@ -281,6 +310,7 @@ display: flex; flex-direction: column; justify-content: space-around; + position: relative; .contetn_center-bottom { height: 315px; @@ -292,7 +322,7 @@ } .contetn_lr-item_right { - width: 48%; + width: 48%; } .contetn_lr-item_left { @@ -384,5 +414,4 @@ .right_wrapper_content { width: 617px; -} -</style> +}</style> -- Gitblit v1.8.0