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

TEAMModelOS.SmartClass/ClientApp/app.js

@@ -18,39 +18,25 @@ require('video.js/dist/video-js.css');
 require('vue-video-player/src/custom-theme.css');
 Vue.use(VideoPlayer);
 
-//新添加的
 import vuescroll from 'vue-scroll'
 import echarts from 'echarts'
-//import FullCalendar from 'vue-full-calendar'
-//Vue.use(FullCalendar);
-//全局API请求
+
 Vue.prototype.$api = apiTools;
 Vue.prototype.$post = post;
 Vue.prototype.$get = fetch;
-
 Vue.prototype.$eventBus = new Vue()
-
 Vue.prototype.$jwtDecode = jwtDecode;
-
 Vue.use(vuescroll)
 Vue.prototype.$echarts = echarts
-
-//ZXJ
 Vue.prototype.common = commons;
 
 // Registration of global components
 Vue.component('icon', FontAwesomeIcon);
 
-//使用钩子函数对路由进行权限跳转
-//router.beforeEach((to, from, next) => {
-//const role = localStorage.getItem('token');
-//  if (!role && to.path !== '/') {
-//    next('/');
-//  } else {
-//    next();
-//  }
-//})
-//Vue.prototype.$http = axios
+router.beforeEach((to, from, next) => {
+  window.scroll(0, 0);
+  next();
+});
 
 Vue.use(iView, {
   i18n: (key, value) => i18n.t(key, value)

TEAMModelOS.SmartClass/ClientApp/view/smart-class/ActivityDetails.vue

@@ -21,7 +21,7 @@
               </div>
               <div class="brief-info-left">
                 <div class="items"><p class="item">高新区教师发展中心</p> <span class="tips">主办方</span></div>
-                <div class="items"><p class="item2">0天 0小时 0分</p> <span class="tips">距离报名开始时间</span></div>
+                <!--<div class="items"><p class="item2">0天 0小时 0分</p> <span class="tips">距离报名开始时间</span></div>-->
               </div>
 
             </div>

TEAMModelOS.SmartClass/ClientApp/view/smart-class/LessonDetails.vue

@@ -88,12 +88,14 @@
 </template>
 <script>
   import lessonInfo from '@/static/lessonDetails.json'
+import { setTimeout } from 'core-js';
   export default {
     components: {
     },
     data() {
       return {
         reviewAcList: [],
+        isLoading: true,
         attachmentsList: [],
         commentList: [],
         rowKey:0,
@@ -102,6 +104,7 @@
     },
 
     created() {
+      this.$Spin.show();
       this.rowKey = sessionStorage.getItem('_lesson_rowKey');
       this.attachmentsList = lessonInfo[this.rowKey].attachments;
       this.activityInfo = lessonInfo[this.rowKey].data;
@@ -119,6 +122,9 @@
 
     },
     mounted() {
+      setTimeout(() => {
+          this.$Spin.hide();
+       }, 500);
       let myChart = this.$echarts.init(document.getElementById('views'));
       let schoolList = lessonInfo[this.rowKey ].views.map(a => a.schoolName);
       let viewsList = lessonInfo[this.rowKey ].views.map(a => a.viewCount);
@@ -176,7 +182,6 @@
         }]
       };
 
-      myChart.setOption(option);
 
       let comments = this.$echarts.init(document.getElementById('comments'));
       let commentList = lessonInfo[this.rowKey ].schoolComments.map(a => a.commentCount);
@@ -225,7 +230,11 @@
         }]
       };
 
-      comments.setOption(commentsOption);
+      setTimeout(() => {
+        myChart.setOption(option);
+        comments.setOption(commentsOption);
+      }, 1500);
+
     }
   }
 </script>

TEAMModelOS.SmartClass/ClientApp/view/smart-class/Lessons.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="container">
 
-    <div class="search">
+    <!--<div class="search">
       <Input v-model="values" placeholder="请输入优课主题 （如：小学语文）" style="width: 200px" />
       <Button>搜索</Button>
-    </div>
+    </div>-->
     <div class="activity-item" v-for="(item,index) in lessons" :key="index">
       <div class="activity-banner">
         <img :src="getThumb(index)" />

TEAMModelOS.SmartClass/ClientApp/view/smart-class/LiveBroadcast.vue

@@ -96,6 +96,7 @@
             console.log(jsEvent);
           },
           eventClick: () => {
+            sessionStorage.setItem('_lesson_rowKey', 1);
             this.$router.push({ path: 'lessonDetails' });
           },
           eventMouseover: function (event, jsEvent, view) {

TEAMModelOS.SmartClass/ClientApp/view/smart-class/NoticeDetails.vue

@@ -25,11 +25,7 @@
     },
 
     created() {
-      //根据跳转参数获取通知详情
-      //let noticeId = this.$route.query.id;
-      //this.$get('http://ttkt.sxedu.org:70/webservice/bizNoticeItem.action?id=' + noticeId + '&nocache=1&_=1557315901157').then(res => {
-      //  console.log(res.data.noticeTypeName);
-      //})
+      this.$Spin.show();
 
       this.noticeContent = noticeDetails.data.content;
     },
@@ -40,6 +36,9 @@
 
     },
     mounted() {
+       setTimeout(() => {
+          this.$Spin.hide();
+       }, 500);
     }
   }
 </script>

TEAMModelOS.SmartClass/ClientApp/view/smart-class/Video.vue

@@ -78,7 +78,7 @@
             type: 'application/x-mpegURL',
             src: 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190517/demo/2019.m3u8'
           }],
-          poster: "http://static.smartisanos.cn/pr/img/video/video_03_cc87ce5bdb.jpg", //你的封面地址
+          //poster: "http://static.smartisanos.cn/pr/img/video/video_03_cc87ce5bdb.jpg", //你的封面地址
           width: document.documentElement.clientWidth,
           notSupportedMessage: '此视频暂无法播放，请稍后再试' //允许覆盖Video.js无法播放媒体源时显示的默认信息。
         },

TEAMModelOS.SmartClass/ClientApp/view/smart-class/index.vue

@@ -30,7 +30,6 @@
         <div class="header-line">
           <h3>评审活动</h3> <span>ACTIVITY</span> <div class="more">
             <a class="view-more" @click="goActivity">查看更多</a> <span class="count">
-              <b style="color: rgb(83, 199, 102);">2</b>个活动进行中
             </span>
           </div>
         </div>
@@ -62,7 +61,6 @@
           <div class="more">
             <a href="./activity.html" class="view-more">查看更多</a>
           <span class="count">
-              <b style="color: rgb(83, 199, 102);">18</b>个活动
             </span>
           </div>
         </div>

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

@@ -9,7 +9,7 @@
       <h1 class="list-title">网上评课</h1>
       <Tabs class="list" value="name1">
         <TabPane label="全部" name="name1">暂无数据</TabPane>
-        <TabPane label="进行中2" name="name2">暂无数据</TabPane>
+        <TabPane label="进行中" name="name2">暂无数据</TabPane>
         <TabPane label="未开始" name="name3">暂无数据</TabPane>
         <TabPane label="已结束" name="name4">暂无数据</TabPane>
       </Tabs>

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

@@ -264,31 +264,31 @@
         info: [
           {
             title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
+            name: '李思达',
             data: '2018-02-26',
             num: '25',
           },
           {
             title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
+            name: '张思德',
             data: '2018-02-26',
             num: '25',
           },
           {
             title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
+            name: '黄海峰',
             data: '2018-02-26',
             num: '25',
           },
           {
             title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
+            name: '周芳芳',
             data: '2018-02-26',
             num: '25',
           },
           {
             title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
+            name: '吴凯峰',
             data: '2018-02-26',
             num: '25',
           },
@@ -300,13 +300,13 @@
           },
           {
             title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
+            name: '何立峰',
             data: '2018-02-26',
             num: '25',
           },
           {
             title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
+            name: '张凯伦',
             data: '2018-02-26',
             num: '25',
           },

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

@@ -116,7 +116,7 @@
     margin-top: 35px;
     width: 90%;
     background: #fff;
-    height: 500px;
+    height: 9380px;
     border: 1px solid #ededed;
   }
 

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

@@ -57,7 +57,7 @@
   }
 
   .item-nav {
-    background: #0099ff;
+    background: #FDB7AD;
     height: 60px;
     line-height: 60px;
   }

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

@@ -9,7 +9,7 @@
             <div class="brief_con ">
               <div class="peo_info ">
                 <span class="ava">
-                  <img src="../../assets/image/resource/touxiang_01.jpeg" alt="">
+                  <img src="../../assets/image/resource/people02.jpg" alt="">
                 </span>
                 <div class="info">
                   <h1 title="李朝华">李朝华</h1>
@@ -59,14 +59,14 @@
           <div class="info-msg">
             <p>工作室资讯</p><a></a><hr>
             <ul>
-              <li><a>陈伟名师网络工作室活动暨职业教满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师活动暨职业教育教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师网络工作室活动暨职业教育教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师网络工作室活教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师网络工教育教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师网络工作室教育教材反馈会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师网络工作室活动暨职业教会圆满结束</a><span>10-25</span></li>
-              <li><a>陈伟名师网络教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">陈伟名师网络工作室活动暨职业教满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">陈伟名师活动暨职业教育教材反馈会圆满结束</a@click="viewDetails"><span>10-25</span></li>
+              <li><a @click="viewDetails">陈伟名师网络工作室活动暨职业教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">陈伟名师网络工作室活教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">陈伟名师网络工教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">陈伟名师网络工作室教育教材反馈会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">陈伟名师网络工作室活动暨职业教会圆满结束</a><span>10-25</span></li>
+              <li><a @click="viewDetails">陈伟名师网络教育教材反馈会圆满结束</a><span>10-25</span></li>
             </ul>
           </div>
           <div class="notice">
@@ -88,7 +88,7 @@
             <div class="header article_header"><em class="fl"><i>教师文章</i></em><a class="more fr"></a></div>
             <div class="article_con clearfix">
               <div class="theme_det clearfix">
-                <a href="javascript:;" title="高考物理考前指导：掌握技巧；科学应考"><img src="http://static.sinweiwx.com/tianyu_edu/common/images/teacherSky_4.0/teacher_img.jpg"></a>
+                <a href="javascript:;" title="高考物理考前指导：掌握技巧；科学应考"><img src="../../assets/image/resource/teacher-ar.jpg"></a>
                 <div class="theme_info ">
                   <h3><a title="高考物理考前指导：掌握技巧；科学应考">高考物理考前指导：掌握技...</a></h3>
                   <p class="tip f14 c888 mgt5">高考物理考前指导：掌握技巧；科学应考...</p>
@@ -169,9 +169,9 @@
             <div class="header res_header"><em class="fl"><i>教学资源</i></em><a class="more fr"></a></div>
             <div class="res_con">
               <div class="source_det clearfix">
-                <img src="http://static.sinweiwx.com/tianyu_edu/common/images/teacherSky_4.0/source_img.jpg">
+                <img src="../../assets/image/resource/source.jpg">
                 <div class="source_info ">
-                  <h3><a href="/index.php?r=studio/resources/info&amp;sid=642&amp;resId=476990_MShunan">16-17版 第2部分 专题1 力...</a></h3>
+                  <h3><a >16-17版 第2部分 专题1 力...</a></h3>
                 </div>
               </div>
               <ul class=" source_list">
@@ -194,6 +194,12 @@
       return {
 
       }
+    },
+    methods: {
+      viewDetails() {
+        this.$router.push({ path: '/TeacherZone/TeachDetails' })
+
+      },
     }
   }
 </script>
@@ -618,7 +624,7 @@
     height: 100px;
     border: 1px solid #fff;
     margin-left: 10px;
-    margin-top: 5px;
+    margin-top: -10px;
   }
   .source_det h3 a {
     font-size: 16px;
@@ -627,7 +633,7 @@
   }
 
   .source_list {
-    margin-top: 70px;
+    margin-top: 60px;
   }
 
     .source_list li {

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

@@ -532,6 +532,7 @@
         padding-top: 3px;
         font-size: 12px;
         font-weight: 800;
+        color:#fff;
       }
   .teacher-detailed {
     width: 100%;

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

@@ -132,7 +132,7 @@ body{
 .studentList>dd{text-align:center;float:left;width: 20%;margin:20px 2.5%;border-radius:2px;padding:15px 0 0;
     /*background:#f5f5f5;box-shadow: 1px 1px  1px rgba(0,0,0,0.2);*/
     border:1px solid #ddd;
-    /*position: relative;*/
+    position: relative;
     /*box-shadow: 0 4px 15px #ddd;;*/
 }
 .studentList>dd i{

TEAMModelOS.TeachZone/ClientApp/common/screen.vue

@@ -1,4 +1,5 @@
 <template>
+  <div>
   <div class="screen">
     <ul>
       <li>
@@ -24,6 +25,17 @@
           <Radio label="校本资源"></Radio>
         </RadioGroup>
       </li>
+      <!--<li>-->
+        <!--<span class="fl">格式：</span>-->
+        <!--<RadioGroup v-model="button2" type="button">-->
+          <!--<Radio label="全部"></Radio>-->
+          <!--<Radio label="图片"></Radio>-->
+          <!--<Radio label="文档"></Radio>-->
+          <!--<Radio label="视频"></Radio>-->
+          <!--<Radio label="音频"></Radio>-->
+          <!--<Radio label="动画"></Radio>-->
+        <!--</RadioGroup>-->
+      <!--</li>-->
       <li>
         <span class="fl">范围：</span>
         <RadioGroup v-model="button3" type="button">
@@ -37,6 +49,7 @@
       </li>
     </ul>
   </div>
+  </div>
 </template>
 <script>
     export default {

TEAMModelOS.TeachZone/ClientApp/common/screenSort.vue

@@ -26,6 +26,7 @@
           <Option value="">本校范围</Option>
           <Option value="">我的分享</Option>
         </Select>
+        <!--<Button type="primary" style="margin-right: 5px;">发布资源</Button>-->
       </div>
     </div>
   </div>

TEAMModelOS.TeachZone/ClientApp/view/reportadvanced.vue

@@ -212,77 +212,77 @@
         ],
         data2: [
           {
-            name: '王小明',
+            name: '周宇鑫',
             studennum: '2018001001',
             paiming: '1',
             fenshu: '98',
             chaoguo:'99%'
           },
           {
-            name: '王小明',
+            name: '李明悦',
             studennum: '2018001001',
             paiming: '2',
             fenshu: '96',
             chaoguo: '98%'
           },
           {
-            name: '王小明',
+            name: '刘佳乐',
             studennum: '2018001001',
             paiming: '3',
             fenshu: '95',
             chaoguo: '97%'
           },
           {
-            name: '王小明',
+            name: '王启航',
             studennum: '2018001001',
             paiming: '4',
             fenshu: '92',
             chaoguo: '96%'
           },
           {
-            name: '王小明',
+            name: '王心怡',
             studennum: '2018001001',
             paiming: '5',
             fenshu: '90',
             chaoguo: '95%'
           },
           {
-            name: '王小明',
+            name: '王程弈',
             studennum: '2018001001',
             paiming: '6',
             fenshu: '90',
             chaoguo: '95.5%'
           },
           {
-            name: '王小明',
+            name: '郭文俊',
             studennum: '2018001001',
             paiming: '7',
             fenshu: '86',
             chaoguo: '94%'
           },
           {
-            name: '王小明',
+            name: '刘玉婷',
             studennum: '2018001001',
             paiming: '8',
             fenshu: '85',
             chaoguo: '93%'
           },
           {
-            name: '王小明',
+            name: '司文涛',
             studennum: '2018001001',
             paiming: '9',
             fenshu: '83',
             chaoguo: '92%'
           },
           {
-            name: '王小明',
+            name: '周军',
             studennum: '2018001001',
             paiming: '10',
             fenshu: '81',
             chaoguo: '91%'
           },
           {
-            name: '王小明',
+            name: '赵志杰',
             studennum: '2018001001',
             paiming: '11',
             fenshu: '79',

TEAMModelOS.TeachZone/ClientApp/view/source.vue

@@ -5,10 +5,10 @@
     <div class="wrap ov">
       <Left></Left>
       <div class="main fr">
-        <h4><a href="/">首页</a> > 学生成绩</h4>
+        <h4><a href="/">首页</a> > 班级资源</h4>
         <div class="content ov bgf">
           <dl class="notice fl " style="width: 100%">
-            <dt>学生成绩</dt>
+            <dt>班级资源</dt>
             <div class="oper">
               <Button type="info" @click="modal1 = true">发布资源</Button>
               <Modal