页面样式,一日流程评估

This commit is contained in:
zhanglipeng
2021-04-23 16:19:56 +08:00
parent aec2eb18c3
commit 480c520bbc
10 changed files with 361 additions and 325 deletions

View File

@ -27,6 +27,15 @@ export function listDayflowassessmentPjf(query) {
});
}
// 查询幼儿园一日流程评估列表 教师平均分
export function listDayflowassessmentTeacherAvg(query) {
return request({
url: "/benyi/dayflowassessment/listteacheravg",
method: "get",
params: query
});
}
// 查询幼儿园一日流程评估详细
export function getDayflowassessment(id) {
return request({

View File

@ -1,58 +1,51 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
label-width="70px"
>
<!-- <el-form-item label="所属计划" prop="planid">
<el-select v-model="queryParams.planid" placeholder="请选择评估计划">
<el-option
v-for="dict in dayflowassessmentplanOptions"
:key="dict.id"
:label="dict.name"
:value="dict.id"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择学年学期">
<el-option
v-for="dict in xnxqOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="班级名称" prop="classid">
<el-select
v-model="queryParams.classid"
clearable
size="small"
placeholder="请选择班级"
>
<el-option
v-for="dict in classOptions"
:key="dict.bjbh"
:label="dict.bjmc"
:value="dict.bjbh"
></el-option>
</el-select>
</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
>
</el-form-item>
<el-form :model="queryParams" ref="queryForm" label-width="70px">
<el-row :gutter="10">
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择学年学期">
<el-option
v-for="dict in xnxqOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="班级名称" prop="classid">
<el-select
v-model="queryParams.classid"
clearable
size="small"
placeholder="请选择班级"
>
<el-option
v-for="dict in classOptions"
:key="dict.bjbh"
:label="dict.bjmc"
:value="dict.bjbh"
></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>
<div class="mb8 btn-list">
@ -68,6 +61,7 @@
<el-table
v-loading="loading"
border
:data="dayflowassessmentList"
@selection-change="handleSelectionChange"
>
@ -75,6 +69,7 @@
<!-- <el-table-column label="所属计划" align="center" prop="planid" :formatter="planFormat"/> -->
<el-table-column
label="学年学期"
fixed
align="center"
prop="xnxq"
:formatter="xnxqFormat"
@ -85,40 +80,12 @@
prop="classid"
:formatter="classFormat"
/>
<!-- <el-table-column label="班级平均分" align="center" prop="classdf" /> -->
<!-- <el-table-column
label="主班教师"
align="center"
prop="bzbh"
:formatter="bzbhFormat"
/>
<el-table-column
label="配班教师"
align="center"
prop="pbbh"
:formatter="pbbhFormat"
/>
<el-table-column
label="助理教师"
align="center"
prop="zlbh"
:formatter="zlbhFormat"
/> -->
<el-table-column
label="评估对象"
align="center"
prop="pgdx"
:formatter="pgdxFormat"
/>
<!-- <el-table-column
label="评估环节"
align="center"
prop="bzid"
:formatter="dayFlowFormat"
/>
<el-table-column label="环节满分" align="center" prop="bzmf" /> -->
<!-- <el-table-column label="扣分值" align="center" prop="kfz" /> -->
<!-- <el-table-column label="扣分次数" align="center" prop="kfcs" /> -->
<el-table-column label="最终得分" align="center" prop="zzdf" />
<el-table-column
label="评估人"
@ -128,9 +95,11 @@
/>
<el-table-column label="评估时间" align="center" prop="createTime" />
<el-table-column
fixed="right"
label="操作"
align="center"
class-name="small-padding fixed-width"
width="60"
class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
@ -339,4 +308,21 @@ 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,109 +1,109 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
label-width="70px"
>
<el-form-item label="学年学期" prop="xnxq">
<el-select
v-model="queryParams.xnxq"
placeholder="请选择学年学期"
clearable
size="small"
>
<el-option
v-for="dict in xnxqOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="评估月份" prop="month">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.month"
type="month"
value-format="yyyy-MM-dd"
placeholder="选择评估月份"
>
</el-date-picker>
</el-form-item>
<el-form-item label="评估班级" prop="classid">
<el-select
v-model="queryParams.classid"
clearable
size="small"
placeholder="请选择班级"
>
<el-option
v-for="dict in classOptions"
:key="dict.bjbh"
:label="dict.bjmc"
:value="dict.bjbh"
></el-option>
</el-select>
</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
>
</el-form-item>
<el-form :model="queryParams" ref="queryForm" label-width="70px">
<el-row :gutter="10">
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="学年学期" prop="xnxq">
<el-select
v-model="queryParams.xnxq"
placeholder="请选择学年学期"
clearable
size="small"
>
<el-option
v-for="dict in xnxqOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="评估月份" prop="month">
<el-date-picker
clearable
size="small"
v-model="queryParams.month"
type="month"
class="my-date-picker"
value-format="yyyy-MM-dd"
placeholder="选择评估月份"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="评估班级" prop="classid">
<el-select
v-model="queryParams.classid"
clearable
size="small"
placeholder="请选择班级"
>
<el-option
v-for="dict in classOptions"
:key="dict.bjbh"
:label="dict.bjmc"
:value="dict.bjbh"
></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-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['benyi:dayflowassessmentplan:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['benyi:dayflowassessmentplan:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['benyi:dayflowassessmentplan:remove']"
>删除</el-button
>
</el-col>
</el-row>
<div class="mb8 btn-list">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['benyi:dayflowassessmentplan:add']"
>新增</el-button
>
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['benyi:dayflowassessmentplan:edit']"
>修改</el-button
>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['benyi:dayflowassessmentplan:remove']"
>删除</el-button
>
</div>
<el-table
v-loading="loading"
border
:data="dayflowassessmentplanList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="计划名称" align="center" prop="name" />
<el-table-column label="计划名称" fixed align="center" prop="name" />
<el-table-column
label="评估学年学期"
align="center"
@ -116,15 +116,22 @@
prop="classid"
:formatter="classFormat"
/>
<el-table-column label="评估内容" align="center" prop="connent" :formatter="dayFlowFormat"/>
<el-table-column
label="评估内容"
align="center"
prop="connent"
:formatter="dayFlowFormat"
/>
<!-- <el-table-column label="内容分数" align="center" prop="score" />
<el-table-column label="班级所得平均分" align="center" prop="classavg" /> -->
<el-table-column label="评估时间" align="center" prop="starttime" />
<!-- <el-table-column label="创建人" align="center" prop="createUserid" /> -->
<el-table-column
fixed="right"
label="操作"
align="center"
class-name="small-padding fixed-width"
width="60"
class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
@ -179,7 +186,11 @@
</el-select>
</el-form-item>
<el-form-item label="评估内容" prop="connent">
<el-select v-model="form.connent" placeholder="请选择评估内容" @change="handleChange">
<el-select
v-model="form.connent"
placeholder="请选择评估内容"
@change="handleChange"
>
<el-option
v-for="dict in detailOptions"
:key="dict.id"

View File

@ -6,9 +6,9 @@
:inline="true"
label-width="70px"
>
<el-form-item label="教师姓名" prop="classid">
<el-form-item label="教师姓名" prop="pgdx">
<el-select
v-model="queryParams.classid"
v-model="queryParams.pgdx"
clearable
size="small"
placeholder="请选择教师"
@ -51,11 +51,10 @@
<el-table-column
label="评估对象"
align="center"
prop="pgdx"
prop="pgdxxm"
fixed
:formatter="pgdxFormat"
/>
<el-table-column label="最终得分" align="center" prop="zzdf" />
<el-table-column label="最终得分" align="center" prop="bjpjf" />
<el-table-column label="早间接待" align="center" prop="zjjdpjf" />
<el-table-column label="用餐" align="center" prop="ycpjf" />
<el-table-column label="早间坐圈" align="center" prop="zjzqpjf" />
@ -89,9 +88,7 @@
<script>
import {
listDayflowassessment,
getDayflowassessment,
delDayflowassessment,
listDayflowassessmentTeacherAvg,
} from "@/api/benyi/dayflowassessment";
import { listClass } from "@/api/system/class";
import { listUser } from "@/api/system/user";
@ -161,7 +158,7 @@ export default {
/** 查询幼儿园一日流程评估列表 */
getList() {
this.loading = true;
listDayflowassessment(this.queryParams).then((response) => {
listDayflowassessmentTeacherAvg(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
this.dayflowassessmentList = response.rows;
this.total = response.total;
this.loading = false;
@ -185,44 +182,12 @@ export default {
});
return actions.join("");
},
// 学年学期类型--字典状态字典翻译
xnxqFormat(row, column) {
return this.selectDictLabel(this.xnxqOptions, row.xnxq);
},
/** 查询用户列表 */
getUserList() {
listUser(null).then((response) => {
this.userOptions = response.rows;
});
},
// 教师字典翻译
pgdxFormat(row, column) {
var actions = [];
var datas = this.userOptions;
Object.keys(datas).map((key) => {
if (datas[key].userId == "" + row.pgdx) {
actions.push(datas[key].nickName);
return false;
}
});
return actions.join("");
},
// 教师字典翻译
createUserFormat(row, column) {
var actions = [];
var datas = this.userOptions;
Object.keys(datas).map((key) => {
if (datas[key].userId == "" + row.createUserid) {
actions.push(datas[key].nickName);
return false;
}
});
return actions.join("");
},
// 学年学期类型--字典状态字典翻译
xnxqFormat(row, column) {
return this.selectDictLabel(this.xnxqOptions, row.xnxq);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@ -230,6 +195,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},

View File

@ -3,114 +3,88 @@
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
label-width="70px"
>
<el-form-item label="新闻类型" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择类型"
clearable
size="small"
>
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="新闻标题" prop="title">
<el-input
v-model="queryParams.title"
type="text"
placeholder="请输入新闻标题"
/>
</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
>
</el-form-item>
<el-row :gutter="10">
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="新闻类型" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择类型"
clearable
size="small"
>
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="新闻标题" prop="title">
<el-input
v-model="queryParams.title"
type="text"
placeholder="请输入新闻标题"
/>
</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-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['benyi:news:add']"
>新增</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['benyi:news:edit']"
>修改</el-button
>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['benyi:news:remove']"
>删除</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['benyi:news:export']"
>导出</el-button
>
</el-col> -->
</el-row>
<div class="mb8 btn-list">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['benyi:news:add']"
>新增</el-button
>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['benyi:news:remove']"
>删除</el-button
>
</div>
<el-table
v-loading="loading"
border
:data="newsList"
@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="title" />
<el-table-column fixed label="新闻标题" align="center" prop="title" />
<el-table-column
label="新闻类型"
align="center"
prop="type"
:formatter="typeFormat"
/>
<!-- <el-table-column
label="内容"
align="center"
prop="content"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<div class="ql-editor" v-html="scope.row.content"></div>
</template>
</el-table-column> -->
<el-table-column
label="所属学校"
align="center"
@ -127,16 +101,17 @@
label="审核时间"
align="center"
prop="checkTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
align="center"
class-name="small-padding fixed-width"
width="60"
class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
@ -175,9 +150,13 @@
width="1024px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="新闻标题" prop="title">
<el-input v-model="form.title" type="text" placeholder="请输入新闻标题" />
<el-input
v-model="form.title"
type="text"
placeholder="请输入新闻标题"
/>
</el-form-item>
<!-- <el-form-item label="类型">
<el-select v-model="form.type" placeholder="请选择类型">
@ -448,15 +427,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除选中的新闻中心数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
this.$confirm("是否确认删除选中的新闻中心数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return delNews(ids);
})
@ -486,3 +461,20 @@ export default {
};
</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>