diff --git a/super-screen/client/assets/images/homepage/fire/lefticon3.png b/super-screen/client/assets/images/homepage/fire/lefticon3.png index 9324872..ba1742c 100644 Binary files a/super-screen/client/assets/images/homepage/fire/lefticon3.png and b/super-screen/client/assets/images/homepage/fire/lefticon3.png differ 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 97b0e95..b2bf6dd 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 @@ -1,6 +1,6 @@ import React, { useEffect } from 'react'; import { Modal, Form, Select, DatePicker, Tooltip } from 'antd'; -import { typeParam_data, alarm_levels, eventType_Data, fireMaterial_data } from '../constants/index' +import { typeParam_data, alarm_levels, eventType_Data, fireScene_data } from '../constants/index' import moment from 'moment'; const { Option } = Select; @@ -76,9 +76,9 @@ function FireAddForm(props) { } - {eventType == '火灾扑救' && + {eventType == '火灾扑救' && } diff --git a/super-screen/client/src/sections/fire-control/components/item-left.js b/super-screen/client/src/sections/fire-control/components/item-left.js index 0e25e53..01d7d1d 100644 --- a/super-screen/client/src/sections/fire-control/components/item-left.js +++ b/super-screen/client/src/sections/fire-control/components/item-left.js @@ -3,12 +3,17 @@ import { Box, AutoRollComponent } from '$components'; import moment from 'moment' import { getName, getPhone } from '$utils'; import TimeComponent from './time'; +import { typeParam_data } from '../constants/index' import './style.less' function BasicInfo(props) { - const { info: { - alarmInfo, - rescueInfo - } } = props; + const { info: { alarmInfo, rescueInfo } } = props; + + const getContent = () => { + return
+ {alarmInfo?.routes?.steps?.map((s, index) => (index + 1) + '.' + s?.instruction).map(x => { + return
{x}
+ })}
+ } let name = '', phone = '' if (rescueInfo?.leaderContactPhone) { @@ -27,18 +32,35 @@ function BasicInfo(props) {
负责人
-
{getName(name)}
+
{getName(name)}
+
事件时间
+
{moment(alarmInfo?.createTime).format('YYYY-MM-DD HH:mm:ss')}
联系方式
{getPhone(phone)}
+
危险等级
+
{alarmInfo?.level}
+
-
警情类型案件时间
-
{alarmInfo?.type}{moment(alarmInfo?.createTime).format('YYYY-MM-DD HH:mm:ss')}
+
+
警情类型
+
{alarmInfo?.type}
+
+ {alarmInfo?.typeParam &&
+
{typeParam_data[alarmInfo?.type]?.name}
+
{alarmInfo?.typeParam}
+
} + { + alarmInfo?.type == '火灾扑救' &&
+
着火场所
+
{alarmInfo?.scene}
+
+ }
@@ -54,11 +76,13 @@ function BasicInfo(props) {
路线规划
- 3} - content={
{alarmInfo?.routes?.steps?.map((s, index) => (index + 1) + '.' + s?.instruction).map(x => { - return
{x}
- })}
} - divHeight={100} divId={`fire-left-bottom${alarmInfo?.id}`} /> + 3} + content={getContent()} + divHeight={100} + divId={`fire-left-bottom${alarmInfo?.id}`} + />
diff --git a/super-screen/client/src/sections/fire-control/components/style.less b/super-screen/client/src/sections/fire-control/components/style.less index 336788f..862ad98 100644 --- a/super-screen/client/src/sections/fire-control/components/style.less +++ b/super-screen/client/src/sections/fire-control/components/style.less @@ -77,14 +77,14 @@ } ._content { - font-size: 16px; + font-size: 14px; color: #ECF7FF; } ._second_item1 { - width: 95px; + width: 153px; height: 100%; - text-align: right; + text-align: center; padding-top: 12px; display: flex; flex-direction: column; @@ -105,17 +105,6 @@ padding-top: 15px; padding-bottom: 15px; } - - @media screen and (min-height:1080px) { - - ._second_item1 { - padding-top: 24px; - } - - ._second_item2 { - padding-top: 24px; - } - } } .left_third_bg { @@ -143,6 +132,7 @@ height: 50px; background: url('/assets/images/homepage/fire/lefticon2.png') no-repeat; background-size: 100% 100%; + margin-right: 20px; } .left_item_left3 { @@ -150,6 +140,7 @@ height: 50px; background: url('/assets/images/homepage/fire/lefticon3.png') no-repeat; background-size: 100% 100%; + margin-right: 20px; } .left_item_left4 { @@ -157,6 +148,7 @@ height: 50px; background: url('/assets/images/homepage/fire/lefticon4.png') no-repeat; background-size: 100% 100%; + margin-right: 20px; } .left_item_right1 { 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 42dbf40..bf2e9ef 100644 --- a/super-screen/client/src/sections/fire-control/constants/index.js +++ b/super-screen/client/src/sections/fire-control/constants/index.js @@ -18,13 +18,13 @@ const typeParam_data = { }, } -//着火材料 -const fireMaterial_data = ["民用建筑", "工业建筑", "森林", "地下建筑", "水上"] +//着火场所 +const fireScene_data = ["民用建筑", "工业建筑", "森林", "地下建筑", "水上"] //危险等级 const alarm_levels = ['I级', 'II级', 'III级', 'IV级', 'V级'] //警情类型 const eventType_Data = ['火灾扑救', '救援抢险', '自然灾害', '灾难事故', '其他出动',] export { - typeParam_data, fireMaterial_data, alarm_levels, eventType_Data + typeParam_data, fireScene_data, alarm_levels, eventType_Data } \ No newline at end of file