提交 32bc4a3e 编写于 作者: W wwx691809

When canceling the interface actively, the page state does not change

上级 ee2cbbd1
......@@ -530,7 +530,7 @@ export default {
this.$set(this.originDataArr[sampleIndex], 'invalidData', true);
}
sampleObject.charData.charOption = this.formateCharOption(
sampleIndex,
sampleIndex
);
this.$nextTick(() => {
......@@ -591,12 +591,12 @@ export default {
if (curOriData) {
if (sampleObject.log) {
dataObj.data = this.formateSmoothData(
curOriData.logData[this.curBenchX],
curOriData.logData[this.curBenchX]
);
dataObjBackend.data = curOriData.logData[this.curBenchX];
} else {
dataObj.data = this.formateSmoothData(
curOriData.valueData[this.curBenchX],
curOriData.valueData[this.curBenchX]
);
dataObjBackend.data = curOriData.valueData[this.curBenchX];
}
......@@ -738,23 +738,23 @@ export default {
position: (point, params, dom, rect, size) => {
const curDom = document.getElementById(sampleObject.domId);
if (!curDom) {
return {left: 0, bottom: '100%'};
return { left: 0, bottom: '100%' };
}
if (sampleObject.fullScreen) {
if (point[0] + size.contentSize[0] <= size.viewSize[0]) {
return {left: point[0], bottom: '10%'};
return { left: point[0], bottom: '10%' };
} else {
return {right: size.viewSize[0] - point[0], bottom: '10%'};
return { right: size.viewSize[0] - point[0], bottom: '10%' };
}
} else {
const parentNode = curDom.parentNode;
if (!parentNode) {
return {left: 0, bottom: '100%'};
return { left: 0, bottom: '100%' };
}
if (parentNode.offsetLeft > size.contentSize[0]) {
return {right: '100%', bottom: 0};
return { right: '100%', bottom: 0 };
} else {
return {left: '100%', bottom: 0};
return { left: '100%', bottom: 0 };
}
}
},
......@@ -833,7 +833,7 @@ export default {
`display:inline-block;"></td><td>${parma.seriesName}</td>` +
`<td>${that.formateYaxisValue(parma.value[1])}</td>` +
`<td>${that.formateYaxisValue(
curSerieOriData.stepData[parma.dataIndex][1],
curSerieOriData.stepData[parma.dataIndex][1]
)}</td>` +
`<td>${curSerieOriData.stepData[parma.dataIndex][0]}</td>` +
`<td>${curSerieOriData.relativeData[
......@@ -841,8 +841,8 @@ export default {
][0].toFixed(3)}${unit}</td>` +
`<td>${that.dealrelativeTime(
new Date(
curSerieOriData.absData[parma.dataIndex][0] * 1000,
).toString(),
curSerieOriData.absData[parma.dataIndex][0] * 1000
).toString()
)}</td>` +
`</tr>`;
}
......@@ -929,7 +929,7 @@ export default {
if (sampleObject.updateFlag) {
sampleObject.charObj.setOption(
sampleObject.charData.charOption,
sampleObject.dataRemove,
sampleObject.dataRemove
);
sampleObject.updateFlag = false;
sampleObject.dataRemove = false;
......@@ -938,7 +938,7 @@ export default {
// creat chart
sampleObject.charObj = echarts.init(
document.getElementById(sampleObject.domId),
null,
null
);
sampleObject.charObj.setOption(sampleObject.charData.charOption, true);
}
......@@ -1039,7 +1039,7 @@ export default {
sampleObject.charData.charOption.series[
index * 2
].data = this.formateSmoothData(
sampleObject.charData.oriData[index].logData[this.curBenchX],
sampleObject.charData.oriData[index].logData[this.curBenchX]
);
sampleObject.charData.charOption.series[index * 2 + 1].data =
sampleObject.charData.oriData[index].logData[this.curBenchX];
......@@ -1047,7 +1047,7 @@ export default {
sampleObject.charData.charOption.series[
index * 2
].data = this.formateSmoothData(
sampleObject.charData.oriData[index].valueData[this.curBenchX],
sampleObject.charData.oriData[index].valueData[this.curBenchX]
);
sampleObject.charData.charOption.series[index * 2 + 1].data =
sampleObject.charData.oriData[index].valueData[
......@@ -1192,7 +1192,6 @@ export default {
this.multiSelectedSummaryNames = {};
this.multiSelectedTagNames = {};
this.curFilterSamples = [];
this.summaryOperateList = [];
this.tagOperateList = [];
this.pageIndex = 0;
this.originDataArr = [];
......@@ -1284,7 +1283,7 @@ export default {
const oldSummaryLength = oldSample.summaryNames.length;
for (let j = oldSummaryLength - 1; j >= 0; j--) {
const sameSummaryIndex = summaryList[sameTagIndex].indexOf(
oldSample.summaryNames[j],
oldSample.summaryNames[j]
);
if (sameSummaryIndex === -1) {
oldSample.summaryNames.splice(j, 1);
......@@ -1425,6 +1424,10 @@ export default {
!res.data.train_jobs ||
!res.data.train_jobs.length
) {
if (res.toString() === 'false') {
return;
}
this.clearAllData();
return;
}
......@@ -1555,13 +1558,13 @@ export default {
serie.data = this.formateSmoothData(
sampleObject.charData.oriData[index / 2].logData[
this.curBenchX
],
]
);
} else {
serie.data = this.formateSmoothData(
sampleObject.charData.oriData[index / 2].valueData[
this.curBenchX
],
]
);
}
}
......@@ -1651,7 +1654,7 @@ export default {
sampleObject.charData.charOption.series[
index * 2
].data = this.formateSmoothData(
sampleObject.charData.oriData[index].logData[this.curBenchX],
sampleObject.charData.oriData[index].logData[this.curBenchX]
);
sampleObject.charData.charOption.series[index * 2 + 1].data =
sampleObject.charData.oriData[index].logData[this.curBenchX];
......@@ -1659,7 +1662,7 @@ export default {
sampleObject.charData.charOption.series[
index * 2
].data = this.formateSmoothData(
sampleObject.charData.oriData[index].valueData[this.curBenchX],
sampleObject.charData.oriData[index].valueData[this.curBenchX]
);
sampleObject.charData.charOption.series[index * 2 + 1].data =
sampleObject.charData.oriData[index].valueData[this.curBenchX];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册