update

src/components/pages/components/a.json

@@ -293,6 +293,11 @@
                                 "name": "链接",
                                 "url": "http://www.ct.cn/",
                                 "type": 8
+                            },
+                            {
+                                "name": "公共资源",
+                                "url": "<p><img src=\"https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/3551665996890_1665997157135.jpg\" style=\"max-width:100%;\"/><img src=\"https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/3561665996891_1665997157148.jpg\" style=\"max-width: 100%;\"/><img src=\"https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/3571665996892_1665997157150.jpg\" style=\"max-width: 100%;\"/><br/></p>",
+                                "type": 6
                             }
                         ],
                         "toolText": "",
@@ -352,37 +357,44 @@
                             {
                                 "value": "罗列与发散",
                                 "detail": "围绕主题，罗列主题相关的板块内容",
-                                "score": 5
+                                "score": 5,
+                                "target":"发散性思维"
                             },
                             {
                                 "value": "创新表达",
                                 "detail": "结合主题，创新性表达自己的观点",
-                                "score": 5
+                                "score": 5,
+                                "target":"发散性思维"
                             },
                             {
                                 "value": "规整与排序",
                                 "detail": "针对罗列的板块内容，规整排序，开展写作",
-                                "score": 5
+                                "score": 5,
+                                "target":"逻辑性思维"
                             },
                             {
                                 "value": "观察与比较",
                                 "detail": "观察和比较，确定文章内容的详略和主次",
-                                "score": 5
+                                "score": 5,
+                                "target":"逻辑性思维"
                             },
                             {
                                 "value": "描述与丰富内容",
                                 "detail": "能够依据自己能力尝试使用描述性的词语添加细节，使内容丰富生动",
-                                "score": 5
+                                "score": 5,
+                                "target":"聚焦主题"
                             },
                             {
                                 "value": "资源搜索",
                                 "detail": "主动利用网页和相关资源进行资源获取",
-                                "score": 5
+                                "score": 5,
+                                "target":"借助多媒体工具"
                             },
                             {
                                 "value": "使用工具",
                                 "detail": "借助词典的简单的工具，完成英语习作",
-                                "score": 5
+                                "score": 5,
+                                "target":"同伴互学"
                             }
                         ]
                     }
@@ -456,27 +468,32 @@
                             {
                                 "value": "同伴互学-修改情况",
                                 "detail": "能够利用同桌互批的建议，互相学习完善写作",
-                                "score": 5
+                                "score": 5,
+                                "target":"同伴互学"
                             },
                             {
                                 "value": "同伴互学-修改情况",
                                 "detail": "对写作过程和效果进行自我评价和反思，根据需要调整计划遇到问题，主动请教同学或者老师",
-                                "score": 5
+                                "score": 5,
+                                "target":"同伴互学"
                             },
                             {
                                 "value": "书写规范",
                                 "detail": "正确使用大小写字母和常见标点符号、单词拼写基本正确",
-                                "score": 5
+                                "score": 5,
+                                "target":"语言准确"
                             },
                             {
                                 "value": "语句通顺",
                                 "detail": "语句基本通顺，句子形式基本正确",
-                                "score": 5
+                                "score": 5,
+                                "target":"语言准确"
                             },
                             {
                                 "value": "行文逻辑",
                                 "detail": "表意基本清楚，内容意义连贯",
-                                "score": 5
+                                "score": 5,
+                                "target":"聚焦主题"
                             }
                         ]
                     }
@@ -550,12 +567,14 @@
                             {
                                 "value": "互批",
                                 "detail": "能够利用同桌互批的建议，互相学习完善写作",
-                                "score": 5
+                                "score": 5,
+                                "target":"同伴互学"
                             },
                             {
                                 "value": "同伴互学-自我反思",
                                 "detail": "对写作过程和效果进行自我评价和反思，根据需要调整计划遇到问题，主动请教同学或者老师",
-                                "score": 5
+                                "score": 5,
+                                "target":"同伴互学"
                             }
                         ]
                     }

src/components/pages/components/report/studentAbility.vue

@@ -400,7 +400,7 @@ export default {
                 name: this.randarJson[i].target,
                 max: 5,
               });
-              radarOption.series[0].data[0].value.push(this.randarJson[i].value / this.randarJson[i].count);
+              radarOption.series[0].data[0].value.push((this.randarJson[i].value / this.randarJson[i].count).toFixed(1));
             }
 
 
@@ -546,7 +546,7 @@ export default {
           this.setChart();
           let _workW = []
           for (var i = 0; i < _isWorks.length; i++) {
-            if (chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList) {
+            if (chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList &&  chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList.length) {
               _workW.push({ stage: _isWorks[i].stage, task: _isWorks[i].task, rate: JSON.parse(_isWorks[i].rate), elist: chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList })
             }
             // else {

src/components/pages/components/worksDetail2.vue

@@ -419,7 +419,7 @@
                             "
                           >
                             <div style="margin-right: 20px; font-size: 20px">
-                              问卷标题:
+                              标题:
                             </div>
                             <div style="font-size: 20px">
                               {{ worksDetail[sIndex].askInfo[0].askTitle }}
@@ -427,7 +427,7 @@
                           </div>
                           <div class="a_addBox">
                             <div style="font-size: 16px; color: #c7c7c7">
-                              问卷内容
+                              内容
                             </div>
                             <div
                               class="a_add_box"
@@ -439,7 +439,7 @@
                                 <div style="display: flex">
                                   {{ index1 + 1 + "、" }}
                                   <div>
-                                    问卷题目：{{
+                                    题目：{{
                                       worksDetail[sIndex].askInfo[0].askJson[
                                         index1
                                       ].askstitle
@@ -463,8 +463,8 @@
                                       :key="checkIndex"
                                       :label="checkIndex"
                                       disabled
-                                      class="redioStyle"
-                                      >{{ item2 }}</el-radio
+                                      class="redioStyle" 
+                                      ><span v-html="item2"></span></el-radio
                                     >
                                   </el-radio-group>
                                 </div>
@@ -541,7 +541,8 @@
                       <div class="ech" style="margin-left: 23px">
                         <img src="../../../assets/icon/pj/score.png" alt="" />
                       </div>
-                      <div
+                      <div style="height: 80%;overflow: auto;">
+                        <div
                         class="score_box"
                         v-for="(item, index) in worksDetail[sIndex].eList"
                         :key="index"
@@ -561,6 +562,7 @@
                           @change="getStar(sIndex)"
                         ></el-rate>
                       </div>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -606,7 +608,7 @@
       </span>
     </el-dialog>
     <el-dialog
-      title="查看问卷调查"
+      title="查看选择题"
       :visible.sync="dialogVisible4"
       :append-to-body="true"
       width="800px"
@@ -626,7 +628,7 @@
           <div style="font-size: 20px">{{ askJson.askTitle }}</div>
         </div>
         <div class="a_addBox">
-          <div style="font-size: 16px; color: #c7c7c7">问卷内容</div>
+          <div style="font-size: 16px; color: #c7c7c7">内容</div>
           <div
             class="a_add_box"
             v-for="(item, index) in askJson.askJson"
@@ -635,7 +637,7 @@
             <div class="a_add_head">
               <div style="display: flex">
                 {{ index + 1 + "、" }}
-                <div>问卷题目：{{ item.askstitle }}</div>
+                <div>题目：{{ item.askstitle }}</div>
               </div>
             </div>
             <div class="a_add_body">
@@ -1023,7 +1025,7 @@ export default {
             workJson[k].time = res.data[0][k].time;
             workJson[k].stagetask =
               res.data[0][k].stage + "-" + res.data[0][k].task;
-            if (eList) {
+            if (eList && eList.length) {
               _ooption = [];
               workJson[k].eList = eList;
               for (var i = 0; i < eList.length; i++) {
@@ -1700,10 +1702,10 @@ export default {
 
           var _ask = "";
           if (workJson.askInfo.length > 0) {
-            var _ask = "<h3>问卷调查</h3>";
+            var _ask = "<h3>选择题</h3>";
             for (var i = 0; i < workJson.askInfo.length; i++) {
               var _div = document.createElement("div");
-              _div.innerHTML = `<h4>问卷标题:${workJson.askInfo[i].askTitle}</h4>`;
+              _div.innerHTML = `<h4>标题:${workJson.askInfo[i].askTitle}</h4>`;
               for (var j = 0; j < workJson.askInfo[i].askJson.length; j++) {
                 var _div2 = document.createElement("div");
                 _div2.innerHTML = `<h5>第${j + 1}题:${
@@ -2090,10 +2092,11 @@ export default {
   font-size: 15px;
   background: #fff;
   height: 100%;
-  padding-top: 98px;
+  padding-top: 40px;
   border-radius: 5px;
   width: 90%;
   box-shadow: 2px 2px 5px #909090;
+  overflow: auto;
 }
 .sd_score .score_box {
   display: flex;
@@ -2400,7 +2403,7 @@ export default {
   background: #fff;
   padding: 15px;
   /* max-height: 400px; */
-  max-height: 170px;
+  max-height: 160px;
   overflow: auto;
 }
 .a_add_box {