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-04-01 16:50:53 +08:00
commit bced2eb7d1
7 changed files with 353 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -85,3 +85,8 @@
"not ie <= 8"
]
}

2
src/i18n/langs/zh/router.js
View File

@ -3,7 +3,7 @@ export default {
designhomePage: '公共地图',
designUserPage: '个人地图',
newDesignUserPage: '新版地图',
newDesignUserPage: '地图绘制',
mapManage: '地图管理',
skinManage: '皮肤管理',

4
src/router/index_Common.js
View File

@ -369,7 +369,7 @@ export const asyncRouter = [
redirect: '/design/userlist/home',
component: Layout,
meta: {
roles: [admin, user]
roles: [admin]
},
children: [
{
@ -855,7 +855,7 @@ export const asyncRouter = [
redirect: '/design/usermap/home',
component: Layout,
meta: {
roles: [admin]
roles: [admin, user]
},
children: [
{

32
src/views/jlmap3d/passflow/jl3dpassflow.vue
View File

@ -1,8 +1,6 @@
<template>
<div class="jl3dpassflow">
<div id="jl3d" class="jl3ddraw">
</div>
<div id="jl3d" class="jl3ddraw" />
<div class="menutop">
<el-button-group>
<el-button type="primary" @click="switchrender">{{ rendermode }}</el-button>
@ -18,30 +16,32 @@
<script>
import Vue from 'vue';
import { Jl3dpassflow } from '@/jlmap3d/jl3dpassflow/jl3dpassflow.js';
import { ProjectIcon } from '@/scripts/ConstDic';
export default {
name: 'passflow',
name: 'Passflow',
components: {
},
data() {
return {
jl3d: null,
rendermode:"监控视角",
renderswitch:true,
}
},
watch: {
rendermode:'监控视角',
renderswitch:true
};
},
computed: {
code() {
return this.$route.query.code;
}
},
mounted() {
watch: {
},
created() {
document.querySelector("link[rel*='icon']").href = ProjectIcon[this.$route.query.project];
},
mounted() {
this.init();
},
@ -50,25 +50,25 @@
methods: {
init: function () {
// let mapdata = this.$store.state.socket.device;
let dom = document.getElementById('jl3d');
const dom = document.getElementById('jl3d');
this.jl3d = new Jl3dpassflow(dom);
},
switchrender() {
if (this.renderswitch == true) {
this.rendermode = "退出监控";
this.rendermode = '退出监控';
this.renderswitch = false;
this.jl3d.switchrender(this.renderswitch);
} else {
this.rendermode = "监控视角";
this.rendermode = '监控视角';
this.renderswitch = true;
this.jl3d.switchrender(this.renderswitch);
}
},
back() {
window.close();
},
}
}
};
</script>
<style scoped>
/* #jl3d {

22
src/views/jlmap3d/simulation/jl3dsimulation.vue
View File

@ -13,8 +13,6 @@
<el-button type="primary" @click="back">{{ $t('global.exit') }}</el-button>
</el-button-group>
</div>
<Jlmap3d-Menu :trainlist="trainlist" :stationlist="stationlist" @sstation="sstation" @strain="strain" />
@ -49,6 +47,7 @@ import { JLmap3d } from '@/jlmap3d/jl3dsimulation/jlmap3d.js';
import Jlmap3dMenu from '@/views/jlmap3d/simulation/show/menu';
import Jlmap3dConfig from '@/views/jlmap3d/simulation/show/configmenu';
import { ProjectIcon } from '@/scripts/ConstDic';
// import Jlmap3dMsg from '@/views/jlmap3d/show/msg';
@ -92,7 +91,9 @@ export default {
// this.$destroy();
}
},
created() {
document.querySelector("link[rel*='icon']").href = ProjectIcon[this.$route.query.project];
},
mounted() {
window.updatemenulist = this.updatemenulist;
this.getParams();
@ -101,7 +102,7 @@ export default {
},
methods: {
getParams:function() {
var routerParams = this.$route.query.group
var routerParams = this.$route.query.group;
this.mapid = this.$route.query.mapid;
this.group = this.$route.query.group;
this.token = this.$route.query.token;
@ -120,16 +121,15 @@ export default {
init: function (skinCode, group) {
const mapdata = this.$store.getters['map/map'];
const dom = document.getElementById('app');
let project = this.$route.query.project;
const project = this.$route.query.project;
// console.log(project);
if (project) {
this.jlmap3d = new JLmap3d(dom, mapdata, skinCode, this.$store, group, project);
} else {
this.jlmap3d = new JLmap3d(dom, mapdata, skinCode,this.$store,group,"");
this.jlmap3d = new JLmap3d(dom, mapdata, skinCode, this.$store, group, '');
}
this.jlmap3d.eventon();
},
@ -158,12 +158,12 @@ export default {
this.jlmap3d.showtrainmsg(showtype);
},
updatemenulist(stationlist, trainlist) {
let stations = [];
for (let k in stationlist) {
const stations = [];
for (const k in stationlist) {
stations.push(stationlist[k]);
}
let trains = [];
for (let k in trainlist) {
const trains = [];
for (const k in trainlist) {
trains.push(trainlist[k]);
}
this.stationlist = stations;

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

@ -190,6 +190,9 @@ export default {
},
isShowScheduling() {
return this.$route.query.prdType == '05';
},
project() {
return getSessionStorage('project');
}
},
watch: {
@ -508,7 +511,7 @@ export default {
mapid:this.mapId,
group:this.group,
token:getToken(),
project:getSessionStorage('project')
project: this.project
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
@ -518,7 +521,8 @@ export default {
const routeData = this.$router.resolve({
path:'/jlmap3d/passengerflow',
query:{
mapid:this.mapId
mapid:this.mapId,
project: this.project
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');

86
src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
View File

@ -20,6 +20,7 @@ import MapPublish from './publish';
import MapPublish3d from './publish3d';
import { mapGetters } from 'vuex';
import { saveMap } from '@/api/jmap/mapdraft';
import { superAdmin, admin } from '@/router/index_APP_TARGET';
export default {
name: 'MapOperateMenu',
@ -46,32 +47,6 @@ export default {
},
data() {
return {
menuMap: [
{
label: this.$t('map.updateObj'),
handler: this.updateObj
},
{
label: this.$t('map.updateObjAxis'),
handler: this.updateObjAxis
},
{
label: this.$t('map.saveAs'),
handler: this.saveAs
},
{
label: this.$t('map.deleteObj'),
handler: this.deleteObj
},
{
label: this.$t('map.jlmap3d'),
handler: this.jlmap3d
},
{
label: this.$t('map.publish3d'),
handler: this.publish3d
}
],
publishMapMenu: {
label: this.$t('map.publish'),
handler: this.publish
@ -95,15 +70,68 @@ export default {
hasRelease() {
return this.$store.state.user.roles.includes('04') ||
this.$store.state.user.roles.includes('05');
},
menuMap() {
if (this.$store.state.user.roles.includes(superAdmin) || this.$store.state.user.roles.includes(admin)) {
return [
{
label: this.$t('map.updateObj'),
handler: this.updateObj
},
{
label: this.$t('map.updateObjAxis'),
handler: this.updateObjAxis
},
{
label: this.$t('map.saveAs'),
handler: this.saveAs
},
{
label: this.$t('map.deleteObj'),
handler: this.deleteObj
},
{
label: this.$t('map.jlmap3d'),
handler: this.jlmap3d
},
{
label: this.$t('map.publish3d'),
handler: this.publish3d
},
{
label: this.$t('map.publish'),
handler: this.publish
}
];
} else {
return [
{
label: this.$t('map.updateObj'),
handler: this.updateObj
},
{
label: this.$t('map.updateObjAxis'),
handler: this.updateObjAxis
},
{
label: this.$t('map.saveAs'),
handler: this.saveAs
},
{
label: this.$t('map.deleteObj'),
handler: this.deleteObj
}
];
}
}
},
watch: {
'$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Map)) {
this.menu = [...this.menuMap];
if (this.hasRelease) {
this.menu.push(this.publishMapMenu);
}
// if (this.hasRelease) {
// this.menu.push(this.publishMapMenu);
// }
this.doShow(this.$store.state.menuOperation.menuPosition);
} else if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
this.initCancelMenu();