luoxiaoli@foxmail.com 6 tahun lalu
induk
melakukan
8ad5a1e4bc

+ 33 - 9
TEAMModelOS.TeachZone/ClientApp/assets/css/style.css

@@ -76,8 +76,13 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 /*选择章节*/
 .left .chapter>dd{
     padding:8px 20px;
+    font-size: 12px;
+    color: #333;
 }
+.left .chapter>dd.nowText{font-weight: bold; }
 
+.chapter .ivu-timeline-item-content>.time{color: #666;}
+.chapter .ivu-timeline-item-content>.content{font-size: 14px;margin-top:5px;}
 .ivu-tree{min-height: 600px;}
 .ivu-tree>.ivu-tree-children>li>span{font-size: 15px;}
 .ivu-tree>.ivu-tree-children>li>ul>li>span{font-size: 14px;color: #666;}
@@ -116,8 +121,8 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 
 /*studentList*/
 
-.studentList>dd{float:left;width: 21%;margin:2%;border-radius:2px;padding:15px 0;background:#f5f5f5;box-shadow: 1px 1px  1px rgba(0,0,0,0.2);background: }
-.studentList>dd img{float:left;width: 50px;margin:0 15px 0 10px;}
+.studentList>dd{text-align:center;float:left;width: 21%;margin:2%;border-radius:2px;padding:15px 0 20px;background:#f5f5f5;box-shadow: 1px 1px  1px rgba(0,0,0,0.2); }
+.studentList>dd img{/*float:left;*/width: 50px;margin:0 15px 0 10px;}
 .studentList>dd h4{font-size: 16px;margin: 3px 0;}
 .studentList>dd span{color: #666;}
 .studentList>dd p{display:block;font-size: 12px;padding:5px 0;margin-top:10px;}
@@ -172,13 +177,13 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 }
 .ivu-select-single .ivu-select-selection{border:0;background: none;}
 .ivu-select-visible .ivu-select-selection{box-shadow: none;-webkit-box-shadow: none;}
-
+.ivu-select-single .ivu-select-selection .ivu-select-selected-value{border:0 !important;}
 /*选择教材*/
 .modalSel{padding:15px 10px 30px;margin-bottom: 30px;background:#eee;border-radius: 3px;}
 .modalSel>h4{margin-bottom:10px ;font-size: 16px;}
 .modalSel .ivu-select-single .ivu-select-selection{border:1px solid #ddd;;height:40px;background: #fff;}
 .modalSel .ivu-select-single .ivu-select-selection .ivu-select-selected-value{height:40px;line-height: 40px;}
-
+.chooseexam .ivu-select-single .ivu-select-selection {border:1px solid #ddd !important;}
 
 .workSourceList>li.ppt,.sourceRecom>ul>li.ppt>a{background-image: url("../image/w-ppt.png") }
 .workSourceList>li.word,.sourceRecom>ul>li.word>a{background-image: url("../image/w-word.png")}
@@ -202,9 +207,19 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 /*资源详情*/
 .sourceDetail>.titleBox{background: #eee;padding:20px; border: 1px solid #ddd;border-bottom: 0;}
 .sourceDetail>.titleBox>h3{font-size: 22px;margin-bottom: 10px;padding-left:35px;
+}
+.sourceDetail>.titleBox>h3.word{
     background: url("../image/w-word.png") no-repeat 0 center;
     background-size:25px auto ;
 }
+.sourceDetail>.titleBox>h3.video{
+    background: url("../image/w-video.png") no-repeat 0 center;
+    background-size:25px auto ;
+}
+.sourceDetail>.titleBox>h3.ppt{
+    background: url("../image/w-ppt.png") no-repeat 0 center;
+    background-size:25px auto ;
+}
 .sourceDetail>.titleBox>.info{color: #666;font-size: 12px;line-height: 31px;}
 .sourceDetail>.titleBox>.info>li{margin-right: 25px;}
 .sourceDetail iframe{width:100%;min-height:500px; border: 1px solid #ddd;border-top: 0; padding:20px;}
@@ -252,11 +267,14 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .numCard>p>b{color:#f7aa20;}
 .numCard>.answerCard{border:1px solid #ddd;}
 .numCard>.answerCard>h5{background: #f9f9f9;font-size:16px;padding:10px;border-bottom:1px solid #ddd;}
-.numCard>.answerCard>.num{padding-bottom:15px;}
-.numCard>.answerCard>.num>ol{padding:30px 10px 30px;min-height: 150px;}
-.numCard>.answerCard>.num>ol>li{background: #eee;border-bottom:2px solid #ccc;color:#666;font-size:12px;margin:5px;width: 20px;height:20px;text-align: center;cursor: pointer;}
-.numCard>.answerCard>.num>ol>li.active{background: #ccc;color: #fff;}
-.numCard>.answerCard>.num>p{padding:0 10px;}
+.numCard>.answerCard>.num{padding:30px 10px 30px;min-height: 150px;}
+
+
+.numCard>.answerCard>.num>p{padding:0 10px;margin-top:50px;}
+.AnchorBox .ivu-anchor-ink-ball{border:0;background: none;}
+.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;}
 .checkList>li{width:100%;padding:15px;margin-bottom: 30px;
     border:1px solid #ddd;
     /*box-shadow: 0 1px 4px rgba(0,0,0,0.2);*/
@@ -278,3 +296,9 @@ body{background:#e3f2fa url("../image/bodyBg.png") no-repeat 0 40px;}
 .checkList>li>ol>li{margin-right: 30px;line-height: 30px;}
 .checkList>li>.answer{color: #666;}
 .checkList>li>.answer>li{width: 100%;}
+.checkList table{margin:15px;}
+.checkList table td{border:1px solid #666;padding:5px;}
+.ivu-checkbox-group-item{display: block;margin:20px 0;}
+.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;}

TEMPAT SAMPAH
TEAMModelOS.TeachZone/ClientApp/assets/image/shenfen.png


TEMPAT SAMPAH
TEAMModelOS.TeachZone/ClientApp/assets/image/shenfen1.png


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

@@ -13,7 +13,7 @@
 
             <Select v-model="formItem.select">
               <Option value="sel1" >首页</Option>
-              <Option value="">四川省平台</Option>
+              <!--<Option value="">四川省平台</Option>-->
               <Option value="">成都市平台</Option>
               <Option value="">高新区平台</Option>
               <Option value="">学校平台</Option>

+ 1 - 1
TEAMModelOS.TeachZone/ClientApp/common/left.vue

@@ -31,9 +31,9 @@
     <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="/teachCheck"><i class="icon"></i>在线监测</a></dd>
       <dd><a href="/teachTask"><i class="icon"></i>课后作业</a></dd>
     </dl>
     <dl class="class-manage">

+ 1 - 1
TEAMModelOS.TeachZone/ClientApp/common/master.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="master wrap">
-      <a href="/">张三的空间</a>
+      <a href="/">的空间</a>
     </div>
   </div>
 

+ 13 - 13
TEAMModelOS.TeachZone/ClientApp/common/recomLeft.vue

@@ -4,23 +4,23 @@
       <dt>当前课程</dt>
       <dd>
         <Timeline>
-          <TimelineItem>
-            <!--<p class="time">教材</p>-->
-            <p class="content">初中历史与社会人教课标版</p>
+          <TimelineItem color="#2db7f5">
+            <p class="time">教材</p>
+            <p class="content">初中历史与社会人教课</p>
           </TimelineItem>
-          <TimelineItem>
-            <!--<p class="time">章节</p>-->
-            <p class="content">第一章 人在社会中生活</p>
+          <TimelineItem color="#2db7f5">
+            <p class="time">章节:第一章</p>
+            <p class="content">人在社会中生活</p>
           </TimelineItem>
-          <TimelineItem>
-            <!--<p class="time">课文</p>-->
-            <p class="content">第一课 我的家在哪里</p>
+          <TimelineItem color="#2db7f5">
+            <p class="time" style="font-weight: bold;" >课文:第一课 </p>
+            <p class="content" style="font-weight: bold;">我的家在哪里</p>
           </TimelineItem>
         </Timeline>
       </dd>
-      <!--<dd>初中历史与社会人教课标版</dd>-->
-      <!--<dd>第一单元 人在社会中生活</dd>-->
-      <!--<dd>第二课 我的家在哪里</dd>-->
+      <!--<dd><Icon type="ios-browsers-outline"style="font-size: 16px;" /> 初中历史与社会人教课标版</dd>-->
+      <!--<dd><Icon type="ios-browsers-outline"style="font-size: 16px;" /> 第一单元 人在社会中生活</dd>-->
+      <!--<dd class="nowText"><Icon type="ios-list-box-outline"  style="font-size: 16px;"/> 第二课 我的家在哪里</dd>-->
       <dd>
         <Button @click="value2 = true" type="info" long>选择章节 <Icon type="ios-arrow-dropright" style="font-size: 16px;"/></Button>
       </dd>
@@ -44,9 +44,9 @@
     <dl class="work bgf">
       <dt>我的工作</dt>
       <dd><a href="/teachSource" class="active"><i class="icon"></i>教材资源</a></dd>
+      <dd><a href="/teachCheck"><i class="icon"></i>在线检测</a></dd>
       <dd><a href="/teachPreclass"><i class="icon"></i>课前导学</a></dd>
       <dd><a href="/teachPrelesson"><i class="icon"></i>同步备课</a></dd>
-      <dd><a href="/teachCheck"><i class="icon"></i>在线监测</a></dd>
       <dd><a href="/teachTask"><i class="icon"></i>课后作业</a></dd>
     </dl>
     <div class="sourceRecom bgf">

+ 11 - 11
TEAMModelOS.TeachZone/ClientApp/common/workMaster.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="master wrap ov">
-    我的工作
-    <ul class="fr">
-      <li><a href="">教材资源</a></li>
-      <li><a href="">课前导学</a></li>
-      <li><a href="">同步备课</a></li>
-      <li><a href="">在线监测</a></li>
-      <li><a href="">课后作业</a></li>
-    </ul>
+    <a href="/">我的空间</a>
+    <!--<ul class="fr">-->
+      <!--<li><a href="">教材资源</a></li>-->
+      <!--<li><a href="">课前导学</a></li>-->
+      <!--<li><a href="">同步备课</a></li>-->
+      <!--<li><a href="">在线监测</a></li>-->
+      <!--<li><a href="">课后作业</a></li>-->
+    <!--</ul>-->
   </div>
 
 </template>
 
 <script>
-    export default {
-        name: "header"
-    }
+  export default {
+    name: "header"
+  }
 </script>
 
 <style scoped>

+ 49 - 2
TEAMModelOS.TeachZone/ClientApp/components/scoreListDetail.vue

@@ -2,8 +2,31 @@
   <div class="main fr">
     <h4><a href="/">首页</a> > 学生成绩</h4>
 
-    <div class="content ov bgf scoreListDetail">
+    <div class="content ov bgf scoreListDetail " style="padding:0 20px;">
       <h5 class="content-title">2019级上学期·第一次模拟考试成绩公布</h5>
+      <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>
       <div class="txt">
         <ul class="ov tc">
           <li class="table-head">
@@ -104,7 +127,31 @@
 
 <script>
   export default {
-    name: "index"
+    name: "index",
+    data(){
+      return{
+        modal1: false,
+        formItem: {
+          input: '',
+          textarea: ''
+        }
+      }
+    },
+    methods: {
+      ok () {
+        this.$Message.info('发布成功');
+      },
+      // cancel () {
+      //   this.$Message.info('');
+      // }
+      yes () {
+        this.modal1 = false;
+        this.$Message.success('发布成功');
+      },
+      cancel () {
+        this.modal1 = false;
+      }
+    }
   }
 </script>
 

+ 1 - 0
TEAMModelOS.TeachZone/ClientApp/components/studentList.vue

@@ -6,6 +6,7 @@
         <dt>学生名单 <a href="" class="fr">更多+</a></dt>
         <dd>
           <a href="">
+            <i>班长</i>
             <img src="../assets/image/head.png" alt="">
             <h4>李四</h4>
             <span>201901002</span>

+ 37 - 1
TEAMModelOS.TeachZone/ClientApp/router/routes.js

@@ -10,6 +10,12 @@ import NoticeDetail from '@/view/noticeDetail'
 import Source from '@/view/source'
 import TeachSource from '@/view/teachSource'
 import TeachSourceDetail from '@/view/teachSourceDetail'
+import TeachSourceVideo from '@/view/teachSourceVideo'
+import TeachPreclass from '@/view/teachPreclass'
+import TeachPrelesson from '@/view/teachPrelesson'
+import TeachCheck from '@/view/teachCheck'
+import TeachTask from '@/view/teachTask'
+import TeachTaskDetail from '@/view/teachTaskDetail'
 import Report from '@/view/report'
 import { resolve } from 'url';
 
@@ -59,9 +65,39 @@ export const routes = [
     path: '/teachSourceDetail',
     component: TeachSourceDetail
   },
+  {
+    name: 'teachSourceVideo',
+    path: '/teachSourceVideo',
+    component: TeachSourceVideo
+  },
+  {
+    name: 'teachPreclass',
+    path: '/teachPreclass',
+    component: TeachPreclass
+  },
+  {
+    name: 'teachPrelesson',
+    path: '/teachPrelesson',
+    component: TeachPrelesson
+  },
+  {
+    name: 'teachCheck',
+    path: '/teachCheck',
+    component: TeachCheck
+  },
+  {
+    name: 'teachTask',
+    path: '/teachTask',
+    component: TeachTask
+  },
+  {
+    name: 'teachTaskDetail',
+    path: '/teachTaskDetail',
+    component: TeachTaskDetail
+  },
   {
     name: 'report',
-    path: '/report',
+    path: '/Report',
     component: Report
   },
 ]

+ 40 - 32
TEAMModelOS.TeachZone/ClientApp/view/report.vue

@@ -1,17 +1,20 @@
 <template>
+
   <div class="report_container">
     <Header></Header>
     <Master></Master>
-    <div class="report_box bgf pad20">
+
+    <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>
+          <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 全市第一次联考</span></li>
+          <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">区级联考</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>
@@ -19,13 +22,13 @@
       </div>
       <div class="chooseexam">
         <div class="exam">
-          <span>考试选择:</span>
+          <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>
+          <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>
@@ -34,22 +37,23 @@
       <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 全市第一次联考</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>
+          <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="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>成绩分析趋势</p>
+        <p class="reportTit">成绩分析趋势</p>
         <div id="zhexian" style="width:100%; height:400px;"></div>
       </div>
       <div class="structure">
-        <p>知识点分数占比</p>
+        <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>
@@ -463,8 +467,9 @@
   .header_basic {
     width:100%;
     text-align:center;
-    border:1px solid #333;
+    border-bottom:1px solid #ddd;
     margin-top:5px;
+    padding:10px 0 20px
   }
     .header_basic ul {
       display:inline-block;
@@ -472,7 +477,7 @@
     }
       .header_basic ul li {
         padding:3px 4px 2px 4px;
-        margin-left:20px;
+        margin:0 15px;
       }
         .header_basic ul li i {
           float: left;
@@ -480,35 +485,34 @@
         }
   .name {
     font-size: 18px;
-    font-family: "微软雅黑";
-    
+
   }
   .name_content {
     font-size: 20px;
-    font-family: "微软雅黑";
-  
   }
   .vice-name, .vice-name_content {
-    font-size: 16px;
-    font-family: "微软雅黑";
+    font-size: 15px;color: #666;
   }
   .chooseexam {
     width:100%;
     height:auto;
-    padding-top:1%;
+    margin:60px 0 40px;
   }
   .exam {
     width:25%;
     float:left;
     padding-left:1%;
+    margin-right: 30px;
+
   }
   .summarize {
     width: 96%;
     margin: 2%;
-    border:1px solid #d3d3d3;
-    padding-bottom:10px;
-    padding-left:0.5%;
-    border-radius:8px;
+    /*border:1px solid #d3d3d3;*/
+    background: #f5f5f5;
+
+    padding:15px 20px 30px;
+    border-radius:5px;
   }
   .summarize_header_title {
     font-size:22px;
@@ -520,7 +524,7 @@
     margin:0 auto;
   }
     .summarize_content p {
-      padding-top:5px;
+     margin:10px 0;
     }
     .content_header {
       font-size: 16px;
@@ -548,12 +552,16 @@
     height: auto;
     padding: 1.5%;
   }
-    .trend p, .structure  p{
-      width: 100%;
-      font-size: 18px;
+    .reportTit{
+      font-size: 16px;
+      font-weight: bold;
+      margin:20px 0 10px;
     }
   .structure_details {
     width:100%;
-    padding:1%
+    padding:1%;
+    margin:20px 0;
+
   }
+
 </style>

File diff ditekan karena terlalu besar
+ 334 - 14
TEAMModelOS.TeachZone/ClientApp/view/teachCheck.vue


+ 11 - 34
TEAMModelOS.TeachZone/ClientApp/view/teachSource.vue

@@ -102,22 +102,10 @@
             collect:'5',
             download:'3'
           },
-          {
-            type:'word',
-            src:'teachSourceDetail',
-            title:'历史与社会.doc',
-            star:5,
-            size:'1.32MB',
-            source:'陆杰',
-            date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
-          },
           {
             type:'ppt',
             src:'teachSourcePpt',
-            title:'综合探究三——如何认识区域(以南非为例.ppt',
+            title:'综合探究三——如何认识区域(以南非为例.ppt',
             star:5,
             size:'1.32MB',
             source:'马平儿',
@@ -127,21 +115,21 @@
             download:'4'
           },
           {
-            type:'ppt',
-            src:'teachSourcePpt',
-            title:'带着地图去旅行(课件).ppt',
+            type:'video',
+            src:'teachSourceVideo',
+            title:'人教五上第五单元_列方程解决实际问题',
             star:4.5,
-            size:'1.32MB',
-            source:'陆杰',
-            date:'2019-04-08',
-            preview:'16',
+            size:'1.64MB',
+            source:'朱艳娜',
+            date:'2019-04-07',
+            preview:'10',
             collect:'5',
-            download:'4'
+            download:'3'
           },
           {
             type:'video',
             src:'teachSourceVideo',
-            title:'公开课4.2文化艺术之都:巴黎.doc',
+            title:'人教三上第四单元_三位数减三位',
             star:4.5,
             size:'1.64MB',
             source:'朱艳娜',
@@ -162,18 +150,7 @@
             collect:'5',
             download:'4'
           },
-          {
-            type:'word',
-            src:'teachSourceDetail',
-            title:'综合探究三——如何认识区域(以南非为例).doc',
-            star:5,
-            size:'1.32MB',
-            source:'马平儿',
-            date:'2019-04-08',
-            preview:'20',
-            collect:'5',
-            download:'4'
-          },
+
         ]
       }
     },

+ 11 - 36
TEAMModelOS.TeachZone/ClientApp/view/teachSourceDetail.vue

@@ -1,23 +1,15 @@
 <template>
   <div id="app">
     <Header></Header>
-    <div class="master wrap ov">
-      我的工作
-      <ul class="fr">
-        <li><a href="">教材资源</a></li>
-        <li><a href="">课前导学</a></li>
-        <li><a href="">同步备课</a></li>
-        <li><a href="">在线监测</a></li>
-        <li><a href="">课后作业</a></li>
-      </ul>
-    </div>
+    <WorkMaster></WorkMaster>
     <div class="wrap ov">
-      <div class="main fl">
+      <RecomLeft></RecomLeft>
+      <div class="main fr">
         <h4><a href="/">首页</a> > <a href="/">教材资源</a> > 详情</h4>
         <div class="content ov bgf pad20">
          <div class="sourceDetail">
            <div class="titleBox">
-             <h3> 2017年全国各地中考作文题汇总.doc</h3>
+             <h3 class="word"> 2017年全国各地中考作文题汇总.doc</h3>
              <ul class="info">
                <li>时间:2019-05-13</li>
                <li>大小:1.36MB</li>
@@ -36,10 +28,12 @@
              <h4>总体印象</h4>
              <ul>
                <li>内容充实</li>
-               <li>内容充实</li>
-               <li>内容充实</li>
-               <li>内容充实</li>
+               <li>简单易懂</li>
+               <li>原创精品</li>
+               <li>趣味性强</li>
+               <li>思路新颖</li>
                <li class="bad">质量一般</li>
+               <li class="bad">应用价值不高</li>
              </ul>
            </div>
            <div class="comment">
@@ -54,27 +48,6 @@
          </div>
         </div>
       </div>
-      <div class="sourceRecom bgf fr">
-        <h3>推荐资源 <span class="fr refresh">换一批</span></h3>
-        <ul>
-          <li>
-            <a href="">当我们的手中只剩下一片树叶.docx</a>
-            <p><Rate  allow-half  v-model="valueText"></Rate></p>
-          </li>
-          <li>
-            <a href="">当我们的手中只剩下一片树叶.docx</a>
-            <p><Rate  allow-half  v-model="valueText"></Rate></p>
-          </li>
-          <li>
-            <a href="">当我们的手中只剩下一片树叶.docx</a>
-            <p><Rate allow-half  v-model="valueText"></Rate></p>
-          </li>
-          <li>
-            <a href="">当我们的手中只剩下一片树叶.docx</a>
-            <p><Rate  allow-half  v-model="valueText"></Rate></p>
-          </li>
-        </ul>
-      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -82,6 +55,7 @@
 <script>
   import Header from '@/common/header.vue'
   import WorkMaster from '@/common/workMaster.vue'
+  import RecomLeft from '@/common/recomLeft.vue'
   import WorkLeft from '@/common/workLeft.vue'
   import Footer from '@/common/footer.vue'
   import ScoreList from '@/components/scoreList.vue'
@@ -89,6 +63,7 @@
     components: {
       Header,
       WorkMaster,
+      RecomLeft,
       WorkLeft,
       Footer,
       ScoreList

+ 101 - 0
TEAMModelOS.TeachZone/ClientApp/view/teachSourceVideo.vue

@@ -0,0 +1,101 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <WorkMaster></WorkMaster>
+    <div class="wrap ov">
+      <RecomLeft></RecomLeft>
+      <div class="main fr">
+        <h4><a href="/">首页</a> > <a href="/">教材资源</a> > 详情</h4>
+        <div class="content ov bgf pad20">
+         <div class="sourceDetail">
+           <div class="titleBox">
+             <h3 class="video"> 人教五上第五单元_列方程解决实际问题</h3>
+             <ul class="info">
+               <li>时间:2019-05-13</li>
+               <li>大小:1.36MB</li>
+               <li>引用:4次</li>
+               <li>播放:20次</li>
+               <li>来源:陆杰(平湖市福臻中学)</li>
+               <li>得分:<Rate allow-half disabled v-model="valueText">
+               </Rate></li>
+             </ul>
+           </div>
+           <div >
+             <video controls="controls" src="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" id="ckplayer_a1" width="937" height="480"></video>
+             <!--<iframe src="http://res.huijiaoyun.com:22021//data9/transform/2019/1/14/21/56/8b188019f7f1406694fbd52154840654/28870b8a84e5b7fe607419a194d09699.doc/html4/transform.html"></iframe>-->
+           </div>
+           <div class="comment">
+             <h4>总体印象</h4>
+             <ul>
+               <li>内容充实</li>
+               <li>简单易懂</li>
+               <li>原创精品</li>
+               <li>趣味性强</li>
+               <li>思路新颖</li>
+               <li class="bad">质量一般</li>
+               <li class="bad">应用价值不高</li>
+             </ul>
+           </div>
+           <div class="comment">
+             <h4>评论
+               <Rate show-text allow-half ></Rate></h4>
+             <Input  type="textarea" :rows="5" placeholder="请输入您的评论..." />
+             <div class="tr commentBtn">
+               <span>还能输入140个字</span>
+               <Button type="primary" size="large">提交</Button>
+             </div>
+           </div>
+         </div>
+        </div>
+      </div>
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/header.vue'
+  import WorkMaster from '@/common/workMaster.vue'
+  import RecomLeft from '@/common/recomLeft.vue'
+  import WorkLeft from '@/common/workLeft.vue'
+  import Footer from '@/common/footer.vue'
+  import ScoreList from '@/components/scoreList.vue'
+  export default {
+    components: {
+      Header,
+      WorkMaster,
+      RecomLeft,
+      WorkLeft,
+      Footer,
+      ScoreList
+    },
+    data () {
+      return {
+        valueText: 5,
+        modal1: false,
+        formItem: {
+          select: 'sel1',
+          select2: 'sel2',
+          input: '',
+          textarea: '',
+        },
+
+      }
+    },
+    methods: {
+      ok () {
+        this.$Message.info('发布成功');
+      },
+      // cancel () {
+      //   this.$Message.info('');
+      // }
+      yes () {
+        this.modal1 = false;
+        this.$Message.success('发布成功');
+      },
+      cancel () {
+        this.modal1 = false;
+      }
+    }
+    }
+</script>
+

+ 50 - 41
TEAMModelOS.TeachZone/ClientApp/view/teachTask.vue

@@ -6,7 +6,7 @@
       <!--<workLeft></workLeft>-->
       <RecomLeft></RecomLeft>
       <div class="main fr">
-        <h4 ><a href="/">首页</a> > 课前导学</h4>
+        <h4 ><a href="/">首页</a> > 课后作业</h4>
         <div class="content ov bgf pad20">
           <Screen></Screen>
           <Sort></Sort>
@@ -14,11 +14,14 @@
             <li :class="item.type">
               <div class="ov">
                 <h2 class="fl"><a :href="'/'+item.src">{{item.title}}</a></h2>
-                <p class="fr">
-                  <Rate show-text allow-half disabled v-model="item.star">
-                    <span>{{ item.star }}分</span>
-                  </Rate>
-                </p>
+                <!--<p class="fr">-->
+                <!--<Rate show-text allow-half disabled v-model="item.star">-->
+                <!--<span>{{ item.star }}分</span>-->
+                <!--</Rate>-->
+                <!--</p>-->
+                <div class="fr" style="width: 150px;">
+                  <Progress :percent="(item.done/item.all)*100"/>
+                </div>
               </div>
               <div class="ov">
                 <ol class="fl">
@@ -27,10 +30,13 @@
                   <li>时间:{{item.date}}</li>
                 </ol>
                 <ol class="fr woekOper">
-                  <li><a :href="'/'+item.src"><Icon type="md-eye"/> 预览({{item.preview}})</a></li>
-                  <li><a href=""><Icon type="ios-heart"/> 收藏({{item.collect}})</a></li>
-                  <li><a href=""><Icon type="md-download"/> 下载</a></li>
+                  <!--<li><a :href="'/'+item.src"><Icon type="md-eye"/> 预览({{item.preview}})</a></li>-->
+                  <!--<li><a href=""><Icon type="ios-heart"/> 收藏({{item.collect}})</a></li>-->
+                  <!--<li><a href=""><Icon type="md-download"/> 下载</a></li>-->
+                  <!--<li><a href=""><Icon type="md-person"/> 参与人数:0/38</a></li>-->
                 </ol>
+
+                <p class="fr"><a href=""><Icon type="md-person"/> 参与人数:{{item.done}}/{{item.all}}</a></p>
               </div>
             </li>
           </ul>
@@ -75,55 +81,58 @@
         },
         list:[
           {
-            type:'daoxue',
-            src:'teachSourceDetail',
-            title:'综合探究——从地图上获取信息-导学',
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第一单元——章节练习',
             star:5,
             size:'1.32MB',
             source:'陆杰',
-            date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
+            date:'2019-04-21',
+            percent:55,
+            all:100,
+            done:20,
           },
           {
-            type:'daoxue',
-            src:'teachSourceDetail',
-            title:'综合探究——从地图上获取信息-导学',
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第二单元——章节练习',
             star:5,
-            size:'1.32MB',
+            size:'1.12MB',
             source:'陆杰',
             date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
+            percent:55,
+            all:100,
+            done:50,
           },
           {
-            type:'daoxue',
-            src:'teachSourceDetail',
-            title:'综合探究——从地图上获取信息-导学',
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第三单元——章节练习',
             star:5,
-            size:'1.32MB',
+            size:'1.89MB',
             source:'陆杰',
-            date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
-          },{
-            type:'daoxue',
-            src:'teachSourceDetail',
-            title:'综合探究——从地图上获取信息-导学',
+            date:'2019-03-15',
+            percent:55,
+            all:100,
+            done:100,
+          },
+          {
+            type:'hunhe',
+            src:'teachTaskDetail',
+            title:'第四单元——章节练习',
             star:5,
-            size:'1.32MB',
+            size:'1.56MB',
             source:'陆杰',
-            date:'2019-04-08',
-            preview:'6',
-            collect:'5',
-            download:'4'
+            date:'2019-03-02',
+            percent:55,
+            all:100,
+            done:80,
           },
-
         ]
       }
+    },
+    creted(){
+
     },
     methods: {
       ok () {

File diff ditekan karena terlalu besar
+ 478 - 59
TEAMModelOS.TeachZone/ClientApp/view/teachTaskDetail.vue