1.修改 运行图 接口

2.增加 iscs 资源

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);

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) {

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: {

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.id;
-                                runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.code;
+                                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;
                             }