From d31fb45254f34d9ba69bc9e036dca2f956768cca Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Thu, 24 Aug 2023 09:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/config.js                                 | 11 +++---
 .../fire-control/components/right-bottom.js   |  3 +-
 .../fire-control/components/style.less        | 35 +------------------
 .../fire-control/containers/homePage.js       | 13 +++----
 4 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/api/config.js b/api/config.js
index bab5934..aea1ab4 100644
--- a/api/config.js
+++ b/api/config.js
@@ -91,11 +91,6 @@ const product = {
                   password: 'Fs2689'
                }
             },
-            pssaRequest: [{
-               name: 'yingshiRequest',
-               root: YINGSHI_URL,
-               params: {}
-            },],
             backupsUrl: BACKUPS_URL,
             k8s: KUBESPHERE_URL,
             dbConfig: DATABASE_CONFIG,
@@ -104,7 +99,11 @@ const product = {
             pssaRequest: [{// name 会作为一个 request 出现在 ctx.app.fs
                name: 'anxinyun',
                root: AXY_API_URL
-            }],
+            }, {
+               name: 'yingshiRequest',
+               root: YINGSHI_URL,
+               params: {}
+            },],
          }
       }, {
          entry: require('./app/lib/middlewares/proxy').entry,
diff --git a/super-screen/client/src/sections/fire-control/components/right-bottom.js b/super-screen/client/src/sections/fire-control/components/right-bottom.js
index fd753c8..bac90fa 100644
--- a/super-screen/client/src/sections/fire-control/components/right-bottom.js
+++ b/super-screen/client/src/sections/fire-control/components/right-bottom.js
@@ -30,7 +30,8 @@ const DataTop5 = ({ dispatch, actions }) => {
          <div className='box_header_bg'  >
             <span className='card-title'>视频监控</span>
             <Select
-               className='bigscreen-select'
+               className="gis-search-select"
+               popupClassName="super-dropdownClassName"
                style={{
                   width: 100,
                   float: 'right',
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 50f81c6..d2fdbb7 100644
--- a/super-screen/client/src/sections/fire-control/components/style.less
+++ b/super-screen/client/src/sections/fire-control/components/style.less
@@ -503,38 +503,5 @@
     }
 }
 
-.bigscreen-select {
-   .ant-select-selector {
-     background-color:  #24dcf74d !important;
-     height: 18px !important;
-   }
- 
-   .ant-select-focused {
-     border: 0px;
-   }
- 
-   .ant-select-selection-item {
-     color: #fff;
-     font-family: YouSheBiaoTiHei;
-     height: 16px !important;
-     line-height: 17px !important;
-     text-align: right;
-   }
- 
-   .ant-select-selection-search {
-     color: #fff;
-   }
- 
-   .ant-select-arrow {
-     color: #fff;
-   }
-   .ant-select-selection-item {
-     background: transparent;
-     border: 0;
-   }
-   .ant-select-multiple,
-   .ant-select-selection-item-remove {
-     color: #fff;
-   }
- }
+
  
\ No newline at end of file
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 8214fe7..b301a25 100644
--- a/super-screen/client/src/sections/fire-control/containers/homePage.js
+++ b/super-screen/client/src/sections/fire-control/containers/homePage.js
@@ -29,7 +29,7 @@ function homePage (props) {
    const [fireDevice, setFireDevice] = useState([])
    const [fireTrend, setFireTrend] = useState([])
 
-
+   const { data: emergencyList = {} } = useFsRequest({ url: 'water/emergency' });
    useEffect(() => {
       getFireData();
    }, [])
@@ -87,6 +87,7 @@ function homePage (props) {
             <div className='homepage-center'>
                <Gis
                   emergencyList={emergencyList}
+                  setLongitudeLatitude={setLongitudeLatitude}
                   dispatch={dispatch}
                   actions={actions}
                   propTab={tab}
@@ -102,11 +103,11 @@ function homePage (props) {
             <div className='homepage-left homepage-left-right'>
                {tab == 'overview' ? <div className="list">
                   {/* <div className='child-right' style={childStyle}>
-                            <RightTop />
-                        </div>
-                        <div className='child-right' style={childStyle}>
-                            <RightMiddle cardContentHeight={cardContentHeight} />
-                        </div>  */}
+                     <RightTop />
+                  </div>
+                  <div className='child-right' style={childStyle}>
+                     <RightMiddle cardContentHeight={cardContentHeight} />
+                  </div>  */}
                   <div className='child-right' style={{ height: 'calc(64% + 17px)', color: '#fff', marginBottom: 17 }}>
                      <RightTop2 longitudeLatitude={longitudeLatitude} />
                   </div>