diff --git a/src/jmapNew/shape/graph/Section/ETextName.js b/src/jmapNew/shape/graph/Section/ETextName.js index ebb8c6738..5154ae5db 100644 --- a/src/jmapNew/shape/graph/Section/ETextName.js +++ b/src/jmapNew/shape/graph/Section/ETextName.js @@ -177,7 +177,10 @@ class ETextName extends Group { this.text && this.text.stopAnimation(false); } - setState() { + setState(bool) { + if (this.text) { + bool ? this.text.show() : this.text.hide(); + } // 区段名称类暂时不做状态处理 } } diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js index b7e4a3583..0ebf5471a 100644 --- a/src/jmapNew/shape/graph/Section/index.js +++ b/src/jmapNew/shape/graph/Section/index.js @@ -599,6 +599,7 @@ export default class Section extends Group { // 分路不良 // model.shuntingTypeList.length > 0 && model.badShunt && this.badShuntStatus(); + this.name.setState(model.nameShow); // 停车倒计时 if (this.remainTimeText) { if (model.stopCountDown) { diff --git a/src/jmapNew/theme/components/menus/passiveDialog/control.vue b/src/jmapNew/theme/components/menus/passiveDialog/control.vue index 8ce6f1148..4b9ea3639 100644 --- a/src/jmapNew/theme/components/menus/passiveDialog/control.vue +++ b/src/jmapNew/theme/components/menus/passiveDialog/control.vue @@ -2,7 +2,7 @@ - {{ `${requestInfo}请求如下区域的控制模式` }} + {{ `${requestInfo} request control mode for the following areas` }} - + - + - + - + - 距离对话还有{{ count }}秒,请应答。 + Two {{ count }} to speak. Respond. - 同意 + Agree - 拒绝 + Refuse @@ -83,11 +83,11 @@ export default { dialogShow: false, disabledAgree: false, disabledRefuse: false, - requestInfo: '调度员1工作站', + requestInfo: 'Dispatcher 1 workstation', controlProps: { - 'Center': this.$t('menu.passiveDialog.inTheControl'), - 'Local': this.$t('menu.passiveDialog.stationControl'), - 'Emergency':this.$t('menu.passiveDialog.emergencyControl') + 'Center': 'Center', + 'Local': 'Local', + 'Emergency':'Emergency' }, selection: [], tableData: [], @@ -269,7 +269,7 @@ export default { } }); } else if (!selection) { - this.$messageBox('请选择一条数据'); + this.$messageBox('Please select a piece of data'); } }, agree() { diff --git a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue index b8015321c..581c0de55 100644 --- a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue +++ b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue @@ -27,7 +27,6 @@ import MenuStation from './menuStation'; import MenuBar from './dispatchWorkMenuBar'; import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import { timestampFormat } from '@/utils/date'; -// import BottomTable from './bottomTable'; import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config'; import MenuButtonCtc from './menuButtonCtc'; diff --git a/src/jmapNew/theme/datie_02/menus/localWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/localWorkMenu.vue index 78817de38..8784d49c8 100644 --- a/src/jmapNew/theme/datie_02/menus/localWorkMenu.vue +++ b/src/jmapNew/theme/datie_02/menus/localWorkMenu.vue @@ -1,6 +1,6 @@