{/*
*/}
+ {/*
+
+
+ {
+ if(map){
+ map.clock.currentTime = Cesium.JulianDate.fromIso8601(e.target.value);
+ }
+ }}>
+
*/}
);
}
diff --git a/src/views/Home/hsyy/index.js b/src/views/Home/hsyy/index.js
index 828ad051b..cda391521 100644
--- a/src/views/Home/hsyy/index.js
+++ b/src/views/Home/hsyy/index.js
@@ -58,7 +58,7 @@ const Page = ({ showPanels, mode }) => {
QSYDWLayer: true,
YHJMHLayer: true
});
- const { mode } = ctx
+ const { mode, data } = ctx
//当前map对象是cesium
if(!mapObj?._cesiumWidget){
return
@@ -75,7 +75,7 @@ const Page = ({ showPanels, mode }) => {
});
const demo = new Demo3D()
- demo.getCzml2(mapObj)
+ demo.getCzml3(mapObj,data.czmlPath)
}else{
mapObj.dataSources._dataSources.forEach(dataSource => {
if (dataSource.name === 'CZML1111') { // 确保你知道你想要移除的数据源名称
diff --git a/src/views/Home/hsyy/information/index.js b/src/views/Home/hsyy/information/index.js
index 4be2d3d02..d6256350d 100644
--- a/src/views/Home/hsyy/information/index.js
+++ b/src/views/Home/hsyy/information/index.js
@@ -10,29 +10,33 @@ import apiurl from '../../../../service/apiurl';
import Fack from './fack'
import Tjpz from './tjpz'
-const Page = ({projectId,onCancel,setCtx}) => {
+const Page = ({project,onCancel,setCtx}) => {
const [data,setData] = useState({data:[],tms:{}})
const [tabs, setTabsChange] = useState(0)
useEffect(()=>{
(async()=>{
- const {code , data} = await httpget2(apiurl.fxdd_xyt.hsyb.ybfagl.getData+'?projectId='+projectId)
+ const {code , data} = await httpget2(apiurl.fxdd_xyt.hsyb.ybfagl.getData+'?projectId='+project.id)
if(code!==200){
return
}
- setData({data:[...data.voList],tms:{
- forecastTime: data.forecastTm,
- projectTm: data.projectTm,
- startTime: data.startTm,
- endTime: data.endTm,
- forecastPeriod: data.forecastPeriod,
- forecastWarm: data.forecastWarm,
- type:data.type,
- ycMaxSwH:data.ycMaxSwH,
- ycMaxRkQ:data.ycMaxRkQ,
- ycMaxCkQ:data.ycMaxCkQ,
- ycSumFlood:data.ycSumFlood,
- }})
+ setData({
+ data:[...data.voList],
+ tms:{
+ forecastTime: data.forecastTm,
+ projectTm: data.projectTm,
+ startTime: data.startTm,
+ endTime: data.endTm,
+ forecastPeriod: data.forecastPeriod,
+ forecastWarm: data.forecastWarm,
+ type:data.type,
+ ycMaxSwH:data.ycMaxSwH,
+ ycMaxRkQ:data.ycMaxRkQ,
+ ycMaxCkQ:data.ycMaxCkQ,
+ ycSumFlood:data.ycSumFlood,
+ },
+ czmlPath : project.czmlPath
+ })
})()
},[])
return (
diff --git a/src/views/Home/hsyy/ybfa.js b/src/views/Home/hsyy/ybfa.js
index bef819dd5..fcdd132ba 100644
--- a/src/views/Home/hsyy/ybfa.js
+++ b/src/views/Home/hsyy/ybfa.js
@@ -17,7 +17,7 @@ const Page = ({ setCtx }) => {
let mapObj = useSelector(s => s.map.map)
const [index,setIndex] = useState(0)
const [data,setData] = useState([])
- const [projectId, setProjectId] = useState('')
+ const [project, setProject] = useState(null)
const [open, setOpen] = useState(false)
const [name, setName] = useState('')
const [tms,setTms] = useState([])
@@ -50,17 +50,19 @@ const Page = ({ setCtx }) => {
const getData = async()=>{
const data = await getTableData()
- setData([data[0]])
+ setData([data[0],data[1]])
}
const openModal = (item)=>{
+ if(index===0){ item.czmlPath = `${process.env.PUBLIC_URL}/data/json/czml1.json` }
+ if(index===1){ item.czmlPath = `${process.env.PUBLIC_URL}/data/json/czml2.json` }
setOpen(true)
- setProjectId(item.id)
+ setProject(item)
}
const closeModal = ()=>{
setOpen(false)
- setProjectId(null)
+ setProject(null)
}
return (
@@ -115,7 +117,7 @@ const Page = ({ setCtx }) => {