lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

qzc-dev-demo
李神峰 2025-04-14 15:00:55 +08:00
parent c7ec69380a 74062c8022
commit c5f6edd9ea
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/assets/xyt/homeImg/video.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

2
src/views/Home/MapCtrl/Markers/GongShuiMarker.js
View File

@ -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:'-'}
</div>
)
}

2
src/views/Home/MapCtrl/Pops/GongShuiPop.js
View File

@ -22,7 +22,7 @@ function RealDrpTip({ id, data, dispatch }) {
<div className="normalModalStyle">
<div className="normalModalStyle_title" style={{marginBottom:0}}>
<div className="normalModalStyle_title_icon"></div>
<span>{data?.sttp == "QQ" ?"放水管流量": data?.sttp == "PQ" ? "输水管流量" : ""}&emsp;</span>
<span>{data.stnm}&emsp;</span>
{data?.sttp &&
<span style={
{

4
src/views/Home/TuLi/Tuli4.js
View File

@ -68,8 +68,8 @@ export default function TuLi() {
<div className='homePage_tuli2_row_item_text'>河流</div>
</div>
<div className='homePage_tuli2_row_item'>
<div className='homePage_tuli2_row_item_icon2'>
<img width={13} height={13} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/shipindian.png`} alt="" />
<div className='homePage_tuli2_row_item_icon2' style={{marginLeft:"-2px",marginRight:'2px'}}>
<img width={16} height={16} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/video.png`} alt="" />
</div>
<div className='homePage_tuli2_row_item_text2'>视频点</div>
</div>

7
src/views/Home/homePanelsLayoutPage/item_gongshui.js
View File

@ -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})
}
}

14
src/views/gxsl/gsnlfx/index.js
View File

@ -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() {
<span>灌溉流量（m³/s）</span>
</div>
<div className='card-value'>
<span className='nl-value'>{ssgData?.fsg?.q ?? "--"}</span>
<span className='nl-time'>（{ssgData?.fsg?.tm ?? "--"}）</span>
<span className='nl-value'>{ssgData?.ssg?.q ?? "--"}</span>
<span className='nl-time'>（{ssgData?.ssg?.tm ?? "--"}）</span>
</div>
</div>
<div className='card-item'>
@ -150,8 +150,8 @@ export default function Gsnlfx() {
<span>水厂流量（m³/s）</span>
</div>
<div className='card-value'>
<span className='nl-value'>{ssgData?.ssg?.q ?? "--"}</span>
<span className='nl-time'>（{ssgData?.ssg?.tm ?? "--"}）</span>
<span className='nl-value'>{ssgData?.fsg?.q ?? "--"}</span>
<span className='nl-time'>（{ssgData?.fsg?.tm ?? "--"}）</span>
</div>
</div>
<div className='card-item'>