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:
fan 2021-03-29 15:01:56 +08:00
commit 577fc1444f
10 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/iscs_picture/bg-door-stand-A.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
src/assets/iscs_picture/bg-door-station-A.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

2
src/iscs/constant/deviceRender.js
View File

@ -342,7 +342,7 @@ deviceRender[deviceType.OrdinaryDoor] = {
deviceRender[deviceType.FuzhouDoor] = {
_type: deviceType.FuzhouDoor,
zlevel: 1,
z: 4
z: 5
};
// 福州通讯图符
deviceRender[deviceType.CommunicationButcher] = {

6
src/iscs/shape/picture.js
View File

@ -78,6 +78,8 @@ import bgStationC from '@/assets/iscs_picture/bg-station-C.png'
import bgStationD from '@/assets/iscs_picture/bg-station-D.png'
import bgStationE from '@/assets/iscs_picture/bg-station-E.png'
import bgStationF from '@/assets/iscs_picture/bg-station-F.png'
import bgDoorStationA from '@/assets/iscs_picture/bg-door-station-A.png';
import bgDoorStandA from '@/assets/iscs_picture/bg-door-stand-A.png';
const pictureObj = {
'psdLeft': psdLeft,
@ -155,7 +157,9 @@ const pictureObj = {
bgStationC,
bgStationD,
bgStationE,
bgStationF
bgStationF,
bgDoorStationA,
bgDoorStandA
};
export default class Picture extends Group {
constructor(device) {

2
src/iscs/utils/parser.js
View File

@ -209,7 +209,7 @@ export function parser(data) {
zrUtil.each(data.ordinaryDoorList || [], elem => {
iscsDevice[elem.code] = deviceFactory(deviceType.OrdinaryDoor, elem);
});
zrUtil.each(data.fuzhoudoorList || [], elem => {
zrUtil.each(data.fuzhouDoorList || [], elem => {
iscsDevice[elem.code] = deviceFactory(deviceType.FuzhouDoor, elem);
});
zrUtil.each(data.communicationButcherList || [], elem => {

10
src/views/iscs/iscsDesign/demonList.vue
View File

@ -279,6 +279,12 @@ export default {
mode: 'afc02',
id: 'afcOne02',
type: 'interface'
},
{
name: '站台层',
mode: 'afc02',
id: 'afcTwo02',
type: 'interface'
}
]
}
@ -343,7 +349,7 @@ export default {
mode: 'fas02',
id: 'stationHallSeven',
type: 'interface'
},
}
]
},
{
@ -948,7 +954,7 @@ export default {
case 'interface':
getPublishMapInfo(this.mapId).then(resp => {
this.$router.push({ path: `/iscs/design/edit`, query: {mode: obj.mode, system: data.parent.data.id, part: obj.id, mapId: this.mapId, lineCode: resp.data.lineCode} });
})
});
break;
}
},

2
src/views/iscs/iscsDraw/icscComponents/picture.vue
View File

@ -132,6 +132,8 @@ export default {
{ name: '站厅D', value: 'bgStationD' },
{ name: '站厅E', value: 'bgStationE' },
{ name: '站厅F', value: 'bgStationF' },
{ name: '门禁站厅A', value: 'bgDoorStationA' },
{ name: '门禁站台A', value: 'bgDoorStandA' }
],
rules: {

12
src/views/iscs/iscsDraw/iscsAutomatic/index.vue
View File

@ -25,6 +25,14 @@
@createDataModel="createDataModel"
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="圆形" name="IscsCircle">
<iscs-circle
ref="iscsCircle"
style="width: 100%;height: 100%;"
@createDataModel="createDataModel"
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="线段" name="IscsLine">
<iscs-line
@ -98,6 +106,7 @@ import FuzhouDoor from '../iscsCommonElem/fuzhouDoor';
import IscsPicture from '../icscComponents/picture';
import CommunicationButcher from '../iscsCommonElem/communicationButcher';
import AfcDoorUnite from './afcDoorUnite';
import IscsCircle from '../icscComponents/circle';
export default {
name: 'IscsOperate',
@ -110,7 +119,8 @@ export default {
FuzhouDoor,
IscsPicture,
CommunicationButcher,
AfcDoorUnite
AfcDoorUnite,
IscsCircle
},
mixins: [
],

10
src/views/iscs/iscsDraw/iscsCommonElem/fuzhouDoor.vue
View File

@ -1,7 +1,10 @@
<template>
<div style="overflow-y: scroll;height: calc(100% - 46px); width: 100%;">
<el-form ref="form" :rules="rules" :model="form" label-width="80px" style="width: 100%;padding: 10px 50px;">
<el-form-item label="门宽:" prop="height">
<el-form-item label="图层:" prop="z2">
<el-input-number v-model="form.z2" controls-position="right" :min="1" size="small" />
</el-form-item>
<el-form-item label="门宽:" prop="width">
<el-input-number v-model="form.width" controls-position="right" :min="1" size="small" />
</el-form-item>
<el-form-item label="X轴坐标:">
@ -28,6 +31,7 @@ export default {
return {
form:{
code: '',
z2: 0,
width: 20,
x: 10,
y: 10
@ -51,6 +55,7 @@ export default {
this.showDeleteButton = true;
this.isUpdate = true;
this.form.code = model.code;
this.form.z2 = model.z2;
this.form.x = model.point.x;
this.form.y = model.point.y;
this.form.width = model.width;
@ -69,6 +74,7 @@ export default {
},
code: this.isUpdate ? this.form.code : getUID('FuzhouDoor', this.iscs.fuzhouDoorList),
_type: 'FuzhouDoor',
z2: this.form.z2,
width: this.form.width
};
this.$emit('createDataModel', model);
@ -86,6 +92,7 @@ export default {
},
code: this.form.code,
_type: 'FuzhouDoor',
z2: this.form.z2,
width: this.form.width
};
this.$emit('deleteDataModel', model);
@ -97,6 +104,7 @@ export default {
this.form = {
code: '',
width: 20,
z2: 0,
x: 10,
y: 10
};

12
src/views/planMonitor/components/routingoperate/routeMap.vue
View File

@ -156,15 +156,19 @@ export default {
};
</script>
<style lang="scss" scope>
.content-route /deep/ .el-dialog__body {
width: 100%;
height:100%;
<style lang="scss" scoped>
/deep/ {
.el-dialog__body {
flex:1;
padding: 0 !important;
overflow: hidden !important;
}
.is-fullscreen {
overflow: hidden !important;
}
}
.content-route{
display: flex;
flex-direction: column;