From 8ea67428e9a73e9555b5ba4894572f3ac64a11d3 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Wed, 4 Jan 2023 18:45:47 +0800
Subject: [PATCH] 飞书bug

---
 src/api/axios.js                     |   1 -
 src/components/setAnswer.vue         |   8 ++++----
 src/components/upload.vue            |  10 ++--------
 src/views/analysis/index.vue         |   1 +
 src/views/ask/analysis.vue           |  18 ++++++++++--------
 src/views/ask/index.vue              | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 src/views/device/index.vue           |   6 +++---
 src/views/device/log.vue             |   1 +
 src/views/examinationPaper/index.vue |   4 ++--
 src/views/login/index.vue            |  10 +++++-----
 src/views/test/analysis.vue          | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
 src/views/test/editAnswer.vue        |  20 ++++++++++----------
 src/views/test/index.vue             | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
 13 files changed, 516 insertions(+), 159 deletions(-)

diff --git a/src/api/axios.js b/src/api/axios.js
index dcaea45..a316063 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -71,7 +71,6 @@ service.interceptors.response.use(
 
     if (status === 403 || status === 401) {
       if (data.status === 999) {
-        debugger
         console.log(data.data)
         if (data.data) {
             window.location.href = data.data;
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index d069f1b..752ac0a 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -356,10 +356,10 @@ export default {
       }
     },
     async saveAnswer() {
-      let questionList = [];
-      for (let i = 0; i < this.FormQuestionList.length; i++) {
-        if (this.FormQuestionList[i].qusType) {
-          this.FormQuestionList.splice(i, 1);
+      let questionList = [...this.FormQuestionList];
+      for (let i = 0; i < questionList.length; i++) {
+        if (questionList[i].qusType) {
+          questionList.splice(i, 1);
           i--;
         }
       }
diff --git a/src/components/upload.vue b/src/components/upload.vue
index f950457..8779670 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -30,14 +30,8 @@
 export default {
   name: "downUpData",
   props: {
-    id: {
-      type: String,
-      default: "",
-    },
-    examId: {
-      type: String,
-      default: "",
-    },
+    id: "",
+    examId: "",
     url: {
       type: String,
       default: "",
diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index 9638fbd..0041469 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -185,6 +185,7 @@ export default {
             //中国式星期天是一周的最后一天
             day = 7;
           }
+          day--
           let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
           that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue
index 06a0890..20ce59f 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/ask/analysis.vue
@@ -77,12 +77,12 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="canyu"
+            prop="participationRate"
             label="班级参与度"
             sortable
             align="center"
             ><template slot-scope="scoped"
-              >{{ scoped.row.canyu }}%</template
+              >{{ scoped.row.participationRate }}%</template
             ></el-table-column
           >
           <el-table-column
@@ -107,21 +107,22 @@
             prop="correctAnswer"
             label="正确答案"
             align="center"
-          ></el-table-column>
+          > <template slot-scope="scoped">{{scoped.row.correctAnswer==1?"✓":scoped.row.correctAnswer==2?"✗":scoped.row.correctAnswer}}</template></el-table-column>
           <el-table-column
             prop="fallible"
             label="干扰答案"
             align="center"
-          ></el-table-column>
-          <el-table-column prop="screenshot" label="题干" align="center">
+          ><template slot-scope="scoped">{{scoped.row.fallible==1?"✓":scoped.row.fallible==2?"✗":scoped.row.correctAnswer}}</template></el-table-column>
+          <!-- <el-table-column prop="screenshot" label="题干" align="center">
             <template slot-scope="scoped">
               <el-image
+                v-if="scoped.row.screenshot"
                 style="width: 60px; height: 40px"
                 :src="scoped.row.screenshot"
                 :preview-src-list="[scoped.row.screenshot]"
               >
-              </el-image></template
-          ></el-table-column>
+              </el-image><span v-else>暂无</span></template
+          ></el-table-column> -->
         </el-table>
         <el-table v-if="type == 2" :data="tableData" border style="width: 100%">
           <el-table-column
@@ -265,7 +266,7 @@
             icon="fa fa-cloud-download"
             >导出报表</el-button
           >
-          <el-button @click="edit" type="primary" round>设置答案</el-button>
+          <el-button @click="edit" type="primary" round>修改答案</el-button>
         </p>
       </div>
     </div>
@@ -336,6 +337,7 @@ export default {
     },
     handleSuccess() {
       this.dialogVisible = false;
+      this._QueryData();
     },
     async edit() {
       if (this.editLoading) return;
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 2b7a39c..300fd92 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -94,7 +94,9 @@
         @change="tabChange"
         style="margin-bottom: 20px"
       >
-        <el-radio-button :label="1">单课时报表</el-radio-button>
+        <el-radio-button :label="1" v-if="query.startDay != query.endDay"
+          >单课时报表</el-radio-button
+        >
         <!-- <el-radio-button :label="2" v-if="this.role != 'ROLE_BANZHUREN'"
           >阶段问答报表</el-radio-button
         > -->
@@ -109,7 +111,7 @@
         <span>总课时数：10</span>
         <span>互动总数：22</span>
       </p> -->
-      <div v-if="tabIndex == 1">
+      <div v-show="tabIndex == 1">
         <el-table
           :data="tableData"
           border
@@ -153,40 +155,46 @@
             >
           </el-table-column>
           <el-table-column
-            prop="correctRate"
+            prop="classCorrectRate"
             label="班级总正确率"
             sortable="custom"
             align="center"
             ><template slot-scope="scoped"
-              >{{ scoped.row.correctRate }}%</template
+              >{{ scoped.row.classCorrectRate }}%</template
             ></el-table-column
           >
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
-              <el-tooltip effect="dark" content="详情" placement="top">
+              <el-tooltip
+                effect="dark"
+                v-if="scoped.row.answerNum == 0"
+                content="设置答案"
+                placement="top"
+              >
                 <el-button
                   type="primary"
                   circle
                   size="mini"
-                  icon="fa fa-arrow-right"
-                  @click="linkTo(scoped.row)"
+                  icon="fa fa-file-text"
+                  @click="edit(scoped.row)"
                 ></el-button>
               </el-tooltip>
-              <el-tooltip effect="dark" content="修改答案" placement="top">
+              <el-tooltip v-else effect="dark" content="详情" placement="top">
                 <el-button
                   type="primary"
                   circle
                   size="mini"
-                  icon="fa fa-file-text"
-                  @click="edit(scoped.row)"
+                  icon="fa fa-arrow-right"
+                  @click="linkTo(scoped.row)"
                 ></el-button>
               </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <div v-if="tabIndex == 2">
+      <div v-show="tabIndex == 2">
         <el-table
+          v-if="role == 'ROLE_JIAOSHI'"
           :data="tableData"
           border
           style="width: 100%"
@@ -252,9 +260,34 @@
             align="center"
           ></el-table-column>
         </el-table>
+        <el-table v-else :data="tableData" border style="width: 100%">
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            align="center"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            v-for="(item, index) in phaseOption"
+            :key="index"
+            :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>
+        </el-table>
       </div>
-      <div v-if="tabIndex == 3">
+      <div v-show="tabIndex == 3">
         <el-table
+         v-if="role == 'ROLE_JIAOSHI'"
           :data="tableData"
           border
           style="width: 100%"
@@ -296,18 +329,40 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="canyu"
+            prop="interactionsNum"
             label="参与得分"
             sortable
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="duicuo"
+            prop="interactionsCorrectNum"
             label="对错得分"
             sortable
             align="center"
           ></el-table-column>
         </el-table>
+        <el-table v-else :data="tableData" border style="width: 100%">
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            align="center"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            v-for="(item, index) in phaseInter"
+            :key="index"
+            :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>
+        </el-table>
       </div>
       <div class="pagination-box" v-show="tabIndex == 1">
         <el-pagination
@@ -369,6 +424,8 @@ export default {
       subjectList: [], //科目
       tabIndex: 1, //选项卡
       tableData: [],
+      phaseOption: [],//问答补充数据
+      phaseInter:[],//互动补充数据
       page: 1,
       size: 20,
       total: 0,
@@ -418,6 +475,7 @@ export default {
             //中国式星期天是一周的最后一天
             day = 7;
           }
+          day--;
           let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
           that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
@@ -486,6 +544,7 @@ export default {
     },
     handleSuccess() {
       this.dialogVisible = false;
+      this._QueryData();
     },
     tabChange() {
       this.page = 1;
@@ -509,7 +568,7 @@ export default {
     async changClazz() {
       await this._QuerySubjectList();
       // await this.setDate(1);
-      this._QueryData()
+      this._QueryData();
     },
     async _QueryClassList() {
       const fetchClassList =
@@ -640,7 +699,29 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["answerCorrectRate" + items.subjectName] = items.answerCorrectRate;
+              params["correctRate" + items.subjectName] = items.correctRate;
+              params["participationRate" + items.subjectName] = items.participationRate;
+              params["periodCount" + items.subjectName] = items.periodCount;
+              params["questionNum" + items.subjectName] = items.questionNum;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.phaseOption = [...subjectName];
+        } else {
+          this.tableData = (data?.list && [...data?.list]) || [];
+        }
         this.total = data.count;
       } else {
         this.$message.error(info);
@@ -680,7 +761,26 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["interactionsNum" + items.subjectName] = items.interactionsNum;
+              params["interactionsCorrectNum" + items.subjectName] = items.interactionsCorrectNum;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.phaseInter = [...subjectName];
+        } else {
+          this.tableData = (data?.list && [...data?.list]) || [];
+        }
         this.total = data.count;
       } else {
         this.$message.error(info);
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 2f0ca54..b6db961 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -39,7 +39,7 @@
         </el-radio-group>
       </div>
       <div class="content">
-        <div v-if="type == 1">
+        <div v-show="type == 1">
           <div class="chart-box" v-if="count">
             <div class="device-num">
               <p class="p1">{{ count }}</p>
@@ -175,7 +175,7 @@
             </el-table>
           </div>
         </div>
-        <div v-else-if="type == 2">
+        <div v-show="type == 2">
           <div class="chart-box" v-if="count">
             <div class="device-num">
               <p class="p1">{{ count }}</p>
@@ -291,7 +291,7 @@
             </el-table>
           </div>
         </div>
-        <div v-else-if="type == 3">
+        <div v-show="type == 3">
           <div class="table-box">
             <div class="answer-header">
               <div class="sel-box">
diff --git a/src/views/device/log.vue b/src/views/device/log.vue
index ad1a947..09f8a23 100644
--- a/src/views/device/log.vue
+++ b/src/views/device/log.vue
@@ -193,6 +193,7 @@ export default {
             //中国式星期天是一周的最后一天
             day = 7;
           }
+          day--
           let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
           that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index bcccf87..dae2399 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -201,7 +201,7 @@ export default {
       tableData: null,
       shareForm: {
         id: "",
-        sharingType: 1, //0-任课班级/1-全年级
+        sharingType: 0, //0-任课班级/1-全年级
       },
       shareRulesForm: {
         sharingType: [
@@ -243,7 +243,7 @@ export default {
         case 1:
           //修改分享范围
           that.shareForm.id = item.id;
-          that.shareForm.sharingType = item.sharingType || 1;
+          that.shareForm.sharingType = item.sharingType;
           that.dialogVisible = true;
           break;
         case 2:
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6a9a118..fd4dbb0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -95,12 +95,12 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "Csiy88888",
-        username: "13610050254",
-        password: "Pw050254#",
+        // username: "13610050254",
+        // password: "Pw050254#",
         // username: "18332123505",
         // password: "Pw123505#",
-        // username: "18687826606",
-        // password: "Pw826606#",
+        username: "18687826606",
+        password: "Pw826606#",
         // username: "18946034886",
         // password: "Pw034886#",
         // username: "18893712576",
@@ -129,7 +129,7 @@ export default {
     this.dockkey = getURLParams("dockkey") || "";
     if (this.code || this.dockkey) {
       this.loading = true
-      // this._LoginCheck();
+      this._LoginCheck();
     }
   },
   methods: {
diff --git a/src/views/test/analysis.vue b/src/views/test/analysis.vue
index 32d1751..fa6b76a 100644
--- a/src/views/test/analysis.vue
+++ b/src/views/test/analysis.vue
@@ -16,7 +16,14 @@
         <el-button type="danger" round @click="_ReScore" size="mini"
           >重新计分</el-button
         >
-        <el-button type="danger" round plain size="mini" @click="paperModifyLog.modifiedTime = ''">暂时不计</el-button>
+        <el-button
+          type="danger"
+          round
+          plain
+          size="mini"
+          @click="paperModifyLog.modifiedTime = ''"
+          >暂时不计</el-button
+        >
       </div>
     </div>
     <div class="page-content">
@@ -46,65 +53,123 @@
           >作答明细表</span
         >
       </div>
-      <el-table v-if="type == 1" :data="tableData" border style="width: 100%">
+      <el-table v-show="type == 1" :data="tableData" border style="width: 100%">
         <el-table-column
           prop="questionIndex"
           label="题号"
           align="center"
+          width="60"
         ></el-table-column>
-        <el-table-column prop="questionType" label="题型" align="center"
+        <el-table-column
+          prop="questionType"
+          label="题型"
+          align="center"
+          width="100"
           ><template slot-scope="scope">{{
             setSubPro(scope.row.questionType)
           }}</template></el-table-column
         >
         <el-table-column
           prop="score"
+          width="100"
           label="满分值"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
+          width="110"
           prop="highestScore"
           label="班最高分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
+          width="110"
           prop="lowestScore"
           label="班最低分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
+          width="110"
           prop="avgScore"
           label="班平均分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="scoringRate"
+          prop="classScoringRate"
+          width="120"
           sortable
           label="班级得分率"
           align="center"
           ><template slot-scope="scoped"
-            >{{ scoped.row.scoringRate }}%</template
+            >{{ scoped.row.classScoringRate }}%</template
           ></el-table-column
         >
-        <el-table-column
-          prop="correctAnswer"
-          label="答案"
-          align="center"
-        ></el-table-column>
+        <el-table-column prop="correctAnswer" label="答案" align="center"
+          ><template slot-scope="scoped">{{
+            scoped.row.correctAnswer == 1
+              ? "✓"
+              : scoped.row.correctAnswer == 2
+              ? "✗"
+              : scoped.row.correctAnswer
+          }}</template>
+        </el-table-column>
         <el-table-column
           v-for="(item, index) in optionsList"
           :key="index"
-          :label="item.option"
-          :prop="item.option"
+          :label="'选项' + (index + 1)"
+          :prop="'option' + index"
+          align="center"
         >
         </el-table-column>
       </el-table>
+      <div class="hui-box" v-show="type == 1">
+        <span class="s-txt">汇总</span>
+        <ul class="hui-ul">
+          <li class="hui-li">
+            <span class="hui-s s1">主观题</span>
+            <span class="hui-s s1">{{ paperModifyLog.subjectiveScore }}</span>
+            <span class="hui-s s2">{{
+              paperModifyLog.subjectiveHighestScore
+            }}</span>
+            <span class="hui-s s2">{{
+              paperModifyLog.subjectiveLowestScore
+            }}</span>
+            <span class="hui-s s2">{{
+              paperModifyLog.subjectiveAvgScore
+            }}</span>
+            <span class="hui-s s3"
+              >{{ paperModifyLog.subjectiveClassScoringRate }}%</span
+            >
+          </li>
+          <li class="hui-li">
+            <span class="hui-s s1">客观题</span>
+            <span class="hui-s s1">{{ paperModifyLog.objectiveScore }}</span>
+            <span class="hui-s s2">{{
+              paperModifyLog.objectiveHighestScore
+            }}</span>
+            <span class="hui-s s2">{{
+              paperModifyLog.objectiveLowestScore
+            }}</span>
+            <span class="hui-s s2">{{ paperModifyLog.objectiveAvgScore }}</span>
+            <span class="hui-s s3"
+              >{{ paperModifyLog.objectiveClassScoringRate }}%</span
+            >
+          </li>
+          <li class="hui-li">
+            <span class="hui-s s1">整卷</span>
+            <span class="hui-s s1">{{ paperModifyLog.examPaperScore }}</span>
+            <span class="hui-s s2">{{ paperModifyLog.highestScore }}</span>
+            <span class="hui-s s2">{{ paperModifyLog.lowestScore }}</span>
+            <span class="hui-s s2">{{ paperModifyLog.avgScore }}</span>
+            <span class="hui-s s3">{{ paperModifyLog.classScoringRate }}%</span>
+          </li>
+        </ul>
+      </div>
       <el-table
-        v-if="type == 2"
+        v-show="type == 2"
         :data="tableData2"
         border
         style="width: 100%"
@@ -123,7 +188,7 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="examPaperScore"
+          prop="examScore"
           label="总分"
           sortable
           align="center"
@@ -175,7 +240,7 @@
         </el-table-column>
       </el-table>
       <el-table
-        v-if="type == 3"
+        v-show="type == 3"
         :data="tableData2"
         border
         style="width: 100%"
@@ -192,19 +257,19 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="examPaperScore"
+          prop="examScore"
           label="总分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column label="分数组成" align="center">
           <el-table-column
-            prop="objectiveScore"
+            prop="objectiveExamScore"
             label="客观题分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="subjectiveScore"
+            prop="subjectiveExamScore"
             label="主观题分"
             align="center"
           ></el-table-column>
@@ -219,7 +284,7 @@
         </el-table-column>
       </el-table>
       <el-table
-        v-if="type == 4"
+        v-show="type == 4"
         :data="tableData2"
         border
         style="width: 100%"
@@ -291,6 +356,7 @@
         >
         <div>
           <el-button
+            v-if="paperModifyLog.subjectiveScore != 0"
             @click="diaUp = true"
             type="primary"
             round
@@ -302,7 +368,6 @@
       </div>
       <div class="edit-dia" v-show="dialogVisible" height="100%">
         <editAnswer
-          :id="id"
           :title="title"
           :score="score"
           @cancel="cancel"
@@ -346,6 +411,21 @@ export default {
       paperModifyLog: {
         realName: "",
         modifiedTime: "",
+        subjectiveScore: 0,
+        subjectiveHighestScore: "",
+        subjectiveLowestScore: "",
+        subjectiveAvgScore: "",
+        subjectiveClassScoringRate: "",
+        objectiveScore: "",
+        objectiveHighestScore: "",
+        objectiveLowestScore: "",
+        objectiveAvgScore: "",
+        objectiveClassScoringRate: "",
+        examPaperScore: "",
+        highestScore: "",
+        lowestScore: "",
+        avgScore: "",
+        classScoringRate: "",
       },
       tableData: [],
       optionsList: [],
@@ -382,6 +462,7 @@ export default {
       return tit;
     },
     edit() {
+      this.$refs.editAnswer.edit(this.id);
       this.dialogVisible = true;
     },
     cancel() {
@@ -421,8 +502,8 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        if (data.paperModifyLog) {
-          this.paperModifyLog = { ...data.paperModifyLog };
+        if (data.examReport) {
+          this.paperModifyLog = { ...data.examReport };
         }
       } else {
         this.$message.error(info);
@@ -437,9 +518,9 @@ export default {
       this.loading = false;
       if (status === 0) {
         this.$message.success(info);
-        this._QueryData()
-        this.paperModifyLog.modifiedTime=""
-        this.paperModifyLog.realName=""
+        this._QueryData();
+        this.paperModifyLog.modifiedTime = "";
+        this.paperModifyLog.realName = "";
       } else {
         this.$message.error(info);
       }
@@ -463,8 +544,9 @@ export default {
           console.log(detail);
           detail.map((items, index) => {
             params["que" + items.id] = items.id;
-            params["score" + items.id] = items.score;
-            params["answer" + items.id] = items.answer;
+            params["score" + items.id] = Number(items.score).toFixed(2);
+            params["answer" + items.id] =
+              items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer;
             params["isRight" + items.id] = items.isRight;
             params["questionType" + items.id] = items.questionType;
           });
@@ -498,7 +580,8 @@ export default {
           }
           console.log(detail);
           detail.map((items, index) => {
-            params[items.option] = items.count;
+            params["option" + index] =
+              items.option == 1 ? "✓" : items.option == 2 ? "✗" : items.option;
           });
           return {
             ...item,
@@ -603,4 +686,38 @@ export default {
   display: flex;
   justify-content: space-between;
 }
+.hui-box {
+  display: flex;
+  text-align: center;
+  .s-txt {
+    width: 61px;
+    line-height: 144px;
+    background: #e2e2e2;
+    font-size: 16px;
+    color: #fff;
+    font-weight: 700;
+  }
+  .hui-ul {
+    border-top: 1px solid #e2e2e2;
+  }
+  .hui-li {
+    display: flex;
+    .hui-s {
+      height: 48px;
+      line-height: 48px;
+      border-right: 1px solid #e2e2e2;
+      border-bottom: 1px solid #e2e2e2;
+      box-sizing: border-box;
+    }
+    .s1 {
+      width: 100px;
+    }
+    .s2 {
+      width: 110px;
+    }
+    .s3 {
+      width: 120px;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/test/editAnswer.vue b/src/views/test/editAnswer.vue
index d492278..77c9134 100644
--- a/src/views/test/editAnswer.vue
+++ b/src/views/test/editAnswer.vue
@@ -299,14 +299,14 @@ export default {
     score: "",
   },
   watch: {
-    id: {
-      handler: function (val) {
-        if (val) {
-          this.edit();
-        }
-      },
-      immediate: true,
-    },
+    // id: {
+    //   handler: function (val) {
+    //     if (val) {
+    //       this.edit();
+    //     }
+    //   },
+    //   immediate: true,
+    // },
   },
   data() {
     return {
@@ -486,10 +486,10 @@ export default {
       }
       this.diaSetAns = false;
     },
-    async edit() {
+    async edit(id) {
       //修改答案
       const { data, status, info } = await this.$request.examQuestionList({
-        examId: this.id,
+        examId: id,
       });
       if (status == 0) {
         this.questionList = deepClone(data?.list || []);
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index 3036fbc..71c244c 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -11,7 +11,6 @@
           class="sel"
           v-model="query.classId"
           placeholder="选择班级"
-          @change="changClazz"
         >
           <el-option
             v-for="item in classList"
@@ -27,7 +26,6 @@
           multiple
           v-model="query.subjectNames"
           placeholder="选择科目"
-          @change="_QueryData"
         >
           <el-option
             v-for="item in subjectList"
@@ -42,7 +40,6 @@
           class="sel"
           v-model="query.subjectNames"
           placeholder="选择科目"
-          @change="_QueryData"
         >
           <el-option
             v-for="item in subjectList"
@@ -97,7 +94,7 @@
         <el-radio-button :label="1">单卷测练报表</el-radio-button>
         <el-radio-button :label="2">阶段测练报表</el-radio-button>
       </el-radio-group>
-      <div v-if="tabIndex == 1" v-loading="loading">
+      <div v-show="tabIndex == 1" v-loading="loading">
         <el-table :data="tableData" border style="width: 100%">
           <el-table-column
             prop="title"
@@ -110,39 +107,51 @@
             align="center"
             width="100"
           ></el-table-column>
-          <el-table-column
-            prop="answeredNum"
-            label="测验人数"
-            align="center"
-          ></el-table-column>
+          <el-table-column prop="answeredNum" label="测验人数" align="center"
+            ><template slot-scope="scoped">{{
+              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
+            }}</template></el-table-column
+          >
           <el-table-column
             prop="examStartTime"
             label="测验时间"
             align="center"
           ></el-table-column>
-          <el-table-column
-            prop="avgScore"
-            label="班平均分"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="highestScore"
-            label="班最高分"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="lowestScore"
-            label="班最低分"
-            align="center"
-          ></el-table-column>
+          <el-table-column prop="avgScore" label="班平均分" align="center"
+            ><template slot-scope="scoped">{{
+              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+              scoped.row.answerNum == 0
+                ? scoped.row.avgScore || "-"
+                : scoped.row.avgScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="highestScore" label="班最高分" align="center"
+            ><template slot-scope="scoped">{{
+              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+              scoped.row.answerNum == 0
+                ? scoped.row.highestScore || "-"
+                : scoped.row.highestScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="lowestScore" label="班最低分" align="center"
+            ><template slot-scope="scoped">{{
+              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+              scoped.row.answerNum == 0
+                ? scoped.row.lowestScore || "-"
+                : scoped.row.lowestScore
+            }}</template></el-table-column
+          >
           <el-table-column
             prop="excellenRate"
             label="优秀数（率）"
             sortable
             align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.excellenRate }}%</template
-            ></el-table-column
+            ><template slot-scope="scoped">{{
+              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+              scoped.row.answerNum == 0
+                ? scoped.row.excellenNum || "-"
+                : `${scoped.row.excellenNum}/${scoped.row.excellenRate}%`
+            }}</template></el-table-column
           >
           <el-table-column
             prop="goodRate"
@@ -150,8 +159,13 @@
             sortable
             align="center"
             ><template slot-scope="scoped"
-              >{{ scoped.row.goodRate }}%</template
-            ></el-table-column
+              >{{
+                scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0
+                  ? scoped.row.goodNum || "-"
+                  : `${scoped.row.goodNum}/${scoped.row.goodRate}%`
+              }}
+            </template></el-table-column
           >
           <el-table-column
             prop="passRate"
@@ -159,21 +173,34 @@
             sortable
             align="center"
             ><template slot-scope="scoped"
-              >{{ scoped.row.passRate }}%</template
-            ></el-table-column
+              >{{
+                scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0
+                  ? scoped.row.passNum || "-"
+                  : `${scoped.row.passNum}/${scoped.row.passRate}%`
+              }}
+            </template></el-table-column
           >
           <el-table-column
             prop="failedRate"
             label="不及格数（率）"
             sortable
             align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.failedRate }}%</template
-            ></el-table-column
+            ><template slot-scope="scoped">{{
+              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+              scoped.row.answerNum == 0
+                ? scoped.row.failedNum || "-"
+                : `${scoped.row.failedNum}/${scoped.row.failedRate}%`
+            }}</template></el-table-column
           >
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
-              <el-tooltip effect="dark" content="详情" placement="top">
+              <el-tooltip
+                v-if="scoped.row.answerNum != 0"
+                effect="dark"
+                content="详情"
+                placement="top"
+              >
                 <el-button
                   type="primary"
                   circle
@@ -182,7 +209,12 @@
                   @click="linkTo(scoped.row)"
                 ></el-button>
               </el-tooltip>
-              <el-tooltip effect="dark" content="修改答案" placement="top">
+              <el-tooltip
+                v-else
+                effect="dark"
+                content="修改答案"
+                placement="top"
+              >
                 <el-button
                   type="primary"
                   circle
@@ -191,6 +223,20 @@
                   @click="edit(scoped.row)"
                 ></el-button>
               </el-tooltip>
+              <el-tooltip
+                v-if="scoped.row.subjectiveScore == scoped.row.examPaperScore"
+                effect="dark"
+                content="导入主观题"
+                placement="top"
+              >
+                <el-button
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="fa fa-cloud"
+                  @click="uploadSJ(scoped.row)"
+                ></el-button>
+              </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
@@ -207,8 +253,13 @@
           </el-pagination>
         </div>
       </div>
-      <div v-if="tabIndex == 2" v-loading="loading">
-        <el-table :data="tableData" border style="width: 100%">
+      <div v-show="tabIndex == 2" v-loading="loading">
+        <el-table
+          v-if="role == 'ROLE_JIAOSHI'"
+          :data="tableData"
+          border
+          style="width: 100%"
+        >
           <el-table-column
             prop="studentCode"
             label="学号"
@@ -229,7 +280,7 @@
           >
             <el-table-column
               :prop="'score' + index"
-              label="总分/成绩"
+              :label="index == 0 ? '总分' : '成绩'"
               align="center"
             ></el-table-column>
             <el-table-column
@@ -239,6 +290,47 @@
             ></el-table-column>
           </el-table-column>
         </el-table>
+        <el-table 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="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in answerList"
+            :key="index"
+            :label="item"
+          >
+            <el-table-column
+              :prop="'examCount' + item"
+              label="测练数"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              :prop="'participationCount' + item"
+              label="参与数"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              :prop="'score' + item"
+              label="总分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              :prop="'classRank' + item"
+              label="班名"
+              align="center"
+            ></el-table-column>
+          </el-table-column>
+        </el-table>
       </div>
       <p class="down" v-if="tabIndex == 2">
         <el-button type="info" plain round icon="fa fa-cloud-download"
@@ -246,9 +338,23 @@
         >
       </p>
     </div>
+    <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
+      <up-load :url="url" :examId="examId" fileName="教师名单">
+        <template slot="down">
+          <p class="down-txt">
+            第一步：下载模板并编辑完成学生分数
+            <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+          </p>
+          <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
+        </template>
+      </up-load>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaUp = false">取 消</el-button>
+      </div>
+    </el-dialog>
     <div class="edit-dia" v-show="dialogVisible" height="100%">
       <editAnswer
-        :id="form.id"
+        ref="editAnswer"
         :title="form.title"
         :score="form.examPaperScore"
         @cancel="cancel"
@@ -259,7 +365,7 @@
 </template>
 
 <script>
-import { formatDate } from "utils";
+import { formatDate, downloadFile } from "utils";
 import editAnswer from "./editAnswer.vue";
 export default {
   components: { editAnswer },
@@ -267,6 +373,9 @@ export default {
     return {
       role: "",
       loading: false,
+      diaUp: false,
+      url: "/api_html/teaching/importSubjectiveScore",
+      examId: "",
       dialogVisible: false,
       form: {
         id: "",
@@ -317,6 +426,10 @@ export default {
         },
       });
     },
+    uploadSJ(obj) {
+      this.examId = obj.id;
+      this.diaUp = true;
+    },
     cancel() {
       this.dialogVisible = false;
     },
@@ -344,6 +457,7 @@ export default {
             //中国式星期天是一周的最后一天
             day = 7;
           }
+          day--;
           let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
           that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
@@ -398,12 +512,26 @@ export default {
     },
     edit(item) {
       this.form = { ...item };
+      this.$refs.editAnswer.edit(this.form.id);
       this.dialogVisible = true;
     },
     changeTab() {
       this.page = 1;
       this._QueryData();
     },
+    async downExcel() {
+      let data = await this.$request.subjectiveScoreTemplate({
+        examId: this.id,
+      });
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`主观题模版.xlsx`, blob);
+      } else {
+        this.$message.error(data.message);
+      }
+    },
     async changClazz() {
       this.page = 1;
       await this._QuerySubjectList();
@@ -478,6 +606,7 @@ export default {
         query.subjectNames = [query.subjectNames];
       } else {
         if (
+          query["subjectNames"] &&
           query["subjectNames"].length == 1 &&
           query["subjectNames"][0] == "全部"
         ) {
@@ -485,6 +614,9 @@ export default {
             return item.value;
           });
           query["subjectNames"].shift();
+        }else{
+          this.loading = false;
+          return
         }
       }
       const { data, status, info } = await this.$request.examReportList({
@@ -515,13 +647,14 @@ export default {
       }
       if (this.role == "ROLE_BANZHUREN") {
         if (
-          query["subjectNames"].length == 1 &&
+          query["subjectNames"] &&
+          query["subjectNames"]?.length == 1 &&
           query["subjectNames"][0] == "全部"
         ) {
           query["subjectNames"] = this.subjectList.map((item) => {
             return item.value;
           });
-          query["subjectNames"].shift();
+          query["subjectNames"]?.shift();
         }
       }
       const phaseExamReport =
@@ -534,47 +667,57 @@ export default {
       this.loading = false;
       if (status === 0) {
         this.total = data.count;
-        let dataIdsList = [],
-          dataList = [];
-        data?.list.map((item) => {
-          item.examList.map((items) => {
-            if (this.role == "ROLE_JITUAN") {
-              // if (!dataIdsList.includes(items.grade)) {
-              //   dataIdsList.push(items.grade);
-              //   dataList.push(items);
-              // }
-            } else {
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["examCount" + items.subjectName] = items.examCount;
+              params["participationCount" + items.subjectName] =
+                items.participationCount;
+              params["score" + items.subjectName] = items.score;
+              params["classRank" + items.subjectName] = items.classRank;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.answerList = [...subjectName];
+        } else {
+          let dataIdsList = [],
+            dataList = [];
+          data?.list.map((item) => {
+            item.examList.map((items) => {
               if (!dataIdsList.includes(items.title)) {
                 dataIdsList.push(items.title);
                 dataList.push(items);
               }
-            }
+            });
           });
-        });
-        console.log(dataList);
-        this.tableData = data?.list.map((item) => {
-          let params = {};
-          dataIdsList.map((ids, index) => {
-            params["score" + index] = "--";
-            params["classRank" + index] = "--";
-            item.examList.map((items) => {
-              if (this.role == "ROLE_JITUAN") {
-                if (items.title == ids) {
-                }
-              } else {
+          console.log(dataList);
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            dataIdsList.map((ids, index) => {
+              params["score" + index] = "--";
+              params["classRank" + index] = "--";
+              item.examList.map((items) => {
                 if (items.title == ids) {
                   params["score" + index] = items.score;
                   params["classRank" + index] = items.classRank;
                 }
-              }
+              });
             });
+            return {
+              ...item,
+              ...params,
+            };
           });
-          return {
-            ...item,
-            ...params,
-          };
-        });
-        this.answerList = dataList;
+          this.answerList = dataList;
+        }
       } else {
         this.$message.error(info);
       }
--
libgit2 0.21.4