样式修复

dev_2020-03-03
yujialong 3 years ago
parent 91aee607b8
commit 74077d5979
  1. BIN
      src/assets/img/ass1.png
  2. 58
      src/pages/ass/list/index.vue
  3. 7
      src/pages/record/list/index.vue
  4. 2
      src/pages/record/show/index.vue
  5. 2
      src/pages/station/list/index.vue
  6. 1
      src/styles/common.scss

Binary file not shown.

After

Width:  |  Height:  |  Size: 288 B

@ -1,12 +1,14 @@
<template> <template>
<!-- 考核列表 --> <!-- 考核列表 -->
<div class="wrap"> <div class="wrap">
<div class="page"> <div class="page" style="padding-bottom: 0;margin-bottom: 12px">
<h6 class="p-title">筛选</h6> <h6 class="l-title">
<div class="tool mul"> <img src="@/assets/img/ass1.png" alt="">
考核筛选
</h6>
<ul class="filter"> <ul class="filter">
<li> <li>
<label>考核时间</label> <label>考核时间</label>
<el-radio-group size="small" v-model="form.month"> <el-radio-group size="small" v-model="form.month">
<el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border> <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>
{{ item.name }} {{ item.name }}
@ -25,18 +27,22 @@
style="width: 300px" style="width: 300px"
></el-date-picker> ></el-date-picker>
</li> </li>
</ul>
<ul class="filter">
<li> <li>
<label>实验状态</label> <label>课程名称</label>
<el-select size="small" v-model="form.status" @change="initData"> <el-select size="small" v-model="form.curriculumId" @change="initData">
<el-option label="不限" value=""></el-option>
<el-option <el-option
v-for="(item,index) in statusList" v-for="(item,index) in courseList"
:key="index" :label="item.name" :key="index"
:value="item.value" :label="item.sysName"
:value="item.sysId"
></el-option> ></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<label>实验班级</label> <label>实验班级</label>
<el-select size="small" v-model="form.classId" @change="initData"> <el-select size="small" v-model="form.classId" @change="initData">
<el-option label="不限" value=""></el-option> <el-option label="不限" value=""></el-option>
<el-option <el-option
@ -48,20 +54,18 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<label>课程名称</label> <label>实验状态</label>
<el-select size="small" v-model="form.curriculumId" @change="initData"> <el-select size="small" v-model="form.status" @change="initData">
<el-option label="不限" value=""></el-option>
<el-option <el-option
v-for="(item,index) in courseList" v-for="(item,index) in statusList"
:key="index" :key="index" :label="item.name"
:label="item.sysName" :value="item.value"
:value="item.sysId"
></el-option> ></el-option>
</el-select> </el-select>
</li> </li>
</ul> </ul>
</div> </div>
<div class="page">
<el-table v-loading="listLoading" :data="listData" class="table" stripe header-align="center"> <el-table v-loading="listLoading" :data="listData" class="table" stripe header-align="center">
<el-table-column type="index" width="100" label="序号" align="center"> <el-table-column type="index" width="100" label="序号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -91,7 +95,7 @@
<!-- <span class="ellipsis">{{ stuState[scope.row.stuState] }}</span>--> <!-- <span class="ellipsis">{{ stuState[scope.row.stuState] }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="操作" align="center"> <el-table-column width="100" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<!--status:考核状态(0待开始 1进行中 2已结束); stuState:学生考试状态(0未考 1在考 2已考)--> <!--status:考核状态(0待开始 1进行中 2已结束); stuState:学生考试状态(0未考 1在考 2已考)-->
<el-button v-if="scope.row.status == 2 && scope.row.stuState == 0" type="text" disabled>未参加</el-button> <el-button v-if="scope.row.status == 2 && scope.row.stuState == 0" type="text" disabled>未参加</el-button>
@ -478,13 +482,18 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page .tool { .wrap {
margin-bottom: 14px; padding: 12px 60px 20px;
}
.page {
padding: 16px;
} }
.filter { .filter {
display: flex;
width: auto;
flex-wrap: wrap; flex-wrap: wrap;
li { li {
margin-bottom: 10px; margin-bottom: 16px;
} }
} }
/deep/ .el-tabs__nav-wrap::after { /deep/ .el-tabs__nav-wrap::after {
@ -496,9 +505,4 @@ export default {
.el-radio-group { .el-radio-group {
white-space: nowrap; white-space: nowrap;
} }
@media (max-width: 1430px) {
.wrap {
padding: 12px 100px 20px;
}
}
</style> </style>

@ -1,6 +1,7 @@
<template> <template>
<!-- 实验记录 --> <!-- 实验记录 -->
<div class="wrap"> <div class="wrap">
<div class="inner">
<div class="block overview"> <div class="block overview">
<h6 class="l-title"> <h6 class="l-title">
<img src="@/assets/img/record5.png" alt=""> <img src="@/assets/img/record5.png" alt="">
@ -59,6 +60,7 @@
<ass v-else :curriculumId.sync="curriculumId" :key="curriculumId"></ass> <ass v-else :curriculumId.sync="curriculumId" :key="curriculumId"></ass>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
@ -153,8 +155,11 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.main .view { .main .view {
width: 1280px;
padding: 12px 0 20px; padding: 12px 0 20px;
.inner {
width: $min-width;
margin: 0 auto;
}
} }
.block { .block {
padding: 16px; padding: 16px;

@ -81,7 +81,7 @@
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="judgmentName" label="判分指标" align="center"></el-table-column> <el-table-column prop="judgmentName" label="判分" align="center"></el-table-column>
<el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150"> <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="(item, index) in scope.row.lcRuleRecords"> <div v-for="(item, index) in scope.row.lcRuleRecords">

@ -92,7 +92,7 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
width: 1072px; width: 1072px;
min-height: calc(100vh - 520px); min-height: calc(100vh - 520px);
padding: 30px 0; padding-top: 60px;
margin: 0 auto; margin: 0 auto;
} }
.item { .item {

@ -66,7 +66,6 @@
font-size: 14px; font-size: 14px;
color: #333; color: #333;
img{ img{
width: 24px;
margin-right: 5px; margin-right: 5px;
} }
} }

Loading…
Cancel
Save