diff --git a/src/jmapNew/shape/Train/TrainHead.js b/src/jmapNew/shape/Train/TrainHead.js index fd8afc86d..786dbb7f5 100644 --- a/src/jmapNew/shape/Train/TrainHead.js +++ b/src/jmapNew/shape/Train/TrainHead.js @@ -63,6 +63,8 @@ export default class TrainHead extends Group { } } setArrowShow(isShow) { - isShow ? this.arrow.show() : this.arrow.hide(); + if (this.arrow) { + isShow ? this.arrow.show() : this.arrow.hide(); + } } } diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue index 918c3424b..e6725826f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue @@ -85,12 +85,12 @@ export default { menuForce: [ { label: '设置ZC故障', - handler: this.setStoppage, + handler: this.undeveloped, cmdType: CMD.Station.CMD_STATION_ADD_FAULT }, { label: '取消ZC故障', - handler: this.cancelStoppage, + handler: this.undeveloped, cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT } ] @@ -225,6 +225,14 @@ export default { this.$refs.stationSetRouteControlAll.doShow(operate, this.selected); } }); + }, + undeveloped() { + this.doClose(); + this.$alert('实现中......', '提示', { + confirmButtonText: '确定', + callback: action => { + } + }); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue index f34d93a10..20c873ac6 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue @@ -198,12 +198,12 @@ export default { }, menuForce: [ { - label: '设置通信故障', - handler: this.setStoppage + label: '设置故障', + handler: this.undeveloped }, { - label: '取消通信故障', - handler: this.cancelStoppage + label: '取消故障', + handler: this.undeveloped } ], menuSpeed: [ diff --git a/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue index 83d3f1e0e..7d53d9aff 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue @@ -281,7 +281,6 @@ export default { }); }, doClose() { - debugger; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); mouseCancelState(this.selected); diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue index 106aa7337..600ce0c38 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue @@ -423,7 +423,6 @@ export default { }, cancel() { const operate = { - operation: OperationEvent.Command.cancel.menu.operation }; diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue index cc84bf9e6..47f1bcd8b 100644 --- a/src/jmapNew/theme/xian_01/menus/menuStation.vue +++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue @@ -95,13 +95,13 @@ export default { }, menuForce: [ { - label: '设置ZC故障', - handler: this.setStoppage, + label: '设置故障', + handler: this.undeveloped, cmdType: CMD.Station.CMD_STATION_ADD_FAULT }, { - label: '取消ZC故障', - handler: this.cancelStoppage, + label: '取消故障', + handler: this.undeveloped, cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT } ] @@ -238,6 +238,14 @@ export default { this.$refs.stationSetRouteControlAll.doShow(operate, this.selected); } }); + }, + undeveloped() { + this.doClose(); + this.$alert('实现中......', '提示', { + confirmButtonText: '确定', + callback: action => { + } + }); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index ea76bb770..1ee3ff62f 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -101,13 +101,13 @@ export default { }, menuForce: [ { - label: this.$t('menu.menuTrain.setCommunicationFault'), - handler: this.setStoppage, + label: '设置故障', + handler: this.undeveloped, cmdType:CMD.Train.CMD_TRAIN_ADD_FAULT }, { - label: this.$t('menu.menuTrain.cancelCommunicationFault'), - handler: this.cancelStoppage, + label: '取消故障', + handler: this.undeveloped, cmdType:CMD.Train.CMD_TRAIN_REMOVE_FAULT } ], diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue index f6b25bdcd..dabca966c 100644 --- a/src/jmapNew/theme/xian_02/menus/menuStation.vue +++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue @@ -148,12 +148,12 @@ export default { }, menuForce: [ { - label: '设置ZC故障', - handler: this.setStoppage + label: '设置故障', + handler: this.undeveloped }, { - label: '取消ZC故障', - handler: this.cancelStoppage + label: '取消故障', + handler: this.undeveloped } ] }; diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index 9e80b6926..e2ea5ff87 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -212,12 +212,12 @@ export default { }, menuForce: [ { - label: '设置通信故障', - handler: this.setStoppage + label: '设置故障', + handler: this.undeveloped }, { - label: '取消通信故障', - handler: this.cancelStoppage + label: '取消故障', + handler: this.undeveloped } ], menuSpeed: [ diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 778caeb7b..836771751 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ 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.41:9000'; // 张赛 - // BASE_API = 'http://192.168.3.82:9000'; // 杜康 + BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/lesson/lessoncategory/edit/chapter/list.vue b/src/views/lesson/lessoncategory/edit/chapter/list.vue index fc98a2a65..f70ecf038 100644 --- a/src/views/lesson/lessoncategory/edit/chapter/list.vue +++ b/src/views/lesson/lessoncategory/edit/chapter/list.vue @@ -180,7 +180,6 @@ export default { getPublishMapListOnline().then(response => { this.mapIdList = response.data; }); - if (this.$route.query.drawWay + '' === 'true') { this.trainingOperateTypeMap = { Switch: [], @@ -247,6 +246,7 @@ export default { this.queryForm.queryObject.type.config.data = trainingOperateConfigList; this.trainingTypeList = trainingOperateConfigList; this.trainingOperateTypeMap = operateTypeMap; + // console.log(this.$route.query.drawWay, trainingOperateConfigList); } else { this.$message.error(this.$t('error.failedToObtainTrainingType')); } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 3bc6f6cea..f85905a94 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -271,11 +271,6 @@ export default { this.sessionId = response.data.sessionId; this.loginUrl = response.data.url; this.loadingCode = false; - // this.clearTimer(this.checkTimeout); - // this.checkTimeout = setTimeout(() => { - // this.loadingCode = true; - // this.loginUrl = ''; - // }, 3 * 60 * 1000); this.checkLoginStatus(); }).catch(() => { this.loadingCode = false; @@ -446,7 +441,6 @@ export default { } .el-loading-spinner .el-loading-text { font-size: 24px; - color: #FFF; } .login-code-box { .el-loading-spinner i { @@ -454,7 +448,6 @@ export default { } .el-loading-spinner .el-loading-text { font-size: 14px; - color: #409EFF; } } }