Skip to content

G
graph
Commit 265bd232 authored by wenli.huang@wuban.net.cn's avatar wenli.huang@wuban.net.cn
Browse files
Options

newup

parent 2c80d7e8
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 43 deletions
src/App.js
View file @ 265bd232
...@@ -57,39 +57,37 @@ class App extends Component { ...@@ -57,39 +57,37 @@ class App extends Component {
allTopAxisXArr = TopAxisX allTopAxisXArr = TopAxisX
allBottomAxisXArr = BottomAxisX allBottomAxisXArr = BottomAxisX
allLinksArr = Links allLinksArr = Links
// console.log(Rows, TopAxisX, BottomAxisX, Links)
that.initChart(resData) that.initChart(resData)
if(!that.interval){ if(!that.interval){
that.interval = setInterval(() => { that.interval = setInterval(() => {
fetch(`/api/graph_by_height_and_duration?height=0&duration=${that.state.requestDuration}`,{ fetch(`/api/graph_by_height_and_duration?height=0&duration=${that.state.requestDuration}`,{
method:'GET', method:'GET',
headers:{ headers:{
'Content-Type':'application/json;charset=UTF-8' 'Content-Type':'application/json;charset=UTF-8'
}, },
}) })
.then(res =>res.json()) .then(res =>res.json())
.then((newData) => { .then((newData) => {
let {Rows, AxisX, Links } = newData.result let {Rows, AxisX, Links } = newData.result
let {TopAxisX, BottomAxisX} = AxisX let {TopAxisX, BottomAxisX} = AxisX
allRows0Arr = Rows[0] allRows0Arr = Rows[0]
allRows1Arr = Rows[1] allRows1Arr = Rows[1]
allRows2Arr = Rows[2] allRows2Arr = Rows[2]
allTopAxisXArr = TopAxisX allTopAxisXArr = TopAxisX
allBottomAxisXArr = BottomAxisX allBottomAxisXArr = BottomAxisX
allLinksArr = Links allLinksArr = Links
newData.result.Rows[0] = allRows0Arr newData.result.Rows[0] = allRows0Arr
newData.result.Rows[1] = allRows1Arr newData.result.Rows[1] = allRows1Arr
newData.result.Rows[2] = allRows2Arr newData.result.Rows[2] = allRows2Arr
newData.result.AxisX.TopAxisX = allTopAxisXArr newData.result.AxisX.TopAxisX = allTopAxisXArr
newData.result.AxisX.BottomAxisX = allBottomAxisXArr newData.result.AxisX.BottomAxisX = allBottomAxisXArr
newData.result.Links = allLinksArr newData.result.Links = allLinksArr
that.initChart(newData) that.initChart(newData)
}) })
}, 5000); }, 5000);
} }
var chartDom = document.getElementById('main'); var chartDom = document.getElementById('main');
var myChart = echarts.init(chartDom); var myChart = echarts.init(chartDom);
...@@ -98,6 +96,7 @@ class App extends Component { ...@@ -98,6 +96,7 @@ class App extends Component {
var options = myChart.getOption(); var options = myChart.getOption();
var endValue=options.dataZoom[0].endValue; var endValue=options.dataZoom[0].endValue;
var startValue=options.dataZoom[0].startValue; var startValue=options.dataZoom[0].startValue;
// console.log(options,'option')
// console.log('当前开始时间：',moment(startValue/1000000).format('YYYY-MM-DD HH:mm:ss:sss')) // console.log('当前开始时间：',moment(startValue/1000000).format('YYYY-MM-DD HH:mm:ss:sss'))
// console.log('当前结束时间：',moment(endValue/1000000).format('YYYY-MM-DD HH:mm:ss:sss')) // console.log('当前结束时间：',moment(endValue/1000000).format('YYYY-MM-DD HH:mm:ss:sss'))
// var min1 // var min1
...@@ -247,6 +246,51 @@ class App extends Component { ...@@ -247,6 +246,51 @@ class App extends Component {
}) })
}) })
} }
let flag=false
options.series.map(item=>{
item.data.map(item1=>{
if(startValue <= item1.value[0] && endValue >= item1.value[0]){
if(item1.value[7] === 'Witness'){
flag = true
}
}
})
})
if(flag === true ){
that.interval = setInterval(() => {
fetch(`/api/graph_by_height_and_duration?height=0&duration=${that.state.requestDuration}`,{
method:'GET',
headers:{
'Content-Type':'application/json;charset=UTF-8'
},
})
.then(res =>res.json())
.then((newData) => {
let {Rows, AxisX, Links } = newData.result
let {TopAxisX, BottomAxisX} = AxisX
allRows0Arr = Rows[0]
allRows1Arr = Rows[1]
allRows2Arr = Rows[2]
allTopAxisXArr = TopAxisX
allBottomAxisXArr = BottomAxisX
allLinksArr = Links
newData.result.Rows[0] = allRows0Arr
newData.result.Rows[1] = allRows1Arr
newData.result.Rows[2] = allRows2Arr
newData.result.AxisX.TopAxisX = allTopAxisXArr
newData.result.AxisX.BottomAxisX = allBottomAxisXArr
newData.result.Links = allLinksArr
that.initChart(newData)
})
}, 5000);
}else{
clearInterval(that.interval)
}
}) })
}) })
}) })
...@@ -523,18 +567,6 @@ class App extends Component { ...@@ -523,18 +567,6 @@ class App extends Component {
series: series, series: series,
}; };
// option.series.map(item=>{
// item.data.map(item1=>{
// if(option.dataZoom[0].startValue <= item1.value[0] && option.dataZoom[0].endValue >= item1.value[0]){
// if(item1.value[7] === 'Witness'){
// console.log("重新开始定时器")
// }
// }
// })
// })
// console.log(option.dataZoom[0].startValue,'11')//1658299327000000000 // console.log(option.dataZoom[0].startValue,'11')//1658299327000000000
// console.log(option.dataZoom[0].endValue,'22')//1658299337000000000 // console.log(option.dataZoom[0].endValue,'22')//1658299337000000000
// console.log(option.series,'option') // console.log(option.series,'option')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment