（*）审稿优化需求处理

super-screen/client/src/sections/fire-control/components/item-right.js

@@ -11,7 +11,8 @@ function BasicInfo(props) {
         bncs: '避难场所',
     }
 
-    return <Box title={"避难场所"} >
+
+    return <Box title={tab_name[emengencyTab]} >
         <div className='fire_item_right_container'>
             {
                 [1, 2, 3, 4, 5, 6, 7].map((s, index) => {

super-screen/client/src/sections/fire-control/components/right-top.js

@@ -1,11 +1,10 @@
 import React, { useEffect, useState } from 'react'
-import { Box } from '$components';
+import { Box, AutoRollComponent } from '$components';
 import './style.less';
 
 function CitySafty(props) {
-
+    const getContent = () => {
-    return <Box title={"城市安全"} >
+        return <div className='realtime_data'>
-        <div className='realtime_data'>
             <div className='realtime_item'>
                 <div className='_icon1' />
                 <div className='_text'>
@@ -21,7 +20,6 @@ function CitySafty(props) {
             </div>
             <div className='realtime_item'>
                 <div className='_icon2' />
-
                 <div className='_text'>
                     <div className='_row1'>
                         <span>今日接警数</span>
@@ -33,7 +31,24 @@ function CitySafty(props) {
                     </div>
                 </div>
             </div>
+
+            <div className='realtime_item'>
+                <div className='_icon2' />
+                <div className='_text'>
+                    <div className='_row1'>
+                        <span>烟感设备</span>
+                        <span>设备在线率</span>
+                    </div>
+                    <div className='_row2' style={{ color: 'rgba(89, 153, 200, 1)' }}>
+                        <span><span className='_number'>271</span>个</span>
+                        <span><span className='_number'>99.9</span>个</span>
+                    </div>
+                </div>
+            </div>
         </div>
+    }
+    return <Box title={"城市安全"} >
+        <AutoRollComponent canScroll={true} content={getContent()} divHeight={340} divId={`fire-right-top`} />
     </Box>
 }
 

super-screen/client/src/sections/fire-control/components/style.less

@@ -340,8 +340,8 @@
 
 //实时数据
 .realtime_data {
-    height: 100%;
+    // height: 100%;
-    padding: 12px 30px 12px 30px;
+    // padding: 12px 30px 12px 30px;
 
     .realtime_item {
         display: flex;

super-screen/client/src/sections/fire-control/containers/gis.js

@@ -590,8 +590,8 @@ function Map(props) {
                         <div>{s.name}</div>
                         {s.className && <div className='dotbg'>7</div>}
                     </div>
-                    <div className='icon_left'></div>
+                    {/* <div className='icon_left'></div>
-                    <div className='icon_right'></div>
+                    <div className='icon_right'></div> */}
                 </>
             })
             }

super-screen/client/src/sections/water-prevention/components/emergency-left-top.js

@@ -4,29 +4,23 @@ import { Box } from '$components';
 function BasicInfo() {
 
     const data = [
-        { title: '防汛I级应急预案', url: '' },
+        { title: '一级应急响应', url: '' },
-        { title: '防汛I级应急预案', url: '' },
+        { title: '二级应急响应', url: '' },
-        { title: '防汛I级应急预案', url: '' },
+        { title: '三级应急响应', url: '' },
-        { title: '防汛I级应急预案', url: '' },
+        { title: '四级应急响应', url: '' },
-        { title: '防汛I级应急预案', url: '' },
+
-        { title: '防汛I级应急预案', url: '' },
-        { title: '防汛I级应急预案', url: '' },
-        { title: '防汛I级应急预案', url: '' },
-        { title: '防汛I级应急预案', url: '' },
-        { title: '防汛I级应急预案', url: '' },
-        { title: '防汛I级应急预案', url: '' },
-        { title: '防汛I级应急预案', url: '' },
-        { title: '防汛I级应急预案', url: '' },
     ]
     return <Box title={"防汛预案"} subtitle={true} >
+
         <div className='prevent_doc'>
+            <div className='doc_img'></div>
             {data.map(s => {
                 return <div className='doc_container'>
-                    <div className='doc_bg'>
+                    <div className='flex-row flex-item-center'>
-                        <div className='doc_row1'>查看</div>
+                        <div className='doc_title'>{s.title}</div>
-                        <div className='doc_row2'>{s.title}</div>
+                        <div className='preview_doc'>查看</div>
                     </div>
-
+                    <div className='doc_bg' />
                 </div>
             })}
         </div>

super-screen/client/src/sections/water-prevention/components/right-top.js

@@ -33,7 +33,7 @@ function CitySafty(props) {
                 <div className='_rank_item4'>未来1小时趋势</div>
             </div>
 
-            <AutoRollComponent canScroll={true} content={getContent()} divHeight={340} divId={`fire-right-top`} />
+            {trendData?.length > 0 && <AutoRollComponent canScroll={true} content={getContent()} divHeight={340} divId={`fire-right-top`} />}
         </div>
     </Box>
 }

super-screen/client/src/sections/water-prevention/components/style.less

@@ -293,73 +293,6 @@
     }
 }
 
-//实时数据
-.realtime_data {
-    height: 100%;
-    padding: 12px 30px 12px 30px;
-
-    .realtime_item {
-        display: flex;
-        background: url('/assets/images/homepage/fire/realtimebg.png') no-repeat;
-        background-size: 100% 100%;
-        height: 45%;
-        width: 100%;
-        margin-bottom: 5%;
-        align-items: center;
-        // padding: 16px 22px 16px 22px;
-
-        ._icon1 {
-            width: 80px;
-            height: 80px;
-            background: url('/assets/images/homepage/fire/icon1.png') no-repeat;
-            background-size: 100% 100%;
-        }
-
-        ._icon2 {
-            width: 80px;
-            height: 80px;
-            background: url('/assets/images/homepage/fire/icon2.png') no-repeat;
-            background-size: 100% 100%;
-        }
-
-        ._text {
-            width: calc(100% - 100px);
-            display: flex;
-            flex-direction: column;
-
-            ._row1 {
-                color: #C3E6FF;
-                width: 100%;
-                height: 22px;
-                background: rgba(0, 88, 204, 0.5);
-                justify-content: space-around;
-                display: flex;
-
-            }
-
-            ._row2 {
-                font-size: 14px;
-                color: #00FF87;
-                justify-content: space-around;
-                display: flex;
-                height: 42px;
-
-                ._number {
-                    font-family: D-DIN-Italic;
-                    font-weight: Italic;
-                    font-size: 28px;
-                    color: #ECF7FF;
-                    margin-right: 6px;
-                }
-            }
-        }
-    }
-}
-
-.realtime_data::-webkit-scrollbar {
-    width: 0 !important
-}
-
 .water_video_container {
     width: 100%;
     height: 100%;
@@ -849,41 +782,46 @@
     width: 100%;
     display: flex;
     flex-wrap: wrap;
-    overflow: auto;
+    justify-content: center;
+
+    .doc_img {
+        width: 361.63px;
+        height: 242.49px;
+        background: url(/assets/images/homepage/water/doc.png);
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+    }
 
     .doc_container {
         width: 50%;
-        height: 83px;
+        height: 43px;
-        margin-bottom: 20px;
 
-        .doc_bg {
+        .doc_title {
-            width: 177px;
+            font-family: SourceHanSansSC-Regular;
-            height: 83px;
+            font-weight: 400;
-            background: url('/assets/images/homepage/water/docbg.png');
+            font-size: 16px;
-            background-repeat: no-repeat;
+            color: #FFFFFF;
-            background-size: 100% 100%;
+            margin-right: 20px;
-            position: relative;
+        }
-
+
-            .doc_row1 {
+        .preview_doc {
-                position: absolute;
+            width: 44px;
-                right: 20%;
+            height: 24.56px;
-                top: 20px;
+            background: #008AFF;
-                right: 29%;
+            border-radius: 2px;
-                top: 24px;
+            display: flex;
-                cursor: pointer;
+            align-items: center;
-            }
+            justify-content: center;
 
-            .doc_row2 {
-                position: absolute;
-                left: 49%;
-                top: 50px;
-                width: 121px;
-                color: #C3E6FF;
-            }
         }
     }
-}
 
-.prevent_doc::-webkit-scrollbar {
+    .doc_bg {
-    width: 0 !important
+        margin-top: 15px;
+        width: 191px;
+        height: 4.09px;
+        opacity: 0.7;
+        background-image: linear-gradient(270deg, #1998ff00 0%, #002FAB 45%, #4787ff6b 84%, #4787ff00 100%);
+        box-shadow: 0 0 0 0 #196c6824;
+    }
 }