Merge branch 'dev' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into dev

src/App.vue

@@ -31,5 +31,10 @@
   .u-page{
     padding: 10px;
   }
-
+.text-tooltip{
+    background: #efeff1 !important;
+    border: 1px solid #e7e7e7 !important;
+    box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3);
+}
 </style>
+

src/components/Course/auditCourse1.vue

@@ -58,7 +58,10 @@
             <el-form-item label="名称" required><el-input maxlength="100" v-model="courseInfo.name" placeholder="课程名称(限100字以内)"></el-input></el-form-item>
             <el-form-item label="封面图片" required >
               <el-col :span="8">
-                <imageUpload :value="courseCoverurl" width="160px" height="90px" @success="uploadCoverImgSuccess" @remove="removeCoverImgSuccess"></imageUpload>
+                <div @click.stop="chooseFile">
+                <imageUpload :disabled="true" :value="courseCoverurl" width="160px" height="90px" @success="uploadCoverImgSuccess" @subimage="acceptimage"  @remove="removeCoverImgSuccess"></imageUpload>
+                  
+                </div>
                 <div>上传为16:9(如:800*450)的png或jpg图片</div>
               </el-col>
               <el-col :span="16">
@@ -212,6 +215,8 @@
         </div>
       </el-tab-pane>
     </el-tabs>
+    <filecloud :show="dlgFileChoose.show" @choose="changeCourseImage" @close="choseChoose"></filecloud>
+
   </div>
 </template>
 
@@ -237,6 +242,7 @@ import apiTag from "../../api/modules/tag.js";
 import videoPlayer from "@/components/VideoPlayer/index.vue";
 import audioPlayer from "@/components/AudioPlayer/index.vue";
 import apiCourseFile from '@/api/modules/courseFile.js';
+import filecloud from '@/components/FileCloud/index.vue';
 import { mapGetters, mapActions } from "vuex";
 // import hyperLink from '@/components/Course/hyperLink.vue';
 export default {
@@ -246,6 +252,7 @@ export default {
     catalogCourseware,
     imageUpload,
     exam,
+    filecloud,
     homework,
     assess,
     WxEditor,
@@ -279,6 +286,9 @@ export default {
   },
   data() {
     return {
+       dlgFileChoose:{
+        show:false
+      },
       converStatus:4,
       courseType: courseType,
       isEdit: true,
@@ -350,6 +360,26 @@ export default {
     });
   },
   methods: {
+
+    chooseFile(){
+      this.dlgFileChoose.show=true;
+    },
+     choseChoose(){
+      this.dlgFileChoose.show=false;
+    },
+   changeCourseImage(img){
+      if(!img.path){
+        return;
+      }
+      //console.log(img);
+      this.dlgFileChoose.show=false;
+      this.courseInfo.coverImg = img.path;
+      this.courseCoverurl = this.fileUrl+img.path;
+    },
+    acceptimage(value){
+      this.courseInfo.coverImg = value.path;
+      this.courseCoverurl = value.path;
+    },
     ...mapActions({
       getResOwnerTree: "resOwner/getResOwnerTree",
       loadResOwners: "resOwner/loadResOwners",

src/components/Course/auditCourse2.vue

@@ -73,7 +73,10 @@
             <!--不显示，因为标题已经代表了 <el-form-item label="授课方式">{{courseTypeMap(params.type)}}</el-form-item>-->
             <el-form-item label="封面图片" required >
               <el-col :span="8">
-                <imageUpload :value="courseCoverurl" width="160px" height="90px" @success="uploadCoverImgSuccess" @remove="removeCoverImgSuccess"></imageUpload>
+                <div @click.stop="chooseFile">
+                <imageUpload :disabled="true" :value="courseCoverurl" width="160px" height="90px" @subimage="acceptimage"   @success="uploadCoverImgSuccess" @remove="removeCoverImgSuccess"></imageUpload>
+                   
+                </div>
                 <div>上传为16:9(如:800*450)的png或jpg图片</div>
               </el-col>
               <el-col :span="16">
@@ -250,6 +253,8 @@
                 </div>
       </el-col>
     </el-row>
+    <filecloud :show="dlgFileChoose.show" @choose="changeCourseImage" @close="choseChoose"></filecloud>
+
   </div>
 </template>
 
@@ -277,6 +282,7 @@ import audioPlayer from '@/components/AudioPlayer/index.vue';
 import { mapGetters,mapActions} from 'vuex';
 import hyperLink from '@/components/Course/hyperLink.vue';
 import apiCourseFile from '../../api/modules/courseFile.js';
+import filecloud from '@/components/FileCloud/index.vue';
 export default {
   name:"auditCourse2",
   components: {
@@ -284,6 +290,7 @@ export default {
     catalogCourseware,
     imageUpload,
     exam,
+    filecloud,
     homework,
     assess,
     WxEditor,
@@ -315,6 +322,9 @@ export default {
     },
   data() {
     return {
+      dlgFileChoose:{
+        show:false
+      },
       converStatus:4,
       curriculumData:{
          url:'',
@@ -391,6 +401,26 @@ export default {
     })
   },
   methods: {
+
+ chooseFile(){
+      this.dlgFileChoose.show=true;
+    },
+     choseChoose(){
+      this.dlgFileChoose.show=false;
+    },
+   changeCourseImage(img){
+      if(!img.path){
+        return;
+      }
+      //console.log(img);
+      this.dlgFileChoose.show=false;
+      this.courseInfo.coverImg = img.path;
+      this.courseCoverurl = this.fileUrl+img.path;
+    },
+    acceptimage(value){
+      this.courseInfo.coverImg = value.path;
+      this.courseCoverurl = value.path;
+    },
     ...mapActions({
       getResOwnerTree:'resOwner/getResOwnerTree',
       loadResOwners:'resOwner/loadResOwners',

src/components/Course/courseForm.vue

@@ -53,7 +53,7 @@
             </div>
             <el-form-item label="名称" required><el-input maxlength="90" v-model="courseInfo.name" show-word-limit placeholder="课程名称(限90字以内)"></el-input></el-form-item>
             <el-form-item label="封面图片" v-show="!weike.onlyRequired">
-              <!-- 上传封面图 -->
+              <!-- 上传封面图-->
               <div style="display:flex">
                 <div @click.stop="chooseFile">
                   <!-- <image :src="courseCoverurl" style="width:160px;height:90px" width="160px" height="90px"></image> -->

src/components/FileCloud/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="min-width: 700px;">
-    <el-dialog title="选择图片" :close-on-click-modal="false"  :visible.sync="show" width="60%" @close="chose"  :modal="false" custom-class="g-dialog">
+    <el-dialog title="选择图片" :close-on-click-modal="false"  :visible.sync="show" width="60%" :show-close="false"  :modal="false" custom-class="g-dialog">
         <div style="margin: -10px;">
           <div style="display: flex;justify-content: space-between;padding: 5px;border-bottom: 1px solid #e0e0e0;">
             <div style="padding-top: 10px;">
@@ -36,6 +36,8 @@
         </div>
         <div slot="footer" class="dialog-footer">
           <el-button :disabled="btnDisabled" type="primary" @click="saveChoose()">确认</el-button>
+          <el-button  @click="chose()">取消</el-button>
+
         </div>
     </el-dialog>
   </div>

src/components/PdfPreview/view.vue

@@ -149,12 +149,6 @@ export default {
       let outerHeight = document.documentElement.clientHeight
       let scrollTop = document.documentElement.scrollTop
       let $this=this;
-      if(this.isscroll){
-        this.showPages++
-        this.moreState = 2;
-          // this.debounce(this.loadInitPdf($this.filePath),5000);
-          //  this.debounce(,200000);
-      }
       if(this.pdfpage >= this.totalPages){
         this.isscroll = false;
         this.moreState = 3;
@@ -163,6 +157,13 @@ export default {
         this.isscroll = false;
         this.moreState = 3;
       }
+      if(this.isscroll){
+        this.showPages++
+        this.moreState = 2;
+          // this.debounce(this.loadInitPdf($this.filePath),5000);
+          //  this.debounce(,200000);
+      }
+
         //  if(scrollTop > 400) {
         //   document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px";
         // } else {

src/components/UcHeader/Index.vue

@@ -23,9 +23,9 @@
             <span>学习时长：{{userInfo.studyTotalH}}小时</span>
           </div>
           <div>
-            <span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)"><router-link to="/study/index">学员</router-link></span>
+            <router-link to="/study/index"><span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)">学员</span></router-link>
-            <span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)"><router-link to="/teacher/index">教师</router-link></span>
+            <router-link to="/teacher/index"><span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)">教师</span></router-link>
-            <span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)"><router-link to="/manager/index">管理员</router-link></span>
+            <router-link to="/manager/index"><span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span></router-link>
           </div>
         </div>
       </div>

src/views/Index.vue

@@ -460,7 +460,7 @@ export default {
         orderField: 'id'
       };
       if (this.caseList.orderType == 2) {
-        params.orderField = 'praises';
+        params.orderField = 'comments';
       }
       apiCase.indexList(params).then(res => {
         if (res.status == 200) {

src/views/course/Courseware.vue

@@ -359,7 +359,6 @@ export default {
     search(){
      this.params.pageIndex = 1;
 	    this.getSearch();
-
     },
     reset() {
       this.params.self = null;
@@ -432,6 +431,7 @@ export default {
         if (status === 200) {
           this.$message.success('保存成功');
           this.editCoursewareShow = false;
+          this.getSearch();
         } else {
           this.$message.error(message);
         }

src/views/portal/article/Detail.vue

@@ -8,7 +8,7 @@
       </el-breadcrumb>
       <div class="xrow" style="display: flex;justify-content: space-between;">
          <div style="flex: 1;" class="xcol content-div">
-          <el-row >
+          <el-row  v-if="noData" >
           <div>
               <!-- <div v-else>我四娘娘</div> -->
               <!-- <el-card :body-style="{ padding: '0px',background: '#f6f7fb' }" class="detail"> -->
@@ -50,6 +50,9 @@
             <comments v-if="articleId!=''" @success="success" :obj-type="2" :obj-id="articleId" :toUsers="toUsers" :authorId="articleDetailData.sysCreateAid"></comments>
           </div>
           </el-row>
+          <div v-else>
+            <el-empty :image-size="200"></el-empty>
+          </div>
          </div>
          <div style="width: 245px;margin-left: 5px;">
 
@@ -87,6 +90,7 @@
    
      
      
+
       <!--以下是评论信息-->
 
     </div>
@@ -127,6 +131,7 @@ export default {
   },
   data() {
     return {
+      noData:true,
       shareInfo:{
         name:'',
         load:false,
@@ -142,7 +147,6 @@ export default {
         orgInfo:'',
         code:'',
         sex:null,
-
       },
       ankingList: [],
       diagSync:false,//控制弹窗
@@ -208,8 +212,10 @@ export default {
           this.articleDetailData=res.result;
           //if(this.articleDetailData.toString()!='{}'){
             this.getAuthorInfo(this.articleDetailData)
-
           //}
+        }else{
+          this.noData = false;
+          this.$message.error(res.message);
         }
       }).catch(err=>{
         this.$message.error("获取数据失败")

src/views/portal/case/Detail.vue

@@ -6,9 +6,9 @@
         <el-breadcrumb-item :to="{ path: '/case' }">案例列表</el-breadcrumb-item>
         <el-breadcrumb-item>案例详情</el-breadcrumb-item>
       </el-breadcrumb>
-       <div class="xrow" style="display: flex;justify-content: space-between;">
+       <div class="xrow" style="display: flex;justify-content: space-between;" >
           <div style="flex: 1;" class="xcol content-div" id="content-div">
-      <el-row :gutter="10">
+            <el-row :gutter="10" v-if="noData">
               <el-col :span="24">
                 <el-card :body-style="{ padding: '0px' }" class="detail">
                   <div class="title">{{ caseDetail.title }}</div>
@@ -75,6 +75,9 @@
                 </div>
               </el-col>
             </el-row>
+            <div v-else>
+              <el-empty :image-size="200"></el-empty>
+            </div>
           </div>
           <div style="width: 245px;margin-left: 5px;" :class="zoomShow?'':'fixd-box-show'">
         <div>
@@ -95,7 +98,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false"  effect="light" :content="item.sysCreateUname" placement="top-start">
+                  <el-tooltip :enterable="false"  effect="light" :content="item.sysCreateUname" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
                         <el-col :span="15"  class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -119,7 +122,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
                         <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -143,7 +146,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
                         <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -184,6 +187,7 @@ export default {
   },
   data() {
     return {
+      noData:true,
       zoomShow:true,
       isTopBoxShow:true,
       toUsers:[],
@@ -363,6 +367,7 @@ export default {
 
           }
         }else{
+          this.noData=false;
           this.$message.error(res.message)
         }
       });

src/views/portal/case/Index.vue

@@ -147,7 +147,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false"  effect="light" :content="item.sysCreateUname" placement="top-start">
+                  <el-tooltip :enterable="false"  effect="light" :content="item.sysCreateUname" :visible-arrow="false" popper-class="text-tooltip" placement="bottom">
                         <el-col :span="15"  class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -171,7 +171,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
                         <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -195,7 +195,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
                         <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -642,13 +642,6 @@ export default {
         }
       });
     },
-    getAnkingData() {
-      apiCase.usernameList(10).then(res => {
-        if (res.status == 200) {
-          this.ankingList = res.result;
-        }
-      });
-    },
     getPopularity() {
       apiCase.queryPraises(5).then(res => {
         if (res.status == 200) {

src/views/portal/course/Index.vue

@@ -217,7 +217,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="top-start">
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
                         <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
@@ -241,7 +241,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="top-start">
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
                         <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" :span="5">{{ item.studys }}</el-col> -->
@@ -266,7 +266,7 @@
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
-                  <el-tooltip :enterable="false" @click.native="jumpRouter2(item)" effect="light" :content="item.courseName" placement="top-start">
+                  <el-tooltip :enterable="false" @click.native="jumpRouter2(item)" effect="light" :content="item.courseName" placement="bottom" :visible-arrow="false" popper-class="text-tooltip">
                         <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.courseName }}</el-col>
                   </el-tooltip>
                   <!-- <el-col class="center" :span="5">{{ item.counts }}</el-col> -->

src/views/portal/qa/Answer.vue

@@ -8,7 +8,7 @@
       </el-breadcrumb>
       <div class="xrow" style="display: flex;justify-content: space-between;">
          <div style="flex: 1;">
-              <el-row>
+              <el-row v-if="noData">
           <el-card :body-style="{ padding: '0px' }" class="detail">
             <div class="title" >
               <span class="qa-basic" :class="detailData.isResolve ? 'qa-solve' : 'qa-unSolve'">
@@ -190,6 +190,9 @@
             </div>
           </div>
          </el-row>
+         <div v-else>
+              <el-empty :image-size="200"></el-empty>
+         </div>
          </div>
          <div style="width: 245px;margin-left: 5px;">
             <el-row>
@@ -287,6 +290,7 @@ export default {
   },
   data() {
     return {
+      noData:true,
       qaFormCheckedShow: false,
       checked: false,
       // sex:null,
@@ -424,12 +428,14 @@ export default {
           res.result.avatar = "";
           res.result.name = "";
           res.result.orgInfo = "";
-
           res.result.sex = null;
           this.detailData = res.result;
           if (JSON.stringify(this.detailData) != "{}") {
             this.getQaUserData(this.detailData);
           }
+        }else{
+          this.noData = false;
+          this.$message.error(res.message);
         }
       });
     },

src/views/portal/qa/Detail.vue

@@ -408,12 +408,13 @@ export default {
           res.result.avatar = "";
           res.result.name = "";
           res.result.orgInfo = "";
-
           res.result.sex = null;
           this.detailData = res.result;
           if (JSON.stringify(this.detailData) != "{}") {
             this.getQaUserData(this.detailData);
           }
+        }else{
+          this.$message.error(res.message);
         }
       });
     },