Merge branch 'zcwy_0726_download' into dev_master

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>
@@ -290,7 +290,7 @@
           </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-button v-if="isHomeWork" :disabled="isTrue" style="padding:10px 15px;margin-bottom: 10px;" type="primary" @click="downLoad">导出全部作业</el-button>
       </el-form>
@@ -347,6 +347,10 @@ export default {
     manageStudyData: {
       type: Object,
       default: () => ({})
+    },
+    isShowDialog:{
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -417,6 +421,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() {
@@ -488,6 +507,10 @@ export default {
         }
       });
     },
+    studyContentRecordsSearch(){
+      this.learningSituation.pageIndex = 1;
+      this.studyContentRecords()
+    },
     // 资源里的学习详情
     studyContentRecords() {
       let params = {
@@ -780,7 +803,7 @@ export default {
       if(type==61){
         this.typePress = true
       }else{
-        this.typePress = false
+        this.typePress = true
       }
       if(type == 60){
         this.isHomeWork = true