luoxiaoli@foxmail.com vor 6 Jahren
Ursprung
Commit
d746045bad

+ 7 - 2
TEAMModelOS.SmartTeach/ClientApp/components/resource/home.vue

@@ -45,7 +45,6 @@
     data() {
       return {
         homeCarouselImg: [
-
           {
             images: require('../../assets/image/resource/banner02.png')
           },
@@ -55,7 +54,13 @@
         ]
       };
     },
-   
+   methods:{
+      init(){
+        $.api.
+
+      }
+
+   }
   }
 </script>
 <style scoped>

+ 3 - 1
TEAMModelOS.TeachZone/ClientApp/assets/css/common.css

@@ -14,7 +14,9 @@ table{border-collapse:collapse;border-spacing:0;}
 th,td{padding:0;}
 img,a img{border:0;margin:0;padding:0;}
 img{border:none;max-width: 100%;}
-a,a:link,a:visited,a:active{outline-style:none;color:#141414;text-decoration:none;}
+a,a:link,a:visited,a:active{outline-style:none;color:#141414;text-decoration:none;
+    -webkit-transition: none;transition: none;
+}
 
 i{font-style: normal;}
 li{float:left;}

+ 73 - 18
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,7 +19,7 @@ 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;}
@@ -55,7 +57,7 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
     /*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 }
@@ -63,17 +65,30 @@ 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;}
+.ivu-select-item{width: 100%}
+/*.ivu-tree ul{font-size: 14px;}*/
+.ivu-tree>ul>li>.ivu-tree-title{font-weight: bold;font-size: 14px;color: #333;}
+.ivu-tree>ul>li>.ivu-tree-title:hover,.ivu-tree>ul>li>.ivu-tree-title-selected,.ivu-tree>ul>li>.ivu-tree-title-selected:hover{background:none;color: #333;}
+.ivu-tree-title{transition: none;-webkit-transition:none;border-radius: 0;}
+.ivu-tree-title-selected, .ivu-tree-title-selected:hover,.ivu-tree-title:hover{background:#eee; }
+.ivu-tree li ul{padding:0;}
+.ivu-tree li ul li{margin:0;width: 100%;}
+.ivu-tree li ul li>span.ivu-tree-title{width: 100%;padding:5px 20px;}
+
+
 
 
-.workLeft{padding:0 10px;}
 .footer{line-height:80px;margin-top: 100px;font-size: 12px;color: #666;}
 
-.ivu-tree-children{overflow: auto;}
+/*.ivu-tree-children{overflow: auto;}*/
 
 /*index*/
 /*main*/
@@ -155,21 +170,24 @@ 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;}
 
-.workSourceList>li.ppt,.sourceRecom>ul>li.ppt{background-image: url("../image/w-ppt.png") }
-.workSourceList>li.word,.sourceRecom>ul>li.word{background-image: url("../image/w-word.png")}
-.workSourceList>li.video,.sourceRecom>ul>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;}
@@ -193,7 +211,7 @@ 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 0px 20px; }
+.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;
@@ -205,16 +223,53 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
     cursor: pointer;
 }
 .sourceRecom>h3>.refresh:hover{color: #4063e0;background-image: url("../image/refresh_hover.png") }
-.sourceRecom>ul>li{ padding:10px 15px 10px 45px;
+.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{}
-.sourceRecom>ul>li:hover{background-color: #f5f5f5;}
-.sourceRecom>ul>li:hover>a{color:#26c6da; }
+.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-bottom:15px;}
+.numCard>.answerCard>.num>ol{padding:30px 10px 30px;min-height: 150px;}
+.numCard>.answerCard>.num>ol>li{background: #eee;border-bottom:2px solid #ccc;color:#666;font-size:12px;margin:5px;width: 20px;height:20px;text-align: center;cursor: pointer;}
+.numCard>.answerCard>.num>ol>li.active{background: #ccc;color: #fff;}
+.numCard>.answerCard>.num>p{padding:0 10px;}
+.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.2);}
+.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%;}

BIN
TEAMModelOS.TeachZone/ClientApp/assets/image/refresh.png


+ 36 - 12
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,8 +50,18 @@
 </template>
 
 <script>
+
     export default {
-        name: "header"
+      name: "header",
+      data () {
+        return {
+          formItem: {
+            select: 'sel1',
+            select2: 'sel2',
+
+          },
+        }
+      },
     }
 </script>
 

+ 1 - 1
TEAMModelOS.TeachZone/ClientApp/common/master.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="master wrap">
-    张三的空间
+      <a href="/">张三的空间</a>
     </div>
   </div>
 

+ 55 - 73
TEAMModelOS.TeachZone/ClientApp/common/recomLeft.vue

@@ -1,14 +1,58 @@
 <template>
-  <div class="left bgf workLeft" style="position: fixed;right:0;">
-    <Select v-model="select">
-      <Option value="sel1" >初中历史与社会人教课标版</Option>
-      <Option value="">思想政治人教标本七年级上册</Option>
-      <Option value="">地理人教科标板七年级上册</Option>
-      <Option value="">地理人教科标板七年级上册</Option>
-      <Option value="">音地理人教科标板七年级上册频</Option>
-      <Option value="">地理人教科标板七年级上册</Option>
-    </Select>
-    <Tree :data="data1"></Tree>
+  <div class="left fl">
+    <dl class="work bgf" style="margin-bottom: 12px;">
+      <dt>我的工作</dt>
+      <dd><a href="/teachSource" class="active"><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="/teachCheck"><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>
 
@@ -16,69 +60,7 @@
   export default {
     data () {
       return {
-        select:'sel1',
-        data1: [
-          // {
-          //   title: '初中历史与社会人教课标版 ',
-          //   expand: true,
-          //   children: [
-              {
-                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: '综合探究三 如何认识区域'
-                  },
-                ]
-              },
-            // ]
-          // }
-        ]
+        valueText:5
       }
     }
 

+ 39 - 3
TEAMModelOS.TeachZone/ClientApp/common/screen.vue

@@ -1,12 +1,48 @@
 <template>
-  <div class="footer wrap">
-    <p class="tc">技术支持:成都益教信息技术有限公司   © 2018 yun.zjer.cn All rights reserved      ICP备案号:浙ICP备05000083 | 浙公网安备 33010602005197号</p>
+  <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>
+          <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>
+        </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>
+        </ol>
+      </li>
+    </ul>
   </div>
 </template>
 
 <script>
     export default {
-        name: "header"
+        name: "screen"
     }
 </script>
 

+ 13 - 6
TEAMModelOS.TeachZone/ClientApp/common/screenSort.vue

@@ -1,5 +1,5 @@
 <template>
-
+  <div>
   <div class="workSort ov">
     <ul class="fl">
       <li><a href="" class="active">默认</a></li>
@@ -10,7 +10,7 @@
       <li><a href="">时间</a></li>
     </ul>
     <div class="fr ov">
-      <Select v-model="formItem.select">
+      <Select v-model="select">
         <Option value="sel1" >格式</Option>
         <Option value="">图片</Option>
         <Option value="">文档</Option>
@@ -18,7 +18,7 @@
         <Option value="">音频</Option>
         <Option value="">动画</Option>
       </Select>
-      <Select v-model="formItem.select2">
+      <Select v-model="select2">
         <Option value="sel2" >全部区域</Option>
         <Option value="">本省区域</Option>
         <Option value="">本市区域</Option>
@@ -28,12 +28,19 @@
       </Select>
     </div>
   </div>
+  </div>
 </template>
 
 <script>
-    export default {
-        name: "header"
-    }
+  export default {
+    data () {
+      return {
+        select:'sel1',
+        select2:'sel2'
+      }
+    },
+
+  }
 </script>
 
 <style scoped>

+ 17 - 2
TEAMModelOS.TeachZone/ClientApp/common/textbook.vue

@@ -1,6 +1,21 @@
 <template>
-  <div class="footer wrap">
-    <p class="tc">技术支持:成都益教信息技术有限公司   © 2018 yun.zjer.cn All rights reserved      ICP备案号:浙ICP备05000083 | 浙公网安备 33010602005197号</p>
+  <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="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>
   </div>
 </template>
 

+ 16 - 7
TEAMModelOS.TeachZone/ClientApp/common/workLeft.vue

@@ -1,5 +1,13 @@
 <template>
-  <div class="left bgf fl workLeft">
+  <div class="left bgf workLeft" style="position: fixed;right:0;">
+    <Select v-model="select">
+      <Option value="sel1" >初中历史与社会人教课标版</Option>
+      <Option value="">思想政治人教标本七年级上册</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+      <Option value="">音地理人教科标板七年级上册频</Option>
+      <Option value="">地理人教科标板七年级上册</Option>
+    </Select>
     <Tree :data="data1"></Tree>
   </div>
 </template>
@@ -8,11 +16,12 @@
   export default {
     data () {
       return {
+        select:'sel1',
         data1: [
-          {
-            title: '初中历史与社会人教课标版 ',
-            expand: true,
-            children: [
+          // {
+          //   title: '初中历史与社会人教课标版 ',
+          //   expand: true,
+          //   children: [
               {
                 title: '致同学们',
                 expand: true,
@@ -67,8 +76,8 @@
                   },
                 ]
               },
-            ]
-          }
+            // ]
+          // }
         ]
       }
     }

+ 1 - 1
TEAMModelOS.TeachZone/ClientApp/common/workMaster.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="master wrap ov">
-    我的工作
+    <a href="/">我的空间</a>
     <ul class="fr">
       <li><a href="">教材资源</a></li>
       <li><a href="">课前导学</a></li>

+ 36 - 0
TEAMModelOS.TeachZone/ClientApp/router/routes.js

@@ -10,6 +10,12 @@ 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 { resolve } from 'url';
 
 export const routes = [
@@ -58,4 +64,34 @@ 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
+  },
 ]

+ 169 - 70
TEAMModelOS.TeachZone/ClientApp/view/teachCheck.vue

@@ -3,40 +3,97 @@
     <Header></Header>
     <WorkMaster></WorkMaster>
     <div class="wrap ov bodyContent">
-      <!--<workLeft></workLeft>-->
       <RecomLeft></RecomLeft>
       <div class="main fr">
         <h4 ><a href="/">首页</a> > 课前导学
           <Textbook></Textbook>
         </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">
+          <div class="screen">
+            <ul>
+              <li>
+                <span class="fl">类型:</span>
                 <ol class="fl">
-                  <li>大小:{{item.size}}</li>
-                  <li>来源:{{item.source}}</li>
-                  <li>时间:{{item.date}}</li>
+                  <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>
                 </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>
+              <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>
+                </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>
                 </ol>
+              </li>
+            </ul>
+          </div>
+          <Sort></Sort>
+          <div class="ov">
+            <ul class="checkList checkList2 fl">
+              <li v-for="(item,index) in list">
+                <h3>
+                  第{{index+1}}题:
+                  <span :class="'dif dif'+item.dif">
+                  <b v-if="item.dif==1">容易</b>
+                  <b v-if="item.dif==2">较易</b>
+                  <b v-if="item.dif==3">一般</b>
+                  <b v-if="item.dif==4">较难</b>
+                  <b v-if="item.dif==5">困难</b>
+                </span>
+                  <span class="type">{{item.type}}</span>
+                  {{item.title}}
+                </h3>
+                <RadioGroup  vertical >
+                  <Radio v-for="(items,indexs) in item.options"  :label="indexs">
+                    <span>{{items.option}} :{{items.txt}}</span>
+                  </Radio>
+                </RadioGroup>
+                <!--<ol class="answer">-->
+                <!--<li>【参考答案】:{{item.answer}}</li>-->
+                <!--<li>【答题解析】:{{item.explain}}</li>-->
+                <!--</ol>-->
+              </li>
+
+            </ul>
+            <div class="numCard fr">
+              <p><Icon type="md-time" size="24" /> 剩余时间 <b>14:15</b></p>
+              <div class="answerCard">
+                <h5>答题卡</h5>
+                <div class="num">
+                  <ol>
+                    <li class="active">1</li>
+                    <li>2</li>
+                    <li>3</li>
+                    <li>4</li>
+                    <li>5</li>
+                    <li>6</li>
+                  </ol>
+                  <p><Button type="success" long>交卷</Button></p>
+                </div>
               </div>
-            </li>
-          </ul>
-          <Page :total="100"  size="small" show-total class="fr" />
+            </div>
+          </div>
+
+          <!--<Page :total="100"  size="small" show-total class="fr" />-->
         </div>
       </div>
     </div>
@@ -65,7 +122,7 @@
       Footer,
       ScoreList
     },
-    data () {
+    data ( ) {
       return {
         valueText: 5,
         modal1: false,
@@ -77,68 +134,110 @@
         },
         list:[
           {
-            type:'daoxue',
-            src:'teachSourceDetail',
-            title:'综合探究——从地图上获取信息-导学',
-            star:5,
-            size:'1.32MB',
-            source:'陆杰',
-            date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
+            id:'1',
+            type:'单选',
+            dif:'1',
+            title:'1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )',
+            options:[
+              {option:'A',txt:'孙传芳'},
+              {option:'B',txt:'吴佩孚'},
+              {option:'C',txt:'张作霖'},
+              {option:'D',txt:'张学良'}
+            ],
+            answer:'A',
+            explain:'题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。'
+
           },
           {
-            type:'daoxue',
-            src:'teachSourceDetail',
-            title:'综合探究——从地图上获取信息-导学',
-            star:5,
-            size:'1.32MB',
-            source:'陆杰',
-            date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
+            id:'1',
+            type:'单选',
+            dif:'1',
+            title:'1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )',
+            options:[
+              {option:'A',txt:'孙传芳'},
+              {option:'B',txt:'吴佩孚'},
+              {option:'C',txt:'张作霖'},
+              {option:'D',txt:'张学良'}
+            ],
+            answer:'A',
+            explain:'题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。'
+
           },
           {
-            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'
+            id:'1',
+            type:'单选',
+            dif:'2',
+            title:'1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )',
+            options:[
+              {option:'A',txt:'孙传芳'},
+              {option:'B',txt:'吴佩孚'},
+              {option:'C',txt:'张作霖'},
+              {option:'D',txt:'张学良'}
+            ],
+            answer:'A',
+            explain:'题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。'
+
           },
+          {
+            id:'1',
+            type:'单选',
+            dif:'3',
+            title:'1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )',
+            options:[
+              {option:'A',txt:'孙传芳'},
+              {option:'B',txt:'吴佩孚'},
+              {option:'C',txt:'张作霖'},
+              {option:'D',txt:'张学良'}
+            ],
+            answer:'A',
+            explain:'题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。'
+
+          },
+          {
+            id:'1',
+            type:'单选',
+            dif:'4',
+            title:'1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )',
+            options:[
+              {option:'A',txt:'孙传芳'},
+              {option:'B',txt:'吴佩孚'},
+              {option:'C',txt:'张作霖'},
+              {option:'D',txt:'张学良'}
+            ],
+            answer:'A',
+            explain:'题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。'
 
+          },
+          {
+            id:'1',
+            type:'单选',
+            dif:'5',
+            title:'1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )',
+            options:[
+              {option:'A',txt:'孙传芳'},
+              {option:'B',txt:'吴佩孚'},
+              {option:'C',txt:'张作霖'},
+              {option:'D',txt:'张学良'}
+            ],
+            answer:'A',
+            explain:'题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。'
+
+          },
         ]
       }
     },
     methods: {
-      ok () {
+      ok ( ) {
         this.$Message.info('发布成功');
       },
-      // cancel () {
+      // cancel ( ) {
       //   this.$Message.info('');
       // }
-      yes () {
+      yes ( ) {
         this.modal1 = false;
         this.$Message.success('发布成功');
       },
-      cancel () {
+      cancel ( ) {
         this.modal1 = false;
       }
     }

+ 25 - 150
TEAMModelOS.TeachZone/ClientApp/view/teachPreclass.vue

@@ -6,95 +6,12 @@
       <!--<workLeft></workLeft>-->
       <RecomLeft></RecomLeft>
       <div class="main fr">
-        <h4 ><a href="/">首页</a> > 教材资源
-          <div class="fr" >
-            <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="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>
-          </div>
+        <h4 ><a href="/">首页</a> > 课前导学
+          <Textbook></Textbook>
         </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>
-                  <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>
-                </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>
-                </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>
-              <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>
+          <Screen></Screen>
+          <Sort></Sort>
           <ul class="workSourceList" v-for="item in list">
             <li :class="item.type">
               <div class="ov">
@@ -131,6 +48,9 @@
   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 {
@@ -139,6 +59,9 @@
       WorkMaster,
       WorkLeft,
       RecomLeft,
+      Screen,
+      Textbook,
+      Sort,
       Footer,
       ScoreList
     },
@@ -154,9 +77,9 @@
         },
         list:[
           {
-            type:'word',
+            type:'daoxue',
             src:'teachSourceDetail',
-            title:'带着地图去旅行.doc',
+            title:'综合探究——从地图上获取信息-导学',
             star:5,
             size:'1.32MB',
             source:'陆杰',
@@ -166,21 +89,9 @@
             download:'4'
           },
           {
-            type:'word',
+            type:'daoxue',
             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',
+            title:'综合探究——从地图上获取信息-导学',
             star:5,
             size:'1.32MB',
             source:'陆杰',
@@ -190,65 +101,29 @@
             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',
+            type:'daoxue',
             src:'teachSourceDetail',
-            title:'带着地图去旅行(课件).doc',
-            star:4.5,
+            title:'综合探究——从地图上获取信息-导学',
+            star:5,
             size:'1.32MB',
             source:'陆杰',
             date:'2019-04-08',
-            preview:'16',
+            preview:'6',
             collect:'5',
             download:'4'
-          },
-          {
-            type:'word',
+          },{
+            type:'daoxue',
             src:'teachSourceDetail',
-            title:'综合探究三——如何认识区域(以南非为例).doc',
+            title:'综合探究——从地图上获取信息-导学',
             star:5,
             size:'1.32MB',
-            source:'马平儿',
+            source:'陆杰',
             date:'2019-04-08',
-            preview:'20',
+            preview:'6',
             collect:'5',
             download:'4'
           },
+
         ]
       }
     },
@@ -267,6 +142,6 @@
         this.modal1 = false;
       }
     }
-    }
+  }
 </script>
 

+ 1 - 1
TEAMModelOS.TeachZone/ClientApp/view/teachPrelesson.vue

@@ -6,7 +6,7 @@
       <!--<workLeft></workLeft>-->
       <RecomLeft></RecomLeft>
       <div class="main fr">
-        <h4 ><a href="/">首页</a> > 教材资源
+        <h4 ><a href="/">首页</a> > 同步备课
           <div class="fr" >
             <Select v-model="select" class="fl" style="width: auto;">
               <Option value="sel1" >初中历史与社会人教课标版</Option>

+ 129 - 231
TEAMModelOS.TeachZone/ClientApp/view/teachSource.vue

@@ -1,247 +1,38 @@
 <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> > 教材资源
+            <Textbook></Textbook>
+        </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>
+          <Screen></Screen>
+          <ScreenSort></ScreenSort>
+          <ul class="workSourceList" v-for="item in list">
+            <li :class="item.type">
               <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">
-              <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 +47,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 Textbook from '@/common/textbook.vue'
+  import ScreenSort from '@/common/screenSort.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 +79,104 @@
           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: {

+ 32 - 37
TEAMModelOS.TeachZone/ClientApp/view/teachSourceDetail.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app">
     <Header></Header>
-    <div class="master wrap ov">
-      我的工作
+    <div class="master wrap ov ">
+      <a href="/">张三的空间</a>
       <ul class="fr">
         <li><a href="">教材资源</a></li>
         <li><a href="">课前导学</a></li>
@@ -11,20 +11,22 @@
         <li><a href="">课后作业</a></li>
       </ul>
     </div>
-    <div class="wrap ov">
-      <div class="main fl">
-        <h4><a href="/">首页</a> > <a href="/">教材资源</a> > 详情</h4>
+    <div class="wrap ov bodyContent">
+      <RecomLeft></RecomLeft>
+
+      <div class="main fr">
+        <h4><a href="/">首页</a> > <a href="/">我的工作</a> > <a href="/">教材资源</a> > 详情</h4>
         <div class="content ov bgf pad20">
          <div class="sourceDetail">
            <div class="titleBox">
              <h3> 2017年全国各地中考作文题汇总.doc</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">
+               <li>时间:2019-05-13</li>
+               <li>引用:4次</li>
+               <li>预览:20次</li>
+               <li>综合评分:<Rate allow-half disabled v-model="valueText">
                </Rate></li>
              </ul>
            </div>
@@ -32,49 +34,40 @@
              <iframe
                src="http://res.huijiaoyun.com:22021//data9/transform/2019/1/14/21/56/8b188019f7f1406694fbd52154840654/28870b8a84e5b7fe607419a194d09699.doc/html4/transform.html"></iframe>
            </div>
+          <div class="ov">
+            <ul class="tips fr">
+              <li><a href=""><Icon type="ios-heart"/> 收藏(15)</a></li>
+              <li><a href=""><Icon type="md-share"/> 分享(6)</a></li>
+              <li><a href=""><Icon type="md-download"/> 下载(6)</a></li>
+
+            </ul>
+          </div>
+
            <div class="comment">
-             <h4>总体印象</h4>
+             <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">
-             <h4>评论
+             <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>
+               <Button type="primary" size="large">立即发布</Button>
              </div>
+             <p class="tc"><img src="../assets/image/sofa.png" alt=""></p>
            </div>
          </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>
@@ -83,6 +76,7 @@
   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 Footer from '@/common/footer.vue'
   import ScoreList from '@/components/scoreList.vue'
   export default {
@@ -90,6 +84,7 @@
       Header,
       WorkMaster,
       WorkLeft,
+      RecomLeft,
       Footer,
       ScoreList
     },

+ 32 - 41
TEAMModelOS.TeachZone/ClientApp/view/teachTask.vue

@@ -16,11 +16,14 @@
             <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>
+                <!--<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">
@@ -29,10 +32,13 @@
                   <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="'/'+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"/> 参与人数:0/38</a></p>
               </div>
             </li>
           </ul>
@@ -77,55 +83,40 @@
         },
         list:[
           {
-            type:'daoxue',
-            src:'teachSourceDetail',
-            title:'综合探究——从地图上获取信息-导学',
-            star:5,
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第一单元--章节练习',
             size:'1.32MB',
             source:'陆杰',
             date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
+            all:100,
+            done:20,
           },
           {
-            type:'daoxue',
-            src:'teachSourceDetail',
-            title:'综合探究——从地图上获取信息-导学',
-            star:5,
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第一单元--章节练习',
             size:'1.32MB',
             source:'陆杰',
             date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
+            all:100,
+            done:20,
           },
           {
-            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,
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第一单元--章节练习',
             size:'1.32MB',
             source:'陆杰',
             date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
+            all:100,
+            done:20,
           },
-
         ]
       }
+    },
+    creted(){
+
     },
     methods: {
       ok () {

+ 194 - 51
TEAMModelOS.TeachZone/ClientApp/view/teachTaskDetail.vue

@@ -3,43 +3,203 @@
     <Header></Header>
     <WorkMaster></WorkMaster>
     <div class="wrap ov bodyContent">
-      <!--<workLeft></workLeft>-->
       <RecomLeft></RecomLeft>
       <div class="main fr">
         <h4 ><a href="/">首页</a> > 课前导学
           <Textbook></Textbook>
         </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">
+          <div class="screen">
+            <ul>
+              <li>
+                <span class="fl">类型:</span>
                 <ol class="fl">
-                  <li>大小:{{item.size}}</li>
-                  <li>来源:{{item.source}}</li>
-                  <li>时间:{{item.date}}</li>
+                  <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>
                 </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>-->
+              </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>
                 </ol>
-
-              <p class="fr"><a href=""><Icon type="md-person"/> 参与人数:0/38</a></p>
-              </div>
+              </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>
+                </ol>
+              </li>
+            </ul>
+          </div>
+          <Sort></Sort>
+          <ul class="checkList">
+            <li>
+              <h3>
+                第1题:
+                <span class="dif dif1">容易</span>
+                <span class="type">单选</span>
+                1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )
+              </h3>
+              <RadioGroup  vertical >
+                <Radio label="apple">
+                  <Icon type="social-apple"></Icon>
+                  <span>孙传芳</span>
+                </Radio>
+                <Radio label="android">
+                  <Icon type="social-android"></Icon>
+                  <span>吴佩孚</span>
+                </Radio>
+                <Radio label="windows">
+                  <Icon type="social-windows"></Icon>
+                  <span>张作霖</span>
+                </Radio>
+                <Radio label="window">
+                  <Icon type="social-windows"></Icon>
+                  <span>张学良</span>
+                </Radio>
+              </RadioGroup>
+              <ol class="answer">
+                <li class="answerNum">【参考答案】:A</li>
+                <!--<li>来源:张珊珊</li>-->
+                <!--<li>评分: <Rate allow-half v-model="valueText" disabled></Rate></li>-->
+                <!--<li><a href="" class="explain">查看解析</a></li>-->
+                <li style="width: 100%" >【答题解析】:题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。</li>
+              </ol>
+            </li>
+            <li>
+              <h3>
+                第2题:
+                <span class="dif dif2">较易</span>
+                <span class="type">单选</span>
+                1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )
+              </h3>
+              <RadioGroup  vertical >
+                <Radio label="apple">
+                  <Icon type="social-apple"></Icon>
+                  <span>孙传芳</span>
+                </Radio>
+                <Radio label="android">
+                  <Icon type="social-android"></Icon>
+                  <span>吴佩孚</span>
+                </Radio>
+                <Radio label="windows">
+                  <Icon type="social-windows"></Icon>
+                  <span>张作霖</span>
+                </Radio>
+                <Radio label="window">
+                  <Icon type="social-windows"></Icon>
+                  <span>张学良</span>
+                </Radio>
+              </RadioGroup>
+              <ol class="answer">
+                <li class="answerNum">【参考答案】:A</li>
+                <li style="width: 100%" >【答题解析】:题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。</li>
+              </ol>
+            </li>
+            <li>
+              <h3>
+                第3题:
+                <span class="dif dif3">一般</span>
+                <span class="type">单选</span>
+                1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )
+              </h3>
+              <RadioGroup  vertical >
+                <Radio label="apple">
+                  <Icon type="social-apple"></Icon>
+                  <span>孙传芳</span>
+                </Radio>
+                <Radio label="android">
+                  <Icon type="social-android"></Icon>
+                  <span>吴佩孚</span>
+                </Radio>
+                <Radio label="windows">
+                  <Icon type="social-windows"></Icon>
+                  <span>张作霖</span>
+                </Radio>
+                <Radio label="window">
+                  <Icon type="social-windows"></Icon>
+                  <span>张学良</span>
+                </Radio>
+              </RadioGroup>
+              <ol class="answer">
+                <li class="answerNum">【参考答案】:A</li>
+                <li style="width: 100%" >【答题解析】:题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。</li>
+              </ol>
+            </li>
+            <li>
+              <h3>
+                第4题:
+                <span class="dif dif4">较难</span>
+                <span class="type">单选</span>
+                1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )
+              </h3>
+              <RadioGroup  vertical >
+                <Radio label="apple">
+                  <Icon type="social-apple"></Icon>
+                  <span>孙传芳</span>
+                </Radio>
+                <Radio label="android">
+                  <Icon type="social-android"></Icon>
+                  <span>吴佩孚</span>
+                </Radio>
+                <Radio label="windows">
+                  <Icon type="social-windows"></Icon>
+                  <span>张作霖</span>
+                </Radio>
+                <Radio label="window">
+                  <Icon type="social-windows"></Icon>
+                  <span>张学良</span>
+                </Radio>
+              </RadioGroup>
+              <ol class="answer">
+                <li class="answerNum">【参考答案】:A</li>
+                <li style="width: 100%" >【答题解析】:题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。</li>
+              </ol>
+            </li>
+            <li>
+              <h3>
+                第4题:
+                <span class="dif dif5">困难</span>
+                <span class="type">单选</span>
+                1928年12月,在东北宣布"服从南京国民政府,改易旗帜"的是 ( )
+              </h3>
+              <RadioGroup  vertical >
+                <Radio label="apple">
+                  <Icon type="social-apple"></Icon>
+                  <span>孙传芳</span>
+                </Radio>
+                <Radio label="android">
+                  <Icon type="social-android"></Icon>
+                  <span>吴佩孚</span>
+                </Radio>
+                <Radio label="windows">
+                  <Icon type="social-windows"></Icon>
+                  <span>张作霖</span>
+                </Radio>
+                <Radio label="window">
+                  <Icon type="social-windows"></Icon>
+                  <span>张学良</span>
+                </Radio>
+              </RadioGroup>
+              <ol class="answer">
+                <li class="answerNum">【参考答案】:A</li>
+                <li style="width: 100%" >【答题解析】:题考查的是标志着近代以来中国争取民族独立和人民解放的历史任务基本完成的事件。人民民主专政的新中国的创建,标志着近代以来中国面临的争取民族独立、人民解放这个历史任务的基本完成,这就为中国人民集中力量进行建设,以实现国家的繁荣富强和人民的共同富裕,创造了前提,开辟了道路。</li>
+              </ol>
             </li>
           </ul>
           <Page :total="100"  size="small" show-total class="fr" />
@@ -71,7 +231,7 @@
       Footer,
       ScoreList
     },
-    data () {
+    data ( ) {
       return {
         valueText: 5,
         modal1: false,
@@ -82,39 +242,22 @@
           textarea: '',
         },
         list:[
-          {
-            type:'hunhe',
-            src:'teachSourceDetail',
-            title:'第一单元--章节练习',
-            star:5,
-            size:'1.32MB',
-            source:'陆杰',
-            date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4',
-            percent:55,
-            all:100,
-            done:20,
-          },
+
         ]
       }
-    },
-    creted(){
-      
     },
     methods: {
-      ok () {
+      ok ( ) {
         this.$Message.info('发布成功');
       },
-      // cancel () {
+      // cancel ( ) {
       //   this.$Message.info('');
       // }
-      yes () {
+      yes ( ) {
         this.modal1 = false;
         this.$Message.success('发布成功');
       },
-      cancel () {
+      cancel ( ) {
         this.modal1 = false;
       }
     }

+ 1 - 1
TEAMModelOS.TeachZone/Views/Shared/_Layout.cshtml

@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"]TEAM Model OS</title>
+    <title>@ViewData["Title"]教学空间</title>
     <link rel="stylesheet" href="~/dist/style.css" asp-append-version="true" />
     <link rel="icon" type="image/x-icon" class="js-site-favicon" href="https://account.habookaclass.biz/dist/6854ccd21afb6b1f994e1556c2360dd8.ico">
     @*<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />