Merge branch 'TPE/feat/classroomManage' into TPE/develop

TEAMModelOS/ClientApp/src/view/schoolmgmt/ClassroomSetting/ClassroomSetting.less

@@ -385,3 +385,15 @@
         background: rgba(68,68,68,.5);
     }
 }
+.hiteach-collapse{
+    &-main{
+        &:hover{
+            background-image: linear-gradient(90deg, rgba(30,30,30,0) 0%, rgba(110,110,110,.2) 50%, rgba(110,110,110,.4) 100%);
+        }
+    }
+    .hiteach-collapse-sub{
+        &:hover{
+            background-image: linear-gradient(90deg, #2a2a2e, #293942);
+        }
+    }
+}

TEAMModelOS/ClientApp/src/view/schoolmgmt/ClassroomSetting/ClassroomSetting.vue

@@ -196,10 +196,10 @@
                         </div>
                         <div class="hiteach-code-wrap-list">
                             <vuescroll>
-                                <div class="hiteach-collapse" style="border-bottom: 1px solid #424242;position: relative;">
+                                <div @click="stdFlag = !stdFlag" class="hiteach-collapse" style="border-bottom: 1px solid #424242;position: relative;cursor: pointer;">
                                     <div class="hiteach-collapse-main" style="display: flex;align-items: center;padding: 20px 0 20px 20px;">
 
-                                        <Icon @click="stdFlag = !stdFlag" :type="stdFlag ? 'ios-arrow-up' : 'ios-arrow-down'" size="30" color="white" style="position: absolute;right: 5px;top: 20px;"/>
+                                        <Icon :type="stdFlag ? 'ios-arrow-up' : 'ios-arrow-down'" size="30" color="white" style="position: absolute;right: 5px;top: 20px;"/>
 
                                         <v-icon style="width: 60px;height: 60px;margin-right: 30px;" iconClass="htc_std" />
                                         <div style="font-size: 12px;letter-spacing: 1px;">
@@ -223,7 +223,7 @@
                                         </div>
                                     </div>
                                     <div v-if="stdFlag">
-                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                        <div class="hiteach-collapse-sub gradient" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
                                             <Checkbox style="margin-right: 70px;" v-model="test1" disabled></Checkbox>
                                             <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
                                                 <ul>
@@ -243,7 +243,7 @@
                                                 </span>
                                             </div>
                                         </div>
-                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                        <div class="hiteach-collapse-sub gradient" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
                                             <Checkbox style="margin-right: 70px;"></Checkbox>
                                             <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
                                                 <ul>
@@ -291,7 +291,7 @@
                                         </div>
                                     </div>
                                     <div v-if="tblFlag">
-                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                        <div class="hiteach-collapse-sub gradient" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
                                             <Checkbox style="margin-right: 70px;" v-model="test1" disabled></Checkbox>
                                             <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
                                                 <ul>
@@ -311,7 +311,7 @@
                                                 </span>
                                             </div>
                                         </div>
-                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                        <div class="hiteach-collapse-sub gradient" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
                                             <Checkbox style="margin-right: 70px;"></Checkbox>
                                             <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
                                                 <ul>
@@ -359,7 +359,7 @@
                                         </div>
                                     </div>
                                     <div v-if="proFlag">
-                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                        <div class="hiteach-collapse-sub gradient" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
                                             <Checkbox style="margin-right: 70px;" v-model="test1" disabled></Checkbox>
                                             <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
                                                 <ul>
@@ -379,7 +379,7 @@
                                                 </span>
                                             </div>
                                         </div>
-                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                        <div class="hiteach-collapse-sub gradient" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
                                             <Checkbox style="margin-right: 70px;"></Checkbox>
                                             <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
                                                 <ul>
@@ -1385,7 +1385,7 @@
         
 </style>
 <style lang="less">
-.testclass{
+.gradient{
     @keyframes Itemfadein {
           0% {
             opacity: 0;

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

@@ -557,8 +557,10 @@
                     data = data.filter(function(item){
                         return item.periodId == periodId
                     })
+                    return data
+                } else {
+                    return []
                 }
-                return data
             },
             filterClasses: function(){
                 var data = this.classes
@@ -567,11 +569,16 @@
                     data = data.filter(function(item){
                         return item.gradeId == gradeId
                     })
+                    return data
+                } else {
+                    return []
                 }
-                return data
             }
         },
         mounted() {
+            if(Array.isArray(this.periods)){
+                this.searchPeriod = this.periods[0].id
+            }
         }
     }
 </script>