From e9338221119c6aa146480bb461d71a7277dbe718 Mon Sep 17 00:00:00 2001 From: qzc Date: Fri, 11 Apr 2025 14:32:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E6=B0=B4=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/xyt/homeImg/video.png | Bin 0 -> 1030 bytes src/views/Home/MapCtrl/Markers/GongShuiMarker.js | 2 +- src/views/Home/MapCtrl/Pops/GongShuiPop.js | 2 +- src/views/Home/TuLi/Tuli4.js | 4 ++-- .../Home/homePanelsLayoutPage/item_gongshui.js | 7 +++++-- src/views/gxsl/gsnlfx/index.js | 14 +++++++------- 6 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 public/assets/xyt/homeImg/video.png diff --git a/public/assets/xyt/homeImg/video.png b/public/assets/xyt/homeImg/video.png new file mode 100644 index 0000000000000000000000000000000000000000..8653e263e5d53f2b777f458b368ba31a1b79e5d8 GIT binary patch literal 1030 zcmV+h1o``kP)Px&z)3_wR7gvmm48gsWgN%f@8eg&b!r-O=y8Ir#5E!B4iiT-|B_)s=WGcDxEj>T z40WaD0xE2@jF~k<+5#7`)i}}NFk7WDAh{!{Kfs!H9!JblOZlb1eeY?{dEa)2$DMS4 z-t+#vU*FG<=lKvJenNYh z&^@=!)q~!v7jS9(me0c2c}SbT6xn(sauU<8MQI}515iWq=5)W?078gG09sm|-KL73 zMqC{ID^!wLqK!v|u>k80>2?5lB>(Ua2mnZPkMR6h+0(T61 zUVxmINyY8RIJ#qwT5}D9_CLT+2tYst{3mU$D86URJuxF7x#?Mu#QxPKvWd54_s!s0 zZ1w@-B4gmpuOA_)Qvsv;#-g|z%4A5uO=S|*>09v318YM9?v99ttDs?wq*ev|ZnSPo za{6vJm7~gBgtP_8L3`t$fk7LO9?O0Q$z&DKT-tuX((LG*b(4=cI+3W2N8hyp zly%klnw){!%&k_E8&$ybR!8T-lJ)~$!LHOz*qLexJ4HeWg(WHD z1(Khr0Ns?w?J`=o>4wJt_TIj^(b}*8w@@%Lbt6ER5PPpI&v29`QcrT&|EVZHK47aT zI`u(V<4}Tz$F?IU(Of~YQtJEx(Ex03*bc9#?Qi>EkkXWFRGABZ0bnNS9m(m>wcaB{ z#~#~Z{h@OwW(6r(whr%@3tbv=4M~?89Bknj09cPX&#ZjY{y7H6u7m_Fj$44YOiyEj zVbxCnEF_)&0ijmr&Ix7ewKkVs+jRakz8(5G0JJtC75VpPAzN=6jfse=2JrqJtxSIx zA;cU2Ps;sV*MA~qx2?f@TxBjqX-c-7O}RY2Bzb+NG{ZmoxAuh&z^UrquO61K|E{!6 zy#TW07=~-q9RZ|?5aK=na#72e9FmvAnalHk0f0V;C?meTwg3PC07*qoM6N<$f - {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 ?? "--"}）