合并qzc-dev

src/views/Home/MapCtrl/Pops/GongShuiPop.js

@@ -23,7 +23,7 @@ function RealDrpTip({ id, data, dispatch }) {
             <div className="normalModalStyle_title" style={{marginBottom:0}}>
                         <div className="normalModalStyle_title_icon"></div>
                         <span>{data.stnm}&emsp;</span>
-                        {data?.sttp &&
+                        {/* {data?.sttp &&
             <span style={
               { 
                 display:"inline-block",
@@ -32,7 +32,7 @@ function RealDrpTip({ id, data, dispatch }) {
                 border: "1px solid #74a7ff",
                 borderRadius: "5px"
               }
-            }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}（{{'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}?.[data.source]}）</span>}
+            }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}（{{'SH':'山洪','SW':'水文','QX':'气象','SK':'水库'}?.[data.source]}）</span>} */}
                         <div className="normalModalStyle_title_cancel">
                   <CloseOutlined onClick={closePop} style={{color:"#333"}}/>
                 </div>

src/views/Home/fhxs/index.js

@@ -20,7 +20,7 @@ const Page = ({showPanels}) => {
 
     useEffect(()=>{
         // dispatch.map.setLayerVisible({ ShuiKuLayer: true })
-        dispatch.map.setLayerVisible({ HdswLayer: true })
+        dispatch.map.setLayerVisible({ HdswLayer: false })
         getData()
         return ()=>{
             dispatch.map.setLayerVisible({ ShuiKuLayer: false })
@@ -72,7 +72,7 @@ const Page = ({showPanels}) => {
   return (
     <div className='fxdd_fhxs' style={{display:!showPanels?'none':'block'}}>
         <div className='homePage_leftBox'>
-            <Collapse ghost onChange={(e)=>setMyKey(e)} defaultActiveKey={['1']} expandIconPosition="end" accordion={true} bordered={false}>
+        <Collapse ghost onChange={(e) => setMyKey(e)} defaultActiveKey={['1']} expandIconPosition="end" accordion={true} bordered={false}>
                 <Panel  
                     key={'1'}
                     header={<div className='homePage_Panel'><img src={`${process.env.PUBLIC_URL}/assets/panelTitle.png`} alt=""/>降雨信息</div>}

src/views/Home/homePanelsLayoutPage/item_shuiku/drpOption.js

@@ -29,6 +29,7 @@ export default function drpOption({data}) {
       { 
         // name: "流量m³/s",
         nameGap: 0,
+        inverse:true,
         type: 'category',
         data: data.map(o => o.tm),
         splitLine: {

src/views/Home/homePanelsLayoutPage/item_yujing/index.js

@@ -86,7 +86,7 @@ const Page = ({ mySetTms }) => {
                     <div></div>
                 </div>
                 <div className="bodyBoxItem" onClick={()=>{setOpen(true);setkey('AI告警')}}>
-                    <div className="num">{dataObj.aiWarnCount}</div>
+                    <div className="num">{dataObj.aiWarnCount||0}</div>
                     <div className="content">AI告警</div>
                     <div></div>
                 </div>