Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

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 };

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;

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>

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() {
 

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: '头码车抵达目的地后变为人工车'
             }
         };
     },