Merge branch 'master' into dev

src/components/Course/auditCourse1.vue

@@ -179,9 +179,9 @@
               </div>
               <div v-if="coursewareInfo.content.contentType == 52">
                 <div v-if="coursewareInfo.content.content!=''">
-                   <!-- <hyper-link :content="coursewareInfo.content"></hyper-link> -->
+                  <!-- <hyper-link :content="coursewareInfo.content"></hyper-link> -->
-                    <!-- <iframe :src="coursewareInfo.content.content" style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe> -->
+                  <!-- <iframe :src="coursewareInfo.content.content" style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe> -->
-                  </div>
+                </div>
               </div>
       </el-tab-pane>
       <el-tab-pane v-if="homeworkInfo.id" label="作业" name="homework">
@@ -623,21 +623,18 @@ export default {
                 }
               }
               if($this.coursewareInfo.content.contentType == 40) {
-                //console.log(con.content,'con.content');
-                // if(con.content != '' && con.content.indexOf('.pdf') > -1) {
-                //     $this.coursewareInfo.content.content = con.content;
-                // }else {
                    apiCourseFile.detail(con.contentRefId).then(cfrs => {
                        if (cfrs.status == 200) {
                          $this.coursewareInfo.content.content = cfrs.result.previewFilePath;
                          $this.curCFile=cfrs.result;
                          $this.converStatus = cfrs.result.converStatus;
-
+                        //以下是为了兼容老数据
                         if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('.pdf') > -1) {
                            $this.coursewareInfo.content.content = cfrs.result.filePath;
                         }
+                        //设置状态值
                         if($this.coursewareInfo.content.content && $this.coursewareInfo.content.content.indexOf('.pdf') > -1){
-                            if(cfrs.result.converStatus || cfrs.result.converStatus<2){
+                            if(!cfrs.result.converStatus || cfrs.result.converStatus<2){
                                $this.converStatus=2;//转化完成
                             }
                         }
@@ -645,7 +642,6 @@ export default {
                          $this.$message.error('加载pdf课件文件失败');
                        }
                    });
-                // }
               }
             } else if (con.sortIndex == 2) {
               $this.homeworkInfo = con;

src/components/Course/auditCourse2.vue

@@ -679,30 +679,28 @@ export default {
             this.curriculumData.url = r.content
       }
       } else if(r.contentType == 40) {
-        this.contentData.content="";
+          this.contentData.content="";
-        // if (r.content != '' && r.content.indexOf('.pdf') > -1) {
-        //   // this.contentData.content = cfrs.result.previewFilePath;
-        // }else{
           apiCourseFile.detail(r.contentRefId).then(cfrs => {
             if (cfrs.status == 200) {
+              this.curCFile=cfrs.result;
               this.contentData.content = cfrs.result.previewFilePath;
               this.converStatus = cfrs.result.converStatus;
-              this.curCFile=cfrs.result;
+              //下面是为了兼容老数据
               if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) {
                 this.contentData.content = cfrs.result.filePath;
               }
+              //设置状态
               if(this.contentData.content && this.contentData.content.indexOf('pdf') > -1){
-                 if(this.converStatus || this.converStatus<2){
+                 if(!this.converStatus || this.converStatus<2){
-                   this.converStatus=2;
+                    this.converStatus=2;
                  }
               }
               //console.log(r.content);
             }else {
-              this.contentData.content="";
               this.$message.error('加载pdf课件文件失败');
             }
           });
-        // }
+
       }
       this.type = 0;
     },

src/components/Course/collectItem.vue

@@ -139,8 +139,9 @@ export default {
 <style lang="scss" scoped>
 .one-line-ellipsis{
   display: -webkit-box;
+
   white-space:pre-wrap;
-  // word-wrap: break-word;
+  word-wrap: break-word;
   word-break:break-all;
   overflow: hidden;
   text-overflow:ellipsis;

src/layout/components/TopNav/Index.vue

@@ -156,12 +156,21 @@ export default {
        this.signInShow=false;
     },
     handleCommand(val) {
+      // let obj = {
+      //   one: process.env.VUE_APP_BOE_WEB_URL+'/web/teacherLesson',
+      //   two: process.env.VUE_APP_BOE_WEB_URL+'/grow180/login',
+      //   three: this.webBaseUrl + '/study/index',
+      //   four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
+      //   five: process.env.VUE_APP_BOE_WEB_URL+'/boe/new-employee/index.html'
+      // };
+      let urlPre=window.location.protocol+'//'+window.location.host;
+      // process.env.VUE_APP_BOE_WEB_URL
       let obj = {
-        one: process.env.VUE_APP_BOE_WEB_URL+'/web/teacherLesson',
+        one: urlPre+'/web/teacherLesson',
-        two: process.env.VUE_APP_BOE_WEB_URL+'/grow180/login',
+        two: urlPre+'/grow180/login',
-        three: this.webBaseUrl + '/study/index',
+        three: this.webBaseUrl + '/study/index?study=1',
         four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
-        five: process.env.VUE_APP_BOE_WEB_URL+'/boe/new-employee/index.html'
+        five: urlPre+'/boe/new-employee/index.html'
       };
       window.open(obj[val]);
     },

src/utils/caseShow.js

@@ -1,5 +1,6 @@
 /**页面设置的一些常量*/
 const caseUser={
+    '12345601': '测试',
     '00004409': '李玉冰',
     '101215': '徐涛',
     '00005011': '邱炜玮',