From 31c13db7a337913a6abcb5a05cf8318d850e1357 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 29 二月 2024 11:54:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/~xiaohui/daoAnOffice
---
src/views/HomeView.vue | 13 ++++
src/assets/img/sgyfd.png | 0
src/views/daoAnOffice/left-top.vue | 8 +-
src/assets/img/dtqh.png | 0
src/assets/img/gjxl.png | 0
src/views/daoAnOffice/center-map.vue | 6 +-
src/assets/img/jtysqy.png | 0
src/assets/img/jlpb.png | 0
src/views/index/chartgd.vue | 16 ++++-
src/assets/img/aqyh.png | 0
src/views/daoAnOffice/chartgd.vue | 114 +++++++++++++++++++++++++++++++------
src/assets/img/djyjq.png | 0
src/assets/img/sslk.png | 0
src/assets/img/dwsg.png | 0
src/assets/img/zdlytd.png | 0
src/views/daoAnOffice/index.vue | 13 ++++
16 files changed, 139 insertions(+), 31 deletions(-)
diff --git a/src/assets/img/aqyh.png b/src/assets/img/aqyh.png
new file mode 100644
index 0000000..361282c
--- /dev/null
+++ b/src/assets/img/aqyh.png
Binary files differ
diff --git a/src/assets/img/djyjq.png b/src/assets/img/djyjq.png
new file mode 100644
index 0000000..6f31836
--- /dev/null
+++ b/src/assets/img/djyjq.png
Binary files differ
diff --git a/src/assets/img/dtqh.png b/src/assets/img/dtqh.png
new file mode 100644
index 0000000..d1ab330
--- /dev/null
+++ b/src/assets/img/dtqh.png
Binary files differ
diff --git a/src/assets/img/dwsg.png b/src/assets/img/dwsg.png
new file mode 100644
index 0000000..e819c7d
--- /dev/null
+++ b/src/assets/img/dwsg.png
Binary files differ
diff --git a/src/assets/img/gjxl.png b/src/assets/img/gjxl.png
new file mode 100644
index 0000000..4241fd5
--- /dev/null
+++ b/src/assets/img/gjxl.png
Binary files differ
diff --git a/src/assets/img/jlpb.png b/src/assets/img/jlpb.png
new file mode 100644
index 0000000..7b0a9cd
--- /dev/null
+++ b/src/assets/img/jlpb.png
Binary files differ
diff --git a/src/assets/img/jtysqy.png b/src/assets/img/jtysqy.png
new file mode 100644
index 0000000..47a4cd7
--- /dev/null
+++ b/src/assets/img/jtysqy.png
Binary files differ
diff --git a/src/assets/img/sgyfd.png b/src/assets/img/sgyfd.png
new file mode 100644
index 0000000..c2a50e6
--- /dev/null
+++ b/src/assets/img/sgyfd.png
Binary files differ
diff --git a/src/assets/img/sslk.png b/src/assets/img/sslk.png
new file mode 100644
index 0000000..7720464
--- /dev/null
+++ b/src/assets/img/sslk.png
Binary files differ
diff --git a/src/assets/img/zdlytd.png b/src/assets/img/zdlytd.png
new file mode 100644
index 0000000..85cf94d
--- /dev/null
+++ b/src/assets/img/zdlytd.png
Binary files differ
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index a75089f..6a2049e 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -7,10 +7,15 @@
import { useSettingStore } from "@/stores/index";
import { storeToRefs } from "pinia";
import MessageContent from "@/components/Plugins/MessageContent";
+import Chartgd from "@/views/daoAnOffice/chartgd.vue";
const settingStore = useSettingStore();
const { isScale } = storeToRefs(settingStore);
const wrapperStyle = {};
+const dtFig=ref(0)
+const handlechan=()=>{
+
+}
</script>
<template>
@@ -27,17 +32,23 @@
:autoScale="isScale"
>
<div class="content_wrap">
+ <chartgd @changeDt="handlechan" v-if="dtFig ==0" class="gddt"></chartgd>
<Headers />
<RouterView />
<MessageContent />
<div class="d-bottom">
-
</div>
</div>
</scale-screen>
<Setting />
</template>
<style lang="scss" scoped>
+.gddt{
+ position: absolute;
+ z-index: 0;
+ width: 3840px;
+ height: 1080px;
+}
.content_wrap {
width: 100%;
height: 100%;
diff --git a/src/views/daoAnOffice/center-map.vue b/src/views/daoAnOffice/center-map.vue
index ec2e799..5606e8d 100644
--- a/src/views/daoAnOffice/center-map.vue
+++ b/src/views/daoAnOffice/center-map.vue
@@ -95,9 +95,9 @@
<span class="titletext">{{ title }}</span>
<div class="you"></div>
</div>
- <div class="mapwrap">
- <chartgd @changeDt="handlechan" v-if="dtFig ==0"></chartgd>
- <chart2 v-else></chart2>
+ <div class="mapwrap" style="display:none;">
+<!-- <chartgd @changeDt="handlechan" v-if="dtFig ==0"></chartgd>-->
+ <chart2 ></chart2>
</div>
</div>
</template>
diff --git a/src/views/daoAnOffice/chartgd.vue b/src/views/daoAnOffice/chartgd.vue
index 4806ef8..4dc2e16 100644
--- a/src/views/daoAnOffice/chartgd.vue
+++ b/src/views/daoAnOffice/chartgd.vue
@@ -1,41 +1,81 @@
<template>
<div class="home">
<div id="map-box"></div>
-<!-- <div class="btn">-->
-<!-- <el-button type="primary" @click="btnsubmit">纭畾</el-button>-->
-<!-- </div>-->
- <div style="position: absolute;bottom: 0;left: 0">
- <el-button @click="btnlk" type="primary">瀹炴椂璺喌</el-button>
- <el-button @click="toggleTrafic">鍦板浘鍒囨崲</el-button>
+ <div style="position: absolute;bottom: 20%;right: 35%;z-index: 999">
+ <div @click="btnlk" class="item-tb">
+ <img src="@/assets/img/sslk.png" alt="" class="item-tb-img">
+ <p class="item-tb-p">瀹炴椂璺喌</p>
+ </div>
+ <div @click="toggleTrafic" class="item-tb">
+ <p class="item-tb-p">鍦板浘鍒囨崲</p>
+ <img src="@/assets/img/dtqh.png" alt="" class="item-tb-img">
+ </div>
+
</div>
<div class="info-box">
<!-- right鑿滃崟-->
<div class="info-div" @click="accidentProneRoadSections">
- 浜嬫晠鏄撳彂澶氬彂璺
+ <img src="@/assets/img/sgyfd.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>浜嬫晠鏄撳彂澶氬彂璺</p>
+ <p>78</p>
+ </div>
</div>
<div class="info-div" @click="keyTouristChannels">
- 閲嶇偣鏃呮父閫氶亾
+ <img src="@/assets/img/zdlytd.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>閲嶇偣鏃呮父閫氶亾</p>
+ <p>178</p>
+ </div>
</div>
<div class="info-div">
- 閮芥睙鍫版櫙鍖�
+ <img src="@/assets/img/djyjq.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>閮芥睙鍫版櫙鍖�</p>
+ <p>278</p>
+ </div>
</div>
<div class="info-div" @click="policeForceDeployment">
- 璀﹀姏閰嶅
+ <img src="@/assets/img/jlpb.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>璀﹀姏閰嶅</p>
+ <p>348</p>
+ </div>
</div>
<div class="info-div" @click="fencingConstruction">
- 鎵撳洿鏂藉伐
+ <img src="@/assets/img/dwsg.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>鎵撳洿鏂藉伐</p>
+ <p>578</p>
+ </div>
</div>
<div class="info-div">
- 浜ら�氫簨鏁呮槗鍙戠偣
+ <img src="@/assets/img/jtysqy.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>浜ら�氫簨鏁呮槗鍙戠偣</p>
+ <p>788</p>
+ </div>
</div>
<div class="info-div" @click="keyTransportationEnterprises">
- 閲嶇偣杩愯緭浼佷笟
+ <img src="@/assets/img/zdlytd.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>閲嶇偣杩愯緭浼佷笟</p>
+ <p>758</p>
+ </div>
</div>
<div class="info-div">
- 鍏氦绾胯矾
+ <img src="@/assets/img/gjxl.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>鍏氦绾胯矾</p>
+ <p>785</p>
+ </div>
</div>
<div class="info-div">
- 瀹夊叏闅愭偅
+ <img src="@/assets/img/aqyh.png" alt="" class="item-tb-img">
+ <div class="info-div-p">
+ <p>瀹夊叏闅愭偅</p>
+ <p>718</p>
+ </div>
</div>
<!-- 鎼滅储-->
@@ -61,6 +101,7 @@
<script lang="ts" setup>
import {shallowRef, defineEmits, defineComponent, ref, onBeforeUnmount, onMounted} from 'vue';
import AMapLoader from "@amap/amap-jsapi-loader";
+import {Pointer} from "@element-plus/icons-vue";
const map = shallowRef(null);
const keyword = ref('');
@@ -642,24 +683,59 @@
margin: 0px;
position: relative;
.info-div{
+ align-items: center;
+ display: flex;
+ cursor: pointer;
margin-top: 0.5rem;
- background-color: #4E2749;
+ //background-color: #4E2749;
height: 2.5rem;
line-height: 2.5rem;
padding-left: 0.5rem;
+ font-family: PingFang SC;
+ font-weight: 800;
+ color: #74A6F2;
+ .item-tb-img{
+ width: 20px;
+ height: 20px;
+ }
+ .info-div-p{
+ flex: 1;
+ margin-left: 5px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
}
.info-box {
position: absolute;
- top: 8px;
- right: 8px;
+ top: 80px;
+ right: 34%;
width: 300px;
//height: 100%;
//background-color: #1f1f1f;
- background-color: #131F3F;
+ opacity: 0.6;
+ background: #11223A;
+ border: 1px solid #29466A;
+ //background-color: #131F3F;
padding: 1rem;
display: flex;
flex-direction: column;
}
+ .item-tb{
+ cursor: pointer;
+ margin-top: 20px;
+ .item-tb-img{
+ width: 65px;
+ }
+ .item-tb-p{
+ line-height:35px;
+ //background: #00adb5;
+ color:#fff;
+ text-align: center;
+ text-shadow:
+ 0 0 0.1em #4e6ef2, 0 0 0.3em #36f, 3px 3px #4e6ef2, 4px 4px #315efb
+ }
+ }
}
.ul{
margin-top: 10px;
diff --git a/src/views/daoAnOffice/index.vue b/src/views/daoAnOffice/index.vue
index 99f8e63..80fcc67 100644
--- a/src/views/daoAnOffice/index.vue
+++ b/src/views/daoAnOffice/index.vue
@@ -17,6 +17,8 @@
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";
+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>'],
@@ -75,10 +77,15 @@
title: '澶栧崗婧簮琚煡鑾锋暟',
length: 9,
}]
+const dtFig=ref(0)
+const handlechan=()=>{
+
+}
</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 />
@@ -243,6 +250,12 @@
</template>
<style scoped lang="scss">
+.gddt{
+ position: absolute;
+ z-index: 0;
+ width: 3840px;
+ height: 1080px;
+}
.index-box {
width: 100%;
display: flex;
diff --git a/src/views/daoAnOffice/left-top.vue b/src/views/daoAnOffice/left-top.vue
index fed5c4e..36ce323 100644
--- a/src/views/daoAnOffice/left-top.vue
+++ b/src/views/daoAnOffice/left-top.vue
@@ -150,7 +150,7 @@
.user_Overview_nums_img_p_numt{
color: #0071F8;
font-size: 25px;
- font-weight: 400;
+ font-weight: 800;
.user_Overview_nums_img_p_num_nan{
font-size: 14px;
color: #fff;
@@ -163,7 +163,7 @@
.user_Overview_nums_img_p_num{
color: #F96FF8;
font-size: 25px;
- font-weight: 400;
+ font-weight: 800;
.user_Overview_nums_img_p_num_nan{
font-size: 14px;
color: #fff;
@@ -176,7 +176,7 @@
.user_Overview_nums_img_p_nums{
color: #FE3146;
font-size: 25px;
- font-weight: 400;
+ font-weight: 800;
.user_Overview_nums_img_p_num_nan{
font-size: 14px;
color: #fff;
@@ -189,7 +189,7 @@
.user_Overview_nums_img_p_numf{
color: #EA7039;
font-size: 25px;
- font-weight: 400;
+ font-weight: 800;
.user_Overview_nums_img_p_num_nan{
font-size: 14px;
color: #fff;
diff --git a/src/views/index/chartgd.vue b/src/views/index/chartgd.vue
index 4806ef8..fd670e0 100644
--- a/src/views/index/chartgd.vue
+++ b/src/views/index/chartgd.vue
@@ -642,20 +642,28 @@
margin: 0px;
position: relative;
.info-div{
+ cursor: pointer;
margin-top: 0.5rem;
- background-color: #4E2749;
+ //background-color: #4E2749;
height: 2.5rem;
line-height: 2.5rem;
padding-left: 0.5rem;
+ font-family: PingFang SC;
+ font-weight: 800;
+ color: #74A6F2;
}
.info-box {
+
position: absolute;
- top: 8px;
- right: 8px;
+ top: 80px;
+ right: 34%;
width: 300px;
//height: 100%;
//background-color: #1f1f1f;
- background-color: #131F3F;
+ opacity: 0.6;
+ background: #11223A;
+ border: 1px solid #29466A;
+ //background-color: #131F3F;
padding: 1rem;
display: flex;
flex-direction: column;
--
Gitblit v1.8.0