Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -38,7 +38,7 @@
                                     <Icon v-show="!isCollapsed" class="sub-menu-icon" :custom="menuItem.icon" size="16" />
                                     <span>
                                         {{menuItem.name}}
-                                        <span style="color: aqua;margin-left: 2px;font-size: 12px;vertical-align: text-top;">
+                                        <span style="color: aqua;margin-left: 2px;font-size: 12px;vertical-align: text-top;margin-top:3px">
                                             {{menuItem.tag}}
                                         </span>
                                     </span>
@@ -51,7 +51,7 @@
                                 <Icon v-show="!isCollapsed" :custom="item.icon" :class="isCollapsed ? 'collapse-icon-size':''" size="16" />
                                 <span>
                                     {{item.name}}
-                                    <span style="color: aqua;margin-left: 2px;font-size: 12px;vertical-align: text-top;">
+                                    <span style="color: aqua;margin-left: 2px;font-size: 12px;vertical-align: text-top;margin-top:3px">
                                         {{item.tag}}
                                     </span>
                                 </span>
@@ -77,7 +77,7 @@
                                 <Icon v-show="!isCollapsed" class="sub-menu-icon" :custom="menuItem.icon" size="16" />
                                 <span>
                                     {{menuItem.name}}
-                                    <span style="color: aqua;margin-left: 2px;font-size: 12px;vertical-align: text-top;">
+                                    <span style="color: aqua;margin-left: 2px;font-size: 12px;vertical-align: text-top;margin-top:3px">
                                         {{menuItem.tag}}
                                     </span>
                                 </span>
@@ -90,14 +90,13 @@
                             <Icon v-show="!isCollapsed" :custom="item.icon" :class="isCollapsed ? 'collapse-icon-size':''" size="16" />
                             <span>
                                 {{item.name}}
-                                <span style="color: aqua;margin-left: 2px;font-size: 12px;">
+                                <span style="color: aqua;margin-left: 2px;font-size: 12px;margin-top:3px">
                                     {{item.tag}}
                                 </span>
                             </span>
                             </MenuItem>
                         </div>
                     </MenuGroup>
-
                 </vuescroll>
             </Menu>
             <p class="copyright-info" v-show="!isCollapsed">
@@ -560,7 +559,34 @@ export default {
     font-size: 12px;
     line-height: 30px;
     height: 30px;
+    position: relative;
+    color: white;
+}
+.ivu-menu-item-group{
+    position: relative;
 }
+.biz-menu .ivu-menu-vertical .ivu-menu-item-group::after {
+    content: "";
+    width: 90%;
+    height: 1px;
+    background: #303030;
+    position: absolute;
+    right: 0px;
+    bottom: -10px;
+    box-shadow:0px 12px 8px -12px #000;
+}
+
+.biz-menu .collapsed-menu .ivu-menu-item-group::after {
+    width: 100% !important;
+}
+.biz-menu  .ivu-menu-item-group:nth-child(2)::after {
+    background: transparent;
+}
+.biz-menu  .ivu-menu-item-group:nth-child(2) {
+    margin-top: 30px;
+}
+
+
 .biz-menu .ivu-menu-item-group:first-child {
     margin-top: 0px;
 }

TEAMModelOS/ClientApp/src/locale/lang/en-US/stuAccount.js

@@ -37,6 +37,9 @@ export default {
   delOk:'删除成功',
   isBottom:'已经到底了',
   edit:'修改',
+  adminClass:'行政班管理',
+  teachClass:'教學班管理',
+  stuMgt:'學生管理',
 
   // AddStudent.vue
   accountInfo: '账号资讯',
@@ -90,6 +93,7 @@ export default {
   idWarning:'警告：Excel 內账号重复！',
   gradeWarning:'警告：年级错误',
   setNoErr:"错误：座位号已在校內重复",
+  downloadText:'(下載名單模板)',
 
   // Authorization.vue
   authTitle: '服务授权管理',

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/stuAccount.js

@@ -37,6 +37,9 @@ export default {
   delOk:'删除成功',
   isBottom:'已经到底了',
   edit:'修改',
+  adminClass:'行政班管理',
+  teachClass:'教学班管理',
+  stuMgt:'学生管理',
 
   // AddStudent.vue
   accountInfo: '账号资讯',
@@ -90,6 +93,7 @@ export default {
   idWarning:'警告：Excel 內账号重复！',
   gradeWarning:'警告：年级错误',
   setNoErr:"错误：座位号已在校內重复",
+  downloadText:'(下载名单模板)',
 
   // Authorization.vue
   authTitle: '服务授权管理',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/stuAccount.js

@@ -37,6 +37,9 @@ export default {
   delOk: '刪除成功',
   isBottom: '已經到底了',
   edit:'修改',
+  adminClass:'行政班管理',
+  teachClass:'教學班管理',
+  stuMgt:'學生管理',
 
   //AddStudent.vue
   accountInfo: '帳號資訊',
@@ -90,6 +93,7 @@ export default {
   idWarning:'警告：Excel 內賬號重複！ ',
   gradeWarning:'警告：年級錯誤',
   setNoErr:"錯誤：座位號已在校內重複",
+  downloadText:'(下載名單模板)',
 
   //Authorization.vue
   authTitle: '服務授權管理',

TEAMModelOS/ClientApp/src/view/student-account/ImportStudent.vue

@@ -12,7 +12,7 @@
             </Upload>
             <p class="import-tips" style="margin-top:40px;">{{$t('stuAccount.importTips1')}}</p>
             <p class="import-tips">{{$t('stuAccount.importTips2') + $t('stuAccount.importTips3')}}</p>
-            <a style="margin-top:10px;color:turquoise;display:inline-block;" href="https://teammodelstorage.blob.core.chinacloudapi.cn/download/%E5%AD%A6%E7%94%9F%E5%90%8D%E5%8D%95%E6%A8%A1%E5%9D%97.xlsx">(下载名单模板)</a>
+            <a style="margin-top:10px;color:turquoise;display:inline-block;" href="https://teammodelstorage.blob.core.chinacloudapi.cn/download/%E5%AD%A6%E7%94%9F%E5%90%8D%E5%8D%95%E6%A8%A1%E5%9D%97.xlsx">{{$t('stuAccount.downloadText')}}</a>
         </div>
         <div class="form-body" style="background:none;" v-else>
             <div class="ivu-upload-list-file">

TEAMModelOS/ClientApp/src/view/student-account/Index.vue

@@ -12,18 +12,14 @@
         <div class="stu-mgt-header">
             <div class="tab-box">
                 <span class="pane" @click="tab = 'list'" :class="{ active: tab === 'list' }">
-                    学生管理
+                    {{$t('stuAccount.stuMgt')}}
                 </span>
                 <span class="pane" @click="tab = 'class'" :class="{ active: tab === 'class' }">
-                    班级管理
+                    {{$t('stuAccount.adminClass')}}
                 </span>
                 <span class="pane" @click="tab = 'stulist'" :class="{ active: tab === 'stulist' }">
-                    {{$t('cusMgt.stuListMgt')}}
+                    {{$t('stuAccount.teachClass')}}
                 </span>
-                <!-- <span @click="goMgtStuList" :class="courseListShow.length == 0 ? 'action-btn-disabled action-btn':'action-btn'">
-                    <Icon type="ios-people" size="16" />
-                    <span>{{$t('cusMgt.stuListMgt')}}</span>
-                </span> -->
             </div>
         </div>
         <!-- 学生账号管理 -->