Merge branch 'dev'

src/components/PdfPreview/view.vue

@@ -236,6 +236,7 @@ export default {
 //     text-align: right;
 //   }
 // }
+
 .pdf-perView {
   .pdf-box {
     min-height: 300px;
@@ -245,6 +246,7 @@ export default {
     overflow-x: hidden;
     >span{
       margin-bottom: 20px;
+      box-shadow: 10px 4px 11px 0px #ccc !important;
     }
   }
   .pdf-header,.pdf-footer {

src/components/Portal/comments.vue

@@ -68,7 +68,7 @@
               type="textarea"
               class="hideControl"
               show-word-limit
-              v-model="inputValue"
+              v-model.trim="inputValue"
               maxlength="800"
               placeholder="写下您的评论(800字以内)，可以@案主哦～"
             ></el-input>
@@ -483,8 +483,7 @@
         this.listShow=flag;
       },
       submit(){
-
+        if(this.inputValue.trim()!=''){
-        if(this.inputValue!=''){
           let cdata={
             objType:this.objType,
             objId:this.objId,

src/components/Qa/editQuestion.vue

@@ -4,7 +4,7 @@
       <el-form-item label="回答内容">
         <el-input
           type="textarea"
-          v-model="editData.content"
+          v-model.trim="editData.content"
           placeholder="请输入详细描述"
           rows="8"
           minlength="1"
@@ -39,7 +39,7 @@
     methods:{
       //确认修改回答
       enSure() {
-        if (!this.editData.content) {
+        if (!this.editData.content.trim()) {
           return this.$message({
             message: '回复内容不能为空',
             type: 'warning'

src/components/Study/manager.vue

@@ -4,10 +4,10 @@
     <div>
       <el-form>
         <el-row :gutter="20">
-          <el-col :span="4"><el-form-item label="课程:">{{manageStudyData.name}}</el-form-item></el-col>
+          <el-col :span="24"><el-form-item label="课程:">{{manageStudyData.name}}</el-form-item></el-col>
-          <el-col :span="4"><el-form-item label="类型:">{{courseType(manageStudyData.type)}}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="类型:">{{courseType(manageStudyData.type)}}</el-form-item></el-col>
-          <el-col :span="4"><el-form-item label="状态:">{{manageStudyData.status == 1? '未审核':'已审核'}}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="内容分类:">{{sysTypeName(this.manageStudyData.sysType1)}}{{this.manageStudyData.sysType2 == ''? '': '/'}}{{sysTypeName(this.manageStudyData.sysType2)}}{{this.manageStudyData.sysType3 == ''? '': '/'}}{{sysTypeName(this.manageStudyData.sysType3)}}</el-form-item></el-col>
-          <el-col :span="4"><el-form-item label="内容分类:">{{sysTypeName(this.manageStudyData.sysType1)}}{{this.manageStudyData.sysType2 == ''? '': '/'}}{{sysTypeName(this.manageStudyData.sysType2)}}{{this.manageStudyData.sysType3 == ''? '': '/'}}{{sysTypeName(this.manageStudyData.sysType3)}}</el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="状态:">{{manageStudyData.status == 1? '未审核':'已审核'}}</el-form-item></el-col>
         </el-row>
       </el-form>
     </div>
@@ -15,7 +15,7 @@
     <div>
       <el-tabs v-model="tabName" @tab-click="handleTabClick">
         <el-tab-pane label="报名管理" name="second">
-          <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div>
+          <!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
           <el-row style="margin: 20px 0;" :gutter="20">
             <!-- <el-col :span="4">
               <div class="grid-content bg-purple"><el-input v-model="input"  placeholder="手动添加：姓名/工号" /></div>
@@ -55,11 +55,10 @@
           </el-row>
           <div class="tab-content">
             <!-- @selection-change="handleSelectionChange" -->
-            <el-table max-height="400" border :data="study.list" style="width: 100%">
+            <el-table border max-height="350" :data="study.list" style="width: 100%">
               <!-- <el-table-column type="selection" width="55"></el-table-column> -->
               <el-table-column prop="name" label="姓名"></el-table-column>
               <el-table-column prop="code" label="工号">
-            
               </el-table-column>
               <el-table-column prop="signTime" label="报名时间" width="180"></el-table-column>
               <el-table-column prop="status" label="状态" width="180">
@@ -110,7 +109,7 @@
             </el-col>
           </el-row>
           <div class="tab-content">
-            <el-table max-height="500" border :data="learningRecords.list" style="width: 100%">
+            <el-table max-height="400" border :data="learningRecords.list" style="width: 100%">
               <el-table-column prop="aname" label="姓名" width="100"></el-table-column>
               <el-table-column prop="addTime" label="学习时间"></el-table-column>
               <!-- <el-table-column prop="finishTime" label="结束时间"></el-table-column> -->
@@ -175,7 +174,7 @@
             </el-col>
           </el-row>
           <div class="tab-content">
-            <el-table max-height="500" border :data="catalogList" style="width: 100%">
+            <el-table max-height="400" border :data="catalogList" style="width: 100%">
               <el-table-column label="课程目录">
                 <template slot-scope="scope">
                   {{scope.row.chapterName}}{{scope.row.chapterName? '--': ''}}{{scope.row.contentName}}
@@ -390,6 +389,22 @@ export default {
       }
     };
   },
+  watch:{
+    manageStudyData(val){
+     if(val){
+       this.tabName = 'second';
+       this.study.list = [];
+       if (this.tabName === "second") {
+        this.getSignupList();
+      } else if (this.tabName === "third") {
+        this.getStudyRecords();
+      } else {
+        // 资源
+        this.getDetail();
+      }
+     }
+    }
+  },
   mounted() {
     this.getSignupList();
     this.getResOwnerTree().then(rs=>{
@@ -626,9 +641,9 @@ export default {
      
       apicourseStudy.findSignup(params).then(res => {
         if (res.status === 200) {
-         
           let ids = [];
           res.result.list.forEach(item => {
+            item.code = '';
             ids.push(item.aid);
           });
           this.getQaUserData(res.result.list, ids);
@@ -714,7 +729,7 @@ export default {
   line-height: 30px;
 }
 .tab-content {
-  height: 450px;
+  height: 400px;
   overflow: auto;
 }
 </style>

src/views/manage/AddAudiences.vue

@@ -46,7 +46,7 @@
           </el-col>
           <el-col :span="18">
             <div class="action">
-              <el-input style="width: 30%;margin-left: 10px;" v-model="userQueryForm.keyWord" placeholder="请输入姓名或工号"></el-input>
+              <el-input clearable style="width: 30%;margin-left: 10px;" v-model="userQueryForm.keyWord" placeholder="请输入姓名或工号"></el-input>
               <el-button type="primary"  size="medium" @click="queryUserData">搜索</el-button>
               <el-button type="primary" class="findBtn"  size="medium" @click="reset">重置</el-button>
             </div>

src/views/user/MyAssess.vue

@@ -5,7 +5,6 @@
     <div style="padding:10px 0px 12px 2px">
     <el-row>
       <el-col :span="24">
-
         <el-input clearable placeholder="搜索名称" v-model="keyword"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="getData()">搜索</el-button>
         <el-button type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button>
@@ -29,21 +28,24 @@
       </el-col>
 
     </el-row>
-     <div v-if="testList.length > 0 " style="height:150px;  text-align: center;   margin-top: 10px; " >
+      <div v-if="testList.length > 0 " style="height:150px;  text-align: center;   margin-top: 10px; " >
-      <el-pagination
+          <el-pagination
-      background
+          background
-      @size-change="handleSizeChange"
+          @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
+          @current-change="handleCurrentChange"
-      :page-sizes="[9, 18, 27, 36]"
+          :page-sizes="[9, 18, 27, 36]"
-      :current-page="page"
+          :current-page="page"
-      :page-size="size"
+          :page-size="size"
-      layout="total, sizes, prev, pager, next, jumper"
+          layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
+          :total="total">
-      >
+          </el-pagination>
-    </el-pagination>
+       </div>
-
+       <div v-else>
-
+            <div v-if="testList.length == 0">
-        </div>
+              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+              <div v-else class="zan-wu">暂无数据</div>
+            </div>
+          </div>
     </div>
 
 </template>
@@ -54,6 +56,7 @@
   export default {
     data(){
       return {
+        isSearh:false,
         keyword:'',
         testList:'',
         total:0,
@@ -83,6 +86,7 @@
         window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=quizsummary`)
       },
       getData() {
+        this.isSearh = true;
         this.page=1;
         this.findList();
       },

src/views/user/Setting.vue

@@ -221,6 +221,7 @@
             apiPassword.modifyPassword({oldPassword:this.passwordForm.oldPass,newPassword:this.passwordForm.newPass,confirmPassword:this.passwordForm.confirmPass}).then(res=>{
               if(res.status==200){
                 this.$message.success('修改密码成功')
+                this.dialogVisiblePassword = false;
               }else{
                 this.$message.error(res.message);
               }