一日流程评估优化

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

View File

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

View File

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

View File

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

View File

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

View File

@ -49,7 +49,7 @@
<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="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="ycpjf" sortable width="80"/>
<el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/>

View File

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

View File

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