From 0dafdc30611902c91a8ba2158cac05d8afca2edd Mon Sep 17 00:00:00 2001
From: xiaowuler <xiaowuler@163.com>
Date: Wed, 30 Mar 2022 14:21:40 +0800
Subject: [PATCH] commit some codes
---
04.系统编码/Frontend/src/components/RamanLidar.vue | 5 +++--
04.系统编码/Frontend/src/model/heat-map-drawer.ts | 8 ++++----
04.系统编码/Frontend/src/uilts/box-drawer.ts | 4 +++-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue
index c72f6aa..dc7dbf3 100644
--- a/04.系统编码/Frontend/src/components/RamanLidar.vue
+++ b/04.系统编码/Frontend/src/components/RamanLidar.vue
@@ -97,7 +97,7 @@
<div class="picture-container raman-picture-container" v-show="currentTab === 'BingoCloud'">
<div class="picture">
<h2 class="title">云气溶胶分类</h2>
- <canvas id='cloud_sol_chart' style="width: 500px;"></canvas>
+ <canvas id='cloud_sol_chart'></canvas>
</div>
<div class="picture">
<h2 class="title">云层高度</h2>
@@ -175,7 +175,8 @@ export default {
pm10Drawer: null
}
let options = reactive({
- currentTab: 'MWR',
+ // currentTab: 'MWR',
+ currentTab: 'BingoCloud',
currentRegion: 'jiangning',
currentElement: 'PBLH',
currentType: '边界层高度',
diff --git a/04.系统编码/Frontend/src/model/heat-map-drawer.ts b/04.系统编码/Frontend/src/model/heat-map-drawer.ts
index 525784f..d310828 100644
--- a/04.系统编码/Frontend/src/model/heat-map-drawer.ts
+++ b/04.系统编码/Frontend/src/model/heat-map-drawer.ts
@@ -19,8 +19,6 @@ export class HeatMapDrawer{
private readonly paddingBottom: number = 50;
private colorChart: ColorChart = null;
private values: any = null;
- private readonly verticalScaleSpecialCount: number = 1;
- private readonly horizontalScaleSpecialCount: number = 1;
// 垂直刻度
private readonly verticalScaleLine: number = 18;
@@ -145,13 +143,15 @@ export class HeatMapDrawer{
let targetValue = value[infoIndex].value;
let color = this.colorChart.getColor(targetValue);
- value[infoIndex].updateBorderInfo(width, height);
+ value[infoIndex].updateBorderInfo(x, y, width, height);
if (color == null) continue;
this.canvasContext.fillStyle = color;
this.canvasContext.fillRect(x, y, width, height);
}
- // this.values[dataIndex] = this.values[dataIndex].reverse();
+ this.values[dataIndex] = this.values[dataIndex].reverse();
}
+
+ console.log(this.values);
this.createCalc(this.values);
}
diff --git a/04.系统编码/Frontend/src/uilts/box-drawer.ts b/04.系统编码/Frontend/src/uilts/box-drawer.ts
index abce59c..86a21b3 100644
--- a/04.系统编码/Frontend/src/uilts/box-drawer.ts
+++ b/04.系统编码/Frontend/src/uilts/box-drawer.ts
@@ -447,7 +447,9 @@ export class Box implements IBox{
this.id = this.uuid();
}
- updateBorderInfo(width: number, height: number): void{
+ updateBorderInfo(x: number, y: number, width: number, height: number): void{
+ this.x = x;
+ this.y = y;
this.width = width;
this.height = height;
}