增加三维驾驶psl

This commit is contained in:
sunzhenyu 2021-09-24 17:20:15 +08:00
parent 93ca66674c
commit 41536232f6
3 changed files with 30 additions and 5 deletions

View File

@ -2,10 +2,10 @@ 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.8.152:9000'; // 袁琪
// BASE_API = 'http://192.168.8.177:9000'; // 旭强
// BASE_API = 'http://192.168.8.109:9000'; // 张赛
BASE_API = 'http://192.168.8.109:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

View File

@ -25,6 +25,7 @@
<!-- <el-button type="primary" @click="raystand">站台选择</el-button> -->
<el-button v-if="pslShow" type="primary" @click="openPsl">{{ pslmsg }}</el-button>
<el-button type="primary" @click="equipboxplane">{{ equipboxmsg }}</el-button>
<el-button type="primary" @click="cctvplane">{{ cctvbuttonmsg }}</el-button>
<el-button type="primary" @click="showmmiplane">{{ showbuttonmmimsg }}</el-button>
@ -52,6 +53,7 @@
<Drive-Tms v-if="tmsshow" ref="tmsui"/>
<Drive-Control v-if="dcontrolshow" ref="dcontrol" :group-num="groupnum" :user-role="userrole"/>
<Equip-Box v-if="equipboxshow" />
<psl v-if="pslShow" ref="psl" pop-class="xian-01__systerm" />
</div>
</template>
@ -80,6 +82,8 @@ import DriveMmi from '@/views/jlmap3d/drive/sceneview/mmiview';
import DriveTms from '@/views/jlmap3d/drive/sceneview/tmsview';
import DriveControl from '@/views/jlmap3d/drive/drivecontrol/drivecontrol';
import Psl from '@/jmapNew/theme/components/menus/dialog/psl';
import EquipBox from '@/views/jlmap3d/drive/equipbox/equipbox';
var train;
@ -89,7 +93,8 @@ export default {
DriveMmi,
DriveTms,
DriveControl,
EquipBox
EquipBox,
Psl
},
data() {
return {
@ -110,6 +115,9 @@ export default {
selectmodel: null,
cctvshow:true,
equipboxmsg:"设备柜——隐藏",
pslmsg:"PSL",
pslCode:"",
pslShow:false,
cctvbuttonmsg: this.$t('jlmap3d.surveillanceHidden'),
mmishow: false,
tmsshow: false,
@ -230,7 +238,7 @@ export default {
window.updateDriverTrust = this.updateDriverTrust;
window.updateDriveValue = this.updateDriveValue;
window.jl3dUpdatePslCode = this.jl3dUpdatePslCode;
if(this.$route.query.group){
getSimulationInfoNew(this.$route.query.group).then(netdata => {
@ -568,6 +576,18 @@ export default {
this.groupnum = newvalue;
}
},
jl3dUpdatePslCode(newPslCode){
console.log(newPslCode);
if(newPslCode != undefined){
this.pslShow = true;
}else{
this.pslShow = false;
}
this.pslCode = newPslCode;
},
openPsl() {
this.$refs.psl.doShow({code:this.pslCode});
},
updatetrainlist(){
getSimulationTrainlistNew(this.group).then(netdata => {
this.options = [];

View File

@ -114,6 +114,7 @@ export default {
oldspeed:0,
endstation:'',
nextstation:'',
standCode:'',
mmimodel:null,
tiaotingjump:"false",
tiaotinghold:"false",
@ -244,6 +245,11 @@ export default {
this.updateM7(newdata.doorMode);
}
if(newdata.standCode != this.standCode){
this.standCode = newdata.standCode;
jl3dUpdatePslCode(this.standCode);
}
if(newdata.nextStation){
this.updateMmiNextStation(newdata.nextStation);
}
@ -603,7 +609,6 @@ export default {
if(next){
this.nextstation = next;
}
},
updateMmiEndStation(end){
if(end){