备题组卷

梁保满
1 parent 533a17d8
Showing 11 changed files with 225 additions and 161 deletions
src/assets/css/index.scss
src/utils/index.js
src/views/ask/analysis.vue
src/views/ask/index.vue
src/views/dataSync/index.vue
src/views/device/index.vue
src/views/device/log.vue
src/views/examinationPaper/add.vue
src/views/login/index.vue
src/views/setUp/account.vue
src/views/test/index.vue
@@ -43,6 +43,7 @@
       border: 1px solid #e2e2e2;
       box-sizing: border-box;
       background: #fff;
+
       .el-input__inner {
         border-radius: 20px;
         border: none;
@@ -76,6 +77,7 @@
     }
   }
 }
+
 .answer-box {
   .answer-s {
     display: inline-block;
@@ -88,6 +90,7 @@
     color: #333;
     text-align: center;
     line-height: 30px;
+
     &.active {
       background: #5e78fa;
       border-color: #5e78fa;
@@ -95,6 +98,7 @@
     }
   }
 }
+
 .el-menu-item i {
   width: 12px;
   text-align: center;
@@ -104,43 +108,57 @@
 .el-table thead th.el-table__cell {
   background: #f5f7fa;
 }
-.el-table .el-table__cell.bg{
+
+.el-table .el-table__cell.bg {
   background: #f9f9f9;
 }
+
+.el-table th.el-table__cell.p0>.cell {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 .el-menu--popup {
   min-width: 160px;
 }
+
 .ellipsis {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.pagination-box{
-  text-align:center;
-  margin:10px;
+
+.pagination-box {
+  text-align: center;
+  margin: 10px;
 }
-.down-txt{
+
+.down-txt {
   display: flex;
   align-items: center;
   padding-left: 160px;
 }
-.h-title{
-  padding-left:12px;
+
+.h-title {
+  padding-left: 12px;
   position: relative;
-  font-size:16px;
-  &:after{
-    content:"";
-    position:absolute;
-    left:0;
-    top:50%;
-    margin-top:-8px;
-    width:3px;
-    height:16px;
+  font-size: 16px;
+
+  &:after {
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 50%;
+    margin-top: -8px;
+    width: 3px;
+    height: 16px;
     background: #2e9afe;
   }
 }
-div,ul{
-  &::-webkit-scrollbar{
-    width:0;
+
+div,
+ul {
+  &::-webkit-scrollbar {
+    width: 0;
   }
 }
 \ No newline at end of file
@@ -723,6 +723,7 @@ export function formatGradeNameClass(data) {
           {
             value: item.classCode,
             label: item.className,
+            leaf:true
           },
         ],
       });
@@ -736,6 +737,7 @@ export function formatGradeNameClass(data) {
       gradeNameArr[gradeIndex].children.push({
         value: item.classCode,
         label: item.className,
+        leaf:true
       });
     }
   });
@@ -152,7 +152,7 @@
             prop="duration"
             label="答题耗时"
             align="center"
-          ></el-table-column>
+          ><template slot-scope="scoped">{{setDuration(scoped.row.duration)}}</template></el-table-column>
           <el-table-column
             prop="correctAnswerTimes"
             label="答对次数"
@@ -332,6 +332,11 @@ export default {
       this.page = 1;
       this._QueryData();
     },
+    setDuration(times){
+      let m = parseInt(times/60)
+      let s = times%60
+      return `${m}分${s}秒`
+    },
     setSubPro(type) {
       let tit;
       switch (type) {
@@ -93,7 +93,7 @@
         @change="tabChange"
         style="margin-bottom: 20px"
       >
-        <el-radio-button :label="1" v-if="query.startDay != query.endDay"
+        <el-radio-button :label="1"
           >单课时报表</el-radio-button
         >
         <!-- <el-radio-button :label="2" v-if="this.role != 'ROLE_BANZHUREN'"
@@ -544,6 +544,7 @@ export default {
           that.query.day = formatDate(new Date(), "yyyy-MM-dd");
           that.query.startDay = that.query.day;
           that.query.endDay = that.query.day;
+          that.tabIndex = 1
           break;
         case 2:
           let day = new Date().getDay();
@@ -32,7 +32,7 @@
       <div class="down-item">
         <p class="h-title">数据导出至U盘</p>
         <p class="txt">
-          本功能将云平台的数据导出到U盘。包括4套答题卡。
+          本功能将云平台的数据导出到U盘。
         </p>
         <div class="btn-box btn-box2" v-loading="downLoading">
           <i class="fa fa-cloud-download" @click="downloadFile"></i>
@@ -51,8 +51,7 @@ export default {
   data() {
     return {
       downLoading: false,
-      // url: "/api_html/teaching/importData",
-      url: "",
+      url: "/api_html/teaching/importData",
       file: {},
     };
   },
@@ -6,9 +6,10 @@
       </template>
       <template
         slot="btns"
-        v-if="role != 'ROLE_JITUAN' && type == 1 && school !== '长水'"
+        v-if="role != 'ROLE_JITUAN' && type == 1 && !code"
       >
-        <el-tooltip effect="dark" content="设备导入" placement="bottom">
+      <!-- 暂未有接口 -->
+        <!-- <el-tooltip effect="dark" content="设备导入" placement="bottom">
           <el-button
             type="primary"
             icon="el-icon-upload2"
@@ -17,7 +18,7 @@
             circle
             @click="diaUp = true"
           ></el-button>
-        </el-tooltip>
+        </el-tooltip> -->
         <el-tooltip effect="dark" content="添加基站" placement="bottom">
           <el-button
             type="primary"
@@ -501,7 +502,7 @@ export default {
   data() {
     return {
       role: "",
-      school: "",
+      code: "",
       loading: false,
       url: "/web/upLoadDevice",
       diaUp: false,
@@ -563,6 +564,7 @@ export default {
     };
   },
   created() {
+    this.code = localStorage.getItem("csCode")||""
     let role = "";
     this.$store.getters.info.permissions.map((item) => {
       if (item.roleName == this.$store.getters.info.showRoleName) {
@@ -64,9 +64,7 @@
             >本季度</span
           >
         </p>
-        <el-button class="serach-box" round @click="_QueryData"
-                  >筛选</el-button
-                >
+        <el-button type="primary" class="serach-box" round @click="_QueryData">筛选</el-button>
       </div>
     </div>
     <div class="table-box">
@@ -196,7 +194,7 @@ export default {
             //中国式星期天是一周的最后一天
             day = 7;
           }
-          day--
+          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");
@@ -287,7 +285,7 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.tableData = data?.list&&[...data?.list] || [];
+        this.tableData = (data?.list && [...data?.list]) || [];
         this.total = data.count;
       } else {
         this.$message.error(info);
@@ -301,7 +299,10 @@ export default {
 .page-content {
   padding: 20px;
 }
-.table-box{
-  padding:0 20px;
+.table-box {
+  padding: 0 20px;
+}
+.serach-box{
+  margin-left:20px;
 }
 </style>
 \ No newline at end of file
@@ -151,8 +151,8 @@
                 icon="el-icon-delete"
               ></el-button>
             </el-popconfirm>
-
-            <span>总分数：{{ setScore(question) }}分</span>
+            <span class="m20">共：{{ question.subQuestions.length }}题</span>
+            <span>共：{{ setScore(question) }}分</span>
           </p>
           <ul class="questions-ul">
             <li class="sub-questions">
@@ -330,10 +330,10 @@
                     :value="item.value"
                   >
                   </el-option>
-                  <el-option label="混合题题型" :value="6"> </el-option>
+                  <el-option label="混合题" :value="6"> </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="默认题数：">
+              <el-form-item label="题数：">
                 <el-input-number
                   v-model="questionForm.number"
                   :min="1"
@@ -344,7 +344,7 @@
                 ></el-input-number>
               </el-form-item>
               <el-form-item
-                label="默认选项："
+                label="选项个数："
                 v-show="
                   questionForm.questionType != 4 &&
                   questionForm.questionType != 5
@@ -359,7 +359,7 @@
                   label="label"
                 ></el-input-number>
               </el-form-item>
-              <el-form-item label="默认分数：">
+              <el-form-item label="单题分数：">
                 <el-input-number
                   v-model="questionForm.score"
                   :min="1"
@@ -398,7 +398,8 @@
           <p class="question-title">
             <span>{{ setBigNum(index) }}、</span>
             <span class="title-txt">{{ question.questionTitle }}</span>
-            <span>共 {{ setScore(question) }} 分</span>
+            <span class="m20">共：{{ question.subQuestions.length }}题</span>
+            <span>共：{{ setScore(question) }} 分</span>
           </p>
           <ul class="questions-ul">
             <li class="sub-questions">
@@ -477,7 +478,7 @@
                       class="answer-s"
                       v-for="option in subQuestions.answerOptions.split(',')"
                       :class="
-                        subQuestions.correctAnswer.includes(option)
+                        subQuestions.correctAnswer?.includes(option)
                           ? 'active'
                           : ''
                       "
@@ -876,7 +877,7 @@ export default {
       } else if (type == 3) {
         txt = ans + ",";
       } else if (type == 4) {
-        txt = ans == 1 ? "✓" : "✗";
+        txt = ans == 1 ? "✓" : ans == 2 ? "✗" : "";
       }
       return txt;
     },
@@ -907,75 +908,71 @@ export default {
       //   }
       // });
       // if (!valid) {
-        //添加题目ID、序号
-        this.form.questionList.map((item, index) => {
-          item.questionType = 0;
-          item.subQuestions.map((items, indexs) => {
-            items.questionId = this.setNum(index, indexs);
-            items.questionIndex = this.setNum(index, indexs);
-          });
+      //添加题目ID、序号
+      this.form.questionList.map((item, index) => {
+        item.questionType = 0;
+        item.subQuestions.map((items, indexs) => {
+          items.questionId = this.setNum(index, indexs);
+          items.questionIndex = this.setNum(index, indexs);
         });
-        //整理问题
-        this.form.questionList?.map((item) => {
-          let types = [{}];
-          let addndex = 0;
-          item.subQuestions.map((sub, index) => {
-            if (!!sub.questionType && sub.questionType != 5) {
-              if (sub.questionType == types[addndex].qusType) {
-                //同类型批量答案+1
-                types[addndex].subNum += 1;
-                if (
-                  types[addndex].answerOptions.length < sub.answerOptions.length
-                ) {
-                  types[addndex].answerOptions = sub.answerOptions;
-                }
-                types[addndex].answerList += this.setAnswer(
-                  sub.questionType,
-                  sub.correctAnswer
-                );
-                if (index == item.subQuestions.length - 1) {
-                  //循环最后类型数量大于等于5，保存批量答案
-                  if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                    types[addndex].endIndex = sub.questionIndex;
-                    types[addndex].index = index;
-                  }
-                }
-              } else {
+      });
+      //整理问题
+      this.form.questionList?.map((item) => {
+        let types = [{}];
+        let addndex = 0;
+        item.subQuestions.map((sub, index) => {
+          if (!!sub.questionType && sub.questionType != 5) {
+            if (sub.questionType == types[addndex].qusType) {
+              //同类型批量答案+1
+              types[addndex].subNum += 1;
+              if (
+                types[addndex].answerOptions.length < sub.answerOptions.length
+              ) {
+                types[addndex].answerOptions = sub.answerOptions;
+              }
+
+              // types[addndex].answerList += this.setAnswer(
+              //   sub.questionType,
+              //   sub.correctAnswer
+              // );
+              types[addndex].answerList = "";
+              if (index == item.subQuestions.length - 1) {
+                //循环最后类型数量大于等于5，保存批量答案
                 if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                  //不同类型时如果原有类型数量大于等于5，保存批量答案
-                  types[addndex].endIndex =
-                    item.subQuestions[index - 1].questionIndex;
-                  types[addndex].index = index - 1;
-                  addndex += 1;
-                  types[addndex] = {};
+                  types[addndex].endIndex = sub.questionIndex;
+                  types[addndex].index = index;
                 }
-                //不同类型初始化批量答案
-                types[addndex].qusType = sub.questionType;
-                types[addndex].subNum = 1;
-                types[addndex].answerOptions = sub.answerOptions;
-                types[addndex].answerList = this.setAnswer(
-                  sub.questionType,
-                  sub.correctAnswer
-                );
               }
-            }
-          });
-          for (let i = 0; i < types.length; i++) {
-            if (types[i].qusType == 3) {
-              types[i].answerList = types[i].answerList.slice(0, -1);
-            }
-            if (types[i].subNum >= 5) {
-              item.subQuestions.splice(
-                types[i].index + i + 1,
-                0,
-                deepClone(types[i])
-              );
+            } else {
+              if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                //不同类型时如果原有类型数量大于等于5，保存批量答案
+                types[addndex].endIndex =
+                  item.subQuestions[index - 1].questionIndex;
+                types[addndex].index = index - 1;
+                addndex += 1;
+                types[addndex] = {};
+              }
+              //不同类型初始化批量答案
+              types[addndex].qusType = sub.questionType;
+              types[addndex].subNum = 1;
+              types[addndex].answerOptions = sub.answerOptions;
+              types[addndex].answerList = ""
             }
           }
-          console.log(types);
         });
-        this.step = 2;
-        return;
+        for (let i = 0; i < types.length; i++) {
+          if (types[i].subNum >= 5) {
+            item.subQuestions.splice(
+              types[i].index + i + 1,
+              0,
+              deepClone(types[i])
+            );
+          }
+        }
+        console.log(types);
+      });
+      this.step = 2;
+      return;
       // } else {
       //   this.$message.error(
       //     `大题名称不能为空，请检查第${valid.slice(0, -1)}大题！`
@@ -1384,6 +1381,9 @@ export default {
 }
 .question-title {
   line-height: 40px;
+  .m20{
+    margin-right:20px;
+  }
   .ipt {
     width: 300px;
     margin: 0 16px 0 10px;
@@ -95,6 +95,8 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "715665",
+        // username: "18087527793",
+        // password: "Pw527793#",
         // username: "18687826606",
         // password: "Pw826606#",
         // username: "18893712576",
@@ -5,7 +5,8 @@
         <span>账号管理</span>
       </template>
       <template slot="btns" v-if="role == 'ROLE_JITUAN'">
-        <el-tooltip effect="dark" content="导入账号" placement="bottom">
+        <!-- 暂未有接口 -->
+        <!-- <el-tooltip effect="dark" content="导入账号" placement="bottom">
           <el-button
             type="primary"
             icon="el-icon-upload2"
@@ -14,7 +15,7 @@
             circle
             @click="diaUp = true"
           ></el-button>
-        </el-tooltip>
+        </el-tooltip> -->
         <el-tooltip effect="dark" content="添加账号" placement="bottom">
           <el-button
             type="primary"
@@ -101,11 +101,7 @@
         >
       </el-radio-group>
       <div v-show="tabIndex == 1" v-loading="loading">
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%"
-        >
+        <el-table :data="tableData" border style="width: 100%">
           <el-table-column
             prop="title"
             label="试卷名称"
@@ -156,67 +152,103 @@
           >
           <el-table-column
             prop="excellenRate"
-            label="优秀数（率）"
+            label="优秀数(率)"
             sortable
             align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.excellenNum
-                ? `${scoped.row.excellenNum}（${scoped.row.excellenRate}%）`
-                : scoped.row.excellenNum
-            }}</template></el-table-column
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.excellenNum }}</p>
+                <p v-if="scoped.row.excellenNum">
+                  {{ `（${scoped.row.excellenRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
           >
           <el-table-column
             prop="goodRate"
-            label="良好数（率）"
+            label="良好数(率)"
             sortable
             align="center"
-            ><template slot-scope="scoped"
-              >{{
-                (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                  scoped.row.answerNum == 0) &&
-                scoped.row.recordStatus == 0
-                  ? "-"
-                  : scoped.row.goodNum
-                  ? `${scoped.row.goodNum}（${scoped.row.goodRate}%）`
-                  : scoped.row.goodNum
-              }}
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.goodNum }}</p>
+                <p v-if="scoped.row.goodNum">
+                  {{ `（${scoped.row.goodRate}%）` }}
+                </p>
+              </template>
             </template></el-table-column
           >
           <el-table-column
             prop="passRate"
-            label="及格数（率）"
+            label="及格数(率)"
             sortable
             align="center"
-            ><template slot-scope="scoped"
-              >{{
-                (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                  scoped.row.answerNum == 0) &&
-                scoped.row.recordStatus == 0
-                  ? "-"
-                  : scoped.row.passNum
-                  ? `${scoped.row.passNum}（${scoped.row.passRate}%）`
-                  : scoped.row.passNum
-              }}
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.passNum }}</p>
+                <p v-if="scoped.row.passNum">
+                  {{ `（${scoped.row.passRate}%）` }}
+                </p>
+              </template>
             </template></el-table-column
           >
           <el-table-column
             prop="failedRate"
-            label="不及格数（率）"
+            label="不及格数(率)"
             sortable
             align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.nswerNum == 0) &&
-              scoped.row.arecordStatus == 0
-                ? "-"
-                : scoped.row.failedNum
-                ? `${scoped.row.failedNum}（${scoped.row.failedRate}%）`
-                : scoped.row.failedNum
-            }}</template></el-table-column
+            width="130"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.failedNum }}</p>
+                <p v-if="scoped.row.failedNum">
+                  {{ `（${scoped.row.failedRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
           >
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
@@ -318,13 +350,13 @@
               :prop="'score' + index"
               :label="index == 0 ? '总分' : '成绩'"
               align="center"
-              :class-name="index%2==0?'bg':''"
+              :class-name="index % 2 == 0 ? 'bg' : ''"
             ></el-table-column>
             <el-table-column
               :prop="'classRank' + index"
               label="班名"
               align="center"
-              :class-name="index%2==0?'bg':''"
+              :class-name="index % 2 == 0 ? 'bg' : ''"
             ></el-table-column>
           </el-table-column>
         </el-table>
@@ -357,25 +389,25 @@
               :prop="'examCount' + item"
               label="测练数"
               align="center"
-              :class-name="index%2==0?'bg':''"
+              :class-name="index % 2 == 0 ? 'bg' : ''"
             ></el-table-column>
             <el-table-column
               :prop="'participationCount' + item"
               label="参与数"
               align="center"
-              :class-name="index%2==0?'bg':''"
+              :class-name="index % 2 == 0 ? 'bg' : ''"
             ></el-table-column>
             <el-table-column
               :prop="'score' + item"
               label="总分"
               align="center"
-              :class-name="index%2==0?'bg':''"
+              :class-name="index % 2 == 0 ? 'bg' : ''"
             ></el-table-column>
             <el-table-column
               :prop="'classRank' + item"
               label="班名"
               align="center"
-              :class-name="index%2==0?'bg':''"
+              :class-name="index % 2 == 0 ? 'bg' : ''"
             ></el-table-column>
           </el-table-column>
         </el-table>
@@ -517,6 +549,7 @@ export default {
           that.query.day = formatDate(new Date(), "yyyy-MM-dd");
           that.query.startDay = that.query.day;
           that.query.endDay = that.query.day;
+          that.tabIndex = 1;
           break;
         case 2:
           let day = new Date().getDay();