From fd5bcc6e5d439c21e3fd90417f9106b64302a4c6 Mon Sep 17 00:00:00 2001 From: xiaowuler Date: Fri, 21 Jan 2022 14:14:04 +0800 Subject: [PATCH] commit some codes --- .../src/components/MicrowaveRadiation.vue | 21 ++++++++++--------- .../Frontend/src/uilts/box-drawer.ts | 13 +++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue b/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue index 94ded69..08fdfd2 100644 --- a/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue +++ b/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue @@ -312,15 +312,15 @@ options.apiTimeLength = apiTimeLength; options.currentElement = element; options.onPitchTime = onPitchTime - initTimeLine() + initTimeLine(reloadData) // if (options.currentTab === 'MWR') // activeContrastImage(); // else // activeImage(moment(options.times[options.index].date).hour(), moment(options.times[options.index].date).minute()); if (element === 'six-minute') { setTimeout(() => { - changeColor() - },0) + changeColor() + },0) } } @@ -509,8 +509,8 @@ options.date = moment(options.date).add(-1, 'day').format('YYYY-MM-DD'); options.titleStartTime = moment(options.date).hour(parseInt(options.currentHour) + options.apiTimeLength).minute(options.currentElement === 'six-minute' ? 36 : 30).format('YYYY-MM-DD HH:mm:ss'); options.titleEndTime = moment(options.date).hour(parseInt(options.currentHour)).minute(options.currentElement === 'six-minute' ? 30 : 0).format('YYYY-MM-DD HH:mm:ss'); - reloadQualityComparison() - reloadQualityInterpolation() + options.currentTime = options.titleEndTime; + reloadData(); } //下一天 @@ -518,8 +518,8 @@ options.date = moment(options.date).add(1, 'day').format('YYYY-MM-DD'); options.titleStartTime = moment(options.date).hour(parseInt(options.currentHour) + options.apiTimeLength).minute(options.currentElement === 'six-minute' ? 36 : 30).format('YYYY-MM-DD HH:mm:ss'); options.titleEndTime = moment(options.date).hour(parseInt(options.currentHour)).minute(options.currentElement === 'six-minute' ? 30 : 0).format('YYYY-MM-DD HH:mm:ss'); - reloadQualityComparison() - reloadQualityInterpolation() + options.currentTime = options.titleEndTime; + reloadData(); } // const onPrevImgClick = () => { @@ -668,8 +668,9 @@ // 重新加载质控对比数据 const reloadQualityComparison = () => { - const startTime = moment(options.currentTime).add(options.apiTimeLength, 'h').add(options.apiTimeInterval, 'm').format('YYYY-MM-DD HH:mm:00'); - const params = prepareApiParams(401, startTime, options.titleEndTime); + const startTime = moment(options.currentTime).add(options.apiTimeLength, 'h').add(options.apiTimeInterval, 'm').format('YYYY-MM-DD HH:mm:00'); + const params = prepareApiParams(401, startTime, options.titleEndTime); + console.log(params); get('/njplatform/radardata/getOriginRangeData',params,'http://rdp.nagr.com.cn:18080').then((response: any)=> { clearBoxDrawer(drawers.originalDrawer); clearBoxDrawer(drawers.abnormalDrawer); @@ -689,7 +690,7 @@ drawers.originalDrawer = new BoxDrawer(1500, 500, prepareTmpOriginalColors(), response.data, 'original-data-canvas'); drawers.abnormalDrawer = new BoxDrawer(1500, 500, prepareTmpOriginalColors(), response.data, 'abnormal-canvas'); options.contrast.noQCImgUrl = drawers.originalDrawer.base64Image; - options.contrast.checkImgUrl = drawers.abnormalDrawer.base64Image + options.contrast.checkImgUrl = drawers.abnormalDrawer.base64Image; }) } diff --git a/04.系统编码/Frontend/src/uilts/box-drawer.ts b/04.系统编码/Frontend/src/uilts/box-drawer.ts index 083ce44..a0eeaf4 100644 --- a/04.系统编码/Frontend/src/uilts/box-drawer.ts +++ b/04.系统编码/Frontend/src/uilts/box-drawer.ts @@ -195,9 +195,12 @@ export class BoxDrawer{ this.targetCanvasContext.putImageData(imgData, 0, 0); } + private _onMouseMove = this.onMouseMove.bind(this); + private _onMouseOut = this.onMouseOut.bind(this) + private bindMoveEvent(): void{ - this.targetCanvas.addEventListener('mousemove', this.onMouseMove.bind(this)); - this.targetCanvas.addEventListener('mouseout', this.onMouseOut.bind(this)); + this.targetCanvas.addEventListener('mousemove', this._onMouseMove); + this.targetCanvas.addEventListener('mouseout', this._onMouseOut); } private onMouseOut() : void{ @@ -219,14 +222,14 @@ export class BoxDrawer{ this.copyCanvas(); this.box = null; } - + box.show(this.targetCanvasContext); this.box = box; } public close(): void{ - this.targetCanvas.removeEventListener('mousemove', this.onMouseMove.bind(this)); - this.targetCanvas.removeEventListener('mouseout', this.onMouseOut.bind(this)); + this.targetCanvas.removeEventListener('mousemove', this._onMouseMove); + this.targetCanvas.removeEventListener('mouseout', this._onMouseOut); } private fillBackground(): void{