一日流程评估优化

This commit is contained in:
zhanglipeng
2021-05-19 15:46:30 +08:00
parent 7b2844b0c2
commit d10108f21e
8 changed files with 574 additions and 554 deletions

View File

@ -1,10 +1,10 @@
import Vue from 'vue' import Vue from "vue";
import Router from 'vue-router' import Router from "vue-router";
Vue.use(Router) Vue.use(Router);
/* Layout */ /* Layout */
import Layout from '@/layout' import Layout from "@/layout";
/** /**
* Note: 路由配置项 * Note: 路由配置项
@ -25,551 +25,570 @@ import Layout from '@/layout'
*/ */
// 公共路由 // 公共路由
export const constantRoutes = [{ export const constantRoutes = [
path: '/redirect', {
path: "/redirect",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: '/redirect/:path(.*)', {
component: () => path: "/redirect/:path(.*)",
import ('@/views/redirect') component: () => import("@/views/redirect")
}] }
]
}, },
{ {
path: '/login', path: "/login",
component: () => component: () => import("@/views/login"),
import ('@/views/login'),
hidden: true hidden: true
}, },
{ {
path: '/wxlogin', path: "/wxlogin",
component: () => component: () => import("@/views/wxlogin"),
import ('@/views/wxlogin'),
hidden: true hidden: true
}, },
{ {
path: '/404', path: "/404",
component: () => component: () => import("@/views/error/404"),
import ('@/views/error/404'),
hidden: true hidden: true
}, },
{ {
path: '/401', path: "/401",
component: () => component: () => import("@/views/error/401"),
import ('@/views/error/401'),
hidden: true hidden: true
}, },
{ {
path: '/experience/content/:id', path: "/experience/content/:id",
component: () => component: () => import("@/views/benyi/experience/content"),
import ('@/views/benyi/experience/content'),
hidden: true hidden: true
}, },
{ {
path: '/activity', path: "/activity",
component: () => component: () => import("@/views/benyi/activity"),
import ('@/views/benyi/activity'),
hidden: true hidden: true
}, },
{ {
path: '/week', path: "/week",
component: () => component: () => import("@/views/benyi/themeweekplan/table"),
import ('@/views/benyi/themeweekplan/table'),
hidden: true hidden: true
}, },
{ {
path: '/month', path: "/month",
component: () => component: () => import("@/views/benyi/thememonthplan/table"),
import ('@/views/benyi/thememonthplan/table'),
hidden: true hidden: true
}, },
{ {
path: '/term', path: "/term",
component: () => component: () => import("@/views/benyi/themetermplan/table"),
import ('@/views/benyi/themetermplan/table'),
hidden: true hidden: true
}, },
{ {
path: '/play', path: "/play",
component: () => component: () => import("@/views/benyi/planweek/table"),
import ('@/views/benyi/planweek/table'),
hidden: true hidden: true
}, },
{ {
path: '/benyi_child/child_preserve', path: "/benyi_child/child_preserve",
component: () => component: () => import("@/views/benyi/child_preserve/index"),
import ('@/views/benyi/child_preserve/index'),
hidden: true, hidden: true,
children: [{ children: [
path: '/benyi_child/child_preserve',
component: () =>
import ('@/views/benyi/child_preserve/index'),
hidden: true
}, ]
},
{ {
path: '/experience/apply/:id(\\d+)', path: "/benyi_child/child_preserve",
component: () => component: () => import("@/views/benyi/child_preserve/index"),
import ('@/views/benyi/experience/choose'),
hidden: true,
children: [{
path: '/experience/apply/:id(\\d+)',
component: () =>
import ('@/views/benyi/experience/apply'),
hidden: true
},
{
path: '/experience/result/:id(\\d+)',
component: () =>
import ('@/views/benyi/experience/result'),
hidden: true hidden: true
} }
] ]
}, },
{ {
path: '', path: "/experience/apply/:id(\\d+)",
component: () => import("@/views/benyi/experience/choose"),
hidden: true,
children: [
{
path: "/experience/apply/:id(\\d+)",
component: () => import("@/views/benyi/experience/apply"),
hidden: true
},
{
path: "/experience/result/:id(\\d+)",
component: () => import("@/views/benyi/experience/result"),
hidden: true
}
]
},
{
path: "",
component: Layout, component: Layout,
redirect: 'index', redirect: "index",
children: [{ children: [
path: 'index', {
component: () => path: "index",
import ('@/views/index'), component: () => import("@/views/index"),
name: '首页', name: "首页",
meta: { meta: {
title: '首页', title: "首页",
icon: 'dashboard', icon: "dashboard",
noCache: true, noCache: true,
affix: true affix: true
} }
}] }
]
}, },
{ {
path: '/user', path: "/user",
component: Layout, component: Layout,
hidden: true, hidden: true,
redirect: 'noredirect', redirect: "noredirect",
children: [{ children: [
path: 'profile', {
component: () => path: "profile",
import ('@/views/system/user/profile/index'), component: () => import("@/views/system/user/profile/index"),
name: 'Profile', name: "Profile",
meta: { meta: {
title: '个人中心', title: "个人中心",
icon: 'user' icon: "user"
} }
}] }
]
}, },
{ {
path: '/user/bind', path: "/user/bind",
component: Layout, component: Layout,
hidden: true, hidden: true,
redirect: 'noredirect', redirect: "noredirect",
children: [{ children: [
path: 'wx', {
component: () => path: "wx",
import ('@/views/system/user/wx/index'), component: () => import("@/views/system/user/wx/index"),
name: 'Wx', name: "Wx",
meta: { meta: {
title: '绑定微信', title: "绑定微信",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/user/change', path: "/user/change",
component: Layout, component: Layout,
hidden: true, hidden: true,
redirect: 'noredirect', redirect: "noredirect",
children: [{ children: [
path: 'dept', {
component: () => path: "dept",
import ('@/views/system/user/change/dept/index'), component: () => import("@/views/system/user/change/dept/index"),
name: 'Changedept', name: "Changedept",
meta: { meta: {
title: '切换岗位', title: "切换岗位",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/dict', path: "/dict",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'type/data/:dictId(\\d+)', {
component: () => path: "type/data/:dictId(\\d+)",
import ('@/views/system/dict/data'), component: () => import("@/views/system/dict/data"),
name: 'Data', name: "Data",
meta: { meta: {
title: '字典数据', title: "字典数据",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/dayflow', path: "/dayflow",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'dayflowmanger/dayflowtask/:id(\\d+)', {
component: () => path: "dayflowmanger/dayflowtask/:id(\\d+)",
import ('@/views/benyi/dayflow/task'), component: () => import("@/views/benyi/dayflow/task"),
name: 'Task', name: "Task",
meta: { meta: {
title: '一日流程任务', title: "一日流程任务",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/dayflow/dayflowmanger', path: "/dayflow/dayflowmanger",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'dayflowtask/standard/:code(\\d+)', {
component: () => path: "dayflowtask/standard/:code(\\d+)",
import ('@/views/benyi/dayflow/standard'), component: () => import("@/views/benyi/dayflow/standard"),
name: 'Standard', name: "Standard",
meta: { meta: {
title: '一日流程标准', title: "一日流程标准",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/dayflow/dayflowmanger/dayflowtask', path: "/dayflow/dayflowmanger/dayflowtask",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'standard/unscramble/:id(\\d+)', {
component: () => path: "standard/unscramble/:id(\\d+)",
import ('@/views/benyi/dayflow/unscramble'), component: () => import("@/views/benyi/dayflow/unscramble"),
name: 'unscramble', name: "unscramble",
meta: { meta: {
title: '一日流程标准解读', title: "一日流程标准解读",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/video_study', path: "/video_study",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'study/detail/:id(\\d+)', {
component: () => path: "study/detail/:id(\\d+)",
import ('@/views/benyi_train/video_study/detail'), component: () => import("@/views/benyi_train/video_study/detail"),
name: 'Detail', name: "Detail",
meta: { meta: {
title: '培训视频详情', title: "培训视频详情",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/planweek', path: "/benyi_course/planweek",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'data/:id', {
component: () => path: "data/:id",
import ('@/views/benyi/planweek/data'), component: () => import("@/views/benyi/planweek/data"),
name: 'planweek1', name: "planweek1",
meta: { meta: {
title: '周计划(明细)', title: "周计划(明细)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/theme', path: "/benyi_course/theme",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'activity/:id(\\d+)', {
component: () => path: "activity/:id(\\d+)",
import ('@/views/benyi/theme/activity'), component: () => import("@/views/benyi/theme/activity"),
name: 'Theme1', name: "Theme1",
meta: { meta: {
title: '主题整合内容', title: "主题整合内容",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/mathtermplan', path: "/benyi_course/mathtermplan",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'data/:id', {
component: () => path: "data/:id",
import ('@/views/benyi/mathtermplan/data'), component: () => import("@/views/benyi/mathtermplan/data"),
name: 'Mathtermplan1', name: "Mathtermplan1",
meta: { meta: {
title: '游戏数学学期计划(明细)', title: "游戏数学学期计划(明细)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/mathtermplanprint', path: "/benyi_course/mathtermplanprint",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'table/:id', {
component: () => path: "table/:id",
import ('@/views/benyi/mathtermplan/table'), component: () => import("@/views/benyi/mathtermplan/table"),
name: 'Mathtermplan2', name: "Mathtermplan2",
meta: { meta: {
title: '游戏数学学期计划(表格)', title: "游戏数学学期计划(表格)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/themetermplan', path: "/benyi_course/themetermplan",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'data/:id', {
component: () => path: "data/:id",
import ('@/views/benyi/themetermplan/data'), component: () => import("@/views/benyi/themetermplan/data"),
name: 'Themetermplan1', name: "Themetermplan1",
meta: { meta: {
title: '主题整合学期计划(明细)', title: "主题整合学期计划(明细)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/thememonthplan', path: "/benyi_course/thememonthplan",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'data/:id', {
component: () => path: "data/:id",
import ('@/views/benyi/thememonthplan/data'), component: () => import("@/views/benyi/thememonthplan/data"),
name: 'Thememonthplan1', name: "Thememonthplan1",
meta: { meta: {
title: '主题整合月计划(明细)', title: "主题整合月计划(明细)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/themeweekplan', path: "/benyi_course/themeweekplan",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'data/:id', {
component: () => path: "data/:id",
import ('@/views/benyi/themeweekplan/data'), component: () => import("@/views/benyi/themeweekplan/data"),
name: 'Themeweekplan1', name: "Themeweekplan1",
meta: { meta: {
title: '主题整合周计划(明细)', title: "主题整合周计划(明细)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/themeweekplanprint', path: "/benyi_course/themeweekplanprint",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'table/:id', {
component: () => path: "table/:id",
import ('@/views/benyi/themeweekplan/table'), component: () => import("@/views/benyi/themeweekplan/table"),
name: 'Themeweekplan2', name: "Themeweekplan2",
meta: { meta: {
title: '主题整合周计划(表格)', title: "主题整合周计划(表格)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/planweekprint', path: "/benyi_course/planweekprint",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'table/:id', {
component: () => path: "table/:id",
import ('@/views/benyi/planweek/table'), component: () => import("@/views/benyi/planweek/table"),
name: 'planweek2', name: "planweek2",
meta: { meta: {
title: '主题整合周计划(表格)', title: "主题整合周计划(表格)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/thememonthplanprint', path: "/benyi_course/thememonthplanprint",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'table/:id', {
component: () => path: "table/:id",
import ('@/views/benyi/thememonthplan/table'), component: () => import("@/views/benyi/thememonthplan/table"),
name: 'Thememonthplan2', name: "Thememonthplan2",
meta: { meta: {
title: '主题整合月计划(表格)', title: "主题整合月计划(表格)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/themetermplanprint', path: "/benyi_course/themetermplanprint",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'table/:id', {
component: () => path: "table/:id",
import ('@/views/benyi/themetermplan/table'), component: () => import("@/views/benyi/themetermplan/table"),
name: 'Themetermplan2', name: "Themetermplan2",
meta: { meta: {
title: '主题整合学期计划(表格)', title: "主题整合学期计划(表格)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/learndevelopmentteacherprint', path: "/benyi_course/learndevelopmentteacherprint",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'table/:id', {
component: () => path: "table/:id",
import ('@/views/benyi/learndevelopmentteacher/table'), component: () => import("@/views/benyi/learndevelopmentteacher/table"),
name: 'learndevelopmentteacher2', name: "learndevelopmentteacher2",
meta: { meta: {
title: '幼儿学习和发展档案(教师)(表格)', title: "幼儿学习和发展档案(教师)(表格)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/learndevelopmentfamilyprint', path: "/benyi_course/learndevelopmentfamilyprint",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'table/:id', {
component: () => path: "table/:id",
import ('@/views/benyi/learndevelopmentfamily/table'), component: () => import("@/views/benyi/learndevelopmentfamily/table"),
name: 'learndevelopmentfamily2', name: "learndevelopmentfamily2",
meta: { meta: {
title: '幼儿学习和发展档案(家长)(表格)', title: "幼儿学习和发展档案(家长)(表格)",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi_course/math', path: "/benyi_course/math",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'plan/:id(\\d+)', {
component: () => path: "plan/:id(\\d+)",
import ('@/views/benyi/math/plan'), component: () => import("@/views/benyi/math/plan"),
name: 'Math1', name: "Math1",
meta: { meta: {
title: '游戏数学方案', title: "游戏数学方案",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi/dayflowassessment', path: "/benyi/dayflowassessment",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'teacher', {
component: () => path: "teacher",
import ('@/views/benyi/dayflowassessment/teacher'), component: () => import("@/views/benyi/dayflowassessment/teacher"),
name: 'dayflowassessmentteacher', name: "dayflowassessmentteacher",
meta: { meta: {
title: '一日流程评估', title: "一日流程评估",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi/dayflowassessments', path: "/benyi/dayflowassessments",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'details/:id(\\d+)', {
component: () => path: "details/:id(\\d+)",
import ('@/views/benyi/dayflowassessment/details'), component: () => import("@/views/benyi/dayflowassessment/details"),
name: 'dayflowassessmentteacherdetails', name: "dayflowassessmentteacherdetails",
meta: { meta: {
title: '一日流程评估详情', title: "一日流程评估详情",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi/assessmentchild', path: "/benyi/assessmentchild",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'student/:id(\\d+)', {
component: () => path: "student/:id(\\d+)",
import ('@/views/benyi/assessment/student'), component: () => import("@/views/benyi/assessment/student"),
name: 'assessmentchild', name: "assessmentchild",
meta: { meta: {
title: '幼儿评估详情', title: "幼儿评估详情",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/benyi/assessmentchildhistory', path: "/benyi/assessmentchildhistory",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'student/:id(\\d+)', {
component: () => path: "student/:id(\\d+)",
import ('@/views/benyi/assessment/history'), component: () => import("@/views/benyi/assessment/history"),
name: 'assessmentchildhistory', name: "assessmentchildhistory",
meta: { meta: {
title: '幼儿评估图表', title: "幼儿评估图表",
icon: '' icon: ""
} }
}] }
]
}, },
{ {
path: '/job', path: "/job",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'log', {
component: () => path: "log",
import ('@/views/monitor/job/log'), component: () => import("@/views/monitor/job/log"),
name: 'JobLog', name: "JobLog",
meta: { meta: {
title: '调度日志' title: "调度日志"
} }
}] }
]
}, },
{ {
path: '/gen', path: "/gen",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [
path: 'edit', {
component: () => path: "edit",
import ('@/views/tool/gen/editTable'), component: () => import("@/views/tool/gen/editTable"),
name: 'GenEdit', name: "GenEdit",
meta: { meta: {
title: '修改生成配置' title: "修改生成配置"
} }
}]
} }
] ]
}
];
export default new Router({ export default new Router({
mode: 'history', // 去掉url中的# mode: "history", // 去掉url中的#
scrollBehavior: () => ({ scrollBehavior: () => ({
y: 0 y: 0
}), }),
routes: constantRoutes routes: constantRoutes
}) });

View File

@ -5,7 +5,7 @@
<span>班级{{ classFormat(this.classid) }} </span> <span>班级{{ classFormat(this.classid) }} </span>
<span> 评估对象{{ pgdxFormat(this.pgdx) }} </span> <span> 评估对象{{ pgdxFormat(this.pgdx) }} </span>
<span> 评估时间{{ this.createtime }} </span> <span> 评估时间{{ this.createtime }} </span>
<span> {{ this.df }} </span> <span> {{ this.df }} </span>
</p> </p>
</div> </div>
<el-tabs v-model="activeName" type="card"> <el-tabs v-model="activeName" type="card">
@ -71,7 +71,7 @@ import { listClass, getUserList } from "@/api/system/class";
import { listUser } from "@/api/system/user"; import { listUser } from "@/api/system/user";
export default { export default {
name: "Assessmentstudentdetails", name: "dayflowassessmentteacherdetails",
data() { data() {
return { return {
id: "", id: "",

View File

@ -86,7 +86,7 @@
prop="pgdx" prop="pgdx"
:formatter="pgdxFormat" :formatter="pgdxFormat"
/> />
<el-table-column label="最终分" align="center" prop="zzdf" /> <el-table-column label="最终分" align="center" prop="zzdf" />
<el-table-column <el-table-column
label="评估人" label="评估人"
align="center" align="center"

View File

@ -109,7 +109,7 @@ import { listClass, getUserList } from "@/api/system/class";
import { listUser } from "@/api/system/user"; import { listUser } from "@/api/system/user";
export default { export default {
name: "Assessmentstudent", name: "dayflowassessmentteacher",
data() { data() {
return { return {

View File

@ -87,7 +87,7 @@
:formatter="createUserFormat" :formatter="createUserFormat"
/> />
<el-table-column <el-table-column
label="最终分" label="最终分"
align="center" align="center"
prop="zzdf" prop="zzdf"
width="110" width="110"

View File

@ -49,7 +49,7 @@
<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 label="最终分" align="center" prop="bjpjf" sortable width="110"/>
<el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/> <el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/>
<el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/> <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="zjzqpjf" sortable width="110"/>

View File

@ -116,7 +116,7 @@
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${dataScope} ${dataScope}
order by d.classid order by d.create_time desc
</where> </where>
</select> </select>

View File

@ -38,6 +38,7 @@
<if test="starttime != null ">and starttime = #{starttime}</if> <if test="starttime != null ">and starttime = #{starttime}</if>
<if test="createUserid != null ">and create_userid = #{createUserid}</if> <if test="createUserid != null ">and create_userid = #{createUserid}</if>
</where> </where>
order by create_time desc
</select> </select>
<select id="selectByDayflowassessmentplanById" parameterType="Long" resultMap="ByDayflowassessmentplanResult"> <select id="selectByDayflowassessmentplanById" parameterType="Long" resultMap="ByDayflowassessmentplanResult">