Browse Source

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

psycho 6 years ago
parent
commit
32e9226938
26 changed files with 449 additions and 359 deletions
  1. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/banner02.png
  2. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/bottom.png
  3. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/center01.png
  4. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/list_icon_one.png
  5. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/list_icon_three.png
  6. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/list_icon_two.png
  7. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/login_img.png
  8. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/map-bg.png
  9. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/tuijian_img.png
  10. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_five.png
  11. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_four.png
  12. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_one.png
  13. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_three.png
  14. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_two.png
  15. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_qingwa_img.png
  16. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_siji_img.png
  17. 10 25
      TEAMModelOS.SmartTeach/ClientApp/common/headers.vue
  18. 8 9
      TEAMModelOS.SmartTeach/ClientApp/components/resource/home.vue
  19. 72 37
      TEAMModelOS.SmartTeach/ClientApp/components/resource/internaltogether.vue
  20. 82 81
      TEAMModelOS.SmartTeach/ClientApp/components/resource/libraryindex.vue
  21. 10 7
      TEAMModelOS.SmartTeach/ClientApp/components/resource/list.vue
  22. 1 22
      TEAMModelOS.SmartTeach/ClientApp/components/resource/recommend.vue
  23. 225 158
      TEAMModelOS.SmartTeach/ClientApp/components/resource/teacherMap.vue
  24. 28 7
      TEAMModelOS.SmartTeach/ClientApp/components/resource/video.vue
  25. 1 1
      TEAMModelOS.SmartTeach/ClientApp/view/resource/index.vue
  26. 12 12
      TEAMModelOS.SmartTeach/ClientApp/view/resource/resourceindex/videodetails.vue

BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/banner02.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/bottom.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/center01.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/list_icon_one.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/list_icon_three.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/list_icon_two.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/login_img.png


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


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/tuijian_img.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_five.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_four.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_one.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_three.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_img_two.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_qingwa_img.png


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/video_siji_img.png


+ 10 - 25
TEAMModelOS.SmartTeach/ClientApp/common/headers.vue

@@ -10,7 +10,7 @@
         </div>
       </div>
       <div class="header_right">
-        <div class="helper" ><button @click="tologin">教学助手</button></div>
+        <div class="helper" ><img src="../assets/image/resource/login_img.png" @click="tologin"/></div>
       </div>
     </div>
   </div>
@@ -48,10 +48,10 @@
     height: 75px;
   }
   .header_right {
-    width: 200px;
+    width: 215px;
     float: left;
     height: 75px;
-    padding-left:7%;
+    padding-left:5%;
     padding-top:5px;
   }
   .logo_img {
@@ -83,31 +83,16 @@
     float:left;
     margin-left:40%;
   }
-    .login_btn button {
-      width: 85px;
-      text-align: center;
-      background: #26b5ff;
-      color: #fff;
-      height: 35px;
-      line-height: 35px;
-      margin: 22px 22px 0px 22px;
-      border: 0;
-      border-radius: 10px;
-      font-size:18px;
-    }
   .helper {
     width: 100%;
+    height:58px;
     display: block;
     float: left;
-    padding-top:22px;
+    padding-top:15px;
   }
-    .helper button {
-      padding: 0 17px;
-      color: #288add;
-      border: 1px solid #2196f3;
-      height: 30px;
-      line-height: 30px;
-      background: #fff;
-      font-size: 18px;
-    }
+    .helper img {
+      width:100%;
+      margin-left:60%;
+    } 
+
 </style>

+ 8 - 9
TEAMModelOS.SmartTeach/ClientApp/components/resource/home.vue

@@ -44,15 +44,13 @@
       <h1>开通智慧云平台</h1>
       <div class="box"></div>
     </div>
-    <img src="../../assets/image/resource/bottom.png">
+    <img src="../../assets/image/resource/bottom.png" style="width:100%">
     <div class="arrow">
-      <img src="../../assets/image/resource/arrow.png">
+      <img src="../../assets/image/resource/arrow.png" >
       <h1>联系我们</h1>
       <div class="box"></div>
     </div>
     <div class="center-info">
-      <!--<h1>已超过<span>1000</span>所学校开通了我们的服务</h1>
-    <img  src="../../assets/image/resource/center01.png" >-->
     </div>
   </div>
 </template>
@@ -62,10 +60,10 @@
       return {
         homeCarouselImg: [
           {
-            images: require('../../assets/image/resource/banner01.png')
+            images: require('../../assets/image/resource/banner02.png')
           },
           {
-            images: require('../../assets/image/resource/banner.png')
+            images: require('../../assets/image/resource/banner01.png')
           },
         ]
       };
@@ -81,6 +79,7 @@
 
   .title {
     width: 100%;
+    overflow:hidden;
   }
 
   .header {
@@ -92,13 +91,13 @@
     width: 100%;
 
   }
-    .demo-carousel img {
+    /*.demo-carousel img {
 
       background-size:contain;
-    }
+    }*/
   .carousel-img {
     width: 100%;
-    cursor: pointer;
+    /*cursor: pointer;*/
     margin: auto;
   }
 

+ 72 - 37
TEAMModelOS.SmartTeach/ClientApp/components/resource/internaltogether.vue

@@ -54,14 +54,9 @@
                   <dt class="nyCase-tit c888">类型:</dt>
                   <dd class="nyCase-c">
                     <p class="nyCase-c-a">
-                      <a href="javascript:resClassQuery('');" class="on">全部</a>
-                      <a href="javascript:resClassQuery('jl01');">教案</a>
-                      <a href="javascript:resClassQuery('jl02');">课件</a>
-                      <a href="javascript:resClassQuery('jl04');">习题</a>
-                      <a href="javascript:resClassQuery('jl06');">素材</a>
-                      <a href="javascript:resClassQuery('jl12');">试卷</a>
-                      <a href="javascript:resClassQuery('jl25');">微课</a>
-                      <a href="javascript:resClassQuery('jl13');">其他</a>
+                      <Select v-model="typedefault" style="width:150px" @on-change="clickbtn">
+                        <Option v-for="itemf in typedata" :value="itemf.value" :key="itemf.value">{{ itemf.label }}</Option>
+                      </Select>
                     </p>
                   </dd>
                 </dl>
@@ -69,14 +64,9 @@
                   <dt class="nyCase-tit c888">格式:</dt>
                   <dd class="nyCase-c">
                     <p class="nyCase-c-a">
-                      <a href="javascript:;" class="on" onclick="javascript:selectFormatDto('');">全部</a>
-                      <a href="javascript:;" onclick="javascript:selectFormatDto('FMT01');">文档</a>
-                      <a href="javascript:;" onclick="javascript:selectFormatDto('FMT02');">图片</a>
-                      <a href="javascript:;" onclick="javascript:selectFormatDto('FMT03');">音频</a>
-                      <a href="javascript:;" onclick="javascript:selectFormatDto('FMT04');">视频</a>
-                      <a href="javascript:;" onclick="javascript:selectFormatDto('FMT05');">动画</a>
-                      <a href="javascript:;" onclick="javascript:selectFormatDto('FMT06');">其他</a>
-                      <a href="javascript:;" onclick="javascript:selectFormatDto('FMT07');">压缩包</a>
+                      <Select v-model="formatdefault" style="width:150px" @on-change="clickformatdefault">
+                        <Option v-for="itemf in formatdata" :value="itemf.value" :key="itemf.value">{{ itemf.label }}</Option>
+                      </Select>
                     </p>
                   </dd>
                 </dl>
@@ -84,10 +74,9 @@
                   <dt class="nyCase-tit c888">来源:</dt>
                   <dd class="nyCase-c">
                     <p class="nyCase-c-a">
-                      <a href="javascript:;" class="on" onclick="javascript:selectOwnerRes('');">全部</a>
-                      <a href="javascript:;" onclick="javascript:selectOwnerRes('2');">社会企业</a>
-                      <a href="javascript:;" onclick="javascript:selectOwnerRes('3');">教育单位</a>
-                      <a href="javascript:;" onclick="javascript:selectOwnerRes('4');">个人共享</a>
+                      <Select v-model="sourcedefault" style="width:150px">
+                        <Option v-for="itemf in sourcedata" :value="itemf.value" :key="itemf.value">{{ itemf.label }}</Option>
+                      </Select>
                     </p>
                   </dd>
                 </dl>
@@ -111,11 +100,11 @@
                     <div class="row-r-rect clearfix">
                       <div class="row-r-col2">
                         <h4>
-                          <a style="display:inline-block;width:450px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:21px;" target="_blank" href="" :title="itemy.title">{{itemy.title}}</a>
+                          <a style="display:inline-block;width:450px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:21px;" target="_blank" :href="itemy.skipurl" :title="itemy.title">{{itemy.title}}</a>
                         </h4>
                         <p class="title">
                           <strong class="c888">简介:</strong>
-                          <a style="display:inline-block;width:540px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:21px;" target="_blank" href="">{{itemy.intro}}</a>
+                          <a style="display:inline-block;width:540px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:21px;" target="_blank" href="itemy.skipurl">{{itemy.intro}}</a>
                         </p>
                         <p class="info">
                           <span>
@@ -151,7 +140,7 @@
                     <a target="_blank" title="音频:《小蜗牛》课文朗读.mp3" href="">音频:《小蜗牛》课文...</a>
                     </h4>
                     <div class="rect">
-                        <img class="photo" src="http://css.huijiaoyun.com/tianyu_edu/area/edu4.0/images/index0331/zy_home/rec_zyImg.png" width="66" height="66">
+                        <img class="photo" src="../../assets/image/resource/tuijian_img.png" width="66" height="66">
                     <div class="baseInfo">
                       <p><strong>9025</strong>次浏览</p><p><strong>13</strong>次下载</p>
                     </div></div></li><li>
@@ -436,23 +425,70 @@
             ]
           }
         ],
+        typedata:[
+   {value: '全部',label: '全部'},
+   {value: '课件',label: '课件'},
+   {value: '习题',label: '习题'},
+   {value: '教案',label: '教案'},
+   {value: '试卷',label: '试卷'},
+   {value: '素材',label: '素材'},
+   {value: '微课',label: '微课'},
+   {value: '其他',label: '其他'},
+                ],
+          typedefault:'全部',
+        formatdata:[
+   {value: '全部',label: '全部'},
+   {value: '文档',label: '文档'},
+   {value: '图片',label: '图片'},
+   {value: '音频',label: '音频'},
+   {value: '视频',label: '视频'},
+   {value: '动画',label: '动画'},
+   {value: '压缩包',label: '压缩包'},
+   {value: '其他',label: '其他'},
+                    ],
+      formatdefault:'全部',
+        sourcedata:[
+             {value: '全部',label: '全部'},
+             {value: '社会企业',label: '社会企业'},
+             {value: '教育单位',label: '教育单位'},
+             {value: '个人共享',label: '个人共享'},
+                  ],
+    sourcedefault:'全部',
         listdata: [
-          { "id": 1, "img": require("../../assets/image/resource/document_01.jpg"), "title": '《2金木水火土》 教学设计.docx', "intro": '点击查看更多《2金木水火土》 教学设计.docx精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲' },
-          { "id": 2, "img": require("../../assets/image/resource/document_02.jpg"), "title": '《小蜗牛》同步练习.doc', "intro": '点击查看更多《小蜗牛》同步练习精彩内容', "time": '2018-11-06', "size": '91KB', 'browse': '89', "enshrine": '0', "upload": '0', "author": '任冲' },
-          { "id": 3, "img": require("../../assets/image/resource/document_03.jpg"), "title": '音频:《对韵歌》课文朗读.mp3', "intro": '点击查看更多音频:《对韵歌》课文朗读.mp3精彩内容', "time": '2019-02-21', "size": '99KB', 'browse': '30', "enshrine": '0', "upload": '0', "author": '王瞿' },
-          { "id": 4, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:柳绿桃红.flv', "intro": '点击查看更多视频:柳绿桃红.flv精彩内容', "time": '2019-02-22', "size": '102.3MB', 'browse': '103', "enshrine": '10', "upload": '5', "author": '李佳' },
-          { "id": 5, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:山清水秀的自然风光.mp4', "intro": '点击查看更多视频:山清水秀的自然风光.mp4精彩内容', "time": '2018-12-09', "size": '58MB', 'browse': '206', "enshrine": '10', "upload": '2', "author": '李佳' },
-          { "id": 6, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:云、雨、雪的形成.mp4', "intro": '点击查看更多视频:云、雨、雪的形成.mp4精彩内容', "time": '2018-08-16', "size": '85KB', 'browse': '109', "enshrine": '73', "upload": '40', "author": '任冲' },
-          { "id": 7, "img": require("../../assets/image/resource/document_02.jpg"), "title": '文档:《对韵歌》拓展学习.ppt', "intro": '点击查看更多文档:《对韵歌》拓展学习.ppt精彩内容', "time": '2018-09-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲' },
-          { "id": 8, "img": require("../../assets/image/resource/document_01.jpg"), "title": '《2金木水火土》 教学设计.docx', "intro": '点击查看更多《2金木水火土》 教学设计.docx精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲' },
-        ],
+          { "id": 1, "img": require("../../assets/image/resource/document_01.jpg"), "title": '《风姑娘送》 教学设计.docx', "intro": '点击查看更多《2金木水火土》 教学设计.docx精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '王佳慧',"skipurl":'/details' },
+          { "id": 2, "img": require("../../assets/image/resource/document_02.jpg"), "title": '《小溪生病了》同步练习.doc', "intro": '点击查看更多《小蜗牛》同步练习精彩内容', "time": '2018-11-06', "size": '91KB', 'browse': '89', "enshrine": '0', "upload": '0', "author": '任冲',"skipurl":'/details' },
+          { "id": 3, "img": require("../../assets/image/resource/document_01.jpg"), "title": '《窗外小鸟轻点叫》 教学设计.docx', "intro": '点击查看更多《窗外小鸟轻点叫》 教学设计.docx精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲',"skipurl":'/details' },
+          { "id": 4, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:柳绿桃红.flv', "intro": '点击查看更多视频:柳绿桃红.flv精彩内容', "time": '2019-02-22', "size": '102.3MB', 'browse': '103', "enshrine": '10', "upload": '5', "author": '李佳',"skipurl":'/videodetails' },
+          { "id": 5, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:山清水秀的自然风光.mp4', "intro": '点击查看更多视频:山清水秀的自然风光.mp4精彩内容', "time": '2018-12-09', "size": '58MB', 'browse': '206', "enshrine": '10', "upload": '2', "author": '李佳',"skipurl":'/videodetails' },
+          { "id": 6, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:云、雨、雪的形成.mp4', "intro": '点击查看更多视频:云、雨、雪的形成.mp4精彩内容', "time": '2018-08-16', "size": '85KB', 'browse': '109', "enshrine": '73', "upload": '40', "author": '任冲',"skipurl":'/videodetails' },
+          { "id": 7, "img": require("../../assets/image/resource/document_02.jpg"), "title": '文档:《对韵歌》拓展学习.ppt', "intro": '点击查看更多文档:《对韵歌》拓展学习.ppt精彩内容', "time": '2018-09-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲',"skipurl":'/details' },
+          { "id": 8, "img": require("../../assets/image/resource/document_01.jpg"), "title": '《山爷爷和孩子的对话》 教学设计.docx', "intro": '点击查看更多《山爷爷和孩子的对话》 教学设计.docx精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲',"skipurl":'/details' },
+          { "id": 9, "img": require("../../assets/image/resource/document_03.jpg"), "title": '音频:《对韵歌》课文朗读.mp3', "intro": '点击查看更多音频:《对韵歌》课文朗读.mp3精彩内容', "time": '2019-02-21', "size": '99KB', 'browse': '30', "enshrine": '0', "upload": '0', "author": '王瞿',"skipurl":'/details' },
+                ],
       }
     },
     methods: {
       callouts() {
         this.callout = !this.callout //取反
-      }
-    }
+      },
+      clickbtn(){
+          let newdata=[
+          { "id": 1, "img": require("../../assets/image/resource/document_01.jpg"), "title": '《风姑娘送》 教学设计.docx', "intro": '点击查看更多《2金木水火土》 教学设计.docx精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '王佳慧' },
+          { "id": 2, "img": require("../../assets/image/resource/document_02.jpg"), "title": '《小溪生病了》同步练习.doc', "intro": '点击查看更多《小蜗牛》同步练习精彩内容', "time": '2018-11-06', "size": '91KB', 'browse': '89', "enshrine": '0', "upload": '0', "author": '任冲' },
+          { "id": 3, "img": require("../../assets/image/resource/document_01.jpg"), "title": '《窗外小鸟轻点叫》 教学设计.docx', "intro": '点击查看更多《窗外小鸟轻点叫》 教学设计.docx精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲' },
+          { "id": 4, "img": require("../../assets/image/resource/document_01.jpg"), "title": '《山爷爷和孩子的对话》 教学设计.docx', "intro": '点击查看更多《山爷爷和孩子的对话》 教学设计.docx精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲' },
+            ];
+          this.listdata=newdata;
+        },
+      clickformatdefault(){
+         let newdata=[
+        { "id": 1, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:柳绿桃红.flv', "intro": '点击查看更多视频:柳绿桃红.flv精彩内容', "time": '2019-02-22', "size": '102.3MB', 'browse': '103', "enshrine": '10', "upload": '5', "author": '李佳' },
+        { "id": 2, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:山清水秀的自然风光.mp4', "intro": '点击查看更多视频:山清水秀的自然风光.mp4精彩内容', "time": '2018-12-09', "size": '58MB', 'browse': '206', "enshrine": '10', "upload": '2', "author": '李佳' },
+        { "id": 3, "img": require("../../assets/image/resource/document_04.jpg"), "title": '视频:云、雨、雪的形成.mp4', "intro": '点击查看更多视频:云、雨、雪的形成.mp4精彩内容', "time": '2018-08-16', "size": '85KB', 'browse': '109', "enshrine": '73', "upload": '40', "author": '任冲' },
+          ];
+           this.listdata=newdata;
+      },
+    },
   }
 </script>
 <style scoped>
@@ -890,9 +926,6 @@
     background: #fff;
     margin-left:10px;
   }
-    .site-nyCase-rect .nyCase-dl {
-      padding: 4px 0;
-    }
     .site-nyCase-rect .nyCase-tit {
       width: 52px;
       float: left;
@@ -906,6 +939,8 @@
       margin-left: 76px;
       overflow: hidden;
       zoom: 1;
+      width:25%;
+      float:left;
     }
     .site-nyCase-rect .nyCase-c-a {
       float: left;

+ 82 - 81
TEAMModelOS.SmartTeach/ClientApp/components/resource/libraryindex.vue

@@ -38,27 +38,9 @@
             <dt class="nyCase-tit c888">册别:</dt>
             <dd class="nyCase-c">
               <p class="nyCase-c-a" style="height: 36px;">
-                <a href="javascript:selectQuery('#volumeId', '', '#volumeName', '');" class="on">不限</a>
-                <a href="javascript:selectQuery('#volumeId', 'V008', '#volumeName', '一年级上册');">一年级上册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V009', '#volumeName', '一年级下册');">一年级下册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V011', '#volumeName', '二年级上册');">二年级上册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V012', '#volumeName', '二年级下册');">二年级下册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V013', '#volumeName', '三年级上册');">三年级上册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V014', '#volumeName', '三年级下册');">三年级下册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V016', '#volumeName', '四年级上册');">四年级上册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V017', '#volumeName', '四年级下册');">四年级下册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V019', '#volumeName', '五年级上册');">五年级上册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V020', '#volumeName', '五年级下册');">五年级下册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V023', '#volumeName', '六年级上册');">六年级上册</a>
-                <a href="javascript:selectQuery('#volumeId', 'V024', '#volumeName', '六年级下册');">六年级下册</a>
-                <a href="javascript:selectQuery('#volumeId', '3ae86d5324474b35aea3f2c606728c39', '#volumeName', '二年级 第一学期');">二年级 第一学期</a>
-                <a href="javascript:selectQuery('#volumeId', '5cdb87be25984a679b290c9161caa87d', '#volumeName', '二年级 第二学期');">二年级 第二学期</a>
-                <a href="javascript:selectQuery('#volumeId', '80e70be68214426fb1556fcdc0b099e6', '#volumeName', '三年级 第一学期');">三年级 第一学期</a>
-                <a href="javascript:selectQuery('#volumeId', '8c57e7f8e001435db028e9f768da1a1e', '#volumeName', '三年级 第二学期');">三年级 第二学期</a>
-                <a href="javascript:selectQuery('#volumeId', '9e6316f6a0bf41758aa9e1cb9afae7c9', '#volumeName', '四年级 第一学期');">四年级 第一学期</a>
-                <a href="javascript:selectQuery('#volumeId', 'dbdb90347dc047d386a8f0d1c669b664', '#volumeName', '四年级 第二学期');">四年级 第二学期</a>
-                <a href="javascript:selectQuery('#volumeId', '653c3b91e7fc4c8db826df727e2d7427', '#volumeName', '五年级 第一学期');">五年级 第一学期</a>
-                <a href="javascript:selectQuery('#volumeId', 'b6c924d570a74e67bc0bf19f2bed47c3', '#volumeName', '五年级 第二学期');">五年级 第二学期</a>
+                <Select v-model="cebie" style="width:150px" @on-change="cebiebtn">
+                  <Option v-for="item in cebiedata" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                </Select>
               </p>
             </dd>
           </dl>
@@ -66,15 +48,9 @@
             <dt class="nyCase-tit c888">类型:</dt>
             <dd class="nyCase-c">
               <p class="nyCase-c-a">
-                <a href="javascript:selectQuery('#resTypeId', '', '#resTypeName', '');" class="on">不限</a>
-                <a href="javascript:selectQuery('#resTypeId', 'zy', '#resTypeName', '随堂练习');">随堂练习</a>
-                <a href="javascript:selectQuery('#resTypeId', 'dy', '#resTypeName', '课后作业');">课后作业</a>
-                <a href="javascript:selectQuery('#resTypeId', 'yk', '#resTypeName', '单元测验');">单元测验</a>
-                <a href="javascript:selectQuery('#resTypeId', 'qz', '#resTypeName', '月考试卷');">月考试卷</a>
-                <a href="javascript:selectQuery('#resTypeId', 'qm', '#resTypeName', '期中测验');">期中测验</a>
-                <a href="javascript:selectQuery('#resTypeId', 'by', '#resTypeName', '期末试卷');">期末试卷</a>
-                <a href="javascript:selectQuery('#resTypeId', 'sp2', '#resTypeName', '毕业水平测试');">毕业水平测试</a>
-                <a href="javascript:selectQuery('#resTypeId', 'js3', '#resTypeName', '竞赛试卷');">竞赛试卷</a>
+                <Select v-model="leixing" style="width:150px">
+                  <Option v-for="item in leixingdata" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                </Select>
               </p>
             </dd>
           </dl>
@@ -82,29 +58,9 @@
             <dt class="nyCase-tit c888">版本:</dt>
             <dd class="nyCase-c">
               <p class="nyCase-c-a" style="height: 36px;">
-                <a href="javascript:selectQuery('#editionId', '', '#editionName', '');" class="on">不限</a>
-                <a href="javascript:selectQuery('#editionId', 'EDI2505', '#editionName', '人教部编版(新)');">人教部编版(新)</a>
-                <a href="javascript:selectQuery('#editionId', 'bb108', '#editionName', '延边教育出版社');">延边教育出版社</a>
-                <a href="javascript:selectQuery('#editionId', 'bb08', '#editionName', '人教课标版');">人教课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb02', '#editionName', '北师大课标版');">北师大课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb03', '#editionName', '鄂教课标版');">鄂教课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb06', '#editionName', '教科课标版');">教科课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb09', '#editionName', '苏教课标版');">苏教课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'EDI2517', '#editionName', '教科课标版(新)');">教科课标版(新)</a>
-                <a href="javascript:selectQuery('#editionId', 'bb10', '#editionName', '西师大课标版');">西师大课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb12', '#editionName', '语文社课标版');">语文社课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb13', '#editionName', '语文社课标版(S版)');">语文社课标版(S版)</a>
-                <a href="javascript:selectQuery('#editionId', 'bb14', '#editionName', '长春课标版');">长春课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb16', '#editionName', '北京课改版');">北京课改版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb17', '#editionName', '冀教课标版');">冀教课标版</a>
-                <a href="javascript:selectQuery('#editionId', 'bb65', '#editionName', '鲁教课标版(五四制)');">鲁教课标版(五四制)</a>
-                <a href="javascript:selectQuery('#editionId', 'EDI2382', '#editionName', '沪教版(沪审试用本)');">沪教版(沪审试用本)</a>
-                <a href="javascript:selectQuery('#editionId', 'EDI2509', '#editionName', '鄂教课标版(新)');">鄂教课标版(新)</a>
-                <a href="javascript:selectQuery('#editionId', 'EDI2513', '#editionName', '北师大课标版(新)');">北师大课标版(新)</a>
-                <a href="javascript:selectQuery('#editionId', 'EDI2519', '#editionName', '苏教课标版(新)');">苏教课标版(新)</a>
-                <a href="javascript:selectQuery('#editionId', 'EDI2536', '#editionName', '长春课标2016版');">长春课标2016版</a>
-                <a href="javascript:selectQuery('#editionId', 'EDI2537', '#editionName', '语文社课标版(新)');">语文社课标版(新)</a>
-                <a href="javascript:selectQuery('#editionId', 'ade3686a22a04d13b642baf5c9117b53', '#editionName', '冀教课标2016版');">冀教课标2016版</a>
+                <Select v-model="banben" style="width:150px">
+                  <Option v-for="item in banbendata" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                </Select>
               </p>
             </dd>
           </dl>
@@ -112,10 +68,9 @@
             <dt class="nyCase-tit c888">来源:</dt>
             <dd class="nyCase-c">
               <p class="nyCase-c-a">
-                <a href="javascript:;" class="on" onclick="javascript:selectOwnerRes('');">全部</a>
-                <a href="javascript:;" onclick="javascript:selectOwnerRes('2');">社会企业</a>
-                <a href="javascript:;" onclick="javascript:selectOwnerRes('3');">教育单位</a>
-                <a href="javascript:;" onclick="javascript:selectOwnerRes('4');">个人共享</a>
+                <Select v-model="laiyuan" style="width:150px">
+                  <Option v-for="item in laiyuandata" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                </Select>
               </p>
             </dd>
           </dl>
@@ -138,11 +93,11 @@
                 <div class="row-r-rect clearfix">
                   <div class="row-r-col2">
                     <h4>
-                      <a style="display:inline-block;width:450px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:21px;" target="_blank" href="" :title="itemy.title">{{itemy.title}}</a>
+                      <a style="display:inline-block;width:450px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:21px;" target="_blank" :href="itemy.skipurl" :title="itemy.title">{{itemy.title}}</a>
                     </h4>
                     <p class="title">
                       <strong class="c888">简介:</strong>
-                      <a style="display:inline-block;width:540px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:21px;" target="_blank" href="">{{itemy.intro}}</a>
+                      <a style="display:inline-block;width:540px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:21px;" target="_blank" :href="itemy.skipurl">{{itemy.intro}}</a>
                     </p>
                     <p class="info">
                       <span>
@@ -179,7 +134,7 @@
                     <a target="_blank" title="音频:《小蜗牛》课文朗读.mp3" href="">音频:《小蜗牛》课文...</a>
                   </h4>
                   <div class="rect">
-                    <img class="photo" src="http://css.huijiaoyun.com/tianyu_edu/area/edu4.0/images/index0331/zy_home/rec_zyImg.png" width="66" height="66">
+                    <img class="photo" src="../../assets/image/resource/tuijian_img.png" width="66" height="66">
                     <div class="baseInfo">
                       <p><strong>9025</strong>次浏览</p><p><strong>13</strong>次下载</p>
                     </div>
@@ -232,22 +187,75 @@
           }
         ],
         listdata: [
-          { "id": 1, "img": require("../../assets/image/resource/document_01.jpg"), "title": '五年级语文上册单元测试卷.doc', "intro": '点击查看更多《五年级语文上册单元测试卷.doc精彩内容', "time": '2019-04-21', "size": '68KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '张国辉' },
-          { "id": 2, "img": require("../../assets/image/resource/document_01.jpg"), "title": '统编本二年级上册语文期中试题.doc', "intro": '点击查看更多统编本二年级上册语文期中试题.doc精彩内容', "time": '2019-03-06', "size": '91KB', 'browse': '89', "enshrine": '0', "upload": '0', "author": '任冲' },
-          { "id": 3, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 语文百花园一课一练练习 语文S版.doc', "intro": '点击查看更多四年级语文下册 语文百花园一课一练练习 语文S版.doc精彩内容', "time": '2019-02-21', "size": '99KB', 'browse': '30', "enshrine": '0', "upload": '0', "author": '王瞿' },
-          { "id": 4, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文上册 绿叶的梦 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 绿叶的梦 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2019-02-22', "size": '102.3MB', 'browse': '103', "enshrine": '10', "upload": '5', "author": '李佳' },
-          { "id": 5, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文上册 快乐的暑假 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 快乐的暑假 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2018-12-09', "size": '58MB', 'browse': '206', "enshrine": '10', "upload": '2', "author": '李佳' },
-          { "id": 6, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文上册 让它们自由生息 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 让它们自由生息 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2018-08-16', "size": '85KB', 'browse': '109', "enshrine": '73', "upload": '40', "author": '任冲' },
-          { "id": 7, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 古诗两首-牧童2一课一练(无答案) 鲁教版.doc', "intro": '点击查看更多四年级语文下册 古诗两首-牧童2一课一练(无答案) 鲁教版.doc精彩内容', "time": '2018-09-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲' },
-          { "id": 8, "img": require("../../assets/image/resource/document_01.jpg"), "title": '二年级语文上册 25 古诗两首练习 人教新课标.doc', "intro": '点击查看更多二年级语文上册 25 古诗两首练习 人教新课标.doc精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲' },
+          { "id": 1, "img": require("../../assets/image/resource/document_01.jpg"), "title": '五年级语文上册单元测试卷.doc', "intro": '点击查看更多《五年级语文上册单元测试卷.doc精彩内容', "time": '2019-04-21', "size": '68KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '张国辉',"skipurl":'/details' },
+          { "id": 2, "img": require("../../assets/image/resource/document_01.jpg"), "title": '统编本二年级上册语文期中试题.doc', "intro": '点击查看更多统编本二年级上册语文期中试题.doc精彩内容', "time": '2019-03-06', "size": '91KB', 'browse': '89', "enshrine": '0', "upload": '0', "author": '任冲',"skipurl":'/details' },
+          { "id": 3, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 语文百花园一课一练练习 语文S版.doc', "intro": '点击查看更多四年级语文下册 语文百花园一课一练练习 语文S版.doc精彩内容', "time": '2019-02-21', "size": '99KB', 'browse': '30', "enshrine": '0', "upload": '0', "author": '王瞿',"skipurl":'/details' },
+          { "id": 4, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文上册 绿叶的梦 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 绿叶的梦 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2019-02-22', "size": '102.3MB', 'browse': '103', "enshrine": '10', "upload": '5', "author": '李佳',"skipurl":'/details' },
+          { "id": 5, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文上册 快乐的暑假 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 快乐的暑假 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2018-12-09', "size": '58MB', 'browse': '206', "enshrine": '10', "upload": '2', "author": '李佳',"skipurl":'/details' },
+          { "id": 6, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文上册 让它们自由生息 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 让它们自由生息 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2018-08-16', "size": '85KB', 'browse': '109', "enshrine": '73', "upload": '40', "author": '任冲',"skipurl":'/details' },
+          { "id": 7, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 古诗两首-牧童2一课一练(无答案) 鲁教版.doc', "intro": '点击查看更多四年级语文下册 古诗两首-牧童2一课一练(无答案) 鲁教版.doc精彩内容', "time": '2018-09-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲',"skipurl":'/details' },
+          { "id": 8, "img": require("../../assets/image/resource/document_01.jpg"), "title": '二年级语文上册 25 古诗两首练习 人教新课标.doc', "intro": '点击查看更多二年级语文上册 25 古诗两首练习 人教新课标.doc精彩内容', "time": '2019-03-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲',"skipurl":'/details' },
         ],
         model1: '',
+        cebiedata:[
+    { value: '不限',label: '不限'},
+    { value: '一年级上册',label: '一年级上册'},
+    { value: '一年级下册',label: '一年级下册'},
+    { value: '二年级上册',label: '二年级上册'},
+    { value: '二年级下册',label: '二年级下册'},
+    { value: '三年级上册',label: '三年级上册'},
+    { value: '三年级下册',label: '三年级下册'},
+    { value: '四年级上册',label: '四年级上册'},
+    { value: '四年级下册',label: '四年级下册'},
+                ],
+                cebie: '不限',
+           leixingdata:[
+    { value: '不限',label: '不限'},
+    { value: '随堂练习',label: '随堂练习'},
+    { value: '课后作业',label: '课后作业'},
+    { value: '单元练习',label: '单元练习'},
+    { value: '月考试卷',label: '月考试卷'},
+    { value: '期中测验',label: '期中测验'},
+    { value: '期末试卷',label: '期末试卷'},
+    { value: '毕业水平测试',label: '毕业水平测试'},
+    { value: '竞赛试卷',label: '竞赛试卷'},
+                ],
+                leixing: '不限',
+     banbendata:[
+    { value: '不限',label: '不限'},
+    { value: '人教部编版',label: '人教部编版'},
+    { value: '人教课标版',label: '人教课标版'},
+    { value: '延边教育出版社',label: '延边教育出版社'},
+    { value: '北师大课标版',label: '北师大课标版'},
+    { value: '教科课标版',label: '教科课标版'},
+    { value: '苏教课标版',label: '苏教课标版'},
+    { value: '西师大课标版',label: '西师大课标版'},
+    { value: '教科课标版(新)',label: '教科课标版(新)'},
+                ],
+                banben: '不限',
+    laiyuandata:[
+    { value: '全部',label: '全部'},
+    { value: '社会企业',label: '社会企业'},
+    { value: '教育单位',label: '教育单位'},
+    { value: '个人共享',label: '个人共享'},
+                ],
+                laiyuan: '全部',
       }
     },
     methods: {
       showbox() {
-        this.showbtn = !this.showbtn 
-      }
+        this.showbtn = !this.showbtn
+      },
+      cebiebtn(){
+      let newdata=[
+          { "id": 3, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 语文百花园一课一练练习 语文S版.doc', "intro": '点击查看更多四年级语文下册 语文百花园一课一练练习 语文S版.doc精彩内容', "time": '2019-02-21', "size": '99KB', 'browse': '30', "enshrine": '0', "upload": '0', "author": '王瞿' },
+          { "id": 4, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 绿叶的梦 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 绿叶的梦 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2019-02-22', "size": '102.3MB', 'browse': '103', "enshrine": '10', "upload": '5', "author": '李佳' },
+          { "id": 5, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 快乐的暑假 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 快乐的暑假 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2018-12-09', "size": '58MB', 'browse': '206', "enshrine": '10', "upload": '2', "author": '李佳' },
+          { "id": 6, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 让它们自由生息 1一课一练(无答案) 语文S版.doc', "intro": '点击查看更多四年级语文上册 让它们自由生息 1一课一练(无答案) 语文S版.doc精彩内容', "time": '2018-08-16', "size": '85KB', 'browse': '109', "enshrine": '73', "upload": '40', "author": '任冲' },
+          { "id": 7, "img": require("../../assets/image/resource/document_01.jpg"), "title": '四年级语文下册 古诗两首-牧童2一课一练(无答案) 鲁教版.doc', "intro": '点击查看更多四年级语文下册 古诗两首-牧童2一课一练(无答案) 鲁教版.doc精彩内容', "time": '2018-09-15', "size": '65KB', 'browse': '109', "enshrine": '5', "upload": '0', "author": '任冲' },
+            ];
+          this.listdata=newdata;
+                }
     }
   }
 </script>
@@ -375,9 +383,6 @@
     padding: 8px 15px 9px 15px;
     background: #fff;
   }
-    .site-nyCase-rect .nyCase-dl {
-      padding: 4px 0;
-    }
     .site-nyCase-rect .nyCase-tit {
       float: left;
       width: 52px;
@@ -770,7 +775,6 @@
         margin-right: 10px;
         color: #7f7f7f;
       }
-
   label {
     vertical-align: middle;
   }
@@ -785,16 +789,13 @@
     color: #fff;
     background: #9d9d9d;
   }
-
   .mgtb20 {
     margin-top: 20px;
     margin-bottom: 20px;
   }
-
   .t_c {
     text-align: center;
   }
-
   .u-white-btn {
     background: #fff;
     border: #56b8fd solid 1px;
@@ -842,10 +843,6 @@
     margin-left: 10px;
   }
 
-    .site-nyCase-rect .nyCase-dl {
-      padding: 4px 0;
-    }
-
     .site-nyCase-rect .nyCase-tit {
       width: 52px;
       float: left;
@@ -885,4 +882,8 @@
       margin: 4px 6px 4px 0;
       white-space: nowrap;
     }
+  .nyCase-dl {
+    float:left;
+    width:25%;
+  }
 </style>

+ 10 - 7
TEAMModelOS.SmartTeach/ClientApp/components/resource/list.vue

@@ -182,29 +182,32 @@
   }
   .icon_img {
     width:35px;
-    height:28px;
-    background:url(../../assets/image/resource/list_icon.png) no-repeat 0px 0px ;
+    height:35px;
+    background:url(../../assets/image/resource/list_icon_one.png) no-repeat;
     display:block;
     float:left;
+    margin-left:15px;
   }
   .icon_img_two {
     width: 35px;
-    height: 28px;
-    background: url(../../assets/image/resource/list_icon.png) no-repeat 0px -70px;
+    height: 35px;
+    background: url(../../assets/image/resource/list_icon_two.png) no-repeat;
     display: block;
     float: left;
+    margin-left: 15px;
   }
   .icon_img_three {
     width: 35px;
-    height: 28px;
-    background: url(../../assets/image/resource/list_icon.png) no-repeat 0px -141px;
+    height: 35px;
+    background: url(../../assets/image/resource/list_icon_three.png) no-repeat;
     display: block;
     float: left;
+    margin-left: 15px;
   }
   .moreover_title {
     font-size: 20px;
     color: #fff;
-    margin-left: 40px;
+    margin-left: 30px;
     float: left;
   }
   .jt {

+ 1 - 22
TEAMModelOS.SmartTeach/ClientApp/components/resource/recommend.vue

@@ -80,10 +80,6 @@
         </ul>
       </div>
     </div>
-    <div class="resource_img">
-    <img src="../../assets/image/resource/resource_img.jpg" class="banner_big" />
-    <img src="../../assets//image/resource/sk.png"  class="sk" @click="skbtn"/> 
-    </div>
   </div>
 </template>
 <script>
@@ -144,7 +140,7 @@
   }
   .recommend_title {
     float: left;
-    line-height: 19px;
+    line-height: 24px;
     border-bottom: #288add solid 1px;
     padding: 10px 3px 0px 3px;
     font-size: 24px;
@@ -206,21 +202,4 @@
   .two {
     color: #FF9966;
   }
-  .resource_img {
-    width: 1200px;
-    padding-top: 30px;
-    padding-bottom:30px;
-    position: relative;
-    margin:0 auto;
-
-  }
-  .banner_big {
-    width: 100%;
-  
-  }
-  .sk {
-    position:absolute;
-    bottom:20%;
-    left:40%;
-  }
 </style>

+ 225 - 158
TEAMModelOS.SmartTeach/ClientApp/components/resource/teacherMap.vue

@@ -1,24 +1,31 @@
 <template>
   <div class="content">
     <div class="map">
+      <span class="map-pro">四川省</span>
+
       <div class="my-map">
         <div id="myChart" :style="{width: '600px', height: '600px'}"></div>
       </div>
       <div class="chart">
-        <span>四川省</span>
-        <p>15854名优秀名师</p>
-        <div id="Chart" :style="{width: '500px', height: '700px'}"></div>
+        <h1>15854</h1><h2>个</h2>
+        <span>名师工作室</span>
+        <ul>
+          <li><span>5215人</span><span>一线教师</span></li>
+          <li><span>5215个</span><span>资源</span></li>
+          <li><span>54546次</span><span>关注度</span></li>
+        </ul>
+        <!--<div id="Chart" :style="{width: '500px', height: '700px'}"></div>-->
       </div>
     </div>
     <div class="teacher-show">
       <div class="header">
-        <h1 class="title ">全国名师展示</h1>
+        <h1 class="title ">名师展示</h1>
         <ul class="region">
-          <li><a href="" class="active" rel="all">全部</a></li>
-          <li><a href="" rel="330000" class="">浙江省</a></li>
-          <li><a href="" rel="440000" class="">广东省</a></li>
-          <li><a href="" rel="210000" class="">辽宁省</a></li>
-          <li><a href="" rel="350000" class="">福建省</a></li>
+          <li><a class="active" @click="chooseSchool()">全部</a></li>
+          <li><a @click="chooseSchool('zt')">紫藤小学</a></li>
+          <li><a @click="chooseSchool('xx')">西芯小学</a></li>
+          <li><a @click="chooseSchool('fc')">芳草小学</a></li>
+          <li><!--<a href="" rel="350000" class=""></a>--></li>
         </ul>
       </div>
       <div class="select">
@@ -81,14 +88,14 @@
             <span class="data-view-member"></span>
           </div>
           <p class="data-name">成员总数</p>
-          <p class="number">579260</p>
+          <p class="number">57260</p>
         </div>
         <div class="data-item">
           <div class="img-content">
             <span class="data-view-article"></span>
           </div>
           <p class="data-name">文章总数</p>
-          <p class="number">1561686</p>
+          <p class="number">15686</p>
         </div>
         <div class="data-item">
           <div class="img-content">
@@ -102,14 +109,14 @@
             <span class="data-view-resource"></span>
           </div>
           <p class="data-name">资源总数</p>
-          <p class="number">1428690</p>
+          <p class="number">142890</p>
         </div>
         <div class="data-item">
           <div class="img-content">
             <span class="data-view-move"></span>
           </div>
           <p class="data-name">优课总数</p>
-          <p class="number">234346</p>
+          <p class="number">23446</p>
         </div>
       </div>
     </div>
@@ -125,7 +132,7 @@
         chart: null,
         data: [],
         total: 0,
-        model1:'',
+        model1: '',
         periodList: [
           {
             value: 1,
@@ -166,27 +173,47 @@
             label: '生物'
           },
           {
-            value:5,
+            value: 5,
             label: '化学'
           },
         ],
-        teacherList: [
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people01.jpg'), title: '省级名师', name: '周杨', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500'},
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people02.jpg'), title: '省级名师', name: '李俊峰', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people04.jpg'),title: '省级名师', name: '王志明', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people03.jpg'),title: '省级名师', name: '李国强', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people05.jpg'), title: '省级名师', name: '黄明莉', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people08.jpg'), title: '省级名师', name: '李章杰', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people06.jpg'), title: '省级名师', name: '周湾', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people07.jpg'), title: '省级名师', name: '徐建生', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people09.jpg'), title: '省级名师', name: '王福生', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people10.jpg'), title: '省级名师', name: '张凯伦', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people13.jpg'), title: '省级名师', name: '吴世杰', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people12.jpg'), title: '省级名师', name: '王先森', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '李德华', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people15.jpg'), title: '省级名师', name: '李萌萌', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-          { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '省级名师', name: '张梦迪', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-        ],
+        teacherList: [],
+        teacher: {
+          datazt: [
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people01.jpg'), title: '省级名师', name: '周杨', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people02.jpg'), title: '省级名师', name: '李俊峰', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people04.jpg'), title: '省级名师', name: '王志明', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people03.jpg'), title: '省级名师', name: '李国强', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people05.jpg'), title: '省级名师', name: '黄明莉', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people08.jpg'), title: '省级名师', name: '李章杰', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people06.jpg'), title: '省级名师', name: '周湾明', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people07.jpg'), title: '省级名师', name: '徐建生', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people09.jpg'), title: '省级名师', name: '王福生', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people10.jpg'), title: '省级名师', name: '张凯伦', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people13.jpg'), title: '省级名师', name: '吴世杰', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people12.jpg'), title: '省级名师', name: '王先森', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '李德华', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people15.jpg'), title: '省级名师', name: '李萌萌', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '省级名师', name: '张梦迪', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
+          ],
+          dataxx: [
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people04.jpg'), title: '市级名师', name: '范建健', period: '中学', text1: '成员', number1: '1260', text2: '资源', number2: '1000', text3: '热度', number3: '6500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people02.jpg'), title: '省级名师', name: '张梦娇', period: '小学', text1: '成员', number1: '1450', text2: '资源', number2: '2500', text3: '热度', number3: '1800' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people01.jpg'), title: '省级名师', name: '严苏华', period: '小学', text1: '成员', number1: '1560', text2: '资源', number2: '2050', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people05.jpg'), title: '省级名师', name: '乔国锋', period: '小学', text1: '成员', number1: '1980', text2: '资源', number2: '2500', text3: '热度', number3: '100' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people03.jpg'), title: '市级名师', name: '周育俭', period: '中学', text1: '成员', number1: '1200', text2: '资源', number2: '2080', text3: '热度', number3: '500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people06.jpg'), title: '省级名师', name: '李章杰', period: '中学', text1: '成员', number1: '1000', text2: '资源', number2: '2800', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people08.jpg'), title: '省级名师', name: '赵志田', period: '小学', text1: '成员', number1: '1600', text2: '资源', number2: '2900', text3: '热度', number3: '1600' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people07.jpg'), title: '省级名师', name: '邹守烁', period: '中学', text1: '成员', number1: '1050', text2: '资源', number2: '2200', text3: '热度', number3: '700' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people09.jpg'), title: '省级名师', name: '王福生', period: '中学', text1: '成员', number1: '1500', text2: '资源', number2: '1800', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people10.jpg'), title: '省级名师', name: '邹守烁', period: '小学', text1: '成员', number1: '2000', text2: '资源', number2: '2700', text3: '热度', number3: '5500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people15.jpg'), title: '市级名师', name: '吴世杰', period: '小学', text1: '成员', number1: '1050', text2: '资源', number2: '2300', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people12.jpg'), title: '省级名师', name: '吴兵', period: '中学', text1: '成员', number1: '1800', text2: '资源', number2: '2020', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people14.jpg'), title: '市级名师', name: '李德华', period: '小学', text1: '成员', number1: '1300', text2: '资源', number2: '2500', text3: '热度', number3: '6500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people13.jpg'), title: '省级名师', name: '李东方', period: '中学', text1: '成员', number1: '1500', text2: '资源', number2: '2060', text3: '热度', number3: '1500' },
+            { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '张浩然', period: '中学', text1: '成员', number1: '1060', text2: '资源', number2: '2800', text3: '热度', number3: '1500' },
+          ]
+          },
         teacherData: [
           {
             "name": "高新区",
@@ -216,9 +243,21 @@
     },
     mounted() {
       this.drawLine();
-      this.drawChart();
+      //this.drawChart();
+      this.teacherList = this.teacher.datazt;
     },
     methods: {
+      chooseSchool(data) {
+        if (data == "zt") {
+          this.teacherList = this.teacher.datazt
+        } else if (data == "xx") {
+          this.teacherList = this.teacher.dataxx
+        } else if (data == "fc") {
+          this.teacherList = this.teacher.datazt
+        } else {
+          this.teacherList = this.teacher.datazt
+        }
+      },
       teacherZone() {
         this.$router.push('/TeacherZone')
       },
@@ -277,120 +316,120 @@
           console.log(params);
         });
       },
-      drawChart() {
-        var myChart = echarts.init(document.getElementById('Chart'));
-        var xData = [],
-          yData = [];
-        var min = 50; // 最小值的定义
-        this.teacherData.map(function (a, b) {
-          xData.push(a.name);
-          if (a.value === 0) {
-            yData.push(a.value + min);
-          } else {
-            yData.push(a.value);
-          }
-        });
-        var option = {
-          //color: ['#3398DB'],
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-              type: 'line',
-              lineStyle: {
-                opacity: 0
-              }
-            },
-            formatter: function (prams) {
-              return "名师数:" + prams[0].data
-            }
-          },
-          grid: {
-            left: '0%',
-            right: '0%',
-            bottom: '5%',
-            top: '5%',
-            height: '50%',
-            containLabel: true,
-            z: 22
-          },
-          xAxis: [{
-            type: 'category',
-            gridIndex: 0,
-            data: xData,
-            axisTick: {
-              alignWithLabel: true
-            },
-            axisLine: {
-              lineStyle: {
-                color: '#0c3b71'
-              }
-            },
-            axisLabel: {
-              show: true,
-              color: 'rgb(170,170,170)',
-              fontSize: 12
-            }
-          }],
-          yAxis: [{
-            type: 'value',
-            gridIndex: 0,
-            splitLine: {
-              show: true
-            },
-            axisTick: {
-              show: true
-            },
-            max: 150,
-            axisLine: {
-              lineStyle: {
-                color: '#0c3b71'
-              }
-            },
-            axisLabel: {
-              color: 'rgb(170,170,170)',
-              formatter: '{value} '
-            }
-          },
-          {
-            type: 'value',
-            gridIndex: 0,
-            max: 200,
-          }
-          ],
-          series: [{
-            type: 'bar',
-            barWidth: '20',
-            xAxisIndex: 0,
-            yAxisIndex: 0,
-            itemStyle: {
-              normal: {
-                //barBorderRadius: [30, 30, 0, 0],
-                color: new echarts.graphic.LinearGradient(
-                  0, 0, 0, 1, [
-                    //  {
-                    //  offset: 0,
-                    //  color: '#00feff'
-                    //},
-                    {
-                      offset: 0.5,
-                      color: '#4da1ff'
-                    },
-                    {
-                      offset: 1,
-                      color: '#4da1ff'
-                    }
-                  ]
-                )
-              }
-            },
-            data: yData,
-            zlevel: 11
+      //drawChart() {
+      //  var myChart = echarts.init(document.getElementById('Chart'));
+      //  var xData = [],
+      //    yData = [];
+      //  var min = 50; // 最小值的定义
+      //  this.teacherData.map(function (a, b) {
+      //    xData.push(a.name);
+      //    if (a.value === 0) {
+      //      yData.push(a.value + min);
+      //    } else {
+      //      yData.push(a.value);
+      //    }
+      //  });
+      //  var option = {
+      //    //color: ['#3398DB'],
+      //    tooltip: {
+      //      trigger: 'axis',
+      //      axisPointer: {
+      //        type: 'line',
+      //        lineStyle: {
+      //          opacity: 0
+      //        }
+      //      },
+      //      formatter: function (prams) {
+      //        return "名师数:" + prams[0].data
+      //      }
+      //    },
+      //    grid: {
+      //      left: '0%',
+      //      right: '0%',
+      //      bottom: '5%',
+      //      top: '5%',
+      //      height: '50%',
+      //      containLabel: true,
+      //      z: 22
+      //    },
+      //    xAxis: [{
+      //      type: 'category',
+      //      gridIndex: 0,
+      //      data: xData,
+      //      axisTick: {
+      //        alignWithLabel: true
+      //      },
+      //      axisLine: {
+      //        lineStyle: {
+      //          color: '#0c3b71'
+      //        }
+      //      },
+      //      axisLabel: {
+      //        show: true,
+      //        color: 'rgb(170,170,170)',
+      //        fontSize: 12
+      //      }
+      //    }],
+      //    yAxis: [{
+      //      type: 'value',
+      //      gridIndex: 0,
+      //      splitLine: {
+      //        show: true
+      //      },
+      //      axisTick: {
+      //        show: true
+      //      },
+      //      max: 150,
+      //      axisLine: {
+      //        lineStyle: {
+      //          color: '#0c3b71'
+      //        }
+      //      },
+      //      axisLabel: {
+      //        color: 'rgb(170,170,170)',
+      //        formatter: '{value} '
+      //      }
+      //    },
+      //    {
+      //      type: 'value',
+      //      gridIndex: 0,
+      //      max: 200,
+      //    }
+      //    ],
+      //    series: [{
+      //      type: 'bar',
+      //      barWidth: '20',
+      //      xAxisIndex: 0,
+      //      yAxisIndex: 0,
+      //      itemStyle: {
+      //        normal: {
+      //          //barBorderRadius: [30, 30, 0, 0],
+      //          color: new echarts.graphic.LinearGradient(
+      //            0, 0, 0, 1, [
+      //              //  {
+      //              //  offset: 0,
+      //              //  color: '#00feff'
+      //              //},
+      //              {
+      //                offset: 0.5,
+      //                color: '#4da1ff'
+      //              },
+      //              {
+      //                offset: 1,
+      //                color: '#4da1ff'
+      //              }
+      //            ]
+      //          )
+      //        }
+      //      },
+      //      data: yData,
+      //      zlevel: 11
 
-          },
-          ]
-        };
-        myChart.setOption(option);
-      }
+      //    },
+      //    ]
+      //  };
+      //  myChart.setOption(option);
+      //}
     },
     
   }
@@ -399,28 +438,56 @@
   .map {
     width: 65%;
     height: 600px;
-    margin:auto;
+    margin: auto;
     /*margin-left:150px;*/
     padding-left: 250px;
-    /*background: url("../../assets/image/resource/title-bg.jpg") center 120% no-repeat;*/
-    background-color:azure;
-    display:flex;
+    background: url("../../assets/image/resource/map-bg.png") no-repeat;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    /*display:flex;*/
+  }
+  .map-pro {
+    display: block;
+    padding-top: 13%;
+    margin-left: 2%;
+    font-size: 24px;
+    font-weight: 800;
+    color: orangered;
   }
   .my-map {
     height: 600px;
     width: 600px;
     /*border: 1px solid red;*/
-    margin-left: -25%;
+    /*text-align: right;*/
+    margin-top: -15%;
+    margin-left: 25%;
   }
   .chart {
-    width: 520px;
-    height: 550px;
-    margin-top: 3%;
+    width: 300px;
+    height: 300px;
+    margin-top: -35%;
     /* border: 1px solid red; */
-    margin-left: 10%;
-    box-shadow: 1px 1px 1px 1px lightblue;
-    background-color: #fff;
+    margin-left: -18%;
   }
+  .chart h1{
+    color:coral;
+  }
+    .chart h2 {
+      display: block;
+      margin-top: -10%;
+      margin-left: 25%;
+    }
+    .chart ul {
+      list-style:none;
+      width:150px;
+    }
+    .chart li {
+      width: 150px;
+      height: 20px;
+      border: 1px solid red;
+      margin-bottom: 10px;
+      border-radius: 25px;
+    }
   .header {
     width: 100%;
     height: 56px;
@@ -518,7 +585,7 @@
     width: 110px;
     height: 105px;
     border-radius: 50%;
-    margin-left: -20px;
+    margin-left: -30px;
     margin-top: -25px;
     position: relative;
   }

+ 28 - 7
TEAMModelOS.SmartTeach/ClientApp/components/resource/video.vue

@@ -23,12 +23,16 @@
             <img :src="item.imgurl" />
             <a target="_blank" :href="item.url" class="playbtn1"></a>
             <h4 class="name_more">
-            <a target="_blank" :href="item.url" style="color:#fff">{{item.slogan}}</a>
+              <a target="_blank" :href="item.url" style="color:#fff">{{item.slogan}}</a>
             </h4>
           </li>
         </ul>
       </div>
     </div>
+    <div class="resource_img">
+      <img src="../../assets/image/resource/resource_img.jpg" class="banner_big" />
+      <img src="../../assets//image/resource/sk.png" class="sk" @click="skbtn" />
+    </div>
   </div>
 </template>
 <script>
@@ -38,10 +42,10 @@
         imgurl: '',
         imgtext:'',
         video_list: [
-          { "id": 1, "imgurl": require("../../assets/image/resource/video_img_one.jpg"), "slogan": '人教三上第四单元_三位数减三位...', "url": '/videodetails?id=1' },
-          { "id": 2, "imgurl": require("../../assets/image/resource/video_img_two.jpg"), "slogan": '五上第七单元_在一条线段上植树', "url": '/videodetails?id=2' },
-          { "id": 3, "imgurl": require("../../assets/image/resource/video_img_three.jpg"), "slogan": '人教一上第五单元_6和7的写法', "url": '/videodetails?id=3' },
-          { "id": 4, "imgurl": require("../../assets/image/resource/video_img_four.jpg"), "slogan": '人教二上第四单元_2,3的乘法口诀', "url": '/videodetails?id=4' },
+          { "id": 1, "imgurl": require("../../assets/image/resource/video_img_two.png"), "slogan": '人教版七年级上册 数学 绝对值', "url": '/videodetails?id=1' },
+          { "id": 2, "imgurl": require("../../assets/image/resource/video_img_three.png"), "slogan": '人教版七年级上册 数学 有理数的分类', "url": '/videodetails?id=2' },
+          { "id": 3, "imgurl": require("../../assets/image/resource/video_img_four.png"), "slogan": '人教版七年级上册 数学 旋转体', "url": '/videodetails?id=3' },
+          { "id": 4, "imgurl": require("../../assets/image/resource/video_img_five.png"), "slogan": '人教版七年级上册 数学 方程式', "url": '/videodetails?id=4' },
         ],
       }
     },
@@ -51,8 +55,8 @@
     methods: {
       init() {
         if (this.$route.path == '/resource') {
-          this.imgurl = require("../../assets/image/resource/video_img.jpg");
-          this.imgtext = '人教五上单元_列方程解决实际问题';
+          this.imgurl = require("../../assets/image/resource/video_img_one.png");
+          this.imgtext = '人教版七年级上册 数学 正数与负数';
         } else if (this.$route.path == '/arearesource') {
           this.imgurl = require("../../assets/image/resource/video_area_img.png");
           this.imgtext = '人教版 一年级(下册) ';
@@ -195,4 +199,21 @@
       width:100%;
       height:170px;
     }
+  .resource_img {
+    width: 1200px;
+    padding-top: 30px;
+    padding-bottom: 30px;
+    position: relative;
+    margin: 0 auto;
+  }
+
+  .banner_big {
+    width: 100%;
+  }
+
+  .sk {
+    position: absolute;
+    bottom: 20%;
+    left: 40%;
+  }
 </style>

+ 1 - 1
TEAMModelOS.SmartTeach/ClientApp/view/resource/index.vue

@@ -3,8 +3,8 @@
     <Header></Header>
     <Banner></Banner>
     <Exam></Exam>
-    <Video></Video>
     <Recommend></Recommend>
+    <Video></Video>
     <Footer></Footer>
   </div>
 </template>

+ 12 - 12
TEAMModelOS.SmartTeach/ClientApp/view/resource/resourceindex/videodetails.vue

@@ -80,23 +80,23 @@
       init() {
         //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';
+          this.title = '人教版七年级上册 数学 正数与负数',
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_one.mp4';
         } else if (this.$route.query.id == '1') {
-          this.title = '人教三上第四单元_三位数减三位',
-            this.videourl = 'http://mct-whtymct.huijiaoyun.com/gfs_mnt/data7/2017/12/14/16/4/d5954e58a8b841b0b7a175a92c1d2af9/79abb986261a42f9a39afb8b8b89d4db/6c836d2154914ed5817e348a556fef79.mp4?authorization=bce-auth-v1/08da4fd5cf644d458c950b09bdb95666/2017-12-14T08:06:19Z/-1//56f2b54251b858c8dcdd582d6253b2f8b813204a7c0b55cf05782cba964657c8';
+          this.title = '人教版七年级上册 数学 绝对值',
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_two.mp4';
         } else if (this.$route.query.id == '2') {
-          this.title = '五上第七单元_在一条线段上植树(两端都栽树)问题的规律',
-            this.videourl = 'http://mct-whtymct.huijiaoyun.com/gfs_mnt/data7/2017/12/14/16/25/d5954e58a8b841b0b7a175a92c1d2af9/d08f00af8f934c0caeb18a8fb3c5cee4/a6ff193a5a694b16bd64b01875ad2841.mp4?authorization=bce-auth-v1/08da4fd5cf644d458c950b09bdb95666/2017-12-14T08:29:11Z/-1//7d531957cacbd810d9903158418112cfb310115ba577a560a1c79c029e95b081';
+          this.title = '人教版七年级上册 数学 有理数的分类',
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_three.mp4';
         } else if (this.$route.query.id == '3') {
-          this.title = '人教一上第五单元_6和7的写法',
-            this.videourl = 'http://mct-whtymct.huijiaoyun.com/gfs_mnt/data7/2017/12/14/16/55/d5954e58a8b841b0b7a175a92c1d2af9/a814f6b58ed042f6a0bb22607b461c10/8ae82a12cb7e42228404881d0bd9e2a7.mp4?authorization=bce-auth-v1/08da4fd5cf644d458c950b09bdb95666/2017-12-14T08:58:41Z/-1//e6b754d1e579379e4f4f3a8bd3d95acd1f1791d4c5b278dc633098b060ed3251';
+          this.title = '人教版七年级上册 数学 旋转体',
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_four.mp4';
         } else if (this.$route.query.id == '4') {
-          this.title = '人教二上第四单元_2,3的乘法口诀',
-            this.videourl = 'http://mct-whtymct.huijiaoyun.com/gfs_mnt/data7/2017/12/14/16/51/d5954e58a8b841b0b7a175a92c1d2af9/09d1fff750fe426699d6d831cf6c6a97/7dcf1f36c99d460f99bfcacff3f84335.mp4?authorization=bce-auth-v1/08da4fd5cf644d458c950b09bdb95666/2017-12-14T09:01:26Z/-1//9f5b259695d3e253c934e21f37560245f93e60ebaccf816c1ec346b9dd394599';
+          this.title = '人教版七年级上册 数学 方程式',
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_five.mp4';
         } else if (this.$route.path == '/videodetails') {
-          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';
+          this.title = '人教版七年级上册 数学 正数与负数',
+            this.videourl = 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelos/video/video_one.mp4';
         }
       }
     }