Browse Source

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

liqk 6 years ago
parent
commit
c0fa7d92f0
27 changed files with 1123 additions and 152 deletions
  1. 1 1
      TEAMModelOS.SmartClass/ClientApp/components/smart-class/headers.vue
  2. 73 65
      TEAMModelOS.SmartClass/ClientApp/view/smart-class/LiveBroadcast.vue
  3. 6 2
      TEAMModelOS.SmartClass/ClientApp/view/smart-class/index.vue
  4. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/arrow.png
  5. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/banner.png
  6. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/banner02.png
  7. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/banner_jc.png
  8. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/bottom.png
  9. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/center01.png
  10. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/logo_img.png
  11. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/who01.png
  12. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/who02.png
  13. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/who03.png
  14. BIN
      TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/who04.png
  15. 2 2
      TEAMModelOS.SmartTeach/ClientApp/common/footer.vue
  16. 9 4
      TEAMModelOS.SmartTeach/ClientApp/common/headers.vue
  17. 101 59
      TEAMModelOS.SmartTeach/ClientApp/components/resource/home.vue
  18. 1 1
      TEAMModelOS.SmartTeach/ClientApp/components/resource/list.vue
  19. 1 1
      TEAMModelOS.SmartTeach/ClientApp/view/resource/resourceindex/videodetails.vue
  20. 1 0
      TEAMModelOS.TeachZone/ClientApp/assets/css/style.css
  21. 4 4
      TEAMModelOS.TeachZone/ClientApp/common/footer.vue
  22. 6 1
      TEAMModelOS.TeachZone/ClientApp/common/header.vue
  23. 57 0
      TEAMModelOS.TeachZone/ClientApp/common/leftStudent.vue
  24. 12 0
      TEAMModelOS.TeachZone/ClientApp/router/routes.js
  25. 36 0
      TEAMModelOS.TeachZone/ClientApp/view/indexStudent.vue
  26. 12 12
      TEAMModelOS.TeachZone/ClientApp/view/report.vue
  27. 801 0
      TEAMModelOS.TeachZone/ClientApp/view/reportadvanced.vue

+ 1 - 1
TEAMModelOS.SmartClass/ClientApp/components/smart-class/headers.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="headerContainer">
     <div class="header center-row">
-      <img src="../../assets/image/e_logo.png" style="width:150px" />
+      <img src="../../assets/image/e_logo3.png" style="width:150px" />
       <ul>
         <li :class="this.$route.path ==  '/main/index' || activeIndex == 0 ? 'li-active':''" @click="handleMenuClick(0,'index')">首页</li>
         <li :class="this.$route.path ==  '/main/notice' || activeIndex == 1? 'li-active':''" @click="handleMenuClick(1,'notice')">通知公告</li>

+ 73 - 65
TEAMModelOS.SmartClass/ClientApp/view/smart-class/LiveBroadcast.vue

@@ -3,9 +3,13 @@
     <div class="review-main">
       <div class="condition-wrap">
         <!--<div class="condition-wrap-left">
-          <Button type="primary">新媒体新技术</Button>
-          <Button type="success">创新实验室</Button>
-        </div>-->
+    <Button type="primary">新媒体新技术</Button>
+    <Button type="success">创新实验室</Button>
+  </div>-->
+
+        <Select v-model="selectSchool" style="width:200px" @on-change="chooseSchool">
+          <Option v-for="(item,index) in schoolList" :value="item" :key="index">{{ item }}</Option>
+        </Select>
         <div class="condition-wrap-right" style="display:none;">
           <Select v-model="yearDefault" size="large" style="width:100px">
             <Option v-for="item in years" :value="item" :key="item">{{ item }}</Option>
@@ -21,8 +25,7 @@
       <Tooltip :content="eventContent" placement="right" transfer max-width="300px">
         <full-calendar :config="config"
                        :events="fcEvents"
-                       ref="calendar"
-                       @dayClick="getDay">
+                       ref="calendar">
         </full-calendar>
       </Tooltip>
       <br><br>
@@ -92,82 +95,82 @@
             console.log(day);
             console.log(jsEvent);
           },
-          eventClick: (day, jsEvent) => {
+          eventClick: () => {
             this.$router.push({ path: 'lessonDetails' });
           },
           eventMouseover: function (event, jsEvent, view) {
             self.eventContent = event.title;
           },
         },
-        lessonList: []
+        lessonList: [],
+        schoolList: [],
+        allList:[],
+        selectSchool:""
       }
     },
 
-    methods: {
-      getDay(event, jsEvent, view) {
-      },
-    },
-    mounted() {
-      this._this = this;
+    created() {
+      this.allList = require("@/static/lessonList.json");
       this.lessonList = require("@/static/lessonList.json");
-      for (let i = 0; i < this.lessonList.length; i++) {
 
-        var sdate = new Date(this.lessonList[i].startTime.time);
-        let sY = sdate.getFullYear() + '-';
-        let sM = (sdate.getMonth() + 1 < 10 ? '0' + (sdate.getMonth() + 1) : sdate.getMonth() + 1) + '-';
-        let sD = sdate.getDate() + ' ';
-        var edate = new Date(this.lessonList[i].endTime.time);
-        let eY = edate.getFullYear() + '-';
-        let eM = (edate.getMonth() + 1 < 10 ? '0' + (edate.getMonth() + 1) : edate.getMonth() + 1) + '-';
-        let eD = edate.getDate() + ' ';
-
-        let dateArr = this.fcEvents.map(item => item.start);
+    },
 
-        //如果已存在
-        if (dateArr.indexOf(sY + sM + sD) == -1) {
-          this.fcEvents.push({
-            title: '名称:' + this.lessonList[i].name
-              + ' \n 学校:' + this.lessonList[i].schoolName
-              + ' \n 主讲人:' + this.lessonList[i].employeeName
-              + ' \n 学科:' + this.lessonList[i].parentCategoryName
-              + ' \n 课题:' + this.lessonList[i].parentProjectName
-              + ' \n 时间:' + this.lessonList[i].timeRangeTipHHmm
-              + ' \n ',
-            start: sY + sM + sD,
-            end: eY + eM + eD
-          });
+    methods: {
+      chooseSchool(val) {
+        if (val == "全部课程") {
+          this.initCalendar(this.allList);
         } else {
-          let index = dateArr.indexOf(sY + sM + sD);
-          let newEvent = {
-            title: this.lessonList[i].name + ' \n\n 等多个活动',
-            start: sY + sM + sD,
-            end: eY + eM + eD,
-            renderHeader: (h, params) => {
-              return h('div', [
-                h('span', params.column.title),
-                h('Tooltip', {
-                  props: {
-                    content: '您希望展示的提示语',
-                    transfer: true,
-                    maxWidth: '220',
-                    theme: 'light'
-                  }
-                }, [
-                    h('Icon', {
-                      props: {
-                        type: 'md-help-circle',
-                        color: "#c8c8c8",
-                        size: "20"
-                      },
-                      class: { iconClass: true }
-                    })
-                  ]),
-              ])
+          this.$nextTick(() => {
+            this.initCalendar(this.allList.filter(item => item.schoolName == val));
+          })
+        }
+
+      },
+      initCalendar(arr) {
+        this.fcEvents = [];
+        this._this = this;
+        for (let i = 0; i < arr.length; i++) {
+          var sdate = new Date(arr[i].startTime.time);
+          let sY = sdate.getFullYear() + '-';
+          let sM = (sdate.getMonth() + 1 < 10 ? '0' + (sdate.getMonth() + 1) : sdate.getMonth() + 1) + '-';
+          let sD = sdate.getDate() + ' ';
+          var edate = new Date(arr[i].endTime.time);
+          let eY = edate.getFullYear() + '-';
+          let eM = (edate.getMonth() + 1 < 10 ? '0' + (edate.getMonth() + 1) : edate.getMonth() + 1) + '-';
+          let eD = edate.getDate() + ' ';
+          let dateArr = this.fcEvents.map(item => item.start);
+
+          //如果已存在
+          if (dateArr.indexOf(sY + sM + sD) == -1) {
+            this.fcEvents.push({
+              title: '名称:' + arr[i].name
+                + ' \n 学校:' + arr[i].schoolName
+                + ' \n 主讲人:' + arr[i].employeeName
+                + ' \n 学科:' + arr[i].parentCategoryName
+                + ' \n 课题:' + arr[i].parentProjectName
+                + ' \n 时间:' + arr[i].timeRangeTipHHmm
+                + ' \n ',
+              start: sY + sM + sD,
+              end: eY + eM + eD
+            });
+          } else {
+            let index = dateArr.indexOf(sY + sM + sD);
+            let newEvent = {
+              title: arr[i].name + ' \n\n 等多个活动',
+              start: sY + sM + sD,
+              end: eY + eM + eD,
             }
+            this.fcEvents.splice(index, 1, newEvent);
           }
-          this.fcEvents.splice(index, 1, newEvent);
         }
-      }
+        }
+      },
+    mounted() {
+        this.schoolList = [...new Set(this.allList.map(item => item.schoolName))];
+        this.lessonList = this.allList;
+        this.schoolList.unshift("全部课程");
+        this.selectSchool = this.schoolList[0];
+        this.initCalendar(this.lessonList);
     }
   }
 </script>
@@ -249,6 +252,11 @@
       background: none;
     }
 
+    .review-main .fc-week {
+      min-height:120px;
+      height:120px !important;
+    }
+
     .review-main  .fc-event {
       border: none;
     }

+ 6 - 2
TEAMModelOS.SmartClass/ClientApp/view/smart-class/index.vue

@@ -54,7 +54,8 @@
     <div class="home-activity">
       <div class="activity-container">
         <div class="header-line">
-          <h3>往届回顾</h3> <span>REVIEW</span> <div class="more">
+          <h3>往届回顾</h3> <span>REVIEW</span>
+          <div class="more">
             <a href="./activity.html" class="view-more">查看更多</a>
           <span class="count">
               <b style="color: rgb(83, 199, 102);">18</b>个活动
@@ -65,7 +66,10 @@
           <div class="activity" v-for="(item,index) in activityList" @click="handleActivityClick()">
             <div>
               <div class="img-box"><span class="state" style="background: rgb(19, 206, 102); visibility: visible;">{{item.statusTip}}</span> <img src="http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221" alt=""></div> <div class="infos">
-                <p></p><p class="actName">{{item.name}}</p> <p></p> <p class="actOrganizer">
+              <p></p>
+              <p class="actName">{{item.name}}</p>
+              <p></p>
+              <p class="actOrganizer">
                   <span class="organizer">
                     {{item.organizer}}
                   </span>

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


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


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


BIN
TEAMModelOS.SmartTeach/ClientApp/assets/image/resource/banner_jc.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/logo_img.png


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


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


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


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


+ 2 - 2
TEAMModelOS.SmartTeach/ClientApp/common/footer.vue

@@ -3,11 +3,11 @@
     <div class="w1200 clearfix">
       <div class="fl">
         <div class="copyright">
-          Copyright© 2018 yijiao.com.   All rights reserved&nbsp;&nbsp;技术运营支持:<a href="http://www.huijiaoyun.com/" class="linkc" target="_blank">成都益教信息技术有限公司</a>            <br>   <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=42018502000485" class="c555"></a>&nbsp;&nbsp;&nbsp;
+          Copyright© 2018 yijiao.com.   All rights reserved&nbsp;&nbsp;技术运营支持:<a href="" class="linkc" target="_blank">成都益教信息技术有限公司</a>            <br>   <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=42018502000485" class="c555"></a>&nbsp;&nbsp;&nbsp;
         </div>
         <div class="hotline">
           <span>客户服务热线:028-86654303</span>
-          <a class="icon01" target="_blank" href="http://weibo.com/p/1006065506433983"></a>
+          <a class="icon01" target="_blank" href=""></a>
           <a class="icon02" href="#">
           </a>
           <a class="icon03" href="" target="_blank"></a>

+ 9 - 4
TEAMModelOS.SmartTeach/ClientApp/common/headers.vue

@@ -10,7 +10,7 @@
         </div>
       </div>
       <div class="header_right">
-        <div class="helper"><button>教学助手</button></div>
+        <div class="helper" ><button @click="tologin">教学助手</button></div>
       </div>
     </div>
   </div>
@@ -26,7 +26,12 @@
           { "id": 4, "name": '活动', "url": '/activity' },
         ],
       }
-    } 
+    },
+    methods: {
+      tologin: function () {
+        this.$router.push({ path: '/login' })
+      }
+    }
   }
 </script>
 <style scoped>
@@ -51,8 +56,8 @@
   }
   .logo_img {
     float: left;
-    width: 25%;
-    margin-top: 1.5%;
+    width: 30%;
+    margin-top: 2%;
   }
   .header_list {
     float: left;

+ 101 - 59
TEAMModelOS.SmartTeach/ClientApp/components/resource/home.vue

@@ -1,56 +1,71 @@
 
 <template>
   <div class="home">
-        <div class="title">
-          <!--顶部轮播图-->
-          <div >
-            <Carousel >
-              <CarouselItem v-for="(homeImagesList,index) in homeCarouselImg" :key="index">
-                <div class="demo-carousel">
-                  <img class="carousel-img" :src="homeImagesList.images" >
-                </div>
-              </CarouselItem>
-            </Carousel>
-          </div>
-        </div>
-        <div class="who-is">
-          <ul class="people-list">
-            <li class=" show animated slideInLeft delay-1s">
-              <img src="../../assets/image/resource/who01.png">
-              <span>我是管理者</span>
-            </li>
-            <li class=" show animated slideInLeft ">
-              <img src="../../assets/image/resource/who02.png">
-              <span>我是教师</span>
-            </li>
-            <li class="show animated slideInRight">
-              <img src="../../assets/image/resource/who03.png">
-              <span>我是学生</span>
-            </li>
-            <li class="show animated slideInRight delay-1s">
-              <img src="../../assets/image/resource/who04.png">
-              <span>我是家长</span>
-            </li>
-          </ul>
-        </div>
-        <div class="center-info">
-          <h1>已超过<span>1000</span>所学校开通了我们的服务</h1>
-          <img  src="../../assets/image/resource/center01.png" >
-          <img  src="../../assets/image/resource/bottom.png" >
-        </div>
-     </div>
+    <div class="title">
+      <!--顶部轮播图-->
+      <div>
+        <Carousel>
+          <CarouselItem v-for="(homeImagesList,index) in homeCarouselImg" :key="index">
+            <div class="demo-carousel">
+              <img class="carousel-img" :src="homeImagesList.images">
+            </div>
+          </CarouselItem>
+        </Carousel>
+      </div>
+    </div>
+    <div class="who-is">
+      <ul class="people-list">
+        <li class=" show animated slideInLeft delay-1s">
+          <img src="../../assets/image/resource/who01.png">
+          <span>我是管理者</span>
+        </li>
+        <li class=" show animated slideInLeft ">
+          <img src="../../assets/image/resource/who02.png">
+          <span>我是教师</span>
+        </li>
+        <li class="show animated slideInRight">
+          <img src="../../assets/image/resource/who03.png">
+          <span>我是学生</span>
+        </li>
+        <li class="show animated slideInRight delay-1s">
+          <img src="../../assets/image/resource/who04.png">
+          <span>我是家长</span>
+        </li>
+      </ul>
+    </div>
+    <div class="arrow">
+      <img src="../../assets/image/resource/arrow.png">
+      <h1>开通智慧学校</h1>
+      <div class="box"></div>
+    </div>
+    <img src="../../assets/image/resource/center01.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">
+    <div class="arrow">
+      <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>
 <script>
   export default {
     data() {
       return {
         homeCarouselImg: [
-
           {
-            images: require('../../assets/image/resource/banner02.png')
+            images: require('../../assets/image/resource/banner01.png')
           },
           {
-            images: require('../../assets/image/resource/banner01.png')
+            images: require('../../assets/image/resource/banner.png')
           },
         ]
       };
@@ -75,8 +90,12 @@
 
   .demo-carousel {
     width: 100%;
+
   }
+    .demo-carousel img {
 
+      background-size:contain;
+    }
   .carousel-img {
     width: 100%;
     cursor: pointer;
@@ -84,13 +103,13 @@
   }
 
   .who-is {
-    height: 240px;
-    margin-top: -70px;
+    height: 260px;
+    margin-top: -20px;
     position: relative;
-    z-index: 21;
-    width: 64%;
+    z-index: 20;
+    width: 56.5%;
     overflow: hidden;
-    margin-left: 19%;
+    margin-left: 21.5%;
   }
 
   .people-list {
@@ -102,20 +121,24 @@
   }
 
     .who-is ul li span {
-      padding-top: 20px;
+      padding-top: 10px;
+      display: block;
       font-size: 24px;
-      color: #fff;
+      /* margin-top: 35px; */
+      font-weight: 800;
+      color: #141414;
     }
 
     .who-is ul li {
       float: left;
-      width: 300px;
-      height: 264px;
+      width: 255px;
+      height: 235px;
       text-align: center;
       position: relative;
-      /*opacity: 0;
-      opacity: 1\9;*/
-      background-color: #289EFB;
+      box-shadow: 1px 1px 1px 1px #808080;
+      border-radius: 5%;
+      margin-left: 12px;
+      background-color: #fff;
     }
 
   .show:hover {
@@ -124,13 +147,32 @@
     cursor:pointer;
   }
 
-      .who-is ul li img {
-        border: 0;
-        vertical-align: middle;
-        margin-top: 30%;
-      }
-  .center-info{
+  .who-is ul li img {
+    border: 0;
+    /* vertical-align: middle; */
+    margin-top: 10%;
+  }
+  .arrow{
     width:100%;
+    text-align:center;
+  }
+    .arrow h1 {
+      margin-top:15px;
+      font-weight: 800;
+      font-size: 26px;
+      color: #0099FF;
+      margin-bottom:20px;
+    }
+  .box {
+    width: 120px;
+    height: 5px;
+    background-color: #0099FF;
+    margin: auto;
+    margin-bottom:20px;
+    /*text-align:center;*/
+  }
+  .center-info {
+    width: 100%;
   }
   .center-info h1{
     font-size:40px;

+ 1 - 1
TEAMModelOS.SmartTeach/ClientApp/components/resource/list.vue

@@ -127,7 +127,7 @@
 <style>
   .list_box {
     width:100%;
-    background:url("../../assets/image/resource/banner.png") no-repeat;
+    background:url("../../assets/image/resource/banner_jc.png") no-repeat;
     background-size:100% 100%;
     height:396px;
     position:relative;

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

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

+ 1 - 0
TEAMModelOS.TeachZone/ClientApp/assets/css/style.css

@@ -7,6 +7,7 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .header .header-list>li{margin-right: 25px;}
 .header .header-list .ivu-select-selection, .header-list .ivu-select-selection .ivu-select-arrow{color: #fff;}
 .header .header-list .ivu-select-selected-value{font-size: 14px;}
+.ivu-select-item{width: 100%;}
 .header .header-list>li.icon{
   background: url("../image/addr.png") no-repeat 0 10px;padding-left:22px;
 }

+ 4 - 4
TEAMModelOS.TeachZone/ClientApp/common/footer.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="footer wrap">
-    <p class="tc">技术支持:成都益教信息技术有限公司   © 2018 yun.zjer.cn All rights reserved      ICP备案号:浙ICP备05000083 | 浙公网安备 33010602005197号</p>
+    <p class="tc">Copyright© 2018 yijiao.com. All rights reserved  技术运营支持:成都益教信息技术有限公司</p>
   </div>
 </template>
 
 <script>
-    export default {
-        name: "header"
-    }
+  export default {
+    name: "header"
+  }
 </script>
 
 <style scoped>

+ 6 - 1
TEAMModelOS.TeachZone/ClientApp/common/header.vue

@@ -25,7 +25,12 @@
             <input type="text" placeholder="请输入关键字..." class="raduis20 search-input">
           </li>
           <li>
-            <a href="">张三 </a>
+            <Select v-model="formItem.select">
+              <!--<Option value="sel1" >班级</Option>-->
+              <Option value="sel1">教师空间</Option>
+              <Option value="">学生空间</Option>
+            </Select>
+            <!--<a href="">张三 </a>-->
           </li>
           <li>
             <Select v-model="formItem.select">

+ 57 - 0
TEAMModelOS.TeachZone/ClientApp/common/leftStudent.vue

@@ -0,0 +1,57 @@
+<template>
+  <div class="left bgf fl">
+    <div class="master-info">
+      <div class="ov">
+        <img src="../assets/image/head.png" alt="" class="fl">
+        <div class="fl name">
+          <p><a href="">李四</a></p>
+          <span>学生</span>
+        </div>
+      </div>
+      <p>成都市高新区芳草小学</p>
+      <ul class="exper">
+        <li><i class="icon"></i>1485积分</li>
+        <li><i class="icon"></i>1960经验</li>
+      </ul>
+      <ul class="other tc">
+        <li>
+          <p>25</p>
+          <span>成果</span>
+        </li>
+        <li>
+          <p>89</p>
+          <span>资源</span>
+        </li>
+        <li>
+          <p>82</p>
+          <span>照片</span>
+        </li>
+      </ul>
+    </div>
+    <dl class="work">
+      <dt>我的工作</dt>
+      <dd><a href="/teachSource"><i class="icon"></i>教材资源</a></dd>
+      <dd><a href="/teachCheck"><i class="icon"></i>在线检测</a></dd>
+      <dd><a href="/teachSource"><i class="icon"></i>课前导学</a></dd>
+      <dd><a href="/teachPrelesson"><i class="icon"></i>同步备课</a></dd>
+      <dd><a href="/teachTask"><i class="icon"></i>课后作业</a></dd>
+    </dl>
+    <dl class="class-manage">
+      <dt>我的班级</dt>
+      <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="/studentList"><i class="icon"></i>学生名单</a></dd>
+    </dl>
+  </div>
+</template>
+
+<script>
+    export default {
+        name: "header"
+    }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -2,6 +2,7 @@
 //import ServerSideLogin from '@/view/serverside/login'
 // import HTTP404 from '@/view/404'
 import Index from '@/view/index'
+import IndexStudent from '@/view/indexStudent'
 import StudentList from '@/view/studentList'
 import ScoreList from '@/view/scoreList'
 import ScoreListDetail from '@/view/scoreListDetail'
@@ -17,6 +18,7 @@ import TeachCheck from '@/view/teachCheck'
 import TeachTask from '@/view/teachTask'
 import TeachTaskDetail from '@/view/teachTaskDetail'
 import Report from '@/view/report'
+import Reportad from '@/view/reportadvanced'
 import { resolve } from 'url';
 
 export const routes = [
@@ -25,6 +27,11 @@ export const routes = [
     path: '',
     component: Index
   },
+  {
+    name: 'indexStudent',
+    path: '/IndexStudent',
+    component: IndexStudent
+  },
   {
     name: 'studentList',
     path: '/studentList',
@@ -100,4 +107,9 @@ export const routes = [
     path: '/Report',
     component: Report
   },
+  {
+    name: 'reportad',
+    path: '/Reportad',
+    component: Reportad
+  },
 ]

+ 36 - 0
TEAMModelOS.TeachZone/ClientApp/view/indexStudent.vue

@@ -0,0 +1,36 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <Master></Master>
+    <div class="wrap ov bodyContent">
+      <LeftStudent></LeftStudent>
+      <Index></Index>
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/header.vue'
+  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
+    },
+    data() {
+      return {
+
+      }
+    },
+      mounted() {
+
+      }
+    }
+</script>
+

+ 12 - 12
TEAMModelOS.TeachZone/ClientApp/view/report.vue

@@ -14,7 +14,7 @@
         </ul>
         <br/>
         <ul>
-          <li><span class="vice-name">考试名称:</span><span class="vice-name_content">2019 全市第一次联考</span></li>
+          <li><span class="vice-name">考试名称:</span><span class="vice-name_content">2019.03.07-在线检测</span></li>
           <li><span class="vice-name">考试类型:</span><span class="vice-name_content">区级联考</span></li>
           <li><span class="vice-name">考试总分:</span><span class="vice-name_content">460</span></li>
           <li><span class="vice-name">学习稳定系数:</span><span class="vice-name_content">0.6</span></li>
@@ -38,7 +38,7 @@
         <p class="summarize_header_title">总结:</p>
         <div class="summarize_content">
           <p class="content_header">张三同学,你好!</p>
-          <p class="content_text">你在本次<span class="exam_color">2019 全市第一次联考</span>中,考试总分为<span class="number_color">460分</span>,考试范围为:1-4章节。</p>
+          <p class="content_text">你在本次<span class="exam_color">在线检测(2019-03-07)</span>中,考试总分为<span class="number_color">460分</span>,考试范围为:1-4章节。</p>
           <p class="content_text">你在 <span class="dot1">知识点1、知识点2、知识点3</span> 处的题目都表现出色,全部都答对了。</p>
           <p class="content_text">你在 <span class="dot2">知识点3、知识点4、知识点6 </span> 处的题目有待加强,部分答对了,其中<span class="dot3">知识点3-XXXX,知识点4-XXXX,知识点6-XXX</span> 需加强练习或复习。</p>
           <p class="content_text">你在<span class="dot4">知识点7、知识点8、知识点9 </span> 处的题目表现较差,都答错了。建议将答错试题请教老师,重新学习知识点内容,也可进入补救题库,进行补救。</p>
@@ -74,23 +74,23 @@
       return {
         cityList: [
           {
-            value: '2019 全市第一次联考',
-            label: '2019 全市第一次联考'
+            value: '2019.03.07-在线检测',
+            label: '2019.03.07-在线检测'
           },
           {
-            value: '2019 全市第二次联考',
-            label: '2019 全市第二次联考'
+            value: '2018.12.15-测试',
+            label: '2018.12.15-测试'
           },
           {
-            value: '2019 全市第三次联考',
-            label: '2019 全市第三次联考'
+            value: '2018.11.03-在线检测',
+            label: '2018.11.03-在线检测'
           },
           {
-            value: '2019 全市第四次联考',
-            label: '2019 全市第四次联考'
+            value: '2018.10.07-在线测试考',
+            label: '2018.10.07-在线测试考'
           },
         ],
-        model1: '2019 全市第一次联考',
+        model1: '2019.03.07-在线检测',
         cityList1: [
           {
             value: '语文',
@@ -247,7 +247,7 @@
               "interval": 0,
 
             },
-            "data": ["2019 全市第一次联考", "2019 全市第二次联考", "2019 全市第三次联考","2019 全市第四次联考","2019 全市第五次联考"],
+            "data": ["在线检测(2019.03.07)", "在线检测(2019.01.13)", "在线检测(2018.12.20)", "在线检测(2018.12.03)","在线检测(2018.11.15)"],
           }],
           "yAxis": [{
             "type": "value",

+ 801 - 0
TEAMModelOS.TeachZone/ClientApp/view/reportadvanced.vue

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