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

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

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-10-13 11:15:16 +08:00
commit bbb546fa42
12 changed files with 249 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/router/index.js
View File

@ -1764,6 +1764,11 @@ export const asyncRouter = [
}
}
]
},
{ // 新地图绘制
path: 'usermap/map/draw/:mapId/:view',
component: NewMapDraft,
hidden: true
}
]
},
@ -1891,6 +1896,11 @@ export const asyncRouter = [
meta: {
i18n: 'newRouter.companyUserManage'
}
},
{ // 组织管理-组织结构
path: 'orgDetail',
component: OrgDetail,
hidden: true
}
]
},

3
src/scripts/ConstDic.js
View File

@ -207,7 +207,7 @@ export const UrlConfig = {
},
newDesignuser: {
prefix: '/design/usermap/home',
mapDraw: '/design/usermap/map/draw'
mapDraw: '/lineDesign/usermap/map/draw'
},
publish: {
runPlanEveryDay: '/publish/runPlan/everyDay',
@ -231,7 +231,6 @@ export const UrlConfig = {
examHome: '/trainingPlatform/examHome',
course: '/trainingPlatform/course',
practical: '/trainingPlatform/practical',
permission: '/trainingPlatform/permission',
pay: '/trainingPlatform/pay',
secondaryHome: '/trainingPlatform/secondaryHome'
},

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

@ -303,6 +303,9 @@ const map = {
map: state => {
return state.map;
},
memberList: state => {
return state.map.memberList;
},
psdList: state => {
if (state.map) {
return state.map.psdList;
@ -1223,7 +1226,7 @@ const map = {
}
});
const list = Object.values(dict);
if (window.location.href.includes('/design/usermap/map/draw')) {
if (window.location.href.includes('/lineDesign/usermap/map/draw')) {
handleOperation(state, list);
}
commit('mapRender', list);

4
src/views/demonstration/detail/index.vue
View File

@ -89,11 +89,11 @@ export default {
},
watch: {
'$route': function (val, oldval) {
this.loadInitData();
// this.loadInitData();
}
},
async mounted() {
this.loadInitData();
// this.loadInitData();
},
methods: {
async loadInitData() {

1
src/views/login/normalLogin.vue
View File

@ -213,7 +213,6 @@ export default {
handleLoginSucessRoute() {
this.loading = false;
this.tipsMsg = '';
console.log(this.path, '00000000000');
// path: '/trainingPlatform',
const path = '/simulation/simulationIndex';
// if()

2
src/views/newMap/display/stationDiagram/jlmap/index.vue
View File

@ -190,7 +190,7 @@ export default {
this.$jlmap.on('dataZoom', this.onDataZoom, this);
this.$jlmap.on('selected', this.onSelected, this);
this.$jlmap.on('contextmenu', this.onContextMenu, this);
if (this.$route.path.startsWith('/design/usermap/map/draw')) {
if (this.$route.path.startsWith('/lineDesign/usermap/map/draw')) {
this.$jlmap.on('keyboard', this.onKeyboard, this);
} else {
this.$jlmap.on('keyboard', this.onSimulationKeyboard, this);

2
src/views/newMap/jlmapNew/index.vue
View File

@ -273,7 +273,7 @@ export default {
this.$jlmap.on('dataZoom', this.onDataZoom, this);
this.$jlmap.on('selected', this.onSelected, this);
this.$jlmap.on('contextmenu', this.onContextMenu, this);
if (this.$route.path.startsWith('/design/usermap/map/draw')) {
if (this.$route.path.startsWith('/lineDesign/usermap/map/draw')) {
this.$jlmap.on('keyboard', this.onKeyboard, this);
} else {
this.$jlmap.on('keyboard', this.onSimulationKeyboard, this);

8
src/views/newMap/newMapdraft/mapoperate/index.vue
View File

@ -80,11 +80,11 @@ import SignalButton from './signalButton';
import LocalConfig from './displayConfig/localConfig';
import CenterConfig from './displayConfig/centerConfig';
import DepotConfig from './displayConfig/depotConfig';
import SimulationMember from './simulationMember/index';
export default {
name: 'MapOperate',
components: {
// CounterDraft,
SectionDraft,
SwitchDraft,
SignalDraft,
@ -113,7 +113,8 @@ export default {
SignalButton,
LocalConfig,
CenterConfig,
DepotConfig
DepotConfig,
SimulationMember
},
props: {
selected: {
@ -155,7 +156,8 @@ export default {
{label: '箭头', name:'Arrow', menus:Arrow},
{label: '防淹门', name: 'FloodGate', menus: FloodGate},
{label: '方向杆', name: 'DirectionRod', menus: DirectionRod},
{label: '信号按钮', name: 'SignalButton', menus: SignalButton }
{label: '信号按钮', name: 'SignalButton', menus: SignalButton },
{label: '仿真成员', name: 'SimulationMember', menus: SimulationMember}
],
selectDevice:'',
enabledTab: 'Section',

216
src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue Normal file
View File

@ -0,0 +1,216 @@
<template>
<el-tabs v-model="activeName" class="card" style="height: 100%;">
<el-tab-pane class="view-control" label="成员" name="first" :lazy="lazy">
<template v-for="item in memberList">
<div />
</template>
</el-tab-pane>
<el-tab-pane class="view-control" label="创建" name="second" :lazy="lazy">
<div style="height: 100%;overflow-y:auto;">
<el-form ref="createForm" :model="createForm" :rules="rules" label-width="150px" class="demo-ruleForm" size="small">
<el-form-item label="成员名称：" prop="name">
<el-input v-model="createForm.name" style="width: 200px;" />
</el-form-item>
<el-form-item label="成员类型：" prop="type">
<el-select v-model="createForm.type" placeholder="请选择">
<el-option v-for="item in roleList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="关联设备：" prop="deviceCode">
<el-select v-model="createForm.deviceCode" placeholder="请选择">
<el-option v-for="item in stationList" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="createMember">提交</el-button>
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane class="view-control" label="批量创建" name="third" :lazy="lazy">
<div style="height: 100%;overflow-y:auto;">
<el-form ref="batchForm" :model="batchForm" label-width="150px" class="demo-ruleForm" size="small">
<el-form-item label="行调：" prop="DISPATCHER">
<el-input-number v-model="batchForm.DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="通号：" prop="MAINTAINER">
<el-input-number v-model="batchForm.MAINTAINER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="行值：" prop="STATION_SUPERVISOR">
<el-input-number v-model="batchForm.STATION_SUPERVISOR" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="司机：" prop="DRIVER">
<el-input-number v-model="batchForm.DRIVER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车辆段调度：" prop="DEPOT_DISPATCHER">
<el-input-number v-model="batchForm.DEPOT_DISPATCHER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车辆段信号楼：" prop="DEPOT_SIGNAL_BUILDING">
<el-input-number v-model="batchForm.DEPOT_SIGNAL_BUILDING" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="停车场信号楼：" prop="PARKING_LOT_SIGNAL_BUILDING">
<el-input-number v-model="batchForm.PARKING_LOT_SIGNAL_BUILDING" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车站助理：" prop="STATION_ASSISTANT">
<el-input-number v-model="batchForm.STATION_ASSISTANT" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车站站长：" prop="STATION_MASTER">
<el-input-number v-model="batchForm.STATION_MASTER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车站信号员：" prop="STATION_SIGNALER">
<el-input-number v-model="batchForm.STATION_SIGNALER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车站客运员：" prop="STATION_PASSENGER">
<el-input-number v-model="batchForm.STATION_PASSENGER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车站扳道员：" prop="STATION_SWITCH_MAN">
<el-input-number v-model="batchForm.STATION_SWITCH_MAN" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车站引导员：" prop="STATION_FACILITATOR">
<el-input-number v-model="batchForm.STATION_FACILITATOR" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车站工务工：" prop="STATION_WORKER">
<el-input-number v-model="batchForm.STATION_WORKER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="车务段段长：" prop="TRAIN_MASTER">
<el-input-number v-model="batchForm.TRAIN_MASTER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="工电调度：" prop="ELECTRIC_DISPATCHER">
<el-input-number v-model="batchForm.ELECTRIC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="上级部分：" prop="PARENT_DEPARTMENT">
<el-input-number v-model="batchForm.PARENT_DEPARTMENT" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="派班员：" prop="SCHEDULING">
<el-input-number v-model="batchForm.SCHEDULING" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
<el-form-item label="设备管理员：" prop="DEVICE_MANAGER">
<el-input-number v-model="batchForm.DEVICE_MANAGER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="batchCreate">批量创建</el-button>
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane class="view-control" label="一键生成" name="fourth" :lazy="lazy">
<div style="text-align: center;">
<el-button size="small" type="primary" @click="keyGeneration">一键生成</el-button>
</div>
</el-tab-pane>
</el-tabs>
</template>
<script>
import {mapGetters} from 'vuex';
export default {
name: 'SimulationMember',
data() {
return {
lazy: true,
activeName: 'first',
roleList: [
{label: '行调', value: 'DISPATCHER'},
{label: '行值', value: 'STATION_SUPERVISOR'},
{label: '司机', value: 'DRIVER'},
{label: '通号', value: 'MAINTAINER'},
{label: '车辆段调度', value: 'DEPOT_DISPATCHER'},
{label: '停车场信号楼', value: 'PARKING_LOT_SIGNAL_BUILDING'},
{label: '车辆段信号楼', value: 'DEPOT_SIGNAL_BUILDING'},
{label: '车站助理', value: 'STATION_ASSISTANT'},
{label: '车站站长', value: 'STATION_MASTER'},
{label: '车站信号员', value: 'STATION_SIGNALER'},
{label: '车站客运员', value: 'STATION_PASSENGER'},
{label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
{label: '车站引导员', value: 'STATION_FACILITATOR'},
{label: '车站工务工', value: 'STATION_WORKER'},
{label: '车务段段长', value: 'TRAIN_MASTER'},
{label: '工电调度', value: 'ELECTRIC_DISPATCHER'},
{label: '上级部分', value: 'PARENT_DEPARTMENT'},
{label: '派班员', value: 'SCHEDULING'},
{label: '设备管理员', value: 'DEVICE_MANAGER'}
],
rules: {
},
createForm: {
id: '',
name: '',
type: '',
deviceCode: ''
},
batchForm: {
DISPATCHER: 0,
STATION_SUPERVISOR: 0,
DRIVER: 0,
MAINTAINER: 0,
DEPOT_DISPATCHER: 0,
DEPOT_SIGNAL_BUILDING: 0,
PARKING_LOT_SIGNAL_BUILDING: 0,
STATION_ASSISTANT: 0,
STATION_MASTER: 0,
STATION_SIGNALER: 0,
STATION_PASSENGER: 0,
STATION_SWITCH_MAN: 0,
STATION_FACILITATOR: 0,
STATION_WORKER: 0,
TRAIN_MASTER: 0,
ELECTRIC_DISPATCHER: 0,
PARENT_DEPARTMENT: 0,
SCHEDULING: 0,
DEVICE_MANAGER: 0
}
};
},
computed: {
...mapGetters('map', [
'memberList',
'stationList'
])
},
methods: {
batchCreate() {
let id = '1';
if (this.memberList && this.memberList.length) {
id = parseInt(this.memberList[this.memberList.length - 1].id) + 1;
}
},
createMember() {
},
resetForm() {
this.batchForm = {
DISPATCHER: 0,
STATION_SUPERVISOR: 0,
DRIVER: 0,
MAINTAINER: 0,
DEPOT_DISPATCHER: 0,
DEPOT_SIGNAL_BUILDING: 0,
PARKING_LOT_SIGNAL_BUILDING: 0,
STATION_ASSISTANT: 0,
STATION_MASTER: 0,
STATION_SIGNALER: 0,
STATION_PASSENGER: 0,
STATION_SWITCH_MAN: 0,
STATION_FACILITATOR: 0,
STATION_WORKER: 0,
TRAIN_MASTER: 0,
ELECTRIC_DISPATCHER: 0,
PARENT_DEPARTMENT: 0,
SCHEDULING: 0,
DEVICE_MANAGER: 0
};
},
keyGeneration() {
}
}
};
</script>
<style scoped>
</style>

9
src/views/publish/publishMap/editSubsystem.vue
View File

@ -112,8 +112,9 @@ export default {
{label: '行值', value: 'STATION_SUPERVISOR'},
{label: '司机', value: 'DRIVER'},
{label: '通号', value: 'MAINTAINER'},
{label: '车辆段信号楼', value: 'DEPOT_DISPATCHER'},
{label: '车辆段调度', value: 'DEPOT_DISPATCHER'},
{label: '停车场信号楼', value: 'PARKING_LOT_SIGNAL_BUILDING'},
{label: '车辆段信号楼', value: 'DEPOT_SIGNAL_BUILDING'},
{label: '车站助理', value: 'STATION_ASSISTANT'},
{label: '车站站长', value: 'STATION_MASTER'},
{label: '车站信号员', value: 'STATION_SIGNALER'},
@ -121,7 +122,11 @@ export default {
{label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
{label: '车站引导员', value: 'STATION_FACILITATOR'},
{label: '车站工务工', value: 'STATION_WORKER'},
{label: '车务段段长', value: 'TRAIN_MASTER'}
{label: '车务段段长', value: 'TRAIN_MASTER'},
{label: '工电调度', value: 'ELECTRIC_DISPATCHER'},
{label: '上级部分', value: 'PARENT_DEPARTMENT'},
{label: '派班员', value: 'SCHEDULING'},
{label: '设备管理员', value: 'DEVICE_MANAGER'}
],
ruleForm: {
name: '',

2
src/views/system/companyManage/index.vue
View File

@ -123,7 +123,7 @@ export default {
this.$router.go(-1);
},
handleOrgDetail(index, row) {
this.$router.push({ path: `/system/companyManage/orgDetail`, query: { orgId: row.id } });
this.$router.push({ path: `/systemManagement/companyUserManage/orgDetail`, query: { orgId: row.id } });
},
handleGenerateQrCode(index, row) {
// let state = 2;

2
src/views/trainingPlatform/demonList.vue
View File

@ -72,7 +72,7 @@ export default {
this.cityMap.set(item.code, item.name);
});
if (this.IsProject) {
res = await listPublishMap({project: this.project});
res = await listPublishMap({projectCode: this.project});
} else {
res = await listPublishMap();
}