From 045ebec05675936ca32bac4d45f69abebbce214e Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Sat, 3 Jul 2021 15:24:45 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../benyi/learndevelopmentfamily/table.vue    | 34 ++++++++++--------
 .../benyi/learndevelopmentteacher/table.vue   | 36 +++++++++++--------
 .../ByChildLearndevelopmentFamilyMapper.xml   |  1 +
 .../ByChildLearndevelopmentTeacherMapper.xml  |  1 +
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/learndevelopmentfamily/table.vue b/ruoyi-ui/src/views/benyi/learndevelopmentfamily/table.vue
index 802745e00..fe503a5d2 100644
--- a/ruoyi-ui/src/views/benyi/learndevelopmentfamily/table.vue
+++ b/ruoyi-ui/src/views/benyi/learndevelopmentfamily/table.vue
@@ -1,23 +1,29 @@
 <template>
   <div class="table-container" ref="printMe">
-    <h2 class="title">{{title}}</h2>
+    <h2 class="title">{{ title }}</h2>
     <div class="table">
       <div class="print no-print">
-        <el-button type="primary" plain size="mini" icon="el-icon-printer" @click="prints"></el-button>
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          icon="el-icon-printer"
+          @click="prints"
+        ></el-button>
       </div>
       <table>
         <tr class="align-center">
           <td class="w140">
             <b class="table-title">班级：</b>
-            {{classname}}
+            {{ classname }}
           </td>
           <td>
             <b class="table-title">学期：</b>
-            {{xnxqFormat(xnxq)}}
+            {{ xnxqFormat(xnxq) }}
           </td>
           <td class="w200">
             <b class="table-title">幼儿姓名：</b>
-            {{childFormat(childid)}}
+            {{ childFormat(childid) }}
           </td>
         </tr>
         <tr>
@@ -26,7 +32,7 @@
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="2">{{zpimgsremarks}}</td>
+          <td colspan="2">{{ zpimgsremarks }}</td>
         </tr>
         <tr>
           <td class="align-center">生活照片</td>
@@ -34,7 +40,7 @@
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="2">{{shimgsremarks}}</td>
+          <td colspan="2">{{ shimgsremarks }}</td>
         </tr>
         <tr>
           <td class="align-center">有趣事件</td>
@@ -42,7 +48,7 @@
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="2">{{yqsjremarks}}</td>
+          <td colspan="2">{{ yqsjremarks }}</td>
         </tr>
         <tr>
           <td class="align-center">教师评语</td>
@@ -50,7 +56,7 @@
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="2">{{jspyremarks}}</td>
+          <td colspan="2">{{ jspyremarks }}</td>
         </tr>
       </table>
       <!-- <p
@@ -64,9 +70,6 @@
 import {
   listFamily,
   getFamily,
-  delFamily,
-  addFamily,
-  updateFamily,
 } from "@/api/benyi/learndevelopmentfamily";
 
 import { listChild } from "@/api/benyi/child";
@@ -83,7 +86,7 @@ export default {
       title: "幼儿学习与发展档案(家长)",
       classname: "",
       childid: "",
-      xnxq:"",
+      xnxq: "",
       zpimgs: "",
       zpimgsremarks: "",
       shimgs: "",
@@ -114,13 +117,16 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        
+        id: "",
       },
       // 表单参数
       form: {},
     };
   },
   created() {
+    const childId = this.$route.params && this.$route.params.id;
+    this.queryParams.id = childId;
+
     this.getList();
     this.getChildList();
     this.getDicts("sys_xnxq").then((response) => {
diff --git a/ruoyi-ui/src/views/benyi/learndevelopmentteacher/table.vue b/ruoyi-ui/src/views/benyi/learndevelopmentteacher/table.vue
index e335ad952..0a5dd7e3b 100644
--- a/ruoyi-ui/src/views/benyi/learndevelopmentteacher/table.vue
+++ b/ruoyi-ui/src/views/benyi/learndevelopmentteacher/table.vue
@@ -1,23 +1,29 @@
 <template>
   <div class="table-container" ref="printMe">
-    <h2 class="title">{{title}}</h2>
+    <h2 class="title">{{ title }}</h2>
     <div class="table">
       <div class="print no-print">
-        <el-button type="primary" plain size="mini" icon="el-icon-printer" @click="prints"></el-button>
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          icon="el-icon-printer"
+          @click="prints"
+        ></el-button>
       </div>
       <table>
         <tr class="align-center">
           <td class="w140">
             <b class="table-title">班级：</b>
-            {{classname}}
+            {{ classname }}
           </td>
           <td>
             <b class="table-title">学期：</b>
-            {{xnxqFormat(xnxq)}}
+            {{ xnxqFormat(xnxq) }}
           </td>
           <td class="w200">
             <b class="table-title">幼儿姓名：</b>
-            {{childFormat(childid)}}
+            {{ childFormat(childid) }}
           </td>
         </tr>
         <tr>
@@ -26,7 +32,7 @@
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="2">{{gcjlremarks}}</td>
+          <td colspan="2">{{ gcjlremarks }}</td>
         </tr>
         <tr>
           <td class="align-center">问题与方案</td>
@@ -34,7 +40,7 @@
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="2">{{wtyfaremarks}}</td>
+          <td colspan="2">{{ wtyfaremarks }}</td>
         </tr>
         <tr>
           <td class="align-center">评估结果</td>
@@ -42,7 +48,7 @@
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="2">{{pgjgremarks}}</td>
+          <td colspan="2">{{ pgjgremarks }}</td>
         </tr>
         <tr>
           <td class="align-center">教育计划</td>
@@ -50,7 +56,7 @@
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="2">{{jyjhremarks}}</td>
+          <td colspan="2">{{ jyjhremarks }}</td>
         </tr>
       </table>
       <!-- <p
@@ -64,9 +70,6 @@
 import {
   listTeacher,
   getTeacher,
-  delTeacher,
-  addTeacher,
-  updateTeacher,
 } from "@/api/benyi/learndevelopmentteacher";
 
 import { listChild } from "@/api/benyi/child";
@@ -83,7 +86,7 @@ export default {
       title: "幼儿学习与发展档案(教师)",
       classname: "",
       childid: "",
-      xnxq:"",
+      xnxq: "",
       gcjl: "",
       gcjlremarks: "",
       wtyfa: "",
@@ -114,9 +117,15 @@ export default {
       open: false,
       // 表单参数
       form: {},
+      queryParams: {
+        id: "",
+      },
     };
   },
   created() {
+    const childId = this.$route.params && this.$route.params.id;
+    this.queryParams.id = childId;
+    //console.log(childId);
     this.getList();
     this.getChildList();
     this.getDicts("sys_xnxq").then((response) => {
@@ -152,7 +161,6 @@ export default {
         this.childOptions = response.rows;
         this.classname = response.rows[0].bjmc;
         // console.log(response.rows);
-        
       });
     },
     /** 查询儿童学习与发展档案（教师）列表 */
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentFamilyMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentFamilyMapper.xml
index a56772a4e..322fd65a4 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentFamilyMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentFamilyMapper.xml
@@ -43,6 +43,7 @@
             <if test="jspy != null  and jspy != ''">and a.jspy = #{jspy}</if>
             <if test="jspyremarks != null  and jspyremarks != ''">and a.jspyremarks = #{jspyremarks}</if>
             <if test="createuserid != null ">and a.createuserid = #{createuserid}</if>
+            <if test="id != null ">and a.id = #{id}</if>
         </where>
     </select>
 
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentTeacherMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentTeacherMapper.xml
index d1e29080b..b516caf0d 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentTeacherMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentTeacherMapper.xml
@@ -43,6 +43,7 @@
             <if test="jyjh != null  and jyjh != ''">and a.jyjh = #{jyjh}</if>
             <if test="jyjhremarks != null  and jyjhremarks != ''">and a.jyjhremarks = #{jyjhremarks}</if>
             <if test="createuserid != null ">and a.createuserid = #{createuserid}</if>
+            <if test="id != null ">and a.id = #{id}</if>
         </where>
     </select>