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-04-16 17:58:59 +08:00
parent bbe8dfabee
commit 66b8c03fef
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmap/shape/Section/index.js
View File

@ -230,7 +230,7 @@ export default class Section extends Group {
const y = Math.min(model.points[0].y, model.points[model.points.length - 1].y) + Math.abs(model.points[model.points.length - 1].y - model.points[0].y) / 2;
const traingle = new JTriangle(model.points[0], model.points[model.points.length - 1]);
const drict = model.trainPosType != '01' ? 1 : -1;
if (model.type == '01' && style.Section.text.show && model.nameShow) { // 物理区段名称
if (model.type == '01' && style.Section.text.show && model.nameShow && !model.isSwitchSection) { // 物理区段名称
const opposite = style.Section.text.opposite ? -1 : 1;
const tempx = x + traingle.getSin(style.Section.text.distance);
const tempy = y + traingle.getCos(style.Section.text.distance) * (style.Section.text.position || opposite * drict);
@ -272,7 +272,7 @@ export default class Section extends Group {
textVerticalAlign: style.Section.logicText.textVerticalAlign
});
this.add(this.name);
} else if (model.type == '03' && model.nameShow) { // 道岔计轴区段
} else if (model.type == '03' && model.nameShow) { // 道岔区段 (实际道岔计轴区段)
this.name = new ETextName({
zlevel: this.zlevel,
z: this.z + 2,

4
src/utils/baseUrl.js
View File

@ -2,9 +2,9 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.3.41:9000'; // 张赛

16
src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
View File

@ -82,29 +82,29 @@
>{{ scope.row.runPlanLevelVO.level5 || '' }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('planMonitor.modifying.operation')" width="100">
<!-- <el-table-column :label="$t('planMonitor.modifying.operation')" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleUpdate(scope.row)">{{ $t('planMonitor.modifying.edit') }}</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</el-row>
<div class="button-group" style="text-align: center; margin-top: 10px;">
<el-button type="primary" @click="handleSave">{{ $t('planMonitor.modifying.save') }}</el-button>
<el-button @click="doClose">{{ $t('planMonitor.modifying.cancelAndQuit') }}</el-button>
</div>
<update-station-interval-time ref="updateStationIntervalTime" @handleConfirm="handleConfirm" />
<!-- <update-station-interval-time ref="updateStationIntervalTime" @handleConfirm="handleConfirm" /> -->
</el-dialog>
</template>
<script>
import { formatName } from '@/utils/runPlan';
import { getStationRunning, setStationRunning } from '@/api/runplan';
import UpdateStationIntervalTime from './updateStationIntervalTime';
// import UpdateStationIntervalTime from './updateStationIntervalTime';
export default {
name: 'ModifyingStationIntervalTime',
components: {
UpdateStationIntervalTime
// UpdateStationIntervalTime
},
data() {
return {
@ -167,9 +167,9 @@ export default {
this.loading = false;
this.dialogShow = false;
},
handleUpdate(row) {
this.$refs.updateStationIntervalTime.doShow(row);
},
// handleUpdate(row) {
// this.$refs.updateStationIntervalTime.doShow(row);
// },
handleConfirm(model) {
this.stationIntervalData.forEach(elem => {
if (elem.id == model.stationRunningId) {