From 6291a869d318876fb2067ee876366e0ea055c819 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 23 Nov 2020 10:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=93=8D=E5=BA=94?=
=?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/benyi/assessment/history.vue | 188 ++++++++++++++++++
.../src/views/benyi/checkindetail/index.vue | 4 +-
ruoyi-ui/src/views/benyi/child/index.vue | 4 +-
.../src/views/benyi/contactpeople/index.vue | 6 +-
ruoyi-ui/src/views/benyi/experience/index.vue | 2 -
.../src/views/benyi/healthcheck/index.vue | 9 +-
.../src/views/benyi/schoolcalendar/index.vue | 7 +-
.../views/benyi/schoolcalendarclass/index.vue | 8 +-
ruoyi-ui/src/views/system/class/index.vue | 8 +-
ruoyi-ui/src/views/system/teacher/index.vue | 10 +-
ruoyi-ui/src/views/system/user/index.vue | 4 +-
11 files changed, 216 insertions(+), 34 deletions(-)
diff --git a/ruoyi-ui/src/views/benyi/assessment/history.vue b/ruoyi-ui/src/views/benyi/assessment/history.vue
index 7e5475282..a845f4899 100644
--- a/ruoyi-ui/src/views/benyi/assessment/history.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/history.vue
@@ -73,24 +73,212 @@
</el-tab-pane>
<el-tab-pane label="语言" name="two">
<radar-chart_yy :psMsg="item.dictValue" v-if="childTab === 'two'" />
+ <div class="block">
+ <h2 class="block-item-title flex align-center">教育建议</h2>
+ <div
+ class="block"
+ v-for="itemLy in assessmentcontentList.filter(
+ p => p.parentId == item.dictValue && p.name == '语言'
+ )"
+ :key="itemLy.id"
+ >
+ {{ itemLy.name }}
+ <div
+ class="block"
+ v-for="itemFzly in assessmentcontentList.filter(
+ p => p.parentId == itemLy.id
+ )"
+ :key="itemFzly.id"
+ >
+ <h2 class="block-item-title flex align-center">
+ {{ itemFzly.name }}
+ </h2>
+ <ul class="block-content">
+ <li
+ v-for="itemMb in assessmentcontentList.filter(
+ p => p.parentId == itemFzly.id
+ )"
+ :key="itemMb.id"
+ >
+ <p class="block-content-title">
+ <span class="num">{{ itemMb.sort }}. </span
+ >{{ itemMb.name }}
+ </p>
+ <div
+ class="checkbox-content"
+ v-for="itemYs in assessmentcontentList.filter(
+ p => p.parentId == itemMb.id
+ )"
+ :key="itemYs.id"
+ >
+ <p class="checkbox-item flex align-center">
+ {{ itemYs.jyjy }}
+ </p>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
</el-tab-pane>
<el-tab-pane label="社会" name="three">
<radar-chart_sh
:psMsg="item.dictValue"
v-if="childTab === 'three'"
/>
+ <div class="block">
+ <h2 class="block-item-title flex align-center">教育建议</h2>
+ <div
+ class="block"
+ v-for="itemLy in assessmentcontentList.filter(
+ p => p.parentId == item.dictValue && p.name == '社会'
+ )"
+ :key="itemLy.id"
+ >
+ {{ itemLy.name }}
+ <div
+ class="block"
+ v-for="itemFzly in assessmentcontentList.filter(
+ p => p.parentId == itemLy.id
+ )"
+ :key="itemFzly.id"
+ >
+ <h2 class="block-item-title flex align-center">
+ {{ itemFzly.name }}
+ </h2>
+ <ul class="block-content">
+ <li
+ v-for="itemMb in assessmentcontentList.filter(
+ p => p.parentId == itemFzly.id
+ )"
+ :key="itemMb.id"
+ >
+ <p class="block-content-title">
+ <span class="num">{{ itemMb.sort }}. </span
+ >{{ itemMb.name }}
+ </p>
+ <div
+ class="checkbox-content"
+ v-for="itemYs in assessmentcontentList.filter(
+ p => p.parentId == itemMb.id
+ )"
+ :key="itemYs.id"
+ >
+ <p class="checkbox-item flex align-center">
+ {{ itemYs.jyjy }}
+ </p>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
</el-tab-pane>
<el-tab-pane label="科学" name="four">
<radar-chart_kx
:psMsg="item.dictValue"
v-if="childTab === 'four'"
/>
+ <div class="block">
+ <h2 class="block-item-title flex align-center">教育建议</h2>
+ <div
+ class="block"
+ v-for="itemLy in assessmentcontentList.filter(
+ p => p.parentId == item.dictValue && p.name == '科学'
+ )"
+ :key="itemLy.id"
+ >
+ {{ itemLy.name }}
+ <div
+ class="block"
+ v-for="itemFzly in assessmentcontentList.filter(
+ p => p.parentId == itemLy.id
+ )"
+ :key="itemFzly.id"
+ >
+ <h2 class="block-item-title flex align-center">
+ {{ itemFzly.name }}
+ </h2>
+ <ul class="block-content">
+ <li
+ v-for="itemMb in assessmentcontentList.filter(
+ p => p.parentId == itemFzly.id
+ )"
+ :key="itemMb.id"
+ >
+ <p class="block-content-title">
+ <span class="num">{{ itemMb.sort }}. </span
+ >{{ itemMb.name }}
+ </p>
+ <div
+ class="checkbox-content"
+ v-for="itemYs in assessmentcontentList.filter(
+ p => p.parentId == itemMb.id
+ )"
+ :key="itemYs.id"
+ >
+ <p class="checkbox-item flex align-center">
+ {{ itemYs.jyjy }}
+ </p>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
</el-tab-pane>
<el-tab-pane label="艺术" name="five">
<radar-chart_ys
:psMsg="item.dictValue"
v-if="childTab === 'five'"
/>
+ <div class="block">
+ <h2 class="block-item-title flex align-center">教育建议</h2>
+ <div
+ class="block"
+ v-for="itemLy in assessmentcontentList.filter(
+ p => p.parentId == item.dictValue && p.name == '艺术'
+ )"
+ :key="itemLy.id"
+ >
+ {{ itemLy.name }}
+ <div
+ class="block"
+ v-for="itemFzly in assessmentcontentList.filter(
+ p => p.parentId == itemLy.id
+ )"
+ :key="itemFzly.id"
+ >
+ <h2 class="block-item-title flex align-center">
+ {{ itemFzly.name }}
+ </h2>
+ <ul class="block-content">
+ <li
+ v-for="itemMb in assessmentcontentList.filter(
+ p => p.parentId == itemFzly.id
+ )"
+ :key="itemMb.id"
+ >
+ <p class="block-content-title">
+ <span class="num">{{ itemMb.sort }}. </span
+ >{{ itemMb.name }}
+ </p>
+ <div
+ class="checkbox-content"
+ v-for="itemYs in assessmentcontentList.filter(
+ p => p.parentId == itemMb.id
+ )"
+ :key="itemYs.id"
+ >
+ <p class="checkbox-item flex align-center">
+ {{ itemYs.jyjy }}
+ </p>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
</el-tab-pane>
</el-tabs>
<!-- <div>sf
diff --git a/ruoyi-ui/src/views/benyi/checkindetail/index.vue b/ruoyi-ui/src/views/benyi/checkindetail/index.vue
index 2d45797fd..8942a3f59 100644
--- a/ruoyi-ui/src/views/benyi/checkindetail/index.vue
+++ b/ruoyi-ui/src/views/benyi/checkindetail/index.vue
@@ -152,8 +152,8 @@
fixed="right"
label="操作"
align="center"
- width="120"
- class-name="small-padding fixed-width"
+ width="60"
+ class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
diff --git a/ruoyi-ui/src/views/benyi/child/index.vue b/ruoyi-ui/src/views/benyi/child/index.vue
index c2cc1fc7b..bb0e1f0f7 100644
--- a/ruoyi-ui/src/views/benyi/child/index.vue
+++ b/ruoyi-ui/src/views/benyi/child/index.vue
@@ -191,8 +191,8 @@
fixed="right"
label="操作"
align="center"
- width="120"
- class-name="small-padding fixed-width"
+ width="60"
+ class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
diff --git a/ruoyi-ui/src/views/benyi/contactpeople/index.vue b/ruoyi-ui/src/views/benyi/contactpeople/index.vue
index eebb59959..49e937e91 100644
--- a/ruoyi-ui/src/views/benyi/contactpeople/index.vue
+++ b/ruoyi-ui/src/views/benyi/contactpeople/index.vue
@@ -98,6 +98,7 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column
+ fixed
label="幼儿"
align="center"
prop="childid"
@@ -130,10 +131,11 @@
prop="moffphone"
/>
<el-table-column
+ fixed="right"
label="操作"
align="center"
- width="120"
- class-name="small-padding fixed-width"
+ width="60"
+ class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
diff --git a/ruoyi-ui/src/views/benyi/experience/index.vue b/ruoyi-ui/src/views/benyi/experience/index.vue
index 05930f3cf..1927cf05d 100644
--- a/ruoyi-ui/src/views/benyi/experience/index.vue
+++ b/ruoyi-ui/src/views/benyi/experience/index.vue
@@ -101,7 +101,6 @@
label="幼儿出生日期"
align="center"
prop="csrq"
- width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.csrq, "{y}-{m}-{d}") }}</span>
@@ -112,7 +111,6 @@
label="申请体验时间"
align="center"
prop="sqtysj"
- width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.sqtysj, "{y}-{m}-{d}") }}</span>
diff --git a/ruoyi-ui/src/views/benyi/healthcheck/index.vue b/ruoyi-ui/src/views/benyi/healthcheck/index.vue
index 370d22b86..7fc54c12b 100644
--- a/ruoyi-ui/src/views/benyi/healthcheck/index.vue
+++ b/ruoyi-ui/src/views/benyi/healthcheck/index.vue
@@ -165,7 +165,6 @@
label="检查日期"
align="center"
prop="checkTime"
- width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
@@ -196,7 +195,7 @@
prop="totalAssessment"
:formatter="totalAssessmentFormat"
/>
- <el-table-column
+ <!-- <el-table-column
label="创建时间"
align="center"
prop="createtime"
@@ -207,13 +206,13 @@
parseTime(scope.row.createtime, "{y}-{m}-{d} {h}:{i}:{s}")
}}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
fixed="right"
label="操作"
align="center"
- width="100"
- class-name="small-padding fixed-width"
+ width="60"
+ class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
diff --git a/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue b/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
index 4d4eca4df..25df8efc0 100644
--- a/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
+++ b/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
@@ -157,24 +157,21 @@
label="活动开始时间"
align="center"
prop="activitytime"
- width="180"
/>
<el-table-column
label="活动截止时间"
align="center"
prop="activityendtime"
- width="180"
/>
- <el-table-column
+ <!-- <el-table-column
label="创建时间"
align="center"
prop="createtime"
- width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
fixed="right"
label="操作"
diff --git a/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue b/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
index 82802a1ec..9f34fe00a 100644
--- a/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
+++ b/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
@@ -144,9 +144,8 @@
label="活动时间"
align="center"
prop="activitytime"
- width="180"
/>
- <el-table-column
+ <!-- <el-table-column
label="创建时间"
align="center"
prop="createtime"
@@ -155,12 +154,13 @@
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span>
</template>
- </el-table-column>
+ </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
diff --git a/ruoyi-ui/src/views/system/class/index.vue b/ruoyi-ui/src/views/system/class/index.vue
index b24fbef1b..fbb0c3060 100644
--- a/ruoyi-ui/src/views/system/class/index.vue
+++ b/ruoyi-ui/src/views/system/class/index.vue
@@ -158,7 +158,7 @@
<el-table-column label="主班教师" align="center" prop="zbjsxm" />
<el-table-column label="配班教师" align="center" prop="pbjsxm" />
<el-table-column label="助理教师" align="center" prop="zljsxm" />
- <el-table-column
+ <!-- <el-table-column
label="创建时间"
align="center"
prop="createtime"
@@ -167,13 +167,13 @@
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
fixed="right"
label="操作"
- width="220"
+ width="80"
align="center"
- class-name="small-padding fixed-width"
+ class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
diff --git a/ruoyi-ui/src/views/system/teacher/index.vue b/ruoyi-ui/src/views/system/teacher/index.vue
index dce4009e7..71bbe4c3d 100644
--- a/ruoyi-ui/src/views/system/teacher/index.vue
+++ b/ruoyi-ui/src/views/system/teacher/index.vue
@@ -107,7 +107,6 @@
label="出生日期"
align="center"
prop="csrq"
- width="180"
></el-table-column>
<el-table-column label="毕业院校" align="center" prop="byyx" />
<el-table-column
@@ -120,9 +119,8 @@
label="参加工作日期"
align="center"
prop="cjgzrq"
- width="180"
></el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="创建时间"
align="center"
prop="createtime"
@@ -131,7 +129,7 @@
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!--<el-table-column label="标识" align="center" prop="id" />
<el-table-column label="证件号码" align="center" prop="zjhm" />
<el-table-column label="专业" align="center" prop="zy" />
@@ -142,8 +140,8 @@
fixed="right"
label="操作"
align="center"
- width="200"
- class-name="small-padding fixed-width"
+ width="60"
+ class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index f1d51dca9..200c2bd6f 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -191,8 +191,8 @@
fixed="right"
label="操作"
align="center"
- width="180"
- class-name="small-padding fixed-width"
+ width="60"
+ class-name="small-padding fixed-width edit-btns"
>
<template slot-scope="scope">
<el-button