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

TEAMModelOS.SmartClass/ClientApp/static/lessonDetails.json

@@ -6,7 +6,7 @@
     "commentCount": 52,
     "cover": "1胡建良.png",
     "coverHash": "127.png",
-    "coverUri": "/upload/viewactivity/cover/127/127.png?_=1557819330146",
+    "coverUri": "../assets/image/lessonCover.png",
     "description": "<br>",
     "dianZanCount": 0,
     "employeeName": "吴雁",
@@ -33,16 +33,16 @@
     "parentCategoryId": 24,
     "parentCategoryName": "创客",
     "parentGradeId": 13,
-    "parentGradeName": "高一",
+    "parentGradeName": "初一",
     "parentGradeSectionId": 3,
-    "parentGradeSectionName": "高中",
+    "parentGradeSectionName": "初中",
     "parentProjectId": 103,
     "parentProjectName": "简易冠啸机器人搭建",
     "parentTeachePlateId": 19,
     "parentTeachePlateName": "冠啸创新实验室",
     "reviewContent": "本次直播总点击量： 68 评论数： 44 今日直播只推PC端，采用移动录播设备直播，直播视频推送画面清晰，播放过程流畅无锯齿拖影，声音干净。上课学校设备保障充分，教师教学过程实施完整。直播过程网络通畅，没有出现画面中断停顿现象。",
     "school": null,
-    "schoolName": "成都市高新区钱清中学",
+    "schoolName": "成都市高新区益民学校",
     "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
     "score": 87.67,
     "speaker": "胡建良",
@@ -148,7 +148,7 @@
       "attachmentTypeId": 1,
       "attachmentTypeName": "观课视频",
       "attachmentTypeTip": "观课视频",
-      "fileName": "钱清中学胡建良创新实验室课例.mp4",
+      "fileName": "胡建良创新实验室课例.mp4",
       "fileNameHash": "511.mp4",
       "fileNameRtmpUri": "rtmp://6.182.0.4:1935/upload//viewactivity/attachment/511/511.mp4",
       "fileNameUri": "/upload/viewactivity/attachment/511/511.mp4?_=1557819505405",

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

@@ -6,7 +6,7 @@
     <div class="details-container">
       <div class="activity-brief center-row">
         <div class="activity-brief-left">
-          <img :src="'http://ttkt.sxedu.org:70'+activityInfo.coverUri" />
+          <img src="../../assets/image/lessonCover.png" width="100%" />
         </div>
         <div class="activity-brief-right">
           <div class="activity-brief-title">

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

@@ -87,7 +87,7 @@
           eventLimit: 1,
           // allDay:true,
           header: {//表头信息
-            left: 'prev, next, today',
+            left: 'prev, next',
             center: 'title',
             right: 'hide, custom'
           },

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

@@ -171,21 +171,21 @@
           },
         ],
         teacherList: [
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people01.jpg'), title: '省级名师', name: '周莉', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500'},
+          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people01.jpg'), title: '省级名师', name: '周杨', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500'},
           { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people02.jpg'), title: '省级名师', name: '李俊峰', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
           { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people04.jpg'),title: '省级名师', name: '王志明', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
           { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people03.jpg'),title: '省级名师', name: '李国强', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people05.jpg'), title: '省级名师', name: '黄明亮', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people08.jpg'), title: '省级名师', name: '李章杰', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people05.jpg'), title: '省级名师', name: '黄明莉', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people08.jpg'), title: '省级名师', name: '李章杰', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
           { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people06.jpg'), title: '省级名师', name: '周湾', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people07.jpg'), title: '省级名师', name: '徐建生', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people07.jpg'), title: '省级名师', name: '徐建生', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
           { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people09.jpg'), title: '省级名师', name: '王福生', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people10.jpg'), title: '省级名师', name: '张凯丽', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people10.jpg'), title: '省级名师', name: '张凯伦', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
           { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people13.jpg'), title: '省级名师', name: '吴世杰', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people12.jpg'), title: '省级名师', name: '王先森', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people12.jpg'), title: '省级名师', name: '王先森', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
           { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '李德华', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people15.jpg'), title: '省级名师', name: '李登辉', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '省级名师', name: '张梦迪', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people15.jpg'), title: '省级名师', name: '李萌萌', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '省级名师', name: '张梦迪', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
         ],
         teacherData: [
           {