-
质控前
+
质控前
{
axiosStore._axiosPromiseCancel.forEach(e => {
e && e()
});
+
axiosStore._axiosPromiseCancel = [];
}
@@ -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;
@@ -1515,6 +1523,7 @@ export default {
locate: options.currentRegion
}
}
+
return {
date: time,
var: variableName,
@@ -1622,9 +1631,15 @@ export default {
.raman-picture-container {
//width: calc(~"100% - 1rem");
+ display: flex;
+ justify-content: center;
+ align-items: center;
margin: 0 auto;
.special-picture {
+ display: flex;
+ flex-flow: column;
+ justify-content: center;
//:deep(.el-loading-mask) {
// top: 64px !important;
//}
@@ -1633,15 +1648,22 @@ export default {
.picture {
width: 100%;
height: 100%;
- position: relative;
+ 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 {
@@ -1653,26 +1675,27 @@ 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,
- #extinction_chart-after,
- #watervapor_chart-before,
- #watervapor_chart-after {
- transform: translateY(50px);
- }
+ //#extinction_chart-before,
+ //#extinction_chart-after,
+ //#watervapor_chart-before,
+ //#watervapor_chart-after {
+ // transform: translateY(50px);
+ //}
.title {
- width: 100%;
- font-size: 0.22rem;
- position: absolute;
- left: 3.5rem;
- top: 0.30rem;
+ padding-top: 70px;
+ //width: 100%;
+ //font-size: 0.22rem;
+ //position: absolute;
+ //left: 350px;
+ //top: 30px;
z-index: 100;
}
diff --git a/04.系统编码/Frontend/src/model/heat-map-drawer.ts b/04.系统编码/Frontend/src/model/heat-map-drawer.ts
index fb05d02..2e67815 100644
--- a/04.系统编码/Frontend/src/model/heat-map-drawer.ts
+++ b/04.系统编码/Frontend/src/model/heat-map-drawer.ts
@@ -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 e614d59..70c6692 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,
@@ -81,13 +86,14 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '18px',
- fontFamily: '微软雅黑'
+ fontSize: '20px',
+ fontFamily: '微软雅黑',
+ fontWeight: '300'
}
},
labels: {
style: {
- fontSize:'20px'
+ fontSize:'20px',
},
},
max: max,
@@ -104,10 +110,16 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '18px',
- fontFamily: '微软雅黑'
+ fontSize: '20px',
+ fontFamily: '微软雅黑',
+ fontWeight: '400'
}
},
+ labels: {
+ style: {
+ fontSize: '18px'
+ },
+ },
max: max,
min: min,
tickInterval: tickInterval,
@@ -123,8 +135,9 @@ export class HighChartCreate {
text: text,
style: {
color: '#000000',
- fontSize: '18px',
- fontFamily: '微软雅黑'
+ fontSize: '20px',
+ fontFamily: '微软雅黑',
+ fontWeight: '300'
}
},
labels: {
@@ -153,7 +166,11 @@ export class HighChartCreate {
floating: true,
x: 20,
y: 0,
- enabled: enabled
+ enabled: enabled,
+ itemStyle : {
+ fontSize: '20px',
+ fontWeight: '300'
+ }
}
}