From 77b02b947e4dcd0af9f6180a0142368b38ecc059 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 14 Jul 2020 16:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                          |  4 +-
 .../newMap/displayNew/demon/equipment.vue     | 71 ++++++++---------
 src/views/newMap/displayNew/menuTrainList.vue | 77 ++++++++-----------
 .../newMap/mapsystemNew/common/index.vue      | 15 +++-
 4 files changed, 82 insertions(+), 85 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 778caeb7b..c59924e25 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
diff --git a/src/views/newMap/displayNew/demon/equipment.vue b/src/views/newMap/displayNew/demon/equipment.vue
index 70ee46638..3220345be 100644
--- a/src/views/newMap/displayNew/demon/equipment.vue
+++ b/src/views/newMap/displayNew/demon/equipment.vue
@@ -14,7 +14,7 @@
       <div style="margin-bottom: 3px; overflow: hidden;">
         <div class="plc_box">名称: {{ plcInfo.name }}</div>
         <div class="plc_box">状态: <span :style="{'color': plcInfo.status ? 'green' : 'red'}">{{ plcInfo.status ? '在线' : '不在线' }}</span></div>
-        <el-button type="text" size="small" class="freshen_box" @click="freshen">刷新</el-button>
+        <el-button type="text" size="small" class="freshen_box" @click="getList">刷新</el-button>
       </div>
       <el-table :data="tableData" border style="width: 100%; max-height: calc(100% - 24px); overflow: auto;">
         <el-table-column prop="code" label="设备编号" width="180" />
@@ -23,19 +23,12 @@
           <template slot-scope="scope">
             <div v-if="scope.row.vrDeviceCode" class="flex_box">{{ scope.row.vrDeviceCode }}</div>
             <div v-if="!scope.row.vrDeviceCode" class="flex_box">(空)</div>
-            <div class="flex_box">
-              <el-button
-                :type="scope.row.buttonShowType ? 'danger' : 'primary'"
-                size="small"
-                @click="hover(scope.row, scope.$index)"
-              >激活</el-button>
-            </div>
           </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row)">连接</el-button>
-            <el-button type="text" size="small" @click="cancel(scope.row, scope.$index)">断开</el-button>
+            <el-button :type="scope.row.buttonShowType ? 'danger' : 'primary'" size="small" @click="handleClick(scope.row, scope.$index)">连接</el-button>
+            <el-button size="small" @click="cancel(scope.row, scope.$index)">断开</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -60,15 +53,24 @@ export default {
                 name: '',
                 status: ''
             },
-            index: 0
+            index: 0,
+            selected: {},
+            typeObj: {
+                Section: '区段',
+                Signal: '信号机',
+                Switch: '道岔',
+                Psd: '屏蔽门',
+                StationStand: '站台'
+            }
         };
     },
     mounted() {
         EventBus.$on('selectDevice', (data) => {
-            this.tableData[this.index]['vrDeviceCode'] = data.code;
+            this.selected = data;
             this.tableData[this.index]['buttonShowType'] = false;
             this.tableData.splice(this.index, 1, this.tableData[this.index]);
             this.$store.dispatch('map/selectDeviceCode', {flag: false, type: ''});
+            this.connect(this.tableData[this.index]);
         });
     },
     async beforeDestroy() {
@@ -100,37 +102,32 @@ export default {
                 console.error(error);
             }
         },
-        hover(row, index) {
+        doClose() {
+            this.show = false;
+        },
+        handleClick(row, index) {
             row.buttonShowType = !row.buttonShowType;
             this.index = index;
             this.tableData.splice(index, 1, row);
             this.$store.dispatch('map/selectDeviceCode', {flag: row.buttonShowType, type: row.type});
         },
-        freshen() {
-            this.getList();
-        },
-        doClose() {
-            this.show = false;
-        },
-        async handleClick(row) {
-            if (row.vrDeviceCode) {
-                this.$confirm('您确定将次设备连接, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(async () => {
-                    try {
-                        const res = await postSimulationConnectById(this.group, row.id, row.vrDeviceCode);
-                        if (res && res.code == 200) {
-                            this.$message.success('连接成功!');
-                        }
-                    } catch (error) {
-                        console.error(error);
+        async connect(row) {
+            this.$confirm(`您确定连接${this.typeObj[this.selected._type] || '设备'}: ${this.selected.name}, 是否继续?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(async () => {
+                try {
+                    const res = await postSimulationConnectById(this.group, row.id, this.selected.code);
+                    if (res && res.code == 200) {
+                        this.$message.success('连接成功!');
+                        this.tableData[this.index]['vrDeviceCode'] = this.selected.code;
+                        this.tableData.splice(this.index, 1, this.tableData[this.index]);
                     }
-                });
-            } else {
-                this.$message.info('需要连接的设备编码为空，请选择');
-            }
+                } catch (error) {
+                    console.error(error);
+                }
+            });
         },
         async cancel(row, index) {
             this.$confirm('您确定将次设备断开, 是否继续?', '提示', {
diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue
index 2e6df6739..5670aef1d 100644
--- a/src/views/newMap/displayNew/menuTrainList.vue
+++ b/src/views/newMap/displayNew/menuTrainList.vue
@@ -1,17 +1,9 @@
 <template>
-  <div class="menuTrainListOut" :class="{'xian_01' : lineCode == '11'}">
-    <div v-if="drawer" class="menuTrainListBtn" @click="clickBtn">
-      <i class="el-icon-more" style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);margin-left:0px;" /></div>
-    <div v-else class="menuTrainListBtn1" @click="clickBtn">
-      <div class="menuTrainListBtn1In">
-        <i class="el-icon-more" style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);" />
-      </div>
+  <div class="menuTrainListOut" :class="{'xian_01' : lineCode == '11', 'active': drawer}">
+    <div class="menuTrainListBtn" @click="clickBtn">
+      <i class="el-icon-more" />
     </div>
-    <div
-      v-show="drawer"
-      :show-close="false"
-      style="height: 100%;"
-    >
+    <div :show-close="false" class="menuTrainList_box" style="height: 100%;">
       <div v-if="lineCode=='10'||lineCode=='11'" class="menuTrainList">
         <div class="bottomTrainListInfo">下行列车详细信息</div>
         <el-table :data="bottomTrainList" height="45%" :highlight-current-row="true" @row-click="selectTrain">
@@ -24,7 +16,6 @@
               <div>{{ covert(scope.row.dt) }}</div>
             </template>
           </el-table-column>
-          <!-- <el-table-column property="right" label="是否上行" width="90" /> -->
         </el-table>
         <div class="topTrainListInfo">上行列车详细信息</div>
         <el-table :data="topTrainList" height="45%" :highlight-current-row="true" style="border-radius:0px 0px 0px 5px;" @row-click="selectTrain">
@@ -37,7 +28,6 @@
               <div>{{ covert(scope.row.dt) }}</div>
             </template>
           </el-table-column>
-          <!-- <el-table-column property="right" label="是否上行" width="90" /> -->
         </el-table>
       </div>
       <div v-else class="menuTrainList">
@@ -45,7 +35,6 @@
           <el-table-column property="groupNumber" label="车组号" width="130" />
           <el-table-column property="tripNumber" label="车次号" width="130" />
           <el-table-column property="serviceNumber" label="表号" width="130" />
-          <!-- <el-table-column property="right" label="是否上行" width="90" /> -->
         </el-table>
       </div>
     </div>
@@ -141,20 +130,17 @@ export default {
     }
 };
 </script>
-<style lang="scss" scoped>
-.menuTrainListBtn1In{
-    width: 20px;
-    height: 40px;
-    background: #fff;
-    text-align: center;
-    border-radius: 6px 0px 0px 6px;
-    cursor:pointer;
-    border: 1px #adadad solid;
-}
-.menuTrainListBtn1{
+<style rel="stylesheet/scss" lang="scss" scoped>
+.menuTrainListOut{
     position: absolute;
-    top: 46%;
-    right:2px;
+    right: 0;
+    top: 15%;
+    height: 70%;
+	transform: translateX(400px);
+	transition: all 0.4s;
+	&.active{
+		transform: translateX(0px);
+	}
 }
 .menuTrainListBtn{
     width: 20px;
@@ -164,24 +150,29 @@ export default {
     border-radius: 6px 0px 0px 6px;
     position: absolute;
     top: 45%;
-    left: -20px;
     z-index: 2;
-    cursor:pointer;
+	transform: translateX(-20px);
+    cursor: pointer;
+	.el-icon-more{
+		font-size: 20px;
+		margin-top: 9px;
+		transform-origin: 50% 50%;
+		transform: rotate(90deg);
+		margin-left:0px;
+	}
 }
-.menuTrainListOut{
-    position: absolute;
-    right: 0;
-    top: 15%;
-    height: 70%;
+.menuTrainList_box{
+	height: 100%;
+	.menuTrainList{
+		width: 400px;
+		height: 100%;
+		border-radius: 10px 0px 0px 10px;
+		background: #fff;
+	}
 }
-.menuTrainList{
-    width: 400px;
-    height:100%;
-    border-radius: 10px 0px 0px 10px;
-    // padding: 5px;
-    background: #fff;
-}
-.topTrainListInfo,.bottomTrainListInfo{
+
+.topTrainListInfo,
+.bottomTrainListInfo{
     padding: 10px 10px;
     background: #cde2ef;
     font-size: 13px;
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index 8968dc6af..4b926b6bd 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -23,7 +23,14 @@ export default {
     data() {
         return {
             selected: null,
-            menus: null
+            menus: null,
+            typeObj: {
+                SECTION: '区段',
+                SIGNAL: '信号机',
+                SWITCH: '道岔',
+                PSD: '屏蔽门',
+                STATIONSTAND: '站台'
+            }
         };
     },
     computed: {
@@ -109,11 +116,13 @@ export default {
                 this.$store.dispatch('menuOperation/setMenuChange', {device: device, subType: em.subType});
             }
             this.$store.dispatch('training/emitTipFresh');
-            if (this.$store.state.map.selectDevice && this.$store.state.map.selectDevice.flag) {
+            if (this.$store.state.map.selectDevice && this.$store.state.map.selectDevice.flag && device._type) {
                 if (device._type.toUpperCase() == this.$store.state.map.selectDevice.type.toUpperCase()) {
                     EventBus.$emit('selectDevice', this.selected);
                 } else {
-                    this.$message.info('选择的设备类型不对');
+                    const name = this.typeObj[this.$store.state.map.selectDevice.type];
+                    const info = '选择的设备类型不正确' + (name ? `，请选择${name}类型` : '');
+                    this.$message.info(info);
                 }
             }