diff --git a/src/assets/ctc_icon/camera.png b/src/assets/ctc_icon/camera.png new file mode 100644 index 000000000..a9a52f334 Binary files /dev/null and b/src/assets/ctc_icon/camera.png differ diff --git a/src/assets/ctc_icon/link.png b/src/assets/ctc_icon/link.png new file mode 100644 index 000000000..9b772658f Binary files /dev/null and b/src/assets/ctc_icon/link.png differ diff --git a/src/assets/ctc_icon/panel.png b/src/assets/ctc_icon/panel.png new file mode 100644 index 000000000..837ab56f7 Binary files /dev/null and b/src/assets/ctc_icon/panel.png differ diff --git a/src/assets/ctc_icon/setting.png b/src/assets/ctc_icon/setting.png new file mode 100644 index 000000000..c430b609a Binary files /dev/null and b/src/assets/ctc_icon/setting.png differ diff --git a/src/assets/ctc_icon/shutdown.png b/src/assets/ctc_icon/shutdown.png new file mode 100644 index 000000000..47332b051 Binary files /dev/null and b/src/assets/ctc_icon/shutdown.png differ diff --git a/src/assets/ctc_icon/t3.png b/src/assets/ctc_icon/t3.png new file mode 100644 index 000000000..59343058a Binary files /dev/null and b/src/assets/ctc_icon/t3.png differ diff --git a/src/assets/ctc_icon/train.png b/src/assets/ctc_icon/train.png new file mode 100644 index 000000000..fdaffdfe3 Binary files /dev/null and b/src/assets/ctc_icon/train.png differ diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index baea95804..ced0fcdb7 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -1,61 +1,43 @@ @@ -88,6 +71,7 @@ import PassiveTimeout from './passiveDialog/timeout'; import { timeFormat } from '@/utils/date'; import { prefixIntrger } from '@/utils/date'; import BottomTable from './bottomTable'; +import MenuPanel from './menuPanel'; import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png'; import CtcBarIcon2 from '@/assets/ctc_icon/pic2.png'; import CtcBarIcon3 from '@/assets/ctc_icon/pic3.png'; @@ -121,9 +105,10 @@ export default { PassiveAlarm, PassiveContorl, PassiveTimeout, - MenuButtonCtc, + MenuButtonCtc, RunplanPane, - BottomTable + BottomTable, + MenuPanel }, props: { selected: { @@ -133,49 +118,49 @@ export default { } } }, - data() { + data() { return { alarmMessages: [ { id: 1, message: '这是告警信息一' }, - { id: 2, message: '这是告警信息二' }, - { id: 3, message: '这是告警信息三' }, - { id: 4, message: '这是告警信息四' }, - { id: 5, message: '这是告警信息五' }, - { id: 6, message: '这是告警信息六' }, - { id: 7, message: '这是告警信息七' }, - ], - warningMessages: [ - { id: 1, message: '这是预警信息一' }, - { id: 2, message: '这是预警信息二' }, - { id: 3, message: '这是预警信息三' }, - { id: 4, message: '这是预警信息四' }, - { id: 5, message: '这是预警信息五' }, - { id: 6, message: '这是预警信息六' }, - { id: 7, message: '这是预警信息七' }, - ], - time: '00:00:00', - dateString: '', - dateString1: '', - ctcBarIcon1: CtcBarIcon1, - ctcBarIcon2: CtcBarIcon2, - ctcBarIcon3: CtcBarIcon3, - ctcBarIcon4: CtcBarIcon4, - ctcBarIcon5: CtcBarIcon5, - ctcBarIcon6: CtcBarIcon6, - ctcBarIcon7: CtcBarIcon7, - ctcBarIcon8: CtcBarIcon8, - ctcBarIcon9: CtcBarIcon9, - ctcBarIcon10: CtcBarIcon10, - ctcBarIcon11: CtcBarIcon11, - ctcBarIcon12: CtcBarIcon12, - ctcBarIcon13: CtcBarIcon13, - ctcBarIcon14: CtcBarIcon14, - ctcBarIcon15: CtcBarIcon15, - ctcBarIcon16: CtcBarIcon16, - ctcBarIcon17: CtcBarIcon17, - ctcBarIcon18: CtcBarIcon18, - } - }, + { id: 2, message: '这是告警信息二' }, + { id: 3, message: '这是告警信息三' }, + { id: 4, message: '这是告警信息四' }, + { id: 5, message: '这是告警信息五' }, + { id: 6, message: '这是告警信息六' }, + { id: 7, message: '这是告警信息七' } + ], + warningMessages: [ + { id: 1, message: '这是预警信息一' }, + { id: 2, message: '这是预警信息二' }, + { id: 3, message: '这是预警信息三' }, + { id: 4, message: '这是预警信息四' }, + { id: 5, message: '这是预警信息五' }, + { id: 6, message: '这是预警信息六' }, + { id: 7, message: '这是预警信息七' } + ], + time: '00:00:00', + dateString: '', + dateString1: '', + ctcBarIcon1: CtcBarIcon1, + ctcBarIcon2: CtcBarIcon2, + ctcBarIcon3: CtcBarIcon3, + ctcBarIcon4: CtcBarIcon4, + ctcBarIcon5: CtcBarIcon5, + ctcBarIcon6: CtcBarIcon6, + ctcBarIcon7: CtcBarIcon7, + ctcBarIcon8: CtcBarIcon8, + ctcBarIcon9: CtcBarIcon9, + ctcBarIcon10: CtcBarIcon10, + ctcBarIcon11: CtcBarIcon11, + ctcBarIcon12: CtcBarIcon12, + ctcBarIcon13: CtcBarIcon13, + ctcBarIcon14: CtcBarIcon14, + ctcBarIcon15: CtcBarIcon15, + ctcBarIcon16: CtcBarIcon16, + ctcBarIcon17: CtcBarIcon17, + ctcBarIcon18: CtcBarIcon18 + }; + }, computed: { ...mapGetters('config', [ 'width' @@ -183,19 +168,19 @@ export default { isShowBar() { return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07'; }, - isCtc() { - return this.$route.query.ctc - } + isCtc() { + return this.$route.query.ctc; + } }, watch: { isShowBar(val) { val && this.$store.dispatch('config/updateMenuBar'); }, - '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新 - this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); - const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); - this.initDate(date); - } + '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新 + this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); + const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); + this.initDate(date); + } }, mounted() { this.$nextTick(() => { @@ -217,21 +202,21 @@ export default { beforeDestroy() { window.onclick = function (e) {}; }, - methods: { - initDate(date) { - this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`; - const years = date.getFullYear() + ''; - let months = date.getMonth() + 1 + ''; - let dates = date.getDate() + ''; - if (months.length < 2) { months = '0' + months; } - if (dates.length < 2) { dates = '0' + dates; } - this.dateString = years + months + dates; - this.dateString1 = years + '年' + months + '月' + dates + '日'; - }, - handleRunplan(){ - this.$refs.runplanPane.doShow() + methods: { + initDate(date) { + this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`; + const years = date.getFullYear() + ''; + let months = date.getMonth() + 1 + ''; + let dates = date.getDate() + ''; + if (months.length < 2) { months = '0' + months; } + if (dates.length < 2) { dates = '0' + dates; } + this.dateString = years + months + dates; + this.dateString1 = years + '年' + months + '月' + dates + '日'; + }, + handleRunplan() { + this.$refs.runplanPane.doShow(); } - } + } }; diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index d21221462..1a4688ae3 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -1,780 +1,777 @@ + diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue index 2f91ede3f..a547d0ebe 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue @@ -24,7 +24,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate'; -// import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain'; import AddSpareTrain from './dialog/addSpareTrain'; import DrawSelect from './dialog/drawSelect'; diff --git a/src/views/login/register.vue b/src/views/login/register.vue index a96dc2548..c47c3c35a 100644 --- a/src/views/login/register.vue +++ b/src/views/login/register.vue @@ -10,18 +10,18 @@ top="25vh" > - - - - + + + +