Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

周计划和详细 页面优化

Browse Source
This commit is contained in:
sk1551 2020-08-28 12:30:30 +08:00
parent 893a520a48
commit 33afe5382a
3 changed files with 59 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ruoyi-ui/src/views/benyi/planweek/data.vue
View File

@ -21,15 +21,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="活动内容" prop="content">
<el-input
v-model="queryParams.content"
placeholder="请输入活动内容"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="活动时间" prop="activitytime">
<el-date-picker
clearable
@ -106,28 +97,22 @@
</el-col>
</el-row>
<el-table
v-loading="loading"
:data="planweekitemList"
@selection-change="handleSelectionChange"
>
<el-table v-loading="loading" :data="planweekitemList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="所属计划" align="center" prop="wid" />
<el-table-column label="活动内容" align="center" prop="content" />
<el-table-column label="所属计划" align="center" prop="wid" :formatter="themePlanFormat" />
<el-table-column
label="活动类型"
align="center"
prop="activitytype"
:formatter="activitytypeFormat"
/>
<el-table-column label="活动内容" align="center" prop="content" />
<el-table-column label="活动时间" align="center" prop="activitytime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.activitytime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createuserid" />
<el-table-column label="修改人" align="center" prop="updateuserid" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -169,7 +154,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="活动类型">
<el-form-item label="活动类型" prop="activitytype">
<el-select v-model="form.activitytype" placeholder="请选择活动类型">
<el-option
v-for="dict in activitytypeOptions"
@ -191,6 +176,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择活动时间"
:picker-options="pickerOptions7">
></el-date-picker>
</el-form-item>
</el-form>
@ -251,10 +237,25 @@ export default {
createuserid: undefined,
updateuserid: undefined
},
// 日期控件 只显示今天和今天以后一周时间区间
pickerOptions7: {
disabledDate(time) {
let curDate = (new Date()).getTime();
let three = 7 * 24 * 3600 * 1000;
let threeMonths = curDate + three;
let datestart = Date.now() - 86400000;
return time.getTime() < datestart || time.getTime() > threeMonths;
}
},
// 表单参数
form: {},
// 表单校验
rules: {}
rules: {
activitytype: [{ required: true, message: "活动类型不能为空", trigger: "blur" }],
content: [{ required: true, message: "活动内容不能为空", trigger: "blur" }],
activitytime: [{ required: true, message: "活动时间不能为空", trigger: "blur" }],
}
};
},
created() {

140
ruoyi-ui/src/views/benyi/planweek/index.vue
View File

@ -10,16 +10,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择当前状态" clearable size="small">
<!-- <el-form-item label="班级名称" prop="classid">
<el-select v-model="queryParams.classid" placeholder="请选择班级" clearable size="small">
<el-option
v-for="dict in statusOptions"
v-for="dict in classOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="开始时间" prop="starttime">
<el-date-picker
clearable
@ -42,64 +42,6 @@
placeholder="选择结束时间"
></el-date-picker>
</el-form-item>
<el-form-item label="本周主题" prop="themeofweek">
<el-input
v-model="queryParams.themeofweek"
placeholder="请输入本周主题"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核人" prop="shrid">
<el-input
v-model="queryParams.shrid"
placeholder="请输入审核人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!--
<el-form-item label="学校id" prop="schoolid">
<el-input
v-model="queryParams.schoolid"
placeholder="请输入学校id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="班级id" prop="classid">
<el-input
v-model="queryParams.classid"
placeholder="请输入班级id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createuserid">
<el-input
v-model="queryParams.createuserid"
placeholder="请输入创建人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="审核时间" prop="shtime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.shtime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择审核时间"
></el-date-picker>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -149,8 +91,7 @@
<el-table v-loading="loading" :data="planweekList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="班级id" align="center" prop="classid" :formatter="classFormat" />
<el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat" />
<el-table-column label="计划名称" align="center" prop="name" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/benyi_course/planweek/data/' + scope.row.id" class="link-type">
@ -169,15 +110,6 @@
</template>
</el-table-column>
<el-table-column label="本周主题" align="center" prop="themeofweek" />
<el-table-column label="当前状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="审核人" align="center" prop="shrid" />
<!-- <el-table-column label="审核时间" align="center" prop="shtime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.shtime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
<!-- <el-table-column label="学校id" align="center" prop="schoolid" />
-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -187,14 +119,14 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['system:planweek:edit']"
>修改</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-check"
@click="handleCheck(scope.row)"
v-hasPermi="['system:planweek:edit']"
v-show="isShow(scope.row)"
>提交</el-button>
>提交</el-button> -->
<el-button
size="mini"
type="text"
@ -260,36 +192,6 @@
<el-form-item label="教学目标(艺术)" prop="jxmbYs">
<el-input v-model="form.jxmbYs" placeholder="请输入教学目标(艺术)" />
</el-form-item>
<!-- <el-form-item label="当前状态">
<el-select v-model="form.status" placeholder="请选择当前状态">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="审核人" prop="shrid">
<el-input v-model="form.shrid" placeholder="请输入审核人" />
</el-form-item> -->
<!-- <el-form-item label="学校id" prop="schoolid">
<el-input v-model="form.schoolid" placeholder="请输入学校id" />
</el-form-item>
<el-form-item label="班级id" prop="classid">
<el-input v-model="form.classid" placeholder="请输入班级id" />
</el-form-item>-->
<!-- <el-form-item label="审核时间" prop="shtime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.shtime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择审核时间"
></el-date-picker>
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -359,7 +261,33 @@ export default {
// 表单参数
form: {},
// 表单校验
rules: {}
rules: {
name: [{ required: true, message: "计划名称不能为空", trigger: "blur" }],
starttime: [
{ required: true, message: "开始时间不能为空", trigger: "blur" },
],
endtime: [
{ required: true, message: "结束时间不能为空", trigger: "blur" },
],
themeofweek: [
{ required: true, message: "本周主题不能为空", trigger: "blur" },
],
jxmbSh: [
{ required: true, message: "教学目标(社会)不能为空", trigger: "blur" },
],
jxmbYy: [
{ required: true, message: "教学目标(语言)不能为空", trigger: "blur" },
],
jxmbJk: [
{ required: true, message: "教学目标(健康)不能为空", trigger: "blur" },
],
jxmbKx: [
{ required: true, message: "教学目标(科学)不能为空", trigger: "blur" },
],
jxmbYs: [
{ required: true, message: "教学目标(艺术)不能为空", trigger: "blur" },
]
}
};
},
created() {

4
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByPlanweekitemController.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.project.benyi.controller;
import java.util.List;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -76,6 +78,7 @@ public class ByPlanweekitemController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody ByPlanweekitem byPlanweekitem)
{
byPlanweekitem.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
return toAjax(byPlanweekitemService.insertByPlanweekitem(byPlanweekitem));
}
@ -87,6 +90,7 @@ public class ByPlanweekitemController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody ByPlanweekitem byPlanweekitem)
{
byPlanweekitem.setUpdateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
return toAjax(byPlanweekitemService.updateByPlanweekitem(byPlanweekitem));
}