Merge branch 'master' of http://106.12.23.251:10080/CDHABOOK/TEAMModelOS

TEAMModelOS.SmartClass/ClientApp/view/smart-class/LessonDetails.vue

@@ -6,7 +6,18 @@
     <div class="details-container">
       <div class="activity-brief center-row">
         <div class="activity-brief-left">
-          <img :src="getThumb(rowKey)" width="100%" />
+          <!--<img :src="getThumb(rowKey)" width="100%" />-->
+          <div class="img-box">
+            <span class="state" style="background: rgb(130, 147, 166); visibility: visible;">{{activityInfo.activityStatusTip}}</span>
+            <!--<img :src="getThumb(item.rowKey)" alt="">-->
+            <div class="lesson-image">
+              <p style="font-size:24px">高新区智慧课堂优秀课例</p>
+              <p style="font-size:16px;margin:5px 0">{{activityInfo.parentGradeName}}</p>
+              <p style="font-size:28px;">《 {{activityInfo.parentProjectName}} 》</p>
+              <p style="font-size:16px;margin-top:8px;">{{activityInfo.schoolName}} {{activityInfo.speaker}}教师 执教</p>
+              <p style="font-size:16px;margin-top:8px;">授课平台：{{activityInfo.parentTeachePlateName}}</p>
+            </div>
+          </div>
         </div>
         <div class="activity-brief-right">
           <div class="activity-brief-title">
@@ -105,14 +116,7 @@
           }
         );
       },
-      getThumb(type) {
-        let thumb = {
-          "0": require("../../assets/image/lessonCover.png"),
-          "1": require("../../assets/image/lessonCover2.png"),
-          "2": require("../../assets/image/lessonCover3.png"),
-         };
-         return thumb[type];
-        },
+
     },
     mounted() {
       let myChart = this.$echarts.init(document.getElementById('views'));
@@ -275,7 +279,7 @@
       .details-container .activity-brief .activity-brief-left {
         width: 30%;
         height: 100%;
-        padding: 40px 20px 0 20px;
+        padding: 30px 20px 0 20px;
       }
 
       .details-container .activity-brief .activity-brief-right {
@@ -415,4 +419,29 @@
         font-weight:bold;
         border-bottom: 1px solid #f6f6f6;
     }
+
+    .img-box {
+          background:url(../../assets/image/lessonCover.png);
+          height: 210px
+      }
+
+        .img-box .lesson-image {
+          display:flex;
+          flex-direction:column;
+          justify-content:center;
+          align-items:center;
+          color:#fff;
+          font-weight:bold;
+        }
+
+      .img-box .state {
+          padding: 5px 8px;
+          line-height: 20px;
+          position: relative;
+          left: 0;
+          top: 3px;
+          z-index: 1;
+          background-color: #13ce66;
+          color: #fff
+      }
 </style>

TEAMModelOS.SmartClass/ClientApp/view/smart-class/LessonList.vue

@@ -8,14 +8,23 @@
     <div class="activities">
       <div class="activity" v-for="(item,index) in lessons" @click="handleLessonClick(item.rowKey)">
         <div>
-          <div class="img-box"><span class="state" style="background: rgb(130, 147, 166); visibility: visible;">{{item.activityStatusTip}}</span> <img :src="getThumb(item.rowKey)" alt=""></div>
+          <div class="img-box">
+            <span class="state" style="background: rgb(130, 147, 166); visibility: visible;">{{item.data.activityStatusTip}}</span>
+          <!--<img :src="getThumb(item.rowKey)" alt="">-->
+            <div class="lesson-image">
+              <p style="font-size:24px">高新区智慧课堂优秀课例</p>
+              <p style="font-size:16px;margin:5px 0">{{item.data.parentGradeName}}</p>
+              <p style="font-size:28px;">《 {{item.data.parentProjectName}} 》</p>
+              <p style="font-size:16px;margin-top:8px;">{{item.data.schoolName}} {{item.data.speaker}}教师 执教</p>
+              <p style="font-size:16px;margin-top:8px;">授课平台：{{item.data.parentTeachePlateName}}</p>
+            </div>
+          </div>
           <div class="infos">
-            <p></p>
-              <p>名称：{{item.mainActivityName}}</p>
-              <p>学校：{{item.schoolName}}</p>
-              <p>主讲：{{item.speaker}}</p>
-              <p>学科：{{item.categoryName}}</p>
-              <p>时间：{{item.timeTip}}</p>
+            <p>名称：{{item.data.name}}</p>
+            <p>学校：{{item.data.schoolName}}</p>
+            <p>主讲：{{item.data.speaker}}</p>
+            <p>学科：{{item.data.parentCategoryName}}</p>
+            <p>时间：{{item.data.timeRangeTip}}</p>
           </div>
         </div>
       </div>
@@ -24,6 +33,7 @@
 </template>
 <script>
     import lessons from '@/static/observationList.json'
+    import lessonDetails from '@/static/lessonDetails.json'
   export default {
     components: {
     },
@@ -34,7 +44,7 @@
     },
 
     created() {
-      this.lessons = lessons.list;
+      this.lessons = lessonDetails;
     },
     methods: {
       getList(type) {
@@ -50,16 +60,6 @@
         this.typeName = name;
         this.getList(typeId);
       },
-      getThumb(type) {
-        let thumb = {
-          "0": require("../../assets/image/lessonCover.png"),
-          "1": require("../../assets/image/lessonCover2.png"),
-          "2": require("../../assets/image/lessonCover3.png"),
-         };
-         return thumb[type];
-        },
-
-
       handleLessonClick(rowKey) {
         sessionStorage.setItem('_lesson_rowKey', rowKey);
         this.$router.push('lessonDetails')
@@ -119,9 +119,19 @@
 }
 
 .img-box {
+    background:url(../../assets/image/lessonCover.png);
     height: 210px
 }
 
+  .img-box .lesson-image {
+    display:flex;
+    flex-direction:column;
+    justify-content:center;
+    align-items:center;
+    color:#fff;
+    font-weight:bold;
+  }
+
 .img-box .state {
     padding: 5px 8px;
     line-height: 20px;
@@ -177,4 +187,5 @@
 }
 
 
+
 </style>