Merge branch 'master-0726' into dev_master

src/components/Course/homework.vue

@@ -1,61 +1,61 @@
 <template>
- <div>
+  <div>
-   <div v-if="has" class="homework-div">
+    <div v-if="has" class="homework-div">
-     <div>
+      <div>
-       <div class="homework-title">作业名称</div>
+        <div class="homework-title">作业名称</div>
-       <div class="homework-content">{{info.name}}</div>
+        <div class="homework-content">{{info.name}}</div>
-     </div>
+      </div>
-     <div>
+      <div>
-       <div class="homework-title">内容</div>
+        <div class="homework-title">内容</div>
-       <div class="homework-content">{{info.content}}</div>
+        <div class="homework-content">{{info.content}}</div>
-     </div>
+      </div>
-     <div v-if="info.file">
+      <div v-if="info.file">
-       <div class="homework-title">附件</div>
+        <div class="homework-title">附件</div>
-       <div class="homework-content" style="color: blue">
+        <div class="homework-content" style="color: blue">
-           <a :href="fileBaseUrl+info.file" target="_blank">下载作业附件</a></div>
+          <a :href="fileBaseUrl+info.file" target="_blank">下载作业附件</a></div>
-     </div>
+      </div>
-     <div>
+      <div>
-       <div class="homework-title">截止时间</div>
+        <div class="homework-title">截止时间</div>
-       <div class="homework-content" :style="{color:close? 'red':''}">{{info.deadTime}}</div>
+        <div class="homework-content" :style="{color:close? 'red':''}">{{info.deadTime}}</div>
-     </div>
+      </div>
-     <div v-show="!close && showSubmit">
+      <div v-show="!close && showSubmit">
-       <div v-if="info.submitMode>1">
+        <div v-if="info.submitMode>1">
-         <div class="homework-title">作业内容</div>
+          <div class="homework-title">作业内容</div>
-         <div class="homework-content">
+          <div class="homework-content">
-           <el-input type="textarea" rows="5" show-word-limit maxlength="255" v-model="answer" placeholder="(限255个字)"></el-input>
+            <el-input type="textarea" rows="5" show-word-limit maxlength="255" v-model="answer" placeholder="(限255个字)"></el-input>
           </div>
-       </div>
+        </div>
-       <div v-if="info.submitMode==1 || info.submitMode==3">
+        <div v-if="info.submitMode==1 || info.submitMode==3">
-           <div class="homework-title">上传作业</div>
+          <div class="homework-title">上传作业</div>
-           <div class="homework-content">
+          <div class="homework-content">
-               <div v-if="filePath!=''">
+            <div v-if="filePath!=''">
-                 <el-tag closable type="success" @close="removeHomeworkFile">作业附件</el-tag><span style="margin-left: 10px;">请点击下面的提交</span>
+              <el-tag closable type="success" @close="removeHomeworkFile">作业附件</el-tag><span style="margin-left: 10px;">请点击下面的提交</span>
-               </div>
+            </div>
-               <div v-else >
+            <div v-else >
-                 <file-upload dir="files" :isShowTip="false" @success="uploadHomeworkFile" @remove="removeHomeworkFile"></file-upload>
+              <file-upload dir="files" :isShowTip="false" @success="uploadHomeworkFile" @remove="removeHomeworkFile"></file-upload>
-               </div>
+            </div>
-           </div>
+          </div>
-       </div>
+        </div>
-       <div style="text-align: center;padding-bottom: 10px;">
+        <div style="text-align: center;padding-bottom: 10px;">
-           <el-button type="primary" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
+          <el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
-       </div>
+        </div>
-     </div>
+      </div>
-     <div v-show="showRecord"><!--作业提交记录-->
+      <div v-show="showRecord"><!--作业提交记录-->
-      <el-table :data="records" style="width: 100%" border>
+        <el-table :data="records" style="width: 100%" border>
-         <el-table-column prop="endTime" label="提交时间" width="100" align="center"></el-table-column>
+          <el-table-column prop="endTime" label="提交时间" width="100" align="center"></el-table-column>
-         <el-table-column  label="内容">
+          <el-table-column  label="内容">
-           <template slot-scope="scope">
+            <template slot-scope="scope">
-             <div>{{scope.row.hwAnswer}}</div>
+              <div>{{scope.row.hwAnswer}}</div>
-             <div style="padding-top: 5px;" v-if="scope.row.filePath!=''">
+              <div style="padding-top: 5px;" v-if="scope.row.filePath!=''">
-               <a :href="fileBaseUrl+scope.row.filePath" target="_blank">下载上传的作业文件</a>
+                <a :href="fileBaseUrl+scope.row.filePath" target="_blank">下载上传的作业文件</a>
-             </div>
+              </div>
-           </template>
+            </template>
-         </el-table-column>
+          </el-table-column>
-       </el-table>
+        </el-table>
-     </div>
+      </div>
-   </div>
+    </div>
-   <div v-else style="text-align: center;padding-top: 20px;color: red;">此课程无作业</div>
+    <div v-else style="text-align: center;padding-top: 20px;color: red;">此课程无作业</div>
- </div>
+  </div>
 </template>
 
 <script>
@@ -65,21 +65,21 @@ import FileUpload from '@/components/FileUpload/index.vue';
 export default {
   components: { FileUpload },
   props:{
-      studyId: {
+    studyId: {
-        type: String,
+      type: String,
-      },
+    },
-      showRecord:{
+    showRecord:{
-        type:Boolean,
+      type:Boolean,
-        default:true
+      default:true
-      },
+    },
-      showSubmit:{
+    showSubmit:{
-        type:Boolean,
+      type:Boolean,
-        default:true
+      default:true
-      },
+    },
-      content: {
+    content: {
-        type: Object,
+      type: Object,
-        default:()=>{}
+      default:()=>{}
-      }
+    }
   },
   data() {
     return {
@@ -87,10 +87,12 @@ export default {
       has:true,
       info:{},
       studyItemId:'',
+      studyItemIdOnce: '',
       filePath:'',
       answer:'',
       close:false,
       records:[],//作业记录
+      isSubmit:false,
     };
   },
   mounted() {
@@ -104,26 +106,26 @@ export default {
   methods: {
     loadHomeworkInfo(){
       apiCourse.getHomework(this.content.id).then(res=>{
-         if(res.status==200){
+        if(res.status==200){
-             this.info=res.result;
+          this.info=res.result;
-             //检查是否过期
+          //检查是否过期
-            if(res.result.deadTime!=''){
+          if(res.result.deadTime!=''){
-               var d = new Date(res.result.deadTime);
+            var d = new Date(res.result.deadTime);
-               var now=new Date();
+            var now=new Date();
-               if(now.getTime() > d.getTime()){
+            if(now.getTime() > d.getTime()){
-                  this.close=true;
+              this.close=true;
-               } else {
+            } else {
-                  this.close=false;
+              this.close=false;
-               }
             }
-             if(!this.showTest && this.showRecord){
+          }
-               this.loadRecord();
+          if(!this.showTest && this.showRecord){
-             }
+            this.loadRecord();
-         }else if(res.status==404){
+          }
-            //没有找到作业信息
+        }else if(res.status==404){
-         }else{
+          //没有找到作业信息
-           this.$message.error(res.message);
+        }else{
-         }
+          this.$message.error(res.message);
+        }
       });
       //
     },
@@ -134,7 +136,11 @@ export default {
       }
       apiCourseStudy.myHomeworkList(params).then(rs=>{
         if(rs.status==200){
+          this.studyItemId = ''
           this.records=rs.result;
+          if(rs.result.length>0){
+            this.studyItemIdOnce = rs.result[rs.result.length - 1].id;
+          }
         }
       })
     },
@@ -143,15 +149,15 @@ export default {
       this.filePath = res.result.filePath;
     },
     removeHomeworkFile(){
-       this.$confirm('您确定要删除已上传的附件吗？', '提示', {
+      this.$confirm('您确定要删除已上传的附件吗？', '提示', {
-                confirmButtonText: '确定',
+        confirmButtonText: '确定',
-                cancelButtonText: '取消',
+        cancelButtonText: '取消',
-                type: 'warning'
+        type: 'warning'
-              }).then(() => {
+      }).then(() => {
-                this.filePath='';
+        this.filePath='';
-                //从服务器端删除
+        //从服务器端删除
-                this.$message({ type: 'success',  message: '删除成功!' });
+        this.$message({ type: 'success',  message: '删除成功!' });
-              })
+      })
 
     },
     submitHomework() {//提交作业
@@ -171,9 +177,9 @@ export default {
           return;
         }
       }
-
+      this.isSubmit = true
       let pamars = {
-        studyItemId: this.studyItemId,//学习内容记录id,
+        studyItemId: this.studyItemId || this.studyItemIdOnce,//学习内容记录id,
         studyId: this.studyId,//学习id,
         courseId: this.content.courseId,//课程id,
         contentId: this.content.id,//内容id,
@@ -185,16 +191,17 @@ export default {
         score: 0
       }
       apiCourseStudy.saveHomework(pamars).then(res=>{
-         if(res.status==200){
+        this.isSubmit = false
-            this.$message.success("作业已提交");
+        if(res.status==200){
-            this.filePath='';
+          this.$message.success("作业已提交");
-            this.answer='';
+          this.filePath='';
-            this.studyItemId=res.result.id;
+          this.answer='';
-            this.records=[res.result];
+          this.studyItemId=res.result.id;
-            this.$emit("submit", this.content);
+          this.records=[res.result];
-         }else {
+          this.$emit("submit", this.content);
-            this.$message.error(res.message);
+        }else {
-         }
+          this.$message.error(res.message);
+        }
 
       })
     },
@@ -203,27 +210,27 @@ export default {
 </script>
 
 <style scoped lang="scss">
-  .homework-div {
+.homework-div {
-    border: 1px solid #dadada;
+  border: 1px solid #dadada;
-    min-height: 500px;
+  min-height: 500px;
-    padding: 20px;
+  padding: 20px;
-    font-size: 14px;
+  font-size: 14px;
-    display: flex;
+  display: flex;
-    flex-direction: column;
+  flex-direction: column;
-    align-items: flex-start;
+  align-items: flex-start;
-    >div{
+  >div{
-      width: 100%;
+    width: 100%;
-      text-align: left;
+    text-align: left;
-      .homework-title {
+    .homework-title {
-        margin-bottom: 10px;
+      margin-bottom: 10px;
-        font-weight: 600;
+      font-weight: 600;
-      }
+    }
-      .homework-content {
+    .homework-content {
-        color: #666;
+      color: #666;
-        margin-bottom: 10px;
+      margin-bottom: 10px;
-        width: 100%;
+      width: 100%;
-      }
     }
-
   }
+
+}
 </style>

src/components/Course/weikeContent.vue

@@ -1049,6 +1049,7 @@
              this.cwareChange.curriculumData = deepClone(this.cware.curriculumData)
           }
         }else if(index==2){
+          this.homework.content.contentName = this.homework.info.name || '作业'
           postData.content=this.homework.content;
           postData.homework=this.homework.info;
           this.homeworkChange = deepClone(this.homework)
@@ -1087,9 +1088,11 @@
             this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
           }
           postData.exam=this.exam.info;
+          postData.content.contentName='考试';
           this.examChange = deepClone(this.exam);
         }else if(index==4){
           this.assess.content.content=JSON.stringify(this.assess.json);
+          this.assess.content.contentName='评估';
           postData.content=this.assess.content;
         }
 

src/components/PdfPreview/index.vue

@@ -6,7 +6,7 @@
       <span v-else style="margin:0 10px;">{{ currentPage }} / {{ pageCount }}</span>
       <el-button @click="nextPage('header')" :disabled="loadedRatio !== 1" icon="el-icon-arrow-right"></el-button>
     </div>
-    <div class="pdf-box">
+    <div class="pdf-box" style="max-height: 725px;">
       <transition name="progress"> 
         <el-progress v-if="showProgress" :percentage="Math.floor(loadedRatio * 100)" :text-inside="true" :show-text="false"></el-progress>
       </transition>

src/components/PortalHeader.vue

@@ -36,7 +36,8 @@
               <el-dropdown placement="bottom" @command="handleCommand">
                 <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">专区</span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="one">BOE系列公开课</el-dropdown-item>
+                  <el-dropdown-item command="zero">热点论坛</el-dropdown-item>
+                  <el-dropdown-item command="one" divided>BOE系列公开课</el-dropdown-item>
                   <el-dropdown-item command="two" divided>Grow180</el-dropdown-item>
                   <el-dropdown-item command="three" divided>管理者进阶</el-dropdown-item>
                   <el-dropdown-item command="four" divided>U选小课堂</el-dropdown-item>
@@ -256,6 +257,7 @@ export default {
         let urlPre = window.location.protocol + "//" + window.location.host;
         // process.env.VUE_APP_BOE_WEB_URL
         let obj = {
+          zero: urlPre + "/pc/hotforum",
           one: urlPre + "/web/teacherLesson",
           two: urlPre + "/grow180/login",
           three: this.webBaseUrl + "/study/index?study=1",

src/components/Study/manager.vue

@@ -95,9 +95,9 @@
             <el-col :offset="12" :span="4">
               <div class="grid-content bg-purple">
                 <el-select v-model="learningRecords.status" clearable placeholder="状态">
-                  <el-option label="已完成" :value="9"></el-option>
                   <el-option label="未开始" :value="1"></el-option>
-                  <el-option label="进行中" :value="8"></el-option>
+                  <el-option label="进行中" :value="2"></el-option>
+                  <el-option label="已完成" :value="9"></el-option>
                 </el-select>
               </div>
             </el-col>
@@ -285,12 +285,12 @@
         <el-form-item label="状态:">
           <el-select v-model="learningSituation.status" clearable placeholder="状态">
             <el-option label="未开始" :value="1"></el-option>
-            <el-option label="已开始" :value="2"></el-option>
             <el-option label="进行中" :value="3"></el-option>
+            <el-option label="已完成" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="studyContentRecords">搜索</el-button>
+          <el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
         </el-form-item>
       </el-form>
       <el-table max-height="500" border :data="learningSituation.list" style="width: 100%">
@@ -344,6 +344,10 @@ export default {
     manageStudyData: {
       type: Object,
       default: () => ({})
+    },
+    isShowDialog:{
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -372,7 +376,9 @@ export default {
         pageSize: 10, // 每页多少条
         count: 0,
         type: "",
-        list: []
+        list: [],
+        name: '',
+        status: '',
       },
       learningRecords: {
         pageIndex: 1, //第几页
@@ -409,6 +415,21 @@ export default {
         this.getDetail();
       }
      }
+    },
+    'study.catalogueShow'(val){
+      if(!val){
+        this.learningSituation.status = null
+        this.learningSituation.name = ''
+      }
+    },
+    isShowDialog(val){
+      if(!val){
+        this.signup.status = null
+        this.signup.name = ''
+        this.learningRecords.status = null
+        this.learningRecords.name = ''
+        this.value = ''
+      }
     }
   },
   mounted() {
@@ -480,6 +501,10 @@ export default {
         }
       });
     },
+    studyContentRecordsSearch(){
+      this.learningSituation.pageIndex = 1;
+      this.studyContentRecords()
+    },
     // 资源里的学习详情
     studyContentRecords() {
       let params = {
@@ -700,7 +725,7 @@ export default {
       if(type=='考试'){
         this.typePress = true
       }else{
-        this.typePress = false
+        this.typePress = true
       }
       this.contentId = row.id;
       this.study.catalogueShow = true;

src/router/index.js

@@ -320,6 +320,13 @@ export const constantRoutes = [{
     name: 'videotest',
     meta: {title: '课程视频测试', icon: 'dashboard', noCache: true, affix: true},
   },
+  {
+    path: '/hotforum',
+    hidden: true,
+    component: (resolve) => require(['@/views/hotforum/Index'], resolve),
+    name: 'hotforum',
+    meta: {title: '热点论坛', icon: 'dashboard', noCache: true, affix: true},
+  },
   {
     path: '/404',
     component: (resolve) => require(['@/views/error/404'], resolve),

src/views/course/ManageList.vue

@@ -196,7 +196,7 @@
     </el-dialog>
     <!--课程管理-->
     <el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
-      <manager :manageStudyData="manageStudyData"></manager>
+      <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
       <template #footer>
         <el-button @click="manageStudy.dlgShow = false">关闭</el-button>
       </template>

src/views/hotforum/Index.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="hot">
+    <div>
+      <div class="center">
+        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
+          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
+        </div>
+      </div>
+      <div style="display: flex;justify-content: center;margin-bottom: 52px;">
+        <img src="../../assets/images/hotforum/foot.png" alt="">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "hotforum",
+    data() {
+      return {
+        imgData:[
+          {img:'01',url:'1265897142383042560'},
+          {img:'02',url:'1265697724606210048'},
+          {img:'03',url:''},
+          {img:'4',url:''},
+        ],
+      }
+    },
+    methods: {
+      goLearn(item){
+        if(item){
+          // this.$router.push({path:'/course/detail',query:{id:item}})
+          window.open(`https://u.boe.com/pc/course/detail?id=${item}`)
+        }
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center{
+    max-width: 1270px;
+    max-height: 700px;
+    margin-bottom: 5%;
+    margin-top: 22%;
+    display: flex;
+    flex-wrap: wrap;
+    .item{
+      width: 610px;
+      height: 330px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 31px;
+      margin-bottom: 59px;
+      cursor: pointer;
+      .img{
+        width: 581px;
+        height: 283px;
+      }
+    }
+  }
+  /* 当窗口宽度大于3068px时的样式 */
+}
+@media (min-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 2560px;
+    max-height: 1300px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 1220px;
+      height: 660px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 62px;
+      margin-bottom: 59px;
+      
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-height: 1500px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1068px;
+    max-height: 580px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 500px;
+      height: 271px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 26px;
+      margin-bottom: 30px;
+      
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-width: 1928px) and (max-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1800px;
+    max-height: 1100px;
+    margin-bottom: 5%;
+    margin-top: 35vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 860px;
+      height: 466px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 48px;
+      margin-bottom: 70px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+</style>

src/views/study/coursenew.vue

@@ -369,6 +369,7 @@
     },
     data() {
       return {
+        tentative: false,
         isContentTypeTwo: null,
         isContentType: null,
         activeId: '',
@@ -658,7 +659,7 @@
       },
       //替换播放区域
       changePlayRes(r,item){
-
+        this.tentative = false;
         if(this.appendStudyOtherHandle!=null){
           window.clearTimeout(this.appendStudyOtherHandle);
         }
@@ -1454,6 +1455,7 @@
         });
       },
       saveStudyInfo() {
+        this.tentative = true
         if(this.isContentType){
           if(this.isContentType != this.contentData.contentType){
             //定时器产生的，不记录
@@ -1647,7 +1649,7 @@
       finishStudyItem() { //设置完成学习的内容,针对于音视频的内容
         if (!this.contentData.studyItemId) {
           //这种可能没有，不过这里也是为了万中那个1
-          this.saveStudyInfo();
+          !this.tentative && this.saveStudyInfo();
         } else {
           let params = {
             itemId: this.contentData.studyItemId,