Merge branch 'master' into xinbo

ruoyi-ui/src/views/benyi/assessment/history.vue

@@ -31,7 +31,7 @@
           <radar-chart_ys :psMsg="item.dictValue" />
         </div>
         <div class="block">
-          <h2 class="block-item-title flex align-center">评估建议</h2>
+          <h2 class="block-item-title flex align-center">教育建议</h2>
           <!-- <ul class="block-content">
             <li>
               <p class="block-content-title">
@@ -108,8 +108,6 @@ export default {
       assessmentscope: "",
       // tabs列表
       tabsList: [],
-      // 遮罩层
-      loading: true,
       activeName: "",
     };
   },

ruoyi-ui/src/views/benyi/assessment/student.vue

@@ -45,7 +45,7 @@
         :label="itemLy.name"
         :name="itemLy.name"
       >
-        <div
+        <div v-loading="loading"
           class="block"
           v-for="itemFzly in assessmentcontentList.filter(
             (p) => p.parentId == itemLy.id