修改计划报告里边跳转到个人报告里边的问题

src/components/ComparePlanUser.vue

@@ -700,12 +700,12 @@ export default {
 
           let listTmp2 =[]
           listTmp2=a.filter((item)=>{
-            return item.dimensionName=='总分'||item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
+            return item.dimensionName=='总分'||item.dimensionName=='压力'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
           })
 
           let listTmp3 =[]
           listTmp3=a.filter((item)=>{
-            return !(item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
+            return !(item.dimensionName=='压力'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
           })
           this.userData1 = listTmp2.concat(listTmp3)
 
@@ -740,12 +740,12 @@ export default {
 
           let listTmp2 =[]
           listTmp2=a.filter((item)=>{
-            return item.dimensionName=='总分'||item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
+            return item.dimensionName=='总分'||item.dimensionName=='压力'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
           })
 
           let listTmp3 =[]
           listTmp3=a.filter((item)=>{
-            return !(item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
+            return !(item.dimensionName=='压力'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
           })
           // this.reportDataAll=listTmp2.concat(listTmp3)
 

src/components/CompareUser.vue

@@ -786,12 +786,12 @@ export default {
 
           let listTmp2 =[]
           listTmp2=a.filter((item)=>{
-            return item.dimensionName=='总分'||item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
+            return item.dimensionName=='总分'||item.dimensionName=='压力'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
           })
 
           let listTmp3 =[]
           listTmp3=a.filter((item)=>{
-            return !(item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
+            return !(item.dimensionName=='压力'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
           })
           this.userData1 = listTmp2.concat(listTmp3)
           if (this.userData2.length == 0) {
@@ -817,12 +817,12 @@ export default {
 
           let listTmp2 =[]
           listTmp2=a.filter((item)=>{
-            return item.dimensionName=='总分'||item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
+            return item.dimensionName=='总分'||item.dimensionName=='压力'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'
           })
 
           let listTmp3 =[]
           listTmp3=a.filter((item)=>{
-            return !(item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
+            return !(item.dimensionName=='压力'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
           })
           // this.reportDataAll=listTmp2.concat(listTmp3)
 

src/components/GroupCompare.vue

@@ -224,7 +224,7 @@ export default {
       optionYiYu: { name: [], score: [] },
       //焦虑全部的数据
       optionJL: { name: [], score: [] },
-      //躯体化全部的数据
+      //压力全部的数据
       optionQTH: { name: [], score: [] },
       //视觉整合能力
       optionSJ: { name: [], score: [] },
@@ -232,7 +232,7 @@ export default {
       yiyuList10: [],
       //焦虑前10
       jlList10: [],
-      //躯体化前10
+      //压力前10
       qthList10: [],
       //视觉整合能力前10
       sjList10: [],
@@ -282,7 +282,7 @@ export default {
       this.queryGradeOrYuanYiYu();
       //焦虑
       this.queryGradeOrYuanJL();
-      //躯体化
+      //压力
       this.queryGradeOrYuanQTH();
       //视觉整合能力
       this.queryGradeOrYuanSJ();
@@ -291,7 +291,7 @@ export default {
       this.queryGradeOrYuan10();
       //查询焦虑前10
       this.queryGradeOrYuanjl10();
-      //查询躯体化前10
+      //查询压力前10
       this.queryGradeOrYuanqth10();
       //查询视觉整合能力前10
       this.queryGradeOrYuansj10();
@@ -302,7 +302,7 @@ export default {
       this.queryGradeOrYuanYiYu();
       //焦虑
       this.queryGradeOrYuanJL();
-      //躯体化
+      //压力
       this.queryGradeOrYuanQTH();
       //视觉整合能力
       this.queryGradeOrYuanSJ();
@@ -311,7 +311,7 @@ export default {
       this.queryGradeOrYuan10();
       //查询焦虑前10
       this.queryGradeOrYuanjl10();
-      //查询躯体化前10
+      //查询压力前10
       this.queryGradeOrYuanqth10();
       //查询视觉整合能力前10
       this.queryGradeOrYuansj10();
@@ -327,7 +327,7 @@ export default {
         this.queryGradeOrYuanYiYu();
         //焦虑
         this.queryGradeOrYuanJL();
-        //躯体化
+        //压力
         this.queryGradeOrYuanQTH();
         //视觉整合能力
         this.queryGradeOrYuanSJ();
@@ -336,7 +336,7 @@ export default {
         this.queryGradeOrYuan10();
         //查询焦虑前10
         this.queryGradeOrYuanjl10();
-        //查询躯体化前10
+        //查询压力前10
         this.queryGradeOrYuanqth10();
         //查询视觉整合能力前10
         this.queryGradeOrYuansj10();
@@ -400,13 +400,13 @@ export default {
         }
       });
     },
-    //查询全年级和全院的所有统计---躯体化的
+    //查询全年级和全院的所有统计---压力的
     queryGradeOrYuanQTH() {
       let url = "";
       if (this.groupType == "1") {
-        url = `/userRecordScore/countPlanOrgHighRiskNum?dimName=躯体化&isLimit=false&planId=${this.planInfo.id}`;
+        url = `/userRecordScore/countPlanOrgHighRiskNum?dimName=压力&isLimit=false&planId=${this.planInfo.id}`;
       } else if (this.groupType == "2" && this.groupGrade != "") {
-        url = `/userRecordScore/countPlanOrgHighRiskNum?dimName=躯体化&grade=${this.groupGrade}&isLimit=false&planId=${this.planInfo.id}`;
+        url = `/userRecordScore/countPlanOrgHighRiskNum?dimName=压力&grade=${this.groupGrade}&isLimit=false&planId=${this.planInfo.id}`;
       }
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {
@@ -563,14 +563,14 @@ export default {
         }
       });
     },
-    //查询躯体化前10数据
+    //查询压力前10数据
     queryGradeOrYuanqth10() {
       //res 返回数据结构
       let url = "";
       if (this.groupType == "1") {
-        url = `/userRecordScore/countPlanOrgHighRiskNum?dimName=躯体化&isLimit=true&planId=${this.planInfo.id}`;
+        url = `/userRecordScore/countPlanOrgHighRiskNum?dimName=压力&isLimit=true&planId=${this.planInfo.id}`;
       } else if (this.groupType == "2" && this.groupGrade != "") {
-        url = `/userRecordScore/countPlanOrgHighRiskNum?dimName=躯体化&grade=${this.groupGrade}&isLimit=true&planId=${this.planInfo.id}`;
+        url = `/userRecordScore/countPlanOrgHighRiskNum?dimName=压力&grade=${this.groupGrade}&isLimit=true&planId=${this.planInfo.id}`;
       }
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {

src/components/PlanReport.vue

@@ -398,7 +398,7 @@
                   <span class="sex_class">{{ tabNameCurrent }}</span>
                   <span class="sex_class">心理健康</span>
                   <span class="sex_class"
-                    >中重度{{ dime == "躯体化" ? "压力" : dime }}</span
+                    >中重度{{ dime == "压力" ? "压力" : dime }}</span
                   >
                 </div>
                 <div style="display: flex; flex-direction: column">
@@ -983,7 +983,7 @@ export default {
     },
     //格式化页面数据
     forDimen(row) {
-      if (row.dimensionName == "躯体化") {
+      if (row.dimensionName == "压力") {
         return "压力";
       } else {
         return row.dimensionName;
@@ -1188,7 +1188,7 @@ export default {
       } else {
         this.dimensionName = val;
         if (val == "压力") {
-          this.getDimensionPeopleList("躯体化");
+          this.getDimensionPeopleList("压力");
         } else {
           this.getDimensionPeopleList(val);
         }
@@ -1231,7 +1231,7 @@ export default {
         this.getAbnormalList();
       } else if (this.userType == "压力") {
         //---
-        this.getDimensionPeopleList("躯体化");
+        this.getDimensionPeopleList("压力");
       } else {
         this.getDimensionPeopleList(this.userType);
       }
@@ -1420,7 +1420,7 @@ export default {
               },
               {
                 value: res.data.highNum,
-                name: `中重度${this.dime == "躯体化" ? "压力" : this.dime}`,
+                name: `中重度${this.dime == "压力" ? "压力" : this.dime}`,
               },
             ];
             // {{ subValue }}&nbsp;&nbsp;&nbsp;&nbsp;中重度{{ dime}}

src/components/Report.vue

@@ -698,7 +698,7 @@ export default {
           let listTmp2 = [];
           listTmp2 = listTmp1.filter((item) => {
             return (
-              item.dimensionName == "躯体化" ||
+              item.dimensionName == "压力" ||
               item.dimensionName == "焦虑" ||
               item.dimensionName == "抑郁"
             );
@@ -707,14 +707,14 @@ export default {
           let listTmp3 = [];
           listTmp3 = listTmp1.filter((item) => {
             return !(
-              item.dimensionName == "躯体化" ||
+              item.dimensionName == "压力" ||
               item.dimensionName == "焦虑" ||
               item.dimensionName == "抑郁"
             );
           });
           this.reportDataAll = listTmp2.concat(listTmp3);
-          //将数组中的躯体化---抑郁---焦虑 取出来
-          //然后将数组中的不是焦虑--抑郁 --躯体化的 取出来 --进行排序
+          //将数组中的压力---抑郁---焦虑 取出来
+          //然后将数组中的不是焦虑--抑郁 --压力的 取出来 --进行排序
 
           // this.reportDataAll = res.data.dimensionScore.filter((item) => {
           //   return item.dimensionName != "总分";

src/components/Report1.vue

@@ -41,11 +41,16 @@
                   width=""
                 >
                 </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('contentEntities')"
                     >
@@ -68,7 +73,7 @@
                           {{ item.name }}
                         </div>
                       </div>
-                    </div>
+                    </div> -->
                   </template>
                 </el-table-column>
               </el-table>
@@ -100,25 +105,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>
@@ -140,13 +167,17 @@
               <div style="padding: 20px 40px">
                 <div>
                   <div class="report_info_out">
-                    <img v-show="gender=='1'" src="../assets/report/man1.png" />
-                    <img v-show="gender=='0'" src="../assets/report/woman1.png" />
+                    <img v-show="gender == '1'" src="../assets/report/man1.png" />
+                    <img v-show="gender == '0'" src="../assets/report/woman1.png" />
                     <div class="report_info_user">
                       <span class="info">姓名:&nbsp;&nbsp;{{ proDataLin.userName }}</span>
-                     
-                      <span class="info" v-show="proDataLin.planType=='0'">学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>
-                      <span class="info" v-show="proDataLin.planType=='1'">编号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>
+
+                      <span class="info" v-show="proDataLin.planType == '0'"
+                        >学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
+                      >
+                      <span class="info" v-show="proDataLin.planType == '1'"
+                        >编号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span
+                      >
                       <span class="info">测试用时:&nbsp;&nbsp;{{ useTime }}</span>
                       <span class="info"
                         >所属组织结构:&nbsp;&nbsp;<span style="">{{
@@ -165,10 +196,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"
@@ -203,9 +245,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>
@@ -224,7 +283,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"
@@ -252,7 +318,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"
@@ -436,6 +509,12 @@ export default {
       userTableData: [],
       multipleSelection: [],
 
+      //量表题目的选项
+      topPicList: [],
+      //认知任务必选的选项
+      taskList: [],
+      //认知任务可选的选项
+      taskOptionalList: [],
       //获取报告总数据
       reportData: [],
       //获取不过滤的数据
@@ -454,13 +533,13 @@ export default {
       echarts_ld: "",
       colorPro: "linear-gradient(to right,#FF4E00 ,#ffffff)",
       //该用户的需要做的题目的列表
-      topPicList: [],
+
       radio1: "",
       currentFlag: "",
       useTime: "",
       //当前用户选择的测试
       planObj: "",
-      gender:'1'
+      gender: "1",
     };
   },
   mounted() {
@@ -487,25 +566,43 @@ 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;
     },
+    radioClickNew(val) {
+      this.planObj = val;
+
+      this.topicVisible = true;
+      this.queryRport(val);
+    },
     radioClick(val, planObj) {
-      this.planObj = planObj;
-      if (this.userInfo.roleType != "5") {
-        if (planObj.enable == "0") {
-          this.$message({
-            type: "error",
-            message: "暂未授权",
-          });
-          return;
-        }
-      }
       //在数组中招待
       let params = {
         planId: val.planId,
@@ -521,7 +618,7 @@ export default {
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {
           // this.reportData = res.data;
-          this.gender=res.data.gender
+          this.gender = res.data.gender;
           let listTmp1 = [];
           listTmp1 = res.data.dimensionScore.filter((item) => {
             return item.dimensionName != "总分";
@@ -530,7 +627,7 @@ export default {
           let listTmp2 = [];
           listTmp2 = listTmp1.filter((item) => {
             return (
-              item.dimensionName == "躯体化" ||
+              item.dimensionName == "压力" ||
               item.dimensionName == "焦虑" ||
               item.dimensionName == "抑郁"
             );
@@ -539,14 +636,14 @@ export default {
           let listTmp3 = [];
           listTmp3 = listTmp1.filter((item) => {
             return !(
-              item.dimensionName == "躯体化" ||
+              item.dimensionName == "压力" ||
               item.dimensionName == "焦虑" ||
               item.dimensionName == "抑郁"
             );
           });
           this.reportDataAll = listTmp2.concat(listTmp3);
-          //将数组中的躯体化---抑郁---焦虑 取出来
-          //然后将数组中的不是焦虑--抑郁 --躯体化的 取出来 --进行排序
+          //将数组中的压力---抑郁---焦虑 取出来
+          //然后将数组中的不是焦虑--抑郁 --压力的 取出来 --进行排序
 
           // this.reportDataAll = res.data.dimensionScore.filter((item) => {
           //   return item.dimensionName != "总分";
@@ -578,7 +675,14 @@ export default {
           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;

src/views/manage/individualTendency.vue

@@ -239,7 +239,7 @@ export default {
     },
     //查询4个维度的值
     async query4Score() {
-      let list = ["抑郁", "焦虑", "躯体化", "视觉整合能力"];
+      let list = ["抑郁", "焦虑", "压力", "视觉整合能力"];
       //抑郁集合
       let listDepressed = [];
       //焦虑组合
@@ -257,8 +257,8 @@ export default {
         if (list[i] == "焦虑") {
           listAnxiety = await this.queryDetailScore(list[i]);
         }
-        //躯体化集合
-        if (list[i] == "躯体化") {
+        //压力集合
+        if (list[i] == "压力") {
           listStress = await this.queryDetailScore(list[i]);
         }
         //视觉能力集合
@@ -271,7 +271,7 @@ export default {
       // console.log(listAnxiety);
       // //抑郁
       // console.log(listDepressed);
-      // //躯体化
+      // //压力
       // console.log(listStress);
       // //视觉整合能力
       // console.log(listSj);
@@ -299,7 +299,7 @@ export default {
         for (let i = 0; i < listDepressed.length; i++) {
           listDepressedTmp.push(listDepressed[i].dimScore);
         }
-        //躯体化数据重组
+        //压力数据重组
         let listStressTmp = [];
         for (let i = 0; i < listStress.length; i++) {
           listStressTmp.push(listStress[i].dimScore);
@@ -677,7 +677,7 @@ export default {
         this.pageNum = 1;
         this.searchList();
       } else {
-        // this.queryDetailScore("躯体化");
+        // this.queryDetailScore("压力");
         this.query4Score();
       }
     },

src/views/manage/manageMain.vue

@@ -587,13 +587,13 @@ export default {
             showItem: true,
             path: "/manage/userManage",
           },
-          {
-            id: "11",
-            name: "请假管理",
-            icon: require("../../assets/menu/yuan.png"),
-            showItem: true,
-            path: "/manage/leaveManage",
-          },
+          // {
+          //   id: "11",
+          //   name: "请假管理",
+          //   icon: require("../../assets/menu/yuan.png"),
+          //   showItem: true,
+          //   path: "/manage/leaveManage",
+          // },
           // {
           //   id: "5",
           //   name: "教师管理",

src/views/manage/tendency.vue

@@ -486,7 +486,7 @@ export default {
     },
     //查询4个维度的值
     async query4Score() {
-      let list = ["抑郁", "焦虑", "躯体化", "视觉整合能力"];
+      let list = ["抑郁", "焦虑", "压力", "视觉整合能力"];
       //抑郁集合
       let listDepressed = [];
       //焦虑组合
@@ -504,8 +504,8 @@ export default {
         if (list[i] == "焦虑") {
           listAnxiety = await this.queryDetailScore(list[i]);
         }
-        //躯体化集合
-        if (list[i] == "躯体化") {
+        //压力集合
+        if (list[i] == "压力") {
           listStress = await this.queryDetailScore(list[i]);
         }
         //视觉能力集合
@@ -518,7 +518,7 @@ export default {
       // console.log(listAnxiety);
       // //抑郁
       // console.log(listDepressed);
-      // //躯体化
+      // //压力
       // console.log(listStress);
       // //视觉整合能力
       // console.log(listSj);
@@ -546,7 +546,7 @@ export default {
         for (let i = 0; i < listDepressed.length; i++) {
           listDepressedTmp.push((parseFloat(listDepressed[i].num) * 100).toFixed(2));
         }
-        //躯体化数据重组
+        //压力数据重组
         let listStressTmp = [];
         for (let i = 0; i < listStress.length; i++) {
           listStressTmp.push((parseFloat(listStress[i].num) * 100).toFixed(2));
@@ -1089,7 +1089,6 @@ export default {
         this.pageNum = 1;
         this.searchList();
       } else {
-        // this.queryDetailScore("躯体化");
         this.query4Score();
       }
     },