From eaa60a811b7a1ef3a840732684d08dd38d5f6138 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 5 Jul 2021 14:28:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=82=AE=E7=AE=B1=3D=E3=80=8B=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=EF=BC=88=E8=B4=A6=E5=8F=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/register.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/login/register.vue b/src/views/login/register.vue index 680aa50d3..a96dc2548 100644 --- a/src/views/login/register.vue +++ b/src/views/login/register.vue @@ -9,10 +9,10 @@ :close-on-click-modal="false" top="25vh" > - + From bdd06c3f1e48f1f0265d48f2f6d1b740fbfbc750 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 5 Jul 2021 16:16:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=99=E5=B8=88=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 3 ++- src/views/login/index.vue | 11 +++++++++-- src/views/organization/index.vue | 13 +++++++++---- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cc906b09e..937e1b456 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -92,9 +92,10 @@ const user = { const type = userInfo.type; const project = userInfo.project; const deviceCode = userInfo.deviceCode; + const teacherLogin = userInfo.teacherLogin; return new Promise((resolve, reject) => { // 登录系统 - const params = Object.assign({ account: username, password, project:project, deviceCode:deviceCode }, type == 'design' ? LoginParams.Design : LoginParams.LianKeTang); + const params = Object.assign({ account: username, password, project:project, deviceCode:deviceCode, teacherLogin:teacherLogin }, type == 'design' ? LoginParams.Design : LoginParams.LianKeTang); login(params).then(resp => { const token = resp.data; const header = { group: '', 'X-Token': token }; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index bebe35b7c..fd9a8c18a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -77,6 +77,7 @@
{{ $t('login.autoLogin') }} + 教师登录
-
{{ $store.state.user.companyName + '教学管理' }}
- 返回 +
{{ companyName + '教学管理' }}
+ 返回
@@ -30,7 +30,7 @@
-
+
@@ -56,7 +56,12 @@ export default { }; }, computed: { - + companyName() { + return this.$store.state.user.companyName; + }, + hideBack() { + return this.$route.query.enter === 'teacher'; + } }, created() { From ab699c2f795c3eaeb400750112431ef5945abf47 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 5 Jul 2021 16:37:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20setManualWhenHeadTrainArriveTarget=20?= =?UTF-8?q?=E5=A4=B4=E7=A0=81=E8=BD=A6=E6=8A=B5=E8=BE=BE=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=90=8E=E5=8F=98=E4=B8=BA=E4=BA=BA=E5=B7=A5=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/configLine/config.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue index 4304c1a62..ea7d8557c 100644 --- a/src/views/system/configLine/config.vue +++ b/src/views/system/configLine/config.vue @@ -111,7 +111,8 @@ export default { 'delayWhenCancelRouteWithAbnormalInterlock', 'noARB', 'checkDirectionWhenSetHead', - 'transferRouteCanOnlyFaultUnlock' + 'transferRouteCanOnlyFaultUnlock', + 'setManualWhenHeadTrainArriveTarget' ], selectList: ['runMode'], generalConfig: [ @@ -155,7 +156,8 @@ export default { 'figuresOfServiceNumber', 'noARB', 'checkDirectionWhenSetHead', - 'transferRouteCanOnlyFaultUnlock' + 'transferRouteCanOnlyFaultUnlock', + 'setManualWhenHeadTrainArriveTarget' ], rangeList: ['noParkingSM', 'parkingSM'], speedList: ['rmAtpSpeed', 'urmAtpSpeed'], @@ -204,7 +206,8 @@ export default { figuresOfServiceNumber: '服务号的位数', noARB: '没有ARB判定', checkDirectionWhenSetHead: '设置头码车时检查方向', - transferRouteCanOnlyFaultUnlock: '转换轨进路只能通过故障解锁来取消' + transferRouteCanOnlyFaultUnlock: '转换轨进路只能通过故障解锁来取消', + setManualWhenHeadTrainArriveTarget: '头码车抵达目的地后变为人工车' } }; }, From 52005bb913823ba7ee7e85ef3c68760208608ec7 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 6 Jul 2021 09:51:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=BD=A6bug=E4=BF=AE=E6=94=B9=EF=BC=88bug335=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/menuDialog/addRunplanLine.vue | 2 +- .../menus/menuDialog/deleteRunplanLine.vue | 4 +- .../menus/menuDialog/addRunplanLine.vue | 2 +- .../menus/menuDialog/deleteRunplanLine.vue | 234 +++++++++--------- 4 files changed, 121 insertions(+), 121 deletions(-) diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue index 2b638208a..5ce230a84 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue @@ -199,7 +199,7 @@ export default { } else { let newValue = parseInt(value); if (newValue) { - if (newValue > 0 & newValue < 9) { + if (newValue > 0 & newValue <= 9) { newValue = '0' + newValue; } this.addModel.serviceNumber = newValue; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/deleteRunplanLine.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/deleteRunplanLine.vue index 2bb05b9bb..b35212a90 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/deleteRunplanLine.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/deleteRunplanLine.vue @@ -107,7 +107,7 @@ export default { } else { let newValue = parseInt(value); if (newValue) { - if (newValue > 0 & newValue < 9) { + if (newValue > 0 & newValue <= 9) { newValue = '0' + newValue; } this.model.serviceNumber = newValue; @@ -129,7 +129,7 @@ export default { this.doClose(); }) .catch(e => { - this.$messageBox(e); + this.$messageBox(e.message); }); } }); diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue index b31b8e8fa..73da5e252 100644 --- a/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue +++ b/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue @@ -199,7 +199,7 @@ export default { } else { let newValue = parseInt(value); if (newValue) { - if (newValue > 0 & newValue < 9) { + if (newValue > 0 & newValue <= 9) { newValue = '0' + newValue; } this.addModel.serviceNumber = newValue; diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/deleteRunplanLine.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/deleteRunplanLine.vue index fb15cc0a9..1d13a85d1 100644 --- a/src/jmapNew/theme/xian_01/menus/menuDialog/deleteRunplanLine.vue +++ b/src/jmapNew/theme/xian_01/menus/menuDialog/deleteRunplanLine.vue @@ -1,108 +1,113 @@