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

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

@@ -1023,12 +1023,15 @@
   }
   .index_top_list {
     width:100%;
-    height:250px;
+    height:auto;
     list-style:none;
+    overflow:hidden;
   }
   .index_top_data {
-    width:100%;
+    width:114%;
+    height:20px;
     padding:1%  3% 3% 0%;
+    border-bottom:1px dashed #ddd;
   }
   .index_top_data_title {
     width: 70%;
@@ -1042,7 +1045,7 @@
   }
   .activity_img {
     width:1200px;
-    margin-top:7%;
+    margin-top:5%;
     float:left;
   }
   .production_box {

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

@@ -142,7 +142,7 @@
   }
   .exam_box {
     width: 30%;
-    height: 250px;
+    height: 300px;
     margin: 1% 0% 1% 4.5%;
     text-align: center;
     float: left;
@@ -150,6 +150,7 @@
     padding: 1%;
     box-shadow: 2px 2px 10px rgba(15,4,9,0.05);
     background-color: #fff;
+    padding-left:20px;
   }
     .exam_box:nth-child(1) {
       margin: 1% 1% 1% 0%;
@@ -165,7 +166,6 @@
     font-size: 24px;
     border-bottom: #288add solid 1px;
     float: left;
-    margin-left: 20px;
   }
 
   .exam_title i {
@@ -183,15 +183,14 @@
   .exam_img {
     margin-top: 10px;
     float: left;
-    margin-left:15px;
   }
     .exam_img img {
-      width:90%;
+      width:106%;
     }
     .exam_list {
       width: 100%;
       height: auto;
-      padding: 1%;
+      padding: 1% 1% 1% 0%;
       list-style: none;
       float: left;
       text-align: left;
@@ -200,6 +199,8 @@
   .exam_list_data {
     width: 100%;
     float: left;
+    padding:4px 2px;
+    border-bottom:1px dashed #ddd;
   }
 
   .exam_list_title {

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

@@ -38,13 +38,13 @@
       <h1>开通智慧学校</h1>
       <div class="box"></div>
     </div>
-    <img src="../../assets/image/resource/center01.png">
+    <img src="../../assets/image/resource/center001.png">
     <div class="arrow">
       <img src="../../assets/image/resource/arrow.png">
       <h1>开通智慧云平台</h1>
       <div class="box"></div>
     </div>
-    <img src="../../assets/image/resource/bottom.png" style="width:100%">
+    <img src="../../assets/image/resource/botton.png" style="width:100%">
     <div class="arrow">
       <img src="../../assets/image/resource/arrow.png" >
       <h1>联系我们</h1>
@@ -60,7 +60,7 @@
       return {
         homeCarouselImg: [
           {
-            images: require('../../assets/image/resource/banner02.png')
+            images: require('../../assets/image/resource/banner002.png')
           },
           {
             images: require('../../assets/image/resource/banner01.png')
@@ -106,9 +106,9 @@
     margin-top: -20px;
     position: relative;
     z-index: 20;
-    width: 56.5%;
+    width: 60%;
     /*overflow: hidden;*/
-    margin-left: 21.5%;
+    margin-left: 21%;
   }
 
   .people-list {

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

@@ -127,10 +127,11 @@
   }
   .recommend_box {
     width: 1200px;
-    height: 370px;
+    height: auto;
     background-color: #fff;
     box-shadow: 2px 2px 10px rgba(15,4,9,0.05);
     margin:0 auto;
+    overflow:hidden;
   }
   .recommend_header {
     width: 100%;
@@ -174,6 +175,7 @@
     /*border:1px solid red;*/
     height:auto;
     padding:1%;
+    /*border-right:1px solid #e3e3e3;*/
   }
   .recommend_left {
     width:100%;
@@ -187,7 +189,8 @@
     width: 100%;
     list-style: none;
     float: left;
-    padding:0.5%;
+    padding:8px 2px;
+    border-bottom:1px dashed #ddd;
   }
   .recommend_list_title {
     font-size:14px;

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

@@ -1,22 +1,24 @@
 <template>
   <div class="content">
-    <div class="map">
-      <span class="map-pro">四川省</span>
+    <div class="top">
+      <div class="map">
+        <span class="map-pro">{{countData.name}}</span>
 
-      <div class="my-map">
-        <div id="myChart" :style="{width: '600px', height: '600px'}"></div>
-      </div>
-      <div class="chart">
-        <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 class="my-map">
+          <div id="myChart" :style="{width: '600px', height: '600px'}"></div>
+        </div>
+        <div class="chart">
+          <h1>{{countData.data}}</h1><h2>个</h2>
+          <h3>名师工作室</h3>
+          <ul>
+            <li><span>{{countData.teacher}}人</span><p>一线教师</p></li>
+            <li><span>{{countData.source}}个</span><p>资源</p></li>
+            <li><span>{{countData.focus}}次</span><p>关注度</p></li>
+          </ul>
+        </div>
       </div>
     </div>
+
     <div class="teacher-show">
       <div class="header">
         <h1 class="title ">名师展示</h1>
@@ -72,52 +74,19 @@
       </div>
     </div>
     <div class="data-view">
-      <div class="four">
-        <img src="https://css.huijiaoyun.com/tianyu_edu/html_other_edu/cd_good_school/images/four.png" alt="">
-      </div>
       <div class="resource-data">
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-teacher"></span>
-          </div>
-          <p class="data-name">名师总数</p>
-          <p class="number">13201</p>
-        </div>
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-member"></span>
-          </div>
-          <p class="data-name">成员总数</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">15686</p>
-        </div>
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-active"></span>
-          </div>
-          <p class="data-name">活动总数</p>
-          <p class="number">38792</p>
-        </div>
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-resource"></span>
-          </div>
-          <p class="data-name">资源总数</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">23446</p>
-        </div>
+        <ul>
+          <li>445585</li>
+          <li>856585</li>
+          <li>482655</li>
+        </ul>
+      </div>
+      <div class="resource">
+        <ul>
+          <li>6545585</li>
+          <li>152685</li>
+          <li>624585</li>
+        </ul>
       </div>
     </div>
   </div>
@@ -129,10 +98,39 @@
   export default {
     data() {
       return {
-        chart: null,
-        data: [],
-        total: 0,
         model1: '',
+        countData:[],
+        dataIndex: '',
+        countDatas: [
+          {
+            name: '四川省',
+            data:'14666',
+            teacher: '41654',
+            source: '599545',
+            focus:'454556'
+          },
+          {
+            name: '湖北省',
+            data: '14956',
+            teacher: '44944',
+            source: '544445',
+            focus: '45956'
+          },
+          {
+            name: '广东省',
+            data: '89966',
+            teacher: '41654',
+            source: '545445',
+            focus: '5416'
+          },
+          {
+            name: '云南省',
+            data: '14986',
+            teacher: '418794',
+            source: '545445',
+            focus: '45556'
+          }
+        ],
         periodList: [
           {
             value: 1,
@@ -214,38 +212,23 @@
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '张浩然', period: '中学', text1: '成员', number1: '1060', text2: '资源', number2: '2800', text3: '热度', number3: '1500' },
           ]
           },
-        teacherData: [
-          {
-            "name": "高新区",
-            "value": 80
-          }, {
-            "name": "青羊区",
-            "value": 87
-          }, {
-            "name": "天府新区",
-            "value": 60
-          }, {
-            "name": "锦江区",
-            "value": 40
-          }, {
-            "name": "金牛区",
-            "value": 50
-          }, {
-            "name": "郫都区",
-            "value": 30
-          }, {
-            "name": "温江区",
-            "value": 40
-          }
-        ]
-
       };
     },
     mounted() {
       this.drawLine();
-      //this.drawChart();
       this.teacherList = this.teacher.datazt;
+      this.countData = this.countDatas[0]
     },
+    //computed: {
+    //  dataIndex: function () {
+    //    console.log('12111541');
+    //  }
+    //},
+    //watch: {
+    //  dataIndex() {
+    //    console.log('23612651');
+    //  },  
+    //},
     methods: {
       chooseSchool(data) {
         if (data == "zt") {
@@ -261,6 +244,18 @@
       teacherZone() {
         this.$router.push('/TeacherZone')
       },
+      choosePro(data) {
+        console.log(data, '5646464');
+        if (data == '0') {
+          this.countData = this.countDatas[0]
+        } else if (data == '2') {
+          this.countData = this.countDatas[1]
+        }else if (data == '1') {
+          this.countData = this.countDatas[2]
+        }else if (data == '3') {
+          this.countData = this.countDatas[3]
+        }
+      },
       drawLine() {
         var mapChart = echarts.init(document.getElementById('myChart'));
         // mapChart的配置
@@ -294,7 +289,7 @@
               normal: {
                 borderWidth: .5,//区域边框宽度
                 borderColor: '#666',//区域边框颜色
-                areaColor: "#fff",//区域颜色
+                areaColor: "lightblue",//区域颜色
                 //background-image: linear-gradient(135deg, #f5f7fa 0 %, #c3cfe2 100 %);
               },
               emphasis: {
@@ -307,158 +302,49 @@
               { name: '四川', selected: true },//福建为选中状态
               { name: '广东', selected: true },//福建为选中状态
               { name: '湖北', selected: true },//福建为选中状态
+              { name: '云南', selected: true },//福建为选中状态
             ]
           }],
         }
         mapChart.setOption(option);
-        mapChart.on('click', function (params) {
-          this.dataIndex = params.dataIndex;
-          console.log(params);
+        mapChart.on('click', (params) => {
+          let data = params.dataIndex;
+          this.choosePro(data);
         });
       },
-      //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);
-      //}
     },
     
   }
 </script>
 <style scoped>
+  .top {
+    width: 100%;
+    background: -webkit-linear-gradient(left, #FFD3AC,#FFC381);
+  }
   .map {
     width: 65%;
     height: 600px;
     margin: auto;
     /*margin-left:150px;*/
     padding-left: 250px;
-    background: url("../../assets/image/resource/map-bg.png") no-repeat;
+    background: url("../../assets/image/resource/map-bg.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    /*display:flex;*/
   }
   .map-pro {
     display: block;
     padding-top: 13%;
     margin-left: 2%;
-    font-size: 24px;
+    font-size: 25px;
     font-weight: 800;
-    color: orangered;
+    color: #f05053;
   }
   .my-map {
     height: 600px;
     width: 600px;
     /*border: 1px solid red;*/
     /*text-align: right;*/
+    /*background-color:#555;*/
     margin-top: -15%;
     margin-left: 25%;
   }
@@ -470,23 +356,47 @@
     margin-left: -18%;
   }
   .chart h1{
-    color:coral;
+    color:gold;
+    margin-top:35px;
   }
     .chart h2 {
       display: block;
-      margin-top: -10%;
+      margin-top: -33px;
       margin-left: 25%;
+      font-size: 20px;
+      color: #fefefe;
+      font-weight: 800;
+    }
+    .chart h3 {
+      font-size:20px;
+      font-weight:800;
+      color:#fefefe;
     }
     .chart ul {
       list-style:none;
       width:150px;
+      margin-top:10%;
     }
     .chart li {
-      width: 150px;
+      width: 200px;
       height: 20px;
-      border: 1px solid red;
-      margin-bottom: 10px;
+      /*border: 1px solid red;*/
+      margin-bottom: 15px;
       border-radius: 25px;
+      background: -webkit-linear-gradient(left, #f05053, #f05053);
+    }
+    .chart span {
+      color:#fff;
+      font-size:14px;
+      margin-left:15px;
+    }
+    .chart p {
+      color: #fff;
+      font-size: 15px;
+      font-weight: 800;
+      display: block;
+      margin-left: 100px;
+      margin-top: -21px;
     }
   .header {
     width: 100%;
@@ -601,12 +511,12 @@
       font-weight: bold;
     }
     .teacher-info .subject {
-      width: 116px;
-      height: 24px;
+      width: 120px;
+      height: 25px;
       margin: 0 auto;
       -webkit-border-radius: 20px;
       border-radius: 20px;
-      background: -webkit-linear-gradient(left, #a1c4fd, #c2e9fb);
+      background: -webkit-linear-gradient(left, #ff7e56, #ffc77d);
     }
       .teacher-info .subject p span {
         display: inline-block;
@@ -618,6 +528,11 @@
         background: #fff;
         margin: 3px 6px;
       }
+      .teacher-info .subject p {
+        padding-top: 3px;
+        font-size: 12px;
+        font-weight: 800;
+      }
   .teacher-detailed {
     width: 100%;
     height: 60px;
@@ -635,9 +550,11 @@
   }
   .data-view {
     width: 100%;
-    height: 663px;
+    height: 650px;
     overflow: hidden;
-    background: url('../../assets/image/resource/data-view-bg.png') no-repeat center center;
+    background: url('../../assets/image/resource/teacher-bottom.png') no-repeat;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
   }
   .four {
     width: 409px;
@@ -666,19 +583,41 @@
     margin-top: 10px;
   }
   .resource-data {
-    width: 1100px;
+    /*width: 1100px;*/
     height: 130px;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    margin: 130px auto 0;
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-justify-content: space-around;
-    -ms-flex-pack: distribute;
-    justify-content: space-around;
+    /*text-align:left;*/
   }
+    .resource-data ul {
+      font-size: 25px;
+      font-weight: 800;
+      margin-top: 365px;
+      margin-left: 565px;
+    }
+      .resource-data ul li {
+        float: left;
+        width: 316px;
+        display: block;
+        font-size: 28px;
+        color:#ff705b;
+      }
+ .resource {
+    /*width: 1100px;*/
+    height: 130px;
+    /*text-align:left;*/
+  }
+  .resource ul {
+    font-size: 25px;
+    font-weight: 800;
+    margin-top: 48px;
+    margin-left: 565px;
+  }
+      .resource ul li {
+        float: left;
+        width: 316px;
+        display: block;
+        font-size: 28px;
+        color:#ff705b;
+      }
   .data-item {
     width: 130px;
     height: 100%;
@@ -689,42 +628,6 @@
     margin: 25px auto 17px;
     text-align: center;
   }
-  .data-view-teacher {
-    width: 43px;
-    height: 51px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-teacher.png') no-repeat;
-  }
-  .data-view-member {
-    width: 54px;
-    height: 33px;
-    margin-top: 13px;
-    background: url('../../assets/image/resource/data-view-member.png') no-repeat;
-  }
-  .data-view-article {
-    width: 46px;
-    height: 50px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-article.png') no-repeat;
-  }
-  .data-view-active {
-    width: 44px;
-    height: 50px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-active.png') no-repeat;
-  }
-  .data-view-resource {
-    width: 46px;
-    height: 50px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-resource.png') no-repeat;
-  }
-  .data-view-move {
-    width: 52px;
-    height: 50px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-move.png') no-repeat;
-  }
   .data-name {
     font-size: 18px;
     color: #555;

TEAMModelOS.SmartTeach/Views/Shared/_Layout.cshtml

@@ -4,9 +4,8 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"]TEAM Model OS</title>
+    <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" />
         <environment names="Staging,Production">
             <link rel="stylesheet" href="~/dist/site.css" asp-append-version="true" />

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

@@ -1,4 +1,8 @@
-body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
+body{
+    /*background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;*/
+    /*background:#e3f2fa url("../image/bodybg2.png") no-repeat 0 40px;*/
+    background:#edfdff url("../image/bodybg3.png") no-repeat 0 40px;
+}
 /*header*/
 .header{height:40px;line-height:40px;background:#313131;color: #fff;
     /*position: fixed;top:0;left:0;width: 100%;z-index: 10;padding:0 25px;*/
@@ -26,18 +30,19 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .bodyContent{margin-top:40px;}
 /*master*/
 .master{height:140px;line-height: 140px;}
-.master>a{font-size: 28px; color: #3d95d5;}
+.master>a{font-size: 28px; /*color: #3d95d5;*/color: #fff;}
 .master li{margin-left:15px;}
 .master li a{color: #3d95d5;font-size: 14px;font-weight: bold;}
 .master li a:hover{text-decoration: underline;}
 /*left*/
-.left{width: 220px;padding-bottom: 20px;
+.left{width: 220px;padding-bottom: 0px;
     /*box-shadow: 2px 2px 4px rgba(0,0,0,0.1)*/
 }
 .left .master-info{padding:20px;border-bottom: 1px solid #ddd;}
-.left .master-info .name{margin-left: 20px;padding-top:18px;}
-.left .master-info .name>p{font-size: 16px;margin-bottom: 2px;}
-.left .master-info .name>span{background: #26c6da;border-radius: 20px;color: #fff;padding:0 12px;font-size: 12px;}
+.left .master-info img.head{width: 70px;border-radius: 50%;}
+.left .master-info .name{margin-left: 20px;padding-top:10px;}
+.left .master-info .name>p{font-size: 16px;margin-bottom: 5px;}
+.left .master-info .name>span{background: #26c6da;border-radius: 20px;color: #fff;padding:0 10px;font-size: 12px;}
 .left .master-info>p{color:#666;margin:15px 0;}
 
 .left .master-info .exper{margin-bottom: 10px;}
@@ -53,7 +58,7 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .left .master-info .other>li:last-child{border:0;background: none;}
 .left .master-info .other>li>p{font-size: 16px;}
 
-.left dl{padding:20px 0;margin-bottom: 12px;}
+.left dl{padding:20px 0;margin-bottom: 10px;}
 .left dl>dt{font-size: 16px;padding-left:20px;margin-bottom: 10px;
     /*background: url("../image/titleLine.png") no-repeat 20px center;*/
 }
@@ -112,10 +117,12 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .main .content>dl>dt>a{color: #999;font-size: 12px;}
 .main .content>dl>dt>a:hover{color: #26c6da;}
 .main .content>dl.notice{width: 62%;}
-.main .content>dl.word{width: 36%;height:290px;}
+.main .content>dl.word{width: 36%;height:336px;}
 .main .content>dl.notice>dd>a{display: block;padding:12px 0;
     border-bottom: 1px dashed #eee;
-    background: url("../image/notice.png") no-repeat 0 center;padding-left: 24px;}
+    background: url("../image/notice.png") no-repeat 0 center;padding-left: 24px;
+}
+.main .content>dl.notice.source>dd>a{padding-left:0px;background: none;}
 .main .content>dl.notice>dd>a>span{float: right;color: #999;font-size: 13px;}
 .main .content>dl.notice>dd>a:hover,.main .content>dl.notice>dd>a:hover span{color: #26c6da; }
 .main .content>dl.word dd{line-height: 26px;text-align: justify;}
@@ -290,6 +297,12 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .AnchorBox .ivu-anchor-link{float:left;padding:0;background: #eee;border-bottom:2px solid #ccc;color:#666;font-size:12px;margin:8px;width: 20px;height:20px;line-height:18px;text-align: center;cursor: pointer;}
 .AnchorBox .ivu-anchor-link-active>.ivu-anchor-link-title{background: #ccc;color: #fff;}
 .AnchorBox .ivu-anchor-ink:before{background:none;}
+.AnchorBox>.lookChart{margin-top:20px;}
+.AnchorBox>.lookChart>a{font-size: 14px;color: #14adc4;
+   background: url("../image/bar2.png") no-repeat 0 center;padding:10px 0 10px 24px;
+    background-size: 18px auto;
+}
+
 .checkList>li{width:100%;padding:15px;margin-bottom: 30px;
     border:1px solid #ddd;
     /*box-shadow: 0 1px 4px rgba(0,0,0,0.2);*/
@@ -317,3 +330,10 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .ivu-collapse,.ivu-collapse>.ivu-collapse-item{border:0;background: #fff;}
 .ivu-collapse>.ivu-collapse-item.ivu-collapse-item-active>.ivu-collapse-header>i,.ivu-collapse>.ivu-collapse-item>.ivu-collapse-header>i{display: none;}
 .ivu-collapse-content{padding-left:30px;}
+
+
+.detail{padding:20px;border:1px solid #ddd;height:500px;overflow-y: auto;font-size: 15px;line-height: 28px;}
+.detail>h2{font-size: 20px;margin-bottom: 20px;}
+.detail>div{margin:10px 0;}
+.detail>div li{margin: 10px 0;width: 100%;}
+.detail>div li>p{margin: 10px 0;width: 100%;}

TEAMModelOS.TeachZone/ClientApp/common/header.vue

@@ -25,10 +25,10 @@
             <input type="text" placeholder="请输入关键字..." class="raduis20 search-input">
           </li>
           <li>
-            <Select v-model="formItem.select2" @change="changeZone">
+            <Select v-model="formItem.select2" @on-change="changeZone">
               <!--<Option value="sel1" >班级</Option>-->
-              <Option value="sel1" >教师空间</Option>
-              <Option value="sel2">学生空间</Option>
+              <Option value="/" >教师空间</Option>
+              <Option value="/indexStudent">学生空间</Option>
             </Select>
             <!--<a href="">张三 </a>-->
           </li>
@@ -62,17 +62,15 @@
       return {
         formItem: {
           select1: 'sel1',
-          select2: 'sel1',
+          select2: '/',
           select3: 'sel1',
 
         },
       }
     },
     methods: {
-
       changeZone: function (url) {
-        alert(11);
-        this.$router.push({path: '/'+url})
+        this.$router.push({path: url})
       }
     }
 

TEAMModelOS.TeachZone/ClientApp/common/left.vue

@@ -2,10 +2,10 @@
   <div class="left bgf fl">
     <div class="master-info">
       <div class="ov">
-        <img src="../assets/image/head.png" alt="" class="fl">
+        <img src="../assets/image/head2.png" alt="" class="fl head">
         <div class="fl name">
-          <p><a href="">张三</a></p>
-          <span>教师</span>
+          <p><a href="">张明哲</a></p>
+          <span>数学老师</span>
         </div>
       </div>
       <p>成都市高新区芳草小学</p>
@@ -39,8 +39,8 @@
     <dl class="class-manage">
       <dt>我的班级</dt>
       <dd><a href="/notice"><i class="icon"></i>班级通知</a></dd>
-      <dd><a href="/scoreList"><i class="icon"></i>学生成绩</a></dd>
       <dd><a href="/source"><i class="icon"></i>班级资源</a></dd>
+      <dd><a href="/scoreList"><i class="icon"></i>学生成绩</a></dd>
       <dd><a href="/studentList"><i class="icon"></i>学生名单</a></dd>
     </dl>
   </div>

TEAMModelOS.TeachZone/ClientApp/common/recomLeft.vue

@@ -6,15 +6,15 @@
         <Timeline>
           <TimelineItem color="#2db7f5">
             <p class="time">教材：</p>
-            <p class="content">初中历史与社会人教课</p>
+            <p class="content">数学人教版六年级下册</p>
           </TimelineItem>
           <TimelineItem color="#2db7f5">
             <p class="time">章节：第一章</p>
-            <p class="content">人在社会中生活</p>
+            <p class="content">相交线与平行线</p>
           </TimelineItem>
           <TimelineItem color="#2db7f5">
             <p class="time" style="font-weight: bold;" >课文：第一课 </p>
-            <p class="content" style="font-weight: bold;">我的家在哪里</p>
+            <p class="content" style="font-weight: bold;">平行线的判定</p>
           </TimelineItem>
         </Timeline>
       </dd>
@@ -29,12 +29,12 @@
       <div class="modalSel">
         <h4>选择教材：</h4>
         <Select v-model="select">
-          <Option value="sel1" >初中历史与社会人教课标版</Option>
-          <Option value="sel2">思想政治人教标本七年级上册</Option>
-          <Option value="sel3">地理人教科标板七年级上册</Option>
-          <Option value="sel4">地理人教科标板七年级上册</Option>
-          <Option value="sel5">音地理人教科标板七年级上册</Option>
-          <Option value="sel6">地理人教科标板七年级上册</Option>
+          <Option value="sel1" >人教版六年级下册</Option>
+          <Option value="sel2">人教版六年级上册</Option>
+          <Option value="sel3">人教版五年级下册</Option>
+          <Option value="sel4">人教版六年级上册</Option>
+          <Option value="sel5">人教版四年级下册</Option>
+          <Option value="sel6">人教版六年级上册</Option>
         </Select>
       </div>
 
@@ -54,7 +54,7 @@
       <ul>
         <li class="word">
           <a href="/teachSourceDetail">
-            <p>当我们的手中只剩下一片树叶.docx</p>
+            <p>数学核心素养研究观点之一.docx</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -62,7 +62,7 @@
         </li>
         <li class="word">
           <a href="/teachSourceDetail">
-            <p>当我们的手中只剩下一片树叶.docx</p>
+            <p>综合学习实践案例.docx</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -70,7 +70,7 @@
         </li>
         <li class="video">
           <a href="/teachSourceVideo">
-            <p>当我们的手中只剩下一片树叶.mp4</p>
+            <p>《比例尺》教学设计.mp4</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -78,7 +78,7 @@
         </li>
         <li class="video">
           <a href="/teachSourceVideo">
-            <p>当我们的手中只剩下一片树叶.mp4</p>
+            <p>加法乘法运算对比问题.mp4</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -86,7 +86,7 @@
         </li>
         <li class="ppt">
           <a href="/teachSourceDetail">
-            <p>当我们的手中只剩下一片树叶.ppt</p>
+            <p>百分数解决问题实例.ppt</p>
             <p>
               <Rate allow-half v-model="valueText" disabled></Rate>
             </p>
@@ -110,99 +110,74 @@
               //   expand: true,
               // },
               {
-                title: '第一单元 人在社会中生活',
+                title: '第一单元 相交线与平行线',
                 expand: true,
                 children: [
                   {
-                    title: '第一课  我的家在哪里',
+                    title: '相交线',
                     expand: true
                   },
                   {
-                    title: '第二课 乡村与城市',
+                    title: '垂线',
                     expand: true
                   },
                   {
-                    title: '综合探究一 从地图上获取信息',
+                    title: '同位角、内错角、同旁...',
                     expand: true
-                  }
+                  },  {
+                    title: '平行线',
+                    expand: true
+                  },  {
+                    title: '平行线的判定',
+                    expand: true
+                  },  {
+                    title: '平行线的性质',
+                    expand: true
+                  },  {
+                    title: '命题、定理、证明',
+                    expand: true
+                  },  {
+                    title: '平移',
+                    expand: true
+                  },{
+                    title: '特殊考点',
+                    expand: true
+                  },
                 ]
               },
               {
-                title: '第二单元 人类共同生活的世界',
+                title: '第二单元 实数',
                 expand: false,
                 children: [
-                  {
-                    title: '第一课 大洲和大洋',
-                    expand: true
-                  },
-                  {
-                    title: '第二课 自然环境',
-                    expand: true
-                  },
-                  {
-                    title: '第三课 世界大家庭',
-                    expand: true
-                  },
-                  {
-                    title: '综合探究二 从地球仪上看世界',
-                    expand: true
-                  }
+                  {title: '算术平方根'},
+                  {title: '平方根'},
+                  {title: '立方根'},
+                  {title: '实数的概念'},
+                  {title: '实数的运算'},
+                  {title: '特殊考点'},
+
                 ]
               },
               {
-                title: '第三单元 各具特色的区域生活',
+                title: '第三单元 平面直角坐标系',
                 expand: false,
                 children: [
-                  {
-                    title: '第一课 家住平原',
-                    expand: true
-                  },
-                  {
-                    title: '第二课 与山为邻',
-                    expand: true
-                  }, {
-                    title: '第三课 傍水而居',
-                    expand: true
-                  }, {
-                    title: '第四课 草原人家',
-                    expand: true
-                  }, {
-                    title: '第五课 干旱的宝地',
-                    expand: true
-                  }, {
-                    title: '综合探究三 如何认识区域',
-                    expand: true
-                  },
+                  {title: '有序对数'},
+                  {title: '平面直角坐标系'},
+                  {title: '用坐标表示地理位置'},
+                  {title: '用坐标表示平移'},
                 ]
               },
               {
-                title: '第四单元 文明中心——城市',
+                title: '第四单元 二元一次方程组',
                 expand: false,
                 children: [
-                  {
-                    title: '第一课 美国政治的心脏：华盛顿',
-                    expand: true
-                  },
-                  {
-                    title: '第二课 文化艺术之都：巴黎',
-                    expand: true
-                  },
-                  {
-                    title: '第三课 IT新城：班加罗尔',
-                    expand: true
-                  },
-                  {
-                    title: '第四课 汽车城：蔚山',
-                    expand: true
-                  },
-                  {
-                    title: '第五课 城市规划的典范：巴西利亚',
-                    expand: true
-                  },
-                  {
-                    title: '综合探究 如何认识城市',
-                    expand: true
-                  }
+                  {title: '二元一次方程组'},
+                  {title: '代入消元法'},
+                  {title: '加减消元法'},
+                  {title: '实际问题与二元一次方...'},
+                  {title: '三元一次方程组的解法'},
+                  {title: '特殊考点'},
                 ]
               }
 

TEAMModelOS.TeachZone/ClientApp/components/index.vue

@@ -1,44 +0,0 @@
-<template>
-  <div class="main fr">
-    <h4>所在班级 > 六年级·1班</h4>
-    <div class="content ov">
-      <dl class="notice fl">
-        <dt>班级通知 <a href="" class="fr">更多+</a></dt>
-        <dd><a href="/noticeDetail">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-      </dl>
-      <dl class="word fl">
-        <dt>班级寄语</dt>
-        <dd>
-          班级是船，学生是帆。岁月轮回，抹不去我们在这里洒下的汗水，
-          挥不去我们在这里展开的笑颜。愿我们处处祥云罩野马，朝朝吉星
-          伴青松。班级空间，让我们一起来书写属于自己的精彩！
-        </dd>
-      </dl>
-    </div>
-    <div class="content ov">
-      <dl class="notice fl " style="width: 100%">
-        <dt>班级资源 <a href="" class="fr">更多+</a></dt>
-        <dd><a href="/scoreL istDetail">第二章（化学方程式计算）.doc<span>发布者：李四</span></a></dd>
-        <dd><a href="">电流、电压和电阻的关系（2课时）.doc<span>发布者：李四</span></a></dd>
-        <dd><a href="">某年6月中旬平均气温图.jpg<span>发布者：李四</span></a></dd>
-        <dd><a href="">独立行走技术-穿越空间<span>发布者：李四</span></a></dd>
-        <dd><a href="">计算机基础第五课时<span>发布者：李四</span></a></dd>
-        <dd><a href="">《望洞庭》和《忆江南》<span>发布者：李四</span></a></dd>
-      </dl>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "index"
-  }
-</script>
-
-<style scoped>
-
-</style>

TEAMModelOS.TeachZone/ClientApp/components/notice.vue

@@ -26,15 +26,16 @@
               </Form>
           </Modal>
         </div>
-        <dd><a href="/noticeDetail">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
-        <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+        <dd><a href="/noticeDetail">5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+        <dd><a href="">师退生进 让学生站在教室中央<span>2019-05-09</span></a></dd>
+        <dd><a href="">2019.4.9 核心素养深入研究，开拓视野精彩纷呈。<span>2019-05-09</span></a></dd>
+        <dd><a href="">18.11.27区数学高段“问题解决”专题 暨“老带青”教研活动通讯。<span>2019-05-09</span></a></dd>
+        <dd><a href="">2019年2月28日四年级教研活动通讯<span>2019-05-09</span></a></dd>
+        <dd><a href="">5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+        <dd><a href="">师退生进 让学生站在教室中央<span>2019-05-09</span></a></dd>
+        <dd><a href="">2019.4.9 核心素养深入研究，开拓视野精彩纷呈。<span>2019-05-09</span></a></dd>
+        <dd><a href="">18.11.27区数学高段“问题解决”专题 暨“老带青”教研活动通讯。<span>2019-05-09</span></a></dd>
+        <dd><a href="">2019年2月28日四年级教研活动通讯<span>2019-05-09</span></a></dd>
       </dl>
       <Page :total="100"  size="small" show-total class="fr" />
     </div>

TEAMModelOS.TeachZone/ClientApp/components/scoreList.vue

@@ -2,7 +2,7 @@
   <div class="main fr">
     <h4><a href="/">首页</a> > 学生成绩</h4>
     <div class="content ov bgf">
-      <dl class="notice fl " style="width: 100%">
+      <dl class="notice source fl " style="width: 100%">
         <dt>学生成绩</dt>
         <div class="oper">
           <Button type="info" @click="modal1 = true">发布成绩</Button>
@@ -27,13 +27,16 @@
 
           </Modal>
         </div>
-        <dd><a href="/scoreListDetail">六年一班上学期第一次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第二次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第三次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第四次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第四次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第四次模拟考试成绩公布<span>2019-05-09</span></a></dd>
-        <dd><a href="">六年一班上学期第四次模拟考试成绩公布<span>2019-05-09</span></a></dd>
+        <dd><a href="/reportAd"> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第十次模拟考试成绩公布<img src="../assets/image/new.gif" alt=""><span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第九次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第八次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第七次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第六次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第五次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第四次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第三次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第二次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
+        <dd><a href=""> <Icon type="ios-paper-outline" style="font-size: 18px;"/>六年一班上学期第一次模拟考试成绩公布<span>查看报表 <Icon type="md-arrow-round-forward" /> </span></a></dd>
       </dl>
       <Page :total="100"  size="small" show-total class="fr" />
     </div>

TEAMModelOS.TeachZone/ClientApp/components/studentList.vue

@@ -4,120 +4,16 @@
     <div class="content ov">
       <dl class="studentList fl " style="width: 100%">
         <dt>学生名单 <!--<a href="" class="fr">更多+</a>--></dt>
-        <dd>
+        <dd v-for="item in students">
           <a href="">
             <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <i>班长</i>
-            <p>201901002</p>
+            <h4>{{item.name}}</h4>
+            <i v-if="item.post">{{item.post}}</i>
+            <p>{{item.num}}</p>
             <!--<p>立即联系</p>-->
           </a>
         </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <i>副班长</i>
-            <p>201901002</p>
-            <!--<p>立即联系</p>-->
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <i>学习委员</i>
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <i>小组长</i>
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>  <dd>
-        <a href="">
-          <img src="../assets/image/head.png" alt="">
-          <h4>李四</h4>
-          <!--<i>学生</i>-->
-          <p>201901002</p>
-        </a>
-      </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
 
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
-        <dd>
-          <a href="">
-            <img src="../assets/image/head.png" alt="">
-            <h4>李四</h4>
-            <!--<i>学生</i>-->
-            <p>201901002</p>
-          </a>
-        </dd>
 
 
       </dl>
@@ -127,7 +23,55 @@
 
 <script>
   export default {
-    name: "index"
+    name: "index",
+    data() {
+      return {
+        students:[
+          {
+            name:'周宇鑫',
+            num:'201901001',
+            post:'班长',
+          },
+          {
+            name:'李明悦',
+            num:'201901002',
+            post:'',
+          },
+          {
+            name:'刘佳乐',
+            num:'201901003',
+            post:'',
+          },
+          {
+            name:'王启航',
+            num:'201901004',
+            post:'',
+          },
+          {
+            name:'王心怡',
+            num:'201901005',
+            post:'',
+          },
+          {
+            name:'王程弈',
+            num:'201901006',
+            post:'',
+          }, {
+            name:'郭文俊',
+            num:'201901006',
+            post:'',
+          }, {
+            name:'刘玉婷',
+            num:'201901006',
+            post:'',
+          }, {
+            name:'司文涛',
+            num:'201901006',
+            post:'',
+          },
+        ]
+      }
+    },
   }
 </script>
 

TEAMModelOS.TeachZone/ClientApp/router/routes.js

@@ -16,11 +16,13 @@ import TeachSourcePpt from '@/view/teachSourceDetail'
 import TeachPreclass from '@/view/teachPreclass'
 import TeachPrelesson from '@/view/teachPrelesson'
 import TeachCheck from '@/view/teachCheck'
+import TeachCheckTeacher from '@/view/teachCheckTeacher'
 import TeachCheckList from '@/view/teachCheckList'
 import TeachTask from '@/view/teachTask'
 import TeachTaskDetail from '@/view/teachTaskDetail'
 import Report from '@/view/report'
 import Reportad from '@/view/reportadvanced'
+import Detail from '@/view/detail'
 import { resolve } from 'url';
 
 export const routes = [
@@ -99,6 +101,11 @@ export const routes = [
     path: '/teachCheck',
     component: TeachCheck
   },
+  {
+    name: 'teachCheckTeacher',
+    path: '/teachCheckTeacher',
+    component: TeachCheckTeacher
+  },
   {
     name: 'teachCheckList',
     path: '/teachCheckList',
@@ -124,4 +131,9 @@ export const routes = [
     path: '/Reportad',
     component: Reportad
   },
+  {
+    name: 'detail',
+    path: '/Detail',
+    component: Detail
+  },
 ]

TEAMModelOS.TeachZone/ClientApp/view/detail.vue

@@ -0,0 +1,80 @@
+<template>
+    <div id="app">
+
+    </div>
+</template>
+<script>
+    import Header from '@/common/header.vue'
+    import Master from '@/common/master.vue'
+    import Left from '@/common/left.vue'
+    import Footer from '@/common/footer.vue'
+    export default {
+        components: {
+            Header,
+            Master,
+            Left,
+            Footer
+        },
+        data () {
+            return {
+                modal1: false,
+                formItem: {
+                    input: '',
+                    textarea: ''
+                },
+                list:[
+                    {
+                        title:'2019.4.9 核心素养深入研究，开拓视野精彩纷呈。',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'2019年4月28日四年级教研活动通讯',
+                        date:'2019-05-09'
+                    },
+
+                    {
+                        title:'师退生进 让学生站在教室中央',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'区数学高段“问题解决”专题 暨“老带青”教研活动通讯。',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'2019年3月15日“图形的认识”专题教研活动通讯',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'18.4.17“数学教师青年团”课堂教学能力提升培训活动简讯',
+                        date:'2019-05-09'
+                    },
+                    {
+                        title:'2018.9.11深入教材研究，共筑智慧课堂',
+                        date:'2019-05-09'
+                    },
+                ]
+
+            }
+        },
+        methods: {
+            ok () {
+                this.$Message.info('发布成功');
+            },
+            // cancel () {
+            //   this.$Message.info('');
+            // }
+            yes () {
+                this.modal1 = false;
+                this.$Message.success('发布成功');
+            },
+            cancel () {
+                this.modal1 = false;
+            }
+        }
+    }
+</script>
+

TEAMModelOS.TeachZone/ClientApp/view/index.vue

@@ -4,7 +4,31 @@
     <Master></Master>
     <div class="wrap ov bodyContent">
       <Left></Left>
-      <Index></Index>
+      <div class="main fr">
+        <h4>所在班级 > 六年级·1班</h4>
+        <div class="content ov">
+          <dl class="notice fl">
+            <dt>班级通知 <a href="notice" class="fr">更多+</a></dt>
+            <dd v-for="(item,index) in notice"><a href="/noticeDetail">{{item.title}}  <b v-if="index<2"><img src="../assets/image/new.gif" alt=""></b><span>{{item.date}}</span></a></dd>
+          </dl>
+          <dl class="word fl">
+            <dt>班级寄语</dt>
+            <dd>
+              班级是船，学生是帆。岁月轮回，抹不去我们在这里洒下的汗水，
+              挥不去我们在这里展开的笑颜。愿我们处处祥云罩野马，朝朝吉星
+              伴青松。班级空间，让我们一起来书写属于自己的精彩！
+            </dd>
+          </dl>
+        </div>
+        <div class="content ov">
+          <dl class="notice source fl " style="width: 100%">
+            <dt>班级资源 <a href="source" class="fr">更多+</a></dt>
+            <dd v-for="(item,index) in cls"><a href="/teachSourceDetail" :title="item.title"> <Icon type="ios-paper-outline" style="font-size: 18px;"/> {{item.title}}
+              <b v-if="index<2"><img src="../assets/image/new.gif" alt=""></b>
+              <span>发布者：{{item.author}}</span></a></dd>
+          </dl>
+        </div>
+      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -14,18 +38,87 @@
   import Master from '@/common/master.vue'
   import Left from '@/common/left.vue'
   import Footer from '@/common/footer.vue'
-  import Index from '@/components/index.vue'
   export default {
     components: {
       Header,
       Master,
       Left,
-      Footer,
-      Index
+      Footer
     },
     data() {
       return {
+        notice:[
+          {
+            title:'2019年五月11日 核心素养深入研究，开拓视野精彩纷呈。',
+            date:'2019-05-09'
+          },
+          {
+            title:'5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。',
+            date:'2019-05-09'
+          },
+          {
+            title:'2019年4月28日 四年级教研活动通讯。',
+            date:'2019-05-09'
+          },
 
+          {
+            title:'师退生进 让学生站在教室中央。',
+            date:'2019-05-09'
+          },
+          {
+            title:'区数学高段“问题解决”专题 暨“老带青”教研活动通讯。',
+            date:'2019-05-09'
+          },
+          {
+            title:'2019年3月15日“图形的认识”专题教研活动通讯。',
+            date:'2019-05-09'
+          },
+          // {
+          //   title:'18.4.17“数学教师青年团”课堂教学能力提升培训活动简讯',
+          //   date:'2019-05-09'
+          // },
+          // {
+          //   title:'2018.9.11深入教材研究，共筑智慧课堂',
+          //   date:'2019-05-09'
+          // },
+        ],
+        cls:[
+          {
+            id:'1',
+            title:'五年级上册《平行四边形的面积》.mp4',
+            author:'郭一凡'
+          },
+          {
+            id:'2',
+            title:'《百分数解决问题例2》教学设计.docx',
+            author:'王晓华'
+          },
+          {
+            id:'3',
+            title:'第五课   图形的认识与测量（第2课时）（课件）.pptx',
+            author:'车明阳'
+          },
+          {
+            id:'4',
+            title:'负数的初步认识(六下第一课时）.ppt',
+            author:'李思思'
+          },
+          {
+            id:'5',
+            title:'王宏伟：用比例解决问题.ppt',
+            author:'王宏伟'
+          },
+          {
+            id:'6',
+            title:'圆柱与圆锥的认识 课件',
+            author:'高哲'
+          },
+          {
+            id:'7',
+            title:'第五课  图形的认识与测量（第1课时课件）.pptx',
+            author:'马雪瑞'
+          },
+        ]
       }
     },
       mounted() {

TEAMModelOS.TeachZone/ClientApp/view/indexStudent.vue

@@ -4,7 +4,35 @@
     <Master></Master>
     <div class="wrap ov bodyContent">
       <LeftStudent></LeftStudent>
-      <Index></Index>
+      <div class="main fr">
+        <h4>所在班级 > 六年级·1班</h4>
+        <div class="content ov">
+          <dl class="notice fl">
+            <dt>班级通知 <a href="notice" class="fr">更多+</a></dt>
+            <dd><a href="/noticeDetail">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。  <img src="../assets/image/new.gif" alt=""><span>2019-05-09</span></a></dd>
+            <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。  <img src="../assets/image/new.gif" alt=""><span>2019-05-09</span></a></dd>
+            <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+            <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+            <dd><a href="">8月20日上午8点举行奥运知识抢答赛，请班级成员准时参加。<span>2019-05-09</span></a></dd>
+          </dl>
+          <dl class="word fl">
+            <dt>班级寄语</dt>
+            <dd>
+              班级是船，学生是帆。岁月轮回，抹不去我们在这里洒下的汗水，
+              挥不去我们在这里展开的笑颜。愿我们处处祥云罩野马，朝朝吉星
+              伴青松。班级空间，让我们一起来书写属于自己的精彩！
+            </dd>
+          </dl>
+        </div>
+        <div class="content ov">
+          <dl class="notice source fl " style="width: 100%">
+            <dt>班级资源 <a href="source" class="fr">更多+</a></dt>
+            <dd v-for="(item,index) in cls"><a href="/scoreL istDetail" :title="item.title"> <Icon type="ios-paper-outline" style="font-size: 18px;"/> {{item.title}}
+              <b v-if="index<2"><img src="../assets/image/new.gif" alt=""></b>
+              <span>发布者：{{item.author}}</span></a></dd>
+          </dl>
+        </div>
+      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -14,23 +42,58 @@
   import Master from '@/common/master.vue'
   import LeftStudent from '@/common/leftStudent.vue'
   import Footer from '@/common/footer.vue'
-  import Index from '@/components/index.vue'
+
   export default {
     components: {
       Header,
       Master,
-      LeftStudent,
       Footer,
-      Index
+      LeftStudent,
     },
     data() {
       return {
-
+        cls:[
+          {
+            id:'1',
+            title:'五年级上册《平行四边形的面积》（袁晓萍）.MP4',
+            author:'郭一凡'
+          },
+          {
+            id:'2',
+            title:'《百分数解决问题例2》教学设计（石翠兰）.docx',
+            author:'王晓华'
+          },
+          {
+            id:'3',
+            title:'第五课   图形的认识与测量（第2课时）（课件）.pptx',
+            author:'车明阳'
+          },
+          {
+            id:'4',
+            title:'负数的初步认识(六下第一课时）.ppt',
+            author:'李思思'
+          },
+          {
+            id:'5',
+            title:'王宏伟：用比例解决问题.ppt',
+            author:'王宏伟'
+          },
+          {
+            id:'6',
+            title:'圆柱与圆锥的认识 课件',
+            author:'高哲'
+          },
+          {
+            id:'7',
+            title:'第五课  图形的认识与测量（第1课时）（课件）.pptx',
+            author:'马雪瑞'
+          },
+        ]
       }
     },
-      mounted() {
+    mounted() {
 
-      }
     }
+  }
 </script>
 

TEAMModelOS.TeachZone/ClientApp/view/notice.vue

@@ -4,7 +4,38 @@
     <Master></Master>
     <div class="wrap ov">
       <Left></Left>
-      <notice></notice>
+      <div class="main fr">
+        <h4><a href="/">首页</a> > 班级通知</h4>
+        <div class="content ov bgf ">
+          <dl class="notice" style="width: 100%;">
+            <dt>班级通知 <!--<a href="" class="fr">更多+</a>--></dt>
+            <div class="oper">
+              <Button type="info" @click="modal1 = true">发布通知</Button>
+              <Modal
+                v-model="modal1" class-name="vertical-center-modal" footer-hide="true"
+                title="发布通知"
+                @on-ok="ok"
+                @on-cancel="cancel">
+                <Form :model="formItem" :label-width="80">
+                  <FormItem label="通知标题">
+                    <Input v-model="formItem.input" placeholder="请输入通知标题"></Input>
+                  </FormItem>
+
+                  <FormItem label="通知内容">
+                    <Input v-model="formItem.textarea" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入通知内容"></Input>
+                  </FormItem>
+                  <FormItem>
+                    <Button type="primary" @click="yes">发布</Button>
+                    <Button style="margin-left: 8px" @click="cancel">取消</Button>
+                  </FormItem>
+                </Form>
+              </Modal>
+            </div>
+            <dd v-for="item in list"><a href="/noticeDetail">{{item.title}}<span>{{item.date}}</span></a></dd>
+          </dl>
+          <Page :total="100"  size="small" show-total class="fr" />
+        </div>
+      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -14,23 +45,73 @@
   import Master from '@/common/master.vue'
   import Left from '@/common/left.vue'
   import Footer from '@/common/footer.vue'
-  import Notice from '@/components/notice.vue'
   export default {
     components: {
       Header,
       Master,
       Left,
-      Footer,
-      Notice
+      Footer
     },
-    data() {
+    data () {
       return {
+        modal1: false,
+        formItem: {
+          input: '',
+          textarea: ''
+        },
+        list:[
+          {
+            title:'2019.4.9 核心素养深入研究，开拓视野精彩纷呈。',
+            date:'2019-05-09'
+          },
+          {
+            title:'5月10日上午8点举行奥运知识抢答赛，请班级成员准时参加。',
+            date:'2019-05-09'
+          },
+          {
+            title:'2019年4月28日四年级教研活动通讯',
+            date:'2019-05-09'
+          },
+
+          {
+            title:'师退生进 让学生站在教室中央',
+            date:'2019-05-09'
+          },
+          {
+            title:'区数学高段“问题解决”专题 暨“老带青”教研活动通讯。',
+            date:'2019-05-09'
+          },
+          {
+            title:'2019年3月15日“图形的认识”专题教研活动通讯',
+            date:'2019-05-09'
+          },
+          {
+            title:'18.4.17“数学教师青年团”课堂教学能力提升培训活动简讯',
+            date:'2019-05-09'
+          },
+          {
+            title:'2018.9.11深入教材研究，共筑智慧课堂',
+            date:'2019-05-09'
+          },
+        ]
 
       }
     },
-      mounted() {
-
+    methods: {
+      ok () {
+        this.$Message.info('发布成功');
+      },
+      // cancel () {
+      //   this.$Message.info('');
+      // }
+      yes () {
+        this.modal1 = false;
+        this.$Message.success('发布成功');
+      },
+      cancel () {
+        this.modal1 = false;
       }
     }
+    }
 </script>
 

TEAMModelOS.TeachZone/ClientApp/view/report.vue

@@ -109,7 +109,7 @@
             label: '物理'
           },
         ],
-        model2: '语文',
+        model2: '数学',
         columns1: [
           {
             title: '知识点名称',

TEAMModelOS.TeachZone/ClientApp/view/reportadvanced.vue

@@ -109,7 +109,7 @@
             label: '物理'
           },
         ],
-        model2: '语文',
+        model2: '数学',
         columns1: [
           {
             title: '知识点名称',

TEAMModelOS.TeachZone/ClientApp/view/teachCheckList.vue

@@ -30,7 +30,8 @@
                   <li>日期：{{item.date}}</li>
                 </ol>
               </div>
-              <a href="/teachCheck" class="startCheck">开始检测</a>
+              <!--<a href="/teachCheck" class="startCheck">开始检测</a>-->
+              <a href="/teachCheckTeacher" class="startCheck">答题详情</a>
             </li>
           </ul>
           <Page :total="100"  size="small" show-total class="fr" />

TEAMModelOS.TeachZone/ClientApp/view/teachSource.vue

@@ -81,10 +81,10 @@
           {
             type:'word',
             src:'teachSourceDetail',
-            title:'带着地图去旅行.doc',
+            title:'《百分数解决问题例2》教学设计.docx',
             star:5,
             size:'1.32MB',
-            source:'陆杰',
+            source:'李雅斯',
             date:'2019-04-08',
             preview:'6',
             collect:'5',
@@ -93,10 +93,10 @@
           {
             type:'word',
             src:'teachSourceDetail',
-            title:'感受生命的意义.doc',
+            title:'《折线统计图》教学设计.docx',
             star:4.5,
             size:'1.64MB',
-            source:'朱艳娜',
+            source:'郑惠莉',
             date:'2019-04-07',
             preview:'10',
             collect:'5',
@@ -105,11 +105,11 @@
           {
             type:'ppt',
             src:'teachSourcePpt',
-            title:'综合探究三——如何认识区域（以南非为例.ppt',
+            title:'几何直观与小学数学教学.ppt',
             star:5,
             size:'1.32MB',
-            source:'马平儿',
-            date:'2019-04-08',
+            source:'史宁中',
+            date:'2019-03-19',
             preview:'20',
             collect:'5',
             download:'4'
@@ -121,7 +121,7 @@
             star:4.5,
             size:'1.64MB',
             source:'朱艳娜',
-            date:'2019-04-07',
+            date:'2019-03-02',
             preview:'10',
             collect:'5',
             download:'3'
@@ -133,7 +133,7 @@
             star:4.5,
             size:'1.64MB',
             source:'朱艳娜',
-            date:'2019-04-07',
+            date:'2019-02-16',
             preview:'10',
             collect:'5',
             download:'3'
@@ -141,16 +141,27 @@
           {
             type:'word',
             src:'teachSourceDetail',
-            title:'带着地图去旅行(课件).doc',
+            title:'《平行四边形的面积》.doc',
             star:4.5,
             size:'1.32MB',
-            source:'陆杰',
-            date:'2019-04-08',
+            source:'袁晓萍',
+            date:'2019-02-15',
             preview:'16',
             collect:'5',
             download:'4'
           },
-
+          {
+            type:'word',
+            src:'teachSourceDetail',
+            title:'《百分数解决问题例2》教学设计.docx',
+            star:5,
+            size:'1.32MB',
+            source:'李雅斯',
+            date:'2019-02-08',
+            preview:'6',
+            collect:'5',
+            download:'4'
+          },
         ]
       }
     },

TEAMModelOS.TeachZone/ClientApp/view/teachSourceDetail.vue

@@ -9,20 +9,94 @@
         <div class="content ov bgf pad20">
          <div class="sourceDetail">
            <div class="titleBox">
-             <h3 class="word"> 2017年全国各地中考作文题汇总.doc</h3>
+             <h3 class="word"> 《百分数解决问题例1》教学设计.docx</h3>
              <ul class="info">
                <li>时间：2019-05-13</li>
                <li>大小：1.36MB</li>
                <li>引用：4次</li>
                <li>下载：20次</li>
-               <li>来源：陆杰（平湖市福臻中学）</li>
+               <li>来源：李雅斯</li>
                <li>得分：<Rate allow-half disabled v-model="valueText">
                </Rate></li>
              </ul>
            </div>
            <div>
-             <iframe
-               src="http://res.huijiaoyun.com:22021//data9/transform/2019/1/14/21/56/8b188019f7f1406694fbd52154840654/28870b8a84e5b7fe607419a194d09699.doc/html4/transform.html"></iframe>
+             <!--<iframe src="/Detail"></iframe>-->
+             <div class="detail">
+                <h2 class="tc">《百分数解决问题 例1》</h2>
+               <div> <b>教学内容：</b>人教版小学数学教材六年级上册第84页例1及相关练习。</div>
+               <div> <b>教学目标：</b>
+                <ol>
+                  <li>1．引导学生开展自主探索，掌握求百分率的方法。会解决求一个数是另一个数的百分之几的实际问题，能理解百分数解决问题和分数解决问题的异同点。</li>
+                  <li>2．在求命中率的基础上，理解更多生活中的百分率的实际含义，感受百分率在生活中应用的广泛性。</li>
+                  <li>3．进一步明确百分率与分数的联系和区别，培养学生比较分析、归纳概括的思维能力。</li>
+                </ol>
+               </div>
+               <div> <b>教学重点：</b>掌握求百分率的方法。</div>
+               <div> <b>教学难点：</b>学会用百分数解决实际问题。</div>
+               <div> <b>教学准备：</b>课件、平板</div>
+               <div> <b>教学过程：</b>
+               <ol>
+                 <li>1、复习旧知，学情铺垫
+                    <ul>
+                      <li>（1）口算填空
+                        <p><b>问：</b>小数化分数你是如何做的？那分数化小数你们是如何做的呢？</p>
+                      </li>
+                    </ul>
+                 </li>
+                 <li>2、创设情境，探究新知
+                   <ul>
+                     <li>（1）播放视频，引出例题
+                       <p><b>问：</b>同学们有喜欢打篮球的吗？让我们一起来看一个片段。（播放视频）<br>
+
+                         这是王涛和李强的投篮成绩，从题目中你知道了哪些信息？你是怎样想的？</p>
+                       <img src="../assets/image/detail1.png" alt="">
+                     </li>
+                     <li>
+                       （2）同桌互说，根据课堂实际生成情况，顺势引导。
+                     </li>
+                   </ul>
+                 </li>
+                 <li>3、回顾与反思
+                   <ul>
+                     <li>（1）回顾与反思
+                       <p><b>问：</b>那从今天的结果来看，我们能判断出谁的投篮更厉害一些吗？</p>
+                       <p><b>问：</b>用百分率来解决问题，实际上就是再求什么？用什么方法呢？</p>
+                     </li>
+                   </ul>
+                 </li>
+                 <li>4、算“失球率”
+                   <p><b>问：</b>其实这个问题，我们还可以从刚才同学们所说的，没有投中的占投篮次数的百分之几来考虑。</p>
+                   <ul>
+                     <li>（1）计算各自的失球率。</li>
+                     <li>（2）观察发现，命中率和失球率之间的关系。</li>
+                   </ul>
+                 </li>
+                 <li>2、联系实际，理解意义
+                   <p><b>问：</b>其实，生活中像这样百分率的例子还有很多。我们一起来看一看。你认为什么是出勤率呢？如何求？</p>
+                 </li>
+
+                 <li>4、联系实际，巩固应用
+                   <ul>
+                     <li>（1）生物小组进行玉米种子发芽试验，每次试验结果如下：
+
+                       <p><img src="../assets/image/detail2.png" alt=""></p>
+                       <p><b>问：</b>不动笔计算，哪组实验更成功？为什么？请同学们验证看。</p>
+                     </li>
+                     <li>
+                       （2）判断
+                       <p>及格率指的是及格人数占总人数的百分之几?</p>
+                       <p>前进小学种植了110棵松树，全部成活，成活率是110%?</p>
+                     </li>
+                   </ul>
+                   <p><b>教师小结：</b>看来要把计算结果转化成百分数，我们可以直接把分母转化成100的分数，改写成百分数；不能直接转化成分母是100的分数，我们可以把它转化成小数，将小数点向右移动两位，加上百分号。遇到除不尽的时候，保留三位小数。</p>
+                 </li>
+
+               </ol>
+               </div>
+               <div> <b></b></div>
+             </div>
+
            </div>
            <div class="comment">
              <h4>总体印象</h4>

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" />