update

TEAMModelOS.SmartClass/ClientApp/router/routes.js

@@ -77,6 +77,11 @@ export const routes = [
         name: 'lessonDetails',
         path: 'lessonDetails',
         component: resolve => require(['@/view/smart-class/LessonDetails'], resolve), //路由懒加载
+      },
+      {
+        name: 'video',
+        path: 'video',
+        component: resolve => require(['@/view/smart-class/Video'], resolve), //路由懒加载
       }
     ]
   }

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

@@ -24,7 +24,7 @@
   </div>
 </template>
 <script>
-  import  FullCalendar  from 'vue-fullcalendar'
+  import FullCalendar  from 'vue-full-calendar'
   //import 'fullcalendar/dist/fullcalendar.css'
   export default {
     components: {

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

@@ -122,7 +122,7 @@
     color: white;
   }
 
-  .drag > > > .ivu-card-head p span {
+  .drag >>> .ivu-card-head p span {
     color: white;
     font-size: 18px;
   }

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

@@ -50,7 +50,11 @@
                 <TabPane label="月季军" name="月季军"></TabPane>
                 <TabPane label="优课" name="优课"></TabPane>
               </Tabs>
-              <Table :columns="columns1" :data="rewardDatas"></Table>
+              <Table :columns="columns1" :data="rewardDatas">
+                <template slot-scope="{ row, index }" slot="applyName" >
+                  <Icon color="#A8CDF3" size="20" type="logo-youtube" style="cursor:pointer;"/><strong  style="margin-right: 5px;cursor:pointer;" @click="showVideo(index)">{{row.applyName}}</strong>
+                </template>
+              </Table>
             </div>
               <div class="description title-tip">
                 <p class="title">
@@ -80,9 +84,9 @@
   </div>
 </template>
 <script>
-    import attachmentsList from '@/static/attachmentsList.json'
-    import activityInfo from '@/static/activityDetails.json'
-    import rewardList from '@/static/rewardList.json'
+  import attachmentsList from '@/static/attachmentsList.json'
+  import activityInfo from '@/static/activityDetails.json'
+  import rewardList from '@/static/rewardList.json'
   export default {
     components: {
     },
@@ -90,78 +94,79 @@
       return {
         reviewAcList: [],
         attachmentsList: [],
-        rewardSettings:[
-            {
-                "activityId":16,
-                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
-                "applyCount":20,
-                "id":46,
-                "name":"月冠军",
-                "ratio":1,
-                "ratioTip":"5.00%/1人",
-                "sortNumber":1,
-                "type":2
-            },
-            {
-                "activityId":16,
-                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
-                "applyCount":20,
-                "id":47,
-                "name":"月亚军",
-                "ratio":1,
-                "ratioTip":"5.00%/1人",
-                "sortNumber":2,
-                "type":2
-            },
-            {
-                "activityId":16,
-                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
-                "applyCount":20,
-                "id":48,
-                "name":"月季军",
-                "ratio":1,
-                "ratioTip":"5.00%/1人",
-                "sortNumber":3,
-                "type":2
-            },
-            {
-                "activityId":16,
-                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
-                "applyCount":20,
-                "id":49,
-                "name":"优课",
-                "ratio":7,
-                "ratioTip":"35.00%/7人",
-                "sortNumber":4,
-                "type":2
-            }
+        rewardSettings: [
+          {
+            "activityId": 16,
+            "activityName": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+            "applyCount": 20,
+            "id": 46,
+            "name": "月冠军",
+            "ratio": 1,
+            "ratioTip": "5.00%/1人",
+            "sortNumber": 1,
+            "type": 2
+          },
+          {
+            "activityId": 16,
+            "activityName": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+            "applyCount": 20,
+            "id": 47,
+            "name": "月亚军",
+            "ratio": 1,
+            "ratioTip": "5.00%/1人",
+            "sortNumber": 2,
+            "type": 2
+          },
+          {
+            "activityId": 16,
+            "activityName": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+            "applyCount": 20,
+            "id": 48,
+            "name": "月季军",
+            "ratio": 1,
+            "ratioTip": "5.00%/1人",
+            "sortNumber": 3,
+            "type": 2
+          },
+          {
+            "activityId": 16,
+            "activityName": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+            "applyCount": 20,
+            "id": 49,
+            "name": "优课",
+            "ratio": 7,
+            "ratioTip": "35.00%/7人",
+            "sortNumber": 4,
+            "type": 2
+          }
         ],
         activityInfo: {},
         columns1: [
-            {
-                title: '作品名称',
-                key: 'applyName'
-            },
-            {
-                title: '作者',
-                key: 'employeeName'
-            },
-            {
-                title: '学校',
-                key: 'employeeSchoolName'
-            },
-            {
-                title: '年级',
-                key: 'gradeName'
-           },
-            {
-                title: '学科',
-                key: 'categoryName'
-           },
-           {
-                title: '奖项',
-                key: 'activityAwardName'
-            }
+          {
+            title: '作品名称',
+            slot: 'applyName',
+            width: 140
+          },
+          {
+            title: '作者',
+            key: 'employeeName'
+          },
+          {
+            title: '学校',
+            key: 'employeeSchoolName'
+          },
+          {
+            title: '年级',
+            key: 'gradeName'
+          },
+          {
+            title: '学科',
+            key: 'categoryName'
+          },
+          {
+            title: '奖项',
+            key: 'activityAwardName'
+          }
         ],
         rewardDatas: []
       }
@@ -175,6 +180,17 @@
     methods: {
       tabClick(name) {
         this.rewardDatas = name == "获奖作品" ? rewardList.data.list : rewardList.data.list.filter(item => item.activityAwardName == name);
+      },
+      showVideo(index) {
+        //alert(url);
+        this.$router.push(
+          {
+            path: 'video',
+            query: {
+              rewardIndex: index
+            }
+          }
+        );
       }
     },
     mounted() {

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

@@ -0,0 +1,209 @@
+<template>
+  <div class="video-page">
+    <div class="video-title">
+      <h3 class="video-title-h3">12月03日直播</h3>
+    </div>
+    <div class="video-info">
+
+      <div class="video-src">
+        <video controls="controls" width="800" style="display:block;"
+               src="https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190516/acalssOne%E7%BD%91%E9%A1%B5%E7%99%BB%E5%BD%95%E5%AD%A6%E4%B9%A0%E6%96%B9%E6%B3%95.mp4">
+          您的浏览器不支持 video 标签。
+        </video>
+
+      </div>
+
+      <div class="video-detail-info">
+        <Form :label-width="100">
+          <FormItem label="获奖情况：">
+            <span>{{routerData.activityAwardName}}</span>
+          </FormItem>
+          <FormItem label="主讲：">
+            <span>{{routerData.employeeName}}</span>
+          </FormItem>
+          <FormItem label="单位：">
+            <span>{{routerData.employeeSchoolName}}</span>
+          </FormItem>
+          <FormItem label="年级：">
+            <span>{{routerData.gradeName}}</span>
+          </FormItem>
+          <FormItem label="学科：">
+            <span>{{routerData.categoryName}}</span>
+          </FormItem>
+          <FormItem label="教学设计：">
+            <!--<span>{{routerData.activityAwardName}}</span>-->
+          </FormItem>
+          <FormItem label="教学反思：">
+            <!--<span>{{routerData.activityAwardName}}</span>-->
+          </FormItem>
+        </Form>
+        <div class="download-video">
+
+          <a download="video" style="color:#999999;font-size:14px;" href="https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190516/acalssOne%E7%BD%91%E9%A1%B5%E7%99%BB%E5%BD%95%E5%AD%A6%E4%B9%A0%E6%96%B9%E6%B3%95.mp4">
+            <Icon type="md-cloud-download" size="22" color="white" />
+            下载视频
+          </a>
+        </div>
+      </div>
+    </div>
+    <div class="video-other">
+      <h3 class="video-title-h3">推荐作品</h3>
+    </div>
+    <div class="videos-wrap">
+      <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'
+  export default {
+    data() {
+      return {
+        routerData: {},
+        rewardDatas: [],
+        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日直播'
+          }
+        ]
+      }
+    },
+    methods: {
+      showVideo(index) {
+        //alert(index);
+        this.$router.push(
+          {
+            name: 'video',
+            query: {
+              rewardIndex: index
+            }
+          }
+        );
+      }
+    },
+    mounted() {
+      let index = this.$route.query.rewardIndex;
+      //alert(index);
+
+      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];
+        }
+      }
+    }
+  }
+</script>
+<style>
+  .video-page {
+    width: 1200px;
+    margin: 100px auto;
+  }
+
+  .video-title {
+    margin-bottom: 20px;
+    height: 20px;
+  }
+
+    .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;
+  }
+  .video-detail-info {
+    width:400px;
+    background:#222222;
+    display:table-cell;
+    vertical-align:top;
+    padding:20px 10px 20px 30px;
+    position:relative;
+  }
+    .video-detail-info .ivu-form-item {
+      margin-bottom:8px;
+    }
+    .video-detail-info .ivu-form .ivu-form-item-label {
+      font-size:14px;
+      color:#999999;
+    }
+    .video-detail-info .ivu-form-item-content {
+      font-size: 14px;
+      color: #ffffff;
+    }
+  .video-src {
+    display:table-cell;
+    width:800px;
+    background:#000000;
+  }
+  .download-video {
+    text-align:center;
+    position:absolute;
+    width:100%;
+    bottom:20px;
+    left:0;
+  }
+  .video-other {
+    margin-top:20px;
+  }
+  .videos-wrap {
+    margin:0px -10px 0px -10px;
+  }
+  .video-item {
+    width: 25%;
+    display: inline-block;
+    padding: 0px 10px;
+    margin-top:20px;
+    cursor:pointer;
+  }
+
+    .video-item p {
+      font-size: 16px;
+      color: #000;
+      margin-top: 10px;
+      text-decoration: none;
+      text-indent: 8px;
+    }
+</style>

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

@@ -8,86 +8,31 @@
     <div class="item-nav">
       <div class="w1200">
         <ul class="nav-li">
-          <li><a href="/index.php?r=studio/index/index&amp;sid=642" class="stair">首页</a></li>
+          <li><router-link to="/TeacherZone/ZonesHome">首页</router-link></li>
           <li>
-            <a href="index.php?r=studio/resources&amp;sid=642" title="教学资源">教学资源</a>
+            <a  title="教学资源">教学资源</a>
           </li>
           <li>
-            <a href="index.php?r=studio/research/lists&amp;sid=642" title="课题研究">课题研究</a>
+            <a title="课题研究">课题研究</a>
           </li>
           <li>
-            <a href="index.php?r=studio/class/index&amp;sid=642" title="名师课堂">名师课堂</a>
+            <a title="名师课堂">名师课堂</a>
           </li>
           <li>
-            <a href="index.php?r=studio/classevaluation/index&amp;sid=642" title="网上评课">网上评课</a>
+            <a title="网上评课">网上评课</a>
           </li>
           <li>
-            <a href="/index.php?r=studio/activies/list&amp;sid=642&amp;cid=15674" title="教研活动">教研活动</a>
+            <a title="教研活动">教研活动</a>
           </li>
           <li>
-            <a href="index.php?r=studio/topic/index&amp;sid=642" title="话题研讨">话题研讨</a>
+            <a title="话题研讨">话题研讨</a>
           </li>
         </ul>
-
       </div>
     </div>
-    <div  class="content-box w1200">
-      <div class="left-side">
-        <div class="brife">
-          <div class="my-brief ">
-            <div class="brief_header">
-              <em class="fl">工作室简介</em><a href="/index.php?r=studio/intro/index&amp;sid=642" class="more fr"></a>
-            </div>
-            <div class="brief_con ">
-              <div class="peo_info ">
-                <span class="ava">
-                  <img src="../../assets/image/resource/touxiang_01.jpeg" alt="">
-                </span>
-                <div class="info">
-                  <h1 title="李朝华">李朝华</h1>
-                  <p class="sub c555">高中物理</p>
-                </div>
-              </div>
-              <div class="source_info">
-                <ul>
-                  <li><span>322</span><p>成员</p></li>
-                  <li><span>17949</span><p>资源</p></li>
-                  <li><span>253</span><p>文章</p></li>
-                </ul>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="statistics"  style="z-index: 98;">
-          <div class="ms_statistics">
-            <div class=" statistics_header"><p class="fl">统计</p></div>
-            <div class="statistics_con con_box">
-              <ul class="statistics_list">
-                <li class="icon_1 f16">
-                  <i class="num">成员数</i><em class="c888">322</em>
-                </li>
-                <li class="icon_2 f16">
-                  <i class="num">文章数</i><em class="c888">253</em>
-                </li>
-                <li class="icon_3 f16">
-                  <i class="num">资源数</i><em class="c888">17949</em>
-                </li>
-                <li class="icon_4 f16">
-                  <i class="num">课题研究数</i><em class="c888">0</em>
-                </li>
-                <li class="icon_5 f16">
-                  <i class="num">名师课堂数</i><em class="c888">233</em>
-                </li>
-                <li class="icon_6 f16">
-                  <i class="num">教研活动数</i><em class="c888">0</em>
-                </li>
-
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-      </div>
+    <div class="content">
+      <router-view></router-view>
+    </div>
   </div>
 </template>
 <script>
@@ -100,17 +45,21 @@
   }
 </script>
 <style scoped>
-  .zone{
-    width:100%;
+
+  .zone {
+    width: 100%;
   }
+
   .banner {
     height: 340px;
     background: url('../../assets/image/resource/banner-t.jpg') center center no-repeat;
   }
+
   .w1200 {
     width: 1200px;
     margin: 0 auto;
   }
+
   .banner p {
     position: absolute;
     left: 30px;
@@ -118,203 +67,35 @@
     color: #fff;
     font-size: 50px;
   }
+
   .item-nav {
     background: #0099ff;
     height: 60px;
     line-height: 60px;
   }
+
   .nav-li {
     float: left;
     list-style: none;
   }
-  .nav-li li {
-    float: left;
-    position: relative;
-  }
-  .item-nav a {
-    font-size: 16px;
-    line-height: 60px;
-    height: 60px;
-    width: 120px;
-    display: block;
-    text-align: center;
-    color:#fff;
-  }
 
-  .left-side {
-    width: 280px;
-
-  }
-  .brife {
-    border: 2px solid #e0e0e0;
-    margin-top: 20px;
-  }
-  .my-brief {
-    padding: 15px 17px;
-    background: #fff;
-  }
-
-  .brief_header {
-    height: 40px;
-    line-height: 40px;
-    border-bottom: 1px solid #ebebeb;
-    padding-bottom: 1px;
-    overflow: hidden;
-  }
-    .brief_header em {
-      font-size: 20px;
-      color: #222;
-      border-bottom: 2px solid #86c8ff;
-      padding: 0 5px;
-    }
-    .brief_header.more {
-      width: 20px;
-      height: 20px;
-      display: inline-block;
-      margin-top: 10px;
-    }
-  .peo_info {
-    display: block;
-  
-  }
-    .peo_info .ava {
-      margin-top: 27px;
+    .nav-li li {
+      float: left;
       position: relative;
-      margin-right: 15px;
-      margin-left: 20px;
     }
- .peo_info .ava img {
-    height: 90px;
-    width: 90px;
-    border-radius: 50%;
-    margin-top:10%;
-  }
-  .info {
-    margin-top: -30%;
-    /* display: block; */
-    margin-left: 56%;
-  }
- .info h1 {
-        color: #222;
-        font-size: 24px;
-      }
-  .info p {
-    color: #555;
-    font-size: 15px;
-    margin-top: 8px;
-  }
-  .source_info {
-    margin-top: 30px;
-  }
-  .source_info li {
-    text-align: center;
-    background: url('../../assets/image/resource/right.png') right center no-repeat;
-    width: 75px;
-    list-style:none;
-    display:inline-block;
-  }
 
-  .source_info span {
-    color: #4b4b4b;
-    font-size: 24px;
-    display: block;
-  }
- .source_info p {
-    color: #9b9b9b;
-    font-size: 14px;
-    display: block;
-    margin-top: 5px;
-  }
-  .statistics {
-    border: 1px solid #e0e0e0;
-    padding: 15px 17px;
-    background: #fff;
-    margin-top: 20px;
-  }
-  .statistics_header {
-    height: 40px;
-    line-height: 40px;
-    border-bottom: 1px solid #ebebeb;
-    padding-bottom: 1px;
-    overflow: hidden;
-  }
-    .statistics_header p {
-      font-size: 20px;
-      color: #222;
-      border-bottom: 2px solid #86c8ff;
-      padding: 0 5px;
-      font-style: normal
-    }
-  .statistics_list {
-    padding-bottom: 27px;
-    height: 560px;
-    list-style:none;
-  }
-  .icon_1 {
-    background-position: left 18px;
-    height: 60px;
-    line-height: 60px;
-    /*background: url(../../images/teacherSky_4.0/tj_icon.png) left 18px no-repeat;*/
-    padding-left: 55px;
-    border-bottom: 1px dashed #ebebeb;
-    font-size: 16px;
- 
-  }
-  .statistics_list li num {
-    width: 100px;
-    display: inline-block;
-    font-style: normal;
-  }
-  .statistics_list li em {
-    width: 60px;
-    display: inline-block;
-    text-align: right;
-    color: #888888;
-    font-style: normal;
-  }
-  .icon_2 {
-    background-position: left 18px;
-    height: 60px;
-    line-height: 60px;
-    /*background: url(../../images/teacherSky_4.0/tj_icon.png) left 18px no-repeat;*/
-    padding-left: 55px;
-    border-bottom: 1px dashed #ebebeb;
-    font-size: 16px;
-  }
-  .icon_3 {
-    background-position: left 18px;
-    height: 60px;
-    line-height: 60px;
-    /*background: url(../../images/teacherSky_4.0/tj_icon.png) left 18px no-repeat;*/
-    padding-left: 55px;
-    border-bottom: 1px dashed #ebebeb;
+  .item-nav a {
     font-size: 16px;
-  }
-  .icon_4 {
-    background-position: left 18px;
-    height: 60px;
     line-height: 60px;
-    /*background: url(../../images/teacherSky_4.0/tj_icon.png) left 18px no-repeat;*/
-    padding-left: 55px;
-    border-bottom: 1px dashed #ebebeb;
-    font-size: 16px;
-  }
-  .icon_5 {
-    background-position: left 18px;
     height: 60px;
-    line-height: 60px;
-    /*background: url(../../images/teacherSky_4.0/tj_icon.png) left 18px no-repeat;*/
-    padding-left: 55px;
-    border-bottom: 1px dashed #ebebeb;
-    font-size: 16px;
+    width: 120px;
+    display: block;
+    text-align: center;
+    color: #fff;
   }
-  .icon_6{
-    background-position: left 18px;
-    height: 60px;
-    line-height: 60px;
-    /*background: url(../../images/teacherSky_4.0/tj_icon.png) left 18px no-repeat;*/
-    padding-left: 55px;
-    border-bottom: 1px dashed #ebebeb;
-    font-size: 16px;
+  .content{
+    width:100%;
+    min-height:1000px;
+    background-color:#f9f9f9;
   }
 </style>

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

@@ -0,0 +1,654 @@
+<template>
+  <div class="zone">
+      <div class="left-side">
+        <div class="brife">
+          <div class="my-brief ">
+            <div class="brief_header">
+              <em class="fl">工作室简介</em><a class="more fr"></a>
+            </div>
+            <div class="brief_con ">
+              <div class="peo_info ">
+                <span class="ava">
+                  <img src="../../assets/image/resource/touxiang_01.jpeg" alt="">
+                </span>
+                <div class="info">
+                  <h1 title="李朝华">李朝华</h1>
+                  <p class="sub c555">高中物理</p>
+                </div>
+              </div>
+              <div class="source_info">
+                <ul>
+                  <li><span>322</span><p>成员</p></li>
+                  <li><span>17949</span><p>资源</p></li>
+                  <li><span>253</span><p>文章</p></li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="statistics" style="z-index: 98;">
+          <div class="ms_statistics">
+            <div class=" statistics_header"><p class="fl">统计</p></div>
+            <div class="statistics_con con_box">
+              <ul class="statistics_list">
+                <li class="icon_1 ">
+                  <i class="num">成员数</i><em class="c888">322</em>
+                </li>
+                <li class="icon_2 ">
+                  <i class="num">文章数</i><em class="c888">253</em>
+                </li>
+                <li class="icon_3 ">
+                  <i class="num">资源数</i><em class="c888">17949</em>
+                </li>
+                <li class="icon_4 ">
+                  <i class="num">课题研究数</i><em class="c888">0</em>
+                </li>
+                <li class="icon_5 ">
+                  <i class="num">名师课堂数</i><em class="c888">233</em>
+                </li>
+                <li class="icon_6 ">
+                  <i class="num">教研活动数</i><em class="c888">0</em>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+    </div>
+      <div class="content">
+        <div class="top-part">
+          <div class="info-msg">
+            <p>工作室资讯</p><a></a><hr>
+            <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>陈伟名师网络工作室教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a>陈伟名师网络工作室活动暨职业教会圆满结束</a><span>10-25</span></li>
+              <li><a>陈伟名师网络教育教材反馈会圆满结束</a><span>10-25</span></li>
+            </ul>
+          </div>
+          <div class="notice">
+            <p>公告</p><a></a><hr />
+            <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>
+            </ul>
+          </div>
+        </div>
+        <div class="content-show">
+          <p><u>成果展示</u></p><a></a>
+        </div>
+        <div class="content-teach ">
+          <div class="ms_article bor_bg_pd">
+            <div class="header article_header"><em class="fl"><i>教师文章</i></em><a class="more fr"></a></div>
+            <div class="article_con clearfix">
+              <div class="theme_det clearfix">
+                <a href="javascript:;" title="高考物理考前指导：掌握技巧；科学应考"><img src="http://static.sinweiwx.com/tianyu_edu/common/images/teacherSky_4.0/teacher_img.jpg"></a>
+                <div class="theme_info ">
+                  <h3><a title="高考物理考前指导：掌握技巧；科学应考">高考物理考前指导：掌握技...</a></h3>
+                  <p class="tip f14 c888 mgt5">高考物理考前指导：掌握技巧；科学应考...</p>
+                  <p class="peo f14 c888 mgt10">
+                    <i>李朝华</i>12-01
+                  </p>
+                </div>
+              </div>
+              <ul class="item_list">
+                <li class="c888">
+                  <strong class="fr">
+                    9
+                  </strong>
+                  <a class="tit " title="高考前最后一根救命稻草! 文综/理综想提分? 此文绝不能错过！">
+                    励志鸡汤
+                  </a>
+                  <a class="tit_sour" title="高考前最后一根救命稻草! 文综/理综想提分? 此文绝不能错过！">
+                    高考前最后一根救命...
+                  </a><i>李朝华</i>
+                  11-02
+                </li>
+                <li class="c888">
+                  <strong class="fr">
+                    6
+                  </strong>
+                  <a class="tit " title="高中物理高效课堂应重视培养学生的创新意识">
+                    默认栏目
+                  </a>
+                  <a class="tit_sour" title="高中物理高效课堂应重视培养学生的创新意识">
+                    高中物理高效课堂应...
+                  </a><i>郑万国</i>
+                  07-24
+                </li>
+                <li class="c888">
+                  <strong class="fr">
+                    3
+                  </strong>
+                  <a class="tit " title="高中物理高效课堂应重视培养学生的创新意识">
+                    教研教改
+                  </a>
+                  <a class="tit_sour" title="高中物理高效课堂应重视培养学生的创新意识">
+                    高中物理高效课堂应...
+                  </a><i>郑万国</i>
+                  07-24
+                </li>
+                <li class="c888">
+                  <strong class="fr">
+                    5
+                  </strong>
+                  <a class="tit " title="浅谈高中物理教学中的情趣教学">
+                    教研教改
+                  </a>
+
+                  <a class="tit_sour" title="浅谈高中物理教学中的情趣教学">
+                    浅谈高中物理教学中...
+                  </a><i>郑万国</i>
+                  07-24
+                </li>
+                <li class="c888">
+                  <strong class="fr">
+                    4
+                  </strong>
+                  <a class="tit " title="优化高中物理课堂教学的原则与方法">
+                    默认栏目
+                  </a>
+                  <a class="tit_sour" title="优化高中物理课堂教学的原则与方法">
+                    优化高中物理课堂教...
+                  </a><i>陈永荣</i>
+                  07-04
+                </li>
+
+
+              </ul>
+
+            </div>
+          </div>
+          <div class="ms_res bor_bg_pd">
+            <div class="header res_header"><em class="fl"><i>教学资源</i></em><a class="more fr"></a></div>
+            <div class="res_con">
+              <div class="source_det clearfix">
+                <img src="http://static.sinweiwx.com/tianyu_edu/common/images/teacherSky_4.0/source_img.jpg">
+                <div class="source_info ">
+                  <h3><a href="/index.php?r=studio/resources/info&amp;sid=642&amp;resId=476990_MShunan">16-17版 第2部分 专题1 力...</a></h3>
+                </div>
+              </div>
+              <ul class=" source_list">
+                <li class="icon_1 ppt"><strong class="fr"></strong><a class="tit_sour">16-17版 第1部分 专题16 ...</a><i></i>12-20</li>
+                <li class="icon_1 ppt"><strong class="fr"></strong><a class="tit_sour">16-17版 第1部分 专题16 ...</a><i></i>12-20</li>
+                <li class="icon_1 ppt"><strong class="fr"></strong><a class="tit_sour">16-17版 第1部分 专题16 ...</a><i></i>12-20</li>
+                <li class="icon_1 ppt"><strong class="fr"></strong><a class="tit_sour">16-17版 第1部分 专题16 ...</a><i></i>12-20</li>
+                <li class="icon_1 ppt"><strong class="fr"></strong><a class="tit_sour">16-17版 第1部分 专题16 ...</a><i></i>12-20</li>
+              </ul>
+            </div>
+          </div>
+        </div>
+      </div>
+  </div>
+
+</template>
+<script>
+  export default {
+    data() {
+      return {
+
+      }
+    }
+  }
+</script>
+<style scoped>
+
+  .zone {
+    width: 100%;
+  }
+  .content-box{
+  }
+  .left-side {
+    width: 280px;
+    float: left;
+    margin-left: 22%;
+  }
+
+  .brife {
+    border: 2px solid #e0e0e0;
+    margin-top: 20px;
+  }
+
+  .my-brief {
+    padding: 15px 17px;
+    background: #fff;
+  }
+
+  .brief_header {
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ebebeb;
+    padding-bottom: 1px;
+    font-size: 15px;
+    overflow: hidden;
+  }
+
+    .brief_header em {
+      font-size: 20px;
+      color: #222;
+      border-bottom: 2px solid #86c8ff;
+      padding: 0 5px;
+      font-weight: 900;
+    }
+
+    .brief_header a {
+      width: 20px;
+      height: 20px;
+      display: inline-block;
+      background: url(../../assets/image/resource/more.png) center center no-repeat;
+      margin-top: 10px;
+    }
+
+  .peo_info {
+    display: block;
+  }
+
+    .peo_info .ava {
+      margin-top: 27px;
+      position: relative;
+      margin-right: 15px;
+      margin-left: 20px;
+    }
+
+      .peo_info .ava img {
+        height: 90px;
+        width: 90px;
+        border-radius: 50%;
+        margin-top: 10%;
+      }
+
+  .info {
+    margin-top: -30%;
+    margin-left: 56%;
+  }
+
+    .info h1 {
+      color: #222;
+      font-size: 24px;
+    }
+
+    .info p {
+      color: #555;
+      font-size: 15px;
+      margin-top: 8px;
+      
+    }
+
+  .source_info {
+    margin-top: 30px;
+  }
+
+    .source_info li {
+      text-align: center;
+      width: 75px;
+      list-style: none;
+      display: inline-block;
+    }
+
+    .source_info span {
+      color: #4b4b4b;
+      font-size: 24px;
+      display: block;
+    }
+
+    .source_info p {
+      color: #9b9b9b;
+      font-size: 14px;
+      display: block;
+      margin-top: 5px;
+    }
+
+  .statistics {
+    border: 1px solid #e0e0e0;
+    padding: 15px 17px;
+    background: #fff;
+    margin-top: 20px;
+  }
+
+  .statistics_header {
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ebebeb;
+    padding-bottom: 1px;
+    overflow: hidden;
+  }
+
+    .statistics_header p {
+      font-size: 20px;
+      color: #222;
+      border-bottom: 2px solid #86c8ff;
+      padding: 0 5px;
+    }
+
+  .statistics_list {
+    padding-bottom: 27px;
+    height: 560px;
+    list-style: none;
+    font-family: Roboto;
+  }
+
+    .statistics_list li {
+      height: 60px;
+      line-height: 60px;
+      padding-left: 55px;
+      border-bottom: 1px dashed #ebebeb;
+      font-size: 16px;
+      font-style: normal
+    }
+
+      .statistics_list li num {
+        width: 100px;
+        display: inline-block;
+      }
+
+      .statistics_list li em {
+        width: 60px;
+        display: inline-block;
+        text-align: right;
+        color: #888888;
+      }
+  .content {
+    width: 40%;
+    height: 800px;
+    margin-left: 2%;
+    margin-top: 1%;
+    float: left;
+  }
+  .top-part {
+    width: 100%;
+    height: 300px;
+    float: left;
+    display: flex;
+    background-color: #ffffff;
+    border: 1px solid #e0e0e0;
+  }
+  .info-msg{
+    width:60%;
+
+  }
+    .info-msg p {
+      font-size: 20px;
+      margin-top: 5px;
+      font-weight: 800;
+      margin-left:5px;
+    }
+    .info-msg ul{
+      list-style:none;
+      margin-top:10px;
+      margin-left:5px;
+    }
+    .info-msg li{
+      font-size:14px;
+      margin-top:5px;
+    }
+      .info-msg li a {
+        color: #4b4b4b;
+        font-family: 'Adobe Caslon Pro';
+      }
+    .info-msg li a:hover {
+      color:cornflowerblue;
+      text-decoration:underline;
+    }
+    .info-msg span{
+      float:right;
+    }
+  .notice{
+    width:35%;
+    display:inline;
+    margin-left:25px;
+  }
+    .notice p {
+      font-size: 20px;
+      margin-top: 5px;
+      font-weight:800;
+    }
+        .content-show a {
+      width: 20px;
+      height: 20px;
+      margin-left:81%;
+      display: inline-block;
+      background: url(../../assets/image/resource/more.png) center center no-repeat;
+      margin-top: 10px;
+    }
+    .notice ul {
+      list-style: none;
+      margin-top: 10px;
+      margin-left: 5px;
+    }
+
+    .notice li {
+      font-size: 14px;
+      margin-top: 15px;
+    }
+
+      .notice li a {
+        color: #4b4b4b;
+        font-family:'Adobe Caslon Pro';
+      }
+
+        .notice li a:hover {
+          color: cornflowerblue;
+          text-decoration: underline;
+        }
+
+    .notice span {
+      float: right;
+    }
+  .content-show {
+    width: 100%;
+    height: 200px;
+    margin-top:10px;
+    float: left;
+    display: flex;
+    background-color: #ffffff;
+    border: 1px solid #e0e0e0;
+  }
+    .content-show p {
+      font-size: 20px;
+      margin-top: 15px;
+      font-weight: 800;
+      margin-left: 15px;
+    }
+    .content-show p:hover {
+      color:cornflowerblue;
+    }
+    .content-show a {
+      width: 20px;
+      height: 20px;
+      margin-left:81%;
+      display: inline-block;
+      background: url(../../assets/image/resource/more.png) center center no-repeat;
+      margin-top: 10px;
+    }
+  .ms_article {
+    width: 405px;
+    height: 369px;
+    float: left;
+    border: 1px solid #e0e0e0;
+    padding: 15px 17px;
+    background: #fff;
+    margin-top: 20px;
+  }
+    .ms_article.header {
+      height: 40px;
+      line-height: 40px;
+      border-bottom: 1px solid #ebebeb;
+      padding-bottom: 1px;
+      overflow: hidden;
+    }
+      .ms_article .header em {
+        font-size: 20px;
+        color: #222;
+        border-bottom: 2px solid #86c8ff;
+        padding: 0 5px;
+        float: left;
+      }
+      .ms_article .header a.more {
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        background: url(../../assets/image/resource/more.png) center center no-repeat;
+      }
+  .theme_det {
+    padding-top: 12px;
+  }
+    .theme_det a {
+      text-decoration: none;
+      color: #288add;
+    }
+    .theme_det img {
+      float: left;
+      width: 150px;
+      height: 100px;
+      margin-left: -88px;
+      margin-top: 31px;
+      border: 1px solid #fff;
+    }
+  .theme_info {
+    margin-left: 14px;
+    margin-top: 35px;
+  }
+  .theme_info h3 a {
+    font-size: 16px;
+    color: #555;
+    font-weight: normal;
+  }  .theme_info h3 a:hover {
+
+    color: red;
+
+  }
+    .theme_info h3 {
+      color: #3d95d5;
+    }
+   
+  .c888 {
+    color: #888888;
+  }
+  .fr {
+    float: right;
+  }
+  .mgt5 {
+    margin-top: 5px;
+  }
+  .f14 {
+    font-size: 14px;
+  }
+  .theme_info .peo i {
+    color: #656565;
+    width: 78px;
+    display: inline-block;
+  }
+  .item_list {
+    padding-top: 23px;
+    list-style: none;
+  }
+    .item_list li {
+      height: 37px;
+      line-height: 37px;
+      font-size: 14px;
+    }
+      .item_list li strong {
+        font-size: 14px;
+        color: #888;
+        font-weight: normal;
+      }
+      .item_list li a.tit {
+        background: #53b5f6;
+        color: #fff;
+        padding: 0 3px;
+        margin-right: 7px;
+        width: 84px;
+        display: inline-block;
+        height: 20px;
+        line-height: 20px;
+      }
+      .item_list li a.tit_sour {
+        font-size: 14px;
+        color: #555;
+        width: 150px;
+        display: inline-block;
+        line-height: 16px;
+        vertical-align: middle;
+      }
+      .item_list li i {
+        width: 60px;
+        display: inline-block;
+        color: #656565;
+      }
+  .content-teach {
+    display: inline-flex;
+  }
+  .ms_res {
+    width: 350px;
+    height: 369px;
+    margin-left: 8px;
+    border: 1px solid #e0e0e0;
+    background: #fff;
+    margin-top: 20px;
+  }
+    .ms_res .header {
+      height: 40px;
+      line-height: 40px;
+      border-bottom: 1px solid #ebebeb;
+      padding-bottom: 1px;
+      overflow: hidden;
+    }
+      .ms_res .header em {
+        font-size: 20px;
+        color: #222;
+        border-bottom: 2px solid #86c8ff;
+        padding: 0 5px;
+      }
+    .ms_res a.more {
+      width: 20px;
+      height: 20px;
+      display: inline-block;
+      background: url(../../assets/image/resource/more.png) center center no-repeat;
+      margin-top: 10px;  
+    }
+  .source_det img {
+    float: left;
+    width: 150px;
+    height: 100px;
+    border: 1px solid #fff;
+    margin-left: 10px;
+    margin-top: 5px;
+  }
+  .source_det h3 a {
+    font-size: 16px;
+    color: #555;
+    font-weight: normal;
+  }
+
+  .source_list {
+    margin-top: 70px;
+  }
+
+    .source_list li {
+      height: 37px;
+      line-height: 37px;
+      font-size: 14px;
+      list-style: none;
+    }
+
+    .source_list li strong {
+      font-size: 14px;
+      color: #888;
+      font-weight: normal;
+    }
+
+  .source_list li a.tit_sour {
+    font-size: 14px;
+    color: #555;
+    width: 300px;
+    display: inline-block;
+    line-height: 16px;
+    vertical-align: middle;
+  }
+</style>

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

@@ -285,7 +285,7 @@
                 borderColor: '#81ADDC'
               },
               emphasis: {
-                areaColor: 'lightgreen'
+                areaColor: '#008DFF'
               }
             }
           },

TEAMModelOS.SmartTeach/ClientApp/view/zone/index.vue

@@ -1,34 +0,0 @@
-<style>
-</style>
-<template>
-  <div id="app">
-    <div class="header">
-555
-    </div>
-    <div class="left">
-
-    </div>
-    <div class="main">
-
-    </div>
-    <div class="footer">
-
-    </div>
-
-  </div>
-</template>
-<script>
-
-  export default {
-
-    data() {
-      return {
-
-      }
-    },
-      mounted() {
-
-      }
-    }
-</script>
-