diff --git a/src/assets/iscs_picture/bas_annulus.png b/src/assets/iscs_picture/bas_annulus.png new file mode 100644 index 000000000..a469fb29e Binary files /dev/null and b/src/assets/iscs_picture/bas_annulus.png differ diff --git a/src/assets/iscs_picture/bas_entity.png b/src/assets/iscs_picture/bas_entity.png new file mode 100644 index 000000000..01eac16bd Binary files /dev/null and b/src/assets/iscs_picture/bas_entity.png differ diff --git a/src/assets/iscs_picture/bas_environmental.png b/src/assets/iscs_picture/bas_environmental.png new file mode 100644 index 000000000..68082b5e9 Binary files /dev/null and b/src/assets/iscs_picture/bas_environmental.png differ diff --git a/src/assets/iscs_picture/bas_interface.png b/src/assets/iscs_picture/bas_interface.png new file mode 100644 index 000000000..4c8818a8b Binary files /dev/null and b/src/assets/iscs_picture/bas_interface.png differ diff --git a/src/assets/iscs_picture/bas_low_pressure.png b/src/assets/iscs_picture/bas_low_pressure.png new file mode 100644 index 000000000..7e364a736 Binary files /dev/null and b/src/assets/iscs_picture/bas_low_pressure.png differ diff --git a/src/iscs/shape/line.js b/src/iscs/shape/line.js index 08aeda96a..01a03cb6e 100644 --- a/src/iscs/shape/line.js +++ b/src/iscs/shape/line.js @@ -75,7 +75,7 @@ export default class line extends Group { this.iscsLine.setStyle('stroke', fillColor); // } } else { - this.iscsLine.setStyle('fill', fillColor); + this.iscsLine.setStyle('fill', fillColor||'rgba(0,0,0,0)'); } if (model.classify == 'dashed') { this.iscsLine.setStyle('lineDash', [8, 6]); @@ -103,7 +103,7 @@ export default class line extends Group { }, style: { lineWidth: 0, - fill: model.fillColor + fill: model.fillColor||'rgba(0,0,0,0)' } }); this.grouper.add(this.arrows); @@ -131,7 +131,7 @@ export default class line extends Group { }, style: { lineWidth: 0, - fill: model.fillColor + fill: model.fillColor||'rgba(0,0,0,0)' } }); this.grouper.add(this.arrows); diff --git a/src/iscs/shape/picture.js b/src/iscs/shape/picture.js index fea080fe2..95939bd87 100644 --- a/src/iscs/shape/picture.js +++ b/src/iscs/shape/picture.js @@ -56,6 +56,11 @@ import checkSell from '@/assets/iscs_picture/check_sell.png'; import checkSell2 from '@/assets/iscs_picture/check_sell2.png'; import bgShowRoom from '@/assets/iscs_picture/bg-showroom.jpg'; import bgStand from '@/assets/iscs_picture/bg-stand.jpg'; +import basAnnulus from '@/assets/iscs_picture/bas_annulus.png'; +import basEnvironmental from '@/assets/iscs_picture/bas_environmental.png'; +import basLowPressure from '@/assets/iscs_picture/bas_low_pressure.png' +import basInterface from '@/assets/iscs_picture/bas_interface.png'; +import basEntity from '@/assets/iscs_picture/bas_entity.png'; const pictureObj = { 'psdLeft': psdLeft, @@ -111,7 +116,12 @@ const pictureObj = { checkSell, checkSell2, bgShowRoom, - bgStand + bgStand, + basAnnulus, + basEnvironmental, + basLowPressure, + basInterface, + basEntity }; export default class Picture extends Group { constructor(device) { diff --git a/src/views/iscs/iscsDraw/icscComponents/picture.vue b/src/views/iscs/iscsDraw/icscComponents/picture.vue index a9d49b192..ec79106fa 100644 --- a/src/views/iscs/iscsDraw/icscComponents/picture.vue +++ b/src/views/iscs/iscsDraw/icscComponents/picture.vue @@ -109,7 +109,12 @@ export default { { name: '受检售票', value: 'checkSell' }, { name: '受检售票2', value: 'checkSell2' }, { name: '站厅背景', value: 'bgShowRoom' }, - { name: '站台背景', value: 'bgStand' } + { name: '站台背景', value: 'bgStand' }, + { name: '环空电控', value: 'basAnnulus' }, + { name: '环控机控', value: 'basEnvironmental' }, + { name: '智能低压', value: 'basLowPressure' }, + { name: '接口机', value: 'basInterface' }, + { name: '实体机', value: 'basEntity' } ], rules: { diff --git a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue index b59815f1a..3426900b8 100644 --- a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue +++ b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue @@ -136,7 +136,7 @@ export default { // this.routingList = list.map(elem => { return { value: elem.code, label: elem.name, routingType:elem.routingType, startSectionCode: elem.startSectionCode, endSectionCode: elem.endSectionCode }; }); list.forEach(elem=>{ // this.routingList.push({value: elem.code, label: elem.name, routingType:elem.routingType}); - this.routingMap[elem.code] = {parkSectionCodeList:elem.parkSectionCodeList}; + this.routingMap[elem.id] = {parkSectionCodeList:elem.parkSectionCodeList}; if (elem.routingType === 'LOOP') { // const name = elem.name; // let temp = ''; @@ -147,8 +147,8 @@ export default { if (!data) { runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode] = {}; } runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].label = elem.name; runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].value = elem.startSectionCode + '-' + elem.endSectionCode; - runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.code; - runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.code; + runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.id; + runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.id; runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].startSectionCode = elem.startSectionCode; runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].endSectionCode = elem.endSectionCode; runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].startStationCode = elem.startStationCode; @@ -160,7 +160,7 @@ export default { if (!data) { runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode] = {}; } // runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].label = elem.name; runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].value = elem.endSectionCode + '-' + elem.startSectionCode; - runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].runningRouting2 = elem.code; + runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].runningRouting2 = elem.id; runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].startSectionCode = elem.startSectionCode; runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].endSectionCode = elem.endSectionCode; }