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

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>

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;
     }

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>

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>

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;

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

@@ -61,12 +61,11 @@
     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')
           },
         ]
       };
@@ -90,11 +89,13 @@
   }
 
   .demo-carousel {
-    /*width: 100%;*/
-    background-size:cover;
-    height:500px;
+    width: 100%;
+
   }
+    .demo-carousel img {
 
+      background-size:contain;
+    }
   .carousel-img {
     width: 100%;
     cursor: pointer;

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;

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;
 }

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>

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

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>

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'
@@ -26,6 +27,11 @@ export const routes = [
     path: '',
     component: Index
   },
+  {
+    name: 'indexStudent',
+    path: '/IndexStudent',
+    component: IndexStudent
+  },
   {
     name: 'studentList',
     path: '/studentList',

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>
+

TEAMModelOS.TeachZone/ClientApp/view/reportadvanced.vue

@@ -6,11 +6,6 @@
     <div class="report_box bgf pad20" style="margin-top:40px;">
       <a href="/teachCheck" style="color: #288add;"> < 返回 </a>
       <div class="header_basic">
-        <ul>
-          <li><!--<Icon type="md-person" size="24" />--><span class="name">姓名：</span><span class="name_content">张三</span></li>
-          <li><!--<Icon type="md-bookmarks" size="24" />--><span class="name">学号：</span><span class="name_content">201901001</span></li>
-          <li><!--<Icon type="ios-clipboard" size="24" />--><span class="name">班级：</span><span class="name_content">2019级五班</span></li>
-        </ul>
         <br />
         <ul>
           <li><span class="vice-name">考试名称：</span><span class="vice-name_content">2019.03.07-在线检测</span></li>
@@ -36,11 +31,10 @@
       <div class="summarize">
         <p class="summarize_header_title">总结：</p>
         <div class="summarize_content">
-          <p class="content_header">张三同学，你好！</p>
-          <p class="content_text">你在本次<span class="exam_color">2019.03.07-在线检测</span>中，考试总分为<span class="number_color">460分</span>,班级平均分为：<span class="number_color1">433.7</span>,年级平均分为：<span class="number_color2">467</span>，考试范围为：1-4章节。</p>
-          <p class="content_text">你在 <span class="dot1">知识点1、知识点2、知识点3</span> 处的题目都表现出色，全部都答对了。</p>
-          <p class="content_text">你在 <span class="dot2">知识点3、知识点4、知识点6 </span> 处的题目有待加强，部分答对了，其中<span class="dot3">知识点3-XXXX，知识点4-XXXX，知识点6-XXX</span> 需加强练习或复习。</p>
-          <p class="content_text">你在<span class="dot4">知识点7、知识点8、知识点9 </span> 处的题目表现较差，都答错了。建议将答错试题请教老师，重新学习知识点内容，也可进入补救题库，进行补救。</p>
+          <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">