From 8dc6e2443fdaf1a5ee1efc1c84d2acab641d1b95 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 27 Sep 2021 10:38:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=A7=86=E9=A2=91=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9B=E5=B9=BC=E5=84=BF=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A6=96=E6=AC=A1=E5=8A=A0=E8=BD=BDbug?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/benyi/childcharge/index.vue     |  6 +-
 .../views/benyi/teacherassessment/index.vue   | 21 +++--
 .../views/benyi_train/video_study/index.vue   | 84 +++++++++++++++----
 .../controller/BySchoolchargeController.java  |  4 +-
 4 files changed, 93 insertions(+), 22 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/childcharge/index.vue b/ruoyi-ui/src/views/benyi/childcharge/index.vue
index f9a4f7eae..4f1988b29 100644
--- a/ruoyi-ui/src/views/benyi/childcharge/index.vue
+++ b/ruoyi-ui/src/views/benyi/childcharge/index.vue
@@ -234,9 +234,9 @@ export default {
         this.classOptions = response.rows;
         this.queryParams.classid = response.rows[0].bjbh;
         this.className = response.rows[0].bjmc;
-      });
 
-      this.getList();
+        this.getList();
+      });
     },
     /** 查询幼儿收费列表 */
     getList() {
@@ -244,7 +244,9 @@ export default {
       if (this.queryParams.month == "") {
         this.queryParams.month = this.month;
       }
+      console.log(this.queryParams);
       listChildcharge(this.queryParams).then((response) => {
+        console.log(response.rows);
         if (response.rows.length == 0) {
           this.msgError("请检查当前班级是否存在幼儿或是否已经设置托费");
         }
diff --git a/ruoyi-ui/src/views/benyi/teacherassessment/index.vue b/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
index 32a466be5..9576653b2 100644
--- a/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
@@ -206,6 +206,7 @@
         <el-form-item label="一日流程" prop="yrlcbl">
           <el-input-number
             v-model="form.yrlcbl"
+            style="width: 100%"
             placeholder="请输入一日流程得分"
             :disabled="true"
           />
@@ -213,20 +214,30 @@
         <el-form-item label="教师出勤" prop="jskqbl">
           <el-input-number
             v-model="form.jskqbl"
+            style="width: 100%"
             placeholder="请输入教师出勤得分"
           />
         </el-form-item>
         <el-form-item label="幼儿出勤" prop="yekqbl">
           <el-input-number
             v-model="form.yekqbl"
+            style="width: 100%"
             placeholder="请输入幼儿出勤得分"
           />
         </el-form-item>
         <el-form-item label="事故" prop="sgbl">
-          <el-input-number v-model="form.sgbl" placeholder="请输入事故得分" />
+          <el-input-number
+            v-model="form.sgbl"
+            style="width: 100%"
+            placeholder="请输入事故得分"
+          />
         </el-form-item>
         <el-form-item label="卫生" prop="wsbl">
-          <el-input-number v-model="form.wsbl" placeholder="请输入卫生得分" />
+          <el-input-number
+            v-model="form.wsbl"
+            style="width: 100%"
+            placeholder="请输入卫生得分"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -375,10 +386,10 @@ export default {
         this.dateRange[1] = this.month + "-31";
       } else if (m == "04" || m == "06" || m == "09" || m == "11") {
         this.dateRange[1] = this.month + "-30";
-      }else{
-        if(y % 4 == 0 && y % 100 !== 0 || y % 400 == 0){
+      } else {
+        if ((y % 4 == 0 && y % 100 !== 0) || y % 400 == 0) {
           this.dateRange[1] = this.month + "-29";
-        }else{
+        } else {
           this.dateRange[1] = this.month + "-28";
         }
       }
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 48c9916ba..3df5f73e9 100644
--- a/ruoyi-ui/src/views/benyi_train/video_study/index.vue
+++ b/ruoyi-ui/src/views/benyi_train/video_study/index.vue
@@ -2,8 +2,18 @@
   <div class="app-container" @contextmenu.prevent="">
     <el-form :model="queryParams" ref="queryForm" label-width="70px">
       <el-row :gutter="10">
-        <el-col :xs="24" :ms="12" :md="5">
-          <el-form-item label="视频类别" prop="type">
+        <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-cascader
               placeholder="请选择视频类别"
               ref="example"
@@ -13,7 +23,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="请选择讲师">
@@ -35,7 +45,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"
@@ -48,6 +58,19 @@
               >重置</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>
@@ -135,10 +158,24 @@ 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;
@@ -148,12 +185,23 @@ 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.$watermark.set("测试专用");
-  // },
+  mounted() {
+    this.handleQuery();
+  },
   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);
       // 目的是选择之后将下拉界面收起
@@ -209,11 +257,13 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      if (this.queryParams.type == null) {
-        this.queryParams.type = "";
-      } else {
-        this.queryParams.type = this.queryParams.type.toString();
-      }
+      // 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(',');
       //console.log(this.queryParams.type);
       this.queryParams.pageNum = 1;
       this.getList();
@@ -227,7 +277,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss">
 .time {
   line-height: 12px;
   font-size: 12px;
@@ -265,6 +315,12 @@ export default {
   margin: 0 !important;
 }
 
+.btns {
+  .el-button {
+    margin: 2px;
+  }
+}
+
 @media (max-width: 768.98px) {
   .el-cascader-node__label {
     max-width: 200px;
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolchargeController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolchargeController.java
index 56ab2a47c..a03646a3c 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolchargeController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolchargeController.java
@@ -40,6 +40,7 @@ public class BySchoolchargeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('benyi:schoolcharge:list')")
     @GetMapping("/list")
     public TableDataInfo list(BySchoolcharge bySchoolcharge) {
+        //System.out.println("1111");
         startPage();
         List<BySchoolcharge> list = bySchoolchargeService.selectBySchoolchargeList(bySchoolcharge);
         return getDataTable(list);
@@ -51,8 +52,9 @@ public class BySchoolchargeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('benyi:schoolcharge:list')")
     @GetMapping("/child/list")
     public TableDataInfo childlist(BySchoolcharge bySchoolcharge) {
-        System.out.println("month---" + bySchoolcharge.getMonth());
+        //System.out.println("month---" + bySchoolcharge.getMonth());
         bySchoolcharge.setMonthday(bySchoolcharge.getMonth() + "-15");
+        //System.out.println(bySchoolcharge.toString());
         List<BySchoolcharge> listScope = bySchoolchargeService.selectByChildchargeListByMonth(bySchoolcharge);
         if (listScope != null && listScope.size() > 0) {
             bySchoolcharge.setId(listScope.get(0).getId());