Bug修改

src/components/TestResults/Record.vue

@@ -181,7 +181,7 @@ export default {
   },
   mounted() {
     console.log(this.$route.query.testPlanId, "测试计划id")
-    // this.inits();
+    this.init();
   },
   methods: {
     init(v) {

src/components/cognitiveTask/cognitiveTaskReport.vue

@@ -10,7 +10,7 @@
         <div class="btn-area flex-row">
           <el-button
             v-if="flag !== 'PSY_CAPITAL'"
-            type="primary"
+            type="success"
             plain
             round
             @click="downloadFile"
@@ -18,7 +18,7 @@
             点击下载
           </el-button>
           <!--                <el-button v-if="type == 0 && isGroup" type="primary" round @click="downloadReport">下载报告</el-button>&nbsp;&nbsp;-->
-          <el-button type="primary" plain round @click="goToHistory"
+          <el-button type="success" plain round @click="goToHistory"
             >测试历史记录</el-button
           >
         </div>

src/components/manage/main/planHistory.vue

@@ -67,7 +67,7 @@
 
     <el-dialog title="用户信息" :visible.sync="showUserInfo" width="50%" append-to-body :close-on-click-modal="false">
       <div class="filter-box">
-        <el-select size="small" style="width: 100px" v-model="userOrGroup" placeholder="任务类型" @change="searchTestRight">
+        <el-select size="small" style="width: 100px" v-model="userOrGroup" placeholder="任务类型" @change="changeUserOrGroup(userOrGroup)">
           <el-option label="个人" value="0"> </el-option>
           <el-option label="分组" value="1"> </el-option>
         </el-select>
@@ -87,7 +87,10 @@
           </el-table-column>
           <el-table-column prop="gender" label="性别" width="auto" align="center" :formatter="sexFormat"></el-table-column>
           <el-table-column prop="birthday" label="生日" width="auto" align="center">
+            <template slot-scope="scope">{{scope.row.birthday}}</template>
           </el-table-column>
+<!--          <el-table-column prop="birthday" label="生日" width="auto" align="center">-->
+<!--          </el-table-column>-->
           <el-table-column prop="profession" label="职业" width="auto" align="center">
           </el-table-column>
         </el-table>
@@ -117,13 +120,14 @@
     <!-- 任务信息 -->
     <el-dialog :close-on-click-modal="false" title="任务信息" :visible.sync="showTaskInfo" width="50%" append-to-body>
       <div class="filter-box">
-        <el-select v-model="taskType" placeholder="任务类型" @change="searchTestRight" size="small">
+        <el-select v-model="taskType" placeholder="任务类型" @change="changeSearch" size="small">
           <el-option v-for="item in taskTypeOptions" :key="item.taskType" :label="item.label" :value="item.taskType">
           </el-option>
         </el-select>
       </div>
       <el-table :data="testRightDatas" @selection-change="handleSelectionChangeForTypeTask" width="100%" size="small">
-        <el-table-column property="name" label="名称"></el-table-column>
+        <el-table-column property="name" label="名称">
+        </el-table-column>
         <el-table-column property="name" label="类型" width="120">
           <template slot-scope="scope">
             {{ scope.row.type == "0" ? "量表" : "认知任务" }}
@@ -137,6 +141,7 @@
         :page-size="pageSizeForTestRight" layout="total, sizes, prev, pager, next, jumper" :total="totalForTestRight">
       </el-pagination>
     </el-dialog>
+
     <el-dialog :close-on-click-modal="false" title="分组人员" :visible.sync="showGroupPeople" width="50%" append-to-body>
       <el-table :data="groupPeopleList" size="small">
         <el-table-column prop="petName" label="用户名称" width="auto" align="center">
@@ -405,6 +410,19 @@ export default {
     },
     handleSizeChangeForTestRight(){
 
+    },
+    //处理用户信息-个人和分组切换时候的请求变化
+    changeUserOrGroup(userOrGroup){
+      if(userOrGroup==0){
+        this.searchUser();
+      }else if(userOrGroup==1){
+        this.searchTestRight();
+      }
+    },
+    //处理任务信息-认知任务和量表切换
+    changeSearch(){
+      this.currentPageForTestRight = 1;
+      this.searchTestRight();
     },
     // 历史计划分页切换
     planCurrentChangeHandle(i) {
@@ -439,6 +457,13 @@ export default {
 
     // 查询任务
     searchTestRight() {
+      console.log(this.ingRowId +
+          "&type=" +
+          this.taskType +
+          "&beginNum=" +
+          this.currentPageForTestRight +
+          "&pageSize=" +
+          this.pageSizeForTestRight,'hhhh')
       this.$http.get(
         "/testPlan/contend/info?testPlanId=" +
         this.ingRowId +
@@ -450,10 +475,13 @@ export default {
         this.pageSizeForTestRight,
         {},
         (response) => {
-          console.log("333", response);
+          console.log(response,'查询任务');
           this.totalForTestRight = response.data.num;
           this.testRightDatas = response.data.data;
-          console.log(response);
+
+          // this.testRightDatas.forEach((item) => {
+          //   console.log(item.description, '11111');
+          // });
         }
       );
     },
@@ -480,9 +508,9 @@ export default {
         this.pageSizeForAddUser,
         {},
         (response) => {
-          this.totalForUser = response.data.num;
           this.userDatas = response.data.data;
-          console.log(response.data.data);
+          console.log(response.data.data,'用户信息');
+          this.totalForUser = response.data.num;
         }
       );
     },

src/components/manage/main/testPlan.vue

@@ -124,31 +124,31 @@
         :reserve-selection="true"
         width="54"
       />
-      <el-table-column prop="name" label="计划名称" width="200" align="center">
+      <el-table-column prop="name" label="计划名称" width="150" align="center">
       </el-table-column>
       <el-table-column
         prop="testBeginTime"
         label="开始日期"
-        min-width="200"
+        min-width="150"
         align="center"
       />
 
       <el-table-column
         prop="testEndTime"
         label="结束日期"
-        min-width="200"
+        min-width="150"
         align="center"
       />
       <el-table-column
         prop="status"
         label="计划状态"
-        min-width="200"
+        min-width="150"
         align="center"
         :formatter="statusFormat"
       />
       <el-table-column
         label="操作"
-        min-width="500"
+        min-width="400"
         align="center"
       >
         <!--        <template slot-scope="scope">-->
@@ -619,9 +619,9 @@
         size="small"
         @selection-change="handleSelectionChangeForAddTypeTask"
       >
-        <el-table-column type="selection" :reserve-selection="true" width="60">
+        <el-table-column type="selection" align="center" :reserve-selection="true"  width="130">
         </el-table-column>
-        <el-table-column property="name" label="任务名称"></el-table-column>
+        <el-table-column  width="220" align="center" prop="name" label="任务名称"></el-table-column>
         <el-table-column
           label="简介"
           prop="description"

src/views/CognitiveAbilityTask/goNogoTask.vue

@@ -71,7 +71,7 @@
         <span class="countdownStr" v-if="countDownSpanShow">{{
           countDownStr
         }}</span>
-        <div class="goNoGoTask txt-center" v-if="divShow" :style="{ background: backgroundColor }"></div>
+        <div class="goNoGoTask txt-center" v-if="divShow" :style="{ background: backgroundColor }" @click.stop="userClick"></div>
       </div>
     </div>
     <div style="text-align: center; padding-bottom: 2rem; display: block">
@@ -146,6 +146,7 @@ export default {
   mounted() {
     document.onkeydown = (e) => {
       let key = window.event.keyCode
+      console.log('key', key)
       if (key === 37) {
         this.userClick();
       }
@@ -170,6 +171,7 @@ export default {
       return percentage === 100 ? "任务已完成" : "任务进度";
     },
     userClick() {
+      console.log('11111');
       //用户点击动作
       if (this.userCanClick) {
         this.userCanClick = false;

src/views/MainTable.vue

@@ -110,6 +110,7 @@ export default {
         {},
         (response) => {
           this.subjectInfos = response.data.data;
+          console.log(this.subjectInfos,'查询量表的数据');
           this.totalNum = response.data.allNum;
           setTimeout(() => {
             this.loading = false

src/views/PersionDetail.vue

@@ -11,11 +11,11 @@
 
         <div class="btn-area flex-row">
           <el-button v-if="userType !== '1'"  type="primary" plain round @click="downloadPDF">PDF报告下载</el-button>
-          <el-button v-if="flag !== 'PSY_CAPITAL'" type="primary" plain round @click="downloadFile">
+          <el-button v-if="flag !== 'PSY_CAPITAL'" type="success" plain round @click="downloadFile">
             点击下载
           </el-button>
           <!--                <el-button v-if="type == 0 && isGroup" type="primary" round @click="downloadReport">下载报告</el-button>&nbsp;&nbsp;-->
-          <el-button type="primary" plain round @click="goBack2()">测试历史记录</el-button>
+          <el-button type="success" plain round @click="goBack2()">测试历史记录</el-button>
         </div>
 
         <div class="result-area">

src/views/ScaleTestPage.vue

@@ -166,7 +166,7 @@
       </div>
 
       <div class="btn-area" v-if="next_and_last_button">
-        <el-button v-if="this.scale_index != 0" type="success" round class="last_item" @click.native="lastItem()">
+        <el-button v-if="this.scale_index != 0" type="success" round class="last_item" @click="lastItem()">
           上一题
         </el-button>
         <el-button v-if="this.scale_index < this.scale_infos.length" type="success" round class="next_item"
@@ -670,6 +670,7 @@ export default {
         console.log('初始化题目:', res);
         if (res.code == 200 && res.data.length > 0) {
           this.scale_infos = res.data;
+          console.log(this.scale_infos,res.data,'11111')
           this.scale_all = this.scale_infos.length;
           this.scale_checkItems = this.scale_infos[this.scale_index].checkItems.split("；");
           this.scale_checkItems_arr = this.scale_infos[this.scale_index].questionParam ? JSON.parse(this.scale_infos[this.scale_index].questionParam) : [];
@@ -683,6 +684,7 @@ export default {
 
     // 上一题
     lastItem() {
+      console.log('jjjj');
       this.radio = "";
       this.checkedCities = [];
       this.otherRadioText = "";
@@ -742,7 +744,7 @@ export default {
 
     // 下一题
     nextItem() {
-      console.log(this.radioNumber)
+      console.log(this.radioNumber,'1111')
       const scaleInfoTemp = Object.assign({}, this.scale_infos[this.scale_index]);
       if (
         this.radio == "" && //0单选答案选择
@@ -757,7 +759,7 @@ export default {
         this.imgCheckbox.length <= 0 && //9附图多选答案选择
         // this.anyRadio == "" && //10附说明单选，不管选哪个选项必须填写补充说明
         this.checkedMultiple.length <= 0 && //11附说明多选，每选中一项必须
-        this.radioNumber == null
+        this.radioNumber == 0
       ) {
         console.log('------------------')
         this.$message.error("请先答本题！");
@@ -867,7 +869,6 @@ export default {
             (res) => {
               this.next_and_last_button = false;
               if (res.code == 200) {
-
                 this.resultJson = res.data;
                 this.getAnswerQuestionPaymentSuccess(this.resultJson);
               } else {
@@ -1161,7 +1162,7 @@ export default {
                       }
                     }
                   );
-                }, 1000);
+                     }, 1000);
               }
             },
             (res) => {
@@ -1271,7 +1272,7 @@ export default {
     background-color: white;
     width: calc(100% - 8px);
     margin-left: 8px;
-    height: auto;
+    height: 100%;
     border-radius: 20px;
     position: relative;
 
@@ -1335,8 +1336,9 @@ export default {
     }
 
     .answer {
+      overflow-y: auto;
       width: 90%;
-      height: auto;
+      height: 100%;
       margin: 0.099rem auto 0.4225rem;
       font-size: 14px;
       color: #999999;