Bläddra i källkod

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

liqk 6 år sedan
förälder
incheckning
17df11a7ec
21 ändrade filer med 234 tillägg och 100 borttagningar
  1. 24 14
      TEAMModelOS.SmartClass/ClientApp/view/smart-class/CommentVideo.vue
  2. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/650.jpg
  3. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-active.png
  4. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-article.png
  5. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-bg.png
  6. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-member.png
  7. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-move.png
  8. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-resource.png
  9. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-teacher.png
  10. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon1.png
  11. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon2.png
  12. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon3.png
  13. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon4.png
  14. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon5.png
  15. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon6.png
  16. 18 11
      TEAMModelOS.SmartTeach/ClientApp/components/resource/TeachDetails.vue
  17. 9 9
      TEAMModelOS.SmartTeach/ClientApp/components/resource/TeachTopclass.vue
  18. 81 0
      TEAMModelOS.SmartTeach/ClientApp/components/resource/TeacherVideos.vue
  19. 62 46
      TEAMModelOS.SmartTeach/ClientApp/components/resource/ZonesHome.vue
  20. 37 19
      TEAMModelOS.SmartTeach/ClientApp/components/resource/teacherMap.vue
  21. 3 1
      TEAMModelOS.SmartTeach/ClientApp/router/routes.js

+ 24 - 14
TEAMModelOS.SmartClass/ClientApp/view/smart-class/CommentVideo.vue

@@ -20,7 +20,7 @@
         <div id="views" style="width:840px; height:350px;"></div>
         <div id="views" style="width:840px; height:350px;"></div>
         <div class="echart-title">专家点评分析图</div>
         <div class="echart-title">专家点评分析图</div>
 
 
-        <div style="width:400px;float:left">
+        <div style="width:400px;float:left;margin-left:20px">
           <div id="radarLeft" style="width:400px; height:350px;margin-top:20px;"></div>
           <div id="radarLeft" style="width:400px; height:350px;margin-top:20px;"></div>
           <div class="echart-title" style="margin-top:20px;width:400px;">课堂评价</div>
           <div class="echart-title" style="margin-top:20px;width:400px;">课堂评价</div>
         </div>
         </div>
@@ -248,14 +248,16 @@
       myChart.setOption(option);
       myChart.setOption(option);
 
 
 
 
+
       let radarLeftOption = {
       let radarLeftOption = {
         tooltip: {},
         tooltip: {},
         radar: {
         radar: {
-            // shape: 'circle',
+          shape: 'circle',
+          radius:'55%',
             name: {
             name: {
                 textStyle: {
                 textStyle: {
                     color: '#fff',
                     color: '#fff',
-                    backgroundColor: '#91C7AE',
+                    backgroundColor: '#33CC8F',
                     borderRadius: 3,
                     borderRadius: 3,
                     padding: [5, 10]
                     padding: [5, 10]
                }
                }
@@ -276,7 +278,6 @@
           },
           },
         },
         },
         series: [{
         series: [{
-            name: '预算 vs 开销(Budget vs spending)',
             type: 'radar',
             type: 'radar',
                itemStyle: {
                itemStyle: {
                   normal: {
                   normal: {
@@ -285,7 +286,7 @@
 
 
                        },
                        },
                        lineStyle:{
                        lineStyle:{
-										    color:'#63B8FF'
+										    color:'#44BB44'
 									    }
 									    }
 
 
                   }
                   }
@@ -301,7 +302,7 @@
                     name: '课堂评价分数',
                     name: '课堂评价分数',
                     areaStyle: {
                     areaStyle: {
                       normal: {
                       normal: {
-                          color: '#91C7AE' // 选择区域颜色
+                          color: '#33CC8F' // 选择区域颜色
                       },
                       },
                   }
                   }
                 }
                 }
@@ -309,31 +310,40 @@
         }]
         }]
       }
       }
 
 
-      radarLeft.setOption(radarLeftOption);
 
 
 
 
       let scoreRightOption = {
       let scoreRightOption = {
           tooltip : {
           tooltip : {
-              formatter: "{a} {b} : {c}分"
+              formatter: "{a}{b} : {c}分"
           },
           },
           series: [
           series: [
               {
               {
                   name: '最终得分',
                   name: '最终得分',
                   type: 'gauge',
                   type: 'gauge',
-                  radius:'80%',
+                  radius:'70%',
                   splitNumber:'5',
                   splitNumber:'5',
                   detail: {
                   detail: {
-                      fontSize:'60',
+                      fontSize:'50',
                       fontWeight:'bolder',
                       fontWeight:'bolder',
-                      padding:[0,0,0,0],
-                      color:"#00868B"
+                      padding:[100,0,0,0],
+                      color:"#44BB44"
               },
               },
+                  axisLine: {            // 坐标轴线  
+                     lineStyle: {       // 属性lineStyle控制线条样式  
+                         color: [[0.2, '#FF6600'], [0.4, '#FFCC00'], [0.6, '#D5D52B'], [0.8, '#33cc99'], [1, '#00cc33']]
+                                }  
+                            },   
               data: [{ value: this.score }]
               data: [{ value: this.score }]
               }
               }
           ]
           ]
       };
       };
 
 
-      scoreRight.setOption(scoreRightOption);
+
+
+      window.addEventListener("scroll", function () {
+        radarLeft.setOption(radarLeftOption);
+        scoreRight.setOption(scoreRightOption);
+      });
 
 
       myChart.on('click', function (params) {
       myChart.on('click', function (params) {
         let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
         let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
@@ -452,7 +462,7 @@
   }
   }
 
 
   .review-pane {
   .review-pane {
-    max-height: 1000px;
+    height: 700px;
     background-color: #fff;
     background-color: #fff;
     overflow-y: auto;
     overflow-y: auto;
     position: relative;
     position: relative;

BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/650.jpg


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-active.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-article.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-bg.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-member.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-move.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-resource.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/data-view-teacher.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon1.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon2.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon3.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon4.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon5.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/teacher-icon6.png


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 18 - 11
TEAMModelOS.SmartTeach/ClientApp/components/resource/TeachDetails.vue


+ 9 - 9
TEAMModelOS.SmartTeach/ClientApp/components/resource/TeachTopclass.vue

@@ -55,16 +55,16 @@
     data() {
     data() {
       return {
       return {
         video_list: [
         video_list: [
-          { "id": 1, "imgurl": require("../../assets/image/resource/teach03.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=1' },
-          { "id": 2, "imgurl": require("../../assets/image/resource/teach01.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=2' },
-          { "id": 3, "imgurl": require("../../assets/image/resource/teach02.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=3' },
-          { "id": 4, "imgurl": require("../../assets/image/resource/teach04.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=4' },
+          { "id": 1, "imgurl": require("../../assets/image/resource/teach03.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', },
+          { "id": 2, "imgurl": require("../../assets/image/resource/teach01.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析',  },
+          { "id": 3, "imgurl": require("../../assets/image/resource/teach02.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', },
+          { "id": 4, "imgurl": require("../../assets/image/resource/teach04.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', },
         ],
         ],
         video_lists: [
         video_lists: [
-          { "id": 1, "imgurl": require("../../assets/image/resource/teach03.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=1' },
-          { "id": 2, "imgurl": require("../../assets/image/resource/teach01.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=2' },
-          { "id": 3, "imgurl": require("../../assets/image/resource/teach02.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=3' },
-          { "id": 4, "imgurl": require("../../assets/image/resource/teach04.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=4' },
+          { "id": 1, "imgurl": require("../../assets/image/resource/teach03.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析',  },
+          { "id": 2, "imgurl": require("../../assets/image/resource/teach01.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析',  },
+          { "id": 3, "imgurl": require("../../assets/image/resource/teach02.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', },
+          { "id": 4, "imgurl": require("../../assets/image/resource/teach04.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析',  },
 
 
         ],
         ],
       }
       }
@@ -116,7 +116,7 @@
     margin-top: 35px;
     margin-top: 35px;
     width: 90%;
     width: 90%;
     background: #fff;
     background: #fff;
-    height: 9380px;
+    height:380px;
     border: 1px solid #ededed;
     border: 1px solid #ededed;
   }
   }
 
 

+ 81 - 0
TEAMModelOS.SmartTeach/ClientApp/components/resource/TeacherVideos.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="activity_container">
+    <div class="activity_details">
+      <div class="activity_details_box">
+        <div class="title">
+          <Icon type="ios-home-outline" size="22" />
+          <p><router-link to="/TeacherZone/ZonesHome">工作室首页</router-link></p><span>>名师课堂</span><span>>视频详情</span>
+        </div>
+        <div class=video-info>
+          <h1>选修3-1第二章恒定电流,2电流的微观解析.mp4</h1>
+          <div class="video">
+            <video-player class="video-player-box" style="width:600px;height:600px;"
+                          ref="videoPlayer"
+                          :options="playerOptions"
+                          :playsinline="true">
+            </video-player>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+
+  export default {
+    data() {
+      return {
+      }
+    },
+    methods: {
+      showVideo(index) {
+        //alert(index);
+        this.$router.push(
+          {
+            name: 'video',
+            query: {
+              rewardIndex: index
+            }
+          }
+        );
+        this.$refs.videoPlayer.player.src({ type: "application/x-mpegURL", src: "https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190517/history/history.m3u8" });
+      }
+    }
+
+  }
+</script>
+<style scoped>
+  .activity_details {
+    width: 100%;
+    height: auto;
+    background: #f8f8f8;
+    padding-top: 20px;
+    padding-bottom: 8%;
+  }
+
+  .activity_details_box {
+    width: 1200px;
+    height: auto;
+    margin: 0 auto;
+  }
+
+  .clearfix {
+    display: block;
+  }
+  .video-info{
+    width:1000px;
+    height:600px;
+    border:1px solid red;
+  }
+  .video-info h1 {
+    text-align:center;
+  }
+  .video{
+    width:800px;
+    height:600px;
+  }
+
+
+
+
+</style>

+ 62 - 46
TEAMModelOS.SmartTeach/ClientApp/components/resource/ZonesHome.vue

@@ -12,7 +12,7 @@
                   <img src="../../assets/image/resource/people02.jpg" alt="">
                   <img src="../../assets/image/resource/people02.jpg" alt="">
                 </span>
                 </span>
                 <div class="info">
                 <div class="info">
-                  <h1 title="李朝华">李朝华</h1>
+                  <h1 title="李朝华">{{userName}}</h1>
                   <p class="sub c555">高中物理</p>
                   <p class="sub c555">高中物理</p>
                 </div>
                 </div>
               </div>
               </div>
@@ -31,23 +31,29 @@
             <div class=" statistics_header"><p class="fl">统计</p></div>
             <div class=" statistics_header"><p class="fl">统计</p></div>
             <div class="statistics_con con_box">
             <div class="statistics_con con_box">
               <ul class="statistics_list">
               <ul class="statistics_list">
-                <li class="icon_1 ">
-                  <i class="num">成员数</i><em class="c888">322</em>
+                <li class="statistics_li">
+                  <img src="../../assets/image/resource/teacher-icon1.png" />
+                  <span>成员数</span><p >322</p>
                 </li>
                 </li>
-                <li class="icon_2 ">
-                  <i class="num">文章数</i><em class="c888">253</em>
+                <li class="statistics_li">
+                  <img src="../../assets/image/resource/teacher-icon2.png" />
+                  <span>文章数</span><p >12322</p>
                 </li>
                 </li>
-                <li class="icon_3 ">
-                  <i class="num">资源数</i><em class="c888">17949</em>
+                <li class="statistics_li">
+                  <img src="../../assets/image/resource/teacher-icon3.png" />
+                  <span>资源数</span><p >322</p>
                 </li>
                 </li>
-                <li class="icon_4 ">
-                  <i class="num">课题研究数</i><em class="c888">0</em>
+                <li class="statistics_li">
+                  <img src="../../assets/image/resource/teacher-icon4.png" />
+                  <span>课题研究数</span><p >5322</p>
                 </li>
                 </li>
-                <li class="icon_5 ">
-                  <i class="num">名师课堂数</i><em class="c888">233</em>
+                <li class="statistics_li">
+                  <img src="../../assets/image/resource/teacher-icon5.png" />
+                  <span>名师课堂数</span><p >3222</p>
                 </li>
                 </li>
-                <li class="icon_6 ">
-                  <i class="num">教研活动数</i><em class="c888">0</em>
+                <li class="statistics_li">
+                  <img src="../../assets/image/resource/teacher-icon6.png" />
+                  <span>教研活动数</span><p >1322</p>
                 </li>
                 </li>
               </ul>
               </ul>
             </div>
             </div>
@@ -59,24 +65,24 @@
           <div class="info-msg">
           <div class="info-msg">
             <p>工作室资讯</p><a></a><hr>
             <p>工作室资讯</p><a></a><hr>
             <ul>
             <ul>
-              <li><a @click="viewDetails">陈伟名师网络工作室活动暨职业教满结束</a><span>10-25</span></li>
-              <li><a @click="viewDetails">陈伟名师活动暨职业教育教材反馈会圆满结束</a@click="viewDetails"><span>10-25</span></li>
-              <li><a @click="viewDetails">陈伟名师网络工作室活动暨职业教育教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a @click="viewDetails">陈伟名师网络工作室活教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a @click="viewDetails">陈伟名师网络工教育教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a @click="viewDetails">陈伟名师网络工作室教育教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a @click="viewDetails">陈伟名师网络工作室活动暨职业教会圆满结束</a><span>10-25</span></li>
-              <li><a @click="viewDetails">陈伟名师网络教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">{{userName}}名师网络工作室活动暨职业教满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">{{userName}}名师活动暨职业教育教材反馈会圆满结束</a@click="viewDetails"><span>10-25</span></li>
+              <li><a @click="viewDetails">{{userName}}名师网络工作室活动暨职业教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">{{userName}}名师网络工作室活教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">{{userName}}名师网络工教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">{{userName}}名师网络工作室教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">{{userName}}名师网络工作室活动暨职业教会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">{{userName}}名师网络教育教材反馈会圆满结束</a><span>10-25</span></li>
             </ul>
             </ul>
-          </div>
+          </div>vvvvvvvv
           <div class="notice">
           <div class="notice">
             <p>公告</p><a></a><hr />
             <p>公告</p><a></a><hr />
             <ul>
             <ul>
-              <li><a>陈伟名师网束</a><span>10-25</span></li>
-              <li><a>陈伟名育教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师馈会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师反馈会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师网馈会圆满结束</a><span>10-25</span></li>
+              <li><a>{{userName}}名师网束</a><span>10-25</span></li>
+              <li><a>{{userName}}名育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a>{{userName}}名师馈会圆满结束</a><span>10-25</span></li>
+              <li><a>{{userName}}名师反馈会圆满结束</a><span>10-25</span></li>
+              <li><a>{{userName}}名师网馈会圆满结束</a><span>10-25</span></li>
             </ul>
             </ul>
           </div>
           </div>
         </div>
         </div>
@@ -93,7 +99,7 @@
                   <h3><a title="高考物理考前指导:掌握技巧;科学应考">高考物理考前指导:掌握技...</a></h3>
                   <h3><a title="高考物理考前指导:掌握技巧;科学应考">高考物理考前指导:掌握技...</a></h3>
                   <p class="tip f14 c888 mgt5">高考物理考前指导:掌握技巧;科学应考...</p>
                   <p class="tip f14 c888 mgt5">高考物理考前指导:掌握技巧;科学应考...</p>
                   <p class="peo f14 c888 mgt10">
                   <p class="peo f14 c888 mgt10">
-                    <i>李朝华</i>12-01
+                    <i>{{userName}}</i>12-01
                   </p>
                   </p>
                 </div>
                 </div>
               </div>
               </div>
@@ -192,14 +198,20 @@
   export default {
   export default {
     data() {
     data() {
       return {
       return {
-
+        userName: {},
+        userImg:'',
       }
       }
     },
     },
     methods: {
     methods: {
       viewDetails() {
       viewDetails() {
-        this.$router.push({ path: '/TeacherZone/TeachDetails' })
+        this.$router.push({ path: '/TeacherZone/TeachDetails' });
 
 
       },
       },
+    },
+    mounted() {
+      this.userName = this.$route.query.name;
+      console.log(this.userImg);
+      console.log(this.$route.query);
     }
     }
   }
   }
 </script>
 </script>
@@ -339,26 +351,30 @@
     font-family: Roboto;
     font-family: Roboto;
   }
   }
 
 
-    .statistics_list li {
-      height: 60px;
-      line-height: 60px;
-      padding-left: 55px;
-      border-bottom: 1px dashed #ebebeb;
+  .statistics_li {
+    display: inline-flex;
+    margin-top: 10px;
+    height: 60px;
+    width: 250px;
+    border-bottom: 1px dashed #ebebeb;
+  }
+  .statistics_li  img{
+    height: 40px;
+    width: 40px;
+  }
+  .statistics_li  span{
+    font-size:16px;
+    margin-top:10px;
+    padding-left:20px;
+    width:100px;
+  }
+    .statistics_li p {
       font-size: 16px;
       font-size: 16px;
-      font-style: normal
+      margin-top: 10px;
+      padding-left:30px;
     }
     }
 
 
-      .statistics_list li num {
-        width: 100px;
-        display: inline-block;
-      }
 
 
-      .statistics_list li em {
-        width: 60px;
-        display: inline-block;
-        text-align: right;
-        color: #888888;
-      }
   .content {
   .content {
     width: 40%;
     width: 40%;
     height: 800px;
     height: 800px;

+ 37 - 19
TEAMModelOS.SmartTeach/ClientApp/components/resource/teacherMap.vue

@@ -40,7 +40,7 @@
       </div>
       </div>
       <div class="content-buttom">
       <div class="content-buttom">
 
 
-        <div class="teacher-item" style="cursor: pointer" v-for="item in teacherList" @click="teacherZone">
+        <div class="teacher-item" style="cursor: pointer" v-for="item in teacherList" @click="teacherZone(item)">
           <div class="t-title">
           <div class="t-title">
             <!--<router-link to="/TeacherZone"></router-link>-->
             <!--<router-link to="/TeacherZone"></router-link>-->
             <span>{{item.provice}}</span>
             <span>{{item.provice}}</span>
@@ -178,21 +178,21 @@
         teacherList: [],
         teacherList: [],
         teacher: {
         teacher: {
           datazt: [
           datazt: [
-            { 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/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/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/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/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/people01.jpg'), title: '省级名师', name: '周杨', period: '小学', text1: '成员', number1: '5400', text2: '资源', number2: '2050', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people02.jpg'), title: '省级名师', name: '李俊峰', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2800', text3: '热度', number3: '840' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people04.jpg'), title: '省级名师', name: '王志明', period: '小学', text1: '成员', number1: '5300', text2: '资源', number2: '2700', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people03.jpg'), title: '省级名师', name: '李国强', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1600' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people05.jpg'), title: '省级名师', name: '黄明莉', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1550' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people08.jpg'), title: '省级名师', name: '李章杰', period: '中学', text1: '成员', number1: '5750', text2: '资源', number2: '2070', text3: '热度', number3: '1540' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people06.jpg'), title: '省级名师', name: '周湾明', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1400' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people07.jpg'), title: '省级名师', name: '徐建生', period: '中学', text1: '成员', number1: '7500', text2: '资源', number2: '2070', text3: '热度', number3: '1600' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people09.jpg'), title: '省级名师', name: '王福生', period: '小学', text1: '成员', number1: '1800', text2: '资源', number2: '2000', text3: '热度', number3: '1200' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people10.jpg'), title: '省级名师', name: '张凯伦', period: '小学', text1: '成员', number1: '1600', text2: '资源', number2: '2700', text3: '热度', number3: '1400' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people13.jpg'), title: '省级名师', name: '吴世杰', period: '小学', text1: '成员', number1: '1570', text2: '资源', number2: '2000', text3: '热度', number3: '1580' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people12.jpg'), title: '省级名师', name: '王先森', period: '中学', text1: '成员', number1: '5800', text2: '资源', number2: '2000', text3: '热度', number3: '1900' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '李德华', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2040', text3: '热度', number3: '1590' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people15.jpg'), title: '省级名师', name: '李萌萌', period: '小学', text1: '成员', number1: '7850', text2: '资源', number2: '2050', text3: '热度', number3: '1570' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '省级名师', name: '张梦迪', period: '中学', text1: '成员', number1: '5700', text2: '资源', number2: '2050', text3: '热度', number3: '1900' },
           ],
           ],
           dataxx: [
           dataxx: [
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people04.jpg'), title: '市级名师', name: '范建健', period: '中学', text1: '成员', number1: '1260', text2: '资源', number2: '1000', text3: '热度', number3: '6500' },
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people04.jpg'), title: '市级名师', name: '范建健', period: '中学', text1: '成员', number1: '1260', text2: '资源', number2: '1000', text3: '热度', number3: '6500' },
@@ -210,6 +210,23 @@
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '市级名师', name: '李德华', period: '小学', text1: '成员', number1: '1300', text2: '资源', number2: '2500', text3: '热度', number3: '6500' },
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '市级名师', name: '李德华', period: '小学', text1: '成员', number1: '1300', text2: '资源', number2: '2500', text3: '热度', number3: '6500' },
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people13.jpg'), title: '省级名师', name: '李东方', period: '中学', text1: '成员', number1: '1500', text2: '资源', number2: '2060', text3: '热度', number3: '1500' },
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people13.jpg'), title: '省级名师', name: '李东方', period: '中学', text1: '成员', number1: '1500', text2: '资源', number2: '2060', text3: '热度', number3: '1500' },
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '张浩然', period: '中学', text1: '成员', number1: '1060', text2: '资源', number2: '2800', text3: '热度', number3: '1500' },
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '张浩然', period: '中学', text1: '成员', number1: '1060', text2: '资源', number2: '2800', text3: '热度', number3: '1500' },
+          ],
+          data: [
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people01.jpg'), title: '市级名师', name: '范建健', period: '中学', text1: '成员', number1: '1260', text2: '资源', number2: '1000', text3: '热度', number3: '6500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people03.jpg'), title: '省级名师', name: '李国刚', period: '小学', text1: '成员', number1: '1450', text2: '资源', number2: '2500', text3: '热度', number3: '1800' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people04.jpg'), title: '省级名师', name: '严苏华', period: '小学', text1: '成员', number1: '1560', text2: '资源', number2: '2050', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people02.jpg'), title: '省级名师', name: '乔国锋', period: '小学', text1: '成员', number1: '1980', text2: '资源', number2: '2500', text3: '热度', number3: '100' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people05.jpg'), title: '市级名师', name: '周育俭', period: '中学', text1: '成员', number1: '1200', text2: '资源', number2: '2080', text3: '热度', number3: '500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people06.jpg'), title: '省级名师', name: '张丽丹', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2800', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people07.jpg'), title: '省级名师', name: '赵志田', period: '小学', text1: '成员', number1: '1600', text2: '资源', number2: '2900', text3: '热度', number3: '1600' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people08.jpg'), title: '省级名师', name: '邹守烁', period: '中学', text1: '成员', number1: '1050', text2: '资源', number2: '2200', text3: '热度', number3: '700' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people09.jpg'), title: '省级名师', name: '黄金凤', period: '中学', text1: '成员', number1: '1500', text2: '资源', number2: '1800', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people10.jpg'), title: '省级名师', name: '邹守烁', period: '小学', text1: '成员', number1: '2000', text2: '资源', number2: '2700', text3: '热度', number3: '5500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '市级名师', name: '吴世杰', period: '小学', text1: '成员', number1: '1050', text2: '资源', number2: '2300', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people12.jpg'), title: '省级名师', name: '吴兵', period: '中学', text1: '成员', number1: '1800', text2: '资源', number2: '2020', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '市级名师', name: '李德华', period: '小学', text1: '成员', number1: '1300', text2: '资源', number2: '2500', text3: '热度', number3: '6500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people13.jpg'), title: '省级名师', name: '李东方', period: '中学', text1: '成员', number1: '1500', text2: '资源', number2: '2060', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people15.jpg'), title: '省级名师', name: '张浩然', period: '中学', text1: '成员', number1: '1060', text2: '资源', number2: '2800', text3: '热度', number3: '1500' },
           ]
           ]
           },
           },
       };
       };
@@ -236,13 +253,14 @@
         } else if (data == "xx") {
         } else if (data == "xx") {
           this.teacherList = this.teacher.dataxx
           this.teacherList = this.teacher.dataxx
         } else if (data == "fc") {
         } else if (data == "fc") {
-          this.teacherList = this.teacher.datazt
+          this.teacherList = this.teacher.data
         } else {
         } else {
           this.teacherList = this.teacher.datazt
           this.teacherList = this.teacher.datazt
         }
         }
       },
       },
-      teacherZone() {
-        this.$router.push('/TeacherZone')
+      teacherZone(data) {
+        console.log(data);
+        this.$router.push({ path: '/TeacherZone', query: { name: data.name,img:data.img} });
       },
       },
       choosePro(data) {
       choosePro(data) {
         console.log(data, '5646464');
         console.log(data, '5646464');

+ 3 - 1
TEAMModelOS.SmartTeach/ClientApp/router/routes.js

@@ -22,6 +22,7 @@ import TeacherZone from '@/view/resource/TeacherZone'
 import ZonesHome from '../components/resource/ZonesHome.vue'
 import ZonesHome from '../components/resource/ZonesHome.vue'
 import TeacherWork from '../components/resource/TeacherWork.vue'
 import TeacherWork from '../components/resource/TeacherWork.vue'
 import TeachDetails from '../components/resource/TeachDetails.vue'
 import TeachDetails from '../components/resource/TeachDetails.vue'
+import TeachVideos from '../components/resource/TeacherVideos.vue'
 import TeachSource from '../components/resource/TeachSource.vue'
 import TeachSource from '../components/resource/TeachSource.vue'
 import TeachResearch from '../components/resource/TeachResearch.vue'
 import TeachResearch from '../components/resource/TeachResearch.vue'
 import TeachTopic from '../components/resource/TeachTopic.vue'
 import TeachTopic from '../components/resource/TeachTopic.vue'
@@ -59,7 +60,8 @@ export const routes = [
       { name: 'TeachTopic', path: 'TeachTopic', component: TeachTopic },
       { name: 'TeachTopic', path: 'TeachTopic', component: TeachTopic },
       { name: 'TeachActivies', path: 'TeachActivies', component: TeachActivies },
       { name: 'TeachActivies', path: 'TeachActivies', component: TeachActivies },
       { name: 'TeachClass', path: 'TeachClass', component: TeachClass },
       { name: 'TeachClass', path: 'TeachClass', component: TeachClass },
-      { name: 'TeachTopclass', path: 'TeachTopclass', component: TeachTopclass }
+      { name: 'TeachTopclass', path: 'TeachTopclass', component: TeachTopclass },
+      { name: 'TeachVideos', path: 'TeachVideos', component: TeachVideos }
     ]
     ]
 
 
   },
   },