From 8b311649e4df84a7ad51bcc19fb1a012fcde9219 Mon Sep 17 00:00:00 2001 From: "peng.peng" Date: Thu, 24 Aug 2023 12:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/infrastructure.js | 14 ++---- .../community-safty/containers/homePage.js | 4 +- .../fire-control/components/alarm-add.js | 7 ++- .../sections/fire-control/constants/index.js | 4 +- .../sections/fire-control/containers/gis.js | 47 ++++++++++--------- .../fire-control/containers/homePage.js | 8 ++-- .../water-prevention/containers/homePage.js | 2 +- 7 files changed, 42 insertions(+), 44 deletions(-) diff --git a/super-screen/client/src/sections/community-safty/components/infrastructure.js b/super-screen/client/src/sections/community-safty/components/infrastructure.js index 2f2ed07..0d4626f 100644 --- a/super-screen/client/src/sections/community-safty/components/infrastructure.js +++ b/super-screen/client/src/sections/community-safty/components/infrastructure.js @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react' +import React from 'react' import { Box, NoData } from '$components'; import { useMockRequest, ApiTable } from '$utils'; @@ -7,14 +7,10 @@ function Infrastructure(props) { url: 'https://superchangnan.anxinyun.cn/api/xiaofang/devices', method: 'mockGet', }); - - let datas = [] - useEffect(() => { - devices?.map(s => { - s.data = JSON.parse(s.data) - return s; - }) - }, [devices]) + const datas = devices?.map(s => { + if (typeof (s.data) == 'string') s.data = JSON.parse(s.data) + return s; + }) const data = [ { name: '烟感设备', number: datas?.find(s => s.type == 3)?.data?.length || 0 }, diff --git a/super-screen/client/src/sections/community-safty/containers/homePage.js b/super-screen/client/src/sections/community-safty/containers/homePage.js index 4142f6a..51cfb70 100644 --- a/super-screen/client/src/sections/community-safty/containers/homePage.js +++ b/super-screen/client/src/sections/community-safty/containers/homePage.js @@ -60,9 +60,7 @@ function homePage(props) {
- 社区安全 -
- 流动人口 + 房屋租赁安全
{ dispatch(push('/homepage')) }} className='_exit' >返回平台
diff --git a/super-screen/client/src/sections/fire-control/components/alarm-add.js b/super-screen/client/src/sections/fire-control/components/alarm-add.js index b2bf6dd..18d6225 100644 --- a/super-screen/client/src/sections/fire-control/components/alarm-add.js +++ b/super-screen/client/src/sections/fire-control/components/alarm-add.js @@ -57,7 +57,12 @@ function FireAddForm(props) { : '请选择事件地点'}
- { + form.setFieldValue('typeParam', null) + form.setFieldValue('scene', null) + }} + placeholder="请选择警情类型"> {eventType_Data.map(s => )} diff --git a/super-screen/client/src/sections/fire-control/constants/index.js b/super-screen/client/src/sections/fire-control/constants/index.js index bf2e9ef..7701767 100644 --- a/super-screen/client/src/sections/fire-control/constants/index.js +++ b/super-screen/client/src/sections/fire-control/constants/index.js @@ -1,7 +1,7 @@ const typeParam_data = { '火灾扑救': { name: '着火物质', - options: ['固体物质', '液体或可熔物质', '气体', '带电物体和精密仪器等物质', '烹饪器具内的烹饪物',] + options: ['固体物质', '液体或可熔物质', '金属', '气体', '带电物体和精密仪器等物质', '烹饪器具内的烹饪物',] }, '救援抢险': { name: '事件类型', @@ -10,7 +10,7 @@ const typeParam_data = { }, '自然灾害': { name: '灾害类型', - options: ['水旱', '气象', '地质灾害', '等自然灾害', '森林、草原火灾'] + options: ['水旱', '气象', '地质灾害', '森林、草原火灾'] }, '灾难事故': { name: '事故类型', diff --git a/super-screen/client/src/sections/fire-control/containers/gis.js b/super-screen/client/src/sections/fire-control/containers/gis.js index 1c9809a..1393ba8 100644 --- a/super-screen/client/src/sections/fire-control/containers/gis.js +++ b/super-screen/client/src/sections/fire-control/containers/gis.js @@ -17,8 +17,8 @@ const tabs = [ { name: '应急避难场所', tab: 'yjbns', className: 'emergency_button' }, ] -function Map (props) { - const { dispatch, actions, emergencyList, propTab,setLongitudeLatitude } = props; +function Map(props) { + const { dispatch, actions, emergencyList, propTab, setLongitudeLatitude } = props; const [delay, setDelay] = useState(true) const [tab, setTab] = useState('xfyjwz') const [visible, setVisible] = useState(false) @@ -231,7 +231,7 @@ function Map (props) { // driving.clear() //清除路线 } - function drawRoute (route) { + function drawRoute(route) { var path = parseRouteToPath(route) var routeLine = new AMap.Polyline({ @@ -256,13 +256,13 @@ function Map (props) { } //计算两点距离 - function computeDis (p1, p2) { + function computeDis(p1, p2) { return Math.round(p1.distance(p2)); } // 解析DrivingRoute对象，构造成AMap.Polyline的path参数需要的格式 // DrivingResult对象结构参考文档 https://lbs.amap.com/api/javascript-api/reference/route-search#m_DriveRoute - function parseRouteToPath (route) { + function parseRouteToPath(route) { var path = [] for (var i = 0, l = route.steps.length; i < l; i++) { var step = route.steps[i] @@ -300,24 +300,25 @@ function Map (props) {
-
-
{ - map.clearInfoWindow(); - if (emergencyList['xfjy']?.length > 0) { - const list = emergencyList['xfjy'].sort((b, a) => computeDis( - new AMap.LngLat(x.longitude, x.latitude), - new AMap.LngLat(b.location?.split(',')[0], b.location?.split(',')[1]) - ) - computeDis( - new AMap.LngLat(x.longitude, x.latitude), - new AMap.LngLat(a.location?.split(',')[0], a.location?.split(',')[1]) - )) - const location = list[0]?.location - drawDrivings([x.longitude, x.latitude], location.split(','), x, list[0]) - } - }} - >一键护航
-
+ { + propTab == 'overview' &&
+
{ + map.clearInfoWindow(); + if (emergencyList['xfjy']?.length > 0) { + const list = emergencyList['xfjy'].sort((b, a) => computeDis( + new AMap.LngLat(x.longitude, x.latitude), + new AMap.LngLat(b.location?.split(',')[0], b.location?.split(',')[1]) + ) - computeDis( + new AMap.LngLat(x.longitude, x.latitude), + new AMap.LngLat(a.location?.split(',')[0], a.location?.split(',')[1]) + )) + const location = list[0]?.location + drawDrivings([x.longitude, x.latitude], location.split(','), x, list[0]) + } + }} + >一键护航
+
} , document.getElementById(`alarmcontentid${x.location}`)); } diff --git a/super-screen/client/src/sections/fire-control/containers/homePage.js b/super-screen/client/src/sections/fire-control/containers/homePage.js index b301a25..f23ed82 100644 --- a/super-screen/client/src/sections/fire-control/containers/homePage.js +++ b/super-screen/client/src/sections/fire-control/containers/homePage.js @@ -16,7 +16,7 @@ import Weather from '../../water-prevention/components/weather'; import { FullScreenContainer } from '$components' import { useFsRequest } from '$utils'; -function homePage (props) { +function homePage(props) { const { dispatch, actions } = props; const childStyle = { height: '32%', color: '#fff', marginBottom: 17 } const cardHeight = document.body.clientHeight * 0.896 * 0.32 @@ -53,9 +53,7 @@ function homePage (props) {
- 智慧消防 -
- 一键护航 + 消防一键护航
{ dispatch(push('/homepage')) }} className='_exit' >返回平台
@@ -129,7 +127,7 @@ function homePage (props) { } -function mapStateToProps (state) { +function mapStateToProps(state) { const { auth, global } = state; diff --git a/super-screen/client/src/sections/water-prevention/containers/homePage.js b/super-screen/client/src/sections/water-prevention/containers/homePage.js index ed9810f..be53414 100644 --- a/super-screen/client/src/sections/water-prevention/containers/homePage.js +++ b/super-screen/client/src/sections/water-prevention/containers/homePage.js @@ -176,7 +176,7 @@ function homePage(props) {
- 水务防汛实时监测预警系统 + 防汛提前知
{ dispatch(push('/homepage')) }} className='_exit' >返回平台