Merge remote-tracking branch 'origin/develop' into local-test

src/views/newMap/display/terminals/index.vue

@@ -29,7 +29,7 @@
     <diagram-load v-else-if="picture === 'diagramLoad'" ref="diagramLoad" :group="group" />
     <diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" />
     <diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" :plan-id="loadPlanId" @pictureChange="pictureChangeAndPlan" />
-    <pis-terminal v-else-if="picture === 'pis'" ref="pisTerminal" />
+    <pis-terminal v-else-if="picture === 'pisStand' || picture === 'pisTrain'" ref="pisTerminal" />
     <display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChangeByType" />
     <tro-work v-else-if="picture === 'troWork'" ref="troWork" />
     <tro-detail-work v-else-if="picture === 'troDetailWork'" ref="troDetailWork" :show-station-code="showStationCode" @pictureChange="pictureChangeByType" />

src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue

@@ -359,7 +359,16 @@ export default {
                     name: '通号端',
                     code: 'maintainerSelect',
                     isShow: () => type === 'METRO'
-
+                },
+                {
+                    name: '站台PIS',
+                    code: 'pisStand',
+                    isShow: () => type === 'METRO'
+                },
+                {
+                    name: '列车PIS',
+                    code: 'pisTrain',
+                    isShow: () => type === 'METRO'
                 }
             ];
             const terminalList = commonTerminals(type);