Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly

src/views/iscs/iscsSystemNew/index.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <station-nav v-if="$route.query.group" />
+    <div class="content-box-station iscs_content_box" :class="{'displayStationIscs': $route.query.group}">
+      <router-view />
+    </div>
+  </div>
+</template>
+<script>
+import StationNav from './stationNav.vue';
+export default {
+    name:'IscsSystem',
+    components: {
+        // TopNav,
+        // GroupNav,
+        // MenuBar,
+        StationNav
+    },
+    data() {
+        return {
+
+        };
+    },
+    mounted() {
+
+    },
+    methods:{
+
+    }
+};
+</script>

src/views/iscs/iscsSystemNew/stationNav.vue

@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <div class="station-nav-out">
+      <div class="station-nav">
+        <div class="stationList">
+          <div class="station-line" />
+          <div v-for="(item, index) in stationList" :key="index" class="station-box-out">
+            <div class="station-box">
+              <div class="leftRect" />
+              <div class="rightRect" />
+              <div class="station-list-box" :class="{'active': selectStation == item.id,'currentStation':tractionList.includes(item.name)}" @click="changeStation(item.id)" />
+            </div>
+            <div class="station-name" :class="index==0?'station-name-first':index%2==1?'station-name-up':'station-name-down'">{{ item.name }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getByGroupStationList } from '@/api/jmap/map';
+export default {
+    name:'',
+    data() {
+        return {
+            stationList:[]
+        };
+    },
+    async created () {
+        // 请求当前线路车站列表
+        const res = await getByGroupStationList(this.$route.query.group);
+        if (res.code == 200) {
+            this.stationList = [];
+            res.data.forEach(station => {
+                if (!station.depot && station.visible) {
+                    const param = {
+                        name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`,
+                        id: station.code
+                    };
+
+                    if (station.centralized) {
+                        this.tractionList.push(param.name);
+                    }
+
+                    this.stationList.push(param);
+                }
+            });
+        }
+        // if (!this.$route.params.mode) {
+        //     this.selectChildren(this.buttonId, true);
+        // }
+    }
+};
+</script>
+

src/views/login/normalLogin.vue

@@ -203,8 +203,9 @@ export default {
                 } else {
                     this.$emit('showOrgList', orgList);
                 }
-            }).catch(()=>{
+            }).catch((error)=>{
                 this.loading = false;
+                this.$message.error(error.message);
             });
         },
         // 选择组织

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

@@ -6,13 +6,14 @@
     <jl3d-device v-else-if="picture === 'jl3dModle'" ref="jl3dModle" />
     <jl3d-passflow v-else-if="picture === 'cctvView'" ref="cctvView" />
     <digital-stand v-else-if="picture === 'digitalStand'" ref="digitalStand" />
+    <iscs-system v-else-if="picture === 'iscsView'" ref="IscsSystem" />
     <traffic-terminal-work v-else-if="picture === 'trafficTerminal'" ref="trafficTerminalWork" :centralized-station-map="centralizedStationMap" />
     <ibp-plate v-else-if="picture === 'ibp'" ref="ibpPlate" />
     <big-train-runplan-manage v-else-if="picture === 'trafficManageTerminal'" ref="bigTrainRunplanManage" />
     <dispatch-cmd v-if="datie" ref="dispatchCmd" @close="close" />
     <dispatcher-loger v-if="datie" ref="dispatcherLoger" @close="close" />
     <terminal-menu v-if="menuShow" ref="terminalMenu" @pictureChange="pictureChange" @popupTerminalShow="popupTerminalShow" @loadingChange="loadingChange" />
-    <iscs-system v-else-if="picture === 'iscs'" ref="IscsSystem" />
+
   </div>
 </template>
 
@@ -33,7 +34,7 @@ import DigitalStand from '@/views/jlmap3d/simulation/jl3dsimulation';
 import IbpPlate from '@/views/ibp/ibpsystem/index';
 import TrafficTerminalWork from './trafficTerminalWork';
 import BigTrainRunplanManage from '@/views/bigTrainRunplanManage/index';
-import IscsSystem from '@/views/iscs/iscsSystem/index';
+import IscsSystem from '@/views/iscs/iscsSystemNew/index';
 export default {
     name: 'Index',
     components: {

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

@@ -63,6 +63,12 @@ export default {
                     {
                         name: 'cctv视图',
                         code: 'cctvView',
+                        roleList: ['DISPATCHER', 'STATION_SUPERVISOR'],
+                        click: this.changePictureShow
+                    },
+                    {
+                        name: 'ISCS',
+                        code: 'iscsView',
                         roleList: ['STATION_SUPERVISOR'],
                         click: this.changePictureShow
                     },

src/views/publish/publishMap/editSubsystem.vue

@@ -142,15 +142,16 @@ export default {
             this.memberMetroList = [];
             this.memberRailwayList = [];
             this.memberEmergencyList = [];
-            memberResp.data.METRO.forEach(member => {
+            const {METRO = [], RAILWAY = [], EMERGENCY = []} = memberResp.data;
+            METRO.forEach(member => {
                 const data = this.handleMember(member, stationResp.data);
                 this.memberMetroList.push(data);
             });
-            memberResp.data.RAILWAY.forEach(member => {
+            RAILWAY.forEach(member => {
                 const data = this.handleMember(member, stationResp.data);
                 this.memberRailwayList.push(data);
             });
-            memberResp.data.EMERGENCY.forEach(member => {
+            EMERGENCY.forEach(member => {
                 const data = this.handleMember(member, stationResp.data);
                 this.memberEmergencyList.push(data);
             });