diff --git a/src/views/Home/MapCtrl/M2D/layermgr2d.js b/src/views/Home/MapCtrl/M2D/layermgr2d.js index 2cc84b1c9..982d23f6d 100644 --- a/src/views/Home/MapCtrl/M2D/layermgr2d.js +++ b/src/views/Home/MapCtrl/M2D/layermgr2d.js @@ -122,7 +122,7 @@ export default class LayerMgr2D extends LayerMgr { //河流 - // this.addLayer(new HLLayer2D2({ visible: visible[HLLayer2D2.LayerName], setting, dispatch }));//河流线-卫星图 //缺失 + this.addLayer(new HLLayer2D2({ visible: visible[HLLayer2D2.LayerName], setting, dispatch }));//河流线-卫星图 this.addLayer(new HLLayer2D({ visible: visible[HLLayer2D.LayerName], setting, dispatch }));//河流线-矢量图 // this.addLayer(new HL2Layer2D({ visible: visible[HL2Layer2D.LayerName], setting, dispatch }));//河流面 //缺失 diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js b/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js index ed27e07e3..0322950cf 100644 --- a/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js +++ b/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js @@ -31,7 +31,7 @@ export default function drpOption(data) { { type: 'category', data: data.map(o => o.tm), - inverse: true, + inverse: false, splitLine: { show: false }, diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js b/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js index 207972249..d5791b3bc 100644 --- a/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js +++ b/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js @@ -4,14 +4,11 @@ import moment from "moment" const { RangePicker } = DatePicker; const cysd = [ - { label:'昨天08:00~当前时间',value:'昨天08:00~当前时间',tms:[moment().add(-1,'days').format('YYYY-MM-DD 08:00:00'),moment().format('YYYY-MM-DD HH:mm:ss')]}, - { label:'今天08:00~当前时间',value:'今天08:00~当前时间',tms:[moment().format('YYYY-MM-DD 08:00:00'),moment().format('YYYY-MM-DD HH:mm:ss')]}, - { label:'昨天08:00~今天08:00',value:'昨天08:00~今天08:00',tms:[moment().add(-1,'days').format('YYYY-MM-DD 08:00:00'),moment().format('YYYY-MM-DD 08:00:00')]}, - { label:'最近1小时',value:'最近1小时',tms:[moment().add(-1,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, - { label:'最近3小时',value:'最近3小时',tms:[moment().add(-3,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, - { label:'最近6小时',value:'最近6小时',tms:[moment().add(-6,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, - { label:'最近12小时',value:'最近12小时',tms:[moment().add(-12,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, - { label:'最近24小时',value:'最近24小时',tms:[moment().add(-24,'hours').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, + { label:'今日',value:'今日',tms:[moment().format('YYYY-MM-DD 00:00:00'),moment().format('YYYY-MM-DD HH:mm:ss')]}, + { label:'近一周',value:'近一周',tms:[moment().add(-7,'days').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, + { label:'近一月',value:'近一月',tms:[moment().add(-1,'months').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, + { label:'近三月',value:'近三月',tms:[moment().add(-3,'months').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, + { label:'近一年',value:'近一年',tms:[moment().add(-1,'years').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]}, ] const ToolBar = ({search, defaultParams}) => { diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js b/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js index 9778c0a1a..0bdb86d26 100644 --- a/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js +++ b/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js @@ -31,7 +31,7 @@ export default function drpOption(data) { { type: 'category', data: data.map(o => o.tm), - inverse: true, + inverse: false, splitLine: { show: false }, diff --git a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js index 5a0771acb..7f8d7c2da 100644 --- a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js +++ b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js @@ -39,36 +39,38 @@ const Page = ({mySetTms}) => { ]; useEffect(()=>{ - ( - async()=>{ - const { code, data } = await httppost2(apiurl.home.xcxj_dcl) - if(code!==200){ - message.error('请求失败') - return - } - setData(data) - }, - - async()=>{ - const { code, data } = await httppost2(apiurl.home.xcxj_by) - if(code!==200){ - message.error('请求失败') - return - } - setData2(data) - }, - - async()=>{ - const { code, data } = await httppost2(apiurl.home.xcxj_bn) - if(code!==200){ - message.error('请求失败') - return - } - setData3(data) - } - )() + getDcl() + getBy() + getBn() },[]) + const getDcl = async()=>{ + const { code, data } = await httppost2(apiurl.home.xcxj_dcl) + if(code!==200){ + message.error('请求失败') + return + } + setData(data) + } + + const getBy = async()=>{ + const { code, data } = await httppost2(apiurl.home.xcxj_by) + if(code!==200){ + message.error('请求失败') + return + } + setData2(data) + } + + const getBn = async()=>{ + const { code, data } = await httppost2(apiurl.home.xcxj_bn) + if(code!==200){ + message.error('请求失败') + return + } + setData3(data) + } + const addHlLayer = (geojsonrv,name,color,item)=>{ mapObj && mapObj.getLayers().getArray().forEach((layer)=> {