From 5470bbe9516a085f4623e33746ffc8c71179ac89 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Tue, 1 Dec 2020 09:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=92=8C=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=95=99=E8=82=B2=E5=BB=BA=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/benyi/assessment/history.vue    | 48 ++++++-------------
 .../views/benyi/assessmentcontent/index.vue   | 10 ++--
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/assessment/history.vue b/ruoyi-ui/src/views/benyi/assessment/history.vue
index 45f5d771f..cf78ecaf2 100644
--- a/ruoyi-ui/src/views/benyi/assessment/history.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/history.vue
@@ -58,12 +58,11 @@
                         <span class="num">{{ itemMb.sort }}. </span
                         >{{ itemMb.name }}(未满足评估标准)
                       </p>
-                      <p class="checkbox-item flex align-center">
-                        教育建议 {{ itemMb.jyjy }}
-                      </p>
+                      <p class="checkbox-item">教育建议</p>
+                      <p class="checkbox-item" v-html="itemMb.jyjy"></p>
                     </li>
                     <li
-                      v-for="(itemMb,index) in assessmentcontentList.filter(
+                      v-for="(itemMb, index) in assessmentcontentList.filter(
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="index"
@@ -125,12 +124,11 @@
                         <span class="num">{{ itemMb.sort }}. </span
                         >{{ itemMb.name }}(未满足评估标准)
                       </p>
-                      <p class="checkbox-item flex align-center">
-                        教育建议 {{ itemMb.jyjy }}
-                      </p>
+                      <p class="checkbox-item">教育建议</p>
+                      <p class="checkbox-item" v-html="itemMb.jyjy"></p>
                     </li>
                     <li
-                      v-for="(itemMb,index) in assessmentcontentList.filter(
+                      v-for="(itemMb, index) in assessmentcontentList.filter(
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="index"
@@ -195,12 +193,11 @@
                         <span class="num">{{ itemMb.sort }}. </span
                         >{{ itemMb.name }}(未满足评估标准)
                       </p>
-                      <p class="checkbox-item flex align-center">
-                        教育建议 {{ itemMb.jyjy }}
-                      </p>
+                      <p class="checkbox-item">教育建议</p>
+                      <p class="checkbox-item" v-html="itemMb.jyjy"></p>
                     </li>
                     <li
-                      v-for="(itemMb,index) in assessmentcontentList.filter(
+                      v-for="(itemMb, index) in assessmentcontentList.filter(
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="index"
@@ -265,12 +262,11 @@
                         <span class="num">{{ itemMb.sort }}. </span
                         >{{ itemMb.name }}(未满足评估标准)
                       </p>
-                      <p class="checkbox-item flex align-center">
-                        教育建议 {{ itemMb.jyjy }}
-                      </p>
+                      <p class="checkbox-item">教育建议</p>
+                      <p class="checkbox-item" v-html="itemMb.jyjy"></p>
                     </li>
                     <li
-                      v-for="(itemMb,index) in assessmentcontentList.filter(
+                      v-for="(itemMb, index) in assessmentcontentList.filter(
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="index"
@@ -335,12 +331,11 @@
                         <span class="num">{{ itemMb.sort }}. </span
                         >{{ itemMb.name }}(未满足评估标准)
                       </p>
-                      <p class="checkbox-item flex align-center">
-                        教育建议 {{ itemMb.jyjy }}
-                      </p>
+                      <p class="checkbox-item">教育建议</p>
+                      <p class="checkbox-item" v-html="itemMb.jyjy"></p>
                     </li>
                     <li
-                      v-for="(itemMb,index) in assessmentcontentList.filter(
+                      v-for="(itemMb, index) in assessmentcontentList.filter(
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="index"
@@ -521,23 +516,10 @@ div {
         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>
diff --git a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
index d9cc60c83..492b2e370 100644
--- a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
@@ -96,7 +96,7 @@
     </el-table>
 
     <!-- 添加或修改评估内容对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="所属模块" prop="parentId">
           <treeselect
@@ -149,11 +149,12 @@
           />
         </el-form-item>
         <el-form-item label="教育建议" prop="jyjy">
-          <el-input
+          <!-- <el-input
             v-model="form.jyjy"
             type="textarea"
             placeholder="请输入内容"
-          />
+          /> -->
+          <Editor v-model="form.jyjy" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -174,10 +175,11 @@ import {
 } from "@/api/benyi/assessmentcontent";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Editor from "@/components/Editor";
 
 export default {
   name: "Assessmentcontent",
-  components: { Treeselect },
+  components: { Treeselect, Editor },
   data() {
     return {
       // 遮罩层