消防功能完善

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',
     });
-
+    const datas = devices?.map(s => {
-    let datas = []
+        if (typeof (s.data) == 'string') s.data = JSON.parse(s.data)
-    useEffect(() => {
+        return s;
-        devices?.map(s => {
+    })
-            s.data = JSON.parse(s.data)
-            return s;
-        })
-    }, [devices])
 
     const data = [
         { name: '烟感设备', number: datas?.find(s => s.type == 3)?.data?.length || 0 },

super-screen/client/src/sections/community-safty/containers/homePage.js

@@ -60,9 +60,7 @@ function homePage(props) {
             <div className='homepage'>
                 <div className='_title'>
                     <div className='_title_text'>
-                        <span>社区安全</span>
+                        <span>房屋租赁安全</span>
-                        <div className='_title_dot'></div>
-                        <span>流动人口</span>
                     </div>
                     <Weather />
                     <div onClick={() => { dispatch(push('/homepage')) }} className='_exit' >返回平台</div>

super-screen/client/src/sections/fire-control/components/alarm-add.js

@@ -57,7 +57,12 @@ function FireAddForm(props) {
                             : '请选择事件地点'}</div>
                 </Form.Item>
                 <Form.Item name="type" label="警情类型" rules={[{ required: true, message: '请选择警情类型!' }]}>
-                    <Select placeholder="请选择警情类型">
+                    <Select
+                        onChange={(s) => {
+                            form.setFieldValue('typeParam', null)
+                            form.setFieldValue('scene', null)
+                        }}
+                        placeholder="请选择警情类型">
                         {eventType_Data.map(s => <Option value={s}>{s}</Option>)}
                     </Select>
                 </Form.Item>

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: '事故类型',

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) {
+function Map(props) {
-   const { dispatch, actions, emergencyList, propTab,setLongitudeLatitude } = 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) {
             </div>
          </div>
 
-         <div className='alarm_confirm'>
+         {
-            <div className='hande_button'
+            propTab == 'overview' && <div className='alarm_confirm'>
-               onClick={() => {
+               <div className='hande_button'
-                  map.clearInfoWindow();
+                  onClick={() => {
-                  if (emergencyList['xfjy']?.length > 0) {
+                     map.clearInfoWindow();
-                     const list = emergencyList['xfjy'].sort((b, a) => computeDis(
+                     if (emergencyList['xfjy']?.length > 0) {
-                        new AMap.LngLat(x.longitude, x.latitude),
+                        const list = emergencyList['xfjy'].sort((b, a) => computeDis(
-                        new AMap.LngLat(b.location?.split(',')[0], b.location?.split(',')[1])
+                           new AMap.LngLat(x.longitude, x.latitude),
-                     ) - computeDis(
+                           new AMap.LngLat(b.location?.split(',')[0], b.location?.split(',')[1])
-                        new AMap.LngLat(x.longitude, x.latitude),
+                        ) - computeDis(
-                        new AMap.LngLat(a.location?.split(',')[0], a.location?.split(',')[1])
+                           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])
+                        const location = list[0]?.location
-                  }
+                        drawDrivings([x.longitude, x.latitude], location.split(','), x, list[0])
-               }}
+                     }
-            >一键护航</div>
+                  }}
-         </div>
+               >一键护航</div>
+            </div>}
       </div>,
          document.getElementById(`alarmcontentid${x.location}`));
    }

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) {
          <div className='homepage'>
             <div className='_title'>
                <div className='_title_text'>
-                  <span>智慧消防</span>
+                  <span>消防一键护航</span>
-                  <div className='_title_dot'></div>
-                  <span>一键护航</span>
                </div>
                <Weather />
                <div onClick={() => { dispatch(push('/homepage')) }} className='_exit' >返回平台</div>
@@ -129,7 +127,7 @@ function homePage (props) {
 
 }
 
-function mapStateToProps (state) {
+function mapStateToProps(state) {
    const {
       auth, global
    } = state;

super-screen/client/src/sections/water-prevention/containers/homePage.js

@@ -176,7 +176,7 @@ function homePage(props) {
             <div className='homepage'>
                 <div className='_title'>
                     <div className='water_title_text'>
-                        水务防汛实时监测预警系统
+                        防汛提前知
                     </div>
                     <Weather />
                     <div onClick={() => { dispatch(push('/homepage')) }} className='_exit' >返回平台</div>