Date: Mon, 13 Jun 2022 14:10:37 +0800
Subject: [PATCH 02/10] commit
---
.../Frontend/src/components/RamanLidar.vue | 20 +++++++++++++------
.../Frontend/src/model/heat-map-drawer.ts | 4 ++--
.../Frontend/src/model/high-chart-create.ts | 16 ++++++++-------
3 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue
index 93f03d6..f90fbab 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') {
@@ -790,11 +790,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 +1123,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,
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 03/10] 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,
From 4e74896571d0cd709f2d0cb3e080323571c45fa6 Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Mon, 13 Jun 2022 15:16:58 +0800
Subject: [PATCH 04/10] commit
---
04.系统编码/Frontend/src/components/RamanLidar.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue
index a4f4075..e6a5443 100644
--- a/04.系统编码/Frontend/src/components/RamanLidar.vue
+++ b/04.系统编码/Frontend/src/components/RamanLidar.vue
@@ -771,6 +771,7 @@ export default {
axiosStore._axiosPromiseCancel.forEach(e => {
e && e()
});
+
axiosStore._axiosPromiseCancel = [];
}
From 0a619b7a46c88919fa29d19206799622cd408b2b Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Mon, 13 Jun 2022 17:40:32 +0800
Subject: [PATCH 05/10] commit
---
04.系统编码/Frontend/src/components/RamanLidar.vue | 2 +-
04.系统编码/Frontend/src/model/high-chart-create.ts | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue
index e6a5443..720a12d 100644
--- a/04.系统编码/Frontend/src/components/RamanLidar.vue
+++ b/04.系统编码/Frontend/src/components/RamanLidar.vue
@@ -771,7 +771,7 @@ export default {
axiosStore._axiosPromiseCancel.forEach(e => {
e && e()
});
-
+
axiosStore._axiosPromiseCancel = [];
}
diff --git a/04.系统编码/Frontend/src/model/high-chart-create.ts b/04.系统编码/Frontend/src/model/high-chart-create.ts
index 78e9105..1a6293e 100644
--- a/04.系统编码/Frontend/src/model/high-chart-create.ts
+++ b/04.系统编码/Frontend/src/model/high-chart-create.ts
@@ -124,9 +124,9 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '20px',
+ fontSize: '22px',
fontFamily: '微软雅黑',
- fontWeight: 'normal'
+ fontWeight: '500'
}
},
labels: {
@@ -157,8 +157,8 @@ export class HighChartCreate {
y: 0,
enabled: enabled,
itemStyle : {
- 'fontSize' : '18px',
- 'fontWeight' : 'normal'
+ fontSize: '22px',
+ fontWeight : '500'
}
}
}
From 69969608933eda47d1e7fd74b83977c38b5cccbc Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Wed, 15 Jun 2022 14:14:27 +0800
Subject: [PATCH 06/10] commit
---
.../src/components/DecisionSupport.vue | 17 ++-
.../src/components/MicrowaveRadiation.vue | 134 +++++++++---------
.../Frontend/src/components/RamanLidar.vue | 30 ++--
.../Frontend/src/model/high-chart-create.ts | 23 ++-
4 files changed, 115 insertions(+), 89 deletions(-)
diff --git a/04.系统编码/Frontend/src/components/DecisionSupport.vue b/04.系统编码/Frontend/src/components/DecisionSupport.vue
index 4a5adb9..4158959 100644
--- a/04.系统编码/Frontend/src/components/DecisionSupport.vue
+++ b/04.系统编码/Frontend/src/components/DecisionSupport.vue
@@ -77,9 +77,8 @@
@@ -455,7 +454,6 @@ export default {
height: auto;
display: block;
position: relative;
-
.el-image {
width: 100%;
height: auto;
@@ -487,11 +485,19 @@ export default {
}
.raman-picture-container {
- margin: 0 auto;
-
+ width: 100%;
+ height: 90%;
.picture {
width: 100%;
height: 100%;
+ display: flex;
+ align-items: center;
+ :deep(.loadingStatus) {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding-right: 20px;
+ }
}
}
@@ -510,5 +516,6 @@ export default {
}
}
+
}
diff --git a/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue b/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue
index 50c304f..0d69f94 100644
--- a/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue
+++ b/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue
@@ -151,55 +151,55 @@
-
-
+
+
-
-
+
@@ -338,7 +338,7 @@ export default {
//垂直廓线温度数据图
const verticalProfileTempInit = () => {
creates.verticalProfileTemp = new HighChartCreate('verticalProfileTemp');
- creates.verticalProfileTemp.setChart(true);
+ creates.verticalProfileTemp.setChart(true, 'line', 500, 500);
creates.verticalProfileTemp.setXAxis('高度(km)', false);
creates.verticalProfileTemp.setYAxis('温度T(℃)', 10, -40, 10, 6);
creates.verticalProfileTemp.setLegend();
@@ -350,7 +350,7 @@ export default {
//垂直廓线水汽密度数据图
const verticalProfileVaporDensityInit = () => {
creates.verticalProfileVaporDensity = new HighChartCreate('verticalProfileVaporDensity');
- creates.verticalProfileVaporDensity.setChart(true);
+ creates.verticalProfileVaporDensity.setChart(true, 'line', 500, 500);
creates.verticalProfileVaporDensity.setXAxis('高度(km)', false);
creates.verticalProfileVaporDensity.setYAxis('水汽密度q(g/kg)', 10, 0, 1, 11);
creates.verticalProfileVaporDensity.setLegend();
@@ -362,7 +362,7 @@ export default {
//垂直廓线相对湿度数据图
const verticalProfileRelativeHumidityInit = () => {
creates.verticalProfileRelativeHumidity = new HighChartCreate('verticalProfileRelativeHumidity');
- creates.verticalProfileRelativeHumidity.setChart(true);
+ creates.verticalProfileRelativeHumidity.setChart(true, 'line', 500, 500);
creates.verticalProfileRelativeHumidity.setXAxis('高度(km)', false);
creates.verticalProfileRelativeHumidity.setYAxis('相对湿度RH(%)', 100, 0, 10, 6);
creates.verticalProfileRelativeHumidity.setLegend();
@@ -373,7 +373,7 @@ export default {
const convectiveIndexProfileTimeChartInitCAPE = () => {
creates.convectiveIndexProfileTimeChartCAPE = new HighChartCreate('convectiveHighChartCAPE');
- creates.convectiveIndexProfileTimeChartCAPE.setChart();
+ creates.convectiveIndexProfileTimeChartCAPE.setChart(false, 'line', 750, 400);
creates.convectiveIndexProfileTimeChartCAPE.setXAxis('时间(时/分)', false);
creates.convectiveIndexProfileTimeChartCAPE.setYAxis('CAPE(J/kg)');
creates.convectiveIndexProfileTimeChartCAPE.setLegend();
@@ -384,7 +384,7 @@ export default {
const convectiveIndexProfileTimeChartInitCIN = () => {
creates.convectiveIndexProfileTimeChartCIN = new HighChartCreate('convectiveHighChartCIN');
- creates.convectiveIndexProfileTimeChartCIN.setChart();
+ creates.convectiveIndexProfileTimeChartCIN.setChart(false, 'line', 750, 400);
creates.convectiveIndexProfileTimeChartCIN.setXAxis('时间(时/分)', false);
creates.convectiveIndexProfileTimeChartCIN.setYAxis('CIN(J/kg)');
creates.convectiveIndexProfileTimeChartCIN.setLegend();
@@ -396,7 +396,7 @@ export default {
//绘制K指数
const kIndexChartInit = () => {
creates.kIndexChart = new HighChartCreate('kIndexChart');
- creates.kIndexChart.setChart();
+ creates.kIndexChart.setChart(false, 'line', 750, 400);
creates.kIndexChart.setXAxis('时间(时/分)', false);
creates.kIndexChart.setYAxis('K(℃)');
creates.kIndexChart.setLegend();
@@ -408,7 +408,7 @@ export default {
//绘制沙式指数
const sandIndexInit = () => {
creates.sandIndex = new HighChartCreate('sandIndexChart');
- creates.sandIndex.setChart();
+ creates.sandIndex.setChart(false, 'line', 750, 400);
creates.sandIndex.setXAxis('时间(时/分)', false);
creates.sandIndex.setYAxis('SI(℃)');
creates.sandIndex.setLegend();
@@ -420,7 +420,7 @@ export default {
//绘制LCl气压
const airPressureInit = () => {
creates.airPressure = new HighChartCreate('airPressureChart');
- creates.airPressure.setChart();
+ creates.airPressure.setChart(false, 'line', 750, 400);
creates.airPressure.setXAxis('时间(时/分)', false);
creates.airPressure.setYAxis('LCL气压(hPa)');
creates.airPressure.setLegend();
@@ -432,7 +432,7 @@ export default {
//绘制850hpa和500hpa温差
const deltaTInit = () => {
creates.deltaT = new HighChartCreate('deltaTChart');
- creates.deltaT.setChart();
+ creates.deltaT.setChart(false, 'line', 750, 400);
creates.deltaT.setXAxis('时间(时/分)', false);
creates.deltaT.setYAxis('deltaT(℃)');
creates.deltaT.setLegend();
@@ -444,7 +444,7 @@ export default {
//绘制0度层高度
const zeroHeightInit = () => {
creates.zeroHeight = new HighChartCreate('zeroHeightChart');
- creates.zeroHeight.setChart();
+ creates.zeroHeight.setChart(false, 'line', 750, 400);
creates.zeroHeight.setXAxis('时间(时/分)', false);
creates.zeroHeight.setYAxis('hgt_0(m)');
creates.zeroHeight.setLegend();
@@ -456,7 +456,7 @@ export default {
//绘制-20度层高度
const NegativeTwentyHeightInit = () => {
creates.NegativeTwentyHeight = new HighChartCreate('NegativeTwentyHeightChart');
- creates.NegativeTwentyHeight.setChart();
+ creates.NegativeTwentyHeight.setChart(false, 'line', 750, 400);
creates.NegativeTwentyHeight.setXAxis('时间(时/分)', false);
creates.NegativeTwentyHeight.setYAxis('hgt_-20(m)');
creates.NegativeTwentyHeight.setLegend();
@@ -963,6 +963,8 @@ export default {
.main {
.container {
//width: 100%;
+
+
.verticalProfile {
width: 100%;
height: 100%;
@@ -971,13 +973,15 @@ export default {
align-items: center;
.verticalProfile-picture {
- position: relative;
-
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
.verticalProfileTitle {
- position: absolute;
- font-size: 0.22rem;
- left: 1.77rem;
- top: -0.8rem;
+ padding-bottom: 30px;
+
}
}
}
@@ -987,40 +991,39 @@ export default {
}
.contrast-picture-container {
- width: calc(~"100% - 2.5rem");
- margin: 0 auto;
- //width: 100%;
+ width: 100% !important;
+ height: 100%;
display: flex;
flex-direction: row;
flex-wrap: wrap;
- // justify-content: space-between;
- .special-picture {
- height: 100%!important;
- .title {
- top: 80px!important;
- }
- }
.picture {
- width: 45%;
- height: 45%;
- position: relative;
+ width: 48%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+ align-items: center;
.title {
- width: 100%;
- font-size: 0.22rem;
- position: absolute;
- left: 3.10rem;
- top: 0;
z-index: 1000;
}
}
+
+ }
+ .shiXu {
+ overflow-y: scroll;
+ }
+ .T-logP {
+ width: 100% !important;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
.T-logpImg {
- transform: scale(0.5);
+ transform: scale(0.5,0.4);
}
}
.raman-picture-container {
- //width: calc(~"100% - 1rem");
margin: 0 auto;
#original-data-canvas /*#abnormal-canvas*/, #interpolate-canvas {
}
@@ -1039,25 +1042,20 @@ export default {
}
}
}
- //.BPPicture {
- // width: 100% !important;
- // height: 100%!important;
- // position: relative;
- //
- //}
- #BP-temp, #BP-relative-humidity, #BP-vapor-density {
- transform: scale(1, 1.0) translateX(-42px);
- }
- .shiXu {
- overflow-y: scroll;
+ .BPPicture {
width: 100% !important;
- }
+ height: 100%!important;
+ //position: relative;
+ display: flex;
+ justify-content: center;
- .shiXuBP {
- flex-flow: column;
- align-content: space-around !important;
}
+ //#BP-temp, #BP-relative-humidity, #BP-vapor-density {
+ //transform: scale(1, 1.0) translateX(-42px);
+ //}
+
+
.picture-MWR {
width: 100%;
diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue
index 720a12d..f4c073b 100644
--- a/04.系统编码/Frontend/src/components/RamanLidar.vue
+++ b/04.系统编码/Frontend/src/components/RamanLidar.vue
@@ -92,10 +92,10 @@
-
+
@@ -117,7 +117,7 @@
@@ -128,7 +128,7 @@
@@ -181,7 +181,7 @@
@@ -1630,6 +1630,9 @@ export default {
.raman-picture-container {
//width: calc(~"100% - 1rem");
+ display: flex;
+ justify-content: center;
+ align-items: center;
margin: 0 auto;
.special-picture {
@@ -1644,15 +1647,22 @@ export default {
.picture {
width: 100%;
height: 100%;
+ display: flex;
+ align-items: center;
//position: relative;
//margin-top: 30px;
-
+ :deep(.loadingStatus) {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding-top: 80px;
+ }
#watervapor_single_chart {
- transform: translateX(6%) translateY(50px);
+ //transform: translateX(6%) translateY(50px);
}
#extinction_optics_chart {
- transform: translateX(6%) translateY(50px);
+ //transform: translateX(6%) translateY(50px);
}
#pm2_5_chart {
@@ -1664,11 +1674,11 @@ export default {
}
#backscatter_chart {
- transform: translateX(6%) translateY(50px);
+ //transform: translateX(6%) translateY(50px);
}
#cloud_sol_chart {
- transform: translateX(6%) translateY(50px);
+ //transform: translateX(6%) translateY(50px);
}
//#extinction_chart-before,
diff --git a/04.系统编码/Frontend/src/model/high-chart-create.ts b/04.系统编码/Frontend/src/model/high-chart-create.ts
index 1a6293e..5058170 100644
--- a/04.系统编码/Frontend/src/model/high-chart-create.ts
+++ b/04.系统编码/Frontend/src/model/high-chart-create.ts
@@ -36,10 +36,15 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '18px',
+ fontSize: '20px',
fontFamily: '微软雅黑'
}
},
+ labels: {
+ style: {
+ fontSize:'20px',
+ },
+ },
categories: [],
showLastLabel: true,
showFirstLabel: true,
@@ -55,7 +60,7 @@ export class HighChartCreate {
type: 'datetime',
labels: {
style: {
- fontSize:'18px'
+ fontSize:'20px'
},
formatter: function () {
return Highcharts.dateFormat('%d日%H时', this.value);
@@ -105,10 +110,16 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '18px',
- fontFamily: '微软雅黑'
+ fontSize: '20px',
+ fontFamily: '微软雅黑',
+ fontWeight: 'normal'
}
},
+ labels: {
+ style: {
+ fontSize:'19px'
+ },
+ },
max: max,
min: min,
tickInterval: tickInterval,
@@ -124,7 +135,7 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '22px',
+ fontSize: '20px',
fontFamily: '微软雅黑',
fontWeight: '500'
}
@@ -157,7 +168,7 @@ export class HighChartCreate {
y: 0,
enabled: enabled,
itemStyle : {
- fontSize: '22px',
+ fontSize: '20px',
fontWeight : '500'
}
}
From 85535dd97077c2a933d6094eb329cfa4a5885658 Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Thu, 16 Jun 2022 16:35:02 +0800
Subject: [PATCH 07/10] commit
---
04.系统编码/Frontend/src/components/RamanLidar.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue
index f4c073b..1bac871 100644
--- a/04.系统编码/Frontend/src/components/RamanLidar.vue
+++ b/04.系统编码/Frontend/src/components/RamanLidar.vue
@@ -1523,6 +1523,7 @@ export default {
locate: options.currentRegion
}
}
+
return {
date: time,
var: variableName,
From 8e92013dea16795965bdb262632c8dd0c65a5c2e Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Fri, 17 Jun 2022 09:23:31 +0800
Subject: [PATCH 08/10] commit
---
.../Frontend/src/components/DecisionSupport.vue | 1 +
04.系统编码/Frontend/src/model/high-chart-create.ts | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/04.系统编码/Frontend/src/components/DecisionSupport.vue b/04.系统编码/Frontend/src/components/DecisionSupport.vue
index 4158959..0ffe303 100644
--- a/04.系统编码/Frontend/src/components/DecisionSupport.vue
+++ b/04.系统编码/Frontend/src/components/DecisionSupport.vue
@@ -485,6 +485,7 @@ export default {
}
.raman-picture-container {
+ padding-top: 20px;
width: 100%;
height: 90%;
.picture {
diff --git a/04.系统编码/Frontend/src/model/high-chart-create.ts b/04.系统编码/Frontend/src/model/high-chart-create.ts
index 5058170..a3778ef 100644
--- a/04.系统编码/Frontend/src/model/high-chart-create.ts
+++ b/04.系统编码/Frontend/src/model/high-chart-create.ts
@@ -86,9 +86,9 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '20px',
+ fontSize: '22px',
fontFamily: '微软雅黑',
- fontWeight: 'normal'
+ fontWeight: '300'
}
},
labels: {
@@ -135,9 +135,9 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '20px',
+ fontSize: '22px',
fontFamily: '微软雅黑',
- fontWeight: '500'
+ fontWeight: '300'
}
},
labels: {
From a16a303835ad59d7d63b4f8dda3f837e62974e57 Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Fri, 17 Jun 2022 10:42:37 +0800
Subject: [PATCH 09/10] commit
---
.../Frontend/src/model/high-chart-create.ts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/04.系统编码/Frontend/src/model/high-chart-create.ts b/04.系统编码/Frontend/src/model/high-chart-create.ts
index a3778ef..0addd7c 100644
--- a/04.系统编码/Frontend/src/model/high-chart-create.ts
+++ b/04.系统编码/Frontend/src/model/high-chart-create.ts
@@ -93,7 +93,7 @@ export class HighChartCreate {
},
labels: {
style: {
- fontSize:'18px',
+ fontSize:'20px',
},
},
max: max,
@@ -110,14 +110,14 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '20px',
+ fontSize: '22px',
fontFamily: '微软雅黑',
- fontWeight: 'normal'
+ fontWeight: '400'
}
},
labels: {
style: {
- fontSize:'19px'
+ fontSize:'18px'
},
},
max: max,
@@ -143,7 +143,7 @@ export class HighChartCreate {
labels: {
y: 8,
style: {
- fontSize:'18px'
+ fontSize:'20px'
},
},
max: max,
@@ -169,7 +169,7 @@ export class HighChartCreate {
enabled: enabled,
itemStyle : {
fontSize: '20px',
- fontWeight : '500'
+ fontWeight: '300'
}
}
}
From eb8389e02c421bac919b296d8d9ea644a9cdfe67 Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Fri, 17 Jun 2022 11:10:39 +0800
Subject: [PATCH 10/10] commit
---
04.系统编码/Frontend/src/model/high-chart-create.ts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/04.系统编码/Frontend/src/model/high-chart-create.ts b/04.系统编码/Frontend/src/model/high-chart-create.ts
index 0addd7c..70c6692 100644
--- a/04.系统编码/Frontend/src/model/high-chart-create.ts
+++ b/04.系统编码/Frontend/src/model/high-chart-create.ts
@@ -86,7 +86,7 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '22px',
+ fontSize: '20px',
fontFamily: '微软雅黑',
fontWeight: '300'
}
@@ -110,14 +110,14 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '22px',
+ fontSize: '20px',
fontFamily: '微软雅黑',
fontWeight: '400'
}
},
labels: {
style: {
- fontSize:'18px'
+ fontSize: '18px'
},
},
max: max,
@@ -135,7 +135,7 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '22px',
+ fontSize: '20px',
fontFamily: '微软雅黑',
fontWeight: '300'
}