From 8710a6231afe4d85bad012c7b93a2598284f96a8 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 23 Oct 2019 16:13:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/chat.js                               | 19 ++++++++++++++-
 .../lessoncategory/edit/lesson/publish.vue    | 21 -----------------
 src/views/trainRoom/index.vue                 | 23 +++++++++++++++++--
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/api/chat.js b/src/api/chat.js
index 99fb60676..bc2dd4e5f 100644
--- a/src/api/chat.js
+++ b/src/api/chat.js
@@ -239,7 +239,7 @@ export function getPermissionJoint(group) {
 	});
 }
 
-//
+// 添加或更新真实设备和仿真对象连接
 export function setRealDevice(group, data) {
 	return request({
 		url: `/api/jointTraining/room/realDevice?group=${group}`,
@@ -247,3 +247,20 @@ export function setRealDevice(group, data) {
 		data: data
 	});
 }
+
+// 删除真实设备和仿真对象连接
+export function delRealDevice(id, group) {
+	return request({
+		url: `/api/jointTraining/room/realDevice/${id}`,
+		method: 'delete',
+		params: { group: group }
+	});
+}
+
+// 获取真实设备列表
+export function getRealDevices(group) {
+	return request({
+		url: `/api/jointTraining/room/${group}/devices`,
+		method: 'get'
+	});
+}
diff --git a/src/views/lesson/lessoncategory/edit/lesson/publish.vue b/src/views/lesson/lessoncategory/edit/lesson/publish.vue
index b6d0266c2..0433db605 100644
--- a/src/views/lesson/lessoncategory/edit/lesson/publish.vue
+++ b/src/views/lesson/lessoncategory/edit/lesson/publish.vue
@@ -9,16 +9,6 @@
         label-width="140px"
         @submit.native.prevent
       >
-        <el-form-item :label="this.$t('lesson.releaseAssociatedCity')" prop="cityCode">
-          <el-select v-model="editModel.cityCode" :placeholder="this.$t('rules.pleaseSelect')" :disabled="this.disabled" @change="cityChange">
-            <el-option v-for="item in cityList" :key="item.code" :label="item.name" :value="item.code" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="this.$t('lesson.releaseAssociatedMap')" prop="mapId">
-          <el-select v-model="editModel.mapId" :placeholder="this.$t('rules.pleaseSelect')" :disabled="this.disabled" @change="mapChange">
-            <el-option v-for="item in mapList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
-        </el-form-item>
         <el-form-item :label="this.$t('lesson.publishCourseName')" prop="name">
           <el-input v-model="editModel.name" :disabled="!this.hasRelease" />
         </el-form-item>
@@ -33,7 +23,6 @@
 
 <script>
 import { getPublishMapListBySkinCode } from '@/api/jmap/map';
-import { getLessonNameByMapIdAndLessonId } from '@/api/jmap/lessondraft';
 import { adminPublishLesson, releaseOrCancel } from '@/api/designPlatform';
 
 export default {
@@ -78,16 +67,6 @@ export default {
 		}
 	},
 	methods: {
-		cityChange(code) {
-			this.editModel.mapId = '';
-			this.mapList = this.cityMapDict[code];
-		},
-		async mapChange(mapId) {
-			const resp = await getLessonNameByMapIdAndLessonId({ mapId: mapId, lessonId: this.editModel.id });
-			if (resp && resp.data) {
-				this.editModel.name = resp.data.name;
-			}
-		},
 		doShow(model) {
 			this.mapList = [];
 			this.cityList = [];
diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue
index af222ccb7..b7904d99c 100644
--- a/src/views/trainRoom/index.vue
+++ b/src/views/trainRoom/index.vue
@@ -178,6 +178,11 @@
               <ul>
                 <li v-for="(nor, index) in stationStandList" :key="index" class="selectPerson">
                   <span>{{ realDeviceType[nor.deviceType] }}</span>
+                  <i
+                    v-if="userId == roomInfo.creatorId"
+                    class="el-icon-close delPerson"
+                    @click="handleDelDevice(nor)"
+                  />
                   <div style="float: right; margin-right: 15px;">
                     <el-select
                       v-model="nor.deviceCode"
@@ -284,7 +289,7 @@
 </template>
 
 <script>
-import { getJoinTrainCode, deljointTrainRoom, putUserRoles, postRoomDetail, getJointTrainRoomUserList, putJointTrainingExit, startJointTraining, putJointTrainingSimulation, putJointTrainingSimulationEntrance, setRealDevice } from '@/api/chat';
+import { getJoinTrainCode, deljointTrainRoom, putUserRoles, postRoomDetail, getJointTrainRoomUserList, putJointTrainingExit, startJointTraining, putJointTrainingSimulation, putJointTrainingSimulationEntrance, setRealDevice, delRealDevice, getRealDevices } from '@/api/chat';
 import { getStationList } from '@/api/runplan';
 import { launchFullscreen } from '@/utils/screen';
 import { DeviceMenu, RealDeviceType } from '@/scripts/ConstDic';
@@ -422,7 +427,8 @@ export default {
 		this.userId = this.$store.state.user.id;
 		this.getRoomInfo(); // 获取房间信息 info
 		this.getUserList(); // 房间人员 列表
-		// this.checkPlcGateway(); //PLC网关
+		this.checkPlcGateway(); // PLC网关
+		this.getDevicesList(); // 获取真实设备列表
 		this.timeDemon = setInterval(() => {
 			checkLoginLine();
 		}, 5000 * 60);
@@ -937,6 +943,19 @@ export default {
 		},
 		handlerDeviceList(data) {
 			this.stationStandList = [data];
+		},
+		getDevicesList() {
+			getRealDevices(this.$route.query.group).then( resp => {
+				this.stationStandList = resp.data;
+			}).catch(() => {
+
+			});
+		},
+		handleDelDevice(nor) {
+			delRealDevice(nor.id, this.$route.query.group).then( resp => {
+			}).catch(() => {
+
+			});
 		}
 	}
 };