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

TEAMModelOS/ClientApp/src/assets/student-web/component_styles/course-list.less

@@ -1,7 +1,8 @@
 @import "color.less";
 
-.course-list {
-    .list{
+// .course-list {
+.list {
+    // .list{
         width: 30%;
 
         .tag-style {
@@ -10,7 +11,7 @@
             border-radius: 3px;
             margin-right: 10px;
         }
-    }
+    // }
     .tableViewBtn,.listViewBtn{
         display: inline-block;
         position: fixed;

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/LessonTestReport.vue

@@ -514,6 +514,7 @@
                     stuId: this.$store.state.userInfo.sub
                 }
                 this.$store.commit("setComposeData", textArr)
+                localStorage.setItem("composeData", encodeURIComponent(JSON.stringify(textArr)))
                 this.$router.push({
                     name: "examView/evaluation",
                     /* params: {

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventList.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
         <Loading v-show="isLoad" bgColor="rgba(0, 0, 0, 0.3)"></Loading>
-        <div class="event-list" v-show="getSidebarisOpen">
-            <div class="list">
+        <!-- <div class="event-list"> -->
+            <div class="list" v-show="getSidebarisOpen">
                 <!--活動搜尋與篩選區域-->
                 <div class="event-selector-block">
                     <div class="search">
@@ -315,7 +315,7 @@
                     <div class="list-end"></div>
                 </div>
             </div>
-        </div>
+        <!-- </div> -->
         <div class="eventContentArea-view" :class="{'no-bar': !getSidebarisOpen}">
             <!--<VoteHint v-if="this.$store.getters.getisVoteResulthover==true"/>-->
             <template v-if="nowActivity">

TEAMModelOS/ClientApp/src/components/student-web/HomeView/CourseListView.vue

@@ -3,11 +3,13 @@
     <div class="courselist-view">
         <Loading v-show="isLoad" bgColor="rgba(0, 0, 0, 0.3)"></Loading>
         <!-- 列表 -->
-        <div class="course-list"
-            :class="{ courselistEn: getCurrentLaguage == 'en-us', 'hide-sidebar': !getSidebarisOpen}"
-        >
-            <div class="list">
-                <ul class="list-block">
+        <!-- <div class="course-list"
+            
+        > -->
+            <div class="list"
+                :class="{ courselistEn: getCurrentLaguage == 'en-us', 'hide-sidebar': !getSidebarisOpen}"
+            >
+                <!-- <ul class="list-block"> -->
                     <Tabs :value="onlyStu ? (getMycID.addSuccess == true ? 'tab2' : 'tab1') : 'tab2' ">
                         <!-- 表定课程 -->
                         <TabPane :label="$t('studentWeb.defaultClass')"
@@ -118,9 +120,9 @@
                             </div>
                         </TabPane>
                     </Tabs>
-                </ul>
+                <!-- </ul> -->
             </div>
-        </div>
+        <!-- </div> -->
         <!-- 基本信息 -->
         <div class="course-content"
             :class="{ courseContentEn: getCurrentLaguage == 'en-us', 'course-content-span': !getSidebarisOpen }"
@@ -1354,7 +1356,7 @@ export default {
     }
 }
 
-.list-block{
+.list{
     .ivu-tabs-nav {
         float: left !important;
 

TEAMModelOS/ClientApp/src/components/student-web/HomeView/HomeViewnnnnew.vue

@@ -2,17 +2,17 @@
     <div class="home-view">
         <Loading v-show="isLoading" bgColor="rgba(0, 0, 0, 0.3)"></Loading>
         <div class="home-head home-card">
-        <Row :gutter="30">
-            <Col :xs="24" :sm="12" :md="12" :lg="8">
-                <ExamPerform />
-            </Col>
-            <Col :xs="24" :sm="12" :md="12" :lg="8">
-                <HomeworkPoint />
-            </Col>
-            <Col :xs="24" :sm="12" :md="12" :lg="8">
-                <ClassPoint />
-            </Col>
-        </Row>
+            <Row :gutter="30">
+                <Col :xs="24" :sm="12" :md="12" :lg="8">
+                    <ExamPerform />
+                </Col>
+                <Col :xs="24" :sm="12" :md="12" :lg="8">
+                    <HomeworkPoint />
+                </Col>
+                <Col :xs="24" :sm="12" :md="12" :lg="8">
+                    <ClassPoint />
+                </Col>
+            </Row>
         </div>
         <Row :gutter="30">
             <Col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">