提交

src/App.js

@@ -25,6 +25,8 @@ class App extends Component {
         // endblockOld:0,
         // count:0,
         // endCount:0,
+        altitude:0,
+        datazoom:false,
     }
     inputChangeValue(){
         let val=this.refs.inputvalue.value;
@@ -232,6 +234,9 @@ class App extends Component {
                                         }
                                         if(item2.label!==undefined){
                                             startBlock=item2.label.formatter
+                                            that.setState({
+                                                altitude:startBlock
+                                            })
                                             endBlock=item2.label.formatter
                                             min3=item2.xAxis
                                         }
@@ -248,6 +253,9 @@ class App extends Component {
                                             min = min2 
                                             if(item2.label !== undefined ){
                                                 startBlock=item2.label.formatter
+                                                that.setState({
+                                                    altitude:startBlock
+                                                })
                                                 min3=item2.xAxis
                                             }
                                         }
@@ -264,6 +272,7 @@ class App extends Component {
                         })
                     })
                     if(params.start === 0){
+                        
                         myChart.showLoading()
                         console.log(startBlock,'startBlock')
 
@@ -280,6 +289,7 @@ class App extends Component {
                         //     })
                         // }
                         that.setState({
+                            datazoom:true,
                             // requestDuration:-100,
                             duration:-10,
                         },()=>{
@@ -517,7 +527,11 @@ class App extends Component {
             mintime=moment(data.result.AxisX.BlockTime/1000000)
             mintime.subtract(-(this.state.duration),'seconds').format('YYYY-MM-DD HH:mm:ss')
             moment(data.result.AxisX.BlockTime/1000000).format('YYYY-MM-DD HH:mm:ss')
+           
         }   
+            // console.log(this.state.duration,'duration' , '--------','requestDuration：',this.state.requestDuration)
+            // console.log(moment(data.result.AxisX.BlockTime/1000000).format('YYYY-MM-DD HH:mm:ss'),'maxtime')
+            // console.log(mintime.subtract(-(this.state.duration),'seconds').format('YYYY-MM-DD HH:mm:ss'),'mintime')
         if(this.state.duration>0){
             mintime=moment(data.result.AxisX.BlockTime/1000000);
             maxtime=moment(data.result.AxisX.BlockTime/1000000)
@@ -663,7 +677,9 @@ class App extends Component {
                         })
                     },
                     max:this.state.duration < 0 ? maxtime.unix()*1000000000 :  maxtime.add(100,'second').unix()*1000000000,
-                    min:this.state.duration <0 ? mintime.subtract(100,'second').unix()*1000000000 : mintime.unix()*1000000000,
+                    min:this.state.duration <0 ? mintime.subtract(-(this.state.inputtime),'second').unix()*1000000000 : mintime.unix()*1000000000,
+                    // max:this.state.requestDuration < 0 ? maxtime.unix()*1000000000 :  maxtime.add(100,'second').unix()*1000000000,
+                    // min:this.state.requestDuration <0 ? mintime.subtract(100,'second').unix()*1000000000 : mintime.unix()*1000000000,
                     
                     axisLine:{
                         show:true,
@@ -724,6 +740,9 @@ class App extends Component {
             startText:moment((option.xAxis[0].min)/1000000).format('YYYY-MM-DD HH:mm:ss'),
             endText:moment((option.xAxis[0].max)/1000000).format('YYYY-MM-DD HH:mm:ss')
         })
+        console.log(option.xAxis[0].min,'min',option.xAxis[0].max,'max')
+        console.log(option.xAxis,'aa')
+        console.log(option.xAxis[0],'aa00')
         myChart.setOption(option,true);
         this.extension(myChart);
     }
@@ -800,6 +819,7 @@ class App extends Component {
             }
         })
     }
+    
     render() {
         const {startText,endText}=this.state
         return (
@@ -820,7 +840,8 @@ class App extends Component {
                         <input ref="inputtime" defaultValue='-100' onChange={()=>this.inputChangeTime()} style={{width:'30%',textAlign:'center'}}/>
                         <button onClick={()=>this.getInputTime()} style={{cursor:'pointer'}}>切换时间</button>
                     </div> */}
-                    <div>当前高度：{this.state.inputvalue}</div>
+                    {/* <div>当前高度：{this.state.inputvalue}</div> */}
+                    <div>当前高度：{this.state.inputvalue == 0 && this.state.datazoom == false? `${0}` :  this.state.inputvalue!= 0 && this.state.datazoom ==false? `${this.state.inputvalue}` : this.state.datazoom == true ? `${this.state.altitude}` :`${this.state.inputvalue}` }</div>
                     <div>当前时间：{this.state.inputtime == -100 ? `${-100}` : this.state.inputtime}</div>
                 </div>
                 <div style={{position:'relative'}}>