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

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

@@ -6,11 +6,27 @@
     <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>
-
+        <!--<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>-->
+        <video-player class="video-player-box" style="width:800px;"
+                      ref="videoPlayer"
+                      :options="playerOptions"
+                      :playsinline="true"
+                      customEventName="customstatechangedeventname"
+                      @play="onPlayerPlay($event)"
+                      @pause="onPlayerPause($event)"
+                      @ended="onPlayerEnded($event)"
+                      @waiting="onPlayerWaiting($event)"
+                      @playing="onPlayerPlaying($event)"
+                      @loadeddata="onPlayerLoadeddata($event)"
+                      @timeupdate="onPlayerTimeupdate($event)"
+                      @canplay="onPlayerCanplay($event)"
+                      @canplaythrough="onPlayerCanplaythrough($event)"
+                      @statechanged="playerStateChanged($event)"
+                      @ready="playerReadied">
+        </video-player>
       </div>
 
       <div class="video-detail-info">
@@ -31,15 +47,15 @@
             <span>{{routerData.categoryName}}</span>
           </FormItem>
           <FormItem label="教学设计：">
-            <!--<span>{{routerData.activityAwardName}}</span>-->
+            <span>暂无数据</span>
           </FormItem>
           <FormItem label="教学反思：">
-            <!--<span>{{routerData.activityAwardName}}</span>-->
+            <span>暂无数据</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">
+          <a download="video" style="color:#999999;font-size:14px;" href="https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190517/%E5%B0%8F%E5%AD%A6%E8%8B%B1%E8%AF%AD301%E8%83%A1%E9%A2%96--2019.mp4">
             <Icon type="md-cloud-download" size="22" color="white" />
             下载视频
           </a>
@@ -62,6 +78,19 @@
   export default {
     data() {
       return {
+        playerOptions: {
+          // videojs options
+          muted: true,
+          language: 'en',
+          preload: 'auto',
+          playbackRates: [0.7, 1.0, 1.5, 2.0],
+          sources: [{
+            type: "video/mp4",
+            src: "https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190517/%E5%B0%8F%E5%AD%A6%E8%8B%B1%E8%AF%AD301%E8%83%A1%E9%A2%96--2019.mp4"
+            //src: "https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190517/%E5%B0%8F%E5%AD%A6%E8%8B%B1%E8%AF%AD301%E8%83%A1%E9%A2%96--20180419.MP4"
+          }],
+          poster: "/static/images/author.jpg",
+        },
         routerData: {},
         rewardDatas: [],
         videos: [
@@ -178,6 +207,10 @@
     width:800px;
     background:#000000;
   }
+    .video-src .video-js {
+      width:800px;
+      height:450px;
+    }
   .download-video {
     text-align:center;
     position:absolute;

TEAMModelOS.SmartClass/TEAMModelOS.SmartClass.csproj

@@ -6,12 +6,16 @@
   <ItemGroup>
     <Compile Remove="ClientApp\components\新文件夹1\**" />
     <Compile Remove="Providers\**" />
+    <Compile Remove="wwwroot\dist\**" />
     <Content Remove="ClientApp\components\新文件夹1\**" />
     <Content Remove="Providers\**" />
+    <Content Remove="wwwroot\dist\**" />
     <EmbeddedResource Remove="ClientApp\components\新文件夹1\**" />
     <EmbeddedResource Remove="Providers\**" />
+    <EmbeddedResource Remove="wwwroot\dist\**" />
     <None Remove="ClientApp\components\新文件夹1\**" />
     <None Remove="Providers\**" />
+    <None Remove="wwwroot\dist\**" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
@@ -29,7 +33,6 @@
     <Folder Include="JsonFile\Core\" />
     <Folder Include="Models\" />
     <Folder Include="wwwroot\" />
-    <Folder Include="wwwroot\dist\" />
   </ItemGroup>
 
 

TEAMModelOS.SmartTeach/ClientApp/common/footer.vue

@@ -3,10 +3,10 @@
     <div class="w1200 clearfix">
       <div class="fl">
         <div class="copyright">
-          Copyright© 2017 huijiaoyun.com.   All rights reserved&nbsp;&nbsp;技术运营支持：<a href="http://www.huijiaoyun.com/" class="linkc" target="_blank">成都益教信息技术有限公司</a>            <br>   <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=42018502000485" class="c555"></a>&nbsp;&nbsp;&nbsp;
+          Copyright© 2018 yijiao.com.   All rights reserved&nbsp;&nbsp;技术运营支持：<a href="http://www.huijiaoyun.com/" class="linkc" target="_blank">成都益教信息技术有限公司</a>            <br>   <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=42018502000485" class="c555"></a>&nbsp;&nbsp;&nbsp;
         </div>
         <div class="hotline">
-          <span>客户服务热线：4001801818</span>
+          <span>客户服务热线：028-86654303</span>
           <a class="icon01" target="_blank" href="http://weibo.com/p/1006065506433983"></a>
           <a class="icon02" href="#">
           </a>
@@ -15,38 +15,8 @@
       </div>
       <div class="fr">
         <div class="bot-nav clearfix">
-          <dl>
-            <dt>关于我们</dt>
-            <dd><a target="_blank" href="">公司简介</a></dd>
-            <dd><a target="_blank" href="">业务定位</a></dd>
-            <dd><a target="_blank" href="">资质证书</a></dd>
-            <dd><a target="_blank" href="">成果案例</a></dd>
-          </dl>
-          <dl>
-            <dt>开放平台</dt>
-            <dd><a target="_blank" href="">开发者首页</a></dd>
-            <dd><a target="_blank" href="">开发者注册</a></dd>
-            <dd><a target="_blank" href="">开发者文档</a></dd>
-            <dd><a target="_blank" href="">开发者协议</a></dd>
-          </dl>
-          <dl>
-            <dt>帮助反馈</dt>
-            <dd><a href="" target="_blank">在线客服</a></dd>
-            <dd><a href="">问题反馈</a></dd>
-            <dd><a href="">帮助中心</a></dd>
-          </dl>
-          <dl>
-            <dt>服务支持</dt>
-            <dd><a href="">服务条款</a></dd>
-            <dd><a href="">运营支持</a></dd>
-            <dd><a target="_blank" href="">应用监控</a></dd>
-            <dd><a target="_blank" href="">后台管理</a></dd>
-          </dl>
           <dl>
             <dt>联系我们</dt>
-            <dd><a href="">服务网点</a></dd>
-            <dd><a href="">商务合作</a></dd>
-            <dd><a href="">证书查询</a></dd>
           </dl>
         </div>
       </div>

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

@@ -28,19 +28,19 @@
           <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>
             <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 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>
             <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 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>
             <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 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>
         </ul>
@@ -98,7 +98,7 @@
                 <img src="../../assets/image/resource/touxiang_04.jpg">
                 <p class="t_c f14 c222 mgt5">陈彬</p>
                 <p class="t_c f12 c888">英语</p>
-                <p class="t_c f14" title="">杭州经济技术...</p>
+                <p class="t_c f14" title="">成都师范银都紫藤小学</p>
               </a>
             </li>
             <li>
@@ -1215,7 +1215,7 @@
   }
     .joiner li a {
       width: 147px;
-      height: 165px;
+      height: 180px;
       border-radius: 10px;
       position: relative;
       display: block;

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

@@ -34,8 +34,7 @@
             </li>
           </ul>
           <div class="cite">
-            <link rel="stylesheet" href="http://css.huijiaoyun.com/tianyu_edu/html_other_edu/player/css/player.css">
-            <iframe src="http://res.huijiaoyun.com:22021//data9/transform/2019/1/14/21/56/8b188019f7f1406694fbd52154840654/28870b8a84e5b7fe607419a194d09699.doc/html4/transform.html" style="width:780px;min-height:480px;margin-bottom: 0px; border: 1px solid #CFCFCF; padding: 0 0;"></iframe>
+           <Essay></Essay>
           </div>
           <div class="m-tag pdb30 learfix">
             <p class="z_tit1 pdr10">总体印象</p>
@@ -47,10 +46,10 @@
             <h3 class="c222">相关资源推荐</h3>
             <dl>
               <dt class="clearfix">
-                <img src="http://css.huijiaoyun.com/tianyu_edu/common/images/resource_icon/file.png" class="imgbox_img">
+                <img src="../../assets/image/resource/doc.png" class="imgbox_img">
                 <p class="sub_title w160">
-                  <a href="goResDetailInfo.html?productCode=PD0001448259" title="&quot;福建省清流县2013年初中历史毕业生学业质量检测试题（扫描版">
-                    "福建省清流县2013年初中历史毕业生学业...
+                  <a href="goResDetailInfo.html?productCode=PD0001448259" title="&quot;四川省成都市2017年初中历史毕业生学业质量检测试题（扫描版">
+                    "四川清成都市2017年初中历史毕业生学业...
                   </a>
                 </p>
               </dt>
@@ -64,10 +63,10 @@
             </dl>
             <dl>
               <dt class="clearfix">
-                <img src="http://css.huijiaoyun.com/tianyu_edu/common/images/resource_icon/doc.png">
+                <img src="../../assets/image/resource/doc.png">
                 <p class="sub_title w160">
-                  <a href="goResDetailInfo.html?productCode=PD3546983" title="湖北省武汉市2016年中考物理模拟题.doc">
-                    湖北省武汉市2016年中考物理模拟题.do...
+                  <a href="goResDetailInfo.html?productCode=PD3546983" title="四川省成都市2016年中考物理模拟题.doc">
+                    四川省成都市2016年中考物理模拟题.do...
                   </a>
                 </p>
               </dt>
@@ -81,10 +80,10 @@
             </dl>
             <dl>
               <dt class="clearfix">
-                <img src="http://css.huijiaoyun.com/tianyu_edu/common/images/resource_icon/doc.png">
+                <img src="../../assets/image/resource/doc.png">
                 <p class="sub_title w160">
-                  <a href="goResDetailInfo.html?productCode=PD3546981" title="湖北省武汉市2016年中考数学模拟题.doc">
-                    湖北省武汉市2016年中考数学模拟题.do...
+                  <a href="goResDetailInfo.html?productCode=PD3546981" title="四川省成都市2016年中考数学模拟题.doc">
+                    四川省成都市2016年中考数学模拟题.do...
                   </a>
                 </p>
               </dt>
@@ -98,10 +97,10 @@
             </dl>
             <dl>
               <dt class="clearfix">
-                <img src="http://css.huijiaoyun.com/tianyu_edu/common/images/resource_icon/doc.png">
+                <img src="../../assets/image/resource/doc.png">
                 <p class="sub_title w160">
-                  <a href="goResDetailInfo.html?productCode=PD662316472852283392" title="2017年湖北省武汉市中考语文试卷.doc">
-                    2017年湖北省武汉市中考语文试卷.doc...
+                  <a href="goResDetailInfo.html?productCode=PD662316472852283392" title="2017年四川省成都市中考语文试卷.doc">
+                    2017年四川省成都市中考语文试卷.doc...
                   </a>
                 </p>
               </dt>
@@ -115,10 +114,10 @@
             </dl>
             <dl>
               <dt class="clearfix">
-                <img src="http://css.huijiaoyun.com/tianyu_edu/common/images/resource_icon/doc.png">
+                <img src="../../assets/image/resource/doc.png">
                 <p class="sub_title w160">
-                  <a href="goResDetailInfo.html?productCode=PD662319984843685888" title="2017年湖北省武汉市中考化学试卷.doc">
-                    2017年湖北省武汉市中考化学试卷.doc...
+                  <a href="goResDetailInfo.html?productCode=PD662319984843685888" title="2017年四川省成都市中考化学试卷.doc">
+                    2017年四川省成都市中考化学试卷.doc...
                   </a>
                 </p>
               </dt>
@@ -137,7 +136,12 @@
   </div>
 </template>
 <script>
-
+  import Essay from '@/components/yinyong'
+  export default {
+    components: {
+      Essay
+    }
+  }
 </script>
 <style scoped>
   .details_index_box {
@@ -430,4 +434,9 @@
     float: left;
     font-style: normal;
   }
+  .cite {
+    height:550px;
+    overflow:auto;
+    border:1px solid #e3e3e3;
+  }
 </style>

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

@@ -55,12 +55,7 @@
         ]
       };
     },
-   methods:{
-      init(){
-
-      }
-
-   }
+   
   }
 </script>
 <style scoped>

TEAMModelOS.SmartTeach/ClientApp/router/routes.js

@@ -31,6 +31,7 @@ import TeachTopclass from '../components/resource/TeachTopclass.vue'
 import text from '../components/resource/text.vue'
 export const routes = [  
   { name: 'index', path: '/', redirect: "/HomePage", component: Index },
+  { name: 'resource', path: '/resource', component: Index },
   { name: 'indexarea', path: '/arearesource', component: Indexarea },
   { name: 'Indexschool', path: '/schoolresource', component: Indexschool },
   { name: 'synch', path: '/synch', component: Synch },

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

@@ -78,7 +78,7 @@
     },
     methods: {
       init() {
-        console.log(this.$route.query);
+        //console.log(this.$route.query);
         if (this.$route.query.id == '') {
           this.title = '人教五上第五单元_列方程解决实际问题',
             this.videourl = 'http://mct-whtymct.huijiaoyun.com/gfs_mnt/data7/2017/12/14/16/33/d5954e58a8b841b0b7a175a92c1d2af9/af13a29dc9db4e5cb0cf1f39602940e9/a090dc48419942be8edfb79cfce49899.mp4?authorization=bce-auth-v1/08da4fd5cf644d458c950b09bdb95666/2017-12-14T08:46:29Z/-1//c6ff6e09909a38673aeedbbe8f74ab964771f45359a8728f06b0f7f5e164ac20';

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

@@ -5,8 +5,10 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 }
 .header .header-list>li>a{color: #fff;}
 .header .header-list>li{margin-right: 25px;}
+.header .header-list .ivu-select-selection, .header-list .ivu-select-selection .ivu-select-arrow{color: #fff;}
+.header .header-list .ivu-select-selected-value{font-size: 14px;}
 .header .header-list>li.icon{
-  background: url("../image/addr.png") no-repeat 0 10px;padding-left:30px;
+  background: url("../image/addr.png") no-repeat 0 10px;padding-left:22px;
 }
 .header .header-list>li>a>i{display:inline-block;width: 10px;height:5px;
     background: url("../image/down.png") no-repeat 0 0;vertical-align: middle;
@@ -17,15 +19,16 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .header .header-list>li>ol>li>a{display: block;padding:1px 15px;}
 .header .header-list>li>ol>li:hover{background: #f5f5f5;}
 .header .header-list>li:hover>ol{display: block;}
-.header .header-list>li:hover i{ background-image: url("../image/up.png")}
+.header .header-list>li>a:hover i{ background-image: url("../image/up.png")}
 .header .header-list>li>ol>li{width: 100%; }
 .header .search-input{height:26px;width:180px;border:0;padding:0 12px;}
 .bodyContent{margin-top:40px;}
 /*master*/
-.master{height:140px;line-height: 140px;font-size: 28px; color: #3d95d5;}
+.master{height:140px;line-height: 140px;}
+.master>a{font-size: 28px; color: #3d95d5;}
 .master li{margin-left:15px;}
-.master a{color: #3d95d5;font-size: 14px;font-weight: bold;}
-.master a:hover{text-decoration: underline;}
+.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;
     /*box-shadow: 2px 2px 4px rgba(0,0,0,0.1)*/
@@ -49,12 +52,12 @@ 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;}
+.left dl{padding:20px 0;margin-bottom: 12px;}
 .left dl>dt{font-size: 16px;padding-left:20px;margin-bottom: 10px;
     /*background: url("../image/titleLine.png") no-repeat 20px center;*/
 }
 .left dl>dd>a{display: block;padding:8px 10px 8px 38px;}
-.left dl>dd>a:hover{background-color: #f5f5f5;}
+.left dl>dd>a:hover,.left dl>dd>a.active{background-color: #f5f5f5;}
 .left dl>dd>a>i{width:20px;height: 16px;margin: 2px 3px 0 0}
 .left dl.work>dd:nth-child(2) i{background-position:-61px -322px }
 .left dl.work>dd:nth-child(3) i{background-position:-61px -356px }
@@ -62,17 +65,32 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .left dl.work>dd:nth-child(5) i{background-position:-61px -460px }
 .left dl.work>dd:nth-child(6) i{background-position:-61px -494px }
 .left dl.work>dd:nth-child(7) i{background-position:-61px -494px }
-
 .left dl.class-manage>dd:nth-child(2) i{background-position:0 -78px }
 .left dl.class-manage>dd:nth-child(3) i{background-position:0 -101px }
 .left dl.class-manage>dd:nth-child(4) i{background-position:0 -555px }
 .left dl.class-manage>dd:nth-child(5) i{background-position:0 -171px }
+.workLeft{padding:10px;min-height: 500px;}
+.workLeft .ivu-select-single .ivu-select-selection{background: #3d95d5;border-radius: 0;}
+.workLeft .ivu-select-single .ivu-select-selection span{color: #fff;font-size: 16px;}
+.workLeft .ivu-select-single .ivu-select-selection i{color: #fff;font-size: 16px;}
+/*选择章节*/
+.left .chapter>dd{
+    padding:8px 20px;
+    font-size: 12px;
+    color: #333;
+}
+.left .chapter>dd.nowText{font-weight: bold; }
 
-
-.workLeft{padding:0 10px;}
+.chapter .ivu-timeline-item-content>.time{color: #666;}
+.chapter .ivu-timeline-item-content>.content{font-size: 14px;margin-top:5px;}
+.ivu-tree{min-height: 600px;}
+.ivu-tree>.ivu-tree-children>li>span{font-size: 15px;}
+.ivu-tree>.ivu-tree-children>li>ul>li>span{font-size: 14px;color: #666;}
+.ivu-tree>.ivu-tree-children>li>ul{cursor: pointer;}
+.ivu-tree>.ivu-tree-children>li>ul:hover{background: #eee;}
 .footer{line-height:80px;margin-top: 100px;font-size: 12px;color: #666;}
 
-.ivu-tree-children{overflow: auto;}
+/*.ivu-tree-children{overflow: auto;}*/
 
 /*index*/
 /*main*/
@@ -103,8 +121,8 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 
 /*studentList*/
 
-.studentList>dd{float:left;width: 21%;margin:2%;border-radius:2px;padding:15px 0;background:#f5f5f5;box-shadow: 1px 1px  1px rgba(0,0,0,0.2);background: }
-.studentList>dd img{float:left;width: 50px;margin:0 15px 0 10px;}
+.studentList>dd{text-align:center;float:left;width: 21%;margin:2%;border-radius:2px;padding:15px 0 20px;background:#f5f5f5;box-shadow: 1px 1px  1px rgba(0,0,0,0.2); }
+.studentList>dd img{/*float:left;*/width: 50px;margin:0 15px 0 10px;}
 .studentList>dd h4{font-size: 16px;margin: 3px 0;}
 .studentList>dd span{color: #666;}
 .studentList>dd p{display:block;font-size: 12px;padding:5px 0;margin-top:10px;}
@@ -137,12 +155,13 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 
 /*工作*/
 .screen{border:1px solid #ddd;padding:20px;}
-.screen>ul>li{width: 100%;margin-bottom: 15px;}
+.screen>ul>li{width: 100%;margin-bottom: 20px;}
 .screen>ul>li:last-child{margin-bottom: 0;}
-.screen>ul>li>ol>li{margin: 0 10px;}
+.screen>ul>li>span{margin-top:2px;}
 .screen>ul>li>ol>li>a{color: #666;font-size:12px;padding:2px 7px;}
 .screen>ul>li>ol>li>a.active,.screen>ul>li>ol>li>a:hover{color: #fff;background:#288add;}
 
+
 .workSort{background: #f5f5f5;margin-top:20px;border:1px solid #ddd;
     line-height: 40px;
 }
@@ -154,21 +173,31 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .workSourceList>li{width: 100%;border-bottom: 1px dashed #ddd;padding:20px 10px;padding-left:75px;
     background-repeat:no-repeat;
     background-position:10px center ;
+    background-size: 50px;
 }
 .ivu-select-single .ivu-select-selection{border:0;background: none;}
 .ivu-select-visible .ivu-select-selection{box-shadow: none;-webkit-box-shadow: none;}
+.ivu-select-single .ivu-select-selection .ivu-select-selected-value{border:0 !important;}
+/*选择教材*/
+.modalSel{padding:15px 10px 30px;margin-bottom: 30px;background:#eee;border-radius: 3px;}
+.modalSel>h4{margin-bottom:10px ;font-size: 16px;}
+.modalSel .ivu-select-single .ivu-select-selection{border:1px solid #ddd;;height:40px;background: #fff;}
+.modalSel .ivu-select-single .ivu-select-selection .ivu-select-selected-value{height:40px;line-height: 40px;}
+.chooseexam .ivu-select-single .ivu-select-selection {border:1px solid #ddd !important;}
 
-.workSourceList>li.ppt{background-image: url("../image/w-ppt.png") }
-.workSourceList>li.word{background-image: url("../image/w-word.png")}
-.workSourceList>li.video{background-image: url("../image/w-video.png")}
-
+.workSourceList>li.ppt,.sourceRecom>ul>li.ppt>a{background-image: url("../image/w-ppt.png") }
+.workSourceList>li.word,.sourceRecom>ul>li.word>a{background-image: url("../image/w-word.png")}
+.workSourceList>li.video,.sourceRecom>ul>li.video>a{background-image: url("../image/w-video.png")}
+.workSourceList>li.daoxue{background-image: url("../image/w-daoxue.png")}
+.workSourceList>li.hunhe{background-image: url("../image/w-hunhe.png")}
 .workSourceList>li:hover{background-color: #f5f5f5;}
 .workSourceList>li h2>a{font-size: 18px;}
 .workSourceList>li h2>a:hover{color:#26c6da;}
 .workSourceList>li>div:first-child{margin-bottom: 10px;}
+.workSourceList>li>div>ol>li>.sourceType{color: #666;border:1px solid #999;font-size: 12px;border-radius: 3px;padding:0px 5px;}
 .workSourceList>li>div>ol>li{margin-right: 30px;font-size: 12px;color:#666; }
 .workSourceList>li>div>ol>li:last-child{margin-right: 0;}
-.workSourceList>li>div>ol.woekOper>li>a{color:#288add; }
+.workSourceList>li>div>ol.woekOper>li>a{color:#288add;}
 .ivu-rate-text{vertical-align: baseline;float: right;margin-top:5px;}
 .ivu-rate-text>span{color:#f5a623;font-size: 14px;}
 .ivu-rate-star{margin-right: 0;font-size: 18px;}
@@ -178,12 +207,22 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 /*资源详情*/
 .sourceDetail>.titleBox{background: #eee;padding:20px; border: 1px solid #ddd;border-bottom: 0;}
 .sourceDetail>.titleBox>h3{font-size: 22px;margin-bottom: 10px;padding-left:35px;
+}
+.sourceDetail>.titleBox>h3.word{
     background: url("../image/w-word.png") no-repeat 0 center;
     background-size:25px auto ;
 }
+.sourceDetail>.titleBox>h3.video{
+    background: url("../image/w-video.png") no-repeat 0 center;
+    background-size:25px auto ;
+}
+.sourceDetail>.titleBox>h3.ppt{
+    background: url("../image/w-ppt.png") no-repeat 0 center;
+    background-size:25px auto ;
+}
 .sourceDetail>.titleBox>.info{color: #666;font-size: 12px;line-height: 31px;}
 .sourceDetail>.titleBox>.info>li{margin-right: 25px;}
-.sourceDetail iframe{width:100%;min-height:600px; border: 1px solid #ddd;border-top: 0; padding:20px;}
+.sourceDetail iframe{width:100%;min-height:500px; border: 1px solid #ddd;border-top: 0; padding:20px;}
 .sourceDetail iframe html{overflow: hidden}
 .sourceDetail .comment{margin:50px 30px;}
 .sourceDetail .comment>h4{font-size: 16px;margin-bottom: 15px;}
@@ -192,17 +231,74 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .sourceDetail .comment .commentBtn{margin-top: 15px;}
 .sourceDetail .comment .commentBtn>span{color: #999;font-size: 12px;margin-right: 10px;}
 
-.sourceRecom{width: 220px;min-height: 500px;padding:0 15px;}
-.sourceRecom>h3{line-height: 50px;padding-left:10px;
-    background: url("../image/titleLine.png") no-repeat 0 center;
-    /*border-bottom: 1px solid #ddd;*/
+.sourceRecom{width: 220px;padding:0 0 20px; }
+.sourceRecom>h3{line-height: 50px;padding:0 15px 0 20px;font-size: 16px;
+    /*background: url("../image/titleLine.png") no-repeat 15px center;*/
+    border-bottom: 1px solid #ddd;
+    margin-bottom: 15px;
 }
-.sourceRecom>h3>.refresh{font-size: 12px;padding-left:16px;
+.sourceRecom>h3>.refresh{font-size: 12px;padding-left:16px; color: #999;
     background: url("../image/refresh.png") no-repeat 0 20px;
+    background-size:12px ;
+    cursor: pointer;
 }
-.sourceRecom>ul>li{border-bottom: 1px solid #ddd;padding:10px 0 10px 30px;
-    background: url("../image/w-word.png") no-repeat 0 20px;
+.sourceRecom>h3>.refresh:hover{color: #4063e0;background-image: url("../image/refresh_hover.png") }
+.sourceRecom>ul>li>a{display: block; padding:10px 15px 10px 45px;
+    background-repeat: no-repeat;
+    background-position: 15px 15px;
     background-size:20px auto;
 }
-.sourceRecom>ul>li>a{display: block;line-height: 18px;font-size: 12px;}
+.sourceRecom>ul>li>a:hover{background-color:#f5f5f5;/*color:#26c6da;*/ }
+.sourceRecom>ul>li:last-child{border-bottom: 0;}
+.sourceRecom>ul>li>a{display: block;line-height: 16px;font-size: 12px;}
 .sourceRecom .ivu-rate-star,.sourceRecom .ivu-rate{font-size: 14px;}
+
+.sourceDetail .tips>li{margin:10px;font-size: 12px;}
+.sourceDetail .tips>li>a{color: #999;}
+.sourceDetail .tips>li>a:hover{color: #3d95d5;}
+
+
+/*在线检测*/
+.checkList{padding:30px 3px;}
+.checkList2{width: 70%;}
+/*答题卡*/
+.numCard{width: 28%;min-height: 200px;margin-top:30px;}
+.numCard>p{border:1px solid #ddd;margin-bottom: 15px;padding:10px;font-size: 12px;color: #666;}
+.numCard>p>b{color:#f7aa20;}
+.numCard>.answerCard{border:1px solid #ddd;}
+.numCard>.answerCard>h5{background: #f9f9f9;font-size:16px;padding:10px;border-bottom:1px solid #ddd;}
+.numCard>.answerCard>.num{padding:30px 10px 30px;min-height: 150px;}
+
+
+.numCard>.answerCard>.num>p{padding:0 10px;margin-top:50px;}
+.AnchorBox .ivu-anchor-ink-ball{border:0;background: none;}
+.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;}
+.checkList>li{width:100%;padding:15px;margin-bottom: 30px;
+    border:1px solid #ddd;
+    /*box-shadow: 0 1px 4px rgba(0,0,0,0.2);*/
+    border-radius: 4px;
+    transition: 0.5s;
+}
+.checkList>li:hover{box-shadow: 0 2px 6px rgba(0,0,0,0.1);}
+.checkList>li>h3>span{display: inline-block;padding:0 5px;font-size: 14px;border-radius: 3px;}
+.checkList>li>h3>.dif{border-width:1px;border-style: solid; color: #fff;}
+.checkList>li>h3>.dif1{background: #07cdae;border-color: #07cdae;}
+.checkList>li>h3>.dif2{background: #26c6da;border-color:#26c6da;}
+.checkList>li>h3>.dif3{background: #4c98e8;border-color:#4c98e8;}
+.checkList>li>h3>.dif4{background: #ffd500;border-color:#ffd500;}
+.checkList>li>h3>.dif5{background: #f7678e;border-color:#f7678e;}
+.checkList>li>h3>.type{border:1px solid #288add;color: #288add;}
+.checkList>li>h3 b{font-weight: normal;}
+.checkList>li .ivu-radio-group{margin: 10px 0;}
+.checkList>li .ivu-radio-group .ivu-radio-wrapper{font-size: 14px;margin:10px 0;}
+.checkList>li>ol>li{margin-right: 30px;line-height: 30px;}
+.checkList>li>.answer{color: #666;}
+.checkList>li>.answer>li{width: 100%;}
+.checkList table{margin:15px;}
+.checkList table td{border:1px solid #666;padding:5px;}
+.ivu-checkbox-group-item{display: block;margin:20px 0;}
+.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;}

TEAMModelOS.TeachZone/ClientApp/common/header.vue

@@ -3,12 +3,21 @@
     <div class="header">
       <div class="wrap ov">
         <ul class="fl header-list">
-          <li class="icon"><a href="">四川省平台 <i></i></a>
-            <ol>
-              <li><a href="">成都市平台</a></li>
-              <li><a href="">高新区平台</a></li>
-              <li><a href="">学校平台</a></li>
-            </ol>
+          <li class="icon">
+            <!--<a href="">四川省平台 <i></i></a>-->
+            <!--<ol>-->
+            <!--<li><a href="">成都市平台</a></li>-->
+            <!--<li><a href="">高新区平台</a></li>-->
+            <!--<li><a href="">学校平台</a></li>-->
+            <!--</ol>-->
+
+            <Select v-model="formItem.select">
+              <Option value="sel1" >首页</Option>
+              <!--<Option value="">四川省平台</Option>-->
+              <Option value="">成都市平台</Option>
+              <Option value="">高新区平台</Option>
+              <Option value="">学校平台</Option>
+            </Select>
           </li>
         </ul>
         <ul class="fr header-list">
@@ -19,11 +28,16 @@
             <a href="">张三 </a>
           </li>
           <li>
-            <a href="">班级 <i></i></a>
-            <ol>
-              <li><a href="">六年级·1班</a></li>
-              <li><a href="">六年级·2班</a></li>
-            </ol>
+            <Select v-model="formItem.select">
+              <!--<Option value="sel1" >班级</Option>-->
+              <Option value="sel1">六年级·1班</Option>
+              <Option value="">六年级·2班</Option>
+            </Select>
+            <!--<a href="">班级 <i></i></a>-->
+            <!--<ol>-->
+            <!--<li><a href="">六年级·1班</a></li>-->
+            <!--<li><a href="">六年级·2班</a></li>-->
+            <!--</ol>-->
           </li>
           <li>
             <a href="">学校 </a>
@@ -36,9 +50,19 @@
 </template>
 
 <script>
-    export default {
-        name: "header"
-    }
+
+  export default {
+    name: "header",
+    data () {
+      return {
+        formItem: {
+          select: 'sel1',
+          select2: 'sel2',
+
+        },
+      }
+    },
+  }
 </script>
 
 <style scoped>

TEAMModelOS.TeachZone/ClientApp/common/left.vue

@@ -31,10 +31,10 @@
     <dl class="work">
       <dt>我的工作</dt>
       <dd><a href="/teachSource"><i class="icon"></i>教材资源</a></dd>
-      <dd><a href=""><i class="icon"></i>课前导学</a></dd>
-      <dd><a href=""><i class="icon"></i>同步备课</a></dd>
-      <dd><a href=""><i class="icon"></i>在线监测</a></dd>
-      <dd><a href=""><i class="icon"></i>课后作业</a></dd>
+      <dd><a href="/teachCheck"><i class="icon"></i>在线检测</a></dd>
+      <dd><a href="/teachSource"><i class="icon"></i>课前导学</a></dd>
+      <dd><a href="/teachPrelesson"><i class="icon"></i>同步备课</a></dd>
+      <dd><a href="/teachTask"><i class="icon"></i>课后作业</a></dd>
     </dl>
     <dl class="class-manage">
       <dt>我的班级</dt>

TEAMModelOS.TeachZone/ClientApp/common/master.vue

@@ -1,16 +1,16 @@
 <template>
   <div>
     <div class="master wrap">
-    张三的空间
+      <a href="/">我的空间</a>
     </div>
   </div>
 
 </template>
 
 <script>
-    export default {
-        name: "header"
-    }
+  export default {
+    name: "header"
+  }
 </script>
 
 <style scoped>

TEAMModelOS.TeachZone/ClientApp/common/recomLeft.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="left fl">
+    <dl class="chapter bgf">
+      <dt>当前课程</dt>
+      <dd>
+        <Timeline>
+          <TimelineItem color="#2db7f5">
+            <p class="time">教材：</p>
+            <p class="content">初中历史与社会人教课</p>
+          </TimelineItem>
+          <TimelineItem color="#2db7f5">
+            <p class="time">章节：第一章</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>
+          </TimelineItem>
+        </Timeline>
+      </dd>
+      <!--<dd><Icon type="ios-browsers-outline"style="font-size: 16px;" /> 初中历史与社会人教课标版</dd>-->
+      <!--<dd><Icon type="ios-browsers-outline"style="font-size: 16px;" /> 第一单元 人在社会中生活</dd>-->
+      <!--<dd class="nowText"><Icon type="ios-list-box-outline"  style="font-size: 16px;"/> 第二课 我的家在哪里</dd>-->
+      <dd>
+        <Button @click="value2 = true" type="info" long>选择章节 <Icon type="ios-arrow-dropright" style="font-size: 16px;"/></Button>
+      </dd>
+    </dl>
+    <Drawer placement="left" :closable="false" v-model="value2"  width="300">
+      <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>
+        </Select>
+      </div>
+
+      <Tree :data="data5" :render="renderContent"></Tree>
+      <Button type="primary" long>添加教材</Button>
+    </Drawer>
+    <dl class="work bgf">
+      <dt>我的工作</dt>
+      <dd><a href="/teachSource" class="active"><i class="icon"></i>教材资源</a></dd>
+      <dd><a href="/teachCheck"><i class="icon"></i>在线检测</a></dd>
+      <dd><a href="/teachPreclass"><i class="icon"></i>课前导学</a></dd>
+      <dd><a href="/teachPrelesson"><i class="icon"></i>同步备课</a></dd>
+      <dd><a href="/teachTask"><i class="icon"></i>课后作业</a></dd>
+    </dl>
+    <div class="sourceRecom bgf">
+      <h3>推荐资源 <span class="fr refresh">换一批</span></h3>
+      <ul>
+        <li class="word">
+          <a href="">
+            <p>当我们的手中只剩下一片树叶.docx</p>
+            <p>
+              <Rate allow-half v-model="valueText" disabled></Rate>
+            </p>
+          </a>
+        </li>
+        <li class="word">
+          <a href="">
+            <p>当我们的手中只剩下一片树叶.docx</p>
+            <p>
+              <Rate allow-half v-model="valueText" disabled></Rate>
+            </p>
+          </a>
+        </li>
+        <li class="ppt">
+          <a href="">
+            <p>当我们的手中只剩下一片树叶.ppt</p>
+            <p>
+              <Rate allow-half v-model="valueText" disabled></Rate>
+            </p>
+          </a>
+        </li>
+        <li class="video">
+          <a href="">
+            <p>当我们的手中只剩下一片树叶.mp4</p>
+            <p>
+              <Rate allow-half v-model="valueText" disabled></Rate>
+            </p>
+          </a>
+        </li>
+        <li class="word">
+          <a href="">
+            <p>当我们的手中只剩下一片树叶.docx</p>
+            <p>
+              <Rate allow-half v-model="valueText" disabled></Rate>
+            </p>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        select:'sel1',
+        valueText:5,
+        value2: false,
+        data5: [
+              // {
+              //   title:'致同学们',
+              //   expand: true,
+              // },
+              {
+                title: '第一单元 人在社会中生活',
+                expand: true,
+                children: [
+                  {
+                    title: '第一课  我的家在哪里',
+                    expand: true
+                  },
+                  {
+                    title: '第二课 乡村与城市',
+                    expand: true
+                  },
+                  {
+                    title: '综合探究一 从地图上获取信息',
+                    expand: true
+                  }
+                ]
+              },
+              {
+                title: '第二单元 人类共同生活的世界',
+                expand: false,
+                children: [
+                  {
+                    title: '第一课 大洲和大洋',
+                    expand: true
+                  },
+                  {
+                    title: '第二课 自然环境',
+                    expand: true
+                  },
+                  {
+                    title: '第三课 世界大家庭',
+                    expand: true
+                  },
+                  {
+                    title: '综合探究二 从地球仪上看世界',
+                    expand: true
+                  }
+                ]
+              },
+              {
+                title: '第三单元 各具特色的区域生活',
+                expand: false,
+                children: [
+                  {
+                    title: '第一课 家住平原',
+                    expand: true
+                  },
+                  {
+                    title: '第二课 与山为邻',
+                    expand: true
+                  }, {
+                    title: '第三课 傍水而居',
+                    expand: true
+                  }, {
+                    title: '第四课 草原人家',
+                    expand: true
+                  }, {
+                    title: '第五课 干旱的宝地',
+                    expand: true
+                  }, {
+                    title: '综合探究三 如何认识区域',
+                    expand: true
+                  },
+                ]
+              },
+              {
+                title: '第四单元 文明中心——城市',
+                expand: false,
+                children: [
+                  {
+                    title: '第一课 美国政治的心脏：华盛顿',
+                    expand: true
+                  },
+                  {
+                    title: '第二课 文化艺术之都：巴黎',
+                    expand: true
+                  },
+                  {
+                    title: '第三课 IT新城：班加罗尔',
+                    expand: true
+                  },
+                  {
+                    title: '第四课 汽车城：蔚山',
+                    expand: true
+                  },
+                  {
+                    title: '第五课 城市规划的典范：巴西利亚',
+                    expand: true
+                  },
+                  {
+                    title: '综合探究 如何认识城市',
+                    expand: true
+                  }
+                ]
+              }
+
+
+        ],
+        buttonProps: {
+          type: 'default',
+          size: 'small',
+        }
+      }
+    },
+    methods: {
+      renderContent (h, { root, node, data }) {
+        return h('span', {//二级
+          style: {
+            display: 'inline-block',
+            width: '100%',
+            cursor:'pointer'
+          },
+          on: {
+          click: () => { this.titleClick(root, node, data) }
+        }
+        }, [
+          h('span', [
+            h('Icon', {
+              props: {
+                type: 'ios-paper-outline'
+              },
+              style: {
+                marginRight: '8px'
+              }
+            }),
+
+            h('span', data.title)
+
+          ]),
+
+        ]);
+      },
+      append (data) {
+        const children = data.children || [];
+        children.push({
+          title: 'appended node',
+          expand: true
+        });
+        this.$set(data, 'children', children);
+      },
+      remove (root, node, data) {
+        const parentKey = root.find(el => el === node).parent;
+        const parent = root.find(el => el.nodeKey === parentKey).node;
+        const index = parent.children.indexOf(data);
+        parent.children.splice(index, 1);
+      },
+      titleClick(root, node, data,event){
+        data.expand = !data.expand
+      }
+    }
+
+
+
+  }
+</script>
+

TEAMModelOS.TeachZone/ClientApp/common/screen.vue

@@ -0,0 +1,62 @@
+<template>
+  <div class="screen">
+    <ul>
+      <li>
+        <span class="fl">类型：</span>
+        <RadioGroup v-model="button1" type="button">
+          <Radio label="全部"></Radio>
+          <Radio label="教案"></Radio>
+          <Radio label="学案"></Radio>
+          <Radio label="课件"></Radio>
+          <Radio label="微课"></Radio>
+          <Radio label="习题"></Radio>
+          <Radio label="素材"></Radio>
+          <Radio label="拓展"></Radio>
+        </RadioGroup>
+      </li>
+      <li>
+        <span class="fl">来源：</span>
+        <RadioGroup v-model="button2" type="button">
+          <Radio label="全部"></Radio>
+          <Radio label="我的资源"></Radio>
+          <Radio label="共享资源"></Radio>
+          <Radio label="精品资源"></Radio>
+          <Radio label="校本资源"></Radio>
+        </RadioGroup>
+      </li>
+      <li>
+        <span class="fl">范围：</span>
+        <RadioGroup v-model="button3" type="button">
+          <Radio label="全部"></Radio>
+          <Radio label="本省区域"></Radio>
+          <Radio label="本市区域"></Radio>
+          <Radio label="本县区区域"></Radio>
+          <Radio label="本校区域"></Radio>
+          <Radio label="我的分享"></Radio>
+        </RadioGroup>
+      </li>
+    </ul>
+  </div>
+</template>
+<script>
+    export default {
+        name: "screen",
+      data(){
+          return{
+            button1: '全部',
+            button2: '全部',
+            button3: '全部',
+          }
+      }
+    }
+</script>
+
+<style scoped>
+  .ivu-radio-group-button .ivu-radio-wrapper:after, .ivu-radio-group-button .ivu-radio-wrapper:before{display: none;}
+  .ivu-radio-group-button .ivu-radio-wrapper:first-child{border:0;}
+  .ivu-radio-group-button .ivu-radio-wrapper{margin-right: 10px; padding: 0 10px;height:22px;line-height: 22px;border:0;transition:none;-webkit-transition:none;outline: 0;}
+  .ivu-radio-group-button .ivu-radio-wrapper-checked{background: #2d8cf0;color: #fff;box-shadow: none;-webkit-box-shadow:none;}
+  .ivu-radio-group-button .ivu-radio-wrapper>span:focus{outline: 0;}
+  .ivu-radio-group-button .ivu-radio-wrapper-checked:hover{color: #fff;}
+  .ivu-radio-group-button .ivu-radio-wrapper:first-child,.ivu-radio-group-button .ivu-radio-wrapper:last-child{border-radius: 0;}
+</style>

TEAMModelOS.TeachZone/ClientApp/common/screenSort.vue

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <div class="workSort ov">
+      <ul class="fl">
+        <li><a href="" class="active">默认</a></li>
+        <li><a href="">评分</a></li>
+        <li><a href="">收藏</a></li>
+        <li><a href="">预览</a></li>
+        <li><a href="">大小</a></li>
+        <li><a href="">时间</a></li>
+      </ul>
+      <div class="fr ov">
+        <Select v-model="select">
+          <Option value="sel1" >格式</Option>
+          <Option value="">图片</Option>
+          <Option value="">文档</Option>
+          <Option value="">视频</Option>
+          <Option value="">音频</Option>
+          <Option value="">动画</Option>
+        </Select>
+        <Select v-model="select2">
+          <Option value="sel2" >全部区域</Option>
+          <Option value="">本省区域</Option>
+          <Option value="">本市区域</Option>
+          <Option value="">本县区区域</Option>
+          <Option value="">本校范围</Option>
+          <Option value="">我的分享</Option>
+        </Select>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        select:'sel1',
+        select2:'sel2'
+      }
+    },
+
+  }
+</script>
+
+<style scoped>
+
+</style>

TEAMModelOS.TeachZone/ClientApp/common/textbook.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="fr textbook" >
+    <Select v-model="select" class="fl" style="width: auto;">
+      <Option value="sel1" >初中历史与社会人教课标版</Option>
+      <Option value="">思想政治人教标本七年级上册</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+      <Option value="">音地理人教科标板七年级上册频</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+    </Select>
+    <Select v-model="select2" class="fl" style="width: auto;">
+      <Option value="sel2" >初中历史与社会人教课标版</Option>
+      <Option value="">思想政治人教标本七年级上册</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+      <Option value="">音地理人教科标板七年级上册频</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+    </Select>
+  </div>
+</template>
+
+<script>
+    export default {
+        name: "header",
+      data(){
+        return {
+          select:'sel1',
+          select2:'sel2',
+          chapter: [
+            {
+              title: '致同学们',
+              expand: true,
+
+            },
+            {
+              title: '第一单元 人在社会中生活',
+              expand: true,
+              children: [
+                {
+                  title: '第一课  我的家在哪里'
+                },
+                {
+                  title: '第二课 乡村与城市'
+                },{
+                  title: '综合探究一 从地图上获取信息'
+                },
+              ]
+            },
+            {
+              title: '第二单元 人类共同生活的世界',
+              expand: true,
+              children: [
+                {
+                  title: '第一课 大洲和大洋'
+                },
+                {
+                  title: '第二课 自然环境'
+                }, {
+                  title: '第三课 世界大家庭'
+                }, {
+                  title: '综合探究二 从地球仪上看世界'
+                },
+              ]
+            },
+            {
+              title: '第三单元 各具特色的区域生活',
+              expand: true,
+              children: [
+                {
+                  title: '第一课 家住平原'
+                },
+                {
+                  title: '第二课 与山为邻'
+                }, {
+                  title: '第三课 傍水而居'
+                }, {
+                  title: '第四课 草原人家'
+                }, {
+                  title: '第五课 干旱的宝地'
+                }, {
+                  title: '综合探究三 如何认识区域'
+                },
+              ]
+            },
+          ]
+        }
+      }
+    }
+</script>
+
+<!--<style scoped>-->
+<style>
+  .textbook .ivu-select-single .ivu-select-selection .ivu-select-selected-value{
+    background: #fff;margin-left:10px;border-radius: 3px;box-shadow: 0 0 2px  rgba(0,0,0,0.2);
+  }
+</style>

TEAMModelOS.TeachZone/ClientApp/common/workMaster.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="master wrap ov">
-    我的工作
-    <ul class="fr">
-      <li><a href="">教材资源</a></li>
-      <li><a href="">课前导学</a></li>
-      <li><a href="">同步备课</a></li>
-      <li><a href="">在线监测</a></li>
-      <li><a href="">课后作业</a></li>
-    </ul>
+    <a href="/">我的空间</a>
+    <!--<ul class="fr">-->
+      <!--<li><a href="">教材资源</a></li>-->
+      <!--<li><a href="">课前导学</a></li>-->
+      <!--<li><a href="">同步备课</a></li>-->
+      <!--<li><a href="">在线监测</a></li>-->
+      <!--<li><a href="">课后作业</a></li>-->
+    <!--</ul>-->
   </div>
 
 </template>
 
 <script>
-    export default {
-        name: "header"
-    }
+  export default {
+    name: "header"
+  }
 </script>
 
 <style scoped>

TEAMModelOS.TeachZone/ClientApp/components/scoreListDetail.vue

@@ -2,8 +2,31 @@
   <div class="main fr">
     <h4><a href="/">首页</a> > 学生成绩</h4>
 
-    <div class="content ov bgf scoreListDetail">
+    <div class="content ov bgf scoreListDetail " style="padding:0 20px;">
       <h5 class="content-title">2019级上学期·第一次模拟考试成绩公布</h5>
+      <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>
       <div class="txt">
         <ul class="ov tc">
           <li class="table-head">
@@ -104,7 +127,31 @@
 
 <script>
   export default {
-    name: "index"
+    name: "index",
+    data(){
+      return{
+        modal1: false,
+        formItem: {
+          input: '',
+          textarea: ''
+        }
+      }
+    },
+    methods: {
+      ok () {
+        this.$Message.info('发布成功');
+      },
+      // cancel () {
+      //   this.$Message.info('');
+      // }
+      yes () {
+        this.modal1 = false;
+        this.$Message.success('发布成功');
+      },
+      cancel () {
+        this.modal1 = false;
+      }
+    }
   }
 </script>
 

TEAMModelOS.TeachZone/ClientApp/components/studentList.vue

@@ -6,6 +6,7 @@
         <dt>学生名单 <a href="" class="fr">更多+</a></dt>
         <dd>
           <a href="">
+            <i>班长</i>
             <img src="../assets/image/head.png" alt="">
             <h4>李四</h4>
             <span>201901002</span>

TEAMModelOS.TeachZone/ClientApp/router/routes.js

@@ -10,7 +10,14 @@ import NoticeDetail from '@/view/noticeDetail'
 import Source from '@/view/source'
 import TeachSource from '@/view/teachSource'
 import TeachSourceDetail from '@/view/teachSourceDetail'
+import TeachSourceVideo from '@/view/teachSourceVideo'
+import TeachPreclass from '@/view/teachPreclass'
+import TeachPrelesson from '@/view/teachPrelesson'
+import TeachCheck from '@/view/teachCheck'
+import TeachTask from '@/view/teachTask'
+import TeachTaskDetail from '@/view/teachTaskDetail'
 import Report from '@/view/report'
+import Reportad from '@/view/reportadvanced'
 import { resolve } from 'url';
 
 export const routes = [
@@ -59,9 +66,44 @@ export const routes = [
     path: '/teachSourceDetail',
     component: TeachSourceDetail
   },
+  {
+    name: 'teachSourceVideo',
+    path: '/teachSourceVideo',
+    component: TeachSourceVideo
+  },
+  {
+    name: 'teachPreclass',
+    path: '/teachPreclass',
+    component: TeachPreclass
+  },
+  {
+    name: 'teachPrelesson',
+    path: '/teachPrelesson',
+    component: TeachPrelesson
+  },
+  {
+    name: 'teachCheck',
+    path: '/teachCheck',
+    component: TeachCheck
+  },
+  {
+    name: 'teachTask',
+    path: '/teachTask',
+    component: TeachTask
+  },
+  {
+    name: 'teachTaskDetail',
+    path: '/teachTaskDetail',
+    component: TeachTaskDetail
+  },
   {
     name: 'report',
-    path: '/report',
+    path: '/Report',
     component: Report
   },
+  {
+    name: 'reportad',
+    path: '/Reportad',
+    component: Reportad
+  },
 ]

TEAMModelOS.TeachZone/ClientApp/view/report.vue

@@ -1,17 +1,20 @@
 <template>
+
   <div class="report_container">
     <Header></Header>
     <Master></Master>
-    <div class="report_box bgf pad20">
+
+    <div class="report_box bgf pad20" style="margin-top:40px;">
+      <a href="/teachCheck" style="color: #288add;"> < 返回 </a>
       <div class="header_basic">
         <ul>
-          <li><Icon type="md-person" size="24" /><span class="name">姓名：</span><span class="name_content">张三</span></li>
-          <li><Icon type="md-bookmarks" size="24" /><span class="name">学号：</span><span class="name_content">201901001</span></li>
-          <li><Icon type="ios-clipboard" size="24" /><span class="name">班级：</span><span class="name_content">2019级五班</span></li>
+          <li><!--<Icon type="md-person" size="24" />--><span class="name">姓名：</span><span class="name_content">张三</span></li>
+          <li><!--<Icon type="md-bookmarks" size="24" />--><span class="name">学号：</span><span class="name_content">201901001</span></li>
+          <li><!--<Icon type="ios-clipboard" size="24" />--><span class="name">班级：</span><span class="name_content">2019级五班</span></li>
         </ul>
         <br/>
         <ul>
-          <li><span class="vice-name">本次考试名称：</span><span class="vice-name_content">2019 全市第一次联考</span></li>
+          <li><span class="vice-name">考试名称：</span><span class="vice-name_content">2019.03.07-在线检测</span></li>
           <li><span class="vice-name">考试类型：</span><span class="vice-name_content">区级联考</span></li>
           <li><span class="vice-name">考试总分：</span><span class="vice-name_content">460</span></li>
           <li><span class="vice-name">学习稳定系数：</span><span class="vice-name_content">0.6</span></li>
@@ -19,13 +22,13 @@
       </div>
       <div class="chooseexam">
         <div class="exam">
-          <span>考试选择:</span>
+          <span>选择考试：</span>
           <Select v-model="model1" style="width:200px">
             <Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </div>
         <div class="subjects">
-          <span>科目:</span>
+          <span>科目：</span>
           <Select v-model="model2" style="width:200px">
             <Option v-for="itemc in cityList1" :value="itemc.value" :key="itemc.value">{{ itemc.label }}</Option>
           </Select>
@@ -34,22 +37,23 @@
       <div class="summarize">
         <p class="summarize_header_title">总结：</p>
         <div class="summarize_content">
-          <p class="content_header">同学，你好</p>
-          <p class="content_text">您在本次<span class="exam_color">2019 全市第一次联考</span>中，当前科目 数学分数为<span class="number_color">460</span>考试范围为：1-4章节。</p>
-          <p class="content_text">您在 <span class="dot1">知识点1、知识点2、知识点3</span> 处的题目都表现出色，全部都答对了。</p>
-          <p class="content_text">您在 <span class="dot2">知识点3、知识点4、知识点6 </span> 处的题目有待加强，部分答对了，其中<span class="dot3">知识点3-XXXX，知识点4-XXXX，知识点6-XXX</span> 需加强练习或复习。</p>
-          <p class="content_text">您在<span class="dot4">知识点7、知识点8、知识点9 </span> 处的题目表现较差，都答错了。建议将答错试题请教老师，重新学习知识点内容，也可进入补救题库，进行补救。</p>
+          <p class="content_header">张三同学，你好！</p>
+          <p class="content_text">你在本次<span class="exam_color">在线检测（2019-03-07）</span>中，考试总分为<span class="number_color">460分</span>，考试范围为：1-4章节。</p>
+          <p class="content_text">你在 <span class="dot1">知识点1、知识点2、知识点3</span> 处的题目都表现出色，全部都答对了。</p>
+          <p class="content_text">你在 <span class="dot2">知识点3、知识点4、知识点6 </span> 处的题目有待加强，部分答对了，其中<span class="dot3">知识点3-XXXX，知识点4-XXXX，知识点6-XXX</span> 需加强练习或复习。</p>
+          <p class="content_text">你在<span class="dot4">知识点7、知识点8、知识点9 </span> 处的题目表现较差，都答错了。建议将答错试题请教老师，重新学习知识点内容，也可进入补救题库，进行补救。</p>
         </div>
       </div>
       <div class="trend">
-        <p>成绩分析趋势</p>
+        <p class="reportTit">成绩分析趋势</p>
         <div id="zhexian" style="width:100%; height:400px;"></div>
       </div>
       <div class="structure">
-        <p>知识点分数占比</p>
+        <p class="reportTit">知识点分数占比</p>
         <div id="zhishidian" style="width:100%; height:400px;"></div>
       </div>
       <div class="structure_details">
+        <p class="reportTit">知识点掌握情况</p>
         <Table :columns="columns1" :data="data1"></Table>
       </div>
     </div>
@@ -70,23 +74,23 @@
       return {
         cityList: [
           {
-            value: '2019 全市第一次联考',
-            label: '2019 全市第一次联考'
+            value: '2019.03.07-在线检测',
+            label: '2019.03.07-在线检测'
           },
           {
-            value: '2019 全市第二次联考',
-            label: '2019 全市第二次联考'
+            value: '2018.12.15-测试',
+            label: '2018.12.15-测试'
           },
           {
-            value: '2019 全市第三次联考',
-            label: '2019 全市第三次联考'
+            value: '2018.11.03-在线检测',
+            label: '2018.11.03-在线检测'
           },
           {
-            value: '2019 全市第四次联考',
-            label: '2019 全市第四次联考'
+            value: '2018.10.07-在线测试考',
+            label: '2018.10.07-在线测试考'
           },
         ],
-        model1: '2019 全市第一次联考',
+        model1: '2019.03.07-在线检测',
         cityList1: [
           {
             value: '语文',
@@ -243,7 +247,7 @@
               "interval": 0,
 
             },
-            "data": ["2019 全市第一次联考", "2019 全市第二次联考", "2019 全市第三次联考","2019 全市第四次联考","2019 全市第五次联考"],
+            "data": ["在线检测(2019.03.07)", "在线检测(2019.01.13)", "在线检测(2018.12.20)", "在线检测(2018.12.03)","在线检测(2018.11.15)"],
           }],
           "yAxis": [{
             "type": "value",
@@ -463,8 +467,9 @@
   .header_basic {
     width:100%;
     text-align:center;
-    border:1px solid #333;
+    border-bottom:1px solid #ddd;
     margin-top:5px;
+    padding:10px 0 20px
   }
     .header_basic ul {
       display:inline-block;
@@ -472,7 +477,7 @@
     }
       .header_basic ul li {
         padding:3px 4px 2px 4px;
-        margin-left:20px;
+        margin:0 15px;
       }
         .header_basic ul li i {
           float: left;
@@ -480,35 +485,34 @@
         }
   .name {
     font-size: 18px;
-    font-family: "微软雅黑";
-    
+
   }
   .name_content {
     font-size: 20px;
-    font-family: "微软雅黑";
-  
   }
   .vice-name, .vice-name_content {
-    font-size: 16px;
-    font-family: "微软雅黑";
+    font-size: 15px;color: #666;
   }
   .chooseexam {
     width:100%;
     height:auto;
-    padding-top:1%;
+    margin:60px 0 40px;
   }
   .exam {
     width:25%;
     float:left;
     padding-left:1%;
+    margin-right: 30px;
+
   }
   .summarize {
     width: 96%;
     margin: 2%;
-    border:1px solid #d3d3d3;
-    padding-bottom:10px;
-    padding-left:0.5%;
-    border-radius:8px;
+    /*border:1px solid #d3d3d3;*/
+    background: #f5f5f5;
+
+    padding:15px 20px 30px;
+    border-radius:5px;
   }
   .summarize_header_title {
     font-size:22px;
@@ -520,7 +524,7 @@
     margin:0 auto;
   }
     .summarize_content p {
-      padding-top:5px;
+     margin:10px 0;
     }
     .content_header {
       font-size: 16px;
@@ -548,12 +552,16 @@
     height: auto;
     padding: 1.5%;
   }
-    .trend p, .structure  p{
-      width: 100%;
-      font-size: 18px;
+    .reportTit{
+      font-size: 16px;
+      font-weight: bold;
+      margin:20px 0 10px;
     }
   .structure_details {
     width:100%;
-    padding:1%
+    padding:1%;
+    margin:20px 0;
+
   }
+
 </style>

TEAMModelOS.TeachZone/ClientApp/view/reportadvanced.vue

@@ -0,0 +1,807 @@
+<template>
+
+  <div class="report_container">
+    <Header></Header>
+    <Master></Master>
+    <div class="report_box bgf pad20" style="margin-top:40px;">
+      <a href="/teachCheck" style="color: #288add;"> < 返回 </a>
+      <div class="header_basic">
+        <ul>
+          <li><!--<Icon type="md-person" size="24" />--><span class="name">姓名：</span><span class="name_content">张三</span></li>
+          <li><!--<Icon type="md-bookmarks" size="24" />--><span class="name">学号：</span><span class="name_content">201901001</span></li>
+          <li><!--<Icon type="ios-clipboard" size="24" />--><span class="name">班级：</span><span class="name_content">2019级五班</span></li>
+        </ul>
+        <br />
+        <ul>
+          <li><span class="vice-name">考试名称：</span><span class="vice-name_content">2019.03.07-在线检测</span></li>
+          <li><span class="vice-name">考试类型：</span><span class="vice-name_content">区级联考</span></li>
+          <li><span class="vice-name">考试总分：</span><span class="vice-name_content">460</span></li>
+          <li><span class="vice-name">学习稳定系数：</span><span class="vice-name_content">0.6</span></li>
+        </ul>
+      </div>
+      <div class="chooseexam">
+        <div class="exam">
+          <span>选择考试：</span>
+          <Select v-model="model1" style="width:200px">
+            <Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+          </Select>
+        </div>
+        <div class="subjects">
+          <span>科目：</span>
+          <Select v-model="model2" style="width:200px">
+            <Option v-for="itemc in cityList1" :value="itemc.value" :key="itemc.value">{{ itemc.label }}</Option>
+          </Select>
+        </div>
+      </div>
+      <div class="summarize">
+        <p class="summarize_header_title">总结：</p>
+        <div class="summarize_content">
+          <p class="content_header">张三同学，你好！</p>
+          <p class="content_text">你在本次<span class="exam_color">2019.03.07-在线检测</span>中，考试总分为<span class="number_color">460分</span>,班级平均分为：<span class="number_color1">433.7</span>,年级平均分为：<span class="number_color2">467</span>，考试范围为：1-4章节。</p>
+          <p class="content_text">你在 <span class="dot1">知识点1、知识点2、知识点3</span> 处的题目都表现出色，全部都答对了。</p>
+          <p class="content_text">你在 <span class="dot2">知识点3、知识点4、知识点6 </span> 处的题目有待加强，部分答对了，其中<span class="dot3">知识点3-XXXX，知识点4-XXXX，知识点6-XXX</span> 需加强练习或复习。</p>
+          <p class="content_text">你在<span class="dot4">知识点7、知识点8、知识点9 </span> 处的题目表现较差，都答错了。建议将答错试题请教老师，重新学习知识点内容，也可进入补救题库，进行补救。</p>
+        </div>
+      </div>
+      <div class="trend">
+        <p class="reportTit">成绩分析趋势</p>
+        <div id="zhexian" style="width:100%; height:400px;"></div>
+      </div>
+      <div class="structure">
+        <p class="reportTit">知识点分数占比</p>
+        <div id="zhishidian" style="width:100%; height:400px;"></div>
+      </div>
+      <div class="structure_details">
+        <p class="reportTit">知识点掌握情况</p>
+        <Table :columns="columns1" :data="data1"></Table>
+      </div>
+      <div class="pie_box">
+        <div id="pie" style="width:100%; height:400px;"></div>
+      </div>
+      <div class="student_details">
+        <p class="reportTit">全班学生情况</p>
+        <Table :columns="columns2" :data="data2"></Table>
+      </div>
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/header.vue'
+  import Master from '@/common/master.vue'
+  import Footer from '@/common/footer.vue'
+  export default {
+    components: {
+      Header,
+      Master,
+      Footer
+    },
+    data() {
+      return {
+        cityList: [
+          {
+            value: '2019.03.07-在线检测',
+            label: '2019.03.07-在线检测'
+          },
+          {
+            value: '2018.12.15-测试',
+            label: '2018.12.15-测试'
+          },
+          {
+            value: '2018.11.03-在线检测',
+            label: '2018.11.03-在线检测'
+          },
+          {
+            value: '2018.10.07-在线测试考',
+            label: '2018.10.07-在线测试考'
+          },
+        ],
+        model1: '2019.03.07-在线检测',
+        cityList1: [
+          {
+            value: '语文',
+            label: '语文'
+          },
+          {
+            value: '数学',
+            label: '数学'
+          },
+          {
+            value: '英语',
+            label: '英语'
+          },
+          {
+            value: '物理',
+            label: '物理'
+          },
+        ],
+        model2: '语文',
+        columns1: [
+          {
+            title: '知识点名称',
+            key: 'name'
+          },
+          {
+            title: '掌握情况',
+            key: 'master'
+          },
+          {
+            title: '难度系数',
+            key: 'difficulty'
+          },
+          {
+            title: '配分',
+            key: 'score'
+          },
+          {
+            title: '相关题目数',
+            key: 'topic'
+          },
+          {
+            title: '班级答对率',
+            key: 'classaccuracy'
+          },
+          {
+            title: '年级答对率',
+            key: 'gradeaccuracy'
+          },
+        ],
+        data1: [
+          {
+            name: '知识点1',
+            master: '一般',
+            difficulty: 0.6,
+            score: 20,
+            topic: '3/5',
+            classaccuracy: '66%',
+            gradeaccuracy:'67%',
+            className: 'demo-table-info-column'
+          },
+          {
+            name: '知识点2',
+            master: '良好',
+            difficulty: 0.4,
+            score: 25,
+            topic: '4/5',
+            classaccuracy: '76%',
+            gradeaccuracy: '72%',
+          },
+          {
+            name: '知识点3',
+            master: '差',
+            difficulty: 0.5,
+            score: 15,
+            topic: '0/3',
+            classaccuracy: '77%',
+            gradeaccuracy: '79%',
+          },
+          {
+            name: '知识点4',
+            master: '差',
+            difficulty: 0.7,
+            score: 10,
+            topic: '0/2',
+            classaccuracy: '68%',
+            gradeaccuracy: '48%',
+          },
+          {
+            name: '知识点5',
+            master: '优秀',
+            difficulty: 0.6,
+            score: 30,
+            topic: '4/4',
+            classaccuracy: '90%',
+            gradeaccuracy: '95%',
+          },
+        ],
+        columns2: [
+          {
+            title: '姓名',
+            key: 'name'
+          },
+          {
+            title: '学号',
+            key: 'studennum'
+          },
+          {
+            title: '排名',
+            key: 'paiming'
+          },
+          {
+            title: '分数',
+            key: 'fenshu'
+          },
+          {
+            title: '已超过班级百分比',
+            key: 'chaoguo'
+          },
+        ],
+        data2: [
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '1',
+            fenshu: '98',
+            chaoguo:'99%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '2',
+            fenshu: '96',
+            chaoguo: '98%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '3',
+            fenshu: '95',
+            chaoguo: '97%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '4',
+            fenshu: '92',
+            chaoguo: '96%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '5',
+            fenshu: '90',
+            chaoguo: '95%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '6',
+            fenshu: '90',
+            chaoguo: '95.5%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '7',
+            fenshu: '86',
+            chaoguo: '94%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '8',
+            fenshu: '85',
+            chaoguo: '93%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '9',
+            fenshu: '83',
+            chaoguo: '92%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '10',
+            fenshu: '81',
+            chaoguo: '91%'
+          },
+          {
+            name: '王小明',
+            studennum: '2018001001',
+            paiming: '11',
+            fenshu: '79',
+            chaoguo: '90%'
+          },
+        ],
+      }
+    },
+    mounted() {
+      this.drawLine();
+      this.graph();
+      this.pie();
+    },
+    methods: {
+      drawLine() {
+        let myChart = this.$echarts.init(document.getElementById('zhexian'));
+        var xData = function () {
+          var data = [];
+          for (var i = 1; i < 15; i++) {
+            data.push(i + "");
+          }
+          return data;
+        }();
+        myChart.setOption({
+          backgroundColor: "#344b58",
+          "tooltip": {
+            "trigger": "axis",
+            "axisPointer": {
+              "type": "shadow",
+              textStyle: {
+                color: "#fff"
+              }
+
+            },
+          },
+          "grid": {
+            "borderWidth": 0,
+            "top": 100,
+            "bottom": 35,
+            "right":30,
+            textStyle: {
+              color: "#fff"
+            }
+          },
+          "legend": {
+            x: '4%',
+            top: '11%',
+            textStyle: {
+              color: '#90979c',
+            },
+            "data": ['班级平均分','班级趋势',,'年级平均分']
+          },
+          "calculable": true,
+          "xAxis": [{
+            "type": "category",
+            "axisLine": {
+              lineStyle: {
+                color: '#90979c'
+              }
+            },
+            "splitLine": {
+              "show": false
+            },
+            "axisTick": {
+              "show": false
+            },
+            "splitArea": {
+              "show": false
+            },
+            "axisLabel": {
+              "interval": 0,
+
+            },
+            "data": ["在线检测(2019.03.07)", "在线检测(2019.01.13)", "在线检测(2018.12.20)", "在线检测(2018.12.03)", "在线检测(2018.11.15)"],
+          }],
+          "yAxis": [{
+            "type": "value",
+            "splitLine": {
+              "show": false
+            },
+            "axisLine": {
+              lineStyle: {
+                color: '#90979c'
+              }
+            },
+            "axisTick": {
+              "show": false
+            },
+            "axisLabel": {
+              "interval": 0,
+
+            },
+            "splitArea": {
+              "show": false
+            },
+
+          }],
+          "series": [
+            {
+              "name": "班级平均分",
+              "type": "bar",
+              symbolSize: 5,
+              barMaxWidth: 30,//最大宽度
+              symbol: 'circle',
+              "itemStyle": {
+                "normal": {
+                  "color": "rgba(127,255,212,1)",
+                  "barBorderRadius": 0,
+                  "label": {
+                    "show": true,
+                    "position": "top",
+                    formatter: function (p) {
+                      return p.value > 0 ? (p.value) : '';
+                    }
+                  }
+                }
+              },
+              "data": [80, 82, 86, 80, 78, 83],
+            },
+            {
+            "name": "班级趋势",
+            "type": "line",
+            "stack": "总量",
+            "barMaxWidth": 5,
+            "barGap": "10%",
+            "itemStyle": {
+              "normal": {
+                "color": "rgba(255,144,128,1)",
+                "label": {
+                  "show": true,
+                  "textStyle": {
+                    "color": "#fff"
+                  },
+                  "position": "insideTop",
+                  formatter: function (p) {
+                    return p.value > 0 ? (p.value) : '';
+                  }
+                }
+              }
+            },
+            "data": [76,83,93,90,68,83],
+          },
+            {
+              "name": "年级平均分",
+              "type": "line",
+              symbolSize: 10,
+              symbol: 'circle',
+              "itemStyle": {
+                "normal": {
+                  "color": "rgba(30,144,255,1)",
+                  "barBorderRadius": 0,
+                  "label": {
+                    "show": true,
+                    "position": "top",
+                    formatter: function (p) {
+                      return p.value > 0 ? (p.value) : '';
+                    }
+                  }
+                }
+              },
+              "data": [76, 72, 76, 80, 79, 77],
+            },
+          ]
+        })
+     },
+      graph() {
+        let myCharts = this.$echarts.init(document.getElementById('zhishidian'));
+        myCharts.setOption({
+          backgroundColor: "#344b58",
+          title: {
+            text: '知识点分数占比',
+            left: 'center',
+            top: 20,
+            textStyle: {
+              color: '#fff'
+            }
+          },
+          tooltip: {
+            trigger: 'item',
+            formatter: "{b} : {c} ({d}%)"
+          },
+
+          visualMap: {
+            show: false,
+            min: 0,
+            max: 100,
+            inRange: {
+              //colorLightness: [0, 1]
+            }
+          },
+          series: [{
+            name: '访问来源',
+            type: 'pie',
+            radius: '70%',
+            center: ['50%', '50%'],
+            color: ['rgb(131,249,103)', '#FBFE27', '#FE5050', '#1DB7E5'], //'#FBFE27','rgb(11,228,96)','#FE5050'
+            data: [{
+              value: 15,
+              name: '知识点1'
+            },
+            {
+              value: 20,
+              name: '知识点2'
+            },
+            {
+              value: 30,
+              name: '知识点3'
+            },
+            {
+              value: 35,
+              name: '知识点4'
+            }
+            ].sort(function (a, b) {
+              return a.value - b.value
+            }),
+            roseType: 'radius',
+            label: {
+              normal: {
+                formatter: ['{c|{c}分}', '{b|{b}}'].join('\n'),
+                rich: {
+                  c: {
+                    color: '#fff',
+                    fontSize: 20,
+                    fontWeight: 'bold',
+                    lineHeight: 5
+                  },
+                  b: {
+                    color: 'rgb(98,137,169)',
+                    fontSize: 15,
+                    height: 40
+                  },
+                },
+              }
+            },
+            labelLine: {
+              normal: {
+                lineStyle: {
+                  color: 'rgb(98,137,169)',
+                },
+                smooth: 0.2,
+                length: 10,
+                length2: 20,
+
+              }
+            },
+            itemStyle: {
+              normal: {
+                shadowColor: 'rgba(0, 0, 0, 0.8)',
+                shadowBlur: 50,
+              }
+            }
+          }]
+        })
+      },
+      pie() {
+        let myChartc = this.$echarts.init(document.getElementById('pie'));
+        myChartc.setOption({
+          backgroundColor: "#344b58",
+          title: {
+            text: '雷达图'
+          },
+          tooltip: {},
+          legend: {
+            top: 20,
+            itemWidth: 12,
+            itemHeight: 12,
+            textStyle: {
+              color: '#fff'
+            }
+          },
+          radar: {
+            radius: '60%',
+            splitNumber: 8,
+            axisLine: {
+              lineStyle: {
+                color: '#fff',
+                opacity: .2
+              }
+            },
+            splitLine: {
+              lineStyle: {
+                color: '#fff',
+                opacity: .2
+              }
+            },
+            splitArea: {
+              areaStyle: {
+                color: 'rgba(127,95,132,.3)',
+                opacity: 1,
+                shadowBlur: 45,
+                shadowColor: 'rgba(0,0,0,.5)',
+                shadowOffsetX: 0,
+                shadowOffsetY: 15,
+              }
+            },
+            indicator: [{
+              name: '选择题',
+              max: 100
+            }, {
+              name: '填空题',
+              max: 100
+            }, {
+              name: '文言文',
+              max: 100
+            }, {
+              name: '阅读理解',
+              max: 100
+            }, {
+              name: '古诗词',
+              max: 100
+            }, {
+              name: '作文',
+              max: 100
+            }]
+          },
+          series: [{
+            name: '',
+            type: 'radar',
+            symbolSize: 0,
+            areaStyle: {
+              normal: {
+                shadowBlur: 13,
+                shadowColor: 'rgba(0,0,0,.2)',
+                shadowOffsetX: 0,
+                shadowOffsetY: 10,
+                opacity: 1
+              }
+            },
+            data: [{
+              value: [70, 80, 65, 70, 60, 85],
+              name: '',
+            },]
+          }],
+          color: ['#ef4b4c', '#b1eadb'],
+          backgroundColor: {
+            type: 'radial',
+            x: 0.4,
+            y: 0.4,
+            r: 0.35,
+            colorStops: [{
+              offset: 0,
+              color: '#895355' // 0% 处的颜色
+            }, {
+              offset: .4,
+              color: '#593640' // 100% 处的颜色
+            }, {
+              offset: 1,
+              color: '#39273d' // 100% 处的颜色
+            }],
+            globalCoord: false // 缺省为 false
+          }
+        })
+      },
+      rowClassName(row, index) {
+        if (index === 1) {
+          return 'demo-table-info-row';
+        } else if (index === 3) {
+          return 'demo-table-error-row';
+        }
+        return '';
+      }
+    }
+  }
+</script>
+<style>
+ .ivu-select-single .ivu-select-selection .ivu-select-selected-value {
+    border: 1px solid #d3d3d3 !important;
+    border-radius: 7px;
+  }
+  .ivu-table .demo-table-info-row td {
+    background-color: #2db7f5;
+    color: #fff;
+  }
+
+  .ivu-table .demo-table-error-row td {
+    background-color: #ff6600;
+    color: #fff;
+  }
+
+  .ivu-table td.demo-table-info-column {
+    background-color: #2db7f5;
+    color: #fff;
+  }
+
+  .ivu-table .demo-table-info-cell-name {
+    background-color: #2db7f5;
+    color: #fff;
+  }
+
+  .ivu-table .demo-table-info-cell-age {
+    background-color: #ff6600;
+    color: #fff;
+  }
+
+  .ivu-table .demo-table-info-cell-address {
+    background-color: #187;
+    color: #fff;
+  }
+</style>
+<style scoped>
+  .report_container {
+    width:100%;
+    height:auto;
+  }
+  .report_box {
+    width:1200px;
+    height:auto;
+    margin:0 auto;
+  }
+  .header_basic {
+    width:100%;
+    text-align:center;
+    border-bottom:1px solid #ddd;
+    margin-top:5px;
+    padding:10px 0 20px
+  }
+    .header_basic ul {
+      display:inline-block;
+      margin-top:20px;
+    }
+      .header_basic ul li {
+        padding:3px 4px 2px 4px;
+        margin:0 15px;
+      }
+        .header_basic ul li i {
+          float: left;
+          margin-top: 4px;
+        }
+  .name {
+    font-size: 18px;
+
+  }
+  .name_content {
+    font-size: 20px;
+  }
+  .vice-name, .vice-name_content {
+    font-size: 15px;color: #666;
+  }
+  .chooseexam {
+    width:100%;
+    height:auto;
+    margin:60px 0 40px;
+  }
+  .exam {
+    width:25%;
+    float:left;
+    padding-left:1%;
+    margin-right: 30px;
+
+  }
+  .summarize {
+    width: 96%;
+    margin: 2%;
+    /*border:1px solid #d3d3d3;*/
+    background: #f5f5f5;
+
+    padding:15px 20px 30px;
+    border-radius:5px;
+  }
+  .summarize_header_title {
+    font-size:22px;
+    padding-top:10px;
+  }
+  .summarize_content {
+    width:1000px;
+    height:auto;
+    margin:0 auto;
+  }
+    .summarize_content p {
+     margin:10px 0;
+    }
+    .content_header {
+      font-size: 16px;
+    }
+  .content_text {
+    font-size: 14px;
+  }
+    .content_text span {
+      font-size:16px;
+    }
+  .exam_color, .dot1 {
+    color: #FF6633;
+  }
+  .number_color, .dot4 {
+    color: #FF3366;
+  }
+  .number_color1 {
+    color: #4876FF
+  }
+  .number_color2 {
+    color: #76EE00
+  }
+  .dot2 {
+    color: #0099CC;
+  }
+  .dot3 {
+    color: #0000CC;
+  }
+  .trend, .structure {
+    width: 100%;
+    height: auto;
+    padding: 1.5%;
+  }
+    .reportTit{
+      font-size: 16px;
+      font-weight: bold;
+      margin:20px 0 10px;
+    }
+  .structure_details {
+    width:100%;
+    padding:1%;
+    margin:20px 0;
+
+  }
+
+</style>

TEAMModelOS.TeachZone/ClientApp/view/teachPreclass.vue

@@ -0,0 +1,145 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <WorkMaster></WorkMaster>
+    <div class="wrap ov bodyContent">
+      <!--<workLeft></workLeft>-->
+      <RecomLeft></RecomLeft>
+      <div class="main fr">
+        <h4 ><a href="/">首页</a> > 课前导学</h4>
+        <div class="content ov bgf pad20">
+          <Screen></Screen>
+          <Sort></Sort>
+          <ul class="workSourceList" v-for="item in list">
+            <li :class="item.type">
+              <div class="ov">
+                <h2 class="fl"><a :href="'/'+item.src">{{item.title}}</a></h2>
+                <p class="fr">
+                  <Rate show-text allow-half disabled v-model="item.star">
+                    <span>{{ item.star }}分</span>
+                  </Rate>
+                </p>
+              </div>
+              <div class="ov">
+                <ol class="fl">
+                  <li>大小：{{item.size}}</li>
+                  <li>来源：{{item.source}}</li>
+                  <li>时间：{{item.date}}</li>
+                </ol>
+                <ol class="fr woekOper">
+                  <li><a :href="'/'+item.src"><Icon type="md-eye"/> 预览({{item.preview}})</a></li>
+                  <li><a href=""><Icon type="ios-heart"/> 收藏({{item.collect}})</a></li>
+                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
+                </ol>
+              </div>
+            </li>
+          </ul>
+          <Page :total="100"  size="small" show-total class="fr" />
+        </div>
+      </div>
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/header.vue'
+  import WorkMaster from '@/common/workMaster.vue'
+  import WorkLeft from '@/common/workLeft.vue'
+  import RecomLeft from '@/common/recomLeft.vue'
+  import Screen from '@/common/screen.vue'
+  import Textbook from '@/common/textbook.vue'
+  import Sort from '@/common/screenSort.vue'
+  import Footer from '@/common/footer.vue'
+  import ScoreList from '@/components/scoreList.vue'
+  export default {
+    components: {
+      Header,
+      WorkMaster,
+      WorkLeft,
+      RecomLeft,
+      Screen,
+      Textbook,
+      Sort,
+      Footer,
+      ScoreList
+    },
+    data () {
+      return {
+        valueText: 5,
+        modal1: false,
+        formItem: {
+          select: 'sel1',
+          select2: 'sel2',
+          input: '',
+          textarea: '',
+        },
+        list:[
+          {
+            type:'daoxue',
+            src:'teachSourceDetail',
+            title:'综合探究——从地图上获取信息-导学',
+            star:5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'daoxue',
+            src:'teachSourceDetail',
+            title:'综合探究——从地图上获取信息-导学',
+            star:5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'daoxue',
+            src:'teachSourceDetail',
+            title:'综合探究——从地图上获取信息-导学',
+            star:5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },{
+            type:'daoxue',
+            src:'teachSourceDetail',
+            title:'综合探究——从地图上获取信息-导学',
+            star:5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },
+
+        ]
+      }
+    },
+    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/teachPrelesson.vue

@@ -0,0 +1,191 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <WorkMaster></WorkMaster>
+    <div class="wrap ov bodyContent">
+      <!--<workLeft></workLeft>-->
+      <RecomLeft></RecomLeft>
+      <div class="main fr">
+        <h4 ><a href="/">首页</a> > 同步备课</h4>
+        <div class="content ov bgf pad20">
+          <Screen></Screen>
+          <ScreenSort></ScreenSort>
+          <ul class="workSourceList" v-for="item in list">
+            <li :class="item.type">
+              <div class="ov">
+                <h2 class="fl"><a :href="'/'+item.src">{{item.title}}</a></h2>
+                <p class="fr">
+                  <Rate show-text allow-half disabled v-model="item.star">
+                    <span>{{ item.star }}分</span>
+                  </Rate>
+                </p>
+              </div>
+              <div class="ov">
+                <ol class="fl">
+                  <li>大小：{{item.size}}</li>
+                  <li>来源：{{item.source}}</li>
+                  <li>时间：{{item.date}}</li>
+                </ol>
+                <ol class="fr woekOper">
+                  <li><a :href="'/'+item.src"><Icon type="md-eye"/> 预览({{item.preview}})</a></li>
+                  <li><a href=""><Icon type="ios-heart"/> 收藏({{item.collect}})</a></li>
+                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
+                </ol>
+              </div>
+            </li>
+          </ul>
+          <Page :total="100"  size="small" show-total class="fr" />
+        </div>
+      </div>
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/header.vue'
+  import WorkMaster from '@/common/workMaster.vue'
+  import WorkLeft from '@/common/workLeft.vue'
+  import RecomLeft from '@/common/recomLeft.vue'
+  import Screen from '@/common/screen.vue'
+  import ScreenSort from '@/common/screenSort.vue'
+  import Footer from '@/common/footer.vue'
+  import ScoreList from '@/components/scoreList.vue'
+  export default {
+    components: {
+      Header,
+      WorkMaster,
+      WorkLeft,
+      RecomLeft,
+      Screen,
+      ScreenSort,
+      Footer,
+      ScoreList
+    },
+    data () {
+      return {
+        valueText: 5,
+        modal1: false,
+        formItem: {
+          select: 'sel1',
+          select2: 'sel2',
+          input: '',
+          textarea: '',
+        },
+        list:[
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'带着地图去旅行.doc',
+            star:5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'感受生命的意义.doc',
+            star:4.5,
+            size:'1.64MB',
+            source:'朱艳娜',
+            date:'2019-04-07',
+            preview:'10',
+            collect:'5',
+            download:'3'
+          },
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'历史与社会.doc',
+            star:5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'ppt',
+            src:'teachSourcePpt',
+            title:'综合探究三——如何认识区域（以南非为例）.ppt',
+            star:5,
+            size:'1.32MB',
+            source:'马平儿',
+            date:'2019-04-08',
+            preview:'20',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'ppt',
+            src:'teachSourcePpt',
+            title:'带着地图去旅行(课件).ppt',
+            star:4.5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'16',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'video',
+            src:'teachSourceVideo',
+            title:'公开课4.2文化艺术之都：巴黎.doc',
+            star:4.5,
+            size:'1.64MB',
+            source:'朱艳娜',
+            date:'2019-04-07',
+            preview:'10',
+            collect:'5',
+            download:'3'
+          },
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'带着地图去旅行(课件).doc',
+            star:4.5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'16',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'综合探究三——如何认识区域（以南非为例）.doc',
+            star:5,
+            size:'1.32MB',
+            source:'马平儿',
+            date:'2019-04-08',
+            preview:'20',
+            collect:'5',
+            download:'4'
+          },
+        ]
+      }
+    },
+    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/teachSource.vue

@@ -1,247 +1,36 @@
 <template>
   <div id="app">
     <Header></Header>
-    <WorkMaster></WorkMaster>
-    <div class="wrap ov">
-      <WorkLeft></WorkLeft>
+    <!--<WorkMaster></WorkMaster>-->
+    <Master></Master>
+    <div class="wrap ov bodyContent">
+      <!--<workLeft></workLeft>-->
+      <RecomLeft></RecomLeft>
       <div class="main fr">
-        <h4><a href="/">首页</a> > <a href="/">我的工作</a> > 教材资源</h4>
+        <h4 ><a href="/">首页</a> > 教材资源</h4>
         <div class="content ov bgf pad20">
-          <div class="screen">
-            <ul>
-              <li>
-                <span class="fl">来源：</span>
-                <ol class="fl">
-                  <li><a href="" class="active">全部</a></li>
-                  <li><a href="">我的资源</a></li>
-                  <li><a href="">共享资源</a></li>
-                  <li><a href="">精品资源</a></li>
-                  <li><a href="">校本资源</a></li>
-                </ol>
-              </li>
-              <li>
-                <span class="fl">类型：</span>
-                <ol class="fl">
-                  <li><a href="" class="active">全部</a></li>
-                  <li><a href="">教案</a></li>
-                  <li><a href="">学案</a></li>
-                  <li><a href="">课件</a></li>
-                  <li><a href="">微课</a></li>
-                  <li><a href="">习题</a></li>
-                  <li><a href="">素材</a></li>
-                  <li><a href="">拓展</a></li>
-                </ol>
-              </li>
-            </ul>
-          </div>
-          <div class="workSort ov">
-            <ul class="fl">
-              <li><a href="" class="active">默认</a></li>
-              <li><a href="">评分</a></li>
-              <li><a href="">收藏</a></li>
-              <li><a href="">预览</a></li>
-              <li><a href="">大小</a></li>
-            </ul>
-            <div class="fr ov">
-                <Select v-model="formItem.select">
-                  <Option value="sel1" >格式</Option>
-                  <Option value="">图片</Option>
-                  <Option value="">文档</Option>
-                  <Option value="">视频</Option>
-                  <Option value="">音频</Option>
-                  <Option value="">动画</Option>
-                </Select>
-                <Select v-model="formItem.select2">
-                <Option value="sel2" >全部区域</Option>
-                <Option value="">本省区域</Option>
-                <Option value="">本市区域</Option>
-                <Option value="">本县区区域</Option>
-                <Option value="">本校范围</Option>
-                <Option value="">我的分享</Option>
-              </Select>
-            </div>
-          </div>
-          <ul class="workSourceList">
-            <li class="ppt">
-              <div class="ov">
-                <h2 class="fl"><a href="/teachSourceDetail">带着地图去旅行</a></h2>
-                <p class="fr">
-                  <Rate show-text allow-half disabled v-model="valueText">
-                    <span>{{ valueText }}分</span>
-                  </Rate>
-                </p>
-              </div>
-              <div class="ov">
-                <ol class="fl">
-                  <li>时间：2019-05-13</li>
-                  <!--<li>引用：4次</li>-->
-                  <li>大小：1.36MB</li>
-                  <li>来源：陆杰（平湖市福臻中学）</li>
-                </ol>
-                <ol class="fr woekOper">
-                  <li><a href="/teachSourceDetail"><Icon type="md-eye"/> 预览(6)</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏(6)</a></li>
-                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
-                </ol>
-              </div>
-            </li>
-            <li class="ppt">
-              <div class="ov">
-                <h2 class="fl"><a href="">带着地图去旅行</a></h2>
-                <p class="fr">
-                  <Rate show-text allow-half disabled v-model="valueText">
-                    <span>{{ valueText }}分</span>
-                  </Rate>
-                </p>
-              </div>
-              <div class="ov">
-                <ol class="fl">
-                  <li>时间：2019-05-13</li>
-                  <!--<li>引用：4次</li>-->
-                  <li>大小：1.36MB</li>
-                  <li>来源：陆杰（平湖市福臻中学）</li>
-                </ol>
-                <ol class="fr woekOper">
-                  <li><a href=""><Icon type="md-eye"/> 预览(6)</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏(6)</a></li>
-                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
-                </ol>
-              </div>
-            </li>
-            <li class="ppt">
-              <div class="ov">
-                <h2 class="fl"><a href="">带着地图去旅行</a></h2>
-                <p class="fr">
-                  <Rate show-text allow-half disabled v-model="valueText">
-                    <span>{{ valueText }}分</span>
-                  </Rate>
-                </p>
-              </div>
-              <div class="ov">
-                <ol class="fl">
-                  <li>时间：2019-05-13</li>
-                  <!--<li>引用：4次</li>-->
-                  <li>大小：1.36MB</li>
-                  <li>来源：陆杰（平湖市福臻中学）</li>
-                </ol>
-                <ol class="fr woekOper">
-                  <li><a href=""><Icon type="md-eye"/> 预览(6)</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏(6)</a></li>
-                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
-                </ol>
-              </div>
-            </li>
-            <li class="video">
-              <div class="ov">
-                <h2 class="fl"><a href="">带着地图去旅行</a></h2>
-                <p class="fr">
-                  <Rate show-text allow-half disabled v-model="valueText">
-                    <span>{{ valueText }}分</span>
-                  </Rate>
-                </p>
-              </div>
-              <div class="ov">
-                <ol class="fl">
-                  <li>时间：2019-05-13</li>
-                  <!--<li>引用：4次</li>-->
-                  <li>大小：1.36MB</li>
-                  <li>来源：陆杰（平湖市福臻中学）</li>
-                </ol>
-                <ol class="fr woekOper">
-                  <li><a href=""><Icon type="md-eye"/> 预览(6)</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏(6)</a></li>
-                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
-                </ol>
-              </div>
-            </li>
-            <li class="word">
-              <div class="ov">
-                <h2 class="fl"><a href="">带着地图去旅行</a></h2>
-                <p class="fr">
-                  <Rate show-text allow-half disabled v-model="valueText">
-                    <span>{{ valueText }}分</span>
-                  </Rate>
-                </p>
-              </div>
-              <div class="ov">
-                <ol class="fl">
-                  <li>时间：2019-05-13</li>
-                  <!--<li>引用：4次</li>-->
-                  <li>大小：1.36MB</li>
-                  <li>来源：陆杰（平湖市福臻中学）</li>
-                </ol>
-                <ol class="fr woekOper">
-                  <li><a href=""><Icon type="md-eye"/> 预览(6)</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏(6)</a></li>
-                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
-                </ol>
-              </div>
-            </li>
-            <li class="word">
-              <div class="ov">
-                <h2 class="fl"><a href="">带着地图去旅行</a></h2>
-                <p class="fr">
-                  <Rate show-text allow-half disabled v-model="valueText">
-                    <span>{{ valueText }}分</span>
-                  </Rate>
-                </p>
-              </div>
-              <div class="ov">
-                <ol class="fl">
-                  <li>时间：2019-05-13</li>
-                  <!--<li>引用：4次</li>-->
-                  <li>大小：1.36MB</li>
-                  <li>来源：陆杰（平湖市福臻中学）</li>
-                </ol>
-                <ol class="fr woekOper">
-                  <li><a href=""><Icon type="md-eye"/> 预览(6)</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏(6)</a></li>
-                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
-                </ol>
-              </div>
-            </li>
-            <li class="ppt">
-              <div class="ov">
-                <h2 class="fl"><a href="">带着地图去旅行</a></h2>
-                <p class="fr">
-                  <Rate show-text allow-half disabled v-model="valueText">
-                    <span>{{ valueText }}分</span>
-                  </Rate>
-                </p>
-              </div>
-              <div class="ov">
-                <ol class="fl">
-                  <li>时间：2019-05-13</li>
-                  <!--<li>引用：4次</li>-->
-                  <li>大小：1.36MB</li>
-                  <li>来源：陆杰（平湖市福臻中学）</li>
-                </ol>
-                <ol class="fr woekOper">
-                  <li><a href=""><Icon type="md-eye"/> 预览(6)</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏(6)</a></li>
-                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
-                </ol>
-              </div>
-            </li>
-            <li class="ppt">
+          <Screen></Screen>
+          <ScreenSort></ScreenSort>
+          <ul class="workSourceList" v-for="item in list">
+            <li :class="item.type">
               <div class="ov">
-                <h2 class="fl"><a href="">带着地图去旅行</a></h2>
+                <h2 class="fl"><a :href="'/'+item.src">{{item.title}}</a></h2>
                 <p class="fr">
-                  <Rate show-text allow-half disabled v-model="valueText">
-                    <span>{{ valueText }}分</span>
+                  <Rate show-text allow-half disabled v-model="item.star">
+                    <span>{{ item.star }}分</span>
                   </Rate>
                 </p>
               </div>
               <div class="ov">
                 <ol class="fl">
-                  <li>时间：2019-05-13</li>
-                  <!--<li>引用：4次</li>-->
-                  <li>大小：1.36MB</li>
-                  <li>来源：陆杰（平湖市福臻中学）</li>
+                  <li><span class="sourceType">课件</span></li>
+                  <li>大小：{{item.size}}</li>
+                  <li>来源：{{item.source}}</li>
+                  <li>时间：{{item.date}}</li>
                 </ol>
                 <ol class="fr woekOper">
-                  <li><a href=""><Icon type="md-eye"/> 预览(6)</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏(6)</a></li>
+                  <li><a :href="'/'+item.src"><Icon type="md-eye"/> 预览({{item.preview}})</a></li>
+                  <li><a href=""><Icon type="ios-heart"/> 收藏({{item.collect}})</a></li>
                   <li><a href=""><Icon type="md-download"/> 下载</a></li>
                 </ol>
               </div>
@@ -256,15 +45,25 @@
 </template>
 <script>
   import Header from '@/common/header.vue'
+  import Master from '@/common/master.vue'
   import WorkMaster from '@/common/workMaster.vue'
   import WorkLeft from '@/common/workLeft.vue'
+  import RecomLeft from '@/common/recomLeft.vue'
+  import Screen from '@/common/screen.vue'
+  import ScreenSort from '@/common/screenSort.vue'
+  import Textbook from '@/common/textbook.vue'
   import Footer from '@/common/footer.vue'
   import ScoreList from '@/components/scoreList.vue'
   export default {
     components: {
       Header,
+      Master,
       WorkMaster,
       WorkLeft,
+      RecomLeft,
+      Screen,
+      Textbook,
+      ScreenSort,
       Footer,
       ScoreList
     },
@@ -278,7 +77,81 @@
           input: '',
           textarea: '',
         },
+        list:[
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'带着地图去旅行.doc',
+            star:5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'感受生命的意义.doc',
+            star:4.5,
+            size:'1.64MB',
+            source:'朱艳娜',
+            date:'2019-04-07',
+            preview:'10',
+            collect:'5',
+            download:'3'
+          },
+          {
+            type:'ppt',
+            src:'teachSourcePpt',
+            title:'综合探究三——如何认识区域（以南非为例.ppt',
+            star:5,
+            size:'1.32MB',
+            source:'马平儿',
+            date:'2019-04-08',
+            preview:'20',
+            collect:'5',
+            download:'4'
+          },
+          {
+            type:'video',
+            src:'teachSourceVideo',
+            title:'人教五上第五单元_列方程解决实际问题',
+            star:4.5,
+            size:'1.64MB',
+            source:'朱艳娜',
+            date:'2019-04-07',
+            preview:'10',
+            collect:'5',
+            download:'3'
+          },
+          {
+            type:'video',
+            src:'teachSourceVideo',
+            title:'人教三上第四单元_三位数减三位',
+            star:4.5,
+            size:'1.64MB',
+            source:'朱艳娜',
+            date:'2019-04-07',
+            preview:'10',
+            collect:'5',
+            download:'3'
+          },
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'带着地图去旅行(课件).doc',
+            star:4.5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            preview:'16',
+            collect:'5',
+            download:'4'
+          },
 
+        ]
       }
     },
     methods: {

TEAMModelOS.TeachZone/ClientApp/view/teachSourceDetail.vue

@@ -1,23 +1,15 @@
 <template>
   <div id="app">
     <Header></Header>
-    <div class="master wrap ov">
-      我的工作
-      <ul class="fr">
-        <li><a href="">教材资源</a></li>
-        <li><a href="">课前导学</a></li>
-        <li><a href="">同步备课</a></li>
-        <li><a href="">在线监测</a></li>
-        <li><a href="">课后作业</a></li>
-      </ul>
-    </div>
+    <WorkMaster></WorkMaster>
     <div class="wrap ov">
-      <div class="main fl">
+      <RecomLeft></RecomLeft>
+      <div class="main fr">
         <h4><a href="/">首页</a> > <a href="/">教材资源</a> > 详情</h4>
         <div class="content ov bgf pad20">
          <div class="sourceDetail">
            <div class="titleBox">
-             <h3> 2017年全国各地中考作文题汇总.doc</h3>
+             <h3 class="word"> 2017年全国各地中考作文题汇总.doc</h3>
              <ul class="info">
                <li>时间：2019-05-13</li>
                <li>大小：1.36MB</li>
@@ -36,10 +28,12 @@
              <h4>总体印象</h4>
              <ul>
                <li>内容充实</li>
-               <li>内容充实</li>
-               <li>内容充实</li>
-               <li>内容充实</li>
+               <li>简单易懂</li>
+               <li>原创精品</li>
+               <li>趣味性强</li>
+               <li>思路新颖</li>
                <li class="bad">质量一般</li>
+               <li class="bad">应用价值不高</li>
              </ul>
            </div>
            <div class="comment">
@@ -54,27 +48,6 @@
          </div>
         </div>
       </div>
-      <div class="sourceRecom bgf fr">
-        <h3>推荐资源 <span class="fr refresh">换一批</span></h3>
-        <ul>
-          <li>
-            <a href="">当我们的手中只剩下一片树叶.docx</a>
-            <p><Rate  allow-half  v-model="valueText"></Rate></p>
-          </li>
-          <li>
-            <a href="">当我们的手中只剩下一片树叶.docx</a>
-            <p><Rate  allow-half  v-model="valueText"></Rate></p>
-          </li>
-          <li>
-            <a href="">当我们的手中只剩下一片树叶.docx</a>
-            <p><Rate allow-half  v-model="valueText"></Rate></p>
-          </li>
-          <li>
-            <a href="">当我们的手中只剩下一片树叶.docx</a>
-            <p><Rate  allow-half  v-model="valueText"></Rate></p>
-          </li>
-        </ul>
-      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -82,6 +55,7 @@
 <script>
   import Header from '@/common/header.vue'
   import WorkMaster from '@/common/workMaster.vue'
+  import RecomLeft from '@/common/recomLeft.vue'
   import WorkLeft from '@/common/workLeft.vue'
   import Footer from '@/common/footer.vue'
   import ScoreList from '@/components/scoreList.vue'
@@ -89,6 +63,7 @@
     components: {
       Header,
       WorkMaster,
+      RecomLeft,
       WorkLeft,
       Footer,
       ScoreList

TEAMModelOS.TeachZone/ClientApp/view/teachSourceVideo.vue

@@ -0,0 +1,101 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <WorkMaster></WorkMaster>
+    <div class="wrap ov">
+      <RecomLeft></RecomLeft>
+      <div class="main fr">
+        <h4><a href="/">首页</a> > <a href="/">教材资源</a> > 详情</h4>
+        <div class="content ov bgf pad20">
+         <div class="sourceDetail">
+           <div class="titleBox">
+             <h3 class="video"> 人教五上第五单元_列方程解决实际问题</h3>
+             <ul class="info">
+               <li>时间：2019-05-13</li>
+               <li>大小：1.36MB</li>
+               <li>引用：4次</li>
+               <li>播放：20次</li>
+               <li>来源：陆杰（平湖市福臻中学）</li>
+               <li>得分：<Rate allow-half disabled v-model="valueText">
+               </Rate></li>
+             </ul>
+           </div>
+           <div >
+             <video controls="controls" src="http://mct-whtymct.huijiaoyun.com/gfs_mnt/data7/2017/12/14/16/33/d5954e58a8b841b0b7a175a92c1d2af9/af13a29dc9db4e5cb0cf1f39602940e9/a090dc48419942be8edfb79cfce49899.mp4?authorization=bce-auth-v1/08da4fd5cf644d458c950b09bdb95666/2017-12-14T08:46:29Z/-1//c6ff6e09909a38673aeedbbe8f74ab964771f45359a8728f06b0f7f5e164ac20" id="ckplayer_a1" width="937" height="480"></video>
+             <!--<iframe src="http://res.huijiaoyun.com:22021//data9/transform/2019/1/14/21/56/8b188019f7f1406694fbd52154840654/28870b8a84e5b7fe607419a194d09699.doc/html4/transform.html"></iframe>-->
+           </div>
+           <div class="comment">
+             <h4>总体印象</h4>
+             <ul>
+               <li>内容充实</li>
+               <li>简单易懂</li>
+               <li>原创精品</li>
+               <li>趣味性强</li>
+               <li>思路新颖</li>
+               <li class="bad">质量一般</li>
+               <li class="bad">应用价值不高</li>
+             </ul>
+           </div>
+           <div class="comment">
+             <h4>评论
+               <Rate show-text allow-half ></Rate></h4>
+             <Input  type="textarea" :rows="5" placeholder="请输入您的评论..." />
+             <div class="tr commentBtn">
+               <span>还能输入140个字</span>
+               <Button type="primary" size="large">提交</Button>
+             </div>
+           </div>
+         </div>
+        </div>
+      </div>
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/header.vue'
+  import WorkMaster from '@/common/workMaster.vue'
+  import RecomLeft from '@/common/recomLeft.vue'
+  import WorkLeft from '@/common/workLeft.vue'
+  import Footer from '@/common/footer.vue'
+  import ScoreList from '@/components/scoreList.vue'
+  export default {
+    components: {
+      Header,
+      WorkMaster,
+      RecomLeft,
+      WorkLeft,
+      Footer,
+      ScoreList
+    },
+    data () {
+      return {
+        valueText: 5,
+        modal1: false,
+        formItem: {
+          select: 'sel1',
+          select2: 'sel2',
+          input: '',
+          textarea: '',
+        },
+
+      }
+    },
+    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/teachTask.vue

@@ -0,0 +1,154 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <WorkMaster></WorkMaster>
+    <div class="wrap ov bodyContent">
+      <!--<workLeft></workLeft>-->
+      <RecomLeft></RecomLeft>
+      <div class="main fr">
+        <h4 ><a href="/">首页</a> > 课后作业</h4>
+        <div class="content ov bgf pad20">
+          <Screen></Screen>
+          <Sort></Sort>
+          <ul class="workSourceList" v-for="item in list">
+            <li :class="item.type">
+              <div class="ov">
+                <h2 class="fl"><a :href="'/'+item.src">{{item.title}}</a></h2>
+                <!--<p class="fr">-->
+                <!--<Rate show-text allow-half disabled v-model="item.star">-->
+                <!--<span>{{ item.star }}分</span>-->
+                <!--</Rate>-->
+                <!--</p>-->
+                <div class="fr" style="width: 150px;">
+                  <Progress :percent="(item.done/item.all)*100"/>
+                </div>
+              </div>
+              <div class="ov">
+                <ol class="fl">
+                  <li>大小：{{item.size}}</li>
+                  <li>来源：{{item.source}}</li>
+                  <li>时间：{{item.date}}</li>
+                </ol>
+                <ol class="fr woekOper">
+                  <!--<li><a :href="'/'+item.src"><Icon type="md-eye"/> 预览({{item.preview}})</a></li>-->
+                  <!--<li><a href=""><Icon type="ios-heart"/> 收藏({{item.collect}})</a></li>-->
+                  <!--<li><a href=""><Icon type="md-download"/> 下载</a></li>-->
+                  <!--<li><a href=""><Icon type="md-person"/> 参与人数：0/38</a></li>-->
+                </ol>
+
+                <p class="fr"><a href=""><Icon type="md-person"/> 参与人数：{{item.done}}/{{item.all}}</a></p>
+              </div>
+            </li>
+          </ul>
+          <Page :total="100"  size="small" show-total class="fr" />
+        </div>
+      </div>
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/header.vue'
+  import WorkMaster from '@/common/workMaster.vue'
+  import WorkLeft from '@/common/workLeft.vue'
+  import RecomLeft from '@/common/recomLeft.vue'
+  import Screen from '@/common/screen.vue'
+  import Textbook from '@/common/textbook.vue'
+  import Sort from '@/common/screenSort.vue'
+  import Footer from '@/common/footer.vue'
+  import ScoreList from '@/components/scoreList.vue'
+  export default {
+    components: {
+      Header,
+      WorkMaster,
+      WorkLeft,
+      RecomLeft,
+      Screen,
+      Textbook,
+      Sort,
+      Footer,
+      ScoreList
+    },
+    data () {
+      return {
+        valueText: 5,
+        modal1: false,
+        formItem: {
+          select: 'sel1',
+          select2: 'sel2',
+          input: '',
+          textarea: '',
+        },
+        list:[
+          {
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第一单元——章节练习',
+            star:5,
+            size:'1.32MB',
+            source:'陆杰',
+            date:'2019-04-21',
+            percent:55,
+            all:100,
+            done:20,
+          },
+          {
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第二单元——章节练习',
+            star:5,
+            size:'1.12MB',
+            source:'陆杰',
+            date:'2019-04-08',
+            percent:55,
+            all:100,
+            done:50,
+          },
+          {
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第三单元——章节练习',
+            star:5,
+            size:'1.89MB',
+            source:'陆杰',
+            date:'2019-03-15',
+            percent:55,
+            all:100,
+            done:100,
+          },
+          {
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第四单元——章节练习',
+            star:5,
+            size:'1.56MB',
+            source:'陆杰',
+            date:'2019-03-02',
+            percent:55,
+            all:100,
+            done:80,
+          },
+        ]
+      }
+    },
+    creted(){
+
+    },
+    methods: {
+      ok () {
+        this.$Message.info('发布成功');
+      },
+      // cancel () {
+      //   this.$Message.info('');
+      // }
+      yes () {
+        this.modal1 = false;
+        this.$Message.success('发布成功');
+      },
+      cancel () {
+        this.modal1 = false;
+      }
+    }
+  }
+</script>
+