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

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

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