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

宁波菜单回车快捷键（区段、信号机、车站）&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整

Browse Source
This commit is contained in:
fan 2020-07-28 18:28:31 +08:00
parent 10918d1f06
commit f13ba95407
14 changed files with 155 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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');

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() {

2
src/store/modules/map.js
View File

@ -874,7 +874,7 @@ const map = {
};
},
setKeyboardEnter: (state) => {
state.keyboardEnterCount++;
state.keyboardEnterCount++;
}
},

65
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>
@ -205,7 +226,7 @@ export default {
});
},
'$store.state.socket.createConversition':function(val) {
const member = this.memberData[val.creatorId];
const member = this.memberData[val.creatorId];
if (member && member.userId == this.$store.state.user.id) {
const memberList = [];
val.memberIds.forEach(id=>{
@ -369,23 +390,23 @@ export default {
this.form = data;
},
createCoversition() {
if (this.memberIdList.length) {
this.createLoading = true;
startConversition(this.group, this.memberIdList).then(resp => {
this.conversitionId = resp.data.id;
this.messageList = [];
this.privateMessageList = [];
this.userString = '';
this.isConversitionCreator = true;
this.$message.success('创建会话成功！');
this.createLoading = false;
}).catch((error) => {
this.$message.error(error.code == '3005' ? '创建会话失败:仿真会话成员忙线中！' : '创建仿真失败！');
this.createLoading = false;
});
} else {
this.userString = '群聊列表为空, 请选择人员';
}
if (this.memberIdList.length) {
this.createLoading = true;
startConversition(this.group, this.memberIdList).then(resp => {
this.conversitionId = resp.data.id;
this.messageList = [];
this.privateMessageList = [];
this.userString = '';
this.isConversitionCreator = true;
this.$message.success('创建会话成功！');
this.createLoading = false;
}).catch((error) => {
this.$message.error(error.code == '3005' ? '创建会话失败:仿真会话成员忙线中！' : '创建仿真失败！');
this.createLoading = false;
});
} else {
this.userString = '群聊列表为空, 请选择人员';
}
},
// 语音录制开始
startRecording() {

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

@ -7,11 +7,11 @@
<el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
<el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" @click="generateQrCode">生成二维码</el-button>
<!-- cctv视图 -->
<!-- cctv视图 -->
<el-button v-if="(isShowScheduling && !dataError) || (isStationSupervisor && !dataError)" @click="jumpjl3dpassflow">{{ $t('display.demon.passengerflow') }}</el-button>
<!-- 三维视图 / 司机视角 -->
<!-- 三维视图 / 司机视角 -->
<el-button v-if="(isShowScheduling && !dataError) || (isDriver && !dataError)" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
<!-- 设备视图 -->
<!-- 设备视图 -->
<el-button v-if="isShow3dmodel && isShowScheduling && !dataError" @click="jumpjlmap3dmodel">{{ $t('display.demon.deviceView') }}</el-button>
<template v-if="isAdmin && project != 'refereeJsxt'">
@ -98,27 +98,27 @@ export default {
chatShow: true,
jsStart: true,
isGoback: false,
noQrcodeList: NoQrcodeList,
isShow3dmodel :false,
jl3dname: this.$t('display.demon.threeDimensionalView'),
noQrcodeList: NoQrcodeList,
isShow3dmodel :false,
jl3dname: this.$t('display.demon.threeDimensionalView')
};
},
computed: {
lineCode() {
return this.$route.query.lineCode;
},
isShowScheduling() {
// 行调与管理员 可显示
return this.$store.state.training.prdType == '02' || this.$store.state.training.prdType == '';
},
isShowScheduling() {
// 行调与管理员 可显示
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');
@ -156,7 +156,7 @@ export default {
}
},
async mounted() {
this.change3dname();
this.change3dname();
},
beforeDestroy() {
this.$store.dispatch('training/setGroup', '');
@ -303,11 +303,11 @@ export default {
},
jlmap3dcctv() {
this.$emit('hidejl3dcctv');
},
jumpjl3dpassflow() {
},
jumpjl3dpassflow() {
this.$emit('passflow');
},
jumpjlmap3dmodel() {
},
jumpjlmap3dmodel() {
this.$emit('devicemodel');
},
startCompetition() {
@ -361,8 +361,8 @@ export default {
}).catch(() => {
this.$messageBox('仿真生成二维码失败！');
});
},
change3dname() {
},
change3dname() {
if (this.$route.query.prdType == '04') {
this.jl3dname = this.$t('display.demon.driverPerspective'); // 司机视角
} else {