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/3] =?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"
   >
-    <el-form ref="ruleForm" :model="form" :rules="rules" label-width="100px" class="demo-ruleForm">
+    <el-form ref="ruleForm" :model="form" :rules="rules" label-width="110px" class="demo-ruleForm">
       <el-form-item prop="email">
         <template slot="label">
-          <span>邮&emsp;&emsp;箱：</span>
+          <span>邮箱(账号)：</span>
         </template>
         <el-input v-model="form.email" />
       </el-form-item>

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/3] =?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 @@
           <div style="display: inline-block;width: 100%;margin-bottom: 10px;">
             <div style="display:inline-block">
               <el-checkbox v-model="isAutoLogin">{{ $t('login.autoLogin') }}</el-checkbox>
+              <el-checkbox v-if="project === 'cgy'" v-model="teacherLogin">教师登录</el-checkbox>
             </div>
             <el-popover
               v-if="!noQrcodeList.includes(project)"
@@ -179,6 +180,7 @@ export default {
             QCode: QCode,
             loading111: true,
             isAutoLogin: false,
+            teacherLogin: false,
             loginForm: {
                 username: '',
                 password: ''
@@ -420,6 +422,7 @@ export default {
                     model.type = this.modelType;
                     model.project = loginInfo[this.project].loginParam;
                     model.deviceCode = this.$route.query.projectDevice;
+                    model.teacherLogin = this.teacherLogin;
                     this.loading = true;
                     if (this.isAutoLogin) {
                         Cookies.set(this.cookiesName, model.username, { expires: 2});
@@ -565,7 +568,11 @@ export default {
                     }
                 });
             } else {
-                this.$router.push({ path: this.path });
+                if (this.teacherLogin) {
+                    this.$router.push({ path: '/info/organization/classManage?enter=teacher' });
+                } else {
+                    this.$router.push({ path: this.path });
+                }
             }
         },
         handleLanguage() {
@@ -774,7 +781,7 @@ export default {
 			position: relative;
 		}
 		.text-box{
-			font-size: 40px;
+			font-size: 39px;
 			font-weight: bold;
 			top: 150px;
 			width: 1050px;
diff --git a/src/views/organization/index.vue b/src/views/organization/index.vue
index 49cccaa24..85323a41a 100644
--- a/src/views/organization/index.vue
+++ b/src/views/organization/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="title_content">{{ $store.state.user.companyName + '教学管理' }}</div>
-    <el-button type="text" class="lessonManageBack" @click="back">返回</el-button>
+    <div class="title_content">{{ companyName + '教学管理' }}</div>
+    <el-button v-if="!hideBack" type="text" class="lessonManageBack" @click="back">返回</el-button>
     <div class="lessonManageInfo">
       <el-menu class="lessonManageMenu" default-active="2-1">
         <el-menu-item index="1" @click="clickMenu">
@@ -30,7 +30,7 @@
       <div class="lessonManageOther">
         <router-view />
       </div>
-      </div>
+    </div>
   </div>
 </template>
 
@@ -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/3] =?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: '头码车抵达目的地后变为人工车'
             }
         };
     },