diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue index ae11384e9..be05be643 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue @@ -266,20 +266,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -468,53 +472,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index d184746fa..8810f9f67 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -179,20 +179,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -378,53 +382,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue index d699e4644..16fde9204 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue @@ -162,20 +162,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -349,53 +353,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue index 36796cbb1..989ada097 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue @@ -170,20 +170,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -362,53 +366,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue index 45ad31629..e71f91140 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue @@ -136,23 +136,27 @@ export default { handler: this.setInbound }, { - label: '切换驾驶模式', + label: '修改预选模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -340,53 +344,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue index 6b70dd111..37c6f32f4 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue @@ -111,20 +111,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -327,53 +331,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue index 1c9c7792f..d7bb38ab0 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue @@ -111,20 +111,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -326,53 +330,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue index 3aacb8878..ab32011e2 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue @@ -250,20 +250,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -438,53 +442,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue index ff8c08cf4..b46665672 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue @@ -251,20 +251,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -438,53 +442,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue index 981615de4..c1e53b2a1 100644 --- a/src/jmapNew/theme/race_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue @@ -261,20 +261,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -436,53 +440,66 @@ export default { handleSpeedLimit() { // 限速指令 this.$refs.speedLimit.doShow(this.selected); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index 8fb9ff040..94afe5aa3 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -134,24 +134,24 @@ export default { label: '切换驾驶模式', children: [ { - // label: '转URM模式', - // 西安三需要把URM改成NRM - label: '转NRM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - // label: '转CM模式', - // 西安三需要把CM改成SM - label: '转SM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] }, @@ -491,53 +491,66 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyAmMode() { + handlerApplySmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_AM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index 548714e1b..6578d5bba 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -273,20 +273,24 @@ export default { label: '切换驾驶模式', children: [ { - label: '转URM模式', - handler: this.handleApplyUrmMode + label: '转AM-C模式', + handler: this.handlerApplyAmcMode + }, + { + label: '转SM-C模式', + handler: this.handlerApplySmcMode + }, + { + label: '转AM-I模式', + handler: this.handlerApplyAmiMode + }, + { + label: '转SM-I模式', + handler: this.handlerApplySmiMode }, { label: '转RM模式', - handler: this.handleApplyRmMode - }, - { - label: '转CM模式', - handler: this.handleApplyCmMode - }, - { - label: '转AM模式', - handler: this.handleApplyAmMode + handler: this.handlerApplyRmMode } ] } @@ -454,41 +458,67 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleApplyUrmMode() { + handlerApplyAmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_URM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyRmMode() { + handlerApplySmcMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_RM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'SM_C' } }; - commitTrainSend(group, param).then(({valid, operate}) => { + commitTrainSend(group, param).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, - handleApplyCmMode() { + handlerApplyAmiMode() { const group = this.$route.query.group; const param = { - commandType: 'Apply_CM_Mode', + commandType: 'Change_Preselection_Mode', targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, - params: {} + params: { preselectionMode: 'AM_I' } }; - commitTrainSend(group, param).then(({valid, operate}) => { - }).catch((error) =>{ + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplySmiMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'SM_I' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handlerApplyRmMode() { + const group = this.$route.query.group; + const param = { + commandType: 'Change_Preselection_Mode', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: { preselectionMode: 'RM' } + }; + commitTrainSend(group, param).then(({ valid, operate }) => { + }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 208ce6f86..7c80b1ce9 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,10 +2,10 @@ 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.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.172:9200'; // 旭强 - // BASE_API = 'http://192.168.8.109:9000'; // 张赛 + BASE_API = 'http://192.168.8.109:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康