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:
zyy 2020-07-28 14:44:52 +08:00
commit 2fd8c44f85
19 changed files with 133 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmapNew/theme/haerbin_01/menus/menuBar.vue
View File

@ -157,6 +157,9 @@ export default {
mounted() {
this.version = this.$store.state.map.version;
this.initMenu();
if (this.$store.state.socket.simulationRoleList && this.$store.state.socket.simulationRoleList.length) {
this.checkRoleChange(this.$store.state.socket.simulationRoleList);
}
},
methods: {
initMenu() {

3
src/router/index_Common.js
View File

@ -62,7 +62,6 @@ const LessonDetail = () => import('@/views/lesson/details');
const ScriptmanageHome = () => import('@/views/scriptManage/home');
const ScriptDisplay = () => import('@/views/scriptManage/display/index');
const ScriptDisplayNew = () => import('@/views/scriptManage/display/indexNew');
const PracticeDisplayNew = () => import('@/views/competitionManage/practiceList/display/index');
const IbpHome = () => import('@/views/ibp/home');
@ -285,7 +284,7 @@ export const publicAsyncRoute = [
},
{ // 剧本编辑 战场图
path: '/scriptDisplayNew/:mode',
component: ScriptDisplayNew,
component: DisplayNew,
hidden: true
},
{ // 实操试题编辑 战场图

3
src/router/index_HEB.js
View File

@ -54,7 +54,6 @@ const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen');
const ScriptmanageHome = () => import('@/views/scriptManage/home');
const ScriptDisplay = () => import('@/views/scriptManage/display/index');
const ScriptDisplayNew = () => import('@/views/scriptManage/display/indexNew');
const IbpHome = () => import('@/views/ibp/home');
const IbpDraw = () => import('@/views/ibp/ibpDraw/index');
@ -224,7 +223,7 @@ export const publicAsyncRoute = [
},
{ // 剧本编辑 战场图
path: '/scriptDisplayNew/:mode',
component: ScriptDisplayNew,
component: DisplayNew,
hidden: true
},

58
src/views/jlmap3d/maintainer/jl3dmaintainer.vue
View File

@ -4,7 +4,7 @@
<div class="display-draft">
<el-button-group>
<el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
<el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
</el-button-group>
@ -14,26 +14,24 @@
v-show="faultlistshow"
:devicelist="devicelist"
@selectdevice="selectdevice"
>
</Devicefault-List>
/>
<Fault-Device
v-show="deviceShow"
ref = "faultdevice"
@closedevice3dview ="devicemodel"
ref="faultdevice"
@closedevice3dview="devicemodel"
/>
<div id="testjlmap3d" class="jlmap3ddraw">
<canvas id="canvastexture" />
</div>
<div class="msg" v-show ="msgshow">
<div v-show="msgshow" class="msg">
<div class="msgtext">
{{controlmsg}}
{{ controlmsg }}
</div>
</div>
<div id="jl3droom" class="roombutton" @click="showroom"></div>
<div id="jl3droom" class="roombutton" @click="showroom" />
</div>
@ -55,7 +53,6 @@ import { JLmap3dMaintainer } from '@/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js
import DevicefaultList from '@/views/jlmap3d/maintainer/component/devicefaultlist';
import FaultDevice from '@/views/jlmap3d/maintainer/component/faultdevice';
import Jlmap3dConfig from '@/views/jlmap3d/simulation/show/configmenu';
import { ProjectIcon } from '@/scripts/ProjectConfig';
@ -66,11 +63,19 @@ export default {
name: 'Jl3dMaintainer',
components: {
DevicefaultList,
FaultDevice,
FaultDevice
// Jlmap3dMsg
// ShowProperty
},
props: {
isAdmin: {
type: Boolean,
default() {
return false;
}
}
},
data() {
return {
training: {
@ -89,7 +94,7 @@ export default {
devicelist:[],
deviceShow:true,
msgshow:false,
controlmsg:"",
controlmsg:''
};
},
@ -98,7 +103,7 @@ export default {
if (this.jlmap3d) {
this.jlmap3d.webwork.postMessage('off');
this.jlmap3d.webwork.terminate();
console.log("www");
console.log('www');
this.jlmap3d.jsonwebworknew.terminate();
this.jlmap3d.dispose();
this.jlmap3d = null;
@ -175,45 +180,45 @@ export default {
showtrainmsg(showtype) {
this.jlmap3d.showtrainmsg(showtype);
},
resetfaultlist(){
resetfaultlist() {
this.devicelist = [];
},
updatefault(fault) {
this.devicelist.push(fault);
},
deletefault(code){
deletefault(code) {
console.log(code);
console.log(this.devicelist);
for(let i=0,leni=this.devicelist.length;i<leni;i++){
if(code == this.devicelist[i].code){
this.devicelist.splice(i,1);
for (let i = 0, leni = this.devicelist.length; i < leni; i++) {
if (code == this.devicelist[i].code) {
this.devicelist.splice(i, 1);
break;
}
}
},
devicemodel(){
devicemodel() {
if (this.deviceShow == false) {
this.deviceShow = true;
} else {
this.deviceShow = false;
}
},
selectdevice(divicedata){
selectdevice(divicedata) {
this.deviceShow = true;
// console.log(divicedata);
this.$refs.faultdevice.showmodel(divicedata);
},
warningmsg(nowmsg){
warningmsg(nowmsg) {
console.log(nowmsg);
this.controlmsg = nowmsg;
this.msgshow = true;
setTimeout(this.warningmsgoff,3000);
setTimeout(this.warningmsgoff, 3000);
},
warningmsgoff(){
warningmsgoff() {
this.msgshow = false;
},
showroom(){
showroom() {
this.deviceShow = true;
this.$refs.faultdevice.showroom();
},
@ -221,7 +226,9 @@ export default {
this.$emit('back');
this.isswitch = false;
},
memberManage() {
this.$emit('handlerMemberManage');
}
}
};
</script>
@ -324,5 +331,4 @@ export default {
z-index: -12;
}
</style>

3
src/views/newMap/displayNew/menuSchema.vue
View File

@ -1,7 +1,8 @@
<template>
<div>
<div class="schema" :style="{top: offset+'px'}">
<el-select v-if="(isScript&&!isScriptCommand) || isDesignPlatform" v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
<!-- (isScript&&!isScriptCommand) || -->
<el-select v-if="isDesignPlatform" v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
<el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
<!-- showSelectStation&&((!isScriptCommand&&swch=='01')||(isScriptCommand && isLocalStation)) -->

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

@ -1,7 +1,7 @@
<template>
<div class="main" :style="{width: canvasWidth+'px'}">
<Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
<Jl3d-Maintainer v-if="jl3dmaintainershow" @back="back" />
<Jl3d-Maintainer v-if="jl3dmaintainershow" :is-admin="isAdmin" @back="back" @handlerMemberManage="handlerMemberManage" />
<ibp-plate v-show="ibpShow" ref="ibpPlate" @hideIbp="hideIbp" />
<template v-show="panelShow" :panelShow="panelShow">
<transition name="el-zoom-in-bottom">
@ -249,6 +249,8 @@ export default {
// 设置菜单和工具栏位置
setPosition() {
this.$nextTick(() => {
this.offset = 10;
this.offsetBottom = 15;
const menuBar = document.getElementById('menuBar');
const menuTool = document.getElementById('menuTool');
const menuBottom = document.getElementById('menuButton');
@ -396,9 +398,10 @@ export default {
this.$store.dispatch('training/setRoles', 'DISPATCHER');
this.hideIbp();
this.drivingShow = false;
if ((this.lineCode === '07' || this.lineCode === '06') && deviceCode) {
if (this.lineCode === '07' || this.lineCode === '06') {
this.mapViewLoadedOver && this.setShowStation('');
}
this.jl3dmaintainershow = false;
break;
case 'STATION_SUPERVISOR':
this.$store.dispatch('training/setPrdType', '01');
@ -408,22 +411,27 @@ export default {
this.$refs.menuSchema.chiShowStation = deviceCode;
this.mapViewLoadedOver && this.switchStationMode(deviceCode);
}
this.jl3dmaintainershow = false;
this.drivingShow = false;
break;
case 'AUDIENCE':
this.$store.dispatch('training/setPrdType', '');
this.$store.dispatch('training/setRoles', 'AUDIENCE');
this.jl3dmaintainershow = false;
this.drivingShow = false;
this.hideIbp();
break;
case 'DRIVER':
this.$store.dispatch('training/setPrdType', '');
this.$store.dispatch('training/setRoles', 'DRIVER');
this.jl3dmaintainershow = false;
break;
case 'MAINTAINER':
this.$store.dispatch('training/setPrdType', '');
this.$store.dispatch('training/setRoles', 'MAINTAINER');
this.hideIbp();
this.jl3dmaintainershow = true;
this.drivingShow = false;
break;
}
},

18
src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
View File

@ -15,7 +15,7 @@
ref="createForm"
:create-form="makeForm"
:add-model="addModel"
:create-rules="createRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -153,22 +153,6 @@ export default {
};
return form;
},
createRules: function () {
return {
width: [
{ required: true, message: this.$t('map.pleaseEnterImageWidth'), trigger: 'blur' }
],
height: [
{ required: true, message: this.$t('map.pleaseEnterImageHeight'), trigger: 'blur' }
],
'position.x': [
{ required: true, message: this.$t('map.pleaseEnterXCoordinate'), trigger: 'blur' }
],
'position.y': [
{ required: true, message: this.$t('map.pleaseEnterYCoordinate'), trigger: 'blur' }
]
};
}
},
mounted() {

10
src/views/newMap/newMapdraft/mapoperate/arrow.vue
View File

@ -15,7 +15,7 @@
ref="createForm"
:create-form="createForm"
:add-model="addModel"
:create-rules="makeRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -77,9 +77,13 @@ export default {
rules: {
code: [
{ required: true, message: this.$t('rules.pleaseSelectLine'), trigger: 'blur' }
],
'position.x': [
{ required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
],
'position.y': [
{ required: true, message: this.$t('rules.trainPositionY'), trigger: 'blur' }
]
},
makeRules: {
}
};
},

3
src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
View File

@ -66,6 +66,9 @@ export default {
},
resetFields() {
this.$refs.dataform && this.$refs.dataform.resetFields();
},
clearValidate() {
this.$refs.dataform && this.$refs.dataform.clearValidate();
}
}
};

45
src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
View File

@ -5,14 +5,14 @@
ref="dataform"
:form="form"
:edit-model="editModel"
:rules="editRules"
:rules="rules"
:type="editModel.type"
@updateMapModel="updateMapModel"
/>
</el-tab-pane>
<el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
<div class="view-control-content">
<config-list ref="make" :form="formMake" :form-model="addModel" :rules="createRules" />
<config-list ref="make" :form="formMake" :form-model="addModel" :rules="rules" />
<div style="color: #99a9bf;font-size: 12px;text-align: center;">
<span>提示:设置归属车站时，坐标会默认设置为车站下方50px</span>
</div>
@ -130,23 +130,6 @@ export default {
pfNum: 0,
switchCode: ''
},
rules: {
code: [
{ required: true, message: this.$t('rules.selectSaidLampType'), trigger: 'change' }
],
name: [
{ required: true, message: this.$t('rules.enterSaidLampName'), trigger: 'blur' }
],
'position.x': [
{ required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
],
'position.y': [
{ required: true, message: this.$t('rules.trainPositionY'), trigger: 'blur' }
],
stationCode: [
{ required: true, message: this.$t('rules.pleaseSelectStationCode'), trigger: 'change'}
]
},
field: ''
};
},
@ -207,11 +190,17 @@ export default {
};
return form;
},
editRules: function () {
rules: function () {
return {
type: [
{ required: true, message: this.$t('rules.selectSaidLampType'), trigger: 'change' }
],
code: [
{ required: true, message: this.$t('rules.pleaseSelectEncoding'), trigger: 'change' }
],
name: [
{ required: true, message: this.$t('rules.enterSaidLampName'), trigger: 'blur' }
],
'position.x': [
{ required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
],
@ -226,22 +215,6 @@ export default {
]
};
},
createRules: function () {
return {
type: [
{ required: true, message: this.$t('rules.selectSaidLampType'), trigger: 'change' }
],
name: [
{ required: true, message: this.$t('rules.enterSaidLampName'), trigger: 'blur' }
],
stationCode: [
{ required: true, message: this.$t('rules.pleaseSelectStationCode'), trigger: 'change'}
],
switchCode: [
{ required: true, message: '请选择所属道岔!', trigger: 'change'}
]
};
},
isButtonType() {
return this.field == 'switchSelectCode';
}

12
src/views/newMap/newMapdraft/mapoperate/counter.vue
View File

@ -15,7 +15,7 @@
ref="createForm"
:create-form="formMake"
:add-model="addModel"
:create-rules="createRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -75,16 +75,6 @@ export default {
'stationList',
'lineCode'
]),
createRules: function () {
return {
type: [
{ required: true, message: this.$t('map.selectCounterType'), trigger: 'change' }
],
stationCode: [
{ required: true, message: this.$t('map.selectStation'), trigger: 'change' }
]
};
},
rules: function () {
return {
code: [

13
src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
View File

@ -5,7 +5,7 @@
ref="dataform"
:form="form"
:edit-model="editModel"
:rules="editRules"
:rules="rules"
type="DelayUnlock"
@updateMapModel="updateMapModel"
/>
@ -15,7 +15,7 @@
ref="createForm"
:create-form="formMake"
:add-model="addModel"
:create-rules="createRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -71,14 +71,7 @@ export default {
'stationList',
'lineCode'
]),
createRules: function () {
return {
stationCode: [
{ required: true, message: this.$t('map.selectStation'), trigger: 'change' }
]
};
},
editRules: function () {
rules: function () {
return {
code: [
{ required: true, message: this.$t('map.pleaseSelectDevice'), trigger: 'change' }

15
src/views/newMap/newMapdraft/mapoperate/lcControl.vue
View File

@ -15,7 +15,7 @@
ref="createForm"
:create-form="createForm"
:add-model="addModel"
:create-rules="createRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -87,19 +87,6 @@ export default {
'lcList',
'lineCode'
]),
createRules: function () {
return {
name: [
{ required: true, message: this.$t('rules.pleaseEnterStatusSignal'), trigger: 'blur' }
],
'position.x': [
{ required: true, message: this.$t('map.pleaseEnterXCoordinate'), trigger: 'blur' }
],
'position.y': [
{ required: true, message: this.$t('map.pleaseEnterYCoordinate'), trigger: 'blur' }
]
};
},
form() {
const form = {
labelWidth: '150px',

13
src/views/newMap/newMapdraft/mapoperate/line.vue
View File

@ -15,7 +15,7 @@
ref="createForm"
:create-form="createForm"
:add-model="addModel"
:create-rules="makeRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -78,17 +78,6 @@ export default {
width: [
{ required: true, message: this.$t('rules.pleaseSelectLineWidth'), trigger: 'blur' }
]
},
makeRules: {
code: [
{ required: true, message: this.$t('rules.pleaseSelectLine'), trigger: 'blur' }
],
type: [
{ required: true, message: this.$t('rules.pleaseSelectLineType'), trigger: 'change' }
],
width: [
{ required: true, message: this.$t('rules.pleaseSelectLineWidth'), trigger: 'blur' }
]
}
};
},

10
src/views/newMap/newMapdraft/mapoperate/power.vue
View File

@ -15,7 +15,7 @@
ref="createForm"
:create-form="createForm"
:add-model="addModel"
:create-rules="makeRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -76,14 +76,6 @@ export default {
width: [
{ required: true, message: this.$t('rules.pleaseSelectLineWidth'), trigger: 'blur' }
]
},
makeRules: {
code: [
{ required: true, message: this.$t('rules.pleaseSelectLine'), trigger: 'blur' }
],
width: [
{ required: true, message: this.$t('rules.pleaseSelectLineWidth'), trigger: 'blur' }
]
}
};
},

10
src/views/newMap/newMapdraft/mapoperate/text.vue
View File

@ -16,7 +16,7 @@
ref="createForm"
:create-form="createForm"
:add-model="addModel"
:create-rules="makeRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -84,14 +84,6 @@ export default {
],
fontColor: [
{ required: true, message: this.$t('rules.textFontColor'), trigger: 'blur' }
]
},
makeRules: {
code: [
{ required: true, message: this.$t('rules.selectText'), trigger: 'blur' }
],
content: [
{ required: true, message: this.$t('rules.pleaseEnterContent'), trigger: 'blur' }
],
'position.x': [
{ required: true, message: this.$t('rules.pleaseEnterXCoordinate'), trigger: 'blur' }

18
src/views/newMap/newMapdraft/mapoperate/zcControl.vue
View File

@ -16,7 +16,7 @@
ref="createForm"
:create-form="formMake"
:add-model="addModel"
:create-rules="createRules"
:create-rules="rules"
@create="create"
/>
</el-tab-pane>
@ -140,22 +140,6 @@ export default {
}
};
return form;
},
createRules: function () {
return {
name: [
{ required: true, message: this.$t('rules.pleaseEnterStatusSignal'), trigger: 'blur' }
],
'position.x': [
{ required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
],
'position.y': [
{ required: true, message: this.$t('rules.trainPositionY'), trigger: 'blur' }
],
concentrateStationList:[
{ required: true, message: this.$t('rules.selectConcentrateStation'), trigger: 'change' }
]
};
}
},
watch: {

47
src/views/scriptManage/display/indexNew.vue
View File

@ -1,47 +0,0 @@
<template>
<!-- <div class="script-parent"> -->
<!-- <div class="script-card" :style="{width: widthLeft+'px'}"> -->
<!-- <tip-script-record ref="tipTaskRecord" :group="group" :width="widthLeft" /> -->
<!-- </div> -->
<!-- <drap-left :width-left="widthLeft" :min="780" :max="980" @drapWidth="drapWidth" /> -->
<!-- <div class="script-display"> -->
<display ref="display" :size="size" />
<!-- -->
<!-- <tip-script-record-new ref="tipTaskRecordNew" :group="group" /> -->
<!-- </div> -->
<!-- </div> -->
</template>
<script>
import Display from '@/views/newMap/displayNew/index';
// import TipScriptRecordNew from './tipScriptRecordNew';
// import drapLeft from '@/views/components/drapLeft/index';
export default {
name: 'ScriptDisplayNew',
components: {
Display
// TipScriptRecordNew
// drapLeft
},
data() {
return {
// widthLeft: 780,
size: {
width: document.documentElement.clientWidth,
height: document.documentElement.clientHeight
},
group: this.$route.query.group
};
},
watch: {
'$store.state.app.windowSizeCount': function() {
this.$nextTick(function() {
this.size = { width: this.$store.state.app.width, height: this.$store.state.app.height};
});
}
},
methods: {
}
};
</script>

3
src/views/scriptManage/display/tipScriptRecordNew.vue
View File

@ -7,7 +7,8 @@
<div class="scriptPanelLeft">
<div class="panelLeftSelect">
<span style="font-size:13px;">当前剧本角色:</span>
<el-select v-model="memberId" filterable placeholder="请选择" :disabled="!backDisabled||isPause" @change="changeRole">
<!-- :disabled="!backDisabled||isPause" -->
<el-select v-model="memberId" filterable placeholder="请选择" @change="changeRole">
<el-option v-for="member in memberList" :key="member.id" :label="member.name" :value="member.id" />
</el-select>
</div>