优化

梁保满
1 parent 3de13776
Showing 9 changed files with 62 additions and 31 deletions
src/api/apis/apis.js
src/utils/index.js
src/views/analysis/index.vue
src/views/ask/analysis.vue
src/views/device/index.vue
src/views/examinationPaper/add.vue
src/views/login/index.vue
src/views/setUp/teacher.vue
src/views/test/analysis.vue
@@ -740,6 +740,7 @@ export default {
       url: setUpUrls.exportSchoolContrast,
       method: "POST",
       data,
+      responseType: 'arraybuffer',
     });
   },
   //  导出年级使用对比
@@ -748,6 +749,7 @@ export default {
       url: setUpUrls.exportGradeContrast,
       method: "POST",
       data,
+      responseType: 'arraybuffer',
     });
   },
 };
@@ -454,7 +454,7 @@ export function checkAnswer(
     //单选
     console.log(s.length + " " + questionCount);
     if (s.length > questionCount) {
-      s = s.substring(s.length - questionCount, s.length);
+      s = s.substring(0, questionCount+1);
     }
   } else if (questionType == 3) {
     //多选
@@ -133,7 +133,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <p class="down" v-if="role != 'ROLE_JITUAN' && tableData.length">
+        <p class="down" v-if="tableData.length">
           <el-button
             @click="downExc"
             type="primary"
@@ -202,7 +202,10 @@ export default {
         delete query.regionId;
       }
       this.exportLoading = true;
-      const data = await this.$request.exportUsageAnalysis({ ...query });
+
+      const exportUsageAnalysis = this.role != "ROLE_JITUAN"?this.$request.exportUsageAnalysis:
+      this.type ==1?this.$request.exportSchoolContrast:this.$request.exportGradeContrast
+      const data = await exportUsageAnalysis({ ...query });
       this.exportLoading = false;
       if (data) {
         let blob = new Blob([data], {
@@ -338,7 +338,7 @@ export default {
       let ms = times
       let aTime;
       if(times==0){
-        aTime = `0分钟`
+        aTime = `0`
       }else{
         if(m==0&&s==0){
           aTime = `${ms}毫秒`
@@ -320,6 +320,7 @@
               </div>
             </div>
             <el-table
+              ref="multipleTable"
               :data="tableData"
               border
               style="width: 100%"
@@ -405,7 +406,11 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="isAdd?'添加基站':'修改基站'" :visible.sync="diaAnswerEqu" width="400">
+    <el-dialog
+      :title="isAdd ? '添加基站' : '修改基站'"
+      :visible.sync="diaAnswerEqu"
+      width="400"
+    >
       <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
         <el-form-item label="设备编码：" prop="sn">
           <el-col :span="16"
@@ -508,7 +513,7 @@ export default {
   },
   data() {
     return {
-      isAdd:false,//添加还是修改基站
+      isAdd: false, //添加还是修改基站
       role: "",
       code: "",
       loading: false,
@@ -624,7 +629,7 @@ export default {
       this._QueryData();
     },
     edit(obj) {
-      this.isAdd=false
+      this.isAdd = false;
       for (let key in this.form) {
         if (key == "classIds") {
           this.form[key] = obj.classList[0]?.classId;
@@ -632,7 +637,7 @@ export default {
           this.form[key] = obj[key];
         }
       }
-      delete this.form.schoolId
+      delete this.form.schoolId;
       this.form.deviceId = obj.id;
       this.diaAnswerEqu = true;
     },
@@ -693,9 +698,9 @@ export default {
       this.form.pairingCode = "";
       this.form.classIds = "";
       this.form.roomName = "";
-      this.form.schoolId= this.school.id
-      delete this.form.deviceId
-      this.isAdd = true
+      this.form.schoolId = this.school.id;
+      delete this.form.deviceId;
+      this.isAdd = true;
       this.diaAnswerEqu = true;
     },
     async showSchool() {
@@ -783,13 +788,18 @@ export default {
           // query.classIds = query.classIds.map((item) => {
           //   return item[1];
           // });
-          if(typeof query.classIds == 'string' || typeof query.classIds == 'number'){
+          if (
+            typeof query.classIds == "string" ||
+            typeof query.classIds == "number"
+          ) {
             query.classIds = [query.classIds];
-          }else{
+          } else {
             query.classIds = [query.classIds[1]];
           }
-          
-          let deviceApi = this.isAdd?this.$request.addStation:this.$request.updateDevice
+
+          let deviceApi = this.isAdd
+            ? this.$request.addStation
+            : this.$request.updateDevice;
           const { data, status, info } = await deviceApi({
             ...query,
           });
@@ -799,8 +809,8 @@ export default {
             this.diaAnswerEqu = false;
             this.$message.success(info);
             this._QueryData();
-            if(this.isAdd){
-              this.stationReport()
+            if (this.isAdd) {
+              this.stationReport();
             }
           } else {
             this.$message.error(info);
@@ -1030,9 +1040,16 @@ export default {
               return item;
             })) ||
           [];
+
         this.total = data.count;
         this.$nextTick(function () {
           this.$refs.main.scrollTop = 0;
+          if (this.query.classId.length) {
+            this.selectionTabIds = this.tableData.map((item) => {
+              this.$refs.multipleTable.toggleRowSelection(item);
+              return item.id;
+            });
+          }
         });
       } else {
         this.$message.error(info);
@@ -400,7 +400,7 @@
           <p class="question-title">
             <span>{{ setBigNum(index) }}、</span>
             <span class="title-txt">{{ question.questionTitle }}</span>
-            <span class="m20">共：{{ question.subQuestions.length }}题</span>
+            <span class="m20">共：{{ setNums(question.subQuestions) }}题</span>
             <span>共：{{ setScore(question) }} 分</span>
           </p>
           <ul class="questions-ul">
@@ -519,13 +519,13 @@
               <p>{{ setSubPro(formAns.qusType) }}：</p>
               <p class="ipt">
                 <el-input
-                  v-if="formAns.qusType ==2 ||formAns.qusType==3"
+                  v-if="formAns.qusType == 2 || formAns.qusType == 3"
                   v-model="formAns.answerList"
-                  @keydown.native="keydownAnswer($event,formAns.qusType)"
+                  @keydown.native="keydownAnswer($event, formAns.qusType)"
                   @input="setAllAnswer($event, formAns.qusType)"
                 ></el-input>
                 <el-input
-                  v-if="formAns.qusType ==4"
+                  v-if="formAns.qusType == 4"
                   v-model="formAns.answerList"
                   readonly=""
                 ></el-input>
@@ -782,6 +782,14 @@ export default {
       }
       return lengths + subIndex + 1;
     },
+    setNums(ques) {
+      let lengths = 0;
+      let subArr = ques.filter((item) => {
+        return !!item.questionType;
+      });
+      lengths = subArr.length;
+      return lengths
+    },
     setBigNum(num) {
       let txt = "";
       let bigNum = [
@@ -912,12 +920,12 @@ export default {
         event.returnValue = "";
       }
     },
-    setAllAnswer(event, type){
+    setAllAnswer(event, type) {
       let str = this.formAns.answerList;
       let str2 = checkAnswer(
         str,
         type,
-        this.formAns.answerOptions.split(',').length,
+        this.formAns.answerOptions.split(",").length,
         this.formAns.subNum
       );
       this.formAns.answerList = str2;
@@ -95,8 +95,8 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "715665",
-        // username: "18314340313",
-        // password: "Pw340313#",
+        username: "18314340313",
+        password: "Pw340313#",
         // username: "18687826606",
         // password: "Pw826606#",
         // username: "18893712576",
@@ -5,7 +5,7 @@
         <span>教师管理</span>
       </template>
       <template slot="btns" v-if="!code">
-        <el-tooltip effect="dark" content="导入教师名单" placement="bottom">
+        <!-- <el-tooltip effect="dark" content="导入教师名单" placement="bottom">
           <el-button
             type="primary"
             icon="el-icon-upload2"
@@ -14,7 +14,7 @@
             circle
             @click="diaUp = true"
           ></el-button>
-        </el-tooltip>
+        </el-tooltip> -->
         <el-tooltip effect="dark" content="添加教师" placement="bottom">
           <el-button
             type="primary"
@@ -341,7 +341,10 @@
           >
             <template slot-scope="scope">
               <span
-                v-if="scope.row['answer' + item.id]"
+                v-if="tableData[index].questionType==5"
+              >*</span>
+              <span
+                v-else-if="scope.row['answer' + item.id]"
                 :class="scope.row['isRight' + item.id] ? '' : 'error'"
               >
                 {{ scope.row["answer" + item.id] }}
@@ -349,9 +352,7 @@
               <span
                 v-else
                 :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'"
-              >
-                {{ scope.row["questionType" + item.id] == 5 ? "*" : "-" }}
-              </span>
+              >-</span>
             </template>
           </el-table-column>
         </el-table>