diff --git a/ruoyi-ui/src/views/benyi/planweek/data.vue b/ruoyi-ui/src/views/benyi/planweek/data.vue index 777590057..39141203f 100644 --- a/ruoyi-ui/src/views/benyi/planweek/data.vue +++ b/ruoyi-ui/src/views/benyi/planweek/data.vue @@ -147,7 +147,7 @@ /> <!-- 添加或修改周计划(家长和教育部门细化)对话框 --> - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> + <el-dialog :title="title" :visible.sync="open" width="1024px" append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form-item label="所属计划" prop="wid"> <el-select v-model="form.wid" size="small" :disabled="true"> @@ -169,9 +169,6 @@ ></el-option> </el-select> </el-form-item> - <el-form-item label="活动内容" prop="content"> - <el-input v-model="form.content" placeholder="请输入活动内容" /> - </el-form-item> <el-form-item label="活动时间" prop="activitytime"> <el-date-picker clearable @@ -184,6 +181,9 @@ :picker-options="pickerOptions7" >></el-date-picker> </el-form-item> + <el-form-item label="活动内容" prop="content"> + <Editor v-model="form.content" placeholder="请输入活动内容" /> + </el-form-item> <!-- <el-form-item label="星期" prop="day"> <el-input v-model="form.day" placeholder="请输入星期几" /> </el-form-item> --> @@ -206,6 +206,8 @@ import { exportPlanweekitem } from "@/api/benyi/planweekitem"; +import Editor from "@/components/Editor"; + import { getPlanweek, listPlanweek } from "@/api/benyi/planweek"; const weekArr = [ @@ -219,6 +221,9 @@ const weekArr = [ ]; export default { name: "Planweekitem", + components: { + Editor + }, data() { return { // 遮罩层 diff --git a/ruoyi-ui/src/views/benyi/planweek/index.vue b/ruoyi-ui/src/views/benyi/planweek/index.vue index 7c584cc33..9a988fe8d 100644 --- a/ruoyi-ui/src/views/benyi/planweek/index.vue +++ b/ruoyi-ui/src/views/benyi/planweek/index.vue @@ -153,12 +153,13 @@ /> <!-- 添加或修改周计划(家长和教育部门)对话框 --> - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> + <el-dialog :title="title" :visible.sync="open" 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"> + <el-form-item label="月 份" prop="month"> + <label slot="label">月 份</label> <el-date-picker clearable size="small" @@ -192,7 +193,8 @@ ></el-date-picker> </el-form-item> <el-form-item label="周次" prop="weekly"> - <el-select v-model="form.weekly" placeholder="请选择周次"> + <label slot="label">周 次</label> + <el-select v-model="form.weekly" placeholder="请选择周次"> <el-option v-for="dict in weeklyOptions" :key="dict.dictValue" @@ -205,19 +207,19 @@ <el-input v-model="form.themeofweek" placeholder="请输入本周主题" /> </el-form-item> <el-form-item label="教学目标(社会)" prop="jxmbSh"> - <el-input v-model="form.jxmbSh" placeholder="请输入教学目标(社会)" /> + <Editor v-model="form.jxmbSh" placeholder="请输入教学目标(社会)" /> </el-form-item> <el-form-item label="教学目标(语言)" prop="jxmbYy"> - <el-input v-model="form.jxmbYy" placeholder="请输入教学目标(语言)" /> + <Editor v-model="form.jxmbYy" placeholder="请输入教学目标(语言)" /> </el-form-item> <el-form-item label="教学目标(健康)" prop="jxmbJk"> - <el-input v-model="form.jxmbJk" placeholder="请输入教学目标(健康)" /> + <Editor v-model="form.jxmbJk" placeholder="请输入教学目标(健康)" /> </el-form-item> <el-form-item label="教学目标(科学)" prop="jxmbKx"> - <el-input v-model="form.jxmbKx" placeholder="请输入教学目标(科学)" /> + <Editor v-model="form.jxmbKx" placeholder="请输入教学目标(科学)" /> </el-form-item> <el-form-item label="教学目标(艺术)" prop="jxmbYs"> - <el-input v-model="form.jxmbYs" placeholder="请输入教学目标(艺术)" /> + <Editor v-model="form.jxmbYs" placeholder="请输入教学目标(艺术)" /> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> @@ -239,10 +241,15 @@ import { checkPlanweek } from "@/api/benyi/planweek"; +import Editor from "@/components/Editor"; + import { listClass } from "@/api/system/class"; export default { name: "Planweek", + components: { + Editor + }, data() { return { // 遮罩层