From 9d11341ce3d5fa14c3cf265d2aeb7fb06981c1a7 Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Mon, 13 Jun 2022 14:10:37 +0800
Subject: [PATCH] commit
---
.../Frontend/src/components/RamanLidar.vue | 21 ++++++++++++-------
.../Frontend/src/model/heat-map-drawer.ts | 4 ++--
.../Frontend/src/model/high-chart-create.ts | 16 +++++++-------
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue
index 93f03d6..a4f4075 100644
--- a/04.系统编码/Frontend/src/components/RamanLidar.vue
+++ b/04.系统编码/Frontend/src/components/RamanLidar.vue
@@ -502,7 +502,7 @@ export default {
},
{
value: 'backscatter',
- label: '后向散射系数'
+ label: '消光后的后向散射系数'
}]
} else if (options.currentTab === 'aerosol-product') {
@@ -767,7 +767,6 @@ export default {
drawer.close();
drawer = null;
}
-
const cancelRequest = () => {
axiosStore._axiosPromiseCancel.forEach(e => {
e && e()
@@ -790,11 +789,18 @@ export default {
}
const prepareBackscatterColors = () => {
- let colorChart = new ColorChart(['#8F0000', '#E00000', '#FF1F00', '#FF6600', '#FF9900', '#FFE000', '#EBFF14', '#99FF66', '#66FF99', '#1FFFE0',
- '#00E0FF', '#0099FF', '#005CFF', '#0029FF', '#0000E0', '#000099'],
- [-1, -1.25, -1.5, -1.75, -2, -2.25, -2.5, -2.75, -3, -3.25, -3.5, -3.75, -4, -4.25, -4.5, -4.75, -5]
+ // let colorChart = new ColorChart(['#8F0000', '#E00000', '#FF1F00', '#FF6600', '#FF9900', '#FFE000', '#EBFF14', '#99FF66', '#66FF99', '#1FFFE0',
+ // '#00E0FF', '#0099FF', '#005CFF', '#0029FF', '#0000E0', '#000099'],
+ // // [-1, -1.25, -1.5, -1.75, -2, -2.25, -2.5, -2.75, -3, -3.25, -3.5, -3.75, -4, -4.25, -4.5, -4.75, -5]
+ // [0.02, 0.01, 0.008, 0.006, 0.004, 0.002, 0.001, 0.0008, 0.0006, 0.0004, 0.0002, 0.0001, 0.00008, 0.00006, 0.00004, 0.00002, 0.00001]
+ // );
+ let colorChart = new ColorChart(['#990000', '#CC0000', '#FF0000', '#FF3300', '#FF6600', '#FF9900', '#FFCC00', '#FFFF00', '#CCFF33', '#99FF66',
+ '#66FF99', '#33FFCC', '#00FFFF', '#00CCFF', '#0099FF', '#0066FF', '#0033FF', '#0000FF', '#0000CC', '#000099'],
+ [0.1, 0.08, 0.06, 0.04, 0.02, 0.01, 0.008, 0.006, 0.004, 0.002, 0.001, 0.0008, 0.0006, 0.0004, 0.0002, 0.0001, 0.00008, 0.00006, 0.00004, 0.00002, 0.00001],
+ true,
+ true
);
- colorChart.setDefaultColors('#000099', '#8F0000');
+ colorChart.setDefaultColors('#0D1485', '#8F0000');
return colorChart;
}
@@ -1116,7 +1122,8 @@ export default {
let value = r.data[h - 2][i]
if (name == 'backscatter') {
- value = value == null ? NaN : Math.log10(value);
+ value = value == null ? NaN : value;
+ //value = value == null ? NaN : Math.log10(value);
}
if (name == 'singleWatervapor' || name == 'watervapor') {
value = value == null ? NaN : value * 1000;
diff --git a/04.系统编码/Frontend/src/model/heat-map-drawer.ts b/04.系统编码/Frontend/src/model/heat-map-drawer.ts
index d04ecc3..3552949 100644
--- a/04.系统编码/Frontend/src/model/heat-map-drawer.ts
+++ b/04.系统编码/Frontend/src/model/heat-map-drawer.ts
@@ -156,7 +156,7 @@ export class HeatMapDrawer{
}
let targetValue = value[infoIndex].value;
- let color = this.colorChart.getColor(targetValue, this.id);
+ let color = this.colorChart.getColor(targetValue);
value[infoIndex].updateBorderInfo(x, y, width, height);
if (color == null) continue;
this.canvasContext.fillStyle = color;
@@ -339,7 +339,7 @@ export class HeatMapDrawer{
private setTimeDetail(_x: number, startY: number, text: string): void{
// const text = this.values[15][0].time.slice(0, 6);
- this.canvasContext.font = "normal 15px 微软雅黑";
+ this.canvasContext.font = "normal 17px 微软雅黑";
this.canvasContext.fillText(text, _x - this.canvasContext.measureText(text).width / 2, startY + this.verticalScaleLine + this.borderHeight + 38);
this.canvasContext.font = "normal 17px 微软雅黑";
}
diff --git a/04.系统编码/Frontend/src/model/high-chart-create.ts b/04.系统编码/Frontend/src/model/high-chart-create.ts
index ba3faec..78e9105 100644
--- a/04.系统编码/Frontend/src/model/high-chart-create.ts
+++ b/04.系统编码/Frontend/src/model/high-chart-create.ts
@@ -55,7 +55,7 @@ export class HighChartCreate {
type: 'datetime',
labels: {
style: {
- fontSize:'20px'
+ fontSize:'18px'
},
formatter: function () {
return Highcharts.dateFormat('%d日%H时', this.value);
@@ -81,13 +81,14 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '18px',
- fontFamily: '微软雅黑'
+ fontSize: '20px',
+ fontFamily: '微软雅黑',
+ fontWeight: 'normal'
}
},
labels: {
style: {
- fontSize:'20px'
+ fontSize:'18px',
},
},
max: max,
@@ -123,14 +124,15 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '18px',
- fontFamily: '微软雅黑'
+ fontSize: '20px',
+ fontFamily: '微软雅黑',
+ fontWeight: 'normal'
}
},
labels: {
y: 8,
style: {
- fontSize:'20px'
+ fontSize:'18px'
},
},
max: max,