From 249c2ef099e8130a28d0f81b4c18fe305393042e Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Sat, 14 Aug 2021 16:33:46 +0800
Subject: [PATCH] =?UTF-8?q?tree=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/benyi/dayflowstudy/index.vue    |   2 +-
 ruoyi-ui/src/views/benyi/mathstudy/index.vue  |   2 +-
 .../views/benyi/microcoursestudy/index.vue    |   2 +-
 ruoyi-ui/src/views/benyi/planweek/data.vue    |   1 +
 ruoyi-ui/src/views/benyi/planweek/index.vue   | 206 ++++++++++++------
 ruoyi-ui/src/views/benyi/themestudy/index.vue |   2 +-
 6 files changed, 139 insertions(+), 76 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/dayflowstudy/index.vue b/ruoyi-ui/src/views/benyi/dayflowstudy/index.vue
index c90fbbd65..8bc0835cb 100644
--- a/ruoyi-ui/src/views/benyi/dayflowstudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowstudy/index.vue
@@ -16,7 +16,7 @@
           <el-tree
             :data="treeOptions"
             :props="defaultProps"
-            :expand-on-click-node="false"
+            :expand-on-click-node="true"
             :filter-node-method="filterNode"
             ref="tree"
             default-expand-all
diff --git a/ruoyi-ui/src/views/benyi/mathstudy/index.vue b/ruoyi-ui/src/views/benyi/mathstudy/index.vue
index 628f21ec8..175482ca7 100644
--- a/ruoyi-ui/src/views/benyi/mathstudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/mathstudy/index.vue
@@ -16,7 +16,7 @@
           <el-tree
             :data="treeOptions"
             :props="defaultProps"
-            :expand-on-click-node="false"
+            :expand-on-click-node="true"
             :filter-node-method="filterNode"
             ref="tree"
             default-expand-all
diff --git a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
index e177b6c61..4494ecd16 100644
--- a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
@@ -16,7 +16,7 @@
           <el-tree
             :data="treeOptions"
             :props="defaultProps"
-            :expand-on-click-node="false"
+            :expand-on-click-node="true"
             :filter-node-method="filterNode"
             ref="tree"
             :default-expand-all="false"
diff --git a/ruoyi-ui/src/views/benyi/planweek/data.vue b/ruoyi-ui/src/views/benyi/planweek/data.vue
index e37281286..f5c33d64f 100644
--- a/ruoyi-ui/src/views/benyi/planweek/data.vue
+++ b/ruoyi-ui/src/views/benyi/planweek/data.vue
@@ -161,6 +161,7 @@
       :title="title"
       :visible.sync="open"
       class="v-dialog"
+      width="900px"
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
diff --git a/ruoyi-ui/src/views/benyi/planweek/index.vue b/ruoyi-ui/src/views/benyi/planweek/index.vue
index 32547db4b..577866992 100644
--- a/ruoyi-ui/src/views/benyi/planweek/index.vue
+++ b/ruoyi-ui/src/views/benyi/planweek/index.vue
@@ -170,6 +170,13 @@
             v-hasPermi="['benyi:planweek:remove']"
             >删除</el-button
           >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-setting"
+            @click="handleActity(scope.row)"
+            >活动</el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -195,80 +202,129 @@
       :title="title"
       :visible.sync="open"
       class="v-dialog"
+      width="1024px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="计划名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入计划名称" />
-        </el-form-item>
-        <el-form-item label="选择月份" prop="month">
-          <label slot="label"
-            >选择月份</label
-          >
-          <el-date-picker
-            clearable
-            size="small"
-            class="my-date-picker"
-            v-model="form.month"
-            type="month"
-            value-format="yyyy-MM"
-            placeholder="选择月份"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="开始时间" prop="starttime">
-          <el-date-picker
-            clearable
-            size="small"
-            class="my-date-picker"
-            v-model="form.starttime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始时间"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="endtime">
-          <el-date-picker
-            clearable
-            size="small"
-            class="my-date-picker"
-            v-model="form.endtime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束时间"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="选择周次" prop="weekly">
-          <label slot="label"
-            >选择周次</label
-          >
-          <el-select v-model="form.weekly" placeholder="请选择周次">
-            <el-option
-              v-for="dict in weeklyOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="本周主题" prop="themeofweek">
-          <el-input v-model="form.themeofweek" placeholder="请输入本周主题" />
-        </el-form-item>
-        <el-form-item label="教学目标(社会)" prop="jxmbSh">
-          <Editor v-model="form.jxmbSh" placeholder="请输入教学目标(社会)" :quillIndex="0" toref="Editora"/>
-        </el-form-item>
-        <el-form-item label="教学目标(语言)" prop="jxmbYy">
-          <Editor v-model="form.jxmbYy" placeholder="请输入教学目标(语言)" :quillIndex="1" toref="Editora"/>
-        </el-form-item>
-        <el-form-item label="教学目标(健康)" prop="jxmbJk">
-          <Editor v-model="form.jxmbJk" placeholder="请输入教学目标(健康)" :quillIndex="2" toref="Editora"/>
-        </el-form-item>
-        <el-form-item label="教学目标(科学)" prop="jxmbKx">
-          <Editor v-model="form.jxmbKx" placeholder="请输入教学目标(科学)" :quillIndex="3" toref="Editora"/>
-        </el-form-item>
-        <el-form-item label="教学目标(艺术)" prop="jxmbYs">
-          <Editor v-model="form.jxmbYs" placeholder="请输入教学目标(艺术)" :quillIndex="4" toref="Editora"/>
-        </el-form-item>
-      </el-form>
+      <el-row :gutter="15">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-col :span="12">
+            <el-form-item label="计划名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入计划名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选择月份" prop="month">
+              <label slot="label">选择月份</label>
+              <el-date-picker
+                clearable
+                size="small"
+                class="my-date-picker"
+                v-model="form.month"
+                type="month"
+                value-format="yyyy-MM"
+                placeholder="选择月份"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开始时间" prop="starttime">
+              <el-date-picker
+                clearable
+                size="small"
+                class="my-date-picker"
+                v-model="form.starttime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择开始时间"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结束时间" prop="endtime">
+              <el-date-picker
+                clearable
+                size="small"
+                class="my-date-picker"
+                v-model="form.endtime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择结束时间"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选择周次" prop="weekly">
+              <label slot="label">选择周次</label>
+              <el-select v-model="form.weekly" placeholder="请选择周次">
+                <el-option
+                  v-for="dict in weeklyOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="本周主题" prop="themeofweek">
+              <el-input
+                v-model="form.themeofweek"
+                placeholder="请输入本周主题"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="教学目标(社会)" prop="jxmbSh">
+              <Editor
+                v-model="form.jxmbSh"
+                placeholder="请输入教学目标(社会)"
+                :quillIndex="0"
+                toref="Editora"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="教学目标(语言)" prop="jxmbYy">
+              <Editor
+                v-model="form.jxmbYy"
+                placeholder="请输入教学目标(语言)"
+                :quillIndex="1"
+                toref="Editora"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="教学目标(健康)" prop="jxmbJk">
+              <Editor
+                v-model="form.jxmbJk"
+                placeholder="请输入教学目标(健康)"
+                :quillIndex="2"
+                toref="Editora"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="教学目标(科学)" prop="jxmbKx">
+              <Editor
+                v-model="form.jxmbKx"
+                placeholder="请输入教学目标(科学)"
+                :quillIndex="3"
+                toref="Editora"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="教学目标(艺术)" prop="jxmbYs">
+              <Editor
+                v-model="form.jxmbYs"
+                placeholder="请输入教学目标(艺术)"
+                :quillIndex="4"
+                toref="Editora"
+              />
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -583,6 +639,12 @@ export default {
         path: "/benyi_course/planweekprint/table/" + id,
       });
     },
+    handleActity(row) {
+      const id = row.id;
+      this.$router.push({
+        path: "/benyi_course/planweek/data/" + id,
+      });
+    },
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/benyi/themestudy/index.vue b/ruoyi-ui/src/views/benyi/themestudy/index.vue
index baff61512..f4e9d1340 100644
--- a/ruoyi-ui/src/views/benyi/themestudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/themestudy/index.vue
@@ -16,7 +16,7 @@
           <el-tree
             :data="treeOptions"
             :props="defaultProps"
-            :expand-on-click-node="false"
+            :expand-on-click-node="true"
             :filter-node-method="filterNode"
             ref="tree"
             default-expand-all