发卡记录显示参数调整

梁保满
1 parent a6eb85ed
Showing 2 changed files with 16 additions and 20 deletions
public/index.html
src/views/standard/card/index.vue
@@ -19,8 +19,8 @@
       var link = document.querySelector("link[rel*='icon']") || document.createElement('link');
       link.type = 'image/x-icon';
       link.rel = 'shortcut icon';
-      var isZS = window.location.host.includes('ezquiz.sunvotecloud')
-      link.href = !isZS ? "./favicon.ico" : "./331icon.ico";
+      var isZS = window.location.host.includes('ezquiz.sunvotecloud') || window.location.host.includes('121.40.127.171')
+      link.href = isZS ? "./favicon.ico" : "./331icon.ico";
       document.getElementsByTagName('head')[0].appendChild(link);
     }
   </script>
@@ -10,7 +10,7 @@
       <div class="answer-header">
         <div class="sel-box" v-if="role == 'ROLE_XUEXIAO'">
           <el-cascader
-            @change="_QueryData(1)"
+            @change="(page = 1), _QueryData(1)"
             size="small"
             class="sel"
             clearable
@@ -24,27 +24,27 @@
             placeholder="请输入学生姓名"
             v-model="query.studentName"
             class="input-with-select"
-            @keyup.enter.native="_QueryData(2)"
+            @keyup.enter.native="(page = 1), _QueryData(2)"
           >
             <el-button
               slot="append"
               icon="el-icon-search"
-              @click="_QueryData(2)"
+              @click="(page = 1), _QueryData(2)"
             ></el-button>
           </el-input>
           <el-input
             placeholder="请输入学生学号"
             v-model="query.studentCode"
             class="input-with-select"
-            @keyup.enter.native="_QueryData(3)"
+            @keyup.enter.native="(page = 1), _QueryData(3)"
           >
             <el-button
               slot="append"
               icon="el-icon-search"
-              @click="_QueryData(3)"
+              @click="(page = 1), _QueryData(3)"
             ></el-button>
           </el-input>
-          <el-button type="primary" round @click="_QueryData(4)"
+          <el-button type="primary" round @click="(page = 1), _QueryData(4)"
             >筛选</el-button
           >
         </div>
@@ -53,7 +53,7 @@
             class="sel2"
             v-model="schoolId"
             placeholder="选择学校"
-            @change="_QueryData(true)"
+            @change="(page = 1), _QueryData(true)"
           >
             <el-option
               v-for="item in schoolList"
@@ -84,9 +84,11 @@
           </el-table-column>
           <el-table-column align="center" label="班级">
             <template slot-scope="scope">
-              <span v-for="item in scope.row.classList" :key="item.classCode">{{
-                item.className
-              }}</span>
+              <span
+                v-for="(item, index) in scope.row.classList"
+                :key="item.classCode"
+                >{{ (index == 0 ? "" : "、") + item.className }}</span
+              >
             </template>
           </el-table-column>
           <el-table-column
@@ -248,6 +250,7 @@ export default {
           this.query.studentName = "";
         } else {
           query = { ...this.query };
+          query.classId = this.query.classId[1] ? this.query.classId[1] : "";
         }
       } else if (this.role == "ROLE_JITUAN") {
         query.schoolId = this.schoolId;
@@ -270,15 +273,8 @@ export default {
     async downExl() {
       //报表导出
       if (this.exportLoading == true) return;
-      let query = {};
-      if (this.role == "ROLE_XUEXIAO") {
-        query = { ...this.query };
-      } else if (this.role == "ROLE_JITUAN") {
-        query.schoolId = this.schoolId;
-      }
-
       this.exportLoading = true;
-      const data = await this.$request.exportClickersLog({ ...query });
+      const data = await this.$request.exportClickersLog();
       this.exportLoading = false;
       if (data && !data.code) {
         let blob = new Blob([data], {