joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

调整代码

Browse Source
This commit is contained in:
zyy 2020-08-12 18:26:27 +08:00
parent 0348d143b5
commit 36a0b1dd93
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jmapNew/shape/Section/index.js
View File

@ -732,9 +732,9 @@ export default class Section extends Group {
} }
} }
/** 保护区段延时解锁*/ /** 保护区段延时解锁 时间计时*/
protectiveTimeRelease() { protectiveTimeRelease() {
console.log(this.model); // console.log(this.model);
this.releaseName && this.releaseName.show(); this.releaseName && this.releaseName.show();
// this.releaseName.setStyle('text', '20'); // this.releaseName.setStyle('text', '20');
// this.section.setStyle({ // this.section.setStyle({
@ -883,14 +883,13 @@ export default class Section extends Group {
drawSelected(selected) { drawSelected(selected) {
this.selected = selected; this.selected = selected;
if (selected) { if (selected) {
if (this.style.Section.line.isActiveShow) { if (this.style.Section.line.isActiveShow) { // 哈尔滨线路专属显示
this.lineBorder && this.lineBorder.setStyle({ lineWidth: this.style.Section.line.width + 3 }); this.lineBorder && this.lineBorder.setStyle({ lineWidth: this.style.Section.line.width + 3 });
} else { } else {
!this.selectedType && this.section && this.section.setStyle({ stroke: '#fbfbfb' }); !this.selectedType && this.section && this.section.setStyle({ stroke: '#fbfbfb' });
} }
} else { } else {
this.lineBorder && this.lineBorder.setStyle({ lineWidth: 0 }); this.lineBorder && this.lineBorder.setStyle({ lineWidth: 0 });
// !this.selectedType && this.section && this.section.setStyle({ stroke: this.style.Section.line.spareColor });
!this.selectedType && this.setState(this.model); !this.selectedType && this.setState(this.model);
} }
} }

1
src/views/competitionManage/competition/index.vue
View File

@ -67,6 +67,7 @@ export default {
{ {
type: 'button', type: 'button',
title: this.$t('global.operate'), title: this.$t('global.operate'),
width: 580,
buttons: [ buttons: [
{ {
name: '修改', name: '修改',

10
src/views/publish/runPlanEveryDay/runPlanView.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="main" style="background-color:floralwhite"> <div class="main" style="background-color:floralwhite">
<div :id="runPlanId" /> <div :id="runPlanId" />
<div v-if="isShowBack" style="float: right; margin-right: 2%; margin-top: 10px; margin-bottom: 20px"> <div v-if="isShowBack" style="float: right; margin-right: 2%; margin-top: 0px; margin-bottom: 0px">
<el-button-group> <el-button-group>
<el-button type="primary" @click="back">{{ $t('global.return') }}</el-button> <el-button type="primary" @click="back">{{ $t('global.return') }}</el-button>
</el-button-group> </el-button-group>
@ -32,7 +32,7 @@ export default {
top: '30px', top: '30px',
left: '120px', left: '120px',
right: '2%', right: '2%',
bottom: '80px', bottom: '65px',
containLabel: true, containLabel: true,
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
@ -163,9 +163,9 @@ export default {
this.setPlanSize(); this.setPlanSize();
}, },
$route() { $route() {
this.$nextTick(() => { // this.$nextTick(() => {
this.loadChartPage(this.$route.query); this.loadChartPage(this.$route.query);
}); // });
} }
}, },
mounted() { mounted() {
@ -344,7 +344,7 @@ export default {
this.myChart = null; this.myChart = null;
} }
}, },
back() { back() { // 返回判断
if (this.$route.params.mode === 'everyDay') { if (this.$route.params.mode === 'everyDay') {
this.$router.replace({ path: `${UrlConfig.publish.runPlanEveryDay}` }); this.$router.replace({ path: `${UrlConfig.publish.runPlanEveryDay}` });
} else if (this.$route.params.mode === 'template') { } else if (this.$route.params.mode === 'template') {