baoman / Ezquiz_Platform

Commit 967e02c93b7db4d615d8267890e1c47beb25ad9d

Authored by 梁保满
1 parent a6eb85ed

发卡记录显示参数调整

Inline Side-by-side
Showing 2 changed files with 16 additions and 20 deletions
public/index.html
  View file @967e02c
... ... @@ -19,8 +19,8 @@
19 19 var link = document.querySelector("link[rel*='icon']") || document.createElement('link');
20 20 link.type = 'image/x-icon';
21 21 link.rel = 'shortcut icon';
22   - var isZS = window.location.host.includes('ezquiz.sunvotecloud')
23   - link.href = !isZS ? "./favicon.ico" : "./331icon.ico";
  22 + var isZS = window.location.host.includes('ezquiz.sunvotecloud') || window.location.host.includes('121.40.127.171')
  23 + link.href = isZS ? "./favicon.ico" : "./331icon.ico";
24 24 document.getElementsByTagName('head')[0].appendChild(link);
25 25 }
26 26 </script>
... ...
src/views/standard/card/index.vue
  View file @967e02c
... ... @@ -10,7 +10,7 @@
10 10 <div class="answer-header">
11 11 <div class="sel-box" v-if="role == 'ROLE_XUEXIAO'">
12 12 <el-cascader
13   - @change="_QueryData(1)"
  13 + @change="(page = 1), _QueryData(1)"
14 14 size="small"
15 15 class="sel"
16 16 clearable
... ... @@ -24,27 +24,27 @@
24 24 placeholder="请输入学生姓名"
25 25 v-model="query.studentName"
26 26 class="input-with-select"
27   - @keyup.enter.native="_QueryData(2)"
  27 + @keyup.enter.native="(page = 1), _QueryData(2)"
28 28 >
29 29 <el-button
30 30 slot="append"
31 31 icon="el-icon-search"
32   - @click="_QueryData(2)"
  32 + @click="(page = 1), _QueryData(2)"
33 33 ></el-button>
34 34 </el-input>
35 35 <el-input
36 36 placeholder="请输入学生学号"
37 37 v-model="query.studentCode"
38 38 class="input-with-select"
39   - @keyup.enter.native="_QueryData(3)"
  39 + @keyup.enter.native="(page = 1), _QueryData(3)"
40 40 >
41 41 <el-button
42 42 slot="append"
43 43 icon="el-icon-search"
44   - @click="_QueryData(3)"
  44 + @click="(page = 1), _QueryData(3)"
45 45 ></el-button>
46 46 </el-input>
47   - <el-button type="primary" round @click="_QueryData(4)"
  47 + <el-button type="primary" round @click="(page = 1), _QueryData(4)"
48 48 >筛选</el-button
49 49 >
50 50 </div>
... ... @@ -53,7 +53,7 @@
53 53 class="sel2"
54 54 v-model="schoolId"
55 55 placeholder="选择学校"
56   - @change="_QueryData(true)"
  56 + @change="(page = 1), _QueryData(true)"
57 57 >
58 58 <el-option
59 59 v-for="item in schoolList"
... ... @@ -84,9 +84,11 @@
84 84 </el-table-column>
85 85 <el-table-column align="center" label="班级">
86 86 <template slot-scope="scope">
87   - <span v-for="item in scope.row.classList" :key="item.classCode">{{
88   - item.className
89   - }}</span>
  87 + <span
  88 + v-for="(item, index) in scope.row.classList"
  89 + :key="item.classCode"
  90 + >{{ (index == 0 ? "" : "、") + item.className }}</span
  91 + >
90 92 </template>
91 93 </el-table-column>
92 94 <el-table-column
... ... @@ -248,6 +250,7 @@ export default {
248 250 this.query.studentName = "";
249 251 } else {
250 252 query = { ...this.query };
  253 + query.classId = this.query.classId[1] ? this.query.classId[1] : "";
251 254 }
252 255 } else if (this.role == "ROLE_JITUAN") {
253 256 query.schoolId = this.schoolId;
... ... @@ -270,15 +273,8 @@ export default {
270 273 async downExl() {
271 274 //报表导出
272 275 if (this.exportLoading == true) return;
273   - let query = {};
274   - if (this.role == "ROLE_XUEXIAO") {
275   - query = { ...this.query };
276   - } else if (this.role == "ROLE_JITUAN") {
277   - query.schoolId = this.schoolId;
278   - }
279   -
280 276 this.exportLoading = true;
281   - const data = await this.$request.exportClickersLog({ ...query });
  277 + const data = await this.$request.exportClickersLog();
282 278 this.exportLoading = false;
283 279 if (data && !data.code) {
284 280 let blob = new Blob([data], {
... ...