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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-07-28 18:30:10 +08:00
commit c0e3df14bc
22 changed files with 275 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/config/skinCode/haerbin_01.js
View File

@ -349,6 +349,7 @@ class SkinCode extends defaultStyle {
lampSpace: 60 // 灯间距
},
StationControl: {
disPlayNone: true, // 不显示
text: {
distance: 2, // 灯和文字之间的距离
fontSize: 11, // 字体大小

31
src/jmapNew/shape/Station/index.js
View File

@ -172,6 +172,7 @@ export default class Station extends Group {
// 创建控制模式
createControlMode() {
const model = this.model;
if (!this.style.Station.StationControl.disPlayNone) {
if (model.visible && model.createControlMode) {
// 紧急站控
this.createEmergencyControl();
@ -185,6 +186,7 @@ export default class Station extends Group {
// 联锁控
this.createInterconnectedControl();
}
}
this.setState(model);
}
@ -355,6 +357,12 @@ export default class Station extends Group {
this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor);
this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色
if (this.style.Station.StationControl.disPlayNone) {
this.stationText && this.stationText.setStyle('textFill', '#1fdc1f');
if (this.model.subheadDisplay) { // 副标题
this.subheadText && this.subheadText.setStyle('textFill', '#1fdc1f');
}
}
}
handleLocal() { // 站控
@ -363,6 +371,12 @@ export default class Station extends Group {
this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.lamp.yellowColor); // 文字颜色
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
if (this.style.Station.StationControl.disPlayNone) {
this.stationText && this.stationText.setStyle('textFill', '#fff');
if (this.model.subheadDisplay) { // 副标题
this.subheadText && this.subheadText.setStyle('textFill', '#fff');
}
}
}
handleEmergency() { // 紧急站控
@ -371,6 +385,21 @@ export default class Station extends Group {
this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
if (this.style.Station.StationControl.disPlayNone) {
this.stationText && this.stationText.setStyle('textFill', '#fff');
if (this.model.subheadDisplay) { // 副标题
this.subheadText && this.subheadText.setStyle('textFill', '#fff');
}
}
}
handleNone() { // 空
if (this.style.Station.StationControl.disPlayNone) { // 没有控制时显示 黄色
this.stationText && this.stationText.setStyle('textFill', '#FFFF00');
if (this.model.subheadDisplay) { // 副标题
this.subheadText && this.subheadText.setStyle('textFill', '#FFFF00');
}
}
}
recover() {
@ -389,6 +418,7 @@ export default class Station extends Group {
setState(model) {
if (!this.isShowShape) return;
this.recover();
// console.log(model.controlMode, model);
model.controlMode && this['handle' + model.controlMode]();
if (model.tbStrategyId) {
store.state.map.map.tbStrategyList.forEach(item => {
@ -398,7 +428,6 @@ export default class Station extends Group {
}
});
}
}
getShapeTipPoint(opts) {

7
src/jmapNew/theme/components/menus/dialog/routeControl.vue
View File

@ -110,6 +110,13 @@ export default {
return '';
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show && this.popClass === 'ningbo-01__systerm') {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');

7
src/jmapNew/theme/components/menus/dialog/routeDetail.vue
View File

@ -103,6 +103,13 @@ export default {
return '查询进路状态';
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show && this.systemName === 'ningbo-01__systerm') {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');

5
src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
View File

@ -146,6 +146,11 @@ export default {
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show && this.systemName === 'ningbo-01__systerm' && !this.commitDisabled) {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {

11
src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
View File

@ -194,6 +194,17 @@ export default {
});
},
deep: true
},
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show && this.popClass === 'ningbo-01__systerm') {
if (!this.cmdDisabled[0]) {
this.command();
} else if (!this.cmdDisabled[1]) {
this.confirm1();
} else if (!this.cmdDisabled[2]) {
this.confirm2();
}
}
}
},
mounted() {

7
src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
View File

@ -64,6 +64,13 @@ export default {
return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : '';
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show && this.popClass === 'ningbo-01__systerm') {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');

7
src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
View File

@ -78,6 +78,13 @@ export default {
return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : '';
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show && this.popClass === 'ningbo-01__systerm') {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');

36
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -333,22 +333,28 @@ export default {
this.centralizedStationList = new Array(15).fill({});
this.stationParamList.forEach((station, index) => {
this.centralizedStationList[index] = station;
if (station.disabledName) {
station.disabled = this.selectedObj[station.disabledName] == station.mode;
}
});
this.tempData = [];
this.tempData.push(this.selectedObj);
if (this.selectedObj.centralized) {
this.param = {
stationCode: this.selectedObj.code,
stationCodes: [this.selectedObj.code]
};
} else {
this.stationList.forEach(station => {
if (station.centralized && station.chargeStationCodeList.includes(this.selectedObj.code)) {
this.param = { stationCode: station.code, stationCodes: [station.code] };
}
});
}
// if (this.selectedObj.centralized) {
// this.param = {
// stationCode: this.selectedObj.code,
// stationCodes: [this.selectedObj.code]
// };
// } else {
// this.stationList.forEach(station => {
// if (station.centralized && station.chargeStationCodeList.includes(this.selectedObj.code)) {
// this.param = { stationCode: station.code, stationCodes: [station.code, ...station.chargeStationCodeList] };
// }
// });
// }
},
handleParam() {
if (this.operate == OperationEvent.Signal.cancelTrainRoute.menu.operation || this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation) {
@ -399,8 +405,8 @@ export default {
},
initMenus() {
this.basicParamList = this.$store.state.training.prdType === '01' ? [
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false },
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },
{ name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, show:false, securityCommand: true },
// { name: '重启另解', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false, securityCommand: true },
{ name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false },
@ -456,10 +462,12 @@ export default {
{ name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menu, show: false }
];
this.stationParamList = this.$store.state.training.prdType === '01' ? [
{ name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false }
{ name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false },
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' }
] : [
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false },
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },
{ name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false },
{ name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false },
{ name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false },

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

@ -183,6 +183,15 @@ export default {
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show) {
if (this.type !== 'password') {
this.commitOnce();
} else if (this.type !== 'text') {
this.commit();
}
}
}
},
mounted() {
this.$nextTick(() => {

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

@ -90,6 +90,13 @@ export default {
return disabled;
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show && !this.commitDisabled) {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');

12
src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue
View File

@ -109,6 +109,18 @@ export default {
return '解除封锁';
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show) {
if (!this.disabledConfirm1) {
this.confirm1();
} else if (!this.disabledConfirm2) {
this.confirm2();
}
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');

7
src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
View File

@ -70,6 +70,13 @@ export default {
return '';
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show) {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');

13
src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue
View File

@ -265,6 +265,19 @@ export default {
},
'speed': function (val) {
if (val) this.cmdDisabled[0] = false;
},
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show) {
if (this.$refs.confirmControlSpeed.show) {
this.$refs.confirmControlSpeed.commit();
} else if (!this.cmdDisabled[0]) {
this.command();
} else if (!this.cmdDisabled[1]) {
this.confirm1();
} else if (!this.cmdDisabled[2]) {
this.confirm2();
}
}
}
},
mounted() {

4
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -59,7 +59,9 @@ export default {
/** 回复站控请求（同意/拒绝） */
CMD_CM_REPLY_STATION_CONTROL: {value:'CM_Reply_Station_Control', label: '回复站控请求'},
/** 回复中控请求（同意/拒绝） */
CMD_CM_REPLY_CENTER_CONTROL: {value:'CM_Reply_Center_Control', label: '回复中控请求'}
CMD_CM_REPLY_CENTER_CONTROL: {value:'CM_Reply_Center_Control', label: '回复中控请求'},
CMD_CM_RECEIVE_CONTROL: {value:'CM_Receive_Control', label: '接收控制'},
CMD_CM_SURRENDER_CONTROL: {value:'CM_Surrender_Control', label: '交出控制'},
},
// 司机操作

2
src/scripts/cmdPlugin/MenuContextHandler.js
View File

@ -69,7 +69,9 @@ class MenuContextHandler {
if (this.getPrdType() != '' && this.getPrdType() != null) {
const type = State2SimulationMap[this.getPrdType()];
const status = State2ControlMap[control.controlMode]; // 判断当前模式
if (type) {
menu = [...menuList[type]];
}
// 特殊处理站台的右键操作( 因为小站台不允许有操作 )
if (selected._type == 'StationStand') {
if (selected.small) {

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://b29z135112.zicp.vip';

5
src/views/newMap/displayNew/index.vue
View File

@ -221,6 +221,7 @@ export default {
},
'$store.state.app.windowSizeCount': function() {
this.setWindowSize();
this.setPosition();
},
$route() {
this.initLoadData();
@ -506,8 +507,8 @@ export default {
if (menuTool) {
this.offset = (menuTool.offsetHeight || 0) + 15;
}
const buttonWidth = this.width - 1200;
if (menuBottom && buttonWidth < 550) {
const buttonWidth = this.width - 1200; // B box widht
if (menuBottom && buttonWidth < 780) {
this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
}
if (menuButtonsBox) {

29
src/views/newMap/jointTrainingNew/chatView/chatBox.vue
View File

@ -15,6 +15,16 @@
<div class="chat-setting" @click="handleSetting()">
<i class="el-icon-s-tools" />
</div>
<div v-if="!commonConversation" class="chat-setting" @click="goCommonConversation">
<el-tooltip effect="dark" content="公共会话" placement="top-start">
<i class="el-icon-chat-line-round" />
</el-tooltip>
</div>
<div v-if="conversitionId && commonConversation" class="chat-setting" @click="cancelCommonConversation">
<el-tooltip effect="dark" content="私有会话" placement="top-start">
<i class="el-icon-chat-round" />
</el-tooltip>
</div>
</div>
<div class="chat-box-content">
<el-tree
@ -36,7 +46,6 @@
</div>
<div class="chat-box-footer">
<div style="width: 400px;font-size: 14px;">{{ userString }}</div>
<el-button size="mini" type="primary" class="chat-box-footer-create" style="right: 80px;" @click="goCommonConversation">公共会话</el-button>
<el-button size="mini" type="primary" class="chat-box-footer-create" :loading="createLoading" @click="createCoversition()">创建群聊</el-button>
<div v-if="scriptTip" class="scriptTip">{{ scriptTip }}</div>
</div>
@ -50,6 +59,21 @@
<div class="chat-setting" @click="handleSetting()">
<i class="el-icon-s-tools" />
</div>
<div v-if="!conversitionId && userRole !== 'AUDIENCE'" class="chat-setting" @click="cancelCommonConversation">
<el-tooltip effect="dark" content="成员列表" placement="top-start">
<i class="el-icon-s-custom" />
</el-tooltip>
</div>
<div v-if="!commonConversation" class="chat-setting" @click="goCommonConversation">
<el-tooltip effect="dark" content="公共会话" placement="top-start">
<i class="el-icon-chat-line-round" />
</el-tooltip>
</div>
<div v-if="conversitionId && commonConversation" class="chat-setting" @click="cancelCommonConversation">
<el-tooltip effect="dark" content="私有会话" placement="top-start">
<i class="el-icon-chat-round" />
</el-tooltip>
</div>
</div>
<div class="chat-box-content">
<chat-content
@ -76,9 +100,6 @@
<div class="chat-box-footer">
<div class="chat-box-footer-tool" />
<el-button v-if="isConversitionCreator && isButtonShow && !commonConversation" size="mini" type="danger" class="chat-box-footer-quit" :loading="quitLoading" @click="quitConversition()">退出群聊</el-button>
<el-button v-if="!commonConversation" class="chat-box-footer-send" size="mini" type="primary" @click="goCommonConversation">公共会话</el-button>
<el-button v-if="!conversitionId && userRole !== 'AUDIENCE'" class="chat-box-footer-send" size="mini" type="primary" @click="cancelCommonConversation">成员列表</el-button>
<el-button v-if="conversitionId && commonConversation" class="chat-box-footer-send" size="mini" type="primary" @click="cancelCommonConversation">私有会话</el-button>
<el-button v-if="isButtonShow && !commonConversation" class="chat-box-footer-send" size="mini" type="primary" :disabled="recordSending" @click="startRecording()">发送语音</el-button>
<div v-if="scriptTip" class="scriptTip">{{ scriptTip }}</div>
</div>

25
src/views/newMap/jointTrainingNew/index.vue
View File

@ -83,6 +83,7 @@ import { EventBus } from '@/scripts/event-bus';
import { timeFormat } from '@/utils/date';
import { Message } from 'element-ui';
import localStore from 'storejs';
import { getToken } from '@/utils/auth';
import MembersManage from './memberManage/membersManage';
import AddMember from './memberManage/addMember';
import { computationTime } from '@/utils/date';
@ -210,6 +211,7 @@ export default {
},
'$store.state.app.windowSizeCount': function() { // 窗口变化
this.setWindowSize();
this.setPosition();
},
$route() {
this.initLoadData();
@ -261,7 +263,7 @@ export default {
this.offset = (menuTool.offsetHeight || 0) + 15;
}
const buttonWidth = this.width - 1200;
if (menuBottom && buttonWidth < 550) {
if (menuBottom && buttonWidth < 780) {
this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
}
});
@ -422,7 +424,7 @@ export default {
this.hideIbp();
break;
case 'DRIVER':
this.$store.dispatch('training/setPrdType', '');
this.$store.dispatch('training/setPrdType', '04');
this.$store.dispatch('training/setRoles', 'DRIVER');
this.jl3dmaintainershow = false;
break;
@ -514,10 +516,27 @@ export default {
window.open(routeData.href, '_blank', 'noopener noreferrer');
},
hidepanel() { // 司机视角
// this.panelShow = false;
// this.drivingShow = true;
// this.ibpShow = false;
// this.$refs.Jl3dDrive.show(this.mapId, this.group);
if (this.$store.state.training.prdType == '04') {
this.panelShow = false;
this.drivingShow = true;
this.ibpShow = false;
this.$refs.Jl3dDrive.show(this.mapId, this.group);
} else {
const routeData = this.$router.resolve({
path:'/jlmap3d/sandbox',
query:{
mapid: this.mapId,
group: this.group,
token: getToken(),
project: this.project,
noPreLogout: true
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
}
},
hideIbp() {

15
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -100,7 +100,7 @@ export default {
isGoback: false,
noQrcodeList: NoQrcodeList,
isShow3dmodel :false,
jl3dname: this.$t('display.demon.threeDimensionalView'),
jl3dname: this.$t('display.demon.threeDimensionalView')
};
},
computed: {
@ -109,16 +109,16 @@ export default {
},
isShowScheduling() {
// 行调与管理员 可显示
return this.$store.state.training.prdType == '02' || this.$store.state.training.prdType == '';
return (this.$store.state.training.prdType == '02' || this.$store.state.training.prdType == '') && !this.$route.query.projectDevice;
},
isSpeaking() {
return this.userRole != 'DRIVER' && this.userRole != '';
},
isStationSupervisor() {
return this.userRole == 'STATION_SUPERVISOR';
return this.userRole == 'STATION_SUPERVISOR' && !this.$route.query.projectDevice;
},
isDriver() {
return this.userRole == 'DRIVER';
return this.userRole == 'DRIVER' && !this.$route.query.projectDevice;
},
project() {
return getSessionStorage('project');
@ -153,6 +153,9 @@ export default {
this.back();
}
}
},
'$store.state.training.prdType': function(prdType) {
this.change3dname();
}
},
async mounted() {
@ -192,7 +195,7 @@ export default {
this.$emit('getUserRole');
break;
case 'DRIVER':
this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'DRIVER');
this.$store.dispatch('training/setPrdType', '04'); this.$store.dispatch('training/setRoles', 'DRIVER');
this.$emit('getUserRole');
break;
case 'MAINTAINER':
@ -363,7 +366,7 @@ export default {
});
},
change3dname() {
if (this.$route.query.prdType == '04') {
if (this.$store.state.training.prdType == '04') {
this.jl3dname = this.$t('display.demon.driverPerspective'); // 司机视角
} else {
this.jl3dname = this.$t('display.demon.threeDimensionalView'); // 三维视图