From 40402a9a8e536195d93fc5f0f7ca792f84167760 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 13 Jul 2020 16:48:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E8=A7=84=E5=88=99bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D&=E5=93=88=E5=B0=94=E6=BB=A8=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/publish.js | 2 +- src/i18n/langs/zh/publish.js | 2 +- .../theme/haerbin_01/menus/menuButton.vue | 40 ++++++++++++++----- src/utils/baseUrl.js | 4 +- src/views/publish/examRule/draft/examFrom.vue | 8 ++-- src/views/publish/examRule/draft/index.vue | 4 +- src/views/publish/examRule/draft/rule.vue | 4 +- 7 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/i18n/langs/en/publish.js b/src/i18n/langs/en/publish.js index 6ddb19a1a..e5aa5a974 100644 --- a/src/i18n/langs/en/publish.js +++ b/src/i18n/langs/en/publish.js @@ -63,7 +63,7 @@ export default { examRuleMaking: 'Exam Rule Making', testName: 'Test name', inputTestName: 'Please input test name', - testScope: 'Test scope', + testScope: 'Attribution course', selectTestScope: 'Please select test scope', testDuration: 'duration', testDate: 'Test time', diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js index 62df46886..98d7d99f5 100644 --- a/src/i18n/langs/zh/publish.js +++ b/src/i18n/langs/zh/publish.js @@ -65,7 +65,7 @@ export default { examRuleMaking: '考试规则制定', testName: '试卷名称', inputTestName: '请填写试卷名称', - testScope: '试题范围', + testScope: '归属课程', selectTestScope: '请选择试题范围', testDuration: '时长', testDate: '考试时间', diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 565d818ce..a666836e8 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -84,7 +84,9 @@ export default { oldClickObj: null, // 上一次点击对象 route: null, // 进路对象 centralizedStationList: new Array(15).fill({}), - ciStationParamList: [] + ciStationParamList: [], + startVirtual: false, + endVirtual: false }; }, computed: { @@ -170,8 +172,25 @@ export default { { name: '引导进路', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menu, show: false }, { name: '取消引导', cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE, operate: OperationEvent.Signal.humanTrainRoute.menu, show: false } ]; - } else if (this.$store.state.training.prdType === '02' ) { - return; + } else if (this.$store.state.training.prdType === '02' && this.startVirtual) { + return [ + { name: 'ATP进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menu, show: false }, + { name: '取消ATP', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menu, show: false } + ]; + } else if (this.$store.state.training.prdType === '02' && this.endVirtual) { + return [ + { name: '联锁进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menu, show: false }, + { name: '取消联锁', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menu, show: false }, + { name: '取消引导', cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE, operate: OperationEvent.Signal.humanTrainRoute.menu, show: false }, + { name: 'ATP进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menu, show: false }, + { name: '取消ATP', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menu, show: false } + ]; + } else if (this.$store.state.training.prdType === '02') { + return [ + { name: '联锁进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menu, show: false }, + { name: '取消联锁', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menu, show: false }, + { name: '取消引导', cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE, operate: OperationEvent.Signal.humanTrainRoute.menu, show: false } + ]; } } }, @@ -203,12 +222,12 @@ export default { case 'Section': this.handleSectionMenu(); break; - case 'Station': - this.handleStationMenu(); - this.deviceHighLight(this.oldDevice, false); - this.deviceHighLight(this.selected, true); - this.oldDevice = this.selected; - break; + // case 'Station': + // this.handleStationMenu(); + // this.deviceHighLight(this.oldDevice, false); + // this.deviceHighLight(this.selected, true); + // this.oldDevice = this.selected; + // break; } } }).catch((error) => { @@ -329,7 +348,8 @@ export default { if (item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selected.code) { const startSignal = this.$store.getters['map/getDeviceByCode'](item.startSignalCode); const endSignal = this.$store.getters['map/getDeviceByCode'](item.endSignalCode); - console.log(startSignal, endSignal); + this.startVirtual = startSignal.virtual; + this.endVirtual = endSignal.virtual; this.route = item; } }); diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index c59924e25..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ 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.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue index 04a9eb850..49cc3ddff 100644 --- a/src/views/publish/examRule/draft/examFrom.vue +++ b/src/views/publish/examRule/draft/examFrom.vue @@ -258,10 +258,10 @@ export default { this.$refs['form'].validate((valid) => { if (valid) { if (this.form.startDate) { - this.form.startDate = this.getDate(this.form.startDate); + this.form.startTime = this.getDate(this.form.startDate); } if (this.form.endDate) { - this.form.endDate = this.getDate(this.form.endDate); + this.form.endTime = this.getDate(this.form.endDate); } this.form['trial'] = this.trial; this.$store.dispatch('exam/setCourseDetail', this.form); @@ -273,10 +273,10 @@ export default { this.$refs['form'].validate((valid) => { if (valid) { if (this.form.startDate) { - this.form.startDate = this.getDate(this.form.startDate); + this.form.startTime = this.getDate(this.form.startDate); } if (this.form.endDate) { - this.form.endDate = this.getDate(this.form.endDate); + this.form.endTime = this.getDate(this.form.endDate); } this.form['trial'] = this.trial; this.$store.dispatch('exam/setCourseDetail', this.form); diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue index 4817a3d31..0b76d62bc 100644 --- a/src/views/publish/examRule/draft/index.vue +++ b/src/views/publish/examRule/draft/index.vue @@ -136,8 +136,8 @@ export default { name: data.name, // 名称 passingPoint: Number(data.passMark), // 及格分 remarks: data.desc, // 考试说明 - endTime: data.endDate, - startTime: data.startDate, + endTime: data.endTime, + startTime: data.startTime, type: data.type, // 类型 trial: data.trial == 2 // 权限判断 }; diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue index b7bd8ae39..6dc0e1b7e 100644 --- a/src/views/publish/examRule/draft/rule.vue +++ b/src/views/publish/examRule/draft/rule.vue @@ -211,8 +211,8 @@ export default { name: this.course.name, // 名称 passingPoint: Number(this.course.passMark), // 及格分 remarks: this.course.desc, // 考试说明 - endTime: this.course.endDate, - startTime: this.course.startDate, + endTime: this.course.endTime, + startTime: this.course.startTime, type: this.course.type, // 类型 trial: this.course.trial == 2 // 权限判断 }; From d9ed44b21868b3b5f6aa0ff2a254ce6374ef4813 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 13 Jul 2020 17:01:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=20=E6=96=B0=E7=89=88?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/displayNew/demon/addQuest.vue | 14 +- .../newMapdraft/mapoperate/espDraft.vue | 4 +- .../newMap/newMapdraft/mapoperate/index.vue | 200 +++--------------- .../newMapdraft/mapoperate/psdDraft.vue | 4 +- 4 files changed, 43 insertions(+), 179 deletions(-) diff --git a/src/views/newMap/displayNew/demon/addQuest.vue b/src/views/newMap/displayNew/demon/addQuest.vue index 0c7062345..778b7ba7b 100644 --- a/src/views/newMap/displayNew/demon/addQuest.vue +++ b/src/views/newMap/displayNew/demon/addQuest.vue @@ -30,13 +30,13 @@
- + @@ -82,7 +82,7 @@ export default { }, row: {}, form: { - role: '' + type: '' }, memberList: [], mapLocation:null, @@ -229,8 +229,8 @@ export default { }, confirm() { - const roleName = this.memberList.find(elem=>{ return elem.id == this.form.role; }); - this.$emit('selectQuest', this.row, this.form.role, this.mapLocation, roleName.role); + const roleName = this.memberList.find(elem=>{ return elem.id == this.form.type; }); + this.$emit('selectQuest', this.row, this.form.type, this.mapLocation, roleName.type); this.doClose(); this.roleDoClose(); }, @@ -260,7 +260,7 @@ export default { }, handleName(item) { - return this.roleConfig[item.role] ? this.roleConfig[item.role] : '' + (item.name ? item.name : ''); + return this.roleConfig[item.type] ? this.roleConfig[item.type] : '' + (item.name ? item.name : ''); } } }; diff --git a/src/views/newMap/newMapdraft/mapoperate/espDraft.vue b/src/views/newMap/newMapdraft/mapoperate/espDraft.vue index b85992e8a..743f1a394 100644 --- a/src/views/newMap/newMapdraft/mapoperate/espDraft.vue +++ b/src/views/newMap/newMapdraft/mapoperate/espDraft.vue @@ -128,7 +128,7 @@ export default { }, hover(field) { this.field = field === this.field ? '' : field; - this.$emit('standStationCode', this.field); + this.$emit('espCode', this.field); }, deviceSelect(selected) { if (selected && selected._type.toUpperCase() === 'Esp'.toUpperCase()) { @@ -140,7 +140,7 @@ export default { this.addModel.standCode = selected.code; this.activeName = 'second'; this.field = ''; - this.$emit('standStationCode', ''); + this.$emit('espCode', ''); } }, hasPSD(data) { diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue index 6e8fc444c..5f52b4ff6 100644 --- a/src/views/newMap/newMapdraft/mapoperate/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/index.vue @@ -21,183 +21,24 @@ 绘图显隐
- - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -