|
@@ -80,7 +80,6 @@ TimePanel.prototype={
|
|
this.buildAxisConfig(utils.dateAdd(startTime,null,diff*start),utils.dateAdd(startTime,null,diff*end))
|
|
this.buildAxisConfig(utils.dateAdd(startTime,null,diff*start),utils.dateAdd(startTime,null,diff*end))
|
|
this.drawAxis()
|
|
this.drawAxis()
|
|
//通知父组件重新加载数据
|
|
//通知父组件重新加载数据
|
|
- console.log('通知父组件重新加载数据')
|
|
|
|
let loadStart=new Date(this.axisConfig.startTime),loadEnd=new Date(this.axisConfig.endTime)
|
|
let loadStart=new Date(this.axisConfig.startTime),loadEnd=new Date(this.axisConfig.endTime)
|
|
this.parent.groupLoad(loadStart,loadEnd,false,{showTip:true,showMask:true})
|
|
this.parent.groupLoad(loadStart,loadEnd,false,{showTip:true,showMask:true})
|
|
},
|
|
},
|
|
@@ -298,7 +297,7 @@ TimePanel.prototype={
|
|
ry=upRoller.shape.y
|
|
ry=upRoller.shape.y
|
|
dwnry=downRoller.shape.y
|
|
dwnry=downRoller.shape.y
|
|
msy=event.offsetY
|
|
msy=event.offsetY
|
|
- slidey=(this.zoomComp['slideBlock']).position[1]
|
|
|
|
|
|
+ slidey=(this.zoomComp['slideBlock']).y
|
|
this.onEvent('mousemove',[upRoller,blockFloor,slideGroove],(event)=>{
|
|
this.onEvent('mousemove',[upRoller,blockFloor,slideGroove],(event)=>{
|
|
let mvh=event.offsetY-msy
|
|
let mvh=event.offsetY-msy
|
|
let nslidey=slidey+mvh
|
|
let nslidey=slidey+mvh
|
|
@@ -322,7 +321,7 @@ TimePanel.prototype={
|
|
|
|
|
|
slideStrip.on('mousedown',(event)=>{
|
|
slideStrip.on('mousedown',(event)=>{
|
|
msy=event.offsetY
|
|
msy=event.offsetY
|
|
- slidey=(this.zoomComp['slideBlock']).position[1]
|
|
|
|
|
|
+ slidey=(this.zoomComp['slideBlock']).y
|
|
let blockH=Math.abs(downRoller.shape.y-upRoller.shape.y)
|
|
let blockH=Math.abs(downRoller.shape.y-upRoller.shape.y)
|
|
this.onEvent('mousemove',[slideStrip,blockFloor,this.plotGrp],(event)=>{
|
|
this.onEvent('mousemove',[slideStrip,blockFloor,this.plotGrp],(event)=>{
|
|
|
|
|
|
@@ -367,14 +366,22 @@ TimePanel.prototype={
|
|
|
|
|
|
//计算起止位百分比
|
|
//计算起止位百分比
|
|
let blockY=(this.zoomComp['slideBlock']).y
|
|
let blockY=(this.zoomComp['slideBlock']).y
|
|
- this.zoomComp['config'].start=blockY/this.zoomComp['config'].zoomH
|
|
|
|
- this.zoomComp['config'].end=(blockY+downRoller.shape.y)/this.zoomComp['config'].zoomH
|
|
|
|
|
|
+ let {start,end,zoomH}=this.zoomComp['config']
|
|
|
|
+ let startTmp=blockY/zoomH
|
|
|
|
+ let endTmp=(blockY+downRoller.shape.y)/zoomH
|
|
|
|
+
|
|
|
|
+ if(startTmp!=start || endTmp!=end){ //滑块位置有变动
|
|
|
|
+ this.zoomComp['config'].start=startTmp
|
|
|
|
+ this.zoomComp['config'].end=endTmp
|
|
|
|
+ this.drawPanel()
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//可能会多次触发,要兼容
|
|
//可能会多次触发,要兼容
|
|
//console.log(event)
|
|
//console.log(event)
|
|
- this.drawPanel()
|
|
|
|
|
|
+
|
|
})
|
|
})
|
|
|
|
|
|
},
|
|
},
|