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-02 10:51:47 +08:00
parent dca7f94ad8
commit 8117a31c80
9 changed files with 138 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jmapNew/config/skinCode/fuzhou_01.js
View File

@ -211,7 +211,8 @@ class SkinCode extends defaultStyle {
}, },
standEmergent: { // 紧急关闭 standEmergent: { // 紧急关闭
mergentR: 4, // 站台紧急关闭半径 mergentR: 4, // 站台紧急关闭半径
offset: {x: 0, y: 40}, // 站台紧急关闭偏移量 insideOffset: { x: 0, y: 25 }, // 内站台紧急关闭偏移量
outsideOffset: { x: 0, y: -25 }, // 外站台紧急关闭偏移量
closeColor: '#F61107' // 站台紧急关闭颜色 closeColor: '#F61107' // 站台紧急关闭颜色
}, },
reentry: { // 站台折返策略 reentry: { // 站台折返策略
@ -394,8 +395,12 @@ class SkinCode extends defaultStyle {
core: { core: {
length: 6 // 道岔单边长度 length: 6 // 道岔单边长度
}, },
block: { // 道岔封锁配置 jointImg: { // 道岔 A B C D四元素属性配置
blockName: 'default' // 默认道岔封锁类型 trapezoidLength: 8, // 直角梯形元素默认长度
block: false, // 联合图形封锁状态
flashingColors: '#D600D5', // 联合图形封锁闪烁显示颜色
fork: false, // 挤岔专用（如有挤岔操作 变为true）
forKColor: 'red' // 挤岔颜色 配合挤岔专用
}, },
arcBlcok: { // 圆形封锁图形 arcBlcok: { // 圆形封锁图形
show: false, // 显示 show: false, // 显示

30
src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
View File

@ -223,27 +223,19 @@ export default {
if (selected) { if (selected) {
this.model.sectionCode = selected.code; this.model.sectionCode = selected.code;
if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) { if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
if (selected.isSwitchSection) {
const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
if (section) { if (section) {
this.model.sectionName = section.name; this.model.sectionName = `${section.name}-${selected.name}(${selected.code})`;
}
} else { } else {
const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); this.model.sectionName = `${selected.name}(${selected.code})`;
if (section) {
this.model.sectionName = section.name;
this.model.sectionName = `${section.name}-${selected.name}`;
} else {
this.model.sectionName = `${selected.name}`;
}
} }
} else if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) { } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
const section = this.$store.getters['map/getDeviceByCode'](selected.switchSectionCode); const section = this.$store.getters['map/getDeviceByCode'](selected.sectionParentCode);
if (section) { if (section) {
this.model.sectionName = section.name; this.model.sectionName = `${section.name}(${section.code})`;
this.model.sectionCode = section.code;
} }
} }
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode); const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
if (station) { if (station) {
this.model.stationName = station.name; this.model.stationName = station.name;
@ -268,10 +260,10 @@ export default {
this.randomSectionList = []; this.randomSectionList = [];
this.sectionList.forEach(section => { this.sectionList.forEach(section => {
if (section.stationCode == code) { if (section.stationCode == code) {
let name = section.name; let name = `${section.name}(${section.code})`;
if (section.type == '02') { if (section.type == '02') {
const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode); const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode);
name = `${sectionParent.name}-${section.name}`; name = `${sectionParent.name}-${section.name}(${section.code})`;
} }
this.randomSectionList.push({ name: `${name}`, code: section.code }); this.randomSectionList.push({ name: `${name}`, code: section.code });
} }
@ -364,10 +356,10 @@ export default {
if (valid) { if (valid) {
this.type = 'text'; this.type = 'text';
this.stopTask(); this.stopTask();
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.popupAlarm.doShow( // this.$refs.popupAlarm.doShow(
Object.assign(this.operate, {val: operate.val}), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`] // Object.assign(this.operate, {val: operate.val}), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]
); // );
} }
}).catch((error) => { }).catch((error) => {
this.loading = false; this.loading = false;

41
src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue
View File

@ -1,9 +1,19 @@
<template> <template>
<el-dialog class="ningbo-01__systerm popup-alarm" :title="title" :visible.sync="show" width="500px" <el-dialog
:before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag> v-dialogDrag
class="ningbo-01__systerm popup-alarm"
:title="title"
:visible.sync="show"
width="500px"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
append-to-body
>
<el-row> <el-row>
<el-col :offset="2"> <el-col :offset="2">
<span v-for="(message, index) in messages" :key="index">{{message}}</span><br> <span v-for="(message, index) in messages" :key="index">{{ message }}</span><br>
</el-col> </el-col>
</el-row> </el-row>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
@ -15,17 +25,17 @@
</template> </template>
<script> <script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic'; import { OperationEvent } from '@/scripts/ConstDic';
export default { export default {
name: 'Popup-Alarm', name: 'PopupAlarm',
data() { data() {
return { return {
dialogShow: false, dialogShow: false,
messages: [], messages: [],
operate: null, operate: null,
operation: '', operation: ''
} };
}, },
computed: { computed: {
show() { show() {
@ -41,7 +51,7 @@
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.$store.dispatch('training/tipReload'); this.$store.dispatch('training/tipReload');
}) });
}, },
methods: { methods: {
doShow(operate, messages) { doShow(operate, messages) {
@ -65,20 +75,19 @@
}, },
alxeEffective() { alxeEffective() {
let operate = { const operate = {
type: this.operate.type, operation: OperationEvent.Command.close.alarm.operation
operation: OperationEvent.Command.close.alarm.operation, };
}
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.doClose(); this.doClose();
} }
}) });
}
} }
} }
};
</script> </script>
<style> <style>

61
src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue
View File

@ -39,7 +39,7 @@
v-model="changeList[scope.$index]" v-model="changeList[scope.$index]"
style="text-align: center; display: block;" style="text-align: center; display: block;"
:disabled="scope.row.disabled" :disabled="scope.row.disabled"
@change="changeCheck(changeList[scope.$index],scope.row.code)" @change="changeCheck(changeList[scope.$index], scope.row.code)"
/> />
</template> </template>
</el-table-column> </el-table-column>
@ -116,13 +116,12 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
domIdChoose() { domIdChoose() {
if (this.dialogShow) {
if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
return OperationEvent.Signal.humanControl.choose.domId; return OperationEvent.Signal.humanControl.choose.domId;
} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
return OperationEvent.Signal.atsAutoControl.choose.domId; return OperationEvent.Signal.atsAutoControl.choose.domId;
} }
} return '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : ''; return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
@ -133,6 +132,7 @@ export default {
} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
return '进路交自动控'; return '进路交自动控';
} }
return '';
} }
}, },
watch: { watch: {
@ -205,6 +205,7 @@ export default {
} }
if (this.selection.length > 0) { if (this.selection.length > 0) {
this.commitDisabled = false; this.commitDisabled = false;
this.handleChooseChange();
} else { } else {
this.commitDisabled = true; this.commitDisabled = true;
} }
@ -237,43 +238,27 @@ export default {
this.commitDisabled = true; this.commitDisabled = true;
} }
}, },
// serializeCodeListWithSeparator(sep) { handleChooseChange() {
// const codeList = []; const codeList = this.selection.map(elem => { return elem; });
// if (this.selection && this.selection.length) { const operate = {
// this.selection.forEach(elem => { operation: '',
// codeList.push(elem.code); val: codeList.join('::')
// }); };
// }
// return codeList.join(sep);
// },
// handleChooseChange(selection) {
// this.selection = selection;
// if (selection && selection.length) {
// const operate = {
// repeat: true,
// type: MapDeviceType.Signal.type,
// operation: '',
// val: this.serializeCodeListWithSeparator('::'),
// selection: selection
// };
// if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
// /** 进路交人工控*/ /** 进路交人工控*/
// operate.operation = OperationEvent.Signal.humanControl.choose.operation; operate.operation = OperationEvent.Signal.humanControl.choose.operation;
// } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
// /** 进路交自动控*/ /** 进路交自动控*/
// operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation; operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
// } }
// this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
// if (valid) { if (valid) {
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
// } }
// }); });
// } else if (!selection) { },
// this.$messageBox(`请选择一条数据`);
// }
// },
commit() { commit() {
if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
/** 进路交人工控*/ /** 进路交人工控*/

3
src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
View File

@ -166,7 +166,8 @@ export default {
// 设置选中指令 // 设置选中指令
const operate = { const operate = {
operation: OperationEvent.Signal.arrangementRoute.choose.operation operation: OperationEvent.Signal.arrangementRoute.choose.operation,
val: row.code
}; };
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {

12
src/scripts/OperationConfig.js
View File

@ -3805,7 +3805,7 @@ export const OperationList = {
// { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
// { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
// { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
// { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' } // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
// ] // ]
// } // }
@ -3880,7 +3880,7 @@ export const OperationList = {
// { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
// { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
// { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
// { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' } // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
// ] // ]
// } // }
{ {
@ -4116,7 +4116,7 @@ export const OperationList = {
{ {
maxDuration: 15, maxDuration: 15,
minDuration: 8, minDuration: 8,
operateType: '0212', operateType: '0215',
skinCode: '06', skinCode: '06',
trainingName: '人工解锁进路({5})', trainingName: '人工解锁进路({5})',
trainingRemark: '人工解锁进路', trainingRemark: '人工解锁进路',
@ -4130,7 +4130,7 @@ export const OperationList = {
{ {
maxDuration: 15, maxDuration: 15,
minDuration: 8, minDuration: 8,
operateType: '0212', operateType: '0216',
skinCode: '06', skinCode: '06',
trainingName: '信号机引导办理({5})', trainingName: '信号机引导办理({5})',
trainingRemark: '信号机引导办理', trainingRemark: '信号机引导办理',
@ -4195,7 +4195,7 @@ export const OperationList = {
trainingName: '请求遥控({1})', trainingName: '请求遥控({1})',
trainingRemark: '控制权限转换，站控转中控', trainingRemark: '控制权限转换，站控转中控',
trainingType: '01', trainingType: '01',
productTypes: ['02'], productTypes: ['02'], // 行调请求中控
stepVOList: [ stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '202', tip: '鼠标左键点击顶部菜单栏【请求遥控】' }, { deviceType: '05', orderNum: 1, operateCode: '202', tip: '鼠标左键点击顶部菜单栏【请求遥控】' },
{ deviceType: '05', orderNum: 2, operateCode: '202', tip: '鼠标左键点击【应用】' } { deviceType: '05', orderNum: 2, operateCode: '202', tip: '鼠标左键点击【应用】' }
@ -4209,7 +4209,7 @@ export const OperationList = {
trainingName: '请求站控({1})', trainingName: '请求站控({1})',
trainingRemark: '控制权限转换，中控转站控', trainingRemark: '控制权限转换，中控转站控',
trainingType: '01', trainingType: '01',
productTypes: ['01'], productTypes: ['01'], // 现地请求站控
stepVOList: [ stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '204', tip: '鼠标左键点击顶部菜单栏【请求站控】' }, { deviceType: '05', orderNum: 1, operateCode: '204', tip: '鼠标左键点击顶部菜单栏【请求站控】' },
{ deviceType: '05', orderNum: 2, operateCode: '204', tip: '鼠标左键点击【应用】' } { deviceType: '05', orderNum: 2, operateCode: '204', tip: '鼠标左键点击【应用】' }

1
src/scripts/cmdPlugin/ValidateHandler.js
View File

@ -52,6 +52,7 @@ class ValidateHandler {
const order = Handler.getOrder(); const order = Handler.getOrder();
let valid = false; let valid = false;
debugger;
if (operate.over && steps.length == 1) { // 右键菜单直接发送校验 if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
if (operate && steps[0] && if (operate && steps[0] &&
operate.code == steps[0].code && operate.code == steps[0].code &&

19
src/utils/baseUrl.js
View File

@ -1,19 +0,0 @@
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 = 'http://192.168.3.5: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'; // 张赛
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
} else {
BASE_API = process.env.VUE_APP_BASE_API;
}
return BASE_API;
}

2
src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue
View File

@ -126,7 +126,7 @@ export default {
methods:{ methods:{
deviceChange(code) { deviceChange(code) {
this.$emit('setCenter', code); this.$emit('setCenter', code);
this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code)); this.setModel(this.$store.getters['map/getDeviceByCode'](code));
}, },
setModel(data) { setModel(data) {
this.$refs.dataform.resetFields(); this.$refs.dataform.resetFields();