From be13854fb14c066c8432a7eb8d520d4cd1a35283 Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Sat, 7 Nov 2020 11:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BC=E5=84=BF=E8=AF=84=E4=BC=B0-=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/router/index.js                  |  15 ++
 .../src/views/benyi/assessment/history.vue    | 241 ++++++++++++++++++
 ruoyi-ui/src/views/benyi/assessment/index.vue |  11 +-
 .../src/views/benyi/assessment/student.vue    |  12 +-
 .../benyi/domain/ByAssessmentchild.java       |  16 ++
 .../mybatis/benyi/ByAssessmentchildMapper.xml |   7 +-
 6 files changed, 289 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 1af3c2e1c..e8d310b34 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -439,6 +439,21 @@ export const constantRoutes = [{
             }
         }]
     },
+    {
+        path: '/benyi/assessmentchildhistory',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: 'student/:id(\\d+)',
+            component: () =>
+                import ('@/views/benyi/assessment/history'),
+            name: 'assessmentchildhistory',
+            meta: {
+                title: '幼儿评估图表',
+                icon: ''
+            }
+        }]
+    },
     {
         path: '/job',
         component: Layout,
diff --git a/ruoyi-ui/src/views/benyi/assessment/history.vue b/ruoyi-ui/src/views/benyi/assessment/history.vue
index e69de29bb..4e9ab7339 100644
--- a/ruoyi-ui/src/views/benyi/assessment/history.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/history.vue
@@ -0,0 +1,241 @@
+<template>
+  <div class="app-container">
+    <div class="flex align-center justify-between">
+      <p class="title flex align-center">
+        <span>{{ this.childName }}同学，评估结果图表 </span>
+      </p>
+    </div>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="儿童学习与发展评估(36-48)" name="first">
+        <div>
+          <radar-chart />
+        </div>
+        <div class="block">
+          <h2 class="block-item-title flex align-center">评估建议</h2>
+          <ul class="block-content">
+            <li>
+              <p class="block-content-title">
+                <span class="num">1. </span>具有健康的体态
+              </p>
+              <div class="checkbox-content">
+                <p class="checkbox-item flex align-center">
+                  身高和体重适宜
+                </p>
+                <div class="check-info">
+                  参考标准：
+                  <p>男孩：身高：94.9-111.7厘米，体重：12.7-21.2公斤</p>
+                  <p>女孩：身高：94.1-111.3厘米，体重：12.3-21.5公斤</p>
+                </div>
+              </div>
+              <div class="checkbox-content">
+                <p class="checkbox-item flex align-center">在提醒下能自然坐直、站直
+                </p>
+                <div class="check-info"></div>
+              </div>
+            </li>
+            <li>
+              <p class="block-content-title">
+                <span class="num">2. </span>情绪安定愉快
+              </p>
+              <div class="checkbox-content">
+                <p class="checkbox-item flex align-center">
+                 情绪比较稳定，很少因一点小事哭闹不止
+                </p>
+                <div class="check-info"></div>
+              </div>
+              <div class="checkbox-content">
+                <p class="checkbox-item flex align-center">
+                 有比较强烈的情绪反应时，能在成人的安抚下逐渐平静下来
+                </p>
+                <div class="check-info"></div>
+              </div>
+            </li>
+          </ul>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="儿童学习与发展评估(48-60)" name="second">配置管理</el-tab-pane>
+      <el-tab-pane label="儿童学习与发展评估(60-72)" name="third">角色管理</el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script>
+import {
+  listAssessmentcontent,
+  getAssessmentcontent,
+  delAssessmentcontent,
+  addAssessmentcontent,
+  updateAssessmentcontent,
+  exportAssessmentcontent,
+} from "@/api/benyi/assessmentcontent";
+
+import { getChildByAssessment } from "@/api/benyi/child";
+import {
+  addAssessmentchild,
+  updateAssessmentchild,
+} from "@/api/benyi/assessmentchild";
+import RadarChart from "@/views/dashboard/RadarChart";
+
+export default {
+  name: "Assessmentstudent",
+  components: {
+    RadarChart,
+  },
+  data() {
+    return {
+      childId: "",
+      childName: "",
+      childCsrq: "",
+      bjmc: "",
+      classid: "",
+      trem: "",
+      zbjsxm: "",
+      assessmentscope: "",
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 评估内容表格数据
+      assessmentcontentList: [],
+      // 表单参数
+      form: {},
+      // 查询参数
+      queryParams: {
+        parentid: undefined,
+        name: undefined,
+        iselement: undefined,
+        scope: undefined,
+        sort: undefined,
+      },
+      activeName: "first",
+      checked: false,
+      checkList: [],
+    };
+  },
+  created() {
+    // this.getList();
+    const childId = this.$route.params && this.$route.params.id;
+    this.childId = childId;
+    // console.log("childId:" + childId);
+    this.getChild(childId);
+  },
+  methods: {
+    getChild(childId) {
+      getChildByAssessment(childId).then((response) => {
+        // console.log(response);
+        if (response.code == "200") {
+          this.childName = response.data.name;
+          this.childCsrq = response.data.csrq;
+          this.trem = response.trem;
+          this.bjmc = response.data.bjmc;
+          this.classid = response.data.classid;
+          this.zbjsxm = response.data.zbjsmc;
+          response.ByAssessmentchild.forEach((item) =>
+            this.checkList.push(item.contentid)
+          );
+          if (response.isAssessment == "0") {
+            this.msgError(
+              "当前幼儿出生日期不符合评估范围，幼儿评估范围为36-72个月"
+            );
+          } else {
+            this.assessmentscope = response.isAssessment;
+
+            this.getList();
+          }
+        }
+      });
+    },
+    /** 查询评估内容列表 */
+    getList() {
+      this.loading = true;
+      listAssessmentcontent(this.queryParams).then((response) => {
+        // console.log("rows:" + response.rows);
+        this.assessmentcontentList = response.rows;
+        this.loading = false;
+      });
+    },
+    handleClick(tab) {
+      // this.activeName = tab
+    },
+    handlecheckedItemsChange(value) {
+      // var items = "";
+      // this.checkList.forEach((item) => {
+      //   //当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去
+      //   items = items + item + ",";
+      // });
+      // console.log(items);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// 禁止复制
+div {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.title {
+  padding: 10px 0;
+  font-weight: 600;
+  span {
+    font-size: 16px;
+    padding: 2px;
+    // &:nth-of-type(2) {
+    //   font-size: 14px;
+    //   font-weight: normal;
+    // }
+  }
+}
+.block {
+  padding: 10px;
+  color: #333;
+  .block-item-title {
+    padding: 10px 0;
+    margin: 0;
+    font-size: 16px;
+    font-weight: 500;
+    &::before {
+      content: "";
+      margin-right: 8px;
+      width: 4px;
+      height: 14px;
+      background: #1890ff;
+    }
+  }
+
+  .block-content {
+    border-radius: 5px;
+    padding: 10px;
+    background: #fcfcfc;
+    .block-content-title {
+      font-size: 14px;
+      font-weight: bold;
+      line-height: 24px;
+      padding-bottom: 5px;
+      .num {
+        font-size: 16px;
+      }
+    }
+    .checkbox-content {
+      padding-left: 20px;
+      margin-bottom: 15px;
+    }
+    .checkbox-item {
+      font-size: 14px;
+      line-height: 22px;
+    }
+    .check-info {
+      padding-left: 24px;
+      line-height: 18px;
+      font-size: 12px;
+      color: #999;
+      p {
+        padding-left: 10px;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/assessment/index.vue b/ruoyi-ui/src/views/benyi/assessment/index.vue
index d44d0a693..5cc722d79 100644
--- a/ruoyi-ui/src/views/benyi/assessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/index.vue
@@ -43,7 +43,16 @@
         prop="classid"
         :formatter="classFormat"
       />
-      <el-table-column label="幼儿姓名" align="center" prop="name" />
+      <el-table-column label="幼儿姓名" align="center" prop="name">
+        <template slot-scope="scope">
+          <router-link
+            :to="'/benyi/assessmentchildhistory/student/' + scope.row.id"
+            class="link-dayflow"
+          >
+            <span>{{ scope.row.name }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column label="幼儿出生日期" align="center" prop="csrq" />
       <el-table-column
         label="性别"
diff --git a/ruoyi-ui/src/views/benyi/assessment/student.vue b/ruoyi-ui/src/views/benyi/assessment/student.vue
index 1be6f526c..3f0801065 100644
--- a/ruoyi-ui/src/views/benyi/assessment/student.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/student.vue
@@ -228,7 +228,6 @@ export default {
             );
           } else {
             this.assessmentscope = response.isAssessment;
-
             this.getList();
           }
         }
@@ -243,16 +242,6 @@ export default {
         this.loading = false;
       });
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
     // // 表单重置
     // reset() {
     //   this.form = {
@@ -291,6 +280,7 @@ export default {
               this.form.items = items;
               this.form.type = "Y";
               this.form.xn = this.trem;
+              this.form.scope = this.assessmentscope;
               addAssessmentchild(this.form).then((response) => {
                 if (response.code === 200) {
                   this.msgSuccess("评估成功");
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentchild.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentchild.java
index 7bc2ce3bd..ca425b70a 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentchild.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentchild.java
@@ -59,6 +59,13 @@ public class ByAssessmentchild extends BaseEntity {
      * 临时创建用
      */
     private String items;
+    /**
+     * 适用范围
+     */
+
+    @Excel(name = "适用范围")
+    private String scope;
+
 
     public void setId(Long id) {
         this.id = id;
@@ -124,6 +131,14 @@ public class ByAssessmentchild extends BaseEntity {
         return items;
     }
 
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
 
     @Override
     public String toString() {
@@ -137,6 +152,7 @@ public class ByAssessmentchild extends BaseEntity {
                 .append("userid", getUserid())
                 .append("createTime", getCreateTime())
                 .append("items", getItems())
+                .append("scope", getScope())
                 .toString();
     }
 }
\ No newline at end of file
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentchildMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentchildMapper.xml
index 80dae6667..d82071606 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentchildMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentchildMapper.xml
@@ -13,10 +13,11 @@
         <result property="xn" column="xn"/>
         <result property="userid" column="userid"/>
         <result property="createTime" column="create_time"/>
+        <result property="scope"    column="scope"    />
     </resultMap>
 
     <sql id="selectByAssessmentchildVo">
-        select id, childid, classid, contentid, type, xn, userid, create_time from by_assessmentchild
+        select id, childid, classid, contentid, type, xn, userid, create_time, scope from by_assessmentchild
     </sql>
 
     <select id="selectByAssessmentchildList" parameterType="ByAssessmentchild" resultMap="ByAssessmentchildResult">
@@ -46,6 +47,7 @@
             <if test="xn != null  and xn != ''">xn,</if>
             <if test="userid != null ">userid,</if>
             <if test="createTime != null ">create_time,</if>
+            <if test="scope != null  and scope != ''">scope,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="childid != null ">#{childid},</if>
@@ -55,6 +57,8 @@
             <if test="xn != null  and xn != ''">#{xn},</if>
             <if test="userid != null ">#{userid},</if>
             <if test="createTime != null ">#{createTime},</if>
+            <if test="scope != null  and scope != ''">#{scope},</if>
+
         </trim>
     </insert>
 
@@ -68,6 +72,7 @@
             <if test="xn != null  and xn != ''">xn = #{xn},</if>
             <if test="userid != null ">userid = #{userid},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="scope != null  and scope != ''">scope = #{scope},</if>
         </trim>
         where id = #{id}
     </update>