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 2022-08-08 11:13:36 +08:00
commit 52a9aa7b61
9 changed files with 65 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/pushMessage.js
View File

@ -28,6 +28,7 @@ export function postLicenseValidate(data) {
return request({
url: `/api/license/validate`,
method: 'post',
production: true,
// baseURL: 'https://joylink.club/jlcloud',
data
});

2
src/jmapNew/shape/graph/Station/index.js
View File

@ -167,7 +167,7 @@ export default class Station extends Group {
const queryCtc = queryList.find(item => {
return item.includes('ctc');
});
if (queryCtc) {
if (queryCtc && model.createControlMode) {
this.createCtcControlMode();
} else if (this.style.Station.StationControl.special) {
if (model.visible && model.createControlMode) { // model.createControlMode 控制模式

20
src/jmapNew/theme/datie_02/menus/index.vue
View File

@ -354,9 +354,23 @@ export default {
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowStation(list, this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode);
this.$jlmap.setCenter(this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode);
this.$jlmap.updateTransform(map.scaling, map.origin);
if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === this.showCentralizedStationCode && picture.type === 'chainStation');
if (picture) {
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
const deviceList = [];
const mapDevice = this.$store.state.map.mapDevice;
for (const deviceCode in mapDevice) {
deviceList.push(deviceCode);
}
this.$jlmap.updatePicture(deviceList);
this.$jlmap.updateTransform(picture.scaling, picture.origin);
}
} else {
this.$jlmap.updateShowStation(list, this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode);
this.$jlmap.setCenter(this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode);
this.$jlmap.updateTransform(map.scaling, map.origin);
}
},
getRailwaySimulationRunplanSend() {
const stationCode = this.$store.state.training.roleDeviceCode;

8
src/scripts/cmdPlugin/CommandHandler.js
View File

@ -77,6 +77,14 @@ class CommandHandle {
Driver_Stop: {
operate: 'Driver_Stop',
paramList: [{name: 'groupNumber'}, {name: 'eb'}]
},
RAIL_QUERY_REGISTER: {
operate: 'RAIL_QUERY_REGISTER',
paramList: [{name: 'stationCode'}]
},
RAIL_FILL_IN_REGISTER: {
operate: 'RAIL_FILL_IN_REGISTER',
paramList: [{name: 'stationCode'}, {name: 'line'}]
}
}
};

3
src/utils/baseUrl.js
View File

@ -66,5 +66,6 @@ export function handlerUrl(data) {
UPLOAD_API = 'http://joylink.club/jlfile';
BASE_SITE = 'https://joylink.club/cbtc';
}
return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE};
const PROD_API = 'https://joylink.club/jlcloud';
return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE, PROD_API};
}

4
src/utils/request.js
View File

@ -32,7 +32,9 @@ service.interceptors.request.use(config => {
if (config.upload) {
config.baseURL = urlData.UPLOAD_API;
}
if (config.production) {
config.baseURL = urlData.PROD_API;
}
if (config.time) {
config.timeout = config.time; // 让每个请求携带自定义token 请根据实际情况自行修改
}

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

@ -482,6 +482,7 @@ export default {
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
this.$jlmap.updatePicture(deviceList);
this.$jlmap.updateTransform(picture.scaling, picture.origin);
this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[deviceCode]);
} else {
this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
this.mapViewLoadedOver && this.switchStationMode(deviceCode);

6
src/views/newMap/mapDraftPicture/createPicture.vue
View File

@ -47,7 +47,7 @@ export default {
return {
centerDialogVisible: false,
skinCodeList: [],
ruleForm: { name: '', type: '', stationCode: '', lineCode: '', deviceMap: {} },
ruleForm: { name: '', type: '', stationCode: '', lineCode: '' },
rules: {
name: [{ required: true, message: '请输入画面名称', trigger: 'blur' }],
type: [{ required: true, message: '请选择画面类型', trigger: 'change' }],
@ -78,9 +78,9 @@ export default {
if (valid) {
const map = this.$store.state.map.map;
if (map && map.pictureList && map.pictureList.length) {
map.pictureList.push({...this.ruleForm, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }});
map.pictureList.push({...this.ruleForm, deviceMap: {}, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }});
} else {
map.pictureList = [{...this.ruleForm, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}];
map.pictureList = [{...this.ruleForm, deviceMap: {}, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}];
}
if (map && parseInt(this.$route.params.mapId)) {
saveMap(Object.assign(map, { mapId: this.$route.params.mapId })).then(() => {

29
src/views/newMap/registerBook/index.vue
View File

@ -423,6 +423,35 @@
</div>
</div>
</el-row>
<el-row style="display: flex;">
<div class="border-box" style="width: 10%;">计数器</div>
<div style="width: 90%;">
<el-row style="display: flex;justify-content: space-between;">
<div class="border-box" style="width: 100%;">名称</div>
<div class="border-box" style="width: 100%;">S总人工解锁</div>
<div class="border-box" style="width: 100%;">S引导</div>
<div class="border-box" style="width: 100%;">S总锁闭</div>
<div class="border-box" style="width: 100%;">X总人工解锁</div>
<div class="border-box" style="width: 100%;">X引导</div>
<div class="border-box" style="width: 100%;">X总锁闭</div>
<div class="border-box" style="width: 100%;">S故障</div>
<div class="border-box" style="width: 100%;">S接车引导</div>
<div class="border-box" style="width: 100%;">南场</div>
</el-row>
<el-row style="display: flex;justify-content: space-between;">
<div class="border-box" style="width: 100%;">号码</div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
<div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
</el-row>
</div>
</el-row>
</el-tab-pane>-->
</el-tabs>
</el-dialog>