Skip to content

M
mindinsight

wmsofts / mindinsight
与 Fork 源项目一致

Fork自 MindSpore / mindinsight

通知 1
Star 0
Fork 0
M
mindinsight

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 a161455f 编写于 作者: M mindspore-ci-bot 提交者： Gitee
浏览文件
操作

!604 Style modification of scalar pop-up window 

Merge pull request !604 from 王卫宁/wwn
上级 af2928c0 5221d2ac
隐藏空白更改
内联 并排
Showing with 271 addition and 264 deletion
mindinsight/ui/src/views/train-manage/scalar.vue
浏览文件 @ a161455f
...@@ -226,9 +226,11 @@ limitations under the License. ...@@ -226,9 +226,11 @@ limitations under the License.
<span slot="footer" <span slot="footer"
class="dialog-footer"> class="dialog-footer">
<el-button @click="thresholdCancel">{{$t('public.cancel')}}</el-button> <el-button @click="thresholdCancel"
size="mini">{{$t('public.cancel')}}</el-button>
<el-button type="primary" <el-button type="primary"
@click="thresholdCommit">{{$t('public.sure')}}</el-button> @click="thresholdCommit"
size="mini">{{$t('public.sure')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -251,9 +253,11 @@ limitations under the License. ...@@ -251,9 +253,11 @@ limitations under the License.
</div> </div>
<span slot="footer" <span slot="footer"
class="dialog-footer"> class="dialog-footer">
<el-button @click="delThresholdCancel">{{$t('public.cancel')}}</el-button> <el-button @click="delThresholdCancel"
size="mini">{{$t('public.cancel')}}</el-button>
<el-button type="primary" <el-button type="primary"
@click="delThresholdCommit">{{$t('public.sure')}}</el-button> @click="delThresholdCommit"
size="mini">{{$t('public.sure')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -306,8 +310,8 @@ export default { ...@@ -306,8 +310,8 @@ export default {
thresholdErrorMsg: '', thresholdErrorMsg: '',
thresholdRelational: '', thresholdRelational: '',
thresholdValue: [ thresholdValue: [
{filterCondition: this.$t('scalar.lessThan'), value: ''}, { filterCondition: this.$t('scalar.lessThan'), value: '' },
{filterCondition: this.$t('scalar.lessThan'), value: ''}, { filterCondition: this.$t('scalar.lessThan'), value: '' },
], ],
filterOptions: [ filterOptions: [
{ {
...@@ -420,7 +424,7 @@ export default { ...@@ -420,7 +424,7 @@ export default {
return; return;
} }
document.title = `${decodeURIComponent( document.title = `${decodeURIComponent(
this.$route.query.train_id, this.$route.query.train_id
)}-${this.$t('scalar.titleText')}-MindInsight`; )}-${this.$t('scalar.titleText')}-MindInsight`;
// Adding a Listener // Adding a Listener
window.addEventListener('resize', this.resizeCallback, false); window.addEventListener('resize', this.resizeCallback, false);
...@@ -448,7 +452,7 @@ export default { ...@@ -448,7 +452,7 @@ export default {
if (localStorage.getItem('thresholdCache')) { if (localStorage.getItem('thresholdCache')) {
try { try {
this.thresholdLocal = JSON.parse( this.thresholdLocal = JSON.parse(
localStorage.getItem('thresholdCache'), localStorage.getItem('thresholdCache')
); );
this.clearCache(); this.clearCache();
} catch (e) { } catch (e) {
...@@ -475,8 +479,8 @@ export default { ...@@ -475,8 +479,8 @@ export default {
) { ) {
delete this.thresholdLocal[this.decodeTrainingJobId]; delete this.thresholdLocal[this.decodeTrainingJobId];
localStorage.setItem( localStorage.setItem(
'thresholdCache', 'thresholdCache',
JSON.stringify(this.thresholdLocal), JSON.stringify(this.thresholdLocal)
); );
} }
} }
...@@ -492,81 +496,81 @@ export default { ...@@ -492,81 +496,81 @@ export default {
train_id: this.trainingJobId, train_id: this.trainingJobId,
}; };
RequestService.getSingleTrainJob(params, false) RequestService.getSingleTrainJob(params, false)
.then((res) => { .then((res) => {
// error; // error;
if ( if (
!res || !res ||
!res.data || !res.data ||
!res.data.train_jobs || !res.data.train_jobs ||
!res.data.train_jobs.length !res.data.train_jobs.length
) { ) {
this.initOver = true;
return;
}
const tempTagList = [];
const dataList = [];
const propsList = [];
const data = res.data.train_jobs[0];
const runNmeColor = CommonProperty.commonColorArr[0];
data.tags.forEach((tagObj) => {
if (!this.oriDataDictionaries[tagObj]) {
this.oriDataDictionaries[tagObj] = true;
// Add the tag list
tempTagList.push({
label: tagObj,
checked: true,
show: true,
});
const sampleIndex = dataList.length;
// Adding Chart Data
dataList.push({
tagName: tagObj,
runNames: data.name,
colors: runNmeColor,
show: false,
updateFlag: false,
dataRemove: false,
fullScreen: false,
sampleIndex: sampleIndex,
domId: 'prDom' + this.DomIdIndex,
charData: {
oriData: [],
charOption: {},
},
zoomData: [null, null],
zoomDataTimer: null,
charObj: null,
invalidData: false,
});
propsList.push({
tagName: tagObj,
runNames: data.name,
colors: '',
});
this.DomIdIndex++;
}
});
this.tagOperateList = tempTagList;
this.tagPropsList = JSON.parse(JSON.stringify(tempTagList));
if (dataList.length === 1) {
dataList[0].fullScreen = true;
}
this.originDataArr = dataList;
this.propsList = propsList;
this.initOver = true; this.initOver = true;
return;
}
const tempTagList = [];
const dataList = [];
const propsList = [];
const data = res.data.train_jobs[0];
const runNmeColor = CommonProperty.commonColorArr[0];
data.tags.forEach((tagObj) => {
if (!this.oriDataDictionaries[tagObj]) {
this.oriDataDictionaries[tagObj] = true;
// Add the tag list
tempTagList.push({
label: tagObj,
checked: true,
show: true,
});
const sampleIndex = dataList.length;
// Adding Chart Data
dataList.push({
tagName: tagObj,
runNames: data.name,
colors: runNmeColor,
show: false,
updateFlag: false,
dataRemove: false,
fullScreen: false,
sampleIndex: sampleIndex,
domId: 'prDom' + this.DomIdIndex,
charData: {
oriData: [],
charOption: {},
},
zoomData: [null, null],
zoomDataTimer: null,
charObj: null,
invalidData: false,
});
this.$nextTick(() => { propsList.push({
this.multiSelectedTagNames = this.$refs.multiselectGroupComponents.updateSelectedDic(); tagName: tagObj,
// Obtains data on the current page runNames: data.name,
this.updateTagInPage(); colors: '',
this.resizeCallback(); });
}); this.DomIdIndex++;
}, this.requestErrorCallback) }
.catch((e) => {
this.initOver = true;
this.$message.error(this.$t('public.dataError'));
}); });
this.tagOperateList = tempTagList;
this.tagPropsList = JSON.parse(JSON.stringify(tempTagList));
if (dataList.length === 1) {
dataList[0].fullScreen = true;
}
this.originDataArr = dataList;
this.propsList = propsList;
this.initOver = true;
this.$nextTick(() => {
this.multiSelectedTagNames = this.$refs.multiselectGroupComponents.updateSelectedDic();
// Obtains data on the current page
this.updateTagInPage();
this.resizeCallback();
});
}, this.requestErrorCallback)
.catch((e) => {
this.initOver = true;
this.$message.error(this.$t('public.dataError'));
});
}, },
/** /**
...@@ -614,108 +618,108 @@ export default { ...@@ -614,108 +618,108 @@ export default {
}; };
RequestService.getScalarsSample(params) RequestService.getScalarsSample(params)
.then((res) => { .then((res) => {
// error // error
if (!res || !res.data || !res.data.metadatas) { if (!res || !res.data || !res.data.metadatas) {
// canceled // canceled
if (res.toString() === 'false') { if (res.toString() === 'false') {
return;
}
if (sampleObject.charObj) {
sampleObject.charObj.clear();
sampleObject.onePoint = false;
}
return; return;
} }
let hasInvalidData = false;
if (sampleObject.charObj) { if (sampleObject.charObj) {
sampleObject.charObj.showLoading(); sampleObject.charObj.clear();
sampleObject.onePoint = false;
} }
return;
}
let hasInvalidData = false;
const resData = res.data; if (sampleObject.charObj) {
sampleObject.charObj.showLoading();
}
const tempObject = { const resData = res.data;
valueData: {
stepData: [],
absData: [],
relativeData: [],
},
logData: {
stepData: [],
absData: [],
relativeData: [],
},
};
let relativeTimeBench = 0;
if (resData.metadatas.length) {
relativeTimeBench = resData.metadatas[0].wall_time;
}
// Initializing Chart Data const tempObject = {
resData.metadatas.forEach((metaData) => { valueData: {
if (metaData.value === null && !hasInvalidData) { stepData: [],
hasInvalidData = true; absData: [],
} relativeData: [],
tempObject.valueData.stepData.push([ },
metaData.step, logData: {
metaData.value, stepData: [],
]); absData: [],
tempObject.valueData.absData.push([ relativeData: [],
metaData.wall_time, },
metaData.value, };
]); let relativeTimeBench = 0;
tempObject.valueData.relativeData.push([ if (resData.metadatas.length) {
metaData.wall_time - relativeTimeBench, relativeTimeBench = resData.metadatas[0].wall_time;
metaData.value, }
]);
const logValue = metaData.value >= 0 ? metaData.value : '';
tempObject.logData.stepData.push([metaData.step, logValue]);
tempObject.logData.absData.push([metaData.wall_time, logValue]);
tempObject.logData.relativeData.push([
metaData.wall_time - relativeTimeBench,
logValue,
]);
});
sampleObject.charData.oriData[0] = tempObject;
if (hasInvalidData) { // Initializing Chart Data
this.$set(sampleObject, 'invalidData', true); resData.metadatas.forEach((metaData) => {
} else { if (metaData.value === null && !hasInvalidData) {
this.$set(sampleObject, 'invalidData', false); hasInvalidData = true;
} }
tempObject.valueData.stepData.push([
metaData.step,
metaData.value,
]);
tempObject.valueData.absData.push([
metaData.wall_time,
metaData.value,
]);
tempObject.valueData.relativeData.push([
metaData.wall_time - relativeTimeBench,
metaData.value,
]);
const logValue = metaData.value >= 0 ? metaData.value : '';
tempObject.logData.stepData.push([metaData.step, logValue]);
tempObject.logData.absData.push([metaData.wall_time, logValue]);
tempObject.logData.relativeData.push([
metaData.wall_time - relativeTimeBench,
logValue,
]);
});
sampleObject.charData.charOption = this.formateCharOption( sampleObject.charData.oriData[0] = tempObject;
sampleIndex,
); if (hasInvalidData) {
const tempOption = sampleObject.charData.charOption; this.$set(sampleObject, 'invalidData', true);
if ( } else {
tempOption.series[0].data.length === 1 || this.$set(sampleObject, 'invalidData', false);
}
sampleObject.charData.charOption = this.formateCharOption(
sampleIndex
);
const tempOption = sampleObject.charData.charOption;
if (
tempOption.series[0].data.length === 1 ||
sampleObject.onePoint sampleObject.onePoint
) { ) {
tempOption.series[0].showSymbol = true; tempOption.series[0].showSymbol = true;
} else { } else {
tempOption.series[0].showSymbol = false; tempOption.series[0].showSymbol = false;
} }
this.$forceUpdate(); this.$forceUpdate();
this.$nextTick(() => { this.$nextTick(() => {
if (sampleObject.charObj) {
sampleObject.charObj.hideLoading();
}
// Draw chart
if (!this.compare) {
this.updateOrCreateChar(sampleIndex, true);
}
});
})
.catch((e) => {
if (sampleObject.charObj) { if (sampleObject.charObj) {
sampleObject.charObj.clear(); sampleObject.charObj.hideLoading();
}
// Draw chart
if (!this.compare) {
this.updateOrCreateChar(sampleIndex, true);
} }
}); });
})
.catch((e) => {
if (sampleObject.charObj) {
sampleObject.charObj.clear();
}
});
}); });
}, },
...@@ -726,7 +730,7 @@ export default { ...@@ -726,7 +730,7 @@ export default {
setOnePoint(sampleObject) { setOnePoint(sampleObject) {
const that = this; const that = this;
sampleObject.charObj.on('datazoom', function(params) { sampleObject.charObj.on('datazoom', function (params) {
const xAxisObject = params.batch[0]; const xAxisObject = params.batch[0];
const yAxisObject = params.batch[1]; const yAxisObject = params.batch[1];
const charData = sampleObject.charData.charOption.series[0].data; const charData = sampleObject.charData.charOption.series[0].data;
...@@ -785,7 +789,7 @@ export default { ...@@ -785,7 +789,7 @@ export default {
setRestore(sampleObject) { setRestore(sampleObject) {
const that = this; const that = this;
sampleObject.charObj.on('restore', function(params) { sampleObject.charObj.on('restore', function (params) {
const charData = sampleObject.charData.charOption.series[0].data; const charData = sampleObject.charData.charOption.series[0].data;
const tempCharOption = sampleObject.charData.charOption; const tempCharOption = sampleObject.charData.charOption;
...@@ -854,12 +858,12 @@ export default { ...@@ -854,12 +858,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];
} }
...@@ -989,23 +993,23 @@ export default { ...@@ -989,23 +993,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 };
} }
} }
}, },
...@@ -1090,16 +1094,16 @@ export default { ...@@ -1090,16 +1094,16 @@ 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[
parma.dataIndex parma.dataIndex
][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>`;
} }
...@@ -1184,9 +1188,9 @@ export default { ...@@ -1184,9 +1188,9 @@ export default {
this.thresholdLocal[this.decodeTrainingJobId][sampleObject.tagName] this.thresholdLocal[this.decodeTrainingJobId][sampleObject.tagName]
) { ) {
const tempStorgeArr = JSON.parse( const tempStorgeArr = JSON.parse(
JSON.stringify( JSON.stringify(
this.thresholdLocal[this.decodeTrainingJobId][sampleObject.tagName], this.thresholdLocal[this.decodeTrainingJobId][sampleObject.tagName]
), )
); );
let pieceStr = ''; let pieceStr = '';
pieceStr = this.formatePieceStr(tempStorgeArr); pieceStr = this.formatePieceStr(tempStorgeArr);
...@@ -1220,8 +1224,8 @@ export default { ...@@ -1220,8 +1224,8 @@ export default {
// Updating chart option // Updating chart option
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;
...@@ -1229,8 +1233,8 @@ export default { ...@@ -1229,8 +1233,8 @@ export default {
} else { } else {
// 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);
this.setOnePoint(sampleObject); this.setOnePoint(sampleObject);
...@@ -1336,13 +1340,13 @@ export default { ...@@ -1336,13 +1340,13 @@ export default {
const oriIndexData = sampleObject.charData.oriData[index]; const oriIndexData = sampleObject.charData.oriData[index];
if (sampleObject.log) { if (sampleObject.log) {
seriesData[index * 2].data = this.formateSmoothData( seriesData[index * 2].data = this.formateSmoothData(
oriIndexData.logData[this.curBenchX], oriIndexData.logData[this.curBenchX]
); );
seriesData[index * 2 + 1].data = seriesData[index * 2 + 1].data =
oriIndexData.logData[this.curBenchX]; oriIndexData.logData[this.curBenchX];
} else { } else {
seriesData[index * 2].data = this.formateSmoothData( seriesData[index * 2].data = this.formateSmoothData(
oriIndexData.valueData[this.curBenchX], oriIndexData.valueData[this.curBenchX]
); );
seriesData[index * 2 + 1].data = seriesData[index * 2 + 1].data =
oriIndexData.valueData[this.curBenchX]; oriIndexData.valueData[this.curBenchX];
...@@ -1556,56 +1560,56 @@ export default { ...@@ -1556,56 +1560,56 @@ export default {
train_id: this.trainingJobId, train_id: this.trainingJobId,
}; };
RequestService.getSingleTrainJob(params, ignoreError) RequestService.getSingleTrainJob(params, ignoreError)
.then((res) => { .then((res) => {
if (this.isReloading) { if (this.isReloading) {
this.$store.commit('setIsReload', false); this.$store.commit('setIsReload', false);
this.isReloading = false; this.isReloading = false;
} }
// Fault tolerance processing // Fault tolerance processing
if (!res || !res.data) { if (!res || !res.data) {
return; return;
} else if (!res.data.train_jobs || !res.data.train_jobs.length) { } else if (!res.data.train_jobs || !res.data.train_jobs.length) {
this.clearAllData(); this.clearAllData();
return; return;
} }
const data = res.data.train_jobs[0]; const data = res.data.train_jobs[0];
// Delete the data that does not exist // Delete the data that does not exist
const tagRemoveFlag = this.removeNonexistentData(data); const tagRemoveFlag = this.removeNonexistentData(data);
// Check whether new data exists and add it to the page // Check whether new data exists and add it to the page
const tagAddFlag = this.checkNewDataAndComplete(data); const tagAddFlag = this.checkNewDataAndComplete(data);
this.$nextTick(() => { this.$nextTick(() => {
this.multiSelectedTagNames = this.$refs.multiselectGroupComponents.updateSelectedDic(); this.multiSelectedTagNames = this.$refs.multiselectGroupComponents.updateSelectedDic();
this.updateTagInPage(!tagRemoveFlag && !tagAddFlag); this.updateTagInPage(!tagRemoveFlag && !tagAddFlag);
this.resizeCallback(); this.resizeCallback();
}); });
const tempTagList = []; const tempTagList = [];
const propsList = []; const propsList = [];
// Initial chart data // Initial chart data
data.tags.forEach((tagObj) => { data.tags.forEach((tagObj) => {
// Check whether the tag with the same name exists // Check whether the tag with the same name exists
tempTagList.push({ tempTagList.push({
label: tagObj, label: tagObj,
checked: true, checked: true,
show: true, show: true,
}); });
// Add the tag list. // Add the tag list.
propsList.push({ propsList.push({
tagName: tagObj, tagName: tagObj,
runNames: data.name, runNames: data.name,
colors: '', colors: '',
});
}); });
this.tagPropsList = tempTagList;
this.propsList = propsList;
}, this.requestErrorCallback)
.catch((e) => {
this.$message.error(this.$t('public.dataError'));
}); });
this.tagPropsList = tempTagList;
this.propsList = propsList;
}, this.requestErrorCallback)
.catch((e) => {
this.$message.error(this.$t('public.dataError'));
});
}, },
/** /**
...@@ -1711,15 +1715,15 @@ export default { ...@@ -1711,15 +1715,15 @@ export default {
if (index % 2 === 0) { if (index % 2 === 0) {
if (log) { if (log) {
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
], ]
); );
} }
} }
...@@ -1815,13 +1819,13 @@ export default { ...@@ -1815,13 +1819,13 @@ export default {
tempOriData.forEach((originData, index) => { tempOriData.forEach((originData, index) => {
if (log) { if (log) {
tempOption.series[index * 2].data = this.formateSmoothData( tempOption.series[index * 2].data = this.formateSmoothData(
tempOriData[index].logData[this.curBenchX], tempOriData[index].logData[this.curBenchX]
); );
tempOption.series[index * 2 + 1].data = tempOption.series[index * 2 + 1].data =
tempOriData[index].logData[this.curBenchX]; tempOriData[index].logData[this.curBenchX];
} else { } else {
tempOption.series[index * 2].data = this.formateSmoothData( tempOption.series[index * 2].data = this.formateSmoothData(
tempOriData[index].valueData[this.curBenchX], tempOriData[index].valueData[this.curBenchX]
); );
tempOption.series[index * 2 + 1].data = tempOption.series[index * 2 + 1].data =
tempOriData[index].valueData[this.curBenchX]; tempOriData[index].valueData[this.curBenchX];
...@@ -1908,7 +1912,7 @@ export default { ...@@ -1908,7 +1912,7 @@ export default {
this.thresholdLocal[this.decodeTrainingJobId][sampleItem.tagName] this.thresholdLocal[this.decodeTrainingJobId][sampleItem.tagName]
) { ) {
delete this.thresholdLocal[this.decodeTrainingJobId][ delete this.thresholdLocal[this.decodeTrainingJobId][
sampleItem.tagName sampleItem.tagName
]; ];
} }
this.currentTagName = sampleItem.tagName; this.currentTagName = sampleItem.tagName;
...@@ -2257,7 +2261,7 @@ export default { ...@@ -2257,7 +2261,7 @@ export default {
this.originDataArr.forEach((sampleObject) => { this.originDataArr.forEach((sampleObject) => {
if (this.multiSelectedTagNames[sampleObject.tagName]) { if (this.multiSelectedTagNames[sampleObject.tagName]) {
this.thresholdLocal[this.decodeTrainingJobId][ this.thresholdLocal[this.decodeTrainingJobId][
sampleObject.tagName sampleObject.tagName
] = chartPieces; ] = chartPieces;
sampleObject.pieceStr = pieceStr; sampleObject.pieceStr = pieceStr;
...@@ -2268,14 +2272,14 @@ export default { ...@@ -2268,14 +2272,14 @@ export default {
}); });
} else { } else {
this.thresholdLocal[this.decodeTrainingJobId][ this.thresholdLocal[this.decodeTrainingJobId][
this.currentTagName this.currentTagName
] = chartPieces; ] = chartPieces;
this.currentSample.pieceStr = pieceStr; this.currentSample.pieceStr = pieceStr;
this.setVisualMap(this.currentSample, chartPieces); this.setVisualMap(this.currentSample, chartPieces);
} }
localStorage.setItem( localStorage.setItem(
'thresholdCache', 'thresholdCache',
JSON.stringify(this.thresholdLocal), JSON.stringify(this.thresholdLocal)
); );
this.thresholdDialogVisible = false; this.thresholdDialogVisible = false;
...@@ -2340,11 +2344,11 @@ export default { ...@@ -2340,11 +2344,11 @@ export default {
this.thresholdLocal && this.thresholdLocal &&
this.thresholdLocal[this.decodeTrainingJobId] && this.thresholdLocal[this.decodeTrainingJobId] &&
this.thresholdLocal[this.decodeTrainingJobId][ this.thresholdLocal[this.decodeTrainingJobId][
sampleObject.tagName sampleObject.tagName
] ]
) { ) {
delete this.thresholdLocal[this.decodeTrainingJobId][ delete this.thresholdLocal[this.decodeTrainingJobId][
sampleObject.tagName sampleObject.tagName
]; ];
sampleObject.pieceStr = ''; sampleObject.pieceStr = '';
const tempCharOption = sampleObject.charData.charOption; const tempCharOption = sampleObject.charData.charOption;
...@@ -2371,7 +2375,7 @@ export default { ...@@ -2371,7 +2375,7 @@ export default {
this.thresholdLocal[this.decodeTrainingJobId][this.currentTagName] this.thresholdLocal[this.decodeTrainingJobId][this.currentTagName]
) { ) {
delete this.thresholdLocal[this.decodeTrainingJobId][ delete this.thresholdLocal[this.decodeTrainingJobId][
this.currentTagName this.currentTagName
]; ];
this.currentSample.pieceStr = ''; this.currentSample.pieceStr = '';
const tempCharOption = this.currentSample.charData.charOption; const tempCharOption = this.currentSample.charData.charOption;
...@@ -2383,7 +2387,7 @@ export default { ...@@ -2383,7 +2387,7 @@ export default {
tempCharOption.visualMap = null; tempCharOption.visualMap = null;
tempCharOption.series[0].markLine = null; tempCharOption.series[0].markLine = null;
tempCharOption.series[0].lineStyle[ tempCharOption.series[0].lineStyle[
'color' 'color'
] = this.currentSample.colors; ] = this.currentSample.colors;
} }
this.currentSample.charObj.setOption(tempCharOption, false); this.currentSample.charObj.setOption(tempCharOption, false);
...@@ -2391,8 +2395,8 @@ export default { ...@@ -2391,8 +2395,8 @@ export default {
} }
this.clearCache(); this.clearCache();
localStorage.setItem( localStorage.setItem(
'thresholdCache', 'thresholdCache',
JSON.stringify(this.thresholdLocal), JSON.stringify(this.thresholdLocal)
); );
this.delThresholdVisible = false; this.delThresholdVisible = false;
}, },
...@@ -2408,11 +2412,25 @@ export default { ...@@ -2408,11 +2412,25 @@ export default {
.cl-scalar-manage { .cl-scalar-manage {
height: 100%; height: 100%;
.el-dialog__title { .el-dialog {
line-height: 24px; border-radius: 4px;
font-size: 18px; }
color: #303133;
font-weight: bold; .el-dialog__header {
padding: 15px 15px 10px;
font-size: 14px;
.el-dialog__title {
font-size: 14px;
}
}
.el-dialog__body {
padding: 10px 15px;
}
.el-dialog__footer {
padding: 5px 15px 10px;
} }
.w60 { .w60 {
...@@ -2776,7 +2794,7 @@ export default { ...@@ -2776,7 +2794,7 @@ export default {
} }
.fs16 { .fs16 {
font-size: 16px; font-size: 14px;
color: #6c7280; color: #6c7280;
width: 180px; width: 180px;
} }
...@@ -2789,17 +2807,6 @@ export default { ...@@ -2789,17 +2807,6 @@ export default {
} }
.delDialog { .delDialog {
.el-dialog__header {
padding: 15px 15px 10px;
}
.el-dialog__title {
font-weight: normal;
line-height: 18px;
}
.el-dialog__body {
padding: 10px 15px;
}
.delThresholdItem { .delThresholdItem {
display: flex; display: flex;
margin-bottom: 10px; margin-bottom: 10px;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或