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

TEAMModelOS.SmartClass/ClientApp/components/smart-class/headers.vue

@@ -5,9 +5,9 @@
       <ul>
         <li :class="this.$route.path ==  '/main/index' || activeIndex == 0 ? 'li-active':''" @click="handleMenuClick(0,'index')">首页</li>
         <li :class="this.$route.path ==  '/main/notice' || activeIndex == 1? 'li-active':''" @click="handleMenuClick(1,'notice')">通知公告</li>
+        <li :class="this.$route.path ==  '/main/LiveBroadcast' || activeIndex == 4? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">天天直播</li>
         <li :class="this.$route.path ==  '/main/reviewActivity' || activeIndex == 2? 'li-active':''" @click="handleMenuClick(2,'reviewActivity')">评审活动</li>
         <li :class="this.$route.path ==  '/main/PastReview' || activeIndex == 3? 'li-active':''" @click="handleMenuClick(3,'PastReview')">往届回顾</li>
-        <li :class="this.$route.path ==  '/main/LiveBroadcast' || activeIndex == 4? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">天天直播</li>
         <li :class="this.$route.path ==  '/main/Lessons' || activeIndex == 5? 'li-active':''" @click="handleMenuClick(5,'Lessons')">优课汇聚</li>
       </ul>
       <span class="btn-login" v-if="isLogin == 1" >欢迎&nbsp;{{userName}} !</span>

TEAMModelOS.SmartClass/ClientApp/static/observationList.json

@@ -1,450 +1,130 @@
 {
-  "data": null,
-  "errorCode": null,
-  "html": null,
-  "key": null,
   "list": [
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 18,
-      "categoryName": "化学",
-      "cover": "徐益敏.png",
+      "categoryName": "英语",
       "coverHash": "350.png",
-      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
-      "endTime": {
-        "date": 14,
-        "day": 5,
-        "hours": 10,
-        "minutes": 47,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544755620000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 12,
+      "coverUri": "../../assets/image/lessonCover.png",
       "gradeName": "九年级",
-      "id": 176,
-      "mainActivityId": 27,
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "徐益敏",
-      "startTime": {
-        "date": 14,
-        "day": 5,
-        "hours": 10,
-        "minutes": 0,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544752800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
+      "speaker": "胡颖",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 0
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 9,
-      "categoryName": "语文",
-      "cover": "喻远鑫.png",
-      "coverHash": "351.png",
-      "coverUri": "/upload/viewactivity/cover/351/351.png?_=1557818510234",
-      "endTime": {
-        "date": 13,
-        "day": 4,
-        "hours": 9,
-        "minutes": 48,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544665680000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 12,
-      "gradeName": "九年级",
-      "id": 175,
-      "mainActivityId": 27,
+      "categoryName": "历史",
+      "coverHash": "350.png",
+      "coverUri": "../../assets/image/lessonCover2.png",
+      "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "喻远鑫",
-      "startTime": {
-        "date": 13,
-        "day": 4,
-        "hours": 9,
-        "minutes": 0,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544662800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.12.13 09:00 - 12.13 09:48",
-      "viewActivityId": 351,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "speaker": "钟源",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 1
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 1,
-      "categoryName": "语文",
-      "cover": "王淼燕.png",
-      "coverHash": "352.png",
-      "coverUri": "/upload/viewactivity/cover/352/352.png?_=1557818510234",
-      "endTime": {
-        "date": 14,
-        "day": 3,
-        "hours": 10,
-        "minutes": 0,
-        "month": 10,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1542160800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 8,
-      "gradeName": "五年级",
-      "id": 174,
-      "mainActivityId": 27,
+      "categoryName": "数学",
+      "coverHash": "350.png",
+      "coverUri": "../../assets/image/lessonCover3.png",
+      "gradeName": "六年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "王淼燕",
-      "startTime": {
-        "date": 14,
-        "day": 3,
-        "hours": 9,
-        "minutes": 15,
-        "month": 10,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1542158100000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.11.14 09:15 - 11.14 10:00",
-      "viewActivityId": 352,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "speaker": "杨悦婷",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 2
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 2,
-      "categoryName": "数学",
-      "cover": "李甜.png",
-      "coverHash": "354.png",
-      "coverUri": "/upload/viewactivity/cover/354/354.png?_=1557818510234",
-      "endTime": {
-        "date": 14,
-        "day": 5,
-        "hours": 11,
-        "minutes": 0,
-        "month": 8,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1536894000000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 6,
-      "gradeName": "三年级",
-      "id": 173,
-      "mainActivityId": 27,
+      "categoryName": "历史",
+      "coverHash": "350.png",
+      "coverUri": "../assets/image/lessonCover.png",
+      "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "李甜",
-      "startTime": {
-        "date": 14,
-        "day": 5,
-        "hours": 10,
-        "minutes": 0,
-        "month": 8,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1536890400000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.09.14 10:00 - 09.14 11:00",
-      "viewActivityId": 354,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "speaker": "钟源",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 0
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 1,
-      "categoryName": "语文",
-      "cover": "赵霞.png",
-      "coverHash": "355.png",
-      "coverUri": "/upload/viewactivity/cover/355/355.png?_=1557818510234",
-      "endTime": {
-        "date": 8,
-        "day": 5,
-        "hours": 10,
-        "minutes": 0,
-        "month": 5,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1528423200000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 5,
-      "gradeName": "二年级",
-      "id": 172,
-      "mainActivityId": 27,
+      "categoryName": "数学",
+      "coverHash": "350.png",
+      "coverUri": "../assets/image/lessonCover2.png",
+      "gradeName": "六年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "赵霞",
-      "startTime": {
-        "date": 8,
-        "day": 5,
-        "hours": 9,
-        "minutes": 0,
-        "month": 5,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1528419600000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.06.08 09:00 - 06.08 10:00",
-      "viewActivityId": 355,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "speaker": "杨悦婷",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 1
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 2,
-      "categoryName": "数学",
-      "cover": "钱亚丽.png",
-      "coverHash": "356.png",
-      "coverUri": "/upload/viewactivity/cover/356/356.png?_=1557818510234",
-      "endTime": {
-        "date": 8,
-        "day": 2,
-        "hours": 10,
-        "minutes": 49,
-        "month": 4,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1525747740000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 4,
-      "gradeName": "一年级",
-      "id": 171,
-      "mainActivityId": 27,
+      "categoryName": "英语",
+      "coverHash": "350.png",
+      "coverUri": "../assets/image/lessonCover3.png",
+      "gradeName": "九年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "钱亚丽",
-      "startTime": {
-        "date": 8,
-        "day": 2,
-        "hours": 10,
-        "minutes": 0,
-        "month": 4,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1525744800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.05.08 10:00 - 05.08 10:49",
-      "viewActivityId": 356,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "speaker": "胡颖",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 2
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 7,
-      "categoryName": "数学",
-      "cover": "余旭红.png",
-      "coverHash": "349.png",
-      "coverUri": "/upload/viewactivity/cover/349/349.png?_=1557818510234",
-      "endTime": {
-        "date": 3,
-        "day": 4,
-        "hours": 10,
-        "minutes": 46,
-        "month": 4,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1525315560000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 12,
-      "gradeName": "九年级",
-      "id": 166,
-      "mainActivityId": 27,
+      "categoryName": "历史",
+      "coverHash": "350.png",
+      "coverUri": "../assets/image/lessonCover.png",
+      "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "余旭红",
-      "startTime": {
-        "date": 3,
-        "day": 4,
-        "hours": 10,
-        "minutes": 0,
-        "month": 4,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1525312800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.05.03 10:00 - 05.03 10:46",
-      "viewActivityId": 349,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "speaker": "钟源",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 0
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 2,
       "categoryName": "数学",
-      "cover": "潘旖.png",
-      "coverHash": "357.png",
-      "coverUri": "/upload/viewactivity/cover/357/357.png?_=1557818510234",
-      "endTime": {
-        "date": 9,
-        "day": 1,
-        "hours": 9,
-        "minutes": 50,
-        "month": 3,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1523238600000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 8,
-      "gradeName": "五年级",
-      "id": 170,
-      "mainActivityId": 27,
+      "coverHash": "350.png",
+      "coverUri": "../assets/image/lessonCover2.png",
+      "gradeName": "六年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "潘旖",
-      "startTime": {
-        "date": 9,
-        "day": 1,
-        "hours": 9,
-        "minutes": 0,
-        "month": 3,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1523235600000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.04.09 09:00 - 04.09 09:50",
-      "viewActivityId": 357,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "speaker": "杨悦婷",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 1
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 10,
-      "categoryName": "科学",
-      "cover": "王珂慧.png",
-      "coverHash": "358.png",
-      "coverUri": "/upload/viewactivity/cover/358/358.png?_=1557818510234",
-      "endTime": {
-        "date": 23,
-        "day": 5,
-        "hours": 10,
-        "minutes": 40,
-        "month": 2,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1521772800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 11,
-      "gradeName": "八年级",
-      "id": 169,
-      "mainActivityId": 27,
+      "categoryName": "英语",
+      "coverHash": "350.png",
+      "coverUri": "../assets/image/lessonCover3.png",
+      "gradeName": "九年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "王珂慧",
-      "startTime": {
-        "date": 23,
-        "day": 5,
-        "hours": 10,
-        "minutes": 0,
-        "month": 2,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1521770400000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.03.23 10:00 - 03.23 10:40",
-      "viewActivityId": 358,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "speaker": "胡颖",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 2
     }
-  ],
-  "message": null,
-  "query": {
-    "fields": [],
-    "orders": [
-      {
-        "asc": false,
-        "property": "-1"
-      },
-      {
-        "asc": true,
-        "property": "parentViewActivity.activityStatus"
-      },
-      {
-        "asc": false,
-        "property": "parentViewActivity.startTime"
-      }
-    ],
-    "pageCount": 2,
-    "pageIndex": 1,
-    "pageSize": 9,
-    "recordCount": 10,
-    "recordEnd": 9,
-    "recordStart": 1
-  },
-  "success": true,
-  "systemTime": {
-    "date": 14,
-    "day": 2,
-    "hours": 15,
-    "minutes": 21,
-    "month": 4,
-    "seconds": 50,
-    "time": 1557818510202,
-    "timezoneOffset": -480,
-    "year": 119
-  },
-  "uri": null
+  ]
 }

TEAMModelOS.SmartClass/ClientApp/view/app.vue

@@ -32,7 +32,7 @@
 </script>
 <style scoped>
   html, body, #app {
-    height: 100% !important;
+    /*height: 100% !important;*/
     user-select: none;
     background:rgb(241,242,243);
   }

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

@@ -4,19 +4,25 @@
       <h3 class="video-title-h3">12月03日直播</h3>
     </div>-->
     <div class="video-info">
-
       <div class="comment-video-src">
         <div>
-          <p style=" font-size: 14px; margin-bottom: 20px;"><span class="title-header">标题 : <span class="title-content">创新实验室（学科教室）课例20190508直播</span></span> <span class="title-header">主讲人 : 林燕<span class="title-content"></span></span> <span class="liveStatus">播放成功</span></p>
+          <p style=" font-size: 14px; margin-bottom: 20px;"><span class="title-header">标题 : <span class="title-content">{{lessonInfo.name}} 《 {{lessonInfo.parentProjectName}} 》</span></span> <span class="title-header">主讲人 : {{lessonInfo.speaker}}<span class="title-content"></span></span> <span class="liveStatus">播放成功</span></p>
         </div>
         <video-player class="video-player-box" style="width:800px;"
                       ref="videoPlayer"
                       :options="playerOptions"
-                      :playsinline="true">
+                      :playsinline="true"
+                      @playing="onPlayerPlaying($event)"
+                      @ready="playerReadied">
         </video-player>
-        <p class="average-score">作品当前平均分 : <span>未评</span></p>
-      </div>
+        <!--<p class="average-score">作品当前平均分 : <span>未评</span></p>-->
 
+        <div id="views" style="width:840px; height:350px;"></div>
+        <div style="background:#fff;text-align:center;display:block;font-size:18px;font-weight:bolder;width:840px; color:#333">
+          <!--<Icon type="md-pulse" size="26" color="rgb(102, 205, 170)" style="margin:10px"/>-->
+          专家点评分析图
+        </div>
+      </div>
       <div class="comment-video-detail-info">
         <Tabs value="name1">
           <TabPane label="观课评论" name="name1">
@@ -27,27 +33,35 @@
                 </span> <span class="reviewlist-content"><span>{{item.content}}</span> <span class="reviewlist-time">({{item.createTimeTip}})</span> <!----></span>
               </div>
             </div>
-            <div style="position: relative; padding-top: 20px;"><div class="lastest-comment" style="display: none;">查看最新评论</div> <textarea placeholder="发表您的评论" maxlength="250" class="publish-review"></textarea> <span class="submit-review">提交</span></div>
+            <div style="position: relative; padding-top:40px;">
+              <div class="lastest-comment" style="display: none;">查看最新评论</div>
+              <textarea placeholder="发表您的评论" v-model="newComment" maxlength="250" class="publish-review"></textarea>
+              <span class="submit-review" @click="addComment">提交</span>
+            </div>
+          </TabPane>
+          <TabPane label="专家点评" name="name2">
+            <div class="review-pane">
+              <div v-for="(item,index) in expertComments">
+                <div class="review-list" v-for="(comment,index) in item.contentList"  :key="index">
+                  <span class="reviewlist-title">
+                    {{comment.name}} :&nbsp;
+                  </span>
+                  <span class="reviewlist-content">
+                    <span>{{comment.content}}</span>
+                    <span class="reviewlist-time">({{item.time}})</span>
+                  </span>
+                </div>
+              </div>
+            </div>
           </TabPane>
-          <TabPane label="专家点评" name="name2">专家点评</TabPane>
         </Tabs>
       </div>
     </div>
-    <div class="video-other" style="display:none;">
-      <h3 class="video-title-h3">推荐作品</h3>
-    </div>
-    <div class="videos-wrap" style="display:none;">
-      <div class="video-item" v-for="(item , index) in videos" @click="showVideo(index)">
-        <img src="../../assets/image/default-act.png" width="95%" />
-        <p>{{item.title}}</p>
-      </div>
-    </div>
   </div>
 </template>
 <script>
-  import rewardList from '@/static/rewardList.json'
-  import CList from '@/static/commentList.json'
-  import"videojs-contrib-hls.js/src/videojs.hlsjs"
+  import lessonDetails from '@/static/lessonDetails.json'
+  import "videojs-contrib-hls.js/src/videojs.hlsjs"
   export default {
     data() {
       return {
@@ -63,87 +77,174 @@
           fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
           sources: [{
             type: 'application/x-mpegURL',
-            src: 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190517/demo/2019.m3u8'
+            src: lessonDetails[sessionStorage.getItem('_lesson_rowKey')].data.liveHls
           }],
-          poster: "http://static.smartisanos.cn/pr/img/video/video_03_cc87ce5bdb.jpg", //你的封面地址
+          //poster: "http://static.smartisanos.cn/pr/img/video/video_03_cc87ce5bdb.jpg", //你的封面地址
           width: document.documentElement.clientWidth,
           notSupportedMessage: '此视频暂无法播放，请稍后再试' //允许覆盖Video.js无法播放媒体源时显示的默认信息。
         },
         routerData: {},
         rewardDatas: [],
-        commmentList:[],
-        videos: [
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          }
-        ]
+        commmentList: [],
+        expertComments: [],
+        newComment: "",
+        player: {},
+        rowKey: sessionStorage.getItem('_lesson_rowKey'),
+        lessonInfo:lessonDetails[sessionStorage.getItem('_lesson_rowKey')].data
       }
     },
     methods: {
-      showVideo(index) {
-        //alert(index);
-        this.$router.push(
-          {
-            name: 'video',
-            query: {
-              rewardIndex: index
-            }
+      //时间转成秒数
+      transferTime(time) {
+        var s = '';
+        var min = time.split(':')[0];
+        var sec = time.split(':')[1];
+        s = Number(min * 60) + Number(sec);
+        return s;
+      },
+      //添加评论
+      addComment() {
+        let newComment = {
+          employeeName: "admin",
+          content: this.newComment,
+          createTimeTip: new Date().toLocaleDateString() + ' ' + new Date().toLocaleTimeString()
+        }
+        if (newComment.content) {
+          this.commmentList.unshift(newComment);
+        } else {
+          this.$Message.warning("评论内容不能为空！");
+        }
+        this.newComment = "";
+      },
+      //秒数转成时间格式
+      transferSecond(s) {
+        var t;
+        if (s > -1) {
+          var hour = Math.floor(s / 3600);
+          var min = Math.floor(s / 60) % 60;
+          var sec = s % 60;
+          if (hour < 10) {
+            t = '0' + hour + ":";
+          } else {
+            t = hour + ":";
           }
-        );
+
+          if (min < 10) { t += "0"; }
+          t += min + ":";
+          if (sec < 10) { t += "0"; }
+          t += sec.toFixed(0);
+        }
+        return t;
+      },
+      onPlayerPlay(player) {
+        console.log('player play!', player)
+      },
+      onPlayerPause(player) {
+        console.log('player pause!', player)
+      },
+      onPlayerPlaying(player) {
+        let current = this.transferTime(player.controlBar.currentTimeDisplay.formattedTime_);
+        let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
+      },
+      playerReadied(player) {
+        //player.currentTime(120);
+      },
+      getPercent(num, total) {
+        num = parseFloat(num);
+        total = parseFloat(total);
+        if (isNaN(num) || isNaN(total)) {
+          return "-";
+        }
+        return total <= 0 ? "0%" : (Math.round(num / total * 10000) / 100.00) + "%";
+      },
+      transferArr(arr) {
+        let newArr = [];
+        for (let i in arr) {
+          newArr.push([arr[i].per, arr[i].value, arr[i].contentList]);
+        }
+        return newArr;
       }
     },
     mounted() {
-      let index = this.$route.query.rewardIndex;
-      //alert(index);
-      this.commmentList = CList.list;
-      this.rewardDatas = rewardList.data.list;
-      if (index == undefined) {
-        this.routerData = this.rewardDatas[0];
-      } else {
-        this.routerData = this.rewardDatas[index];
-      }
-      
-    },
-    
-    watch: {
-      $route() {
-        let index = this.$route.query.rewardIndex;
-        //alert(index);
-        if (index == undefined) {
-          this.routerData = this.rewardDatas[0];
-        } else {
-          this.routerData = this.rewardDatas[index];
+      let that = this;
+      this.commmentList = lessonDetails[this.rowKey].commentList;
+      this.expertComments = lessonDetails[this.rowKey].expertComments;
+
+      let myChart = this.$echarts.init(document.getElementById('views'));
+
+      let option = {
+        calculable: true,
+        xAxis: [
+          {
+            type: 'value',
+            name: "视频进度",
+            boundaryGap: false,
+            axisLabel: {
+              formatter: '{value}%'
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: "专家点评数",
+            nameGap: 30,
+            minInterval:1,
+            axisLabel: {
+            },
+            splitLine: {    // gird 区域中的分割线
+              show: false,   // 是否显示
+            },
+          }
+        ],
+        series: [
+          {
+            name: '评论数',
+            type: 'line',
+            smooth: true,
+            data: that.transferArr(that.expertComments),
+            itemStyle: {
+              normal: {
+                color: '#66CDAA', //改变折线点的颜色
+                borderWidth: 5
+              }
+            },
+            lineStyle: {
+              color: '#66CDAA', //改变折线颜色
+              width: 3,
+            },
+
+          }
+        ],
+        tooltip: {
+          formatter: function (point) {
+            let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
+            let time = "点评时间 : " + that.transferSecond(point.value[0] * totalSecond * 0.01) + '</br>';
+            let list = point.value[2];
+            let str = "评论内容：</br>"
+            let content = "";
+            for (let i in list) {
+               content = content + list[i].name + ' : ' + list[i].content + '</br>';
+            }
+            return time + content
+             
+          }
         }
-      }
-    }
+      };
+
+      myChart.setOption(option);
+
+      myChart.on('click', function (params) {
+        let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
+        that.$refs.videoPlayer.player.currentTime(totalSecond * parseInt(params.value[0]) * 0.01);
+      });
+    },
   }
 </script>
 <style>
   .video-page {
     width: 1200px;
     margin: 100px auto;
-    font-family:none;
   }
 
   .video-title {
@@ -151,50 +252,56 @@
     height: 20px;
   }
 
-    .video-title-h3 {
-      height: 20px;
-      font-size: 20px;
-      line-height: 20px;
-      border-left: 6px solid #37b1fa;
-      padding-left: 12px;
-    }
+  .video-title-h3 {
+    height: 20px;
+    font-size: 20px;
+    line-height: 20px;
+    border-left: 6px solid #37b1fa;
+    padding-left: 12px;
+  }
 
   .video-info {
     width: 100%;
     display: table;
   }
+
   .comment-video-detail-info {
-    width:400px;
-    background:#ffffff;
-    display:table-cell;
-    vertical-align:top;
-    padding:20px 10px 20px 30px;
-    position:relative;
-    border-left: 15px solid rgb(252,252,252);
+    width: 400px;
+    background: #ffffff;
+    display: table-cell;
+    vertical-align: top;
+    padding: 20px 10px 20px 30px;
+    position: relative;
+    border-left: 15px solid rgb(241,242,243);
   }
+
     .comment-video-detail-info .ivu-form-item {
-      margin-bottom:8px;
+      margin-bottom: 8px;
     }
+
     .comment-video-detail-info .ivu-form .ivu-form-item-label {
-      font-size:14px;
-      color:#999999;
+      font-size: 14px;
+      color: #999999;
     }
+
     .comment-video-detail-info .ivu-form-item-content {
       font-size: 14px;
       color: #ffffff;
     }
+
   .comment-video-src {
-    display:table-cell;
-    width:780px;
-    box-sizing:border-box;
-    padding:20px 20px;
-    background:#FFFFFF;
+    display: table-cell;
+    width: 780px;
+    box-sizing: border-box;
+    padding: 20px 20px;
+    background: #FFFFFF;
   }
+
     .comment-video-src .video-js .vjs-big-play-button {
       top: 50%;
       left: 50%;
       margin-left: -40px;
-      margin-top:-20px;
+      margin-top: -20px;
     }
 
   .download-video {
@@ -204,18 +311,21 @@
     bottom: 20px;
     left: 0;
   }
+
   .video-other {
-    margin-top:20px;
+    margin-top: 20px;
   }
+
   .videos-wrap {
-    margin:0px -10px 0px -10px;
+    margin: 0px -10px 0px -10px;
   }
+
   .video-item {
     width: 25%;
     display: inline-block;
     padding: 0px 10px;
-    margin-top:20px;
-    cursor:pointer;
+    margin-top: 20px;
+    cursor: pointer;
   }
 
     .video-item p {
@@ -225,22 +335,25 @@
       text-decoration: none;
       text-indent: 8px;
     }
+
   .title-header {
     color: #666;
     margin-right: 30px;
     display: inline-block;
   }
+
   .liveStatus {
     color: #33aafe;
     float: right;
   }
 
   .review-pane {
-    height: 300px;
+    height: 700px;
     background-color: #fff;
     overflow-y: auto;
     position: relative;
   }
+
   .review-list {
     overflow: hidden;
     font-size: 14px;
@@ -251,7 +364,7 @@
 
   .reviewlist-title {
     float: left;
-    width: 22%;
+    /*width: 22%;*/
     color: #999;
     text-align: right;
     padding-right: 5px;
@@ -260,7 +373,7 @@
   .reviewlist-content {
     float: left;
     color: #444;
-    width: 76%;
+    /*width: 76%;*/
     font-size: 14px;
     word-break: break-all;
   }
@@ -308,13 +421,19 @@
     font-size: 12px;
     color: #ccc;
   }
+
   .average-score {
     margin-top: 20px;
     color: #666;
     font-size: 14px;
   }
 
-  .average-score span {
-    color: #fd8f45;
+    .average-score span {
+      color: #fd8f45;
+    }
+
+  #views {
+    background: #fff;
+    padding-top: 30px;
   }
 </style>

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="../../assets/image/lessonCover.png" 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">
@@ -26,7 +37,6 @@
             <div class="brief-info-left">
               <div class="items"><p class="item">活动时间：<span style="font-weight:bold;color:#000">{{activityInfo.timeRangeTip}}</span></p></div>
               <div class="items"><p class="item">授课平台：<span style="font-weight:bold;color:#000">{{activityInfo.parentTeachePlateName}}</span></p></div>
-              <div class="items"><p class="item">业务荣誉：<span style="font-weight:bold;color:#000">{{activityInfo.workHonor}}</span></p></div>
             </div>
 
           </div>
@@ -37,7 +47,7 @@
           <div class="title-tip">
             <p class="title">观课用户<span>VIEW CLASS USER</span></p>
             <div class="content">
-              <p style="margin:15px">专家：刘斌</p>
+              <!--<p style="margin:15px">专家：刘斌</p>-->
               <p style="margin:15px">成员：公开参与</p>
             </div>
           </div>
@@ -68,7 +78,7 @@
               <span>REVIEW</span>
             </p>
             <div class="content">
-              <p class="comment-item" v-for="item in commentList" ><span style="color:#666">{{item.employeeName}}</span> : {{item.reviewContent}}</p>
+              <p class="comment-item" v-for="item in commentList"><span style="color:#666">{{item.employeeName}}</span> : {{item.content}}</p>
             </div>
           </div>
         </div>
@@ -85,15 +95,17 @@
       return {
         reviewAcList: [],
         attachmentsList: [],
-        commentList:[],
+        commentList: [],
+        rowKey:0,
         activityInfo: {}
       }
     },
 
     created() {
-      this.attachmentsList = lessonInfo.attachments;
-      this.activityInfo = lessonInfo.data;
-      this.commentList = lessonInfo.commentList;
+      this.rowKey = sessionStorage.getItem('_lesson_rowKey');
+      this.attachmentsList = lessonInfo[this.rowKey].attachments;
+      this.activityInfo = lessonInfo[this.rowKey].data;
+      this.commentList = lessonInfo[this.rowKey].commentList;
 
     },
     methods: {
@@ -103,12 +115,13 @@
             path:'commentVideo'
           }
         );
-      }
+      },
+
     },
     mounted() {
       let myChart = this.$echarts.init(document.getElementById('views'));
-      let schoolList = lessonInfo.views.map(a => a.schoolName);
-      let viewsList = lessonInfo.views.map(a => a.viewCount);
+      let schoolList = lessonInfo[this.rowKey ].views.map(a => a.schoolName);
+      let viewsList = lessonInfo[this.rowKey ].views.map(a => a.viewCount);
 
       let option = {
         color: ['#ff8745'],
@@ -166,7 +179,7 @@
       myChart.setOption(option);
 
       let comments = this.$echarts.init(document.getElementById('comments'));
-      let commentList = lessonInfo.comments.map(a => a.commentCount);
+      let commentList = lessonInfo[this.rowKey ].schoolComments.map(a => a.commentCount);
 
       let commentsOption = {
         color: ['#ff8745'],
@@ -266,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 {
@@ -406,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

@@ -1,21 +1,30 @@
 <template>
   <div class="container">
 
-    <div class="search">
+    <!--<div class="search">
       <DatePicker type="daterange" placement="bottom-end" placeholder="选择起止时间" style="width: 200px"></DatePicker>
       <Button>搜索</Button>
-    </div>
+    </div>-->
     <div class="activities">
-      <div class="activity" v-for="(item,index) in lessons" @click="handleLessonClick()">
+      <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="../../assets/image/cover.png" 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,8 +60,8 @@
         this.typeName = name;
         this.getList(typeId);
       },
-
-      handleLessonClick() {
+      handleLessonClick(rowKey) {
+        sessionStorage.setItem('_lesson_rowKey', rowKey);
         this.$router.push('lessonDetails')
       },
 
@@ -109,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;
@@ -167,4 +187,5 @@
 }
 
 
+
 </style>

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

@@ -2,7 +2,7 @@
   <div class="container">
 
     <div class="search">
-      <Input v-model="value" placeholder="请输入优课主题 （如：小学语文）" style="width: 200px" />
+      <Input v-model="values" placeholder="请输入优课主题 （如：小学语文）" style="width: 200px" />
       <Button>搜索</Button>
     </div>
     <div class="activity-item" v-for="(item,index) in lessons" :key="index">
@@ -35,7 +35,8 @@
     },
     data() {
       return {
-        lessons: []
+        lessons: [],
+        values:""
       }
     },
 

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

@@ -32,9 +32,9 @@
 </script>
 <style scoped>
   html, body, #app {
-    height: 100% !important;
+    /*height: 100% !important;*/
     user-select: none;
-    background: rgb(241,242,243);
+    background: rgb(241,242,243);  
   }
 
   .main-content {
@@ -45,6 +45,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
+    background: rgb(241,242,243);
   }
 
   .content {

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

@@ -3,7 +3,7 @@
     <div class="notice-header">
       <p class="title">
       <span class="content-title">关于开展2019年高新区智慧课堂第二次研讨活动的通知</span></p>
-      <p class="sub">2019-04-11&nbsp;&nbsp;&nbsp;月月研讨&nbsp;&nbsp;&nbsp;点击量：0</p>
+      <p class="sub">2019-04-11&nbsp;&nbsp;&nbsp;月月研讨&nbsp;&nbsp;&nbsp;点击量：96</p>
     </div>
     <div class="content" v-html="noticeContent">
 

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

@@ -112,7 +112,7 @@
         this.$eventBus.$emit("activeIndex", 2);
       },
       goNotice() {
-        this.$router.push('/notice');
+        this.$router.push('notice');
         this.$eventBus.$emit("activeIndex", 1);
       },
       goActivity() {

TEAMModelOS.SmartTeach/ClientApp/common/headers.vue

@@ -10,7 +10,7 @@
         </div>
       </div>
       <div class="header_right">
-        <div class="helper" ><button @click="tologin">教学助手</button></div>
+        <div class="helper" ><img src="../assets/image/resource/login_img.png" @click="tologin"/></div>
       </div>
     </div>
   </div>
@@ -48,10 +48,10 @@
     height: 75px;
   }
   .header_right {
-    width: 200px;
+    width: 215px;
     float: left;
     height: 75px;
-    padding-left:7%;
+    padding-left:5%;
     padding-top:5px;
   }
   .logo_img {
@@ -83,31 +83,16 @@
     float:left;
     margin-left:40%;
   }
-    .login_btn button {
-      width: 85px;
-      text-align: center;
-      background: #26b5ff;
-      color: #fff;
-      height: 35px;
-      line-height: 35px;
-      margin: 22px 22px 0px 22px;
-      border: 0;
-      border-radius: 10px;
-      font-size:18px;
-    }
   .helper {
     width: 100%;
+    height:58px;
     display: block;
     float: left;
-    padding-top:22px;
+    padding-top:15px;
   }
-    .helper button {
-      padding: 0 17px;
-      color: #288add;
-      border: 1px solid #2196f3;
-      height: 30px;
-      line-height: 30px;
-      background: #fff;
-      font-size: 18px;
-    }
+    .helper img {
+      width:100%;
+      margin-left:60%;
+    } 
+
 </style>

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

@@ -64,17 +64,17 @@
   }
   .banner_img {
     width: 100%;
-    height:330px;
+    height:325px;
   }
     .banner_img img {
       width:100%;
     }
-    .nav_list_box {
-      width: 100%;
-      height: 54px;
-      padding: 0px 2px 2px 2px;
-      background: #309aeb;
-    }
+  .nav_list_box {
+    width: 100%;
+    height: 54px;
+    padding: 0px 2px 2px 2px;
+    background: #00C2CB;
+  }
   .nav_list {
     width:1200px;
     height:54px;

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

@@ -4,16 +4,12 @@
       <div class="index_top_left">
         <Carousel autoplay v-model="value2" loop>
           <CarouselItem>
-            <div class="demo-carousel"><img src="../../assets/image/resource/activity_banner_01.jpg" /></div>
+            <div class="demo-carousel"><img src="../../assets/image/resource/activity_banner_01.png" /></div>
           </CarouselItem>
           <CarouselItem>
             <div class="demo-carousel"><img src="../../assets/image/resource/activity_banner_02.png" /></div>
           </CarouselItem>
         </Carousel>
-        <span class="tit">
-          <em class="bg"></em>
-          <p>2018年创新杯首届全国信息化教学创新大赛正式启动</p>
-        </span>
       </div>
       <div class="index_top_right">
         <div class="index_top_title"><div class="right_title">活动报道</div></div>
@@ -26,19 +22,19 @@
         <div class="production_box_title"><div class="production_box_name">作品样例</div></div>
         <ul class="production_list">
           <li>
-            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="https://css.huijiaoyun.com/tianyu_edu/area/edu4.0/images/tianyu_cup/class07.jpg"></a>
+            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="../../assets/image/resource/zuopin_one.png"></a>
             <p class="f18 videoName">绿色植物的光合作用<i class="c01">生</i></p>
             <p class="f14"><a href="javascript:;" class="fr">高新区实验小学</a><a class="f14" href="javascript:;">孙云芳</a></p>
             <p><a href="javascript:;" class="videoTag style01">导学案</a><a href="javascript:;" class="videoTag style02">微课</a><a href="javascript:;" class="videoTag style03">教学设计</a><a href="javascript:;" class="videoTag style04">多媒体课件</a><a href="javascript:;" class="videoTag style05">课堂板书</a></p>
           </li>
           <li>
-            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="https://css.huijiaoyun.com/tianyu_edu/area/edu4.0/images/tianyu_cup/class08.jpg"></a>
+            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="../../assets/image/resource/zuopin_two.png"></a>
             <p class="f18 videoName">分液漏斗<i class="c02">化</i></p>
             <p class="f14"><a href="javascript:;" class="fr">成都市高新区师范银都紫藤小学</a><a class="f14" href="javascript:;">侯敏</a></p>
             <p><a href="javascript:;" class="videoTag style01">导学案</a><a href="javascript:;" class="videoTag style02">微课</a><a href="javascript:;" class="videoTag style03">教学设计</a><a href="javascript:;" class="videoTag style04">多媒体课件</a><a href="javascript:;" class="videoTag style05">课堂板书</a></p>
           </li>
           <li class="last">
-            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="https://css.huijiaoyun.com/tianyu_edu/area/edu4.0/images/tianyu_cup/class09.jpg"></a>
+            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="../../assets/image/resource/zuopin_three.png"></a>
             <p class="f18 videoName">记单词的方法<i class="c03">英</i></p>
             <p class="f14"><a href="javascript:;" class="fr">成都市高新区师范银都紫藤小学</a><a class="f14" href="javascript:;">何炜</a></p>
             <p><a href="javascript:;" class="videoTag style01">导学案</a><a href="javascript:;" class="videoTag style02">微课</a><a href="javascript:;" class="videoTag style03">教学设计</a><a href="javascript:;" class="videoTag style04">多媒体课件</a><a href="javascript:;" class="videoTag style05">课堂板书</a></p>
@@ -1027,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%;
@@ -1046,7 +1045,7 @@
   }
   .activity_img {
     width:1200px;
-    margin-top:7%;
+    margin-top:5%;
     float:left;
   }
   .production_box {

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

@@ -44,7 +44,7 @@
         school:false,
         listdata: [
           {
-            "id": 1, "title": '中考专区', "num": '980', "img": require("../../assets/image/resource/exam_img_one.jpg"), data: [
+            "id": 1, "title": '中考专区', "num": '980', "img": require("../../assets/image/resource/exam_img_one.png"), data: [
               { "type": '物理', "title": '2018年成都市中考物理试卷.doc', "loocknum": '750',"url":'/details' },
               { "type": '英语', "title": '2018年成都市中考英语试卷.doc', "loocknum": '920', "url": '/details'},
               { "type": '数学', "title": '2018年成都市中考数学试卷.doc', "loocknum": '1006', "url": '/details'},
@@ -52,7 +52,7 @@
             ]
           },
           {
-            "id": 2, "title": '高考专区', "num": '1080', "img": require("../../assets/image/resource/exam_img_two.jpg"), data: [
+            "id": 2, "title": '高考专区', "num": '1080', "img": require("../../assets/image/resource/exam_img_two.png"), data: [
               { "type": '语文', "title": '2018年成都市高考语文试卷.doc', "loocknum": '1750', "url": '/details' },
               { "type": '英语', "title": '2018年成都市高考英语试卷.doc', "loocknum": '1220', "url": '/details' },
               { "type": '数学', "title": '2018年成都市高考数学试卷.doc', "loocknum": '1606', "url": '/details' },
@@ -60,7 +60,7 @@
             ]
           },
           {
-            "id": 3, "title": '优课专区', "num": '900', "img": require("../../assets/image/resource/exam_img_three.jpg"), data: [
+            "id": 3, "title": '优课专区', "num": '900', "img": require("../../assets/image/resource/exam_img_three.png"), data: [
               { "type": '优课', "title": '古诗二首', "loocknum": '350', "url":'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=8aee808f62fbe7ab016300a9e6a22e65&t=2&sessionKey=3xCsBKvbaWPKVmk1Yk9Y' },
               { "type": '优课', "title": '我的影子', "loocknum": '620', "url":'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=8aee80a562bc9be10162be0f7167109d&t=2&sessionKey=ey65FtcgEGMh4uHprmSE' },
               { "type": '优课', "title": '路程、时间与速度', "loocknum": '606', "url":'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=ff8080815d07057f015d07443709007a&t=2&sessionKey=wj0ZhZK7YbjgxhIBJiGw' },
@@ -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 {
@@ -185,12 +185,12 @@
     float: left;
   }
     .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;
@@ -199,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/list.vue

@@ -182,29 +182,32 @@
   }
   .icon_img {
     width:35px;
-    height:28px;
-    background:url(../../assets/image/resource/list_icon.png) no-repeat 0px 0px ;
+    height:35px;
+    background:url(../../assets/image/resource/list_icon_one.png) no-repeat;
     display:block;
     float:left;
+    margin-left:15px;
   }
   .icon_img_two {
     width: 35px;
-    height: 28px;
-    background: url(../../assets/image/resource/list_icon.png) no-repeat 0px -70px;
+    height: 35px;
+    background: url(../../assets/image/resource/list_icon_two.png) no-repeat;
     display: block;
     float: left;
+    margin-left: 15px;
   }
   .icon_img_three {
     width: 35px;
-    height: 28px;
-    background: url(../../assets/image/resource/list_icon.png) no-repeat 0px -141px;
+    height: 35px;
+    background: url(../../assets/image/resource/list_icon_three.png) no-repeat;
     display: block;
     float: left;
+    margin-left: 15px;
   }
   .moreover_title {
     font-size: 20px;
     color: #fff;
-    margin-left: 40px;
+    margin-left: 30px;
     float: left;
   }
   .jt {

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/ClientApp/components/resource/video.vue

@@ -30,8 +30,7 @@
       </div>
     </div>
     <div class="resource_img">
-      <img src="../../assets/image/resource/resource_img.jpg" class="banner_big" />
-      <img src="../../assets//image/resource/sk.png" class="sk" @click="skbtn" />
+      <img src="../../assets/image/resource/resource_img.png" class="banner_big" />
     </div>
   </div>
 </template>

TEAMModelOS.SmartTeach/ClientApp/view/resource/login.vue

@@ -60,7 +60,7 @@ import Header from '@/common/headers.vue'
   .login {
     width:100%;
     height:700px;
-    background:url(../../assets/image/resource/login_bg.jpg) no-repeat;
+    background:url(../../assets/image/resource/login_bg.png) no-repeat;
     background-size:cover;
   }
   .login_box {

TEAMModelOS.SmartTeach/ClientApp/view/resource/resourceindex/videodetails.vue

@@ -81,22 +81,22 @@
         //console.log(this.$route.query);
         if (this.$route.query.id == '') {
           this.title = '人教版七年级上册 数学 正数与负数',
-            this.videourl = '';
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_one.mp4';
         } else if (this.$route.query.id == '1') {
           this.title = '人教版七年级上册 数学 绝对值',
-            this.videourl = '';
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_two.mp4';
         } else if (this.$route.query.id == '2') {
           this.title = '人教版七年级上册 数学 有理数的分类',
-            this.videourl = '';
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_three.mp4';
         } else if (this.$route.query.id == '3') {
           this.title = '人教版七年级上册 数学 旋转体',
-            this.videourl = '';
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_four.mp4';
         } else if (this.$route.query.id == '4') {
           this.title = '人教版七年级上册 数学 方程式',
-            this.videourl = '';
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_five.mp4';
         } else if (this.$route.path == '/videodetails') {
           this.title = '人教版七年级上册 数学 正数与负数',
-            this.videourl = '';
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_one.mp4';
         }
       }
     }

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" />

TEAMModelOS.TeachZone/ClientApp/assets/css/style.css

@@ -1,4 +1,8 @@
-body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
+body{
+    /*background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;*/
+    /*background:#e3f2fa url("../image/bodybg2.png") no-repeat 0 40px;*/
+    background:#edfdff url("../image/bodybg3.png") no-repeat 0 40px;
+}
 /*header*/
 .header{height:40px;line-height:40px;background:#313131;color: #fff;
     /*position: fixed;top:0;left:0;width: 100%;z-index: 10;padding:0 25px;*/
@@ -26,18 +30,19 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .bodyContent{margin-top:40px;}
 /*master*/
 .master{height:140px;line-height: 140px;}
-.master>a{font-size: 28px; color: #3d95d5;}
+.master>a{font-size: 28px; /*color: #3d95d5;*/color: #fff;}
 .master li{margin-left:15px;}
 .master li a{color: #3d95d5;font-size: 14px;font-weight: bold;}
 .master li a:hover{text-decoration: underline;}
 /*left*/
-.left{width: 220px;padding-bottom: 20px;
+.left{width: 220px;padding-bottom: 0px;
     /*box-shadow: 2px 2px 4px rgba(0,0,0,0.1)*/
 }
 .left .master-info{padding:20px;border-bottom: 1px solid #ddd;}
-.left .master-info .name{margin-left: 20px;padding-top:18px;}
-.left .master-info .name>p{font-size: 16px;margin-bottom: 2px;}
-.left .master-info .name>span{background: #26c6da;border-radius: 20px;color: #fff;padding:0 12px;font-size: 12px;}
+.left .master-info img.head{width: 70px;border-radius: 50%;}
+.left .master-info .name{margin-left: 20px;padding-top:10px;}
+.left .master-info .name>p{font-size: 16px;margin-bottom: 5px;}
+.left .master-info .name>span{background: #26c6da;border-radius: 20px;color: #fff;padding:0 10px;font-size: 12px;}
 .left .master-info>p{color:#666;margin:15px 0;}
 
 .left .master-info .exper{margin-bottom: 10px;}
@@ -53,7 +58,7 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .left .master-info .other>li:last-child{border:0;background: none;}
 .left .master-info .other>li>p{font-size: 16px;}
 
-.left dl{padding:20px 0;margin-bottom: 12px;}
+.left dl{padding:20px 0;margin-bottom: 10px;}
 .left dl>dt{font-size: 16px;padding-left:20px;margin-bottom: 10px;
     /*background: url("../image/titleLine.png") no-repeat 20px center;*/
 }
@@ -112,10 +117,12 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .main .content>dl>dt>a{color: #999;font-size: 12px;}
 .main .content>dl>dt>a:hover{color: #26c6da;}
 .main .content>dl.notice{width: 62%;}
-.main .content>dl.word{width: 36%;height:290px;}
+.main .content>dl.word{width: 36%;height:336px;}
 .main .content>dl.notice>dd>a{display: block;padding:12px 0;
     border-bottom: 1px dashed #eee;
-    background: url("../image/notice.png") no-repeat 0 center;padding-left: 24px;}
+    background: url("../image/notice.png") no-repeat 0 center;padding-left: 24px;
+}
+.main .content>dl.notice.source>dd>a{padding-left:0px;background: none;}
 .main .content>dl.notice>dd>a>span{float: right;color: #999;font-size: 13px;}
 .main .content>dl.notice>dd>a:hover,.main .content>dl.notice>dd>a:hover span{color: #26c6da; }
 .main .content>dl.word dd{line-height: 26px;text-align: justify;}
@@ -290,6 +297,12 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .AnchorBox .ivu-anchor-link{float:left;padding:0;background: #eee;border-bottom:2px solid #ccc;color:#666;font-size:12px;margin:8px;width: 20px;height:20px;line-height:18px;text-align: center;cursor: pointer;}
 .AnchorBox .ivu-anchor-link-active>.ivu-anchor-link-title{background: #ccc;color: #fff;}
 .AnchorBox .ivu-anchor-ink:before{background:none;}
+.AnchorBox>.lookChart{margin-top:20px;}
+.AnchorBox>.lookChart>a{font-size: 14px;color: #14adc4;
+   background: url("../image/bar2.png") no-repeat 0 center;padding:10px 0 10px 24px;
+    background-size: 18px auto;
+}
+
 .checkList>li{width:100%;padding:15px;margin-bottom: 30px;
     border:1px solid #ddd;
     /*box-shadow: 0 1px 4px rgba(0,0,0,0.2);*/
@@ -317,3 +330,10 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .ivu-collapse,.ivu-collapse>.ivu-collapse-item{border:0;background: #fff;}
 .ivu-collapse>.ivu-collapse-item.ivu-collapse-item-active>.ivu-collapse-header>i,.ivu-collapse>.ivu-collapse-item>.ivu-collapse-header>i{display: none;}
 .ivu-collapse-content{padding-left:30px;}
+
+
+.detail{padding:20px;border:1px solid #ddd;height:500px;overflow-y: auto;font-size: 15px;line-height: 28px;}
+.detail>h2{font-size: 20px;margin-bottom: 20px;}
+.detail>div{margin:10px 0;}
+.detail>div li{margin: 10px 0;width: 100%;}
+.detail>div li>p{margin: 10px 0;width: 100%;}

TEAMModelOS.TeachZone/ClientApp/common/header.vue

@@ -25,10 +25,10 @@
             <input type="text" placeholder="请输入关键字..." class="raduis20 search-input">
           </li>
           <li>
-            <Select v-model="formItem.select2" @change="changeZone">
+            <Select v-model="formItem.select2" @on-change="changeZone">
               <!--<Option value="sel1" >班级</Option>-->
-              <Option value="sel1" >教师空间</Option>
-              <Option value="sel2">学生空间</Option>
+              <Option value="/" >教师空间</Option>
+              <Option value="/indexStudent">学生空间</Option>
             </Select>
             <!--<a href="">张三 </a>-->
           </li>
@@ -62,17 +62,15 @@
       return {
         formItem: {
           select1: 'sel1',
-          select2: 'sel1',
+          select2: '/',
           select3: 'sel1',
 
         },
       }
     },
     methods: {
-
       changeZone: function (url) {
-        alert(11);
-        this.$router.push({path: '/'+url})
+        this.$router.push({path: url})
       }
     }
 

TEAMModelOS.TeachZone/ClientApp/common/left.vue

@@ -2,10 +2,10 @@
   <div class="left bgf fl">
     <div class="master-info">
       <div class="ov">
-        <img src="../assets/image/head.png" alt="" class="fl">
+        <img src="../assets/image/head2.png" alt="" class="fl head">
         <div class="fl name">
-          <p><a href="">张三</a></p>
-          <span>教师</span>
+          <p><a href="">张明哲</a></p>
+          <span>数学老师</span>
         </div>
       </div>
       <p>成都市高新区芳草小学</p>
@@ -39,8 +39,8 @@
     <dl class="class-manage">
       <dt>我的班级</dt>
       <dd><a href="/notice"><i class="icon"></i>班级通知</a></dd>
-      <dd><a href="/scoreList"><i class="icon"></i>学生成绩</a></dd>
       <dd><a href="/source"><i class="icon"></i>班级资源</a></dd>
+      <dd><a href="/scoreList"><i class="icon"></i>学生成绩</a></dd>
       <dd><a href="/studentList"><i class="icon"></i>学生名单</a></dd>
     </dl>
   </div>

TEAMModelOS.TeachZone/ClientApp/common/recomLeft.vue

@@ -6,15 +6,15 @@
         <Timeline>
           <TimelineItem color="#2db7f5">
             <p class="time">教材：</p>
-            <p class="content">初中历史与社会人教课</p>
+            <p class="content">数学人教版六年级下册</p>
           </TimelineItem>
           <TimelineItem color="#2db7f5">
             <p class="time">章节：第一章</p>
-            <p class="content">人在社会中生活</p>
+            <p class="content">相交线与平行线</p>
           </TimelineItem>
           <TimelineItem color="#2db7f5">
             <p class="time" style="font-weight: bold;" >课文：第一课 </p>
-            <p class="content" style="font-weight: bold;">我的家在哪里</p>
+            <p class="content" style="font-weight: bold;">平行线的判定</p>
           </TimelineItem>
         </Timeline>
       </dd>
@@ -29,12 +29,12 @@
       <div class="modalSel">
         <h4>选择教材：</h4>
         <Select v-model="select">
-          <Option value="sel1" >初中历史与社会人教课标版</Option>
-          <Option value="sel2">思想政治人教标本七年级上册</Option>
-          <Option value="sel3">地理人教科标板七年级上册</Option>
-          <Option value="sel4">地理人教科标板七年级上册</Option>
-          <Option value="sel5">音地理人教科标板七年级上册</Option>
-          <Option value="sel6">地理人教科标板七年级上册</Option>
+          <Option value="sel1" >人教版六年级下册</Option>
+          <Option value="sel2">人教版六年级上册</Option>
+          <Option value="sel3">人教版五年级下册</Option>
+          <Option value="sel4">人教版六年级上册</Option>
+          <Option value="sel5">人教版四年级下册</Option>
+          <Option value="sel6">人教版六年级上册</Option>
         </Select>
       </div>
 
@@ -54,7 +54,7 @@
       <ul>
         <li class="word">
           <a href="/teachSourceDetail">
-            <p>当我们的手中只剩下一片树叶.docx</p>
+            <p>数学核心素养研究观点之一.docx</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -62,7 +62,7 @@
         </li>
         <li class="word">
           <a href="/teachSourceDetail">
-            <p>当我们的手中只剩下一片树叶.docx</p>
+            <p>综合学习实践案例.docx</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -70,7 +70,7 @@
         </li>
         <li class="video">
           <a href="/teachSourceVideo">
-            <p>当我们的手中只剩下一片树叶.mp4</p>
+            <p>《比例尺》教学设计.mp4</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -78,7 +78,7 @@
         </li>
         <li class="video">
           <a href="/teachSourceVideo">
-            <p>当我们的手中只剩下一片树叶.mp4</p>
+            <p>加法乘法运算对比问题.mp4</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -86,7 +86,7 @@
         </li>
         <li class="ppt">
           <a href="/teachSourceDetail">
-            <p>当我们的手中只剩下一片树叶.ppt</p>
+            <p>百分数解决问题实例.ppt</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -110,99 +110,74 @@
               //   expand: true,
               // },
               {
-                title: '第一单元 人在社会中生活',
+                title: '第一单元 相交线与平行线',
                 expand: true,
                 children: [
                   {
-                    title: '第一课  我的家在哪里',
+                    title: '相交线',
                     expand: true
                   },
                   {
-                    title: '第二课 乡村与城市',
+                    title: '垂线',
                     expand: true
                   },
                   {
-                    title: '综合探究一 从地图上获取信息',
+                    title: '同位角、内错角、同旁...',
                     expand: true
-                  }
+                  },  {
+                    title: '平行线',
+                    expand: true
+                  },  {
+                    title: '平行线的判定',
+                    expand: true
+                  },  {
+                    title: '平行线的性质',
+                    expand: true
+                  },  {
+                    title: '命题、定理、证明',
+                    expand: true
+                  },  {
+                    title: '平移',
+                    expand: true
+                  },{
+                    title: '特殊考点',
+                    expand: true
+                  },
                 ]
               },
               {
-                title: '第二单元 人类共同生活的世界',
+                title: '第二单元 实数',
                 expand: false,
                 children: [
-                  {
-                    title: '第一课 大洲和大洋',
-                    expand: true
-                  },
-                  {
-                    title: '第二课 自然环境',
-                    expand: true
-                  },
-                  {
-                    title: '第三课 世界大家庭',
-                    expand: true
-                  },
-                  {
-                    title: '综合探究二 从地球仪上看世界',
-                    expand: true
-                  }
+                  {title: '算术平方根'},
+                  {title: '平方根'},
+                  {title: '立方根'},
+                  {title: '实数的概念'},
+                  {title: '实数的运算'},
+                  {title: '特殊考点'},
+
                 ]
               },
               {
-                title: '第三单元 各具特色的区域生活',
+                title: '第三单元 平面直角坐标系',
                 expand: false,
                 children: [
-                  {
-                    title: '第一课 家住平原',
-                    expand: true
-                  },
-                  {
-                    title: '第二课 与山为邻',
-                    expand: true
-                  }, {
-                    title: '第三课 傍水而居',
-                    expand: true
-                  }, {
-                    title: '第四课 草原人家',
-                    expand: true
-                  }, {
-                    title: '第五课 干旱的宝地',
-                    expand: true
-                  }, {
-                    title: '综合探究三 如何认识区域',
-                    expand: true
-                  },
+                  {title: '有序对数'},
+                  {title: '平面直角坐标系'},
+                  {title: '用坐标表示地理位置'},
+                  {title: '用坐标表示平移'},
                 ]
               },
               {
-                title: '第四单元 文明中心——城市',
+                title: '第四单元 二元一次方程组',
                 expand: false,
                 children: [
-                  {
-                    title: '第一课 美国政治的心脏：华盛顿',
-                    expand: true
-                  },
-                  {
-                    title: '第二课 文化艺术之都：巴黎',
-                    expand: true
-                  },
-                  {
-                    title: '第三课 IT新城：班加罗尔',
-                    expand: true
-                  },
-                  {
-                    title: '第四课 汽车城：蔚山',
-                    expand: true
-                  },
-                  {
-                    title: '第五课 城市规划的典范：巴西利亚',
-                    expand: true
-                  },
-                  {
-                    title: '综合探究 如何认识城市',
-                    expand: true
-                  }
+                  {title: '二元一次方程组'},
+                  {title: '代入消元法'},
+                  {title: '加减消元法'},
+                  {title: '实际问题与二元一次方...'},
+                  {title: '三元一次方程组的解法'},
+                  {title: '特殊考点'},
                 ]
               }
 

TEAMModelOS.TeachZone/ClientApp/components/index.vue

@@ -1,44 +0,0 @@
-<template>
-  <div class="main fr">
-    <h4>所在班级 > 六年级·1班</h4>
-    <div class="content ov">
-      <dl class="notice fl">
-        <dt>班级通知 <a href="" class="fr">更多+</a></dt>
-        <dd><a href="/noticeDetail">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-      </dl>
-      <dl class="word fl">
-        <dt>班级寄语</dt>
-        <dd>
-          班级是船，学生是帆。岁月轮回，抹不去我们在这里洒下的汗水，
-          挥不去我们在这里展开的笑颜。愿我们处处祥云罩野马，朝朝吉星
-          伴青松。班级空间，让我们一起来书写属于自己的精彩！
-        </dd>
-      </dl>
-    </div>
-    <div class="content ov">
-      <dl class="notice fl " style="width: 100%">
-        <dt>班级资源 <a href="" class="fr">更多+</a></dt>
-        <dd><a href="/scoreL istDetail">第二章（化学方程式计算）.doc<span>发布者：李四</span></a></dd>
-        <dd><a href="">电流、电压和电阻的关系（2课时）.doc<span>发布者：李四</span></a></dd>
-        <dd><a href="">某年6月中旬平均气温图.jpg<span>发布者：李四</span></a></dd>
-        <dd><a href="">独立行走技术-穿越空间<span>发布者：李四</span></a></dd>
-        <dd><a href="">计算机基础第五课时<span>发布者：李四</span></a></dd>
-        <dd><a href="">《望洞庭》和《忆江南》<span>发布者：李四</span></a></dd>
-      </dl>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "index"
-  }
-</script>
-
-<style scoped>
-
-</style>

TEAMModelOS.TeachZone/ClientApp/components/notice.vue

@@ -26,15 +26,16 @@
               </Form>
           </Modal>
         </div>
-        <dd><a href="/noticeDetail">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+        <dd><a href="/noticeDetail">5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+        <dd><a href="">师退生进 让学生站在教室中央<span>2019-05-09</span></a></dd>
+        <dd><a href="">2019.4.9 核心素养深入研究，开拓视野精彩纷呈。<span>2019-05-09</span></a></dd>
+        <dd><a href="">18.11.27区数学高段“问题解决”专题 暨“老带青”教研活动通讯。<span>2019-05-09</span></a></dd>
+        <dd><a href="">2019年2月28日四年级教研活动通讯<span>2019-05-09</span></a></dd>
+        <dd><a href="">5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+        <dd><a href="">师退生进 让学生站在教室中央<span>2019-05-09</span></a></dd>
+        <dd><a href="">2019.4.9 核心素养深入研究，开拓视野精彩纷呈。<span>2019-05-09</span></a></dd>
+        <dd><a href="">18.11.27区数学高段“问题解决”专题 暨“老带青”教研活动通讯。<span>2019-05-09</span></a></dd>
+        <dd><a href="">2019年2月28日四年级教研活动通讯<span>2019-05-09</span></a></dd>
       </dl>
       <Page :total="100"  size="small" show-total class="fr" />
     </div>

TEAMModelOS.TeachZone/ClientApp/components/scoreList.vue

@@ -2,7 +2,7 @@
   <div class="main fr">
     <h4><a href="/">首页</a> > 学生成绩</h4>
     <div class="content ov bgf">
-      <dl class="notice fl " style="width: 100%">
+      <dl class="notice source fl " style="width: 100%">
         <dt>学生成绩</dt>
         <div class="oper">
           <Button type="info" @click="modal1 = true">发布成绩</Button>
@@ -27,13 +27,16 @@
 
           </Modal>
         </div>
-        <dd><a href="/scoreListDetail">六年一班上学期第一次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第二次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第三次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第四次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第四次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第四次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第四次模拟考试成绩公布<span>2019-05-09</span></a></dd>
+        <dd><a href="/reportAd"> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第十次模拟考试成绩公布<img src="../assets/image/new.gif" alt=""><span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第九次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第八次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第七次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第六次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第五次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第四次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第三次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第二次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第一次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
       </dl>
       <Page :total="100"  size="small" show-total class="fr" />
     </div>

TEAMModelOS.TeachZone/ClientApp/components/studentList.vue

@@ -4,120 +4,16 @@
     <div class="content ov">
       <dl class="studentList fl " style="width: 100%">
         <dt>学生名单 <!--<a href="" class="fr">更多+</a>--></dt>
-        <dd>
+        <dd v-for="item in students">
           <a href="">
             <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <i>班长</i>
-            <p>201901002</p>
+            <h4>{{item.name}}</h4>
+            <i v-if="item.post">{{item.post}}</i>
+            <p>{{item.num}}</p>
             <!--<p>立即联系</p>-->
           </a>
         </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <i>副班长</i>
-            <p>201901002</p>
-            <!--<p>立即联系</p>-->
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <i>学习委员</i>
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <i>小组长</i>
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>  <dd>
-        <a href="">
-          <img src="../assets/image/head.png" alt="">
-          <h4>李四</h4>
-          <!--<i>学生</i>-->
-          <p>201901002</p>
-        </a>
-      </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
 
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
 
 
       </dl>
@@ -127,7 +23,55 @@
 
 <script>
   export default {
-    name: "index"
+    name: "index",
+    data() {
+      return {
+        students:[
+          {
+            name:'周宇鑫',
+            num:'201901001',
+            post:'班长',
+          },
+          {
+            name:'李明悦',
+            num:'201901002',
+            post:'',
+          },
+          {
+            name:'刘佳乐',
+            num:'201901003',
+            post:'',
+          },
+          {
+            name:'王启航',
+            num:'201901004',
+            post:'',
+          },
+          {
+            name:'王心怡',
+            num:'201901005',
+            post:'',
+          },
+          {
+            name:'王程弈',
+            num:'201901006',
+            post:'',
+          }, {
+            name:'郭文俊',
+            num:'201901006',
+            post:'',
+          }, {
+            name:'刘玉婷',
+            num:'201901006',
+            post:'',
+          }, {
+            name:'司文涛',
+            num:'201901006',
+            post:'',
+          },
+        ]
+      }
+    },
   }
 </script>
 

TEAMModelOS.TeachZone/ClientApp/router/routes.js

@@ -16,11 +16,13 @@ import TeachSourcePpt from '@/view/teachSourceDetail'
 import TeachPreclass from '@/view/teachPreclass'
 import TeachPrelesson from '@/view/teachPrelesson'
 import TeachCheck from '@/view/teachCheck'
+import TeachCheckTeacher from '@/view/teachCheckTeacher'
 import TeachCheckList from '@/view/teachCheckList'
 import TeachTask from '@/view/teachTask'
 import TeachTaskDetail from '@/view/teachTaskDetail'
 import Report from '@/view/report'
 import Reportad from '@/view/reportadvanced'
+import Detail from '@/view/detail'
 import { resolve } from 'url';
 
 export const routes = [
@@ -99,6 +101,11 @@ export const routes = [
     path: '/teachCheck',
     component: TeachCheck
   },
+  {
+    name: 'teachCheckTeacher',
+    path: '/teachCheckTeacher',
+    component: TeachCheckTeacher
+  },
   {
     name: 'teachCheckList',
     path: '/teachCheckList',
@@ -124,4 +131,9 @@ export const routes = [
     path: '/Reportad',
     component: Reportad
   },
+  {
+    name: 'detail',
+    path: '/Detail',
+    component: Detail
+  },
 ]

TEAMModelOS.TeachZone/ClientApp/view/detail.vue

@@ -0,0 +1,80 @@
+<template>
+    <div id="app">
+
+    </div>
+</template>
+<script>
+    import Header from '@/common/header.vue'
+    import Master from '@/common/master.vue'
+    import Left from '@/common/left.vue'
+    import Footer from '@/common/footer.vue'
+    export default {
+        components: {
+            Header,
+            Master,
+            Left,
+            Footer
+        },
+        data () {
+            return {
+                modal1: false,
+                formItem: {
+                    input: '',
+                    textarea: ''
+                },
+                list:[
+                    {
+                        title:'2019.4.9 核心素养深入研究，开拓视野精彩纷呈。',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'2019年4月28日四年级教研活动通讯',
+                        date:'2019-05-09'
+                    },
+
+                    {
+                        title:'师退生进 让学生站在教室中央',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'区数学高段“问题解决”专题 暨“老带青”教研活动通讯。',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'2019年3月15日“图形的认识”专题教研活动通讯',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'18.4.17“数学教师青年团”课堂教学能力提升培训活动简讯',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'2018.9.11深入教材研究，共筑智慧课堂',
+                        date:'2019-05-09'
+                    },
+                ]
+
+            }
+        },
+        methods: {
+            ok () {
+                this.$Message.info('发布成功');
+            },
+            // cancel () {
+            //   this.$Message.info('');
+            // }
+            yes () {
+                this.modal1 = false;
+                this.$Message.success('发布成功');
+            },
+            cancel () {
+                this.modal1 = false;
+            }
+        }
+    }
+</script>
+

TEAMModelOS.TeachZone/ClientApp/view/index.vue

@@ -4,7 +4,31 @@
     <Master></Master>
     <div class="wrap ov bodyContent">
       <Left></Left>
-      <Index></Index>
+      <div class="main fr">
+        <h4>所在班级 > 六年级·1班</h4>
+        <div class="content ov">
+          <dl class="notice fl">
+            <dt>班级通知 <a href="notice" class="fr">更多+</a></dt>
+            <dd v-for="(item,index) in notice"><a href="/noticeDetail">{{item.title}}  <b v-if="index<2"><img src="../assets/image/new.gif" alt=""></b><span>{{item.date}}</span></a></dd>
+          </dl>
+          <dl class="word fl">
+            <dt>班级寄语</dt>
+            <dd>
+              班级是船，学生是帆。岁月轮回，抹不去我们在这里洒下的汗水，
+              挥不去我们在这里展开的笑颜。愿我们处处祥云罩野马，朝朝吉星
+              伴青松。班级空间，让我们一起来书写属于自己的精彩！
+            </dd>
+          </dl>
+        </div>
+        <div class="content ov">
+          <dl class="notice source fl " style="width: 100%">
+            <dt>班级资源 <a href="source" class="fr">更多+</a></dt>
+            <dd v-for="(item,index) in cls"><a href="/teachSourceDetail" :title="item.title"> <Icon type="ios-paper-outline" style="font-size: 18px;"/> {{item.title}}
+              <b v-if="index<2"><img src="../assets/image/new.gif" alt=""></b>
+              <span>发布者：{{item.author}}</span></a></dd>
+          </dl>
+        </div>
+      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -14,18 +38,87 @@
   import Master from '@/common/master.vue'
   import Left from '@/common/left.vue'
   import Footer from '@/common/footer.vue'
-  import Index from '@/components/index.vue'
   export default {
     components: {
       Header,
       Master,
       Left,
-      Footer,
-      Index
+      Footer
     },
     data() {
       return {
+        notice:[
+          {
+            title:'2019年五月11日 核心素养深入研究，开拓视野精彩纷呈。',
+            date:'2019-05-09'
+          },
+          {
+            title:'5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。',
+            date:'2019-05-09'
+          },
+          {
+            title:'2019年4月28日 四年级教研活动通讯。',
+            date:'2019-05-09'
+          },
 
+          {
+            title:'师退生进 让学生站在教室中央。',
+            date:'2019-05-09'
+          },
+          {
+            title:'区数学高段“问题解决”专题 暨“老带青”教研活动通讯。',
+            date:'2019-05-09'
+          },
+          {
+            title:'2019年3月15日“图形的认识”专题教研活动通讯。',
+            date:'2019-05-09'
+          },
+          // {
+          //   title:'18.4.17“数学教师青年团”课堂教学能力提升培训活动简讯',
+          //   date:'2019-05-09'
+          // },
+          // {
+          //   title:'2018.9.11深入教材研究，共筑智慧课堂',
+          //   date:'2019-05-09'
+          // },
+        ],
+        cls:[
+          {
+            id:'1',
+            title:'五年级上册《平行四边形的面积》.mp4',
+            author:'郭一凡'
+          },
+          {
+            id:'2',
+            title:'《百分数解决问题例2》教学设计.docx',
+            author:'王晓华'
+          },
+          {
+            id:'3',
+            title:'第五课   图形的认识与测量（第2课时）（课件）.pptx',
+            author:'车明阳'
+          },
+          {
+            id:'4',
+            title:'负数的初步认识(六下第一课时）.ppt',
+            author:'李思思'
+          },
+          {
+            id:'5',
+            title:'王宏伟：用比例解决问题.ppt',
+            author:'王宏伟'
+          },
+          {
+            id:'6',
+            title:'圆柱与圆锥的认识 课件',
+            author:'高哲'
+          },
+          {
+            id:'7',
+            title:'第五课  图形的认识与测量（第1课时课件）.pptx',
+            author:'马雪瑞'
+          },
+        ]
       }
     },
       mounted() {

TEAMModelOS.TeachZone/ClientApp/view/indexStudent.vue

@@ -4,7 +4,35 @@
     <Master></Master>
     <div class="wrap ov bodyContent">
       <LeftStudent></LeftStudent>
-      <Index></Index>
+      <div class="main fr">
+        <h4>所在班级 > 六年级·1班</h4>
+        <div class="content ov">
+          <dl class="notice fl">
+            <dt>班级通知 <a href="notice" class="fr">更多+</a></dt>
+            <dd><a href="/noticeDetail">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。  <img src="../assets/image/new.gif" alt=""><span>2019-05-09</span></a></dd>
+            <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。  <img src="../assets/image/new.gif" alt=""><span>2019-05-09</span></a></dd>
+            <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+            <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+            <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+          </dl>
+          <dl class="word fl">
+            <dt>班级寄语</dt>
+            <dd>
+              班级是船，学生是帆。岁月轮回，抹不去我们在这里洒下的汗水，
+              挥不去我们在这里展开的笑颜。愿我们处处祥云罩野马，朝朝吉星
+              伴青松。班级空间，让我们一起来书写属于自己的精彩！
+            </dd>
+          </dl>
+        </div>
+        <div class="content ov">
+          <dl class="notice source fl " style="width: 100%">
+            <dt>班级资源 <a href="source" class="fr">更多+</a></dt>
+            <dd v-for="(item,index) in cls"><a href="/scoreL istDetail" :title="item.title"> <Icon type="ios-paper-outline" style="font-size: 18px;"/> {{item.title}}
+              <b v-if="index<2"><img src="../assets/image/new.gif" alt=""></b>
+              <span>发布者：{{item.author}}</span></a></dd>
+          </dl>
+        </div>
+      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -14,23 +42,58 @@
   import Master from '@/common/master.vue'
   import LeftStudent from '@/common/leftStudent.vue'
   import Footer from '@/common/footer.vue'
-  import Index from '@/components/index.vue'
+
   export default {
     components: {
       Header,
       Master,
-      LeftStudent,
       Footer,
-      Index
+      LeftStudent,
     },
     data() {
       return {
-
+        cls:[
+          {
+            id:'1',
+            title:'五年级上册《平行四边形的面积》（袁晓萍）.MP4',
+            author:'郭一凡'
+          },
+          {
+            id:'2',
+            title:'《百分数解决问题例2》教学设计（石翠兰）.docx',
+            author:'王晓华'
+          },
+          {
+            id:'3',
+            title:'第五课   图形的认识与测量（第2课时）（课件）.pptx',
+            author:'车明阳'
+          },
+          {
+            id:'4',
+            title:'负数的初步认识(六下第一课时）.ppt',
+            author:'李思思'
+          },
+          {
+            id:'5',
+            title:'王宏伟：用比例解决问题.ppt',
+            author:'王宏伟'
+          },
+          {
+            id:'6',
+            title:'圆柱与圆锥的认识 课件',
+            author:'高哲'
+          },
+          {
+            id:'7',
+            title:'第五课  图形的认识与测量（第1课时）（课件）.pptx',
+            author:'马雪瑞'
+          },
+        ]
       }
     },
-      mounted() {
+    mounted() {
 
-      }
     }
+  }
 </script>
 

TEAMModelOS.TeachZone/ClientApp/view/notice.vue

@@ -4,7 +4,38 @@
     <Master></Master>
     <div class="wrap ov">
       <Left></Left>
-      <notice></notice>
+      <div class="main fr">
+        <h4><a href="/">首页</a> > 班级通知</h4>
+        <div class="content ov bgf ">
+          <dl class="notice" style="width: 100%;">
+            <dt>班级通知 <!--<a href="" class="fr">更多+</a>--></dt>
+            <div class="oper">
+              <Button type="info" @click="modal1 = true">发布通知</Button>
+              <Modal
+                v-model="modal1" class-name="vertical-center-modal" footer-hide="true"
+                title="发布通知"
+                @on-ok="ok"
+                @on-cancel="cancel">
+                <Form :model="formItem" :label-width="80">
+                  <FormItem label="通知标题">
+                    <Input v-model="formItem.input" placeholder="请输入通知标题"></Input>
+                  </FormItem>
+
+                  <FormItem label="通知内容">
+                    <Input v-model="formItem.textarea" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入通知内容"></Input>
+                  </FormItem>
+                  <FormItem>
+                    <Button type="primary" @click="yes">发布</Button>
+                    <Button style="margin-left: 8px" @click="cancel">取消</Button>
+                  </FormItem>
+                </Form>
+              </Modal>
+            </div>
+            <dd v-for="item in list"><a href="/noticeDetail">{{item.title}}<span>{{item.date}}</span></a></dd>
+          </dl>
+          <Page :total="100"  size="small" show-total class="fr" />
+        </div>
+      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -14,23 +45,73 @@
   import Master from '@/common/master.vue'
   import Left from '@/common/left.vue'
   import Footer from '@/common/footer.vue'
-  import Notice from '@/components/notice.vue'
   export default {
     components: {
       Header,
       Master,
       Left,
-      Footer,
-      Notice
+      Footer
     },
-    data() {
+    data () {
       return {
+        modal1: false,
+        formItem: {
+          input: '',
+          textarea: ''
+        },
+        list:[
+          {
+            title:'2019.4.9 核心素养深入研究，开拓视野精彩纷呈。',
+            date:'2019-05-09'
+          },
+          {
+            title:'5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。',
+            date:'2019-05-09'
+          },
+          {
+            title:'2019年4月28日四年级教研活动通讯',
+            date:'2019-05-09'
+          },
+
+          {
+            title:'师退生进 让学生站在教室中央',
+            date:'2019-05-09'
+          },
+          {
+            title:'区数学高段“问题解决”专题 暨“老带青”教研活动通讯。',
+            date:'2019-05-09'
+          },
+          {
+            title:'2019年3月15日“图形的认识”专题教研活动通讯',
+            date:'2019-05-09'
+          },
+          {
+            title:'18.4.17“数学教师青年团”课堂教学能力提升培训活动简讯',
+            date:'2019-05-09'
+          },
+          {
+            title:'2018.9.11深入教材研究，共筑智慧课堂',
+            date:'2019-05-09'
+          },
+        ]
 
       }
     },
-      mounted() {
-
+    methods: {
+      ok () {
+        this.$Message.info('发布成功');
+      },
+      // cancel () {
+      //   this.$Message.info('');
+      // }
+      yes () {
+        this.modal1 = false;
+        this.$Message.success('发布成功');
+      },
+      cancel () {
+        this.modal1 = false;
       }
     }
+    }
 </script>
 

TEAMModelOS.TeachZone/ClientApp/view/report.vue

@@ -109,7 +109,7 @@
             label: '物理'
           },
         ],
-        model2: '语文',
+        model2: '数学',
         columns1: [
           {
             title: '知识点名称',

TEAMModelOS.TeachZone/ClientApp/view/reportadvanced.vue

@@ -109,7 +109,7 @@
             label: '物理'
           },
         ],
-        model2: '语文',
+        model2: '数学',
         columns1: [
           {
             title: '知识点名称',

TEAMModelOS.TeachZone/ClientApp/view/teachCheckList.vue

@@ -30,7 +30,8 @@
                   <li>日期：{{item.date}}</li>
                 </ol>
               </div>
-              <a href="/teachCheck" class="startCheck">开始检测</a>
+              <!--<a href="/teachCheck" class="startCheck">开始检测</a>-->
+              <a href="/teachCheckTeacher" class="startCheck">答题详情</a>
             </li>
           </ul>
           <Page :total="100"  size="small" show-total class="fr" />

TEAMModelOS.TeachZone/ClientApp/view/teachSource.vue

@@ -81,10 +81,10 @@
           {
             type:'word',
             src:'teachSourceDetail',
-            title:'带着地图去旅行.doc',
+            title:'《百分数解决问题例2》教学设计.docx',
             star:5,
             size:'1.32MB',
-            source:'陆杰',
+            source:'李雅斯',
             date:'2019-04-08',
             preview:'6',
             collect:'5',
@@ -93,10 +93,10 @@
           {
             type:'word',
             src:'teachSourceDetail',
-            title:'感受生命的意义.doc',
+            title:'《折线统计图》教学设计.docx',
             star:4.5,
             size:'1.64MB',
-            source:'朱艳娜',
+            source:'郑惠莉',
             date:'2019-04-07',
             preview:'10',
             collect:'5',
@@ -105,11 +105,11 @@
           {
             type:'ppt',
             src:'teachSourcePpt',
-            title:'综合探究三——如何认识区域（以南非为例.ppt',
+            title:'几何直观与小学数学教学.ppt',
             star:5,
             size:'1.32MB',
-            source:'马平儿',
-            date:'2019-04-08',
+            source:'史宁中',
+            date:'2019-03-19',
             preview:'20',
             collect:'5',
             download:'4'
@@ -121,7 +121,7 @@
             star:4.5,
             size:'1.64MB',
             source:'朱艳娜',
-            date:'2019-04-07',
+            date:'2019-03-02',
             preview:'10',
             collect:'5',
             download:'3'
@@ -133,7 +133,7 @@
             star:4.5,
             size:'1.64MB',
             source:'朱艳娜',
-            date:'2019-04-07',
+            date:'2019-02-16',
             preview:'10',
             collect:'5',
             download:'3'
@@ -141,16 +141,27 @@
           {
             type:'word',
             src:'teachSourceDetail',
-            title:'带着地图去旅行(课件).doc',
+            title:'《平行四边形的面积》.doc',
             star:4.5,
             size:'1.32MB',
-            source:'陆杰',
-            date:'2019-04-08',
+            source:'袁晓萍',
+            date:'2019-02-15',
             preview:'16',
             collect:'5',
             download:'4'
           },
-
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'《百分数解决问题例2》教学设计.docx',
+            star:5,
+            size:'1.32MB',
+            source:'李雅斯',
+            date:'2019-02-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },
         ]
       }
     },

TEAMModelOS.TeachZone/ClientApp/view/teachSourceDetail.vue

@@ -9,20 +9,94 @@
         <div class="content ov bgf pad20">
          <div class="sourceDetail">
            <div class="titleBox">
-             <h3 class="word"> 2017年全国各地中考作文题汇总.doc</h3>
+             <h3 class="word"> 《百分数解决问题例1》教学设计.docx</h3>
              <ul class="info">
                <li>时间：2019-05-13</li>
                <li>大小：1.36MB</li>
                <li>引用：4次</li>
                <li>下载：20次</li>
-               <li>来源：陆杰（平湖市福臻中学）</li>
+               <li>来源：李雅斯</li>
                <li>得分：<Rate allow-half disabled v-model="valueText">
                </Rate></li>
              </ul>
            </div>
            <div>
-             <iframe
-               src="http://res.huijiaoyun.com:22021//data9/transform/2019/1/14/21/56/8b188019f7f1406694fbd52154840654/28870b8a84e5b7fe607419a194d09699.doc/html4/transform.html"></iframe>
+             <!--<iframe src="/Detail"></iframe>-->
+             <div class="detail">
+                <h2 class="tc">《百分数解决问题 例1》</h2>
+               <div> <b>教学内容：</b>人教版小学数学教材六年级上册第84页例1及相关练习。</div>
+               <div> <b>教学目标：</b>
+                <ol>
+                  <li>1．引导学生开展自主探索，掌握求百分率的方法。会解决求一个数是另一个数的百分之几的实际问题，能理解百分数解决问题和分数解决问题的异同点。</li>
+                  <li>2．在求命中率的基础上，理解更多生活中的百分率的实际含义，感受百分率在生活中应用的广泛性。</li>
+                  <li>3．进一步明确百分率与分数的联系和区别，培养学生比较分析、归纳概括的思维能力。</li>
+                </ol>
+               </div>
+               <div> <b>教学重点：</b>掌握求百分率的方法。</div>
+               <div> <b>教学难点：</b>学会用百分数解决实际问题。</div>
+               <div> <b>教学准备：</b>课件、平板</div>
+               <div> <b>教学过程：</b>
+               <ol>
+                 <li>1、复习旧知，学情铺垫
+                    <ul>
+                      <li>（1）口算填空
+                        <p><b>问：</b>小数化分数你是如何做的？那分数化小数你们是如何做的呢？</p>
+                      </li>
+                    </ul>
+                 </li>
+                 <li>2、创设情境，探究新知
+                   <ul>
+                     <li>（1）播放视频，引出例题
+                       <p><b>问：</b>同学们有喜欢打篮球的吗？让我们一起来看一个片段。（播放视频）<br>
+
+                         这是王涛和李强的投篮成绩，从题目中你知道了哪些信息？你是怎样想的？</p>
+                       <img src="../assets/image/detail1.png" alt="">
+                     </li>
+                     <li>
+                       （2）同桌互说，根据课堂实际生成情况，顺势引导。
+                     </li>
+                   </ul>
+                 </li>
+                 <li>3、回顾与反思
+                   <ul>
+                     <li>（1）回顾与反思
+                       <p><b>问：</b>那从今天的结果来看，我们能判断出谁的投篮更厉害一些吗？</p>
+                       <p><b>问：</b>用百分率来解决问题，实际上就是再求什么？用什么方法呢？</p>
+                     </li>
+                   </ul>
+                 </li>
+                 <li>4、算“失球率”
+                   <p><b>问：</b>其实这个问题，我们还可以从刚才同学们所说的，没有投中的占投篮次数的百分之几来考虑。</p>
+                   <ul>
+                     <li>（1）计算各自的失球率。</li>
+                     <li>（2）观察发现，命中率和失球率之间的关系。</li>
+                   </ul>
+                 </li>
+                 <li>2、联系实际，理解意义
+                   <p><b>问：</b>其实，生活中像这样百分率的例子还有很多。我们一起来看一看。你认为什么是出勤率呢？如何求？</p>
+                 </li>
+
+                 <li>4、联系实际，巩固应用
+                   <ul>
+                     <li>（1）生物小组进行玉米种子发芽试验，每次试验结果如下：
+
+                       <p><img src="../assets/image/detail2.png" alt=""></p>
+                       <p><b>问：</b>不动笔计算，哪组实验更成功？为什么？请同学们验证看。</p>
+                     </li>
+                     <li>
+                       （2）判断
+                       <p>及格率指的是及格人数占总人数的百分之几?</p>
+                       <p>前进小学种植了110棵松树，全部成活，成活率是110%?</p>
+                     </li>
+                   </ul>
+                   <p><b>教师小结：</b>看来要把计算结果转化成百分数，我们可以直接把分母转化成100的分数，改写成百分数；不能直接转化成分母是100的分数，我们可以把它转化成小数，将小数点向右移动两位，加上百分号。遇到除不尽的时候，保留三位小数。</p>
+                 </li>
+
+               </ol>
+               </div>
+               <div> <b></b></div>
+             </div>
+
            </div>
            <div class="comment">
              <h4>总体印象</h4>

TEAMModelOS.TeachZone/Views/Shared/_Layout.cshtml

@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"]TEAM Model OS</title>
+    <title>@ViewData["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" />