diff --git a/public/assets/xyt/homeImg/video.png b/public/assets/xyt/homeImg/video.png new file mode 100644 index 000000000..8653e263e Binary files /dev/null and b/public/assets/xyt/homeImg/video.png differ diff --git a/src/views/Home/MapCtrl/Markers/GongShuiMarker.js b/src/views/Home/MapCtrl/Markers/GongShuiMarker.js index 0d23f60a9..351f859f7 100644 --- a/src/views/Home/MapCtrl/Markers/GongShuiMarker.js +++ b/src/views/Home/MapCtrl/Markers/GongShuiMarker.js @@ -165,7 +165,7 @@ function GongShuiMarker({ data, dispatch, setting, zoom, distSq }) { color: `rgba(0, 0, 0, 0.533)`, // textShadow: '2px 2px 4px #000000' }}> - {data.v || '-'} + {typeof data.v === 'number'?data.v:'-'} ) } diff --git a/src/views/Home/MapCtrl/Pops/GongShuiPop.js b/src/views/Home/MapCtrl/Pops/GongShuiPop.js index a4798422d..6a51a38eb 100644 --- a/src/views/Home/MapCtrl/Pops/GongShuiPop.js +++ b/src/views/Home/MapCtrl/Pops/GongShuiPop.js @@ -22,7 +22,7 @@ function RealDrpTip({ id, data, dispatch }) {
- {data?.sttp == "QQ" ?"放水管流量": data?.sttp == "PQ" ? "输水管流量" : ""}  + {data.stnm}  {data?.sttp && 河流
-
- +
+
视频点
diff --git a/src/views/Home/homePanelsLayoutPage/item_gongshui.js b/src/views/Home/homePanelsLayoutPage/item_gongshui.js index 08f86ffde..000b44544 100644 --- a/src/views/Home/homePanelsLayoutPage/item_gongshui.js +++ b/src/views/Home/homePanelsLayoutPage/item_gongshui.js @@ -25,9 +25,12 @@ const Page = () => { } data?.map((item,index)=>{ if(index<2){ - if(item.sttp==='QQ'){ + if(item.stcd==='1111111'){ + //灌溉流量站 setData1({...item}) - }else{ + } + if(item.stcd==='2222222'){ + //取水流量计 setData2({...item}) } } diff --git a/src/views/gxsl/gsnlfx/index.js b/src/views/gxsl/gsnlfx/index.js index f1c6706e1..9a942ca9d 100644 --- a/src/views/gxsl/gsnlfx/index.js +++ b/src/views/gxsl/gsnlfx/index.js @@ -21,7 +21,7 @@ export default function Gsnlfx() { } const [form] = Form.useForm() const [tableData, setTableData] = useState([]) - const [ssgData, setSsGData] = useState({}) //输水管数据 + const [ssgData, setSsGData] = useState({}) const [gsDays, setGsDays] = useState() const [lslOpen, setLslOpen] = useState(false) const [simailarData, setSimailarData] = useState([]) @@ -46,8 +46,8 @@ export default function Gsnlfx() { const getInputData = async() => { try { const res = await httppost2(apiurl.gsxl.zfzl.input) - const ssg = res.data.find(item => item.sttp == "PQ"); - const fsg = res.data.find(item => item.sttp == "QQ"); + const ssg = res.data.find(item => item.stcd == "1111111");//灌溉流量 + const fsg = res.data.find(item => item.stcd == "2222222");//水厂流量 setSsGData({ssg,fsg}) } catch (error) { console.log(error); @@ -140,8 +140,8 @@ export default function Gsnlfx() { 灌溉流量(m³/s)
- {ssgData?.fsg?.q ?? "--"} - ({ssgData?.fsg?.tm ?? "--"}) + {ssgData?.ssg?.q ?? "--"} + ({ssgData?.ssg?.tm ?? "--"})
@@ -150,8 +150,8 @@ export default function Gsnlfx() { 水厂流量(m³/s)
- {ssgData?.ssg?.q ?? "--"} - ({ssgData?.ssg?.tm ?? "--"}) + {ssgData?.fsg?.q ?? "--"} + ({ssgData?.fsg?.tm ?? "--"})