From 2aa1d87680e9351bf027bab73f61290b7f00efe4 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 08 三月 2024 15:55:56 +0800
Subject: [PATCH] fix:修改柱状图提示框样式
---
src/views/daoAnOffice/index.vue | 205 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 146 insertions(+), 59 deletions(-)
diff --git a/src/views/daoAnOffice/index.vue b/src/views/daoAnOffice/index.vue
index e55199a..bbb73a7 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 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";
@@ -12,8 +11,23 @@
import RightBottom from "./right-bottom.vue";
import chart2 from "./chart2.vue";
import BorderBox13 from "@/components/datav/border-box-13";
+
+// 鍙宠竟閮ㄥ垎
+import Analysis from './right/analysis/index.vue';
+import Danger from './right/danger/index.vue';
+import Publicize from './right/publicize/index.vue';
+import Chartgd from "@/views/index/chartgd.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>'],
+ 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>'],
data: [
['1', '澶╅┈闀�', '45'],
['5', '鐏屽彛琛楅亾', '21'],
@@ -29,50 +43,57 @@
// index: true,
// columnWidth: [50],
align: ['center'],
- headerBGC:"rgba(0,0,0,0.5)",
+ headerBGC: "rgba(0,0,0,0.5)",
}
-const config1 = [{
- title:'姣涘彂鎶芥鎶ラ亾鐜�',
+const config1 = [{
+ title: '姣涘彂鎶芥鎶ラ亾鐜�',
length: 10,
-},{
- title:'姣涘彂鎶芥闃虫�х巼',
+}, {
+ title: '姣涘彂鎶芥闃虫�х巼',
length: 90,
-},{
- title:'鎴掓柇涓夊勾鏈鍚镐汉鍛樻煡澶�',
+}, {
+ title: '鎴掓柇涓夊勾鏈鍚镐汉鍛樻煡澶�',
length: 82,
-},{
- title:'鍦ㄥ唽鍚告瘨浜哄憳婊嬩簨琛屼负',
+}, {
+ title: '鍦ㄥ唽鍚告瘨浜哄憳婊嬩簨琛屼负',
length: 130,
-},{
- title:'鏄撳埗姣掑寲瀛﹀搧绠℃帶闂',
+}, {
+ title: '鏄撳埗姣掑寲瀛﹀搧绠℃帶闂',
length: 110,
-},{
- title:'杈栧尯鍐呭嚭鐜拌仛闆嗘互鐢ㄧ獫鐐规暟',
+}, {
+ title: '杈栧尯鍐呭嚭鐜拌仛闆嗘互鐢ㄧ獫鐐规暟',
length: 9,
}]
-const config2 = [{
- title:'澶栨祦娑夋瘨浜哄憳鏁�',
+const config2 = [{
+ title: '澶栨祦娑夋瘨浜哄憳鏁�',
length: 10,
-},{
- title:'鏂板彂鐜板惛姣掍汉鍛樻暟',
+}, {
+ title: '鏂板彂鐜板惛姣掍汉鍛樻暟',
length: 90,
-},{
- title:'姣掑搧涓浆闆嗘暎鏁伴噺',
+}, {
+ title: '姣掑搧涓浆闆嗘暎鏁伴噺',
length: 82,
-},{
- title:'鏈垚骞存秹姣掍汉鍛樻暟',
+}, {
+ title: '鏈垚骞存秹姣掍汉鍛樻暟',
length: 130,
-},{
- title:'鍒舵瘨绐濈偣鏁伴噺',
+}, {
+ title: '鍒舵瘨绐濈偣鏁伴噺',
length: 110,
-},{
- title:'澶栧崗婧簮琚煡鑾锋暟',
+}, {
+ title: '澶栧崗婧簮琚煡鑾锋暟',
length: 9,
}]
+
+
+
+const mapChange = () => {
+ mapState.value = !mapState.value;
+}
</script>
<template>
<div class="index-box">
+ <!-- <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 />
@@ -80,26 +101,52 @@
<div class="contetn_lr-item_contetn">
<div class="contetn_lr-item_left">
<ItemWrap class="contetn_left-top contetn_lr-item" title="浜鸿溅璺熀纭�淇℃伅">
- <left-center/>
+ <left-center />
</ItemWrap>
</div>
<div class="contetn_lr-item_right">
<ItemWrap class="contetn_left-top contetn_lr-item" title="閲嶇偣鏅尯杩愯鎯呭喌">
- <left-bottom/>
+ <left-bottom />
</ItemWrap>
</div>
</div>
</div>
- <div class="contetn_center">
- <CenterMap class="contetn_center_top" title="璁惧鍒嗗竷鍥�" />
+ <div class="contetn_center" v-if="mapState">
+ <!-- echart鍦板浘 -->
+ <CenterMap class="contetn_center_top" />
</div>
- <div style="display:flex;">
+
+ <!-- 鍙宠竟鍖哄煙 -->
+ <div class="contetn_right flex flex-col">
<div>
+ <Analysis />
+ </div>
+ <div class="flex justify-between">
+ <div class="right_wrapper_content">
+ <Danger />
+ </div>
+ <div class="right_wrapper_content">
+ <Publicize />
+ </div>
+ </div>
+ </div>
+
+ <!-- 鍒囨崲鍦板浘鎸夐挳 -->
+ <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>
<div style="height: 50%;">
- <BorderBox13 >
+
<div style="display: flex;justify-content: space-between">
<div class="item_title">
<div class="zuo"></div>
@@ -115,11 +162,11 @@
<div style="width: 100%;height: 90%;">
<RightTop1 />
</div>
- </BorderBox13>
+
</div>
<div style="height: 50%;">
- <BorderBox13 >
+
<div style="display: flex;justify-content: space-between">
<div class="item_title">
<div class="zuo"></div>
@@ -133,12 +180,12 @@
<div style="width: 100%;height: 100%;">
<RightCenter />
</div>
- </BorderBox13>
+
</div>
</div>
<div>
<div style="height: 50%">
- <BorderBox13 >
+
<div style="display: flex;justify-content: space-between">
<div class="item_title">
<div class="zuo"></div>
@@ -173,10 +220,11 @@
<span>鏃堕棿锛�2023-01-01鑷�2023-12-31</span>
</div>
</div
- ></BorderBox13>
+ >
</div>
+
<div style="height: 50%">
- <BorderBox13 >
+
<div style="display: flex;justify-content: space-between">
<div class="item_title">
<div class="zuo"></div>
@@ -211,20 +259,43 @@
<span>鏃堕棿锛�2023-01-01鑷�2023-12-31</span>
</div>
</div
- ></BorderBox13>
+ >
</div>
- </div>
- </div>
+ </div> -->
+ <!-- 缂夋瘨鍘熺増 -->
</div>
</template>
<style scoped lang="scss">
+.map-change-button {
+ width: 94px;
+ position: absolute;
+ bottom: 50px;
+ left: 2416px;
+ font-size: 16px;
+ color: #FFFFFF;
+ z-index: 99;
+ text-align: center;
+ cursor: pointer;
+ font-family: 'PingFang SC';
+}
+
+.gddt {
+ position: absolute;
+ z-index: 0;
+ width: 3840px;
+ height: 1080px;
+}
+
.index-box {
width: 100%;
display: flex;
min-height: calc(100% - 64px);
justify-content: space-between;
+ margin-top: -40px;
+ padding: 0 22px;
}
+
//宸﹁竟 鍙宠竟 缁撴瀯涓�鏍�
.contetn_left,
.contetn_right {
@@ -236,12 +307,15 @@
box-sizing: border-box;
flex-shrink: 0;
}
+
.contetn_center {
flex: 1;
margin: 0 54px;
display: flex;
flex-direction: column;
justify-content: space-around;
+ position: relative;
+
.contetn_center-bottom {
height: 315px;
}
@@ -250,16 +324,21 @@
.contetn_lr-item {
height: 310px;
}
-.contetn_lr-item_right{
- flex: auto;
+
+.contetn_lr-item_right {
+ width: 48%;
}
-.contetn_lr-item_left{
- flex: 1;
+
+.contetn_lr-item_left {
+ width: 50%;
+ margin-right: 26px;
}
-.contetn_lr-item_contetn{
+
+.contetn_lr-item_contetn {
display: flex;
}
-.contetn_left-center_item_center{
+
+.contetn_left-center_item_center {
padding: 1rem 0.5rem;
margin-top: 5px;
@@ -268,9 +347,11 @@
height: 75px;
background-color: #172451;
}
-.header{
+
+.header {
background-color: #121E44;
}
+
$item-title-height: 38px;
$item_title_content-height: calc(100% - 38px);
@@ -296,21 +377,20 @@
.you {
transform: rotate(180deg);
}
+
.title-inner {
font-weight: 900;
letter-spacing: 2px;
- background: linear-gradient(
- 92deg,
- #0072ff 0%,
- #00eaff 48.8525390625%,
- #01aaff 100%
- );
+ background: linear-gradient(92deg,
+ #0072ff 0%,
+ #00eaff 48.8525390625%,
+ #01aaff 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
-:deep(.dv-border-box-content) {
+:deep(.dv-border-box-content) {
box-sizing: border-box;
padding: 6px 16px 0px;
}
@@ -318,13 +398,16 @@
.item_title_content {
//height: $item_title_content-height;
margin: 20px 0;
+ border: 1px solid #29466A;
+ //background: #11223A;
}
.item_title_content_def {
width: 100%;
height: 100%;
}
-.right-right-zg{
+
+.right-right-zg {
background-color: #172451;
width: 120px;
display: flex;
@@ -333,4 +416,8 @@
justify-content: center;
padding: 20px 0;
}
+
+.right_wrapper_content {
+ width: 617px;
+}
</style>
--
Gitblit v1.8.0