|
@@ -460,73 +460,42 @@ export default {
|
|
|
// });
|
|
|
|
|
|
that.Analysis = aList2;
|
|
|
- } else if (res.data.length == 4) {
|
|
|
+ } else if (res.data.length >=3) {
|
|
|
that.dialogVisible = true;
|
|
|
BASE.closeLoading();
|
|
|
- let aKey4 = [
|
|
|
- "doubleValue",
|
|
|
- "doubleValue",
|
|
|
- "doubleValue",
|
|
|
- "doubleValue",
|
|
|
- ];
|
|
|
- let aList4 = [
|
|
|
- {
|
|
|
- title: "",
|
|
|
- // yAxisIndex:"",
|
|
|
- smooth: true,
|
|
|
- value: [],
|
|
|
- },
|
|
|
- {
|
|
|
- title: "",
|
|
|
- // yAxisIndex:"",
|
|
|
- smooth: true,
|
|
|
- value: [],
|
|
|
- },
|
|
|
- {
|
|
|
- title: "",
|
|
|
- // yAxisIndex:"",
|
|
|
- smooth: true,
|
|
|
- value: [],
|
|
|
- },
|
|
|
- {
|
|
|
- title: "",
|
|
|
- // yAxisIndex:"",
|
|
|
- smooth: true,
|
|
|
- value: [],
|
|
|
- },
|
|
|
- ];
|
|
|
+ let aList4 = []
|
|
|
let yaxises2 = [
|
|
|
{
|
|
|
name: "",
|
|
|
min: 0,
|
|
|
max: null,
|
|
|
- unit: "",
|
|
|
- position: "left",
|
|
|
+ unit: '',
|
|
|
+ position: 'left'
|
|
|
},
|
|
|
{
|
|
|
name: "",
|
|
|
min: 0,
|
|
|
max: null,
|
|
|
- unit: "",
|
|
|
- position: "right",
|
|
|
- },
|
|
|
- ];
|
|
|
- yaxises2.forEach((aEle, aIndex) => {
|
|
|
- res.data.forEach((rEle) => {
|
|
|
- // aEle.name = rEle.name;
|
|
|
- aEle.unit = rEle.unit;
|
|
|
- });
|
|
|
+ unit: '',
|
|
|
+ position: 'right'
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ res.data.forEach((aEle, keyIndex) => {
|
|
|
+ yaxises2[0].unit = aEle.unit
|
|
|
+ yaxises2[1].unit = aEle.unit
|
|
|
+ aList4.push({
|
|
|
+ title: aEle.name,
|
|
|
+ yAxisIndex: 0,
|
|
|
+ smooth: true,
|
|
|
+ value: aEle.data.map(o => {
|
|
|
+ return {
|
|
|
+ text: new Date(o.ts).formatDate("hh:mm"),
|
|
|
+ value: o.doubleValue,
|
|
|
+ }
|
|
|
+ }),
|
|
|
+ })
|
|
|
});
|
|
|
that.AnalysisYAxises = yaxises2;
|
|
|
- aKey4.forEach((keyEle, keyIndex) => {
|
|
|
- aList4[keyIndex].title = res.data[keyIndex].name;
|
|
|
- res.data[keyIndex].data.forEach((rEle) => {
|
|
|
- aList4[keyIndex].value.push({
|
|
|
- text: new Date(rEle.ts).formatDate("hh:mm"),
|
|
|
- value: rEle.doubleValue,
|
|
|
- });
|
|
|
- });
|
|
|
- });
|
|
|
that.Analysis = aList4;
|
|
|
} else if (res.data.length == 0) {
|
|
|
that.dialogVisible = false;
|