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

一日流程评估时间过滤

Browse Source
This commit is contained in:
zhanglipeng 2021-04-25 15:33:47 +08:00
parent 61ad21e35d
commit b84e9d745c
7 changed files with 232 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue
View File

@ -61,27 +61,93 @@
prop="createUserid" prop="createUserid"
:formatter="createUserFormat" :formatter="createUserFormat"
/> />
<el-table-column label="最终得分" align="center" prop="zzdf" /> <el-table-column
<el-table-column label="早间接待" align="center" prop="zjjdpjf" /> label="最终得分"
<el-table-column label="用餐" align="center" prop="ycpjf" /> align="center"
<el-table-column label="早间坐圈" align="center" prop="zjzqpjf" /> prop="zzdf"
<el-table-column label="分组教学" align="center" prop="fzjxpjf" /> width="110"
<el-table-column label="点心时间" align="center" prop="dxsjpjf" /> />
<el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" /> <el-table-column
<el-table-column label="活动过渡" align="center" prop="hdgdpjf" /> label="早间接待"
<el-table-column label="户外活动" align="center" prop="hwhdpjf" /> align="center"
<el-table-column label="午睡" align="center" prop="wspjf" /> prop="zjjdpjf"
<el-table-column label="离园再见" align="center" prop="lyzjpjf" /> width="110"
<el-table-column label="安全" align="center" prop="aqpjf" /> />
<el-table-column label="自由活动" align="center" prop="zyhdpjf" /> <el-table-column label="用餐" align="center" prop="ycpjf" width="80" />
<el-table-column
label="早间坐圈"
align="center"
prop="zjzqpjf"
width="110"
/>
<el-table-column
label="分组教学"
align="center"
prop="fzjxpjf"
width="110"
/>
<el-table-column
label="点心时间"
align="center"
prop="dxsjpjf"
width="110"
/>
<el-table-column
label="如厕洗手饮水"
align="center"
prop="rcxsyspjf"
width="130"
/>
<el-table-column
label="活动过渡"
align="center"
prop="hdgdpjf"
width="110"
/>
<el-table-column
label="户外活动"
align="center"
prop="hwhdpjf"
width="110"
/>
<el-table-column label="午睡" align="center" prop="wspjf" width="80" />
<el-table-column
label="离园再见"
align="center"
prop="lyzjpjf"
width="110"
/>
<el-table-column label="安全" align="center" prop="aqpjf" width="80" />
<el-table-column
label="自由活动"
align="center"
prop="zyhdpjf"
width="110"
/>
<el-table-column <el-table-column
label="规则与纪律约束" label="规则与纪律约束"
align="center" align="center"
prop="gzyjlyspjf" prop="gzyjlyspjf"
width="140"
/>
<el-table-column
label="微型课程"
align="center"
prop="wxkcpjf"
width="110"
/>
<el-table-column
label="潜课程"
align="center"
prop="qkcpjf"
width="100"
/>
<el-table-column
label="评估时间"
align="center"
prop="createTime"
width="180"
/> />
<el-table-column label="微型课程" align="center" prop="wxkcpjf" />
<el-table-column label="潜课程" align="center" prop="qkcpjf" />
<el-table-column label="评估时间" align="center" prop="createTime" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -188,7 +254,9 @@ export default {
/** 查询幼儿园一日流程评估列表 */ /** 查询幼儿园一日流程评估列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listDayflowassessmentmyself(this.queryParams).then((response) => { listDayflowassessmentmyself(
this.addDateRange(this.queryParams, this.dateRange)
).then((response) => {
this.dayflowassessmentList = response.rows; this.dayflowassessmentList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -258,6 +326,7 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.dateRange = [];
this.handleQuery(); this.handleQuery();
}, },
handleAssessment(row) { handleAssessment(row) {

34
ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue
View File

@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" border :data="dayflowassessmentList"> <el-table v-loading="loading" border :default-sort = "{prop: 'bjpjf', order: 'descending'}" :data="dayflowassessmentList">
<el-table-column <el-table-column
label="班级名称" label="班级名称"
align="center" align="center"
@ -41,26 +41,26 @@
prop="classid" prop="classid"
:formatter="classFormat" :formatter="classFormat"
/> />
<el-table-column label="班级综合平均分" align="center" prop="bjpjf" /> <el-table-column label="班级平均分" align="center" prop="bjpjf" sortable width="110"/>
<el-table-column label="早间接待" align="center" prop="zjjdpjf" /> <el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/>
<el-table-column label="用餐" align="center" prop="ycpjf" /> <el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/>
<el-table-column label="早间坐圈" align="center" prop="zjzqpjf" /> <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/>
<el-table-column label="分组教学" align="center" prop="fzjxpjf" /> <el-table-column label="分组教学" align="center" prop="fzjxpjf" sortable width="110"/>
<el-table-column label="点心时间" align="center" prop="dxsjpjf" /> <el-table-column label="点心时间" align="center" prop="dxsjpjf" sortable width="110"/>
<el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" /> <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" sortable width="130"/>
<el-table-column label="活动过渡" align="center" prop="hdgdpjf" /> <el-table-column label="活动过渡" align="center" prop="hdgdpjf" sortable width="110"/>
<el-table-column label="户外活动" align="center" prop="hwhdpjf" /> <el-table-column label="户外活动" align="center" prop="hwhdpjf" sortable width="110"/>
<el-table-column label="午睡" align="center" prop="wspjf" /> <el-table-column label="午睡" align="center" prop="wspjf" sortable width="80"/>
<el-table-column label="离园再见" align="center" prop="lyzjpjf" /> <el-table-column label="离园再见" align="center" prop="lyzjpjf" sortable width="110"/>
<el-table-column label="安全" align="center" prop="aqpjf" /> <el-table-column label="安全" align="center" prop="aqpjf" sortable width="80"/>
<el-table-column label="自由活动" align="center" prop="zyhdpjf" /> <el-table-column label="自由活动" align="center" prop="zyhdpjf" sortable width="110"/>
<el-table-column <el-table-column
label="规则与纪律约束" label="规则与纪律约束"
align="center" align="center"
prop="gzyjlyspjf" prop="gzyjlyspjf" sortable width="140"
/> />
<el-table-column label="微型课程" align="center" prop="wxkcpjf" /> <el-table-column label="微型课程" align="center" prop="wxkcpjf" sortable width="110"/>
<el-table-column label="潜课程" align="center" prop="qkcpjf" /> <el-table-column label="潜课程" align="center" prop="qkcpjf" sortable width="100"/>
</el-table> </el-table>
<pagination <pagination

117
ruoyi-ui/src/views/benyi/dayflowassessmentteacher/index.vue
View File

@ -31,6 +31,18 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="评估时间">
<el-date-picker
v-model="dateRange"
size="small"
class="my-date-picker"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
@ -74,27 +86,93 @@
fixed fixed
:formatter="createUserFormat" :formatter="createUserFormat"
/> />
<el-table-column label="最终得分" align="center" prop="zzdf" /> <el-table-column
<el-table-column label="早间接待" align="center" prop="zjjdpjf" /> label="最终得分"
<el-table-column label="用餐" align="center" prop="ycpjf" /> align="center"
<el-table-column label="早间坐圈" align="center" prop="zjzqpjf" /> prop="zzdf"
<el-table-column label="分组教学" align="center" prop="fzjxpjf" /> width="110"
<el-table-column label="点心时间" align="center" prop="dxsjpjf" /> />
<el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" /> <el-table-column
<el-table-column label="活动过渡" align="center" prop="hdgdpjf" /> label="早间接待"
<el-table-column label="户外活动" align="center" prop="hwhdpjf" /> align="center"
<el-table-column label="午睡" align="center" prop="wspjf" /> prop="zjjdpjf"
<el-table-column label="离园再见" align="center" prop="lyzjpjf" /> width="110"
<el-table-column label="安全" align="center" prop="aqpjf" /> />
<el-table-column label="自由活动" align="center" prop="zyhdpjf" /> <el-table-column label="用餐" align="center" prop="ycpjf" width="80" />
<el-table-column
label="早间坐圈"
align="center"
prop="zjzqpjf"
width="110"
/>
<el-table-column
label="分组教学"
align="center"
prop="fzjxpjf"
width="110"
/>
<el-table-column
label="点心时间"
align="center"
prop="dxsjpjf"
width="110"
/>
<el-table-column
label="如厕洗手饮水"
align="center"
prop="rcxsyspjf"
width="130"
/>
<el-table-column
label="活动过渡"
align="center"
prop="hdgdpjf"
width="110"
/>
<el-table-column
label="户外活动"
align="center"
prop="hwhdpjf"
width="110"
/>
<el-table-column label="午睡" align="center" prop="wspjf" width="80" />
<el-table-column
label="离园再见"
align="center"
prop="lyzjpjf"
width="110"
/>
<el-table-column label="安全" align="center" prop="aqpjf" width="80" />
<el-table-column
label="自由活动"
align="center"
prop="zyhdpjf"
width="110"
/>
<el-table-column <el-table-column
label="规则与纪律约束" label="规则与纪律约束"
align="center" align="center"
prop="gzyjlyspjf" prop="gzyjlyspjf"
width="140"
/>
<el-table-column
label="微型课程"
align="center"
prop="wxkcpjf"
width="110"
/>
<el-table-column
label="潜课程"
align="center"
prop="qkcpjf"
width="100"
/>
<el-table-column
label="评估时间"
align="center"
prop="createTime"
width="180"
/> />
<el-table-column label="微型课程" align="center" prop="wxkcpjf" />
<el-table-column label="潜课程" align="center" prop="qkcpjf" />
<el-table-column label="评估时间" align="center" prop="createTime" />
</el-table> </el-table>
<pagination <pagination
@ -139,6 +217,8 @@ export default {
xnxqOptions: [], xnxqOptions: [],
// 所有教师 // 所有教师
userOptions: [], userOptions: [],
// 日期范围
dateRange: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -179,7 +259,9 @@ export default {
/** 查询幼儿园一日流程评估列表 */ /** 查询幼儿园一日流程评估列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listDayflowassessment(this.queryParams).then((response) => { listDayflowassessment(
this.addDateRange(this.queryParams, this.dateRange)
).then((response) => {
this.dayflowassessmentList = response.rows; this.dayflowassessmentList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -249,6 +331,7 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.dateRange = [];
this.handleQuery(); this.handleQuery();
}, },
}, },

34
ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue
View File

@ -47,28 +47,28 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" border :data="dayflowassessmentList"> <el-table v-loading="loading" border :default-sort = "{prop: 'bjpjf', order: 'descending'}" :data="dayflowassessmentList">
<el-table-column label="评估对象" align="center" prop="pgdxxm" fixed /> <el-table-column label="评估对象" align="center" prop="pgdxxm" fixed />
<el-table-column label="最终得分" align="center" prop="bjpjf" /> <el-table-column label="最终得分" align="center" prop="bjpjf" sortable width="110"/>
<el-table-column label="早间接待" align="center" prop="zjjdpjf" /> <el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/>
<el-table-column label="用餐" align="center" prop="ycpjf" /> <el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/>
<el-table-column label="早间坐圈" align="center" prop="zjzqpjf" /> <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/>
<el-table-column label="分组教学" align="center" prop="fzjxpjf" /> <el-table-column label="分组教学" align="center" prop="fzjxpjf" sortable width="110"/>
<el-table-column label="点心时间" align="center" prop="dxsjpjf" /> <el-table-column label="点心时间" align="center" prop="dxsjpjf" sortable width="110"/>
<el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" /> <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" sortable width="130"/>
<el-table-column label="活动过渡" align="center" prop="hdgdpjf" /> <el-table-column label="活动过渡" align="center" prop="hdgdpjf" sortable width="110"/>
<el-table-column label="户外活动" align="center" prop="hwhdpjf" /> <el-table-column label="户外活动" align="center" prop="hwhdpjf" sortable width="110"/>
<el-table-column label="午睡" align="center" prop="wspjf" /> <el-table-column label="午睡" align="center" prop="wspjf" sortable width="80"/>
<el-table-column label="离园再见" align="center" prop="lyzjpjf" /> <el-table-column label="离园再见" align="center" prop="lyzjpjf" sortable width="110"/>
<el-table-column label="安全" align="center" prop="aqpjf" /> <el-table-column label="安全" align="center" prop="aqpjf" sortable width="80"/>
<el-table-column label="自由活动" align="center" prop="zyhdpjf" /> <el-table-column label="自由活动" align="center" prop="zyhdpjf" sortable width="110"/>
<el-table-column <el-table-column
label="规则与纪律约束" label="规则与纪律约束"
align="center" align="center"
prop="gzyjlyspjf" prop="gzyjlyspjf" sortable width="140"
/> />
<el-table-column label="微型课程" align="center" prop="wxkcpjf" /> <el-table-column label="微型课程" align="center" prop="wxkcpjf" sortable width="110"/>
<el-table-column label="潜课程" align="center" prop="qkcpjf" /> <el-table-column label="潜课程" align="center" prop="qkcpjf" sortable width="100"/>
</el-table> </el-table>
<pagination <pagination

2
ruoyi-ui/src/views/dashboard/LineChartTeacherDayFlowAvg.vue
View File

@ -65,7 +65,7 @@ export default {
async getClassList() { async getClassList() {
await listDayflowassessmentTeacherAvg(this.queryParams).then( await listDayflowassessmentTeacherAvg(this.queryParams).then(
(response) => { (response) => {
console.log(this.queryParams); //console.log(this.queryParams);
var items = []; var items = [];
var childcounts = []; var childcounts = [];
response.rows.forEach((element) => { response.rows.forEach((element) => {

10
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java
View File

@ -149,11 +149,11 @@ public class ByDayflowassessment extends BaseEntity {
@Excel(name = "执行人") @Excel(name = "执行人")
private Long createUserid; private Long createUserid;
/** // /**
* 创建时间 // * 创建时间
*/ // */
@Excel(name = "创建时间") // @Excel(name = "创建时间")
private Date createTime; // private Date createTime;
public Double getBjpjf() { public Double getBjpjf() {
return bjpjf; return bjpjf;

6
ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
View File

@ -107,6 +107,12 @@
<if test="kfcs != null ">and d.kfcs = #{kfcs}</if> <if test="kfcs != null ">and d.kfcs = #{kfcs}</if>
<if test="pgdx != null ">and d.pgdx = #{pgdx}</if> <if test="pgdx != null ">and d.pgdx = #{pgdx}</if>
<if test="createUserid != null ">and d.create_userid = #{createUserid}</if> <if test="createUserid != null ">and d.create_userid = #{createUserid}</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
AND date_format(d.create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
AND date_format(d.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${dataScope} ${dataScope}
order by d.classid order by d.classid