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)? -