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

TEAMModelOS.SmartClass/ClientApp/static/lessonDetails.json

@@ -1086,6 +1086,7 @@
     ]
   },
   {
+    "rowKey": 3,
     "data": {
       "activityStatusTip": "已结束",
       "commentCount": 52,
@@ -1447,6 +1448,7 @@
     ]
   },
   {
+    "rowKey": 4,
     "data": {
       "activityStatusTip": "已结束",
       "commentCount": 52,
@@ -1808,6 +1810,7 @@
     ]
   },
   {
+    "rowKey": 5,
     "data": {
       "activityStatusTip": "已结束",
       "commentCount": 52,
@@ -2169,6 +2172,7 @@
     ]
   },
   {
+    "rowKey": 6,
     "data": {
       "activityStatusTip": "已结束",
       "commentCount": 52,
@@ -2530,6 +2534,7 @@
     ]
   },
   {
+    "rowKey": 7,
     "data": {
       "activityStatusTip": "已结束",
       "commentCount": 52,
@@ -2891,6 +2896,7 @@
     ]
   },
   {
+    "rowKey": 8,
     "data": {
       "activityStatusTip": "已结束",
       "commentCount": 52,
@@ -3252,6 +3258,7 @@
     ]
   },
   {
+    "rowKey": 9,
     "data": {
       "activityStatusTip": "已结束",
       "commentCount": 52,

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>

TEAMModelOS.SmartTeach/ClientApp/components/resource/activityindex.vue

@@ -1023,12 +1023,15 @@
   }
   .index_top_list {
     width:100%;
-    height:250px;
+    height:auto;
     list-style:none;
+    overflow:hidden;
   }
   .index_top_data {
-    width:100%;
+    width:114%;
+    height:20px;
     padding:1%  3% 3% 0%;
+    border-bottom:1px dashed #ddd;
   }
   .index_top_data_title {
     width: 70%;
@@ -1042,7 +1045,7 @@
   }
   .activity_img {
     width:1200px;
-    margin-top:7%;
+    margin-top:5%;
     float:left;
   }
   .production_box {

TEAMModelOS.SmartTeach/ClientApp/components/resource/exam.vue

@@ -142,7 +142,7 @@
   }
   .exam_box {
     width: 30%;
-    height: 250px;
+    height: 300px;
     margin: 1% 0% 1% 4.5%;
     text-align: center;
     float: left;
@@ -150,6 +150,7 @@
     padding: 1%;
     box-shadow: 2px 2px 10px rgba(15,4,9,0.05);
     background-color: #fff;
+    padding-left:20px;
   }
     .exam_box:nth-child(1) {
       margin: 1% 1% 1% 0%;
@@ -165,7 +166,6 @@
     font-size: 24px;
     border-bottom: #288add solid 1px;
     float: left;
-    margin-left: 20px;
   }
 
   .exam_title i {
@@ -183,15 +183,14 @@
   .exam_img {
     margin-top: 10px;
     float: left;
-    margin-left:15px;
   }
     .exam_img img {
-      width:90%;
+      width:106%;
     }
     .exam_list {
       width: 100%;
       height: auto;
-      padding: 1%;
+      padding: 1% 1% 1% 0%;
       list-style: none;
       float: left;
       text-align: left;
@@ -200,6 +199,8 @@
   .exam_list_data {
     width: 100%;
     float: left;
+    padding:4px 2px;
+    border-bottom:1px dashed #ddd;
   }
 
   .exam_list_title {

TEAMModelOS.SmartTeach/ClientApp/components/resource/recommend.vue

@@ -127,10 +127,11 @@
   }
   .recommend_box {
     width: 1200px;
-    height: 370px;
+    height: auto;
     background-color: #fff;
     box-shadow: 2px 2px 10px rgba(15,4,9,0.05);
     margin:0 auto;
+    overflow:hidden;
   }
   .recommend_header {
     width: 100%;
@@ -174,6 +175,7 @@
     /*border:1px solid red;*/
     height:auto;
     padding:1%;
+    /*border-right:1px solid #e3e3e3;*/
   }
   .recommend_left {
     width:100%;
@@ -187,7 +189,8 @@
     width: 100%;
     list-style: none;
     float: left;
-    padding:0.5%;
+    padding:8px 2px;
+    border-bottom:1px dashed #ddd;
   }
   .recommend_list_title {
     font-size:14px;

TEAMModelOS.SmartTeach/Views/Shared/_Layout.cshtml

@@ -4,9 +4,8 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"]TEAM Model OS</title>
+    <title>益教·智慧教育云平台</title>
     <link rel="stylesheet" href="~/dist/style.css" asp-append-version="true" />
-    <link rel="icon" type="image/x-icon" class="js-site-favicon" href="https://account.habookaclass.biz/dist/6854ccd21afb6b1f994e1556c2360dd8.ico">
     @*<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
         <environment names="Staging,Production">
             <link rel="stylesheet" href="~/dist/site.css" asp-append-version="true" />