|
@@ -2884,8 +2884,10 @@ export default {
|
|
chemicalsOptions: [],
|
|
chemicalsOptions: [],
|
|
// y轴最大值
|
|
// y轴最大值
|
|
maxValue: null,
|
|
maxValue: null,
|
|
|
|
+ maxValue2: null,
|
|
// y轴最小值
|
|
// y轴最小值
|
|
minValue: null,
|
|
minValue: null,
|
|
|
|
+ minValue2: null,
|
|
// 趋势图
|
|
// 趋势图
|
|
chart: null,
|
|
chart: null,
|
|
// 趋势分析参数
|
|
// 趋势分析参数
|
|
@@ -4196,6 +4198,8 @@ export default {
|
|
draw2() {
|
|
draw2() {
|
|
getAnalysisData(this.analysisQueryParams).then(response => {
|
|
getAnalysisData(this.analysisQueryParams).then(response => {
|
|
let data = response.data;
|
|
let data = response.data;
|
|
|
|
+ this.maxValue2 = 0;
|
|
|
|
+ this.minValue2 = data[0].valueData;
|
|
for (let i = 0; i < data.length; i++) {
|
|
for (let i = 0; i < data.length; i++) {
|
|
if (data[i].valueData != null) {
|
|
if (data[i].valueData != null) {
|
|
if (data[i].valueData.toString().search("%") != -1) {
|
|
if (data[i].valueData.toString().search("%") != -1) {
|
|
@@ -4203,11 +4207,11 @@ export default {
|
|
} else {
|
|
} else {
|
|
this.valueList2[i] = data[i].valueData;
|
|
this.valueList2[i] = data[i].valueData;
|
|
}
|
|
}
|
|
- if (data[i].valueData > this.maxValue) {
|
|
|
|
- this.maxValue = data[i].valueData;
|
|
|
|
|
|
+ if (data[i].valueData > this.maxValue2) {
|
|
|
|
+ this.maxValue2 = data[i].valueData;
|
|
}
|
|
}
|
|
- if (data[i].valueData < this.minValue) {
|
|
|
|
- this.minValue = data[i].valueData;
|
|
|
|
|
|
+ if (data[i].valueData < this.minValue2) {
|
|
|
|
+ this.minValue2 = data[i].valueData;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -4222,20 +4226,51 @@ export default {
|
|
},
|
|
},
|
|
xAxis: {
|
|
xAxis: {
|
|
data: this.dateList,
|
|
data: this.dateList,
|
|
- name: '日期'
|
|
|
|
},
|
|
},
|
|
- yAxis: {
|
|
|
|
- max: this.maxValue,
|
|
|
|
- min: this.minValue,
|
|
|
|
- min: function(value) { // 取最小值向下取整为最小刻度
|
|
|
|
- return Math.floor(value.min)
|
|
|
|
|
|
+ yAxis: [
|
|
|
|
+ {
|
|
|
|
+ name: this.fieldNameTitle,
|
|
|
|
+ nameTextStyle: {
|
|
|
|
+ fontWeight: 'bold',
|
|
|
|
+ color:"#5470c6",
|
|
|
|
+ },
|
|
|
|
+ position: 'left',
|
|
|
|
+ axisLine: {
|
|
|
|
+ show: 'true',
|
|
|
|
+ },
|
|
|
|
+ max: this.maxValue,
|
|
|
|
+ min: this.minValue,
|
|
|
|
+ min: function(value) { // 取最小值向下取整为最小刻度
|
|
|
|
+ return Math.floor(value.min)
|
|
|
|
+ },
|
|
|
|
+ max: function(value) { // 取最大值向上取整为最大刻度
|
|
|
|
+ return Math.ceil(value.max)
|
|
|
|
+ },
|
|
|
|
+ scale: true,
|
|
|
|
+ type: 'value',
|
|
},
|
|
},
|
|
- max: function(value) { // 取最大值向上取整为最大刻度
|
|
|
|
- return Math.ceil(value.max)
|
|
|
|
|
|
+ {
|
|
|
|
+ name: this.fieldNameTitle2,
|
|
|
|
+ nameTextStyle: {
|
|
|
|
+ fontWeight: 'bold',
|
|
|
|
+ color:"#91cc75",
|
|
|
|
+ },
|
|
|
|
+ position: 'right',
|
|
|
|
+ axisLine: {
|
|
|
|
+ show: 'true',
|
|
|
|
+ },
|
|
|
|
+ max: this.maxValue2,
|
|
|
|
+ min: this.minValue2,
|
|
|
|
+ min: function(value) { // 取最小值向下取整为最小刻度
|
|
|
|
+ return Math.floor(value.min)
|
|
|
|
+ },
|
|
|
|
+ max: function(value) { // 取最大值向上取整为最大刻度
|
|
|
|
+ return Math.ceil(value.max)
|
|
|
|
+ },
|
|
|
|
+ scale: true,
|
|
|
|
+ type: 'value',
|
|
},
|
|
},
|
|
- scale: true,
|
|
|
|
- type: 'value',
|
|
|
|
- },
|
|
|
|
|
|
+ ],
|
|
series: [
|
|
series: [
|
|
{
|
|
{
|
|
name: this.fieldNameTitle,
|
|
name: this.fieldNameTitle,
|
|
@@ -4250,7 +4285,8 @@ export default {
|
|
color:"#5470c6",
|
|
color:"#5470c6",
|
|
lineStyle: {
|
|
lineStyle: {
|
|
width: 6
|
|
width: 6
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ yAxisIndex: 0
|
|
},
|
|
},
|
|
{
|
|
{
|
|
name: this.fieldNameTitle2,
|
|
name: this.fieldNameTitle2,
|
|
@@ -4265,7 +4301,8 @@ export default {
|
|
color:"#91cc75",
|
|
color:"#91cc75",
|
|
lineStyle: {
|
|
lineStyle: {
|
|
width: 6
|
|
width: 6
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ yAxisIndex: 1
|
|
}
|
|
}
|
|
],
|
|
],
|
|
};
|
|
};
|
|
@@ -4353,9 +4390,6 @@ export default {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
/** 查询每日生产报告列表 */
|
|
/** 查询每日生产报告列表 */
|
|
getList() {
|
|
getList() {
|
|
this.loading = true;
|
|
this.loading = true;
|