|
@@ -161,7 +161,7 @@ export default defineComponent({
|
|
active: "",
|
|
active: "",
|
|
activeItem: activeItem,
|
|
activeItem: activeItem,
|
|
titleList: titleList,
|
|
titleList: titleList,
|
|
- query: query,
|
|
|
|
|
|
+ query: props.query ? props.query : query,
|
|
parseImgUrl: parseImgUrl,
|
|
parseImgUrl: parseImgUrl,
|
|
/**
|
|
/**
|
|
* 加载loading
|
|
* 加载loading
|
|
@@ -324,6 +324,7 @@ export default defineComponent({
|
|
let xData: any = chartData.map((item: any) => {
|
|
let xData: any = chartData.map((item: any) => {
|
|
return item.time;
|
|
return item.time;
|
|
});
|
|
});
|
|
|
|
+ let max: any = Math.max(...seriesData);
|
|
if (xData && xData.length) {
|
|
if (xData && xData.length) {
|
|
if (proxyData.checkIsData(seriesData)) {
|
|
if (proxyData.checkIsData(seriesData)) {
|
|
let options = {
|
|
let options = {
|
|
@@ -358,7 +359,7 @@ export default defineComponent({
|
|
yAxis: [
|
|
yAxis: [
|
|
{
|
|
{
|
|
type: "value",
|
|
type: "value",
|
|
- max: chartMax,
|
|
|
|
|
|
+ // max: chartMax,
|
|
axisTick: {
|
|
axisTick: {
|
|
show: false,
|
|
show: false,
|
|
},
|
|
},
|
|
@@ -381,89 +382,56 @@ export default defineComponent({
|
|
],
|
|
],
|
|
series: [
|
|
series: [
|
|
{
|
|
{
|
|
- markLine: {
|
|
|
|
- symbol: "none",
|
|
|
|
- data: [
|
|
|
|
- {
|
|
|
|
- name: "均线",
|
|
|
|
- type: "max",
|
|
|
|
- yAxis: chartMax,
|
|
|
|
- lineStyle: {
|
|
|
|
- normal: {
|
|
|
|
- color: "red",
|
|
|
|
- width: 2,
|
|
|
|
- type: "solid",
|
|
|
|
|
|
+ markLine:
|
|
|
|
+ max >= chartMax
|
|
|
|
+ ? {
|
|
|
|
+ symbol: "none",
|
|
|
|
+ data: [
|
|
|
|
+ {
|
|
|
|
+ name: "均线",
|
|
|
|
+ type: "max",
|
|
|
|
+ yAxis: chartMax,
|
|
|
|
+ lineStyle: {
|
|
|
|
+ normal: {
|
|
|
|
+ color: "red",
|
|
|
|
+ width: 2,
|
|
|
|
+ type: "solid",
|
|
|
|
+ },
|
|
|
|
+ },
|
|
|
|
+ },
|
|
|
|
+ ],
|
|
|
|
+ label: {
|
|
|
|
+ normal: {
|
|
|
|
+ show: true,
|
|
|
|
+ position: "middle",
|
|
|
|
+ textStyle: {
|
|
|
|
+ fontSize: 12,
|
|
|
|
+ fontWeight: 600,
|
|
|
|
+ },
|
|
|
|
+ },
|
|
},
|
|
},
|
|
- },
|
|
|
|
- },
|
|
|
|
- ],
|
|
|
|
- label: {
|
|
|
|
- normal: {
|
|
|
|
- show: true,
|
|
|
|
- position: "middle",
|
|
|
|
- textStyle: {
|
|
|
|
- fontSize: 12,
|
|
|
|
- fontWeight: 600,
|
|
|
|
- },
|
|
|
|
- },
|
|
|
|
- },
|
|
|
|
- },
|
|
|
|
|
|
+ }
|
|
|
|
+ : {},
|
|
name: "CO₂",
|
|
name: "CO₂",
|
|
type: "line",
|
|
type: "line",
|
|
smooth: true,
|
|
smooth: true,
|
|
symbol: "circle",
|
|
symbol: "circle",
|
|
symbolSize: 5,
|
|
symbolSize: 5,
|
|
showSymbol: false,
|
|
showSymbol: false,
|
|
- lineStyle: {
|
|
|
|
- width: 2,
|
|
|
|
- color: new (echarts as any).graphic.LinearGradient(
|
|
|
|
- 1,
|
|
|
|
- 0,
|
|
|
|
- 0,
|
|
|
|
- 0,
|
|
|
|
- [
|
|
|
|
- {
|
|
|
|
- offset: 0,
|
|
|
|
- color: "rgba(229, 87, 79, 1)",
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- offset: 0.5,
|
|
|
|
- color: "rgba(229, 87, 79, 1)",
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- offset: 0.6,
|
|
|
|
- color: "rgba(79, 128, 255, 1)",
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- offset: 1,
|
|
|
|
- color: "rgba(79, 128, 255, 1)",
|
|
|
|
- },
|
|
|
|
- ],
|
|
|
|
- false
|
|
|
|
- ),
|
|
|
|
- },
|
|
|
|
areaStyle: {
|
|
areaStyle: {
|
|
color: new (echarts as any).graphic.LinearGradient(
|
|
color: new (echarts as any).graphic.LinearGradient(
|
|
0,
|
|
0,
|
|
- 0,
|
|
|
|
1,
|
|
1,
|
|
0,
|
|
0,
|
|
|
|
+ 0,
|
|
[
|
|
[
|
|
{
|
|
{
|
|
offset: 0,
|
|
offset: 0,
|
|
color: "rgba(79, 128, 255, 0.1)",
|
|
color: "rgba(79, 128, 255, 0.1)",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- offset: 0.5,
|
|
|
|
- color: "rgba(79, 128, 255, 0.3)",
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- offset: 0.6,
|
|
|
|
- color: "rgba(229, 87, 79, 0.1)",
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
offset: 1,
|
|
offset: 1,
|
|
- color: "rgba(229, 87, 79, 0.3)",
|
|
|
|
|
|
+ color: "rgba(79, 128, 255, 0.6)",
|
|
},
|
|
},
|
|
],
|
|
],
|
|
false
|
|
false
|
|
@@ -695,13 +663,26 @@ export default defineComponent({
|
|
let max = 0;
|
|
let max = 0;
|
|
switch (funcid) {
|
|
switch (funcid) {
|
|
case "CO2":
|
|
case "CO2":
|
|
- max = dayTarget && dayTarget[0] && dayTarget[0].co2Max;
|
|
|
|
|
|
+ for (let i = 0; i < dayTarget.length; i++) {
|
|
|
|
+ if (dayTarget[i].co2Max) {
|
|
|
|
+ max = dayTarget[i].co2Max;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
break;
|
|
break;
|
|
case "PM2d5":
|
|
case "PM2d5":
|
|
- max = dayTarget && dayTarget[0] && dayTarget[0].pm25Max;
|
|
|
|
|
|
+ for (let i = 0; i < dayTarget.length; i++) {
|
|
|
|
+ if (dayTarget[i].pm25Max) {
|
|
|
|
+ max = dayTarget[i].pm25Max;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
break;
|
|
break;
|
|
case "HCHO":
|
|
case "HCHO":
|
|
- max = dayTarget && dayTarget[0] && dayTarget[0].hchoMax;
|
|
|
|
|
|
+ // max = dayTarget && dayTarget[0] && dayTarget[0].hchoMax;
|
|
|
|
+ for (let i = 0; i < dayTarget.length; i++) {
|
|
|
|
+ if (dayTarget[i].hchoMax) {
|
|
|
|
+ max = dayTarget[i].hchoMax;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
break;
|
|
break;
|
|
case "RH":
|
|
case "RH":
|
|
max = 0;
|
|
max = 0;
|
|
@@ -720,6 +701,8 @@ export default defineComponent({
|
|
props,
|
|
props,
|
|
(newProps: any) => {
|
|
(newProps: any) => {
|
|
proxyData.query = JSON.parse(JSON.stringify(newProps.query));
|
|
proxyData.query = JSON.parse(JSON.stringify(newProps.query));
|
|
|
|
+ proxyData.setActiveItem();
|
|
|
|
+ proxyData.queryAllData();
|
|
// 设置当前选中的tab
|
|
// 设置当前选中的tab
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -728,6 +711,8 @@ export default defineComponent({
|
|
}
|
|
}
|
|
);
|
|
);
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
|
|
+ // proxyData.setActiveItem();
|
|
|
|
+ // proxyData.queryAllData();
|
|
// const route: any = useRoute();
|
|
// const route: any = useRoute();
|
|
// if (route.query) {
|
|
// if (route.query) {
|
|
// proxyData.query = route.query;
|
|
// proxyData.query = route.query;
|