baoman / Ezquiz_Platform

Commit 34b574e01c5e961266f0242c3a813dc057ff4584

Authored by 梁保满
1 parent 11cb8ce0

细节优化

Inline Side-by-side
Showing 7 changed files with 44 additions and 27 deletions
src/views/admin/clientVersion/index.vue
  View file @34b574e
... ... @@ -119,6 +119,15 @@
119 119 </el-input>
120 120 </el-col>
121 121 </el-form-item>
  122 + <el-form-item label="类型：">
  123 + <el-col :span="12">
  124 + <el-select v-model="formAdd.appType" placeholder="">
  125 + <el-option label="授课端软件" :value="0"></el-option>
  126 + <el-option label="发卡软件" :value="1"></el-option>
  127 + <el-option label="授课端个人版" :value="2"></el-option>
  128 + </el-select>
  129 + </el-col>
  130 + </el-form-item>
122 131 <el-form-item label="软件图标：">
123 132 <el-col :span="12">
124 133 <upLoadImg url="/file/uploadImg" @upSuccess="logoSuccess" />
... ... @@ -172,6 +181,7 @@ export default {
172 181 appName: "",
173 182 versionName: "",
174 183 versionNumber: "",
  184 + appType:0,
175 185 appImage: "",
176 186 md5: "",
177 187 fileSize: "",
... ... @@ -188,6 +198,9 @@ export default {
188 198 versionName: [
189 199 { required: true, message: "请输入版本名称", trigger: "blur" },
190 200 ],
  201 + appType: [
  202 + { required: true, message: "请选择版本名称", trigger: "blur" },
  203 + ],
191 204 filePath: [
192 205 { required: true, message: "请上传全量文件包", trigger: "blur" },
193 206 ],
... ... @@ -212,6 +225,7 @@ export default {
212 225 for (let key in this.formAdd) {
213 226 this.formAdd[key] = "";
214 227 }
  228 + this.formAdd.appType = 0
215 229 this.diaAdd = true;
216 230 },
217 231 changePage(page) {
... ...
src/views/admin/device/index.vue
  View file @34b574e
... ... @@ -30,24 +30,36 @@
30 30 placeholder="请输入学校"
31 31 v-model="query.schoolName"
32 32 class="input-with-select"
33   - @keyup.enter.native="query.loginName='',_QueryData(true)"
  33 + @keyup.enter.native="query.loginName='',query.realName='',QueryData(true)"
34 34 >
35 35 <el-button
36 36 slot="append"
37 37 icon="el-icon-search"
38   - @click="query.loginName='',_QueryData(true)"
  38 + @click="query.loginName='',query.realName='',_QueryData(true)"
39 39 ></el-button>
40 40 </el-input>
41 41 <el-input
42   - placeholder="请输入租户"
  42 + placeholder="请输入租户账号"
43 43 v-model="query.loginName"
44 44 class="input-with-select"
45   - @keyup.enter.native="query.schoolName='',_QueryData(true)"
  45 + @keyup.enter.native="query.schoolName='',query.realName='',_QueryData(true)"
46 46 >
47 47 <el-button
48 48 slot="append"
49 49 icon="el-icon-search"
50   - @click="query.schoolName='',_QueryData(true)"
  50 + @click="query.schoolName='',query.realName='',_QueryData(true)"
  51 + ></el-button>
  52 + </el-input>
  53 + <el-input
  54 + placeholder="请输入租户名称"
  55 + v-model="query.realName"
  56 + class="input-with-select"
  57 + @keyup.enter.native="query.schoolName='',query.loginName='',_QueryData(true)"
  58 + >
  59 + <el-button
  60 + slot="append"
  61 + icon="el-icon-search"
  62 + @click="query.schoolName='',query.loginName='',_QueryData(true)"
51 63 ></el-button>
52 64 </el-input>
53 65 <el-button class="serach-box" round @click="_QueryData(true)"
... ... @@ -72,25 +84,18 @@
72 84 align="center"
73 85 ></el-table-column>
74 86 <el-table-column
75   - prop="roomName"
76   - label="所在教室"
  87 + prop="tenantName"
  88 + label="所在学校"
77 89 align="center"
78 90 ></el-table-column>
79   - <el-table-column label="关联班级" align="center">
80   - <template slot-scope="scoped">
81   - <p v-for="(item, index) in scoped.row.classList" :key="index">
82   - {{ item.className }}
83   - </p>
84   - </template>
85   - </el-table-column>
86 91 <el-table-column
87 92 prop="otaVersionName"
88 93 label="固件版本号"
89 94 align="center"
90 95 ></el-table-column>
91 96 <el-table-column
92   - prop="onlineTime"
93   - label="最近上报"
  97 + prop="contactPerson"
  98 + label="联系人"
94 99 align="center"
95 100 ></el-table-column>
96 101 <el-table-column label="状态" align="center"
... ... @@ -180,11 +185,6 @@
180 185 </p></template
181 186 ></el-table-column
182 187 >
183   - <el-table-column
184   - prop="electricity"
185   - label="电量"
186   - align="center"
187   - ></el-table-column>
188 188 <el-table-column prop="class" label="关联班级" align="center">
189 189 <template slot-scope="scoped">
190 190 <p v-for="(item, index) in scoped.row.classList" :key="index">
... ... @@ -272,6 +272,7 @@ export default {
272 272 query: {
273 273 schoolName: "",
274 274 loginName: "",
  275 +
275 276 },
276 277 tableData: [],
277 278 total: 0,
... ...
src/views/examinationPaper/index.vue
  View file @34b574e
... ... @@ -323,6 +323,7 @@ export default {
323 323 },
324 324 // 查找答题卡类型
325 325 async _QueryTypeList() {
  326 + if (!this.query.classId) return;
326 327 let fetchTypeNames =
327 328 this.role == "ROLE_PERSONAL"
328 329 ? this.$request.pPaperTagList
... ... @@ -375,6 +376,7 @@ export default {
375 376 },
376 377 // 查找科目
377 378 async _QuerySubjectList() {
  379 + if (!this.query.classId) return;
378 380 let fetchSubjectList =
379 381 this.role == "ROLE_PERSONAL"
380 382 ? this.$request.pSubjectList
... ... @@ -397,6 +399,7 @@ export default {
397 399 }
398 400 },
399 401 async _QueryData(type) {
  402 + if (!this.query.classId) return;
400 403 this.loading = true;
401 404 //获取答题卡列表
402 405 let query = {};
... ...
src/views/personal/ask/index.vue
  View file @34b574e
... ... @@ -538,6 +538,7 @@ export default {
538 538 }
539 539 },
540 540 async _QuerySubjectList() {
  541 + if (!this.query.classId) return;
541 542 const { data, status, info } = await this.$request.pSubjectList({
542 543 classId: this.query.classId,
543 544 });
... ... @@ -560,6 +561,7 @@ export default {
560 561 }
561 562 },
562 563 async _QueryData() {
  564 + if (!this.query.classId) return;
563 565 if (this.tabIndex == 1) {
564 566 this.periodReportList();
565 567 } else if (this.tabIndex == 2) {
... ...
src/views/personal/setUp/student.vue
  View file @34b574e
... ... @@ -287,7 +287,7 @@ export default {
287 287 setClass(obj) {
288 288 this.formClass.classId = obj.id;
289 289 this.formClass.className = obj.className;
290   - this.formClass.subjectNames = obj.subjectNames;
  290 + this.formClass.subjectNames = obj.subjectNames||[];
291 291 this.diaClass = true;
292 292 },
293 293 addSubjectName() {
... ...
src/views/personal/test/index.vue
  View file @34b574e
... ... @@ -660,6 +660,7 @@ export default {
660 660 }
661 661 },
662 662 async _QuerySubjectList() {
  663 + if (!this.query.classId) return;
663 664 const { data, status, info } = await this.$request.pSubjectList({
664 665 classId: this.query.classId,
665 666 });
... ... @@ -682,6 +683,7 @@ export default {
682 683 }
683 684 },
684 685 async _QueryData() {
  686 + if (!this.query.classId) return;
685 687 this.tableData = [];
686 688 if (this.tabIndex == 1) {
687 689 this.examReportList();
... ...
src/views/standard/device/index.vue
  View file @34b574e
... ... @@ -252,11 +252,6 @@
252 252 </p></template
253 253 ></el-table-column
254 254 >
255   - <el-table-column
256   - prop="electricity"
257   - label="电量"
258   - align="center"
259   - ></el-table-column>
260 255 <el-table-column prop="class" label="关联班级" align="center">
261 256 <template slot-scope="scoped">
262 257 <p v-for="(item, index) in scoped.row.classList" :key="index">
... ...