diff --git a/mindinsight/ui/src/services/request-service.js b/mindinsight/ui/src/services/request-service.js
index 8fb0439756a8bbebf319856015bb3917681c8efb..d30a5424b5eddb705801b7d588879bd073dae3f7 100644
--- a/mindinsight/ui/src/services/request-service.js
+++ b/mindinsight/ui/src/services/request-service.js
@@ -42,13 +42,15 @@ export default {
});
},
-
// query summary list
- querySummaryList(params) {
+ querySummaryList(params, isIgnoreError) {
return axios({
method: 'get',
url: '/v1/mindinsight/datavisual/train-jobs',
params: params,
+ headers: {
+ ignoreError: isIgnoreError,
+ },
});
},
@@ -103,18 +105,6 @@ export default {
});
},
- // query trainJob data
- getTrainJobs(params, isIgnoreError) {
- return axios({
- method: 'get',
- params: params,
- url: 'v1/mindinsight/datavisual/train-jobs',
- headers: {
- ignoreError: isIgnoreError,
- },
- });
- },
-
// set caches
trainJobsCaches(params) {
return axios({
diff --git a/mindinsight/ui/src/views/train-manage/compare-plate.vue b/mindinsight/ui/src/views/train-manage/compare-plate.vue
index c755d0403a84d03906bf5a956d9ef8976d753b6f..c263a9821c2add66e670692e6363d771fe98a113 100644
--- a/mindinsight/ui/src/views/train-manage/compare-plate.vue
+++ b/mindinsight/ui/src/views/train-manage/compare-plate.vue
@@ -27,23 +27,21 @@ limitations under the License.
-
+
-
-
-
-
+
+
+
+
@@ -62,13 +60,12 @@ limitations under the License.
+ @input="updataInputValue">
-
+
{
// error;
if (
@@ -318,10 +315,10 @@ export default {
colorIndex: colorIndex,
});
- if (summaryObj.cache_status===this.cacheStatus) {
- tempSummaryList.forEach((item)=>{
- if (item.label=== summaryObj.train_id) {
- item.loading=true;
+ if (summaryObj.cache_status === this.cacheStatus) {
+ tempSummaryList.forEach((item) => {
+ if (item.label === summaryObj.train_id) {
+ item.loading = true;
}
});
}
@@ -339,7 +336,7 @@ export default {
if (!this.oriDataDictionaries[tagObj]) {
// Add the tag list
- this.oriDataDictionaries[tagObj]=true;
+ this.oriDataDictionaries[tagObj] = true;
tempTagList.push({
label: tagObj,
checked: true,
@@ -386,11 +383,13 @@ export default {
this.initOver = true;
this.$nextTick(() => {
- this.multiSelectedTagNames=this.$refs.tagsGroup.updateSelectedDic();
- this.multiSelectedSummaryNames=this.$refs.summaryGroup.updateSelectedDic();
+ this.multiSelectedTagNames = this.$refs.tagsGroup.updateSelectedDic();
+ this.multiSelectedSummaryNames = this.$refs.summaryGroup.updateSelectedDic();
this.updateTagInPage();
this.resizeCallback();
- this.trainJobsCaches();
+ if (Object.keys(this.multiSelectedSummaryNames).length > 0) {
+ this.trainJobsCaches();
+ }
});
}, this.requestErrorCallback)
.catch((e) => {
@@ -399,8 +398,8 @@ export default {
},
trainJobsCaches() {
- const params={};
- params.train_ids=Object.keys(this.multiSelectedSummaryNames);
+ const params = {};
+ params.train_ids = Object.keys(this.multiSelectedSummaryNames);
RequestService.trainJobsCaches(params);
},
@@ -437,12 +436,12 @@ export default {
*/
updateCurPageSamples() {
- this.curPageArr.forEach((sampleObject)=>{
+ this.curPageArr.forEach((sampleObject) => {
if (!sampleObject) {
return;
}
sampleObject.updateFlag = true;
- const sampleIndex=sampleObject.sampleIndex;
+ const sampleIndex = sampleObject.sampleIndex;
const summaryCount = sampleObject.summaryNames.length;
if (summaryCount === 0) {
return;
@@ -453,15 +452,14 @@ export default {
tag: sampleObject.tagName,
};
- for (let i=0; i {
if (sampleObject.charObj) {
@@ -537,12 +535,10 @@ export default {
this.updateOrCreateChar(sampleIndex);
});
})
- .catch((error) => {
- });
+ .catch((error) => {});
});
},
-
/**
* Formatting Chart Data
* @param {Number} sampleIndex Chart subscript
@@ -717,7 +713,7 @@ export default {
},
grid: {
left: 80,
- right: sampleObject.fullScreen ? 80:10,
+ right: sampleObject.fullScreen ? 80 : 10,
},
animation: true,
dataZoom: [
@@ -962,11 +958,11 @@ export default {
if (sampleObject.fullScreen) {
sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =
'#3E98C5';
- sampleObject.charData.charOption.grid.right=80;
+ sampleObject.charData.charOption.grid.right = 80;
} else {
sampleObject.charData.charOption.toolbox.feature.myToolFullScreen.iconStyle.borderColor =
'#6D7278';
- sampleObject.charData.charOption.grid.right=10;
+ sampleObject.charData.charOption.grid.right = 10;
}
sampleObject.updateFlag = true;
@@ -985,13 +981,13 @@ export default {
*/
updateTagInPage(noPageDataNumChange) {
- const curFilterSamples=[];
- this.originDataArr.forEach((sampleItem)=>{
+ const curFilterSamples = [];
+ this.originDataArr.forEach((sampleItem) => {
if (this.multiSelectedTagNames[sampleItem.tagName]) {
curFilterSamples.push(sampleItem);
}
});
- this.curFilterSamples=curFilterSamples;
+ this.curFilterSamples = curFilterSamples;
this.getCurPageDataArr(noPageDataNumChange);
},
@@ -1086,9 +1082,9 @@ export default {
if (!selectedItemDict) {
return;
}
- this.multiSelectedTagNames=selectedItemDict;
+ this.multiSelectedTagNames = selectedItemDict;
// reset to the first page
- this.pageIndex=0;
+ this.pageIndex = 0;
this.updateTagInPage();
},
@@ -1101,11 +1097,13 @@ export default {
if (!selectedItemDict) {
return;
}
- this.multiSelectedSummaryNames=selectedItemDict;
+ this.multiSelectedSummaryNames = selectedItemDict;
if (this.isTimeReload) {
this.autoUpdateSamples();
}
- this.trainJobsCaches();
+ if (Object.keys(this.multiSelectedSummaryNames).length > 0) {
+ this.trainJobsCaches();
+ }
this.updateSummary();
},
@@ -1114,33 +1112,30 @@ export default {
*/
updateSummary() {
// update the data display area
- this.originDataArr.forEach((sampleObject)=>{
+ this.originDataArr.forEach((sampleObject) => {
if (sampleObject.charObj) {
- sampleObject.updateFlag=true;
- sampleObject.summaryNames.forEach((summaryName)=>{
+ sampleObject.updateFlag = true;
+ sampleObject.summaryNames.forEach((summaryName) => {
+ const sampleSelect =
+ sampleObject.charData.charOption.legend.selected;
+ if (!sampleSelect) {
+ return;
+ }
if (this.multiSelectedSummaryNames[summaryName]) {
- sampleObject.charData.charOption.legend.selected[
- summaryName
- ]=true;
- sampleObject.charData.charOption.legend.selected[
- summaryName+this.backendString
- ]=true;
+ sampleSelect[summaryName] = true;
+ sampleSelect[summaryName + this.backendString] = true;
} else {
- sampleObject.charData.charOption.legend.selected[
- summaryName
- ]=false;
- sampleObject.charData.charOption.legend.selected[
- summaryName+this.backendString
- ]=false;
+ sampleSelect[summaryName] = false;
+ sampleSelect[summaryName + this.backendString] = false;
}
});
}
});
- setTimeout(()=>{
+ setTimeout(() => {
// Refresh the current page chart
- this.curPageArr.forEach((sampleObject)=>{
- sampleObject.charData.charOption.animation=false;
+ this.curPageArr.forEach((sampleObject) => {
+ sampleObject.charData.charOption.animation = false;
this.updateOrCreateChar(sampleObject.sampleIndex, true);
});
}, 0);
@@ -1151,6 +1146,9 @@ export default {
*/
resizeCallback() {
+ if (this.isTimeReload) {
+ this.autoUpdateSamples();
+ }
if (this.charResizeTimer) {
clearTimeout(this.charResizeTimer);
this.charResizeTimer = null;
@@ -1165,7 +1163,6 @@ export default {
}, 500);
},
-
/**
* Initialize the color array
*/
@@ -1192,7 +1189,7 @@ export default {
this.tagOperateList = [];
this.pageIndex = 0;
this.originDataArr = [];
- this.oriDataDictionaries={};
+ this.oriDataDictionaries = {};
this.curPageArr = [];
},
@@ -1214,7 +1211,6 @@ export default {
}
},
-
/**
* Delete the data that does not exist
* @param {Object} oriData Original summary and tag data
@@ -1334,16 +1330,16 @@ export default {
summaryColor = this.summaryOperateList[sameSummaryIndex].color;
}
- if (summaryObj.cache_status===this.cacheStatus) {
- this.summaryOperateList.forEach((item)=>{
- if (item.label=== summaryObj.train_id) {
- item.loading=true;
+ if (summaryObj.cache_status === this.cacheStatus) {
+ this.summaryOperateList.forEach((item) => {
+ if (item.label === summaryObj.train_id) {
+ item.loading = true;
}
});
} else {
- this.summaryOperateList.forEach((item)=>{
- if (item.label=== summaryObj.train_id) {
- item.loading=false;
+ this.summaryOperateList.forEach((item) => {
+ if (item.label === summaryObj.train_id) {
+ item.loading = false;
}
});
}
@@ -1399,17 +1395,16 @@ export default {
return dataAddFlag;
},
-
/**
* Updating all data
* @param {Boolean} ignoreError whether ignore error tip
*/
updateAllData(ignoreError) {
- const params={};
+ const params = {};
params.offset = 0;
params.limit = 999;
- RequestService.getTrainJobs(params, ignoreError)
+ RequestService.querySummaryList(params, ignoreError)
.then((res) => {
if (this.isReloading) {
this.$store.commit('setIsReload', false);
@@ -1417,10 +1412,12 @@ export default {
}
// Fault tolerance processing
- if (!res ||
+ if (
+ !res ||
!res.data ||
!res.data.train_jobs ||
- !res.data.train_jobs.length) {
+ !res.data.train_jobs.length
+ ) {
this.clearAllData();
return;
}
@@ -1440,7 +1437,9 @@ export default {
this.updateTagInPage(!tagRemoveFlag && !tagAddFlag);
this.resizeCallback();
- this.trainJobsCaches();
+ if (Object.keys(this.multiSelectedSummaryNames).length > 0) {
+ this.trainJobsCaches();
+ }
});
}, this.requestErrorCallback)
.catch((e) => {
@@ -1483,7 +1482,7 @@ export default {
if (this.firstNum === 0) {
return;
}
- this.smoothValueNumber=Number(val);
+ this.smoothValueNumber = Number(val);
if (this.smoothSliderValueTimer) {
clearTimeout(this.smoothSliderValueTimer);
this.smoothSliderValueTimer = null;
@@ -1496,26 +1495,26 @@ export default {
smoothValueChange(val) {
if (!isNaN(val)) {
- if (Number(val)===0) {
- this.smoothValue=0;
+ if (Number(val) === 0) {
+ this.smoothValue = 0;
}
- if (Number(val)<0) {
- this.smoothValue=0;
- this.smoothValueNumber=0;
+ if (Number(val) < 0) {
+ this.smoothValue = 0;
+ this.smoothValueNumber = 0;
}
- if (Number(val)>0) {
- if (Number(val)>0.99) {
- this.smoothValue=0.99;
- this.smoothValueNumber=0.99;
+ if (Number(val) > 0) {
+ if (Number(val) > 0.99) {
+ this.smoothValue = 0.99;
+ this.smoothValueNumber = 0.99;
} else {
- this.smoothValue=Number(val);
+ this.smoothValue = Number(val);
}
}
}
},
smoothValueBlur() {
- this.smoothValueNumber=this.smoothValue;
+ this.smoothValueNumber = this.smoothValue;
},
/**
@@ -1715,7 +1714,7 @@ export default {
background: #ffffff;
.cl-eval-operate-component {
- margin-top:8px;
+ margin-top: 8px;
}
}
.cl-eval-slider-operate-content {
diff --git a/mindinsight/ui/src/views/train-manage/summary-manage.vue b/mindinsight/ui/src/views/train-manage/summary-manage.vue
index 139880901a4577b0ec6e64e6a37df74462063e4c..42ee7149adfb3942f407eb072eb9319538401f85 100644
--- a/mindinsight/ui/src/views/train-manage/summary-manage.vue
+++ b/mindinsight/ui/src/views/train-manage/summary-manage.vue
@@ -127,7 +127,7 @@ export default {
* @param {Object} params page info param
*/
querySummaryList(params) {
- RequestService.querySummaryList(params)
+ RequestService.querySummaryList(params, false)
.then(
(res) => {
if (res && res.data && res.data.train_jobs) {