diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 2e575c51e..72be3b2f1 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,8 +3,8 @@ 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 = 'http://192.168.3.5:9000'; // 袁琪 + // 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.4:9000' // 琰培 } else { diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue index 58924fc26..de5dc22b1 100644 --- a/src/views/trainRoom/index.vue +++ b/src/views/trainRoom/index.vue @@ -15,7 +15,7 @@
-
+

调度员

@@ -33,7 +33,7 @@
-
+

车站值班员

  • @@ -107,7 +107,7 @@
-
+

司机

  • @@ -123,7 +123,7 @@
-
+

IBP

  • @@ -162,54 +162,72 @@
-
-
- - 开始仿真 +
+
+

大屏

+
    +
  • + {{ nor.nickName }} + +
  • +
+
+ +
-
- - 进入仿真 - - 结束仿真 -
- 生成二维码 - - 返回 - - 销毁房间 -
+
+ + + 生成二维码 + + 销毁房间 + + 返回 + +
@@ -286,7 +304,8 @@ export default { adminList: [], driverList: [], signalList: [], - stationList: [], // 车站列表 + bigScreenList: [], + stationList: [], ibpList: [], point: { x: 0, @@ -387,7 +406,8 @@ export default { ...this.equipmentList, ...this.driverList, ...this.signalList, - ...this.ibpList + ...this.ibpList, + ...this.bigScreenList ].length - 1: 0; }, filterNode(value, data) { @@ -483,11 +503,11 @@ export default { break; case 'Attendant': this.equipmentList.forEach((nor, index) => { - if (nor.id == item.id) { // 修改状态 + if (nor.id == item.id) { this.equipmentList.splice(index, 1); } }); - this.equipmentList.push(item); // 新增 + this.equipmentList.push(item); break; case 'Driver': this.driverList.push(item); @@ -497,11 +517,14 @@ export default { break; case 'IBP': this.ibpList.forEach((nor, index) => { - if (nor.id == item.id) { // 修改状态 + if (nor.id == item.id) { this.ibpList.splice(index, 1); } }); - this.ibpList.push(item); // 新增 + this.ibpList.push(item); + break; + case 'BigScreen': + this.bigScreenList.push(item); break; default: this.dispatchList.forEach((nor, index) => { @@ -534,6 +557,11 @@ export default { this.ibpList.splice(index, 1); } }); + this.bigScreenList.forEach((nor, index) => { + if (item.id == nor.id) { + this.bigScreenList.splice(index, 1); + } + }); break; } }); @@ -597,6 +625,10 @@ export default { item.select = true; this.ibpList.push(item); break; + case 'BigScreen': + item.select = true; + this.bigScreenList.push(item); + break; } this.treeData.push(item); }); @@ -713,6 +745,9 @@ export default { case 'ibp': // IBP params.userRole = 'IBP'; break; + case 'bigScreen': // 大屏 + params.userRole = 'BigScreen'; + break; } arr.push(params); }); @@ -886,15 +921,14 @@ export default { } .personnel { - padding: 0px 20px; width: calc(100% - 500px); - height: calc(100% - 60px); + height: calc(100% - 120px); float: left; .Scheduling { width: calc(50% - 10px); float: left; - height: 250px; + height: 240px; border: 1px solid #ccc; margin-bottom: 20px; overflow-y: scroll; @@ -915,10 +949,6 @@ export default { } } - .bottomNone { - margin-bottom: 0; - } - .selectPerson { height: 30px; line-height: 30px; @@ -940,9 +970,11 @@ export default { } .start-box { - width: 100%; - height: 40px; - margin-top: 20px; + width: 100%; + display: flex; + justify-content: center; + background: #f1f1f1; + padding: 20px 0px; } @media screen and (max-width: 1325px) {