修改报告显示问题

src/components/Report.vue

@@ -91,13 +91,21 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="350px" align="center">
+                <el-table-column label="操作" width="240px" align="center">
                   <template slot-scope="scope">
-                    <div
+                    <div class="detail_button_out">
+                      <div class="detail_button" @click="radioClickNew(scope.row)">
+                        <img src="../assets/img/table/search.png" />
+                        <span> 个人报告查看 </span>
+                      </div>
+                    </div>
+                    <!-- <div
                       class="detail_button_out"
-                      v-if="scope.row.hasOwnProperty('contentList')"
+                      v-if="scope.row.hasOwnProperty('contentList')" 
                     >
-                      <div v-for="item in scope.row.contentList" :key="item.id">
+                   
+                  
+                     <div v-for="item in scope.row.contentList" :key="item.id">
                         <div
                           v-if="item.isDisplayed == 1"
                           style="
@@ -116,7 +124,7 @@
                           {{ item.name }}
                         </div>
                       </div>
-                    </div>
+                    </div> -->
                   </template>
                 </el-table-column>
               </el-table>
@@ -148,25 +156,47 @@
       >
         <div slot="title">
           <div label-width="150px" class="demo-ruleForm">
-            <p v-if="isView" class="dig_title">选择题目</p>
+            <p v-if="isView" class="dig_title">查看报告</p>
             <div slot=""></div>
             <div slot="footer"></div>
 
-            <div
-              class="table-content"
-              style="display: flex; justify-content: space-around"
+            <div style="margin-bottom: 20px">量表</div>
+            <el-button
+              type="success"
+              style="border-radius: 20px"
+              v-for="item in topPicList"
+              :key="item.name"
+              @click="radioClick(item)"
             >
-              <el-button
-                type="success"
-                style="border-radius: 20px"
-                v-for="item in topPicList"
-                :key="item.name"
-                @click="radioClick(item)"
-              >
-                {{ item.name }}
-              </el-button>
-            </div>
+              {{ item.name }}
+            </el-button>
 
+            <div style="margin-bottom: 20px; margin-top: 20px">任务(必选)</div>
+            <el-button
+              type="success"
+              style="border-radius: 20px"
+              v-for="item in taskList"
+              :key="item.name"
+              @click="radioClick(item)"
+            >
+              {{ item.name }}
+            </el-button>
+            <div style="margin-bottom: 20px; margin-top: 20px">任务(可选)</div>
+            <div v-show="taskOptionalList.length == 0">无</div>
+            <el-button
+              type="success"
+              style="
+                border-radius: 20px;
+                margin-left: 0px;
+                display: flex;
+                margin-top: 20px;
+              "
+              v-for="item in taskOptionalList"
+              :key="item.name"
+              @click="radioClick(item)"
+            >
+              {{ item.name }}
+            </el-button>
             <div class="dig_button"></div>
           </div>
         </div>
@@ -223,10 +253,21 @@
                     </div>
                     <div class="totol_result_des" v-if="reportData.length > 0">
                       <div
-                        v-show="currentFlag == 'SHAPE_RANDOM'"
+                        v-show="
+                          currentFlag == 'SHAPE_RANDOM' ||
+                          currentFlag == 'ETB01' ||
+                          currentFlag == 'FDOT' ||
+                          currentFlag == 'EMOTION_STROOP'
+                        "
                         class="progress_out"
                         :style="{
-                          width: currentFlag != 'SHAPE_RANDOM' ? '100%' : '50%',
+                          width:
+                            currentFlag == 'SHAPE_RANDOM' ||
+                            currentFlag == 'ETB01' ||
+                            currentFlag == 'FDOT' ||
+                            currentFlag == 'EMOTION_STROOP'
+                              ? '100%'
+                              : '50%',
                         }"
                         style="display: flex; align-items: center"
                         v-for="(item, index) in echarts_name_list"
@@ -261,9 +302,26 @@
                       }}
                     </div>
                   </div>
-                  <div class="out_p" v-show="currentFlag != 'SHAPE_RANDOM'">
+                  <div
+                    class="out_p"
+                    v-show="
+                      !(
+                        currentFlag == 'SHAPE_RANDOM' ||
+                        currentFlag == 'ETB01' ||
+                        currentFlag == 'FDOT' ||
+                        currentFlag == 'EMOTION_STROOP'
+                      )
+                    "
+                  >
                     <div
-                      v-show="currentFlag != 'SHAPE_RANDOM'"
+                      v-show="
+                        !(
+                          currentFlag == 'SHAPE_RANDOM' ||
+                          currentFlag == 'ETB01' ||
+                          currentFlag == 'FDOT' ||
+                          currentFlag == 'EMOTION_STROOP'
+                        )
+                      "
                       class="echrts_sty"
                       ref="echarts_ld"
                     ></div>
@@ -282,7 +340,14 @@
                         <div
                           class="progress_out"
                           :style="{
-                            width: currentFlag != 'SHAPE_RANDOM' ? '100%' : '50%',
+                            width: !(
+                              currentFlag == 'SHAPE_RANDOM' ||
+                              currentFlag == 'ETB01' ||
+                              currentFlag == 'FDOT' ||
+                              currentFlag == 'EMOTION_STROOP'
+                            )
+                              ? '100%'
+                              : '50%',
                           }"
                           v-for="(item, index) in echarts_name_list"
                           :key="index"
@@ -310,7 +375,14 @@
                   </div>
                   <!-- **********************************开始1 -->
                   <div
-                    v-show="currentFlag != 'SHAPE_RANDOM'"
+                    v-show="
+                      !(
+                        currentFlag == 'SHAPE_RANDOM' ||
+                        currentFlag == 'ETB01' ||
+                        currentFlag == 'FDOT' ||
+                        currentFlag == 'EMOTION_STROOP'
+                      )
+                    "
                     v-for="(item, index) in reportDataAll"
                     :key="index"
                     style="padding-top: 20px"
@@ -512,7 +584,13 @@ export default {
       echarts_ld: "",
       colorPro: "linear-gradient(to right,#FF4E00 ,#ffffff)",
       //该用户的需要做的题目的列表
+      //量表题目的选项
       topPicList: [],
+      //认知任务必选的选项
+      taskList: [],
+      //认知任务可选的选项
+      taskOptionalList: [],
+
       radio1: "",
       currentFlag: "",
       useTime: "",
@@ -544,18 +622,40 @@ export default {
         let list = [];
         list = res.data;
         //过滤一下list
-
+        // 量表过滤
         this.topPicList = list.filter((item) => {
-          return item.isDisplayed == "1";
+          return (
+            item.isDisplayed == "1" &&
+            item.contentType == "0" &&
+            item.flag != "20210617140713"
+          );
+        });
+        //比作的认知任务
+        this.taskList = list.filter((item) => {
+          return (
+            item.isDisplayed == "1" && item.contentType == "1" && item.isRequired == "1"
+          );
         });
+        //选做的认知任务
+        this.taskOptionalList = list.filter((item) => {
+          return (
+            item.isDisplayed == "1" && item.contentType == "1" && item.isRequired == "0"
+          );
+        });
+        //     topPicList: [],
+        //   //认知任务必选的选项
+        //   taskList:[],
+        //  //认知任务可选的选项
+        //   taskOptionalList:[],
       });
+
       //出现选择了几个题目//需要显示--需要出现个弹出框进行选择
       this.topicVisible = true;
     },
-    radioClick(val, planObj) {
-      this.planObj = planObj;
+    radioClickNew(val) {
+      this.planObj = val;
       if (this.userInfo.roleType != "5") {
-        if (planObj.enable == "0") {
+        if (val.enable == "0") {
           this.$message({
             type: "error",
             message: "暂未授权",
@@ -563,6 +663,18 @@ export default {
           return;
         }
       }
+      this.topicVisible = true;
+      this.queryRport(val);
+    },
+    radioClick(val) {
+      // this.planObj = planObj;
+      // if (this.userInfo.roleType != "5") {
+      //     this.$message({
+      //       type: "error",
+      //       message: "暂未授权",
+      //     });
+      //     return;
+      // }
       //在数组中招待
       let params = {
         planId: val.planId,
@@ -632,9 +744,15 @@ export default {
           this.echarts_des_list = scoreDes;
           this.echarts_data_list = scoreList;
           this.echarts_name_list = nameList;
-          // currentFlag != 'SHAPE_RANDOM'
 
-          if (this.currentFlag != "SHAPE_RANDOM") {
+          if (
+            !(
+              this.currentFlag == "SHAPE_RANDOM" ||
+              this.currentFlag == "ETB01" ||
+              this.currentFlag == "FDOT" ||
+              this.currentFlag == "EMOTION_STROOP"
+            )
+          ) {
             const myChart = echarts.init(this.echarts_ld);
             // this.option.series[0].data[0] = a;
             this.option.series[0].data[0].value = this.echarts_data_list;