一日流程评估 优化

This commit is contained in:
zhanglipeng 2021-07-28 17:07:23 +08:00
parent 0496f06e40
commit f8a82403eb
4 changed files with 525 additions and 222 deletions

View File

@ -1,39 +1,44 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true" <el-form-item label="选择月份" prop="createTime">
label-width="70px" <el-date-picker
> clearable
<el-form-item label="选择月份" prop="createTime"> size="small"
<el-date-picker class="my-date-picker"
clearable v-model="queryParams.createTime"
size="small" type="month"
style="width: 200px" value-format="yyyy-MM-dd"
v-model="queryParams.createTime" placeholder="选择月份"
type="month" >
value-format="yyyy-MM-dd" </el-date-picker>
placeholder="选择月份" </el-form-item>
> </el-col>
</el-date-picker> <el-col :xs="24" :ms="12" :md="5">
</el-form-item> <el-form-item>
<el-button
<el-form-item> type="primary"
<el-button icon="el-icon-search"
type="primary" size="mini"
icon="el-icon-search" @click="handleQuery"
size="mini" >搜索</el-button
@click="handleQuery" >
>搜索</el-button <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
> >重置</el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" >
>重置</el-button </el-form-item>
> </el-col>
</el-form-item> </el-row>
</el-form> </el-form>
<el-table v-loading="loading" border :default-sort = "{prop: 'bjpjf', order: 'descending'}" :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 +46,118 @@
prop="classid" prop="classid"
:formatter="classFormat" :formatter="classFormat"
/> />
<el-table-column label="班级平均分" align="center" prop="bjpjf" sortable width="110"/> <el-table-column
<el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/> label="班级平均分"
<el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/> align="center"
<el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/> prop="bjpjf"
<el-table-column label="分组教学" align="center" prop="fzjxpjf" sortable width="110"/> sortable
<el-table-column label="点心时间" align="center" prop="dxsjpjf" sortable width="110"/> width="110"
<el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" sortable width="130"/> />
<el-table-column label="活动过渡" align="center" prop="hdgdpjf" sortable width="110"/> <el-table-column
<el-table-column label="户外活动" align="center" prop="hwhdpjf" sortable width="110"/> label="早间接待"
<el-table-column label="午睡" align="center" prop="wspjf" sortable width="80"/> align="center"
<el-table-column label="离园再见" align="center" prop="lyzjpjf" sortable width="110"/> prop="zjjdpjf"
<el-table-column label="安全" align="center" prop="aqpjf" sortable width="80"/> sortable
<el-table-column label="自由活动" align="center" prop="zyhdpjf" sortable width="110"/> width="110"
/>
<el-table-column
label="用餐"
align="center"
prop="ycpjf"
sortable
width="80"
/>
<el-table-column
label="早间坐圈"
align="center"
prop="zjzqpjf"
sortable
width="110"
/>
<el-table-column
label="分组教学"
align="center"
prop="fzjxpjf"
sortable
width="110"
/>
<el-table-column
label="点心时间"
align="center"
prop="dxsjpjf"
sortable
width="110"
/>
<el-table-column
label="如厕洗手饮水"
align="center"
prop="rcxsyspjf"
sortable
width="130"
/>
<el-table-column
label="活动过渡"
align="center"
prop="hdgdpjf"
sortable
width="110"
/>
<el-table-column
label="户外活动"
align="center"
prop="hwhdpjf"
sortable
width="110"
/>
<el-table-column
label="午睡"
align="center"
prop="wspjf"
sortable
width="80"
/>
<el-table-column
label="离园再见"
align="center"
prop="lyzjpjf"
sortable
width="110"
/>
<el-table-column
label="安全"
align="center"
prop="aqpjf"
sortable
width="80"
/>
<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" sortable width="140" prop="gzyjlyspjf"
sortable
width="140"
/>
<el-table-column
label="微型课程"
align="center"
prop="wxkcpjf"
sortable
width="110"
/>
<el-table-column
label="潜课程"
align="center"
prop="qkcpjf"
sortable
width="100"
/> />
<el-table-column label="微型课程" align="center" prop="wxkcpjf" sortable width="110"/>
<el-table-column label="潜课程" align="center" prop="qkcpjf" sortable width="100"/>
</el-table> </el-table>
<pagination <pagination
@ -179,3 +276,20 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

View File

@ -1,12 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <!-- <el-form-item label="学年学期" prop="xnxq">
ref="queryForm"
:inline="true"
label-width="70px"
>
<el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择学年学期"> <el-select v-model="queryParams.xnxq" placeholder="请选择学年学期">
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
@ -15,46 +10,71 @@
:value="dict.dictValue" :value="dict.dictValue"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="班级名称" prop="classid"> <el-row :gutter="10">
<el-select <el-col :xs="24" :ms="12" :md="5">
v-model="queryParams.classid" <el-form-item label="评估时间">
clearable <el-date-picker
size="small" v-model="dateRange"
placeholder="请选择班级" size="small"
> class="my-date-picker"
<el-option value-format="yyyy-MM-dd"
v-for="dict in classOptions" type="daterange"
:key="dict.bjbh" range-separator="-"
:label="dict.bjmc" start-placeholder="开始日期"
:value="dict.bjbh" end-placeholder="结束日期"
></el-option> ></el-date-picker>
</el-select> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="评估时间"> <el-col :xs="24" :ms="12" :md="5">
<el-date-picker <el-form-item label="班级名称" prop="classid">
v-model="dateRange" <el-select
size="small" v-model="queryParams.classid"
class="my-date-picker" clearable
value-format="yyyy-MM-dd" size="small"
type="daterange" placeholder="请选择班级"
range-separator="-" >
start-placeholder="开始日期" <el-option
end-placeholder="结束日期" v-for="dict in classOptions"
></el-date-picker> :key="dict.bjbh"
</el-form-item> :label="dict.bjmc"
<el-form-item> :value="dict.bjbh"
<el-button ></el-option>
type="primary" </el-select>
icon="el-icon-search" </el-form-item>
size="mini" </el-col>
@click="handleQuery" <el-col :xs="24" :ms="12" :md="5">
>搜索</el-button <el-form-item label="选择教师" prop="pgdx">
> <el-select
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" v-model="queryParams.pgdx"
>重置</el-button clearable
> size="small"
</el-form-item> placeholder="请选择教师"
>
<el-option
v-for="dict in userOptions"
:key="dict.userId"
:label="dict.nickName"
:value="dict.userId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<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
>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-table v-loading="loading" border :data="dayflowassessmentList"> <el-table v-loading="loading" border :data="dayflowassessmentList">
@ -191,7 +211,7 @@ import {
getDayflowassessment, getDayflowassessment,
delDayflowassessment, delDayflowassessment,
} from "@/api/benyi/dayflowassessment"; } from "@/api/benyi/dayflowassessment";
import { listClass } from "@/api/system/class"; import { listClass, getUserList } from "@/api/system/class";
import { listUser } from "@/api/system/user"; import { listUser } from "@/api/system/user";
import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger"; import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
@ -217,6 +237,8 @@ export default {
xnxqOptions: [], xnxqOptions: [],
// //
userOptions: [], userOptions: [],
//
userAllOptions: [],
// //
dateRange: [], dateRange: [],
// //
@ -246,6 +268,17 @@ export default {
form: {}, form: {},
}; };
}, },
watch: {
"queryParams.classid": function (val) {
//console.log(val);
if (val != "undefined") {
getUserList(val).then((response) => {
//console.log(response);
this.userOptions = response.rows;
});
}
},
},
created() { created() {
this.getList(); this.getList();
this.getClassList(); this.getClassList();
@ -292,13 +325,13 @@ export default {
/** 查询用户列表 */ /** 查询用户列表 */
getUserList() { getUserList() {
listUser(null).then((response) => { listUser(null).then((response) => {
this.userOptions = response.rows; this.userAllOptions = response.rows;
}); });
}, },
// //
pgdxFormat(row, column) { pgdxFormat(row, column) {
var actions = []; var actions = [];
var datas = this.userOptions; var datas = this.userAllOptions;
Object.keys(datas).map((key) => { Object.keys(datas).map((key) => {
if (datas[key].userId == "" + row.pgdx) { if (datas[key].userId == "" + row.pgdx) {
actions.push(datas[key].nickName); actions.push(datas[key].nickName);
@ -332,8 +365,26 @@ export default {
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.dateRange = []; this.dateRange = [];
this.userOptions = this.userAllOptions;
this.handleQuery(); this.handleQuery();
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

View File

@ -1,74 +1,174 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true" <el-form-item label="评估时间">
label-width="70px" <el-date-picker
> v-model="dateRange"
<el-form-item label="教师姓名" prop="pgdx"> size="small"
<el-select class="my-date-picker"
v-model="queryParams.pgdx" value-format="yyyy-MM-dd"
clearable type="daterange"
size="small" range-separator="-"
placeholder="请选择教师" start-placeholder="开始日期"
> end-placeholder="结束日期"
<el-option ></el-date-picker>
v-for="dict in userOptions" </el-form-item>
:key="dict.userId" </el-col>
:label="dict.nickName" <el-col :xs="24" :ms="12" :md="5">
:value="dict.userId" <el-form-item label="教师姓名" prop="pgdx">
></el-option> <el-select
</el-select> v-model="queryParams.pgdx"
</el-form-item> clearable
<el-form-item label="评估时间"> size="small"
<el-date-picker placeholder="请选择教师"
v-model="dateRange" >
size="small" <el-option
class="my-date-picker" v-for="dict in userOptions"
value-format="yyyy-MM-dd" :key="dict.userId"
type="daterange" :label="dict.nickName"
range-separator="-" :value="dict.userId"
start-placeholder="开始日期" ></el-option>
end-placeholder="结束日期" </el-select>
></el-date-picker> </el-form-item>
</el-form-item> </el-col>
<el-form-item> <el-col :xs="24" :ms="12" :md="5">
<el-button <el-form-item>
type="primary" <el-button
icon="el-icon-search" type="primary"
size="mini" icon="el-icon-search"
@click="handleQuery" size="mini"
>搜索</el-button @click="handleQuery"
> >搜索</el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" >
>重置</el-button <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
> >重置</el-button
</el-form-item> >
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-table v-loading="loading" border :default-sort = "{prop: 'bjpjf', order: 'descending'}" :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" sortable width="110"/> <el-table-column
<el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/> label="最终扣分"
<el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/> align="center"
<el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/> prop="bjpjf"
<el-table-column label="分组教学" align="center" prop="fzjxpjf" sortable width="110"/> sortable
<el-table-column label="点心时间" align="center" prop="dxsjpjf" sortable width="110"/> width="110"
<el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" sortable width="130"/> />
<el-table-column label="活动过渡" align="center" prop="hdgdpjf" sortable width="110"/> <el-table-column
<el-table-column label="户外活动" align="center" prop="hwhdpjf" sortable width="110"/> label="早间接待"
<el-table-column label="午睡" align="center" prop="wspjf" sortable width="80"/> align="center"
<el-table-column label="离园再见" align="center" prop="lyzjpjf" sortable width="110"/> prop="zjjdpjf"
<el-table-column label="安全" align="center" prop="aqpjf" sortable width="80"/> sortable
<el-table-column label="自由活动" align="center" prop="zyhdpjf" sortable width="110"/> width="110"
/>
<el-table-column
label="用餐"
align="center"
prop="ycpjf"
sortable
width="80"
/>
<el-table-column
label="早间坐圈"
align="center"
prop="zjzqpjf"
sortable
width="110"
/>
<el-table-column
label="分组教学"
align="center"
prop="fzjxpjf"
sortable
width="110"
/>
<el-table-column
label="点心时间"
align="center"
prop="dxsjpjf"
sortable
width="110"
/>
<el-table-column
label="如厕洗手饮水"
align="center"
prop="rcxsyspjf"
sortable
width="130"
/>
<el-table-column
label="活动过渡"
align="center"
prop="hdgdpjf"
sortable
width="110"
/>
<el-table-column
label="户外活动"
align="center"
prop="hwhdpjf"
sortable
width="110"
/>
<el-table-column
label="午睡"
align="center"
prop="wspjf"
sortable
width="80"
/>
<el-table-column
label="离园再见"
align="center"
prop="lyzjpjf"
sortable
width="110"
/>
<el-table-column
label="安全"
align="center"
prop="aqpjf"
sortable
width="80"
/>
<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" sortable width="140" prop="gzyjlyspjf"
sortable
width="140"
/>
<el-table-column
label="微型课程"
align="center"
prop="wxkcpjf"
sortable
width="110"
/>
<el-table-column
label="潜课程"
align="center"
prop="qkcpjf"
sortable
width="100"
/> />
<el-table-column label="微型课程" align="center" prop="wxkcpjf" sortable width="110"/>
<el-table-column label="潜课程" align="center" prop="qkcpjf" sortable width="100"/>
</el-table> </el-table>
<pagination <pagination
@ -209,3 +309,20 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

View File

@ -1,65 +1,69 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true" <el-form-item label="选择班级" prop="classid">
label-width="70px" <el-select
> v-model="queryParams.classid"
<el-form-item label="选择班级" prop="classid"> clearable
<el-select size="small"
v-model="queryParams.classid" placeholder="请选择班级"
clearable >
size="small" <el-option
placeholder="请选择班级" v-for="dict in classOptions"
> :key="dict.bjbh"
<el-option :label="dict.bjmc"
v-for="dict in classOptions" :value="dict.bjbh"
:key="dict.bjbh" ></el-option>
:label="dict.bjmc" </el-select>
:value="dict.bjbh" </el-form-item>
></el-option> </el-col>
</el-select> <el-col :xs="24" :ms="12" :md="5">
</el-form-item> <el-form-item label="选择教师" prop="jsid">
<el-form-item label="选择教师" prop="jsid"> <el-select
<el-select v-model="queryParams.jsid"
v-model="queryParams.jsid" clearable
clearable size="small"
size="small" placeholder="请选择教师"
placeholder="请选择教师" >
> <el-option
<el-option v-for="dict in userOptions"
v-for="dict in userOptions" :key="dict.userId"
:key="dict.userId" :label="dict.nickName"
:label="dict.nickName" :value="dict.userId"
:value="dict.userId" ></el-option>
></el-option> </el-select>
</el-select> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="考核月份" prop="month"> <el-col :xs="24" :ms="12" :md="5">
<el-date-picker <el-form-item label="考核月份" prop="month">
clearable <el-date-picker
size="small" clearable
style="width: 200px" size="small"
v-model="queryParams.month" class="my-date-picker"
type="month" v-model="queryParams.month"
value-format="yyyy-MM" type="month"
placeholder="选择月份" value-format="yyyy-MM"
></el-date-picker> placeholder="选择月份"
</el-form-item> ></el-date-picker>
</el-form-item>
<el-form-item> </el-col>
<el-button <el-col :xs="24" :ms="12" :md="5">
type="primary" <el-form-item>
icon="el-icon-search" <el-button
size="mini" type="primary"
@click="handleQuery" icon="el-icon-search"
>搜索</el-button size="mini"
> @click="handleQuery"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" >搜索</el-button
>重置</el-button >
> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
</el-form-item> >重置</el-button
>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
@ -333,7 +337,7 @@ export default {
}, },
watch: { watch: {
"queryParams.classid": function (val) { "queryParams.classid": function (val) {
console.log(val); //console.log(val);
if (val != "undefined") { if (val != "undefined") {
getUserList(val).then((response) => { getUserList(val).then((response) => {
//console.log(response); //console.log(response);
@ -543,3 +547,20 @@ export default {
margin: 0 !important; margin: 0 !important;
} }
</style> </style>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>