From f01c445b25358e7945343e7771067bf112434962 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 27 Sep 2023 15:46:10 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 0598da9a2d42a63e9238b8c85251508844e914cc)
---
 src/api/simulation.js                         |  7 +++++
 .../menuDialog/stationControlConvert.vue      | 31 +++++++++++++++++++
 src/utils/subscribeCallback.js                |  2 +-
 src/views/newMap/display/terminals/index.vue  |  5 ++-
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/api/simulation.js b/src/api/simulation.js
index 52387fe15..dbe149486 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -583,3 +583,10 @@ export function enterSimulationByTeacher(group) {
         method: 'post'
     });
 }
+/** 切换角色后触发消息 */
+export function getUnreceivedMessages(simulationId, memberId) {
+    return request({
+        url: `/simulation/${simulationId}/${memberId}/unreceivedMessages`,
+        method: 'get'
+    });
+}
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
index 833f8c6b6..c58ecdb49 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
@@ -163,6 +163,37 @@ export default {
                 this.updateTableValue(controlTransfer);
             });
         },
+        '$store.state.socket.controlTransfer': function(val) {
+            if (this.$store.state.training.domConfig.trainingDesign) {
+                if (val[0].application === 'LOCAL') {
+                    this.doShow({operation: OperationEvent.StationControl.requestStationControl.mbar.operation});
+                } else if (val[0].application === 'CENTER') {
+                    this.doShow({operation: OperationEvent.StationControl.requestCentralControl.mbar.operation});
+                } else if (val[0].application === 'FORCE_LOCAL') {
+                    this.doShow({operation: OperationEvent.StationControl.forcedStationControl.mbar.operation});
+                }
+                val.forEach(item => {
+                    let controlMode = '';
+                    if (item.application === 'LOCAL' || item.application === 'FORCE_LOCAL') {
+                        controlMode = 'Local';
+                    } else if (item.application === 'CENTER') {
+                        controlMode = 'Center';
+                    }
+                    // this.updateTableValue( { code: item.stationCode, controlMode: controlMode });
+                    this.tableData.forEach((row, index) => {
+                        if (row.code == item.stationCode) {
+                            row.result = this.$t('menu.menuDialog.controlModeTransfersuccees');
+                            row.control = this.controlProps[controlMode];
+                            this.removeSelection(item.stationCode);
+                            row.disabled = true;
+                            row.check = false;
+                            this.disabledClose = false;
+                            this.disabledSure = false;
+                        }
+                    });
+                });
+            }
+        },
         // 深度数据状态
         tableData: {
             handler(val, oldVal) {
diff --git a/src/utils/subscribeCallback.js b/src/utils/subscribeCallback.js
index 93f02247b..677d1f867 100644
--- a/src/utils/subscribeCallback.js
+++ b/src/utils/subscribeCallback.js
@@ -210,7 +210,7 @@ function handle(data) {
     case 'Simulation_Training_Audio_MATCH_RESULT':
         store.dispatch('trainingNew/handleMatchVoice', msg);
         break;
-    case 'Simulation_Control_Transfer_Result':
+    case 'Simulation_Control_Mode_Apply_Result':
         store.dispatch('socket/setControlTransfer', msg);
         break;
     case 'Simulation_Training_Prepare_Start': // 仿真预加载
diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue
index a8c8e9f2d..b4ee973ab 100644
--- a/src/views/newMap/display/terminals/index.vue
+++ b/src/views/newMap/display/terminals/index.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import {getSimulationMemberList, getAllSimulationUser} from '@/api/simulation';
+import {getSimulationMemberList, getAllSimulationUser, getUnreceivedMessages} from '@/api/simulation';
 import {getToken} from '@/utils/auth';
 import {creatSubscribe, clearSubscribe, getTopic} from '@/utils/stomp';
 import { defaultCallback, stateCallback, diagramSimCallback } from '@/utils/subscribeCallback';
@@ -166,6 +166,9 @@ export default {
                 this.$store.dispatch('training/setMapDefaultState');
                 this.isFirst = false;
             }
+            if (this.$store.state.training.domConfig.trainingDesign) {
+                getUnreceivedMessages(this.$route.query.group, this.$store.state.training.myMemberId);
+            }
         },
         '$store.state.socket.memberChangeCount': function () { // 仿真成员变更
             this.initMemberUserInfo();

From 82e67c69e685931af7aa1dce15f1a099fdf4ffb8 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 27 Sep 2023 16:22:32 +0800
Subject: [PATCH 2/4] =?UTF-8?q?memberId=E4=B8=A2=E5=A4=B1=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/terminals/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue
index b4ee973ab..695fc4ee4 100644
--- a/src/views/newMap/display/terminals/index.vue
+++ b/src/views/newMap/display/terminals/index.vue
@@ -166,7 +166,7 @@ export default {
                 this.$store.dispatch('training/setMapDefaultState');
                 this.isFirst = false;
             }
-            if (this.$store.state.training.domConfig.trainingDesign) {
+            if (this.$store.state.training.domConfig.trainingDesign && this.$store.state.training.myMemberId) {
                 getUnreceivedMessages(this.$route.query.group, this.$store.state.training.myMemberId);
             }
         },

From 90d52176f2f12d7a18c59b9b64fa3ea41de8d704 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 27 Sep 2023 17:32:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BF=E7=9C=9F?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ConstConfig.js                    |  9 ++++--
 src/utils/baseUrl.js                          |  4 +--
 .../display/memberManage/membersManage.vue    | 30 +++++++++++++++++++
 .../newMap/display/terminals/terminalMenu.vue |  2 +-
 .../mapoperate/simulationMember/index.vue     | 28 ++++++++++++++++-
 5 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 4d8d34f12..83faf8237 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -74,7 +74,8 @@ export default {
             { label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator' },
             { label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker' },
             { label: '设备管理员', value: 'DEVICE_MANAGER', enLabel: 'DeviceManager' },
-            { label: '车务段段长', value: 'TRAIN_MASTER', enLabel: 'Train_Master' }
+            { label: '值班站长', value: 'STATION_HEAD', enLabel: 'Station_Head' },
+            { label: '站务员', value: 'STATION_ATTENDANT', enLabel: 'Station_Attendant' }
         ],
         roleTypeList: [
             {label: 'NCC调度', value: 'NCC_DISPATCHER', simTypeList: ['METRO', 'RAILWAY', 'EMERGENCY']},
@@ -95,11 +96,13 @@ export default {
             {label: '车务段段长', value: 'TRAIN_MASTER', simTypeList: ['METRO']},
             {label: '工电调度', value: 'ELECTRIC_DISPATCHER', simTypeList: ['METRO']},
             {label: '电力工务', value: 'STATION_ELECTRIC_WORKER', simTypeList: ['METRO', 'RAILWAY']}, // 大铁：车站电务
-            {label: '上级部分', value: 'PARENT_DEPARTMENT', simTypeList: ['METRO']},
+            {label: '上级部门', value: 'PARENT_DEPARTMENT', simTypeList: ['METRO']},
             {label: '派班员', value: 'SCHEDULING', simTypeList: ['METRO']},
             {label: '设备管理员', value: 'DEVICE_MANAGER', simTypeList: ['RAILWAY']},
             {label: '值班主任', value: 'SHIFT_MANAGER', simTypeList: ['METRO']},
-            {label: '环控调度', value: 'ENVIRONMENT_DISPATCHER', simTypeList: ['METRO']}
+            {label: '环控调度', value: 'ENVIRONMENT_DISPATCHER', simTypeList: ['METRO']},
+            {label: '值班站长', value: 'STATION_HEAD', simTypeList: ['METRO']},
+            {label: '站务员', value: 'STATION_ATTENDANT', simTypeList: ['METRO']}
         ],
         releaseReview: [
             { enlabel: 'Unpublished', label: '未发布', value: '0' },
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c3d8d55e6..09f5d349f 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -23,13 +23,13 @@ export function handlerUrl() {
     let OSS_URL;
     if (process.env.NODE_ENV === 'development') {
         // 开发分支
-        BASE_API = 'http://192.168.3.233/rtss-server';
+        // BASE_API = 'http://192.168.3.233/rtss-server';
         // BASE_API = 'https://joylink.club/jlcloud';
         // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://114.116.51.125/jlcloud';
         // BASE_API = 'http://192.168.3.47:9000'; // 周寅
         // BASE_API = 'http://192.168.3.94:9000'; // 旭强
-        // BASE_API = 'http://192.168.3.15:9000'; // 张赛
+        BASE_API = 'http://192.168.3.15:9000'; // 张赛
         // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
         // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
         // BASE_API = 'http://b29z135112.zicp.vip';
diff --git a/src/views/newMap/display/memberManage/membersManage.vue b/src/views/newMap/display/memberManage/membersManage.vue
index 623355fd4..1da3d33cb 100644
--- a/src/views/newMap/display/memberManage/membersManage.vue
+++ b/src/views/newMap/display/memberManage/membersManage.vue
@@ -106,6 +106,9 @@ export default {
             }, {
                 labelName: '车站值班员',
                 children: []
+            }, {
+                labelName: '值班站长',
+                children: []
             }, {
                 labelName: '司机',
                 children: []
@@ -149,6 +152,10 @@ export default {
             {
                 labelName: '设备管理员',
                 children: []
+            },
+            {
+                labelName: '站务员',
+                children: []
             }
             ]
         };
@@ -207,6 +214,8 @@ export default {
                 const environmentDispatherList = [];
                 const parentDepartmentList = [];
                 const schedulingList = [];
+                const stationHeadList = [];
+                const stationAttendantList = [];
                 const ss = this.simType == 'RAILWAY' ? '车站值班员' : '行值';
                 const sew = this.simType == 'RAILWAY' ? '车站电务' : '电力工务';
                 val.forEach(item => {
@@ -256,6 +265,14 @@ export default {
                         this.memberData[item.id].labelName = '车站助理-' + device.name + (item.name ? `-${item.name }` : '');
                         stationAssistantList.push(this.memberData[item.id]);
                         break;
+                    case 'STATION_HEAD':
+                        this.memberData[item.id].labelName = '车站站长' + device.name + (item.name ? `-${item.name }` : '');
+                        stationHeadList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_ATTENDANT':
+                        this.memberData[item.id].labelName = '站务员' + device.name + (item.name ? `-${item.name }` : '');
+                        stationAttendantList.push(this.memberData[item.id]);
+                        break;
                     case 'STATION_MASTER':
                         this.memberData[item.id].labelName = '车站站长-' + device.name + (item.name ? `-${item.name }` : '');
                         stationMasterList.push(this.memberData[item.id]);
@@ -308,6 +325,7 @@ export default {
                         this.memberData[item.id].labelName = sew + '-' + device.name + (item.name ? `-${item.name }` : '');
                         stationElectricWorkerList.push(this.memberData[item.id]);
                         break;
+
                     }
                 });
                 this.treeData = [{
@@ -372,6 +390,18 @@ export default {
                     memberType: 'STATION_MASTER',
                     children: stationMasterList
                 },
+                {
+                    labelName: '车站站长',
+                    id: 'stationHead',
+                    memberType: 'STATION_HEAD',
+                    children: stationHeadList
+                },
+                {
+                    labelName: '站务员',
+                    id: 'stationAttendant',
+                    memberType: 'STATION_ATTENDANT',
+                    children: stationAttendantList
+                },
                 {
                     labelName: '车站信号员',
                     id: 'stationSignaler',
diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue
index ff2110487..1e83dee6c 100644
--- a/src/views/newMap/display/terminals/terminalMenu.vue
+++ b/src/views/newMap/display/terminals/terminalMenu.vue
@@ -178,7 +178,7 @@ export default {
         },
         initPictureShow() {
             const localWorkRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER', 'STATION_SWITCH_MAN',
-                'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER'];
+                'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'STATION_HEAD'];
             if (localWorkRoleList.includes(this.roles)) {
                 const terminal = this.findTerminalFromMap('localWork');
                 this.changePictureShow(terminal);
diff --git a/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue b/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
index 088e38f0f..8e8b9005e 100644
--- a/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
@@ -244,6 +244,16 @@
                 <el-input-number v-model="batchForm.STATION_ELECTRIC_WORKER" size="small" :min="0" :step="1" :precision="0" />
               </el-form-item>
             </el-col>
+            <el-col v-if="batchForm.systemType === 'METRO'" :span="12">
+              <el-form-item label="值班站长" prop="STATION_HEAD">
+                <el-input-number v-model="batchForm.STATION_HEAD" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="batchForm.systemType === 'METRO'" :span="12">
+              <el-form-item label="站务员" prop="STATION_ATTENDANT">
+                <el-input-number v-model="batchForm.STATION_ATTENDANT" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="NCC调度：" prop="NCC_DISPATCHER">
                 <el-input-number v-model="batchForm.NCC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
@@ -495,6 +505,8 @@ export default {
                 SHIFT_MANAGER: 0,
                 ENVIRONMENT_DISPATCHER: 0,
                 STATION_ELECTRIC_WORKER:0,
+                STATION_HEAD: 0,
+                STATION_ATTENDANT: 0,
                 systemType: 'METRO'
             },
             generationForm: {
@@ -505,7 +517,7 @@ export default {
             },
             disStationList: [],
             stationShow: ['STATION_SUPERVISOR', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER', 'STATION_SWITCH_MAN',
-                'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'STATION_WORKER', 'STATION_ELECTRIC_WORKER'],
+                'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'STATION_WORKER', 'STATION_ELECTRIC_WORKER', 'STATION_HEAD', 'STATION_ATTENDANT'],
             conversationForm: {
                 systemType: 'METRO',
                 id: '',
@@ -1143,6 +1155,20 @@ export default {
                             deviceCode: station.code
                         };
                         memberMap[this.generationForm.systemType].push(memberStationElectricWorker);
+                        const memberStationHead = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_HEAD',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationHead);
+                        const memberStationAttendant = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_ATTENDANT',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationAttendant);
                     }
                 });
                 const memberTrainMaster = {

From 16d9ee72bb8999aeedd46e63425f55c1559030c1 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 27 Sep 2023 18:02:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=BC=96=E5=88=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/simulation.js                                 | 5 +++--
 src/views/newMap/display/memberManage/membersManage.vue | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/utils/simulation.js b/src/utils/simulation.js
index bf9b156cc..53e79e929 100644
--- a/src/utils/simulation.js
+++ b/src/utils/simulation.js
@@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
     lastData = JSON.parse(lastData);
     const lastMemberList = [];
     // const electricDispatcherList = [];
-    const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+    const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
     const driverList = [];
     lastData.forEach((member, index)=>{
         if (member.userId && member.userId == store.state.user.id) {
@@ -37,7 +37,8 @@ export function covertMemberData (activeTrainList, resp) {
             member.label = member.type + name + userName;
             member.normalName = member.type + name;
         }
-        const deviceType = ['行调', '通号', '行值', '司机', '车辆段/停车场调度', '上级部门', '电力调度', '车辆段/停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长', '电力工务'];
+        const deviceType = ['行调', '通号', '行值', '司机', '车辆段/停车场调度', '上级部门', '电力调度', '车辆段/停车场信号楼', '车站助理', '车站站长',
+            '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长', '电力工务', '值班站长', '站务员'];
 
         /**
          * 车站助理
diff --git a/src/views/newMap/display/memberManage/membersManage.vue b/src/views/newMap/display/memberManage/membersManage.vue
index 1da3d33cb..09789cbb3 100644
--- a/src/views/newMap/display/memberManage/membersManage.vue
+++ b/src/views/newMap/display/memberManage/membersManage.vue
@@ -266,7 +266,7 @@ export default {
                         stationAssistantList.push(this.memberData[item.id]);
                         break;
                     case 'STATION_HEAD':
-                        this.memberData[item.id].labelName = '车站站长' + device.name + (item.name ? `-${item.name }` : '');
+                        this.memberData[item.id].labelName = '值班站长' + device.name + (item.name ? `-${item.name }` : '');
                         stationHeadList.push(this.memberData[item.id]);
                         break;
                     case 'STATION_ATTENDANT':
@@ -391,7 +391,7 @@ export default {
                     children: stationMasterList
                 },
                 {
-                    labelName: '车站站长',
+                    labelName: '值班站长',
                     id: 'stationHead',
                     memberType: 'STATION_HEAD',
                     children: stationHeadList