diff --git a/src/jmap/theme/chengdu_03/menus/dialog/cancelAllLimit.vue b/src/jmap/theme/chengdu_03/menus/dialog/cancelAllLimit.vue deleted file mode 100644 index 15fbc4750..000000000 --- a/src/jmap/theme/chengdu_03/menus/dialog/cancelAllLimit.vue +++ /dev/null @@ -1,355 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/jmap/theme/chengdu_03/menus/index.vue b/src/jmap/theme/chengdu_03/menus/index.vue index 5a77c88e9..67d082909 100644 --- a/src/jmap/theme/chengdu_03/menus/index.vue +++ b/src/jmap/theme/chengdu_03/menus/index.vue @@ -13,7 +13,6 @@ - @@ -33,7 +32,6 @@ import MenuSection from './menuSection'; import MenuTrain from './menuTrain'; import MenuStation from './menuStation'; import MenuBar from './menuBar'; -// import MenuLimit from './menuLimit'; import PassiveAlarm from './passiveDialog/alarm'; import PassiveContorl from './passiveDialog/control'; import PassiveTimeout from './passiveDialog/timeout'; @@ -51,7 +49,6 @@ export default { MenuStationStand, MenuStation, MenuTrain, - // MenuLimit, PassiveAlarm, PassiveContorl, PassiveTimeout diff --git a/src/jmap/theme/chengdu_03/menus/menuLimit.vue b/src/jmap/theme/chengdu_03/menus/menuLimit.vue deleted file mode 100644 index 938e1b368..000000000 --- a/src/jmap/theme/chengdu_03/menus/menuLimit.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue index 76011e3b0..035858631 100644 --- a/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue +++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue @@ -177,7 +177,7 @@ if (operate.selection && operate.selection.length) { operate.selection.forEach(elem => { if (operate.commit) { - this.updateTableValue(elem.code, { result: `${$t('menu.menuDialog.senedMessageOne')}${this.timeout} ${this.$t('menu.menuDialog.senedMessageTwo')}` }, false); + this.updateTableValue(elem.code, { result: `${this.$t('menu.menuDialog.senedMessageOne')}${this.timeout} ${this.$t('menu.menuDialog.senedMessageTwo')}` }, false); } else if (operate.cancel) { this.updateTableValue(elem.code, { result: '' }, false); } @@ -381,7 +381,7 @@ }; this.selection.forEach((elem, index) => { - operate.messages.push(`${$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`); + operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`); }); this.disabledSure = true; @@ -406,7 +406,7 @@ }; this.selection.forEach((elem, index) => { - operate.messages.push(`${$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`); + operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`); }); this.disabledSure = true; @@ -431,7 +431,7 @@ }; this.selection.forEach((elem, index) => { - operate.messages.push(`${$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`); + operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`); }); this.disabledSure = true; diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue index e36fdc491..393599ff2 100644 --- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue +++ b/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue @@ -160,7 +160,7 @@ childType: this.$t('menu.passiveDialog.childTypeTips'), timeSummary: this.$t('menu.passiveDialog.controlModeSummary'), recommendedOperation: '', - alarmDetail: `${$t('menu.passiveDialog.controlModeTransfer')} ${this.operate.name}${this.$t('menu.passiveDialog.alarmDetailOne')}${operate.currentMode == '01' ? this.$t('menu.passiveDialog.stationToCentral') : this.$t('menu.passiveDialog.centralToStation')}!` + alarmDetail: `${this.$t('menu.passiveDialog.controlModeTransfer')} ${this.operate.name}${this.$t('menu.passiveDialog.alarmDetailOne')}${operate.currentMode == '01' ? this.$t('menu.passiveDialog.stationToCentral') : this.$t('menu.passiveDialog.centralToStation')}!` }; this.dialogShow = true; this.$nextTick(function () { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index f997f31f4..871e8ec9c 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.41:9000'; // 王兴杰 } else {