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

一日流程评估优化

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1113
ruoyi-ui/src/router/index.js
View File

File diff suppressed because it is too large Load Diff

4
ruoyi-ui/src/views/benyi/dayflowassessment/details.vue
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: "",

2
ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
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"

2
ruoyi-ui/src/views/benyi/dayflowassessment/teacher.vue
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 {

2
ruoyi-ui/src/views/benyi/dayflowassessmentteacher/index.vue
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"

2
ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue
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"/>

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

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

1
ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml
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">