修改可疑人员和满分人员显示

src/components/PlanReport.vue

@@ -178,7 +178,7 @@
             </el-table-column>
             <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
             </el-table-column>
-            <el-table-column label="操作" align="center" v-if="userType == '心理异常'">
+            <el-table-column label="症状" align="center" v-if="userType == '心理异常'">
               <template slot-scope="scope">
                 <div
                   v-show="scope.row.symptom == '重度'"
@@ -204,7 +204,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" v-if="userType != '心理异常'">
+            <el-table-column label="症状" align="center" v-if="userType != '心理异常'">
               <template slot-scope="scope">
                 <div
                   v-show="scope.row.dimensionSymptom == '重度'"
@@ -380,75 +380,6 @@
                     {{ subSingle }}人</span
                   >
                 </div>
-
-                <!-- <div style="display: flex; flex: 1; flex-direction: row">
-                  <div style="text-align: center; margin: 4px; font-size: 16px">
-                    {{ tabNameCurrent }}:
-                  </div>
-                  <div
-                    :title="subValue"
-                    style="
-                      font-size: 16px;
-                      text-align: center;
-                      margin: 4px;
-                      display: flex;
-                      cursor: pointer;
-                      overflow: hidden;
-                      -webkit-line-clamp: 1;
-                      display: -webkit-box;
-                      -webkit-box-orient: vertical;
-                    "
-                  >
-                    {{ subValue }}
-                  </div>
-                  <div style="margin: 4px; font-size: 16px">{{ subAll }}人</div>
-                </div>
-                <div style="display: flex; flex: 1; flex-direction: row">
-                  <div style="text-align: center; margin: 4px; font-size: 16px">
-                    心理健康
-                  </div>
-                  <div
-                    style="
-                      background-color: #5470c6;
-                      font-size: 16px;
-                      padding: 0 20px;
-                      margin: 4px;
-                      color: #ffffff;
-                      text-align: center;
-                      min-width: 80px;
-                    "
-                  >
-                    {{ subAll }}人
-                  </div>
-                </div>
-                <div style="display: flex; flex: 1; flex-direction: row">
-                  <div
-                    style="
-                      font-size: 16px;
-                      text-align: center;
-                      margin: 4px;
-                      overflow: hidden;
-                      -webkit-line-clamp: 1;
-                      display: -webkit-box;
-                      -webkit-box-orient: vertical;
-                    "
-                  >
-                    中重度{{ dime == "躯体化" ? "压力" : dime }}
-                  </div>
-                  <div
-                    style="
-                      background-color: #ffae00;
-                      padding: 0 20px;
-                      font-size: 16px;
-                      margin: 4px;
-                      color: #ffffff;
-                      text-align: center;
-                      min-width: 80px;
-                    "
-                  >
-                    {{ subSingle }}人
-                  </div>
-                </div> -->
               </div>
             </div>
           </div>
@@ -504,6 +435,98 @@
           :total="subTotal"
         >
         </el-pagination>
+        <div class="report_ge_title" style="margin-top: 40px; margin-bottom: 20px">
+          <div class="blue_t"></div>
+          <div class="com">可疑人员</div>
+        </div>
+        <div class="finish_class">
+          <el-table
+            :data="doubtfulData"
+            :row-style="{ height: '0px' }"
+            :cell-style="{ padding: '5px' }"
+            :header-cell-style="{ background: '#F8F8F8', color: '#606266' }"
+          >
+            <el-table-column
+              show-overflow-tooltip
+              prop="userName"
+              label="姓名"
+              align="center"
+              width=""
+            >
+            </el-table-column>
+            <el-table-column prop="userNo" label="学号" align="center" width="">
+            </el-table-column>
+            <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
+            </el-table-column>
+            <!-- <el-table-column
+              prop="dimensionName"
+              label="维度"
+              :formatter="forDimen"
+              align="center"
+              width=""
+            >
+            </el-table-column> -->
+            <!-- <el-table-column prop="dimensionSymptom" label="症状" align="center" width="">
+            </el-table-column> -->
+          </el-table>
+        </div>
+        <el-pagination
+          class="pag_class"
+          background
+          @current-change="doubtfulHandleCurrentChange"
+          :current-page.sync="doubtfulPageNum"
+          layout="total, prev, pager, next"
+          :page-size="doubtfulPageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="doubtfulTotal"
+        >
+        </el-pagination>
+        <div class="report_ge_title" style="margin-top: 40px; margin-bottom: 20px">
+          <div class="blue_t"></div>
+          <div class="com">满分人员</div>
+        </div>
+        <div class="finish_class">
+          <el-table
+            :data="fullmarkData"
+            :row-style="{ height: '0px' }"
+            :cell-style="{ padding: '5px' }"
+            :header-cell-style="{ background: '#F8F8F8', color: '#606266' }"
+          >
+            <el-table-column
+              show-overflow-tooltip
+              prop="userName"
+              label="姓名"
+              align="center"
+              width=""
+            >
+            </el-table-column>
+            <el-table-column prop="userNo" label="学号" align="center" width="">
+            </el-table-column>
+            <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
+            </el-table-column>
+            <!-- <el-table-column
+              prop="dimensionName"
+              label="维度"
+              :formatter="forDimen"
+              align="center"
+              width=""
+            >
+            </el-table-column> -->
+            <!-- <el-table-column prop="dimensionSymptom" label="症状" align="center" width="">
+            </el-table-column> -->
+          </el-table>
+        </div>
+        <el-pagination
+          class="pag_class"
+          background
+          @current-change="fullmarkHandleCurrentChange"
+          :current-page.sync="fullmarkPageNum"
+          layout="total, prev, pager, next"
+          :page-size="fullmarkPageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="fullmarkTotal"
+        >
+        </el-pagination>
       </div>
     </el-dialog>
 
@@ -589,6 +612,24 @@ export default {
       gradeList: [],
       subAll: 0,
       subSingle: 0,
+
+      //可疑人员总共变量
+      doubtfulData: [],
+      //可疑人员第几页
+      doubtfulPageNum: 1,
+      //可疑人员每页条数
+      doubtfulPageSize: 10,
+      //每页多少条
+      doubtfulTotal: 0,
+      //----------满分人员----------
+      //满分人员总变量
+      fullmarkData: [],
+      //满分人员第几页
+      fullmarkPageNum: 1,
+      //满分人员每页条数
+      fullmarkPageSize: 10,
+      //满分人员每页多少条
+      fullmarkTotal: 0,
     };
   },
   mounted() {
@@ -734,8 +775,13 @@ export default {
       //下载
       let a = document.createElement("a");
       document.body.appendChild(a);
-      console.log(basePath + `/planUser/exportCompletedUserHighRisk?planId=${this.planId}`)
-      a.setAttribute("href", basePath + `/planUser/exportCompletedUserHighRisk?planId=${this.planId}`);
+      console.log(
+        basePath + `/planUser/exportCompletedUserHighRisk?planId=${this.planId}`
+      );
+      a.setAttribute(
+        "href",
+        basePath + `/planUser/exportCompletedUserHighRisk?planId=${this.planId}`
+      );
       a.click();
     },
     echartsAllSize() {
@@ -843,6 +889,11 @@ export default {
       //获取维度列表
       this.getDimensionList();
       //获取组织架构信息
+
+      //获取可疑人员列表
+      this.doubtfulSearchList();
+      //获取满分人员列表
+      this.fullmarkSearchList();
     },
     //查询计划下年级
     queryGrade() {
@@ -1225,6 +1276,50 @@ export default {
       this.subPageNum = val;
       this.queryStudentData();
     },
+    //可疑人员列表查询
+    doubtfulSearchList() {
+      this.$http.get(
+        `/planUser/findCompletedNotSeriousUserList?pageNum=${this.doubtfulPageNum}&pageSize=${this.doubtfulPageSize}&planId=${this.planId}`,
+        {},
+        (res) => {
+          if (res && res.code == 200) {
+            this.doubtfulData = res.data.content;
+            this.doubtfulTotal = res.data.totalElements;
+            //调用接口开始查询选择的列表
+          } else {
+            this.$message.error(res.msg);
+          }
+        }
+      );
+    },
+    //可疑人员分页变化
+    doubtfulHandleCurrentChange(val) {
+      this.doubtfulPageNum = val;
+      //查询可疑人员列表数据
+      this.doubtfulSearchList();
+    },
+    //满分人员列表查询
+    fullmarkSearchList() {
+      this.$http.get(
+        `/planUser/findCompletedFullMarksUserList?pageNum=${this.fullmarkPageNum}&pageSize=${this.fullmarkPageSize}&planId=${this.planId}`,
+        {},
+        (res) => {
+          if (res && res.code == 200) {
+            this.fullmarkData = res.data.content;
+            this.fullmarkTotal = res.data.totalElements;
+            //调用接口开始查询选择的列表
+          } else {
+            this.$message.error(res.msg);
+          }
+        }
+      );
+    },
+    //满分人员分页变化
+    fullmarkHandleCurrentChange(val) {
+      this.fullmarkPageNum = val;
+      //查询可疑人员列表数据
+      this.fullmarkSearchList();
+    },
   },
 };
 </script>