diff --git a/src/assets/iscs_picture/bg-door-stand-A.png b/src/assets/iscs_picture/bg-door-stand-A.png new file mode 100644 index 000000000..bebbfe90c Binary files /dev/null and b/src/assets/iscs_picture/bg-door-stand-A.png differ diff --git a/src/assets/iscs_picture/bg-door-station-A.png b/src/assets/iscs_picture/bg-door-station-A.png new file mode 100644 index 000000000..e6b4dc7e5 Binary files /dev/null and b/src/assets/iscs_picture/bg-door-station-A.png differ diff --git a/src/iscs/constant/deviceRender.js b/src/iscs/constant/deviceRender.js index 198b6ecad..cab5bf094 100644 --- a/src/iscs/constant/deviceRender.js +++ b/src/iscs/constant/deviceRender.js @@ -342,7 +342,7 @@ deviceRender[deviceType.OrdinaryDoor] = { deviceRender[deviceType.FuzhouDoor] = { _type: deviceType.FuzhouDoor, zlevel: 1, - z: 4 + z: 5 }; // 福州通讯图符 deviceRender[deviceType.CommunicationButcher] = { diff --git a/src/iscs/shape/picture.js b/src/iscs/shape/picture.js index 4f031ae99..bb59d80b4 100644 --- a/src/iscs/shape/picture.js +++ b/src/iscs/shape/picture.js @@ -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) { diff --git a/src/iscs/utils/parser.js b/src/iscs/utils/parser.js index 6dacc418f..6d70340a7 100644 --- a/src/iscs/utils/parser.js +++ b/src/iscs/utils/parser.js @@ -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 => { diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue index 83802c692..f41135662 100644 --- a/src/views/iscs/iscsDesign/demonList.vue +++ b/src/views/iscs/iscsDesign/demonList.vue @@ -279,6 +279,12 @@ export default { mode: 'afc02', id: 'afcOne02', type: 'interface' + }, + { + name: '站台层', + mode: 'afc02', + id: 'afcTwo02', + type: 'interface' } ] } @@ -326,7 +332,7 @@ export default { id: 'stationHallFour', type: 'interface' }, - { + { name: '站厅层D端', mode: 'fas02', id: 'stationHallFive', @@ -338,12 +344,12 @@ export default { id: 'stationHallSix', type: 'interface' }, - { + { name: '站厅层F端', mode: 'fas02', id: 'stationHallSeven', type: 'interface' - }, + } ] }, { @@ -946,9 +952,9 @@ export default { case 'system' : break; case 'interface': - getPublishMapInfo(this.mapId).then(resp => { + 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; } }, diff --git a/src/views/iscs/iscsDraw/icscComponents/picture.vue b/src/views/iscs/iscsDraw/icscComponents/picture.vue index 63bdde004..5af89efbe 100644 --- a/src/views/iscs/iscsDraw/icscComponents/picture.vue +++ b/src/views/iscs/iscsDraw/icscComponents/picture.vue @@ -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: { diff --git a/src/views/iscs/iscsDraw/iscsAutomatic/index.vue b/src/views/iscs/iscsDraw/iscsAutomatic/index.vue index 1ccc435dd..e02418549 100644 --- a/src/views/iscs/iscsDraw/iscsAutomatic/index.vue +++ b/src/views/iscs/iscsDraw/iscsAutomatic/index.vue @@ -25,6 +25,14 @@ @createDataModel="createDataModel" @deleteDataModel="deleteDataModel" /> + + +
- + + + + @@ -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 }; diff --git a/src/views/planMonitor/components/routingoperate/routeMap.vue b/src/views/planMonitor/components/routingoperate/routeMap.vue index d9dbca265..05e990803 100644 --- a/src/views/planMonitor/components/routingoperate/routeMap.vue +++ b/src/views/planMonitor/components/routingoperate/routeMap.vue @@ -156,13 +156,17 @@ export default { }; -