Commit af0d559bf26036e1cff3345f5794a24979280ea1
1 parent
4c2fb560
样式调整
Showing
2 changed files
with
36 additions
and
28 deletions
src/views/standard/card/index.vue
| @@ -21,30 +21,6 @@ | @@ -21,30 +21,6 @@ | ||
| 21 | :props="props" | 21 | :props="props" |
| 22 | :show-all-levels="false" | 22 | :show-all-levels="false" |
| 23 | ></el-cascader> | 23 | ></el-cascader> |
| 24 | - <el-input | ||
| 25 | - placeholder="请输入学生姓名" | ||
| 26 | - v-model="query.studentName" | ||
| 27 | - class="input-with-select" | ||
| 28 | - @keyup.enter.native="(page = 1), _QueryData(2)" | ||
| 29 | - > | ||
| 30 | - <el-button | ||
| 31 | - slot="append" | ||
| 32 | - icon="el-icon-search" | ||
| 33 | - @click="(page = 1), _QueryData(2)" | ||
| 34 | - ></el-button> | ||
| 35 | - </el-input> | ||
| 36 | - <el-input | ||
| 37 | - placeholder="请输入学生学号" | ||
| 38 | - v-model="query.studentCode" | ||
| 39 | - class="input-with-select" | ||
| 40 | - @keyup.enter.native="(page = 1), _QueryData(3)" | ||
| 41 | - > | ||
| 42 | - <el-button | ||
| 43 | - slot="append" | ||
| 44 | - icon="el-icon-search" | ||
| 45 | - @click="(page = 1), _QueryData(3)" | ||
| 46 | - ></el-button> | ||
| 47 | - </el-input> | ||
| 48 | </template> | 24 | </template> |
| 49 | <template v-if="role == 'ROLE_JITUAN'"> | 25 | <template v-if="role == 'ROLE_JITUAN'"> |
| 50 | <el-select | 26 | <el-select |
| @@ -63,7 +39,7 @@ | @@ -63,7 +39,7 @@ | ||
| 63 | </el-select> | 39 | </el-select> |
| 64 | </template> | 40 | </template> |
| 65 | <el-select | 41 | <el-select |
| 66 | - class="sel" | 42 | + class="sel sel3" |
| 67 | v-model="query.operationType" | 43 | v-model="query.operationType" |
| 68 | placeholder="选择类型" | 44 | placeholder="选择类型" |
| 69 | > | 45 | > |
| @@ -90,6 +66,32 @@ | @@ -90,6 +66,32 @@ | ||
| 90 | > | 66 | > |
| 91 | </el-date-picker> | 67 | </el-date-picker> |
| 92 | </div> | 68 | </div> |
| 69 | + <template v-if="role == 'ROLE_XUEXIAO'"> | ||
| 70 | + <el-input | ||
| 71 | + placeholder="请输入学生姓名" | ||
| 72 | + v-model="query.studentName" | ||
| 73 | + class="input-with-select sel" | ||
| 74 | + @keyup.enter.native="(page = 1), _QueryData(2)" | ||
| 75 | + > | ||
| 76 | + <el-button | ||
| 77 | + slot="append" | ||
| 78 | + icon="el-icon-search" | ||
| 79 | + @click="(page = 1), _QueryData(2)" | ||
| 80 | + ></el-button> | ||
| 81 | + </el-input> | ||
| 82 | + <el-input | ||
| 83 | + placeholder="请输入学生学号" | ||
| 84 | + v-model="query.studentCode" | ||
| 85 | + class="input-with-select sel" | ||
| 86 | + @keyup.enter.native="(page = 1), _QueryData(3)" | ||
| 87 | + > | ||
| 88 | + <el-button | ||
| 89 | + slot="append" | ||
| 90 | + icon="el-icon-search" | ||
| 91 | + @click="(page = 1), _QueryData(3)" | ||
| 92 | + ></el-button> | ||
| 93 | + </el-input> | ||
| 94 | + </template> | ||
| 93 | <el-button type="primary" round @click="(page = 1), _QueryData(4)" | 95 | <el-button type="primary" round @click="(page = 1), _QueryData(4)" |
| 94 | >筛选</el-button | 96 | >筛选</el-button |
| 95 | > | 97 | > |
| @@ -377,10 +379,17 @@ export default { | @@ -377,10 +379,17 @@ export default { | ||
| 377 | } | 379 | } |
| 378 | .answer-header { | 380 | .answer-header { |
| 379 | .sel-box { | 381 | .sel-box { |
| 382 | + .sel { | ||
| 383 | + margin-right: 20px; | ||
| 384 | + min-width: 120px; | ||
| 385 | + } | ||
| 380 | .sel2 { | 386 | .sel2 { |
| 381 | - width: 300px; | 387 | + width: 200px; |
| 382 | margin-right: 20px; | 388 | margin-right: 20px; |
| 383 | } | 389 | } |
| 390 | + .sel3 { | ||
| 391 | + min-width: 80px; | ||
| 392 | + } | ||
| 384 | .d1 { | 393 | .d1 { |
| 385 | margin-right: 20px; | 394 | margin-right: 20px; |
| 386 | } | 395 | } |
src/views/standard/device/index.vue
| @@ -277,9 +277,8 @@ | @@ -277,9 +277,8 @@ | ||
| 277 | prop="sn" | 277 | prop="sn" |
| 278 | label="设备编码" | 278 | label="设备编码" |
| 279 | align="center" | 279 | align="center" |
| 280 | - width="160" | ||
| 281 | ></el-table-column> | 280 | ></el-table-column> |
| 282 | - <el-table-column label="学生信息" align="center" width="120" | 281 | + <el-table-column label="学生信息" align="center" |
| 283 | ><template slot-scope="scoped" | 282 | ><template slot-scope="scoped" |
| 284 | ><p | 283 | ><p |
| 285 | v-for="(item, index) in scoped.row.studentList" | 284 | v-for="(item, index) in scoped.row.studentList" |