From 2d2807da410c78c97a13740a00bfb6d35504e24e Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Sun, 26 Sep 2021 14:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=A7=86=E9=A2=91-=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/benyi_train/video_study/index.vue   | 84 ++++---------------
 1 file changed, 14 insertions(+), 70 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi_train/video_study/index.vue b/ruoyi-ui/src/views/benyi_train/video_study/index.vue
index 3df5f73e9..48c9916ba 100644
--- a/ruoyi-ui/src/views/benyi_train/video_study/index.vue
+++ b/ruoyi-ui/src/views/benyi_train/video_study/index.vue
@@ -2,18 +2,8 @@
   <div class="app-container" @contextmenu.prevent="">
     <el-form :model="queryParams" ref="queryForm" label-width="70px">
       <el-row :gutter="10">
-        <el-col>
-          <el-form-item style="margin-bottom: 5px" label="视频类型" prop="type">
-            <div class="flex wrap btns">
-              <el-button 
-                v-for="ele in optionTypes" 
-                size="mini"
-                :key="ele.id"
-                :type="ele.id === type ? 'primary' : ''"
-                @click="changeType(ele)">{{ele.name}}</el-button>
-            </div>
-          </el-form-item>
-          <!-- <el-form-item label="视频类别" prop="type">
+        <el-col :xs="24" :ms="12" :md="5">
+          <el-form-item label="视频类别" prop="type">
             <el-cascader
               placeholder="请选择视频类别"
               ref="example"
@@ -23,7 +13,7 @@
               clearable
               @change="exampleChange"
             ></el-cascader>
-          </el-form-item> -->
+          </el-form-item>
           <!-- 博士要求注释掉，不需要该过滤条件 2020-05-30 zlp -->
           <!-- <el-form-item label="讲师姓名" prop="lecturer">
         <el-select v-model="queryParams.lecturer" filterable placeholder="请选择讲师">
@@ -45,7 +35,7 @@
         />
       </el-form-item>-->
         </el-col>
-        <!-- <el-col :xs="24" :ms="12" :md="6">
+        <el-col :xs="24" :ms="12" :md="6">
           <el-form-item class="no-margin">
             <el-button
               type="primary"
@@ -58,19 +48,6 @@
               >重置</el-button
             >
           </el-form-item>
-        </el-col> -->
-        <el-col>
-          <el-form-item  style="margin-bottom: 5px" label="详细分类" prop="type">
-            <div class="flex wrap btns">
-              <el-button 
-                v-for="ele in getVideoTypes"
-                round
-                size="mini"
-                :key="ele.id"
-                :type="ele.id === ancestors ? 'primary' : ''"
-                @click="changeTypeDetail(ele)">{{ele.name}}</el-button>
-            </div>
-          </el-form-item>
         </el-col>
       </el-row>
     </el-form>
@@ -158,24 +135,10 @@ export default {
         pageNum: 1,
         pageSize: 8,
       },
-      type: 1,
-      ancestors: '',
-      videoTypes: []
     };
   },
-  computed: {
-    getVideoTypes(){
-      let arr = [];
-      for(let ele of this.optionTypes) {
-        if (ele.id === this.type) {
-          arr = ele.children;
-        }
-      }
-      return arr;
-    }
-  },
   created() {
-    // this.getList();
+    this.getList();
     // listAllLecturer().then((response) => {
     //   //console.log(response.lecturer);
     //   this.lecturerOptions = response.lecturer;
@@ -185,23 +148,12 @@ export default {
       this.optionTypes = this.handleTree(response.data, "id", "pid");
       //第二步移除children为0的数组，也就是将children为0 设置为undefined
       this.optionTypes = this.getTreeData(this.optionTypes);
-      //console.log(this.optionTypes)
     });
   },
-  mounted() {
-    this.handleQuery();
-  },
+  // mounted() {
+  //   this.$watermark.set("测试专用");
+  // },
   methods: {
-    changeType(btn) {
-      console.log(btn);
-      this.type = btn.id;
-      this.ancestors = '';
-      this.handleQuery(btn);
-    },
-    changeTypeDetail(btn) {
-      this.ancestors = (this.ancestors && btn.id === this.ancestors) ? '' : btn.id;
-      this.handleQuery(btn);
-    },
     exampleChange(e) {
       // console.log(e);
       // 目的是选择之后将下拉界面收起
@@ -257,13 +209,11 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      // if (this.queryParams.type == null) {
-      //   this.queryParams.type = "";
-      // } else {
-      //   // this.queryParams.type = this.queryParams.type.toString();
-      //   this.queryParams.type = ancestors;
-      // }
-      this.queryParams.type = [this.type, this.ancestors].join(',');
+      if (this.queryParams.type == null) {
+        this.queryParams.type = "";
+      } else {
+        this.queryParams.type = this.queryParams.type.toString();
+      }
       //console.log(this.queryParams.type);
       this.queryParams.pageNum = 1;
       this.getList();
@@ -277,7 +227,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style>
 .time {
   line-height: 12px;
   font-size: 12px;
@@ -315,12 +265,6 @@ export default {
   margin: 0 !important;
 }
 
-.btns {
-  .el-button {
-    margin: 2px;
-  }
-}
-
 @media (max-width: 768.98px) {
   .el-cascader-node__label {
     max-width: 200px;