From dbbfc6c5bac371f34ac43c2edcdddc0cae0afa1e Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Wed, 4 Jan 2023 22:57:14 +0800
Subject: [PATCH] 飞书优化及bug

---
 src/views/analysis/index.vue |   6 ++++--
 src/views/ask/analysis.vue   |  13 +++++++++++--
 src/views/ask/index.vue      | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
 src/views/device/index.vue   |   3 ++-
 src/views/device/log.vue     |   5 ++++-
 src/views/down/client.vue    |   6 +++---
 src/views/layout/layout.vue  |   1 +
 src/views/login/index.vue    |   8 +-------
 src/views/setUp/account.vue  |  11 ++++++-----
 src/views/test/analysis.vue  |  47 ++++++++++++++++++++++++++++++++++++-----------
 src/views/test/index.vue     |  49 ++++++++++++++++++++++++++++++++-----------------
 11 files changed, 213 insertions(+), 73 deletions(-)

diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index 0041469..641ae76 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -240,7 +240,7 @@ export default {
       let query = {};
       for (let key in this.query) {
         if (this.query[key] != "") {
-          if (key == gradeName) {
+          if (key == "gradeName") {
             query[key] = this.query[key]=="全部"?"":this.query[key];
           } else {
             query[key] = this.query[key];
@@ -335,7 +335,9 @@ export default {
             ...params,
           };
         });
-        this.dataList = dataList;
+        this.dataList = dataList.sort((a,b)=>{
+          return a.grade-b.grade
+        });
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue
index 20ce59f..8977a0f 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/ask/analysis.vue
@@ -112,7 +112,7 @@
             prop="fallible"
             label="干扰答案"
             align="center"
-          ><template slot-scope="scoped">{{scoped.row.fallible==1?"✓":scoped.row.fallible==2?"✗":scoped.row.correctAnswer}}</template></el-table-column>
+          ><template slot-scope="scoped">{{scoped.row.fallible==1?"✓":scoped.row.fallible==2?"✗":scoped.row.fallible}}</template></el-table-column>
           <!-- <el-table-column prop="screenshot" label="题干" align="center">
             <template slot-scope="scoped">
               <el-image
@@ -411,7 +411,16 @@ export default {
   },
 };
 </script>
-
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
 <style lang="scss" scoped>
 .down {
   padding-top: 20px;
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 300fd92..dc9fe25 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="main" ref="main">
     <back-box>
       <template slot="title">
         <span>问答-数据报表</span>
@@ -7,12 +7,7 @@
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.classId"
-          placeholder="选择班级"
-          @change="changClazz"
-        >
+        <el-select class="sel" v-model="query.classId" placeholder="选择班级">
           <el-option
             v-for="item in classList"
             :key="item.value"
@@ -27,7 +22,7 @@
           multiple
           v-model="query.subjectNames"
           placeholder="选择科目"
-          @change="_QueryData"
+          @change="changeSub"
         >
           <el-option
             v-for="item in subjectList"
@@ -42,7 +37,6 @@
           class="sel"
           v-model="query.subjectNames"
           placeholder="选择科目"
-          @change="_QueryData"
         >
           <el-option
             v-for="item in subjectList"
@@ -260,16 +254,18 @@
             align="center"
           ></el-table-column>
         </el-table>
-        <el-table v-else :data="tableData" border style="width: 100%">
+        <el-table :max-height="tableMaxHeight" v-else :data="tableData" border style="width: 100%">
           <el-table-column
             prop="studentCode"
             label="学号"
             align="center"
+            fixed
           ></el-table-column>
           <el-table-column
             prop="studentName"
             label="姓名"
             align="center"
+            fixed
             width="100"
           ></el-table-column>
           <el-table-column
@@ -278,16 +274,36 @@
             :label="item"
             align="center"
           >
-            <el-table-column align="center" :label="index==0?'总课时数':'课时数'" :prop="'periodCount'+item"> </el-table-column>
-            <el-table-column align="center" :label="index==0?'总出题数':'出题数'" :prop="'questionNum'+item"> </el-table-column>
-            <el-table-column align="center" :label="index==0?'总参与度':'参与度'" :prop="'participationRate'+item"> </el-table-column>
-            <el-table-column align="center" :label="index==0?'总正确率':'正确率'" :prop="'correctRate'+item"> </el-table-column>
+            <el-table-column
+              align="center"
+              :label="index == 0 ? '总课时数' : '课时数'"
+              :prop="'periodCount' + item"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              :label="index == 0 ? '总出题数' : '出题数'"
+              :prop="'questionNum' + item"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              :label="index == 0 ? '总参与度' : '参与度'"
+              :prop="'participationRate' + item"
+            >
+            </el-table-column>
+            <el-table-column
+              align="center"
+              :label="index == 0 ? '总正确率' : '正确率'"
+              :prop="'correctRate' + item"
+            ><template slot-scope="scoped">{{scoped.row['correctRate' + item]}}%</template>
+            </el-table-column>
           </el-table-column>
         </el-table>
       </div>
       <div v-show="tabIndex == 3">
         <el-table
-         v-if="role == 'ROLE_JIAOSHI'"
+          v-if="role == 'ROLE_JIAOSHI'"
           :data="tableData"
           border
           style="width: 100%"
@@ -359,8 +375,36 @@
             :label="item"
             align="center"
           >
-            <el-table-column align="center" :label="index==0?'参与分':'互动数'" :prop="'interactionsNum'+item"> </el-table-column>
-            <el-table-column align="center" :label="index==0?'对错分':'参与数'" :prop="'interactionsCorrectNum'+item"> </el-table-column>
+            <el-table-column
+              align="center"
+              v-if="index == 0"
+              label="参与分"
+              sortable
+              :prop="'interactionsNum' + item"
+            >
+            </el-table-column>
+            <el-table-column
+              v-else
+              align="center"
+              label="互动数"
+              :prop="'interactionsNum' + item"
+            >
+            </el-table-column>
+            <el-table-column
+              v-if="index == 0"
+              align="center"
+              label="对错分"
+              sortable
+              :prop="'interactionsCorrectNum' + item"
+            >
+            </el-table-column>
+            <el-table-column
+              v-else
+              align="center"
+              label="参与数"
+              :prop="'interactionsCorrectNum' + item"
+            >
+            </el-table-column>
           </el-table-column>
         </el-table>
       </div>
@@ -402,6 +446,7 @@ import { formatDate, deepClone, downloadFile } from "utils";
 export default {
   data() {
     return {
+      tableMaxHeight:300,
       role: "",
       loading: false,
       dialogVisible: false,
@@ -424,8 +469,8 @@ export default {
       subjectList: [], //科目
       tabIndex: 1, //选项卡
       tableData: [],
-      phaseOption: [],//问答补充数据
-      phaseInter:[],//互动补充数据
+      phaseOption: [], //问答补充数据
+      phaseInter: [], //互动补充数据
       page: 1,
       size: 20,
       total: 0,
@@ -446,6 +491,17 @@ export default {
     }
   },
   methods: {
+    changeSub(val) {
+      let sub;
+      if (val && val.length) {
+        let leng = val.length - 1;
+        sub = val[leng];
+      }
+      console.log(val);
+      this.query.subjectNames = val.filter((item) => {
+        return sub != "全部" ? item != "全部" : item == "全部";
+      });
+    },
     linkTo(obj) {
       //去详情
       this.$router.push({
@@ -547,7 +603,9 @@ export default {
       this._QueryData();
     },
     tabChange() {
+      this.tableMaxHeight = this.$refs.main.offsetHeight
       this.page = 1;
+      this.tableData = [];
       this._QueryData();
     },
     sortChange(obj) {
@@ -643,6 +701,7 @@ export default {
         query.subjectNames = [query.subjectNames];
       } else {
         if (
+          query["subjectNames"] &&
           query["subjectNames"].length == 1 &&
           query["subjectNames"][0] == "全部"
         ) {
@@ -651,6 +710,10 @@ export default {
           });
           query["subjectNames"].shift();
         }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
       }
       const { data, status, info } = await this.$request.periodReportList({
         ...query,
@@ -680,6 +743,7 @@ export default {
       }
       if (this.role == "ROLE_BANZHUREN") {
         if (
+          query["subjectNames"] &&
           query["subjectNames"].length == 1 &&
           query["subjectNames"][0] == "全部"
         ) {
@@ -688,6 +752,10 @@ export default {
           });
           query["subjectNames"].shift();
         }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
       }
       const phaseAnswerReport =
         this.role == "ROLE_BANZHUREN"
@@ -707,9 +775,11 @@ export default {
               if (!subjectName.includes(items.subjectName)) {
                 subjectName.push(items.subjectName);
               }
-              params["answerCorrectRate" + items.subjectName] = items.answerCorrectRate;
+              params["answerCorrectRate" + items.subjectName] =
+                items.answerCorrectRate;
               params["correctRate" + items.subjectName] = items.correctRate;
-              params["participationRate" + items.subjectName] = items.participationRate;
+              params["participationRate" + items.subjectName] =
+                items.participationRate;
               params["periodCount" + items.subjectName] = items.periodCount;
               params["questionNum" + items.subjectName] = items.questionNum;
             });
@@ -742,6 +812,7 @@ export default {
       }
       if (this.role == "ROLE_BANZHUREN") {
         if (
+          query["subjectNames"] &&
           query["subjectNames"].length == 1 &&
           query["subjectNames"][0] == "全部"
         ) {
@@ -750,6 +821,10 @@ export default {
           });
           query["subjectNames"].shift();
         }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
       }
       const phaseInteractiveReport =
         this.role == "ROLE_BANZHUREN"
@@ -769,8 +844,10 @@ export default {
               if (!subjectName.includes(items.subjectName)) {
                 subjectName.push(items.subjectName);
               }
-              params["interactionsNum" + items.subjectName] = items.interactionsNum;
-              params["interactionsCorrectNum" + items.subjectName] = items.interactionsCorrectNum;
+              params["interactionsNum" + items.subjectName] =
+                items.interactionsNum;
+              params["interactionsCorrectNum" + items.subjectName] =
+                items.interactionsCorrectNum;
             });
             return {
               ...item,
@@ -801,8 +878,20 @@ export default {
   },
 };
 </script>
-
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
 <style lang="scss" scoped>
+.main{
+  height:100%;
+}
 .table-box {
   margin: 0 20px;
   padding: 16px;
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index b6db961..ff89be1 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -517,6 +517,7 @@ export default {
         type: "",
       },
       statusList: [
+        { label: "全部", value: "" },
         { label: "离线", value: 0 },
         { label: "在线", value: 1 },
         { label: "异常", value: 2 },
@@ -916,7 +917,7 @@ export default {
       this.loading = false;
       if (status == 0) {
         this.tableData =
-          data?.list.map((item) => {
+          data?.list&&data?.list.map((item) => {
             item.upgradeFlag = item.upgradeFlag == 1 ? true : false;
             return item;
           }) || [];
diff --git a/src/views/device/log.vue b/src/views/device/log.vue
index 09f8a23..4a8c8f1 100644
--- a/src/views/device/log.vue
+++ b/src/views/device/log.vue
@@ -64,6 +64,9 @@
             >本季度</span
           >
         </p>
+        <el-button class="serach-box" round @click="_QueryData"
+                  >筛选</el-button
+                >
       </div>
     </div>
     <div class="table-box">
@@ -284,7 +287,7 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.tableData = [...data?.list] || [];
+        this.tableData = data?.list&&[...data?.list] || [];
         this.total = data.count;
       } else {
         this.$message.error(info);
diff --git a/src/views/down/client.vue b/src/views/down/client.vue
index d4c4756..14a572f 100644
--- a/src/views/down/client.vue
+++ b/src/views/down/client.vue
@@ -54,7 +54,7 @@
           <i class="fa fa-mail-reply-all"></i>
           <p>
             {{
-              `${type == 1 ? "参数设置" : formData.configName + "-修改入口"}`
+              `${type == 1 ? "参数设置" : formData.configName}`
             }}
           </p>
         </div>
@@ -66,7 +66,7 @@
           :rules="ruleForm"
           label-width="180px"
         >
-          <el-form-item label="主菜单设置：" prop="configName" v-if="type == 1">
+          <el-form-item label="配置名称：" prop="configName" v-if="type == 1">
             <el-col :span="12">
               <el-input
                 v-model.trim="formData.configName"
@@ -169,7 +169,7 @@
               :step="1"
               :step-strictly="true"
             ></el-input-number>
-            <span v-show="formData.viesAnswerSet != 2">秒</span>
+            <span v-show="formData.viesAnswerSet == 0">秒</span>
           </el-form-item>
           <el-form-item label="抽答设置：" prop="ballotAnswerSet">
             <el-radio-group v-model="formData.ballotAnswerSet">
diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue
index 05cf1a2..4848f49 100644
--- a/src/views/layout/layout.vue
+++ b/src/views/layout/layout.vue
@@ -109,6 +109,7 @@ ul.el-menu {
 #elmain {
   background-color: #fff;
   padding: 0;
+  min-height:calc(100% - 78px);
 }
 
 .avatar-uploader .el-upload {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index fd4dbb0..29cf62d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -95,16 +95,10 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "Csiy88888",
-        // username: "13610050254",
-        // password: "Pw050254#",
-        // username: "18332123505",
-        // password: "Pw123505#",
         username: "18687826606",
         password: "Pw826606#",
-        // username: "18946034886",
-        // password: "Pw034886#",
         // username: "18893712576",
-        // password: "Pw712576#",
+        // password: "712576",
         // username: "13247726488",
         // password: "726488",
         // username: "13319607658",
diff --git a/src/views/setUp/account.vue b/src/views/setUp/account.vue
index 95b5912..4e862c1 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/setUp/account.vue
@@ -132,9 +132,9 @@
           label="管辖范围"
           align="center"
         >
-          <template slot-scope="scoped" v-if="scoped.row.regionList">
-            <span v-for="item in scoped.row.regionList" :key="item.id">{{
-              item.regionName
+          <template slot-scope="scoped" v-if="scoped.row.schoolList.length">
+            <span v-for="item in scoped.row.schoolList" :key="item.id">{{
+              item.schoolName
             }}</span>
           </template>
         </el-table-column>
@@ -461,7 +461,7 @@ export default {
       if (this.role != "ROLE_JITUAN") {
         this.formCount.userId = obj.userId;
       } else {
-        this.formCount.id = obj.id;
+        this.formCount.userId = obj.id;
       }
       this.formCount.loginName = obj.loginName;
       this.formCount.realName = obj.realName;
@@ -503,6 +503,7 @@ export default {
                 });
           if (status === 0) {
             this.$message.success(info);
+            this.diaCount=false
             this._QueryData(4);
           } else {
             this.$message.error(info);
@@ -548,7 +549,7 @@ export default {
               ...query,
             })
           : await this.$request.tenantUpdateUser({
-              id: obj.id,
+              userId: obj.id,
               type: type,
               ...query,
             });
diff --git a/src/views/test/analysis.vue b/src/views/test/analysis.vue
index fa6b76a..eea2a9e 100644
--- a/src/views/test/analysis.vue
+++ b/src/views/test/analysis.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="page-container" :class="dialogVisible ? 'active' : ''">
+  <div ref="main" class="page-container" :class="dialogVisible ? 'active' : ''">
     <back-box>
       <template slot="title">
         <span>单卷分析</span>
@@ -31,39 +31,41 @@
         <span
           class="tab-item"
           :class="type == 1 ? 'active' : ''"
-          @click="type = 1"
+          @click="setType(1)"
           >试题分析</span
         >
         <span
           class="tab-item"
           :class="type == 2 ? 'active' : ''"
-          @click="type = 2"
+          @click="setType(2)"
           >成绩排名</span
         >
         <span
           class="tab-item"
           :class="type == 3 ? 'active' : ''"
-          @click="type = 3"
+          @click="setType(3)"
           >小题分报表</span
         >
         <span
           class="tab-item"
           :class="type == 4 ? 'active' : ''"
-          @click="type = 4"
+          @click="setType(4)"
           >作答明细表</span
         >
       </div>
-      <el-table v-show="type == 1" :data="tableData" border style="width: 100%">
+      <el-table :max-height="tableMaxHeight" v-show="type == 1" :data="tableData" border style="width: 100%">
         <el-table-column
           prop="questionIndex"
           label="题号"
           align="center"
+          fixed
           width="60"
         ></el-table-column>
         <el-table-column
           prop="questionType"
           label="题型"
           align="center"
+          fixed
           width="100"
           ><template slot-scope="scope">{{
             setSubPro(scope.row.questionType)
@@ -120,7 +122,7 @@
           v-for="(item, index) in optionsList"
           :key="index"
           :label="'选项' + (index + 1)"
-          :prop="'option' + index"
+          :prop="'count' + index"
           align="center"
         >
         </el-table-column>
@@ -170,6 +172,7 @@
       </div>
       <el-table
         v-show="type == 2"
+        :max-height="tableMaxHeight"
         :data="tableData2"
         border
         style="width: 100%"
@@ -241,6 +244,7 @@
       </el-table>
       <el-table
         v-show="type == 3"
+        :max-height="tableMaxHeight"
         :data="tableData2"
         border
         style="width: 100%"
@@ -249,11 +253,13 @@
         <el-table-column
           prop="studentCode"
           label="学号"
+          fixed
           align="center"
         ></el-table-column>
         <el-table-column
           prop="studentName"
           label="姓名"
+          fixed
           align="center"
         ></el-table-column>
         <el-table-column
@@ -284,6 +290,7 @@
         </el-table-column>
       </el-table>
       <el-table
+      :max-height="tableMaxHeight"
         v-show="type == 4"
         :data="tableData2"
         border
@@ -293,11 +300,13 @@
         <el-table-column
           prop="studentCode"
           label="学号"
+          fixed
           align="center"
         ></el-table-column>
         <el-table-column
           prop="studentName"
           label="姓名"
+          fixed
           align="center"
         ></el-table-column>
         <el-table-column
@@ -306,7 +315,7 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="examPaperScore"
+          prop="examScore"
           label="总分"
           sortable
           align="center"
@@ -363,11 +372,12 @@
             v-loading="exportLoading"
             >导入主观题分数</el-button
           >
-          <el-button @click="edit" type="primary" round>设置答案</el-button>
+          <el-button @click="edit" type="primary" round>修改答案</el-button>
         </div>
       </div>
       <div class="edit-dia" v-show="dialogVisible" height="100%">
         <editAnswer
+          ref="editAnswer"
           :title="title"
           :score="score"
           @cancel="cancel"
@@ -399,6 +409,7 @@ export default {
   components: { editAnswer },
   data() {
     return {
+      tableMaxHeight:300,
       loading: false,
       exportLoading: false,
       diaUp: false,
@@ -443,6 +454,10 @@ export default {
     this._QueryData();
   },
   methods: {
+    setType(type){
+      this.tableMaxHeight = this.$refs.main.offsetHeight-120
+      this.type=type
+    },
     setSubPro(type) {
       let tit;
       switch (type) {
@@ -580,6 +595,7 @@ export default {
           }
           console.log(detail);
           detail.map((items, index) => {
+            params["count" + index] = items.count;
             params["option" + index] =
               items.option == 1 ? "✓" : items.option == 2 ? "✗" : items.option;
           });
@@ -609,12 +625,21 @@ export default {
   },
 };
 </script>
-
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
 <style lang="scss" scoped>
 .page-container {
   position: relative;
+  min-height: 100%;
   &.active {
-    height: 100%;
     overflow: hidden;
   }
   .edit-dia {
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index 71c244c..714eca7 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="page-container" :class="dialogVisible ? 'active' : ''">
+  <div ref="main" class="page-container" :class="dialogVisible ? 'active' : ''">
     <back-box>
       <template slot="title">
         <span>即时测-数据报表</span>
@@ -26,6 +26,7 @@
           multiple
           v-model="query.subjectNames"
           placeholder="选择科目"
+          @change="changeSub"
         >
           <el-option
             v-for="item in subjectList"
@@ -121,7 +122,7 @@
             ><template slot-scope="scoped">{{
               scoped.row.subjectiveScore == scoped.row.examPaperScore ||
               scoped.row.answerNum == 0
-                ? scoped.row.avgScore || "-"
+                ? "-"
                 : scoped.row.avgScore
             }}</template></el-table-column
           >
@@ -129,7 +130,7 @@
             ><template slot-scope="scoped">{{
               scoped.row.subjectiveScore == scoped.row.examPaperScore ||
               scoped.row.answerNum == 0
-                ? scoped.row.highestScore || "-"
+                ? "-"
                 : scoped.row.highestScore
             }}</template></el-table-column
           >
@@ -137,7 +138,7 @@
             ><template slot-scope="scoped">{{
               scoped.row.subjectiveScore == scoped.row.examPaperScore ||
               scoped.row.answerNum == 0
-                ? scoped.row.lowestScore || "-"
+                ? "-"
                 : scoped.row.lowestScore
             }}</template></el-table-column
           >
@@ -149,8 +150,8 @@
             ><template slot-scope="scoped">{{
               scoped.row.subjectiveScore == scoped.row.examPaperScore ||
               scoped.row.answerNum == 0
-                ? scoped.row.excellenNum || "-"
-                : `${scoped.row.excellenNum}/${scoped.row.excellenRate}%`
+                ? "-"
+                : scoped.row.excellenNum?`${scoped.row.excellenNum}/${scoped.row.excellenRate}%`:scoped.row.excellenNum 
             }}</template></el-table-column
           >
           <el-table-column
@@ -162,8 +163,8 @@
               >{{
                 scoped.row.subjectiveScore == scoped.row.examPaperScore ||
                 scoped.row.answerNum == 0
-                  ? scoped.row.goodNum || "-"
-                  : `${scoped.row.goodNum}/${scoped.row.goodRate}%`
+                  ? "-"
+                  : scoped.row.goodNum?`${scoped.row.goodNum}/${scoped.row.goodRate}%`:scoped.row.goodNum
               }}
             </template></el-table-column
           >
@@ -176,8 +177,8 @@
               >{{
                 scoped.row.subjectiveScore == scoped.row.examPaperScore ||
                 scoped.row.answerNum == 0
-                  ? scoped.row.passNum || "-"
-                  : `${scoped.row.passNum}/${scoped.row.passRate}%`
+                  ?  "-"
+                  : scoped.row.passNum?`${scoped.row.passNum}/${scoped.row.passRate}%`:scoped.row.passNum
               }}
             </template></el-table-column
           >
@@ -189,8 +190,8 @@
             ><template slot-scope="scoped">{{
               scoped.row.subjectiveScore == scoped.row.examPaperScore ||
               scoped.row.answerNum == 0
-                ? scoped.row.failedNum || "-"
-                : `${scoped.row.failedNum}/${scoped.row.failedRate}%`
+                ? "-"
+                : scoped.row.failedNum?`${scoped.row.failedNum}/${scoped.row.failedRate}%`:scoped.row.failedNum
             }}</template></el-table-column
           >
           <el-table-column label="操作" align="center">
@@ -290,7 +291,7 @@
             ></el-table-column>
           </el-table-column>
         </el-table>
-        <el-table v-else :data="tableData" border style="width: 100%">
+        <el-table :max-height="tableMaxHeight" v-else :data="tableData" border style="width: 100%">
           <el-table-column
             prop="studentCode"
             label="学号"
@@ -371,6 +372,7 @@ export default {
   components: { editAnswer },
   data() {
     return {
+      tableMaxHeight:300,
       role: "",
       loading: false,
       diaUp: false,
@@ -415,6 +417,17 @@ export default {
     }
   },
   methods: {
+     changeSub(val) {
+      let sub;
+      if (val && val.length) {
+        let leng = val.length - 1;
+        sub = val[leng];
+      }
+      console.log(val)
+      this.query.subjectNames = val.filter((item) => {
+        return sub != "全部" ? item != "全部" : item == "全部";
+      });
+    },
     linkTo(obj) {
       //去详情
       this.$router.push({
@@ -516,6 +529,7 @@ export default {
       this.dialogVisible = true;
     },
     changeTab() {
+      this.tableMaxHeight = this.$refs.main.offsetHeight-100
       this.page = 1;
       this._QueryData();
     },
@@ -614,9 +628,10 @@ export default {
             return item.value;
           });
           query["subjectNames"].shift();
-        }else{
-          this.loading = false;
-          return
+        }
+         if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
         }
       }
       const { data, status, info } = await this.$request.examReportList({
@@ -739,8 +754,8 @@ div::-webkit-scrollbar-thumb {
 <style lang="scss" scoped>
 .page-container {
   position: relative;
+  min-height: 100%;
   &.active {
-    height: 100%;
     overflow: hidden;
   }
 }
--
libgit2 0.21.4