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

Merge branch 'qzc-dev'

lsf-dev
秦子超 2024-09-30 09:12:00 +08:00
parent 9c71538c22 dd5b798392
commit ba5077dcb2
4 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js
View File

@ -31,7 +31,7 @@ export default function drpOption(data) {
{ {
type: 'category', type: 'category',
data: data.map(o => o.tm), data: data.map(o => o.tm),
inverse: true, inverse: false,
splitLine: { splitLine: {
show: false show: false
}, },

13
src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js
View File

@ -4,14 +4,11 @@ import moment from "moment"
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
const cysd = [ 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:'今日',value:'今日',tms:[moment().format('YYYY-MM-DD 00: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:'近一周',value:'近一周',tms:[moment().add(-7,'days').format('YYYY-MM-DD HH:mm:ss'),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:'近一月',value:'近一月',tms:[moment().add(-1,'months').format('YYYY-MM-DD HH:mm:ss'),moment().format('YYYY-MM-DD HH:mm:ss')]},
{ 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:'近三月',value:'近三月',tms:[moment().add(-3,'months').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:'近一年',value:'近一年',tms:[moment().add(-1,'years').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')]},
] ]
const ToolBar = ({search, defaultParams}) => { const ToolBar = ({search, defaultParams}) => {

2
src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js
View File

@ -31,7 +31,7 @@ export default function drpOption(data) {
{ {
type: 'category', type: 'category',
data: data.map(o => o.tm), data: data.map(o => o.tm),
inverse: true, inverse: false,
splitLine: { splitLine: {
show: false show: false
}, },

18
src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js
View File

@ -39,26 +39,30 @@ const Page = ({mySetTms}) => {
]; ];
useEffect(()=>{ useEffect(()=>{
( getDcl()
async()=>{ getBy()
getBn()
},[])
const getDcl = async()=>{
const { code, data } = await httppost2(apiurl.home.xcxj_dcl) const { code, data } = await httppost2(apiurl.home.xcxj_dcl)
if(code!==200){ if(code!==200){
message.error('请求失败') message.error('请求失败')
return return
} }
setData(data) setData(data)
}, }
async()=>{ const getBy = async()=>{
const { code, data } = await httppost2(apiurl.home.xcxj_by) const { code, data } = await httppost2(apiurl.home.xcxj_by)
if(code!==200){ if(code!==200){
message.error('请求失败') message.error('请求失败')
return return
} }
setData2(data) setData2(data)
}, }
async()=>{ const getBn = async()=>{
const { code, data } = await httppost2(apiurl.home.xcxj_bn) const { code, data } = await httppost2(apiurl.home.xcxj_bn)
if(code!==200){ if(code!==200){
message.error('请求失败') message.error('请求失败')
@ -66,8 +70,6 @@ const Page = ({mySetTms}) => {
} }
setData3(data) setData3(data)
} }
)()
},[])
const addHlLayer = (geojsonrv,name,color,item)=>{ const addHlLayer = (geojsonrv,name,color,item)=>{