From 1289c40801a6f0da5ba786fb4a9e8203e3e2620a Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 08 五月 2025 15:04:29 +0800
Subject: [PATCH] 新xiugai
---
src/assets/warningScreen/scroll-bg2.png | 0
src/views/bigScreen/components/screen.vue | 11 ++++-
src/views/bigScreen/components/map.vue | 60 +++++++++++++-----------------
3 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/src/assets/warningScreen/scroll-bg2.png b/src/assets/warningScreen/scroll-bg2.png
index bae713a..8152489 100644
--- a/src/assets/warningScreen/scroll-bg2.png
+++ b/src/assets/warningScreen/scroll-bg2.png
Binary files differ
diff --git a/src/views/bigScreen/components/map.vue b/src/views/bigScreen/components/map.vue
index 51ad8cd..5f7cc2d 100644
--- a/src/views/bigScreen/components/map.vue
+++ b/src/views/bigScreen/components/map.vue
@@ -1,51 +1,51 @@
<template>
- <baidu-map class="bigMap" ref="map" ak="Z4tYehNEVsdeMw3Mjspdn77pV50ffc8t" @zoomend="zoomMap" v="3.0" type="API" :scroll-wheel-zoom="true" :center="{lng: 87.681678, lat: 43.943557}" :zoom="18" map-type="BMAP_SATELLITE_MAP" @ready="initMap">
+ <baidu-map class="bigMap" ref="map" ak="Z4tYehNEVsdeMw3Mjspdn77pV50ffc8t" v="3.0" @zoomend="zoomMap" type="API" :scroll-wheel-zoom="true" :center="{lng: 87.681678, lat: 43.943557}" :zoom="18" map-type="BMAP_SATELLITE_MAP" @ready="initMap">
<bm-overlay pane="mapPane" class="polys" @draw="initMap">
<bm-polygon :path="polygonPath1" stroke-color="yellow" fillColor="yellow" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="1" :position="{lng: 87.679807, lat: 43.94402 }" title="1" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="1#电石库" :position="{lng: 87.679667, lat: 43.94382}" title="1#电石库" />
+ <bm-label content="1" :position="{lng: 87.679807, lat: 43.94402 }" :labelStyle="tittleStyle" title="1" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="1#电石库" :position="{lng: 87.679667, lat: 43.94382}" :labelStyle="textStyle" title="1#电石库" />
<bm-polygon :path="polygonPath2" stroke-color="#061959" fillColor="#061959" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="2" :position="{lng: 87.679663, lat: 43.942926}" title="2" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="渣浆清液池" :position="{lng: 87.679363, lat:43.942676}" title="渣浆清液池" />
+ <bm-label content="2" :position="{lng: 87.679663, lat: 43.942926}" :labelStyle="tittleStyle" title="2" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="渣浆清液池" :position="{lng: 87.679363, lat:43.942676}" :labelStyle="textStyle" title="渣浆清液池" />
<bm-polygon :path="polygonPath3" stroke-color="#048599" fillColor="#048599" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="3" :position="{lng: 87.681455, lat: 43.943401}" title="3" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="中间罐区" :position="{lng: 87.681205, lat:43.943131}" title="中间罐区" />
+ <bm-label content="3" :position="{lng: 87.681455, lat: 43.943401}" :labelStyle="tittleStyle" title="3" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="中间罐区" :position="{lng: 87.681205, lat:43.943131}" :labelStyle="textStyle" title="中间罐区" />
<bm-polygon :path="polygonPath4" stroke-color="green" fillColor="green" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="4" :position="{lng: 87.683095, lat: 43.943702 }" title="1" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="3#冷冻" :position="{lng: 87.683005, lat: 43.943502 }" title="3#冷冻" />
+ <bm-label content="4" :position="{lng: 87.683095, lat: 43.943702 }" :labelStyle="tittleStyle" title="1" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="3#冷冻" :position="{lng: 87.683005, lat: 43.943502 }" :labelStyle="textStyle" title="3#冷冻" />
<bm-polygon :path="polygonPath5" stroke-color="#3eec34" fillColor="#3eec34" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="5" :position="{lng: 87.683509, lat: 43.943055}" title="5" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="新增浓缩池" :position="{lng: 87.683209, lat:43.942875}" title="新增浓缩池" />
+ <bm-label content="5" :position="{lng: 87.683509, lat: 43.943055}" :labelStyle="tittleStyle" title="5" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="新增浓缩池" :position="{lng: 87.683209, lat:43.942875}" :labelStyle="textStyle" title="新增浓缩池" />
<bm-polygon :path="polygonPath6" stroke-color="#ff52e7" fillColor="#ff52e7" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="6" :position="{lng: 87.68274, lat: 43.944283 }" title="1" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="3#精馏" :position="{lng: 87.68264, lat: 43.944083 }" title="3#精馏" />
+ <bm-label content="6" :position="{lng: 87.68274, lat: 43.944283 }" :labelStyle="tittleStyle" title="1" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="3#精馏" :position="{lng: 87.68264, lat: 43.944083 }" :labelStyle="textStyle" title="3#精馏" />
<bm-polygon :path="polygonPath7" stroke-color="#0055eb" fillColor="#0055eb" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="7" :position="{lng: 87.682286, lat: 43.944765}" title="4" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="3#压缩" :position="{lng: 87.682206, lat: 43.944565}" title="3#压缩" />
+ <bm-label content="7" :position="{lng: 87.682286, lat: 43.944765}" :labelStyle="tittleStyle" title="4" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="3#压缩" :position="{lng: 87.682206, lat: 43.944565}" :labelStyle="textStyle" title="3#压缩" />
<bm-polygon :path="polygonPath8" stroke-color="#11feee" fillColor="#11feee" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="8" :position="{lng: 87.681338, lat: 43.944341 }" title="1" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="2#精馏" :position="{lng: 87.681238, lat: 43.944141}" title="2#精馏" />
+ <bm-label content="8" :position="{lng: 87.681338, lat: 43.944341 }" :labelStyle="tittleStyle" title="1" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="2#精馏" :position="{lng: 87.681238, lat: 43.944141}" :labelStyle="textStyle" title="2#精馏" />
<bm-polygon :path="polygonPath9" stroke-color="#b330d2" fillColor="#b330d2" :fillOpacity="0.7" :stroke-weight="2" :zIndex="2"/>
- <bm-label content="9" :position="{lng: 87.680727, lat: 43.944157}" title="1" :zIndex="3"/>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="1#精馏" :position="{lng: 87.68061, lat:43.943955}" title="1#精馏" />
+ <bm-label content="9" :position="{lng: 87.680727, lat: 43.944157}" :labelStyle="tittleStyle" title="1" :zIndex="3"/>
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="1#精馏" :position="{lng: 87.68061, lat:43.943955}" :labelStyle="textStyle" title="1#精馏" />
<bm-polyline :path="polylinePath1" stroke-color="red" :stroke-opacity="1" :stroke-weight="3"></bm-polyline>
<bm-polyline :path="polylinePath11" stroke-color="red" :stroke-opacity="1" :stroke-weight="3"></bm-polyline>
<bm-polyline :path="polylinePath12" stroke-color="red" :stroke-opacity="1" :stroke-weight="3"></bm-polyline>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="155m 方位1" :position="{lng: 87.6798, lat:43.943708}" title="155m 方位1" />
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="155m 方位1" :position="{lng: 87.6798, lat:43.943708}" :labelStyle="numberStyle" title="155m 方位1" />
<bm-polyline :path="polylinePath2" stroke-color="red" :stroke-opacity="1" :stroke-weight="3"></bm-polyline>
<bm-polyline :path="polylinePath21" stroke-color="red" :stroke-opacity="1" :stroke-weight="3"></bm-polyline>
<bm-polyline :path="polylinePath22" stroke-color="red" :stroke-opacity="1" :stroke-weight="3"></bm-polyline>
- <bm-label style="background-color: rgba(0,0,0,0) !important;" content="145m 方位2" :position="{lng:87.681065, lat:43.942399}" title="145m 方位2" />
+ <bm-label style="background-color: rgba(0,0,0,0) !important;" content="145m 方位2" :position="{lng:87.681065, lat:43.942399}" :labelStyle="numberStyle" title="145m 方位2" />
</bm-overlay>
<bm-ground class="picBg" :bounds="{ne: {lng: 87.679854, lat: 43.945406}, sw:{lng: 87.67801, lat: 43.94331}}" imageURL="/directions.png" opacity="1"></bm-ground>
<bm-map-type :map-types="['BMAP_SATELLITE_MAP','BMAP_NORMAL_MAP' ]" anchor="BMAP_ANCHOR_TOP_LEFT"></bm-map-type>
@@ -78,7 +78,6 @@
polylinePath21: Array<location>
polylinePath22: Array<location>
textStyle: {}
- textStyle2: {}
tittleStyle: {}
numberStyle: {}
}
@@ -111,12 +110,6 @@
fontSize : '16px',
backgroundColor: 'rgba(0,0,0,0)',
borderColor: '#fff'
- },
- textStyle2: {
- color: 'red',
- fontSize : '16px',
- backgroundColor: 'rgba(0,0,0,0)',
- borderColor: 'red'
},
tittleStyle: {
color: '#000000',
@@ -164,21 +157,20 @@
state.polylinePath2 = [{ lng: 87.681000, lat: 43.942226}, {lng: 87.680323, lat: 43.943302}]
state.polylinePath21 = [{lng: 87.680323, lat: 43.943302},{ lng: 87.680303, lat: 43.943202}]
state.polylinePath22 = [{lng: 87.680323, lat: 43.943302},{ lng: 87.680453, lat: 43.943242}]
+
}
- const zoomMap = (type, target)=>{
- if(type.target.Za>=18){
+ const zoomMap = (e)=>{
+ const zoom = e.target.getZoom()
+ if(zoom>=18){
state.textStyle.fontSize = '16px'
- state.textStyle2.fontSize = '16px'
state.tittleStyle.fontSize = '20px'
state.numberStyle.fontSize = '16px'
- }else if(type.target.Za>=15 && type.target.Za<=17){
+ }else if(zoom>=15 && zoom<=17){
state.textStyle.fontSize = '12px'
- state.textStyle2.fontSize = '12px'
state.tittleStyle.fontSize = '14px'
state.numberStyle.fontSize = '12px'
}else{
state.textStyle.fontSize = '10px'
- state.textStyle2.fontSize = '10px'
state.tittleStyle.fontSize = '10px'
state.numberStyle.fontSize = '10px'
}
diff --git a/src/views/bigScreen/components/screen.vue b/src/views/bigScreen/components/screen.vue
index 7c9cb10..ac0ea94 100644
--- a/src/views/bigScreen/components/screen.vue
+++ b/src/views/bigScreen/components/screen.vue
@@ -2012,12 +2012,16 @@
background: url("../../../assets/warningScreen/data-6.png") no-repeat center;
background-size: 90% 90%;
}
+ div:nth-of-type(7){
+ background: url("../../../assets/warningScreen/data-7.png") no-repeat center;
+ background-size: 90% 90%;
+ }
}
.weather{
width: 100%;
height: calc(100% - 60px);
- background: url("../../../assets/warningScreen/scroll-bg2.png") no-repeat bottom;
- background-size: 100% 82%;
+ //background: url("../../../assets/warningScreen/scroll-bg.png") no-repeat bottom;
+ //background-size: 100% 82%;
tr{
width: 100%;
@@ -2029,7 +2033,7 @@
width: calc(100% / 6);
text-align: center;
box-sizing: border-box;
- font-size: 12px;
+ font-size: 11px;
}
}
.weatherTit{
@@ -2037,6 +2041,7 @@
}
.weatherRow{
color: #fff;
+ background: rgb(18,90,145);
}
}
--
Gitblit v1.9.2