Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -1379,7 +1379,8 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                             {
                                                 T = 0;
                                             }
-                                            else if (lessonRecord.clientInteractionAverge >= 1 && lessonRecord.clientInteractionAverge <= 2)
+                                            else if (lessonRecord.clientInteractionAverge > 0 && lessonRecord.clientInteractionAverge < 2)
+                                           // else if (lessonRecord.clientInteractionAverge >= 1 && lessonRecord.clientInteractionAverge <= 2)
                                             {
                                                 T = 1;
                                             }

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -4532,6 +4532,8 @@ const LANG_EN_US = {
             error: "Failed to join the course",
             api: "API Error",
             noAgree: "The course is not open to join",
+            basicCourses: 'Base Course',
+            system: 'System',
         },
         coursesCardTitle: 'My Course List',
         newAddCourse: 'The latest addition',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -4535,6 +4535,8 @@ const LANG_ZH_CN = {
             error: "邀请码不存在，请重新输入",
             api: "API错误",
             noAgree: "课程名单未开放加入",
+            basicCourses: '基本课程',
+            system: '系统',
         },
         coursesCardTitle: '我的课程清单',
         newAddCourse: '最新加入课程',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -4536,6 +4536,8 @@ const LANG_ZH_TW = {
             error: "課程加入失敗",
             api: "API錯誤",
             noAgree: "課程名單未開放加入",
+            basicCourses: '基本課程',
+            system: '系統',
         },
         coursesCardTitle: '我的課程清單',
         newAddCourse: '最新加入課程',

TEAMModelOS/ClientApp/src/view/mycourse/MyCourse.less

@@ -249,4 +249,12 @@
 .start-cus-info {
     color: #17233d;
     font-weight: 900;
+}
+
+.edit-name-content{
+    .edit-name-label{
+        margin-bottom: 0;
+        margin-right: 20px;
+        min-width: 30px;
+    }
 }

TEAMModelOS/ClientApp/src/view/mycourse/MyCourse.vue

@@ -169,10 +169,12 @@
         {{$t('cusMgt.renameListTitle')}}
       </div>
       <div class="edit-name-content">
-        <p class="edit-name-label">
-          {{$t('cusMgt.listName')}}
-        </p>
-        <Input v-model="edName" :placeholder="renameBefore" />
+        <div style="display: flex; align-items: center;">
+          <p class="edit-name-label">
+            {{$t('cusMgt.listName')}}
+          </p>
+          <Input v-model="edName" :placeholder="renameBefore" />
+        </div>
         <Button :loading="btnLoading" @click="confirmRename" long type="primary" class="confirm-btn">{{ $t('syllabus.confirm') }}</Button>
       </div>
     </Modal>
@@ -198,7 +200,7 @@
             </RadioGroup>
           </FormItem>
           <FormItem :label="$t('cusMgt.name')" v-if="type == 'create'">
-            <Input v-file-name v-model="listName" :placeholder="$t('cusMgt.nameHolder')" style="width: 300px" />
+            <Input v-file-name v-model="listName" :placeholder="$t('cusMgt.nameHolder')" />
           </FormItem>
           <FormItem :label="$t('cusMgt.listLabel')" v-else>
             <Select v-model="listId" style="width:300px">

TEAMModelOS/ClientApp/src/view/student-web/AppNew.vue

@@ -3,9 +3,12 @@
         <!--導航列-->
         <div class="myNav">
             <div>
-                <span @click="clickSidebarToggle()" v-if="MyNo != '1' && MyNo != '4' && MyNo != 'X' && MyNo != '7' && MyNo != '8'" class="sidebar-toggle">
+                <span @click="clickSidebarToggle()" v-if="MyNo != '1' && MyNo != '4' && MyNo != 'X' && MyNo != '7' && MyNo != '8' && MyNo != '12' && MyNo != '13'" class="sidebar-toggle">
                     <Icon class="menu-icon" type="md-menu" :class="{'menu-icon-close': this.$store.getters.getSidebarisOpen == false}" v-if="MyNo != '11'" />
                 </span>
+                <span v-show="MyNo === '13'" class="sidebar-toggle">
+                    <Icon custom="iconfont icon-exit" size="20" class="menu-icon" @click="$router.go(-1)"></Icon>
+                </span>
                 <span :class="['mytitle', {'no-show-title': MyNo === '1'}]">{{ MyName }}</span>
             </div>
             <div :class="courseList.length && !onlySystem ? 'selectClass' : 'addClass'" v-if="MyNo != '11'">
@@ -632,17 +635,17 @@ export default {
                             admClass = {
                                 id: "",
                                 no: "",
-                                name: "基本课程-系统",
+                                name: `${this.$t('studentWeb.courseType.basicCourses')}-${this.$t('studentWeb.courseType.system')}`,
                                 subject: "",
                                 scope: "school",
                                 school: this.$store.state.userInfo.azp,
                                 creatorId: "",
                                 desc: "",
                                 roster: undefined,
-                                teacherName: "系统",
+                                teacherName: this.$t('studentWeb.courseType.system'),
                                 list: this.user.studentProfile.classinfo.id,
                                 listName: this.user.studentProfile.classinfo.name,
-                                showName: `基本课程-系统(系统-${this.user.studentProfile.classinfo.name})`,
+                                showName: `${this.$t('studentWeb.courseType.basicCourses')}-${this.$t('studentWeb.courseType.system')}(${this.$t('studentWeb.courseType.system')}-${this.user.studentProfile.classinfo.name})`,
                                 courseAddDate: "",
                                 createTime: 0,
                                 isSystem: true,
@@ -656,17 +659,17 @@ export default {
                     let admClass = {
                         id: "",
                         no: "",
-                        name: "基本课程-系统",
+                        name: `${this.$t('studentWeb.courseType.basicCourses')}-${this.$t('studentWeb.courseType.system')}`,
                         subject: "",
                         scope: "school",
                         school: this.$store.state.userInfo.azp,
                         creatorId: "",
                         desc: "",
                         roster: undefined,
-                        teacherName: "系统",
+                        teacherName: this.$t('studentWeb.courseType.system'),
                         list: this.user.studentProfile.classinfo.id,
                         listName: this.user.studentProfile.classinfo.name,
-                        showName: `基本课程-系统(系统-${this.user.studentProfile.classinfo.name})`,
+                        showName: `${this.$t('studentWeb.courseType.basicCourses')}-${this.$t('studentWeb.courseType.system')}(${this.$t('studentWeb.courseType.system')}-${this.user.studentProfile.classinfo.name})`,
                         courseAddDate: "",
                         createTime: 0,
                         isSystem: true,