diff --git a/public/assets/bar/巡查.png b/public/assets/bar/巡查.png new file mode 100644 index 0000000..f81effa Binary files /dev/null and b/public/assets/bar/巡查.png differ diff --git a/public/assets/bar/巡查2.png b/public/assets/bar/巡查2.png new file mode 100644 index 0000000..cba378a Binary files /dev/null and b/public/assets/bar/巡查2.png differ diff --git a/public/assets/bar/水库.png b/public/assets/bar/水库.png new file mode 100644 index 0000000..c1785ae Binary files /dev/null and b/public/assets/bar/水库.png differ diff --git a/public/assets/bar/水库2.png b/public/assets/bar/水库2.png new file mode 100644 index 0000000..d326390 Binary files /dev/null and b/public/assets/bar/水库2.png differ diff --git a/public/assets/bar/返回.png b/public/assets/bar/返回.png new file mode 100644 index 0000000..44ab2a4 Binary files /dev/null and b/public/assets/bar/返回.png differ diff --git a/public/assets/bar/防汛.png b/public/assets/bar/防汛.png new file mode 100644 index 0000000..a1f4f3d Binary files /dev/null and b/public/assets/bar/防汛.png differ diff --git a/public/assets/bar/防汛2.png b/public/assets/bar/防汛2.png new file mode 100644 index 0000000..faf293f Binary files /dev/null and b/public/assets/bar/防汛2.png differ diff --git a/src/views/Home/InfoPops/RealDrpPop/DrpChart.js b/src/views/Home/InfoPops/RealDrpPop/DrpChart.js index e4ac40f..4bead72 100644 --- a/src/views/Home/InfoPops/RealDrpPop/DrpChart.js +++ b/src/views/Home/InfoPops/RealDrpPop/DrpChart.js @@ -312,7 +312,7 @@ function DrpChart({ record }) { name: '小时降雨', type: 'bar', barWidth: '60%', - data: data2.map(o => o.drp), + data: data2.map(o => Number((o.drp).toFixed(2))), itemStyle: { normal: { barBorderRadius: [3, 3, 0, 0], @@ -342,7 +342,7 @@ function DrpChart({ record }) { label: { show: false, }, - data: data2.map(o => o.totalDrp), + data: data2.map(o => Number((o.totalDrp).toFixed(2))), lineStyle: { normal: { width: 1, diff --git a/src/views/Home/MapCtrl/mapstyle/base.js b/src/views/Home/MapCtrl/mapstyle/base.js index 4b56834..67bf763 100644 --- a/src/views/Home/MapCtrl/mapstyle/base.js +++ b/src/views/Home/MapCtrl/mapstyle/base.js @@ -19,7 +19,7 @@ export default { }, 'paint': { 'fill-opacity': 0.9, - 'fill-color': '#38467f', + 'fill-color': 'rgba(44,169,138,0.2)', } }, 浮桥河流域: { @@ -31,7 +31,7 @@ export default { }, 'paint': { 'fill-opacity': 0.9, - 'fill-color': '#38467f', + 'fill-color': 'rgba(44,169,138,0.4)', } }, 浮桥河: { @@ -43,7 +43,8 @@ export default { 'visibility':'none' }, 'paint': { - 'line-color': '#75fbfd', + 'line-opacity': 0.6, + 'line-color': '#00FFFF', 'line-width': [ 'case', ['==', ['get', 'LEVEL'], 1], 2.2*4, diff --git a/src/views/Home/MapCtrl/mapstyle/layermgr.js b/src/views/Home/MapCtrl/mapstyle/layermgr.js index 2457258..92b5a1f 100644 --- a/src/views/Home/MapCtrl/mapstyle/layermgr.js +++ b/src/views/Home/MapCtrl/mapstyle/layermgr.js @@ -140,7 +140,6 @@ class LayerMgr { layers: [ base.background, base.zhenGround, - base.浮桥河流域, base.heatmap, base.gwmap, base.gqmap, @@ -150,6 +149,7 @@ class LayerMgr { this.layerMap.RivlLayer.getStyle('water'), this.layerMap.RivlLayer.getStyle('rivl'), sources.绿色区域 && base.plantZone, + base.浮桥河流域, base.浮桥河, base.xzj.shape, base.xj.shape, diff --git a/src/views/Home/components/DrpSearch/drpOption.js b/src/views/Home/components/DrpSearch/drpOption.js index 8e18698..286f18b 100644 --- a/src/views/Home/components/DrpSearch/drpOption.js +++ b/src/views/Home/components/DrpSearch/drpOption.js @@ -128,7 +128,7 @@ export default function drpOption({ data, grid, title }) { label: { show: false, }, - data: data2.map(o => o.totalDrp), + data: data2.map(o => Number((o.totalDrp).toFixed(2))), lineStyle: { normal: { width: 1, diff --git a/src/views/Home/components/Title/index.js b/src/views/Home/components/Title/index.js index 045d8d8..0edd0b4 100644 --- a/src/views/Home/components/Title/index.js +++ b/src/views/Home/components/Title/index.js @@ -157,16 +157,16 @@ export default function Title() { } { (view===203||view===205||view===206)? -
+
{ [ - {name:'返回',key:200,icon:'组1.png'}, - {name:'水库监测',key:203,icon:'组2.png'}, - {name:'防汛调度',key:205,icon:'组3.png'}, - {name:'巡查维养',key:206,icon:'组4.png'}, + {name:'返回',key:200,icon:'返回.png',icon2:'返回.png'}, + {name:'水库监测',key:203,icon:'水库.png',icon2:'水库2.png'}, + {name:'防汛调度',key:205,icon:'防汛.png',icon2:'防汛2.png'}, + {name:'巡查维养',key:206,icon:'巡查.png',icon2:'巡查2.png'}, ].map((item)=> <> -
{ +
{ dispatch.map.setView(item.key) const map = window.__mapref; if (map) { @@ -188,10 +188,11 @@ export default function Title() { } } }}> -
- -
- {item.name} + { + item.key===200? + + : + }
) diff --git a/src/views/Home/panels/JbqkRight/page2.js b/src/views/Home/panels/JbqkRight/page2.js index 8fc13b8..5699687 100644 --- a/src/views/Home/panels/JbqkRight/page2.js +++ b/src/views/Home/panels/JbqkRight/page2.js @@ -3100,7 +3100,7 @@ function Page({jbqkKey}) { map.setLayoutProperty('浮桥河流域', 'visibility', 'visible'); map.setLayoutProperty('浮桥河', 'visibility', 'visible'); dispatch.runtime.setCameraTarget({ - center: [114.814743, 31.306305], + center: [114.904743, 31.306305], zoom: 10, pitch: 50, bearing: 0 diff --git a/src/views/Home/panels/Skzl/collapsePage.js b/src/views/Home/panels/Skzl/collapsePage.js index 8e99f84..7b3bda9 100644 --- a/src/views/Home/panels/Skzl/collapsePage.js +++ b/src/views/Home/panels/Skzl/collapsePage.js @@ -1,11 +1,11 @@ -function Page({ type,name,num1,num2,skType,setSkType }) { +function Page({ type,name,num1,num2,skType,setSkType,icon }) { return (
{ setSkType(skType!==type?type:'') }}> - +
{name}
{num1}座
{num2}亿m³
diff --git a/src/views/Home/panels/Skzl/countPage.js b/src/views/Home/panels/Skzl/countPage.js index 32330b5..3db4fbe 100644 --- a/src/views/Home/panels/Skzl/countPage.js +++ b/src/views/Home/panels/Skzl/countPage.js @@ -5,22 +5,22 @@ function Page({ style }) {
- +
大型水库
3
- +
中型水库
7
- +
小(1)型水库
44
- +
小(2)型水库
207
diff --git a/src/views/Home/panels/Skzl/index.js b/src/views/Home/panels/Skzl/index.js index e8681f2..54136da 100644 --- a/src/views/Home/panels/Skzl/index.js +++ b/src/views/Home/panels/Skzl/index.js @@ -39,10 +39,10 @@ function DrpReal({ style }) { }, [skData, skType, sort, sort1]) const skTypeObj = [ - { type: '1', name: '大型水库', num1: 3, num2: 7.9316 },//8.735 - { type: '2', name: '中型水库', num1: 7, num2: 1.627 }, - { type: '3', name: '小(1)型水库', num1: 44, num2: 1.627 }, - { type: '4', name: '小(2)型水库', num1: 207, num2: 8.735 }, + { type: '1', name: '大型水库', num1: 3, num2: 7.9316,icon:'大型水库.png' },//8.735 + { type: '2', name: '中型水库', num1: 7, num2: 1.627,icon:'中.png' }, + { type: '3', name: '小(1)型水库', num1: 44, num2: 1.627 ,icon:'小1.png'}, + { type: '4', name: '小(2)型水库', num1: 207, num2: 8.735 ,icon:'小1.png'}, ] useEffect(() => { @@ -136,7 +136,7 @@ function DrpReal({ style }) { { skTypeObj.map((item) => (<> - + diff --git a/src/views/Mgr/components/DrpSearch/drpOption.js b/src/views/Mgr/components/DrpSearch/drpOption.js index 8e18698..286f18b 100644 --- a/src/views/Mgr/components/DrpSearch/drpOption.js +++ b/src/views/Mgr/components/DrpSearch/drpOption.js @@ -128,7 +128,7 @@ export default function drpOption({ data, grid, title }) { label: { show: false, }, - data: data2.map(o => o.totalDrp), + data: data2.map(o => Number((o.totalDrp).toFixed(2))), lineStyle: { normal: { width: 1,