huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

样式修复

Browse Source
dev_2020-03-03
yujialong 3 years ago
parent 91aee607b8
commit 74077d5979
6 changed files with 129 additions and 121 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/img/ass1.png
  2. 142
      src/pages/ass/list/index.vue
  3. 103
      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

BIN
src/assets/img/ass1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 288 B

142
src/pages/ass/list/index.vue
Unescape View File

@ -1,67 +1,71 @@
<template>
<!-- 考核列表 -->
<div class="wrap">
<div class="page" style="padding-bottom: 0;margin-bottom: 12px">
<h6 class="l-title">
<img src="@/assets/img/ass1.png" alt="">
考核筛选
</h6>
<ul class="filter">
<li>
<label>考核时间：</label>
<el-radio-group size="small" v-model="form.month">
<el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>
{{ item.name }}
</el-radio>
</el-radio-group>
<el-date-picker
size="small"
v-model="date"
align="right"
unlink-panels type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
clearable
style="width: 300px"
></el-date-picker>
</li>
</ul>
<ul class="filter">
<li>
<label>课程名称：</label>
<el-select size="small" v-model="form.curriculumId" @change="initData">
<el-option label="不限" value=""></el-option>
<el-option
v-for="(item,index) in courseList"
:key="index"
:label="item.sysName"
:value="item.sysId"
></el-option>
</el-select>
</li>
<li>
<label>实验班级：</label>
<el-select size="small" v-model="form.classId" @change="initData">
<el-option label="不限" value=""></el-option>
<el-option
v-for="(item,index) in classList"
:key="index"
:label="item.className"
:value="item.id"
></el-option>
</el-select>
</li>
<li>
<label>实验状态：</label>
<el-select size="small" v-model="form.status" @change="initData">
<el-option
v-for="(item,index) in statusList"
:key="index" :label="item.name"
:value="item.value"
></el-option>
</el-select>
</li>
</ul>
</div>
<div class="page">
<h6 class="p-title">筛选</h6>
<div class="tool mul">
<ul class="filter">
<li>
<label>考核时间</label>
<el-radio-group size="small" v-model="form.month">
<el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>
{{ item.name }}
</el-radio>
</el-radio-group>
<el-date-picker
size="small"
v-model="date"
align="right"
unlink-panels type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
clearable
style="width: 300px"
></el-date-picker>
</li>
<li>
<label>实验状态</label>
<el-select size="small" v-model="form.status" @change="initData">
<el-option
v-for="(item,index) in statusList"
:key="index" :label="item.name"
:value="item.value"
></el-option>
</el-select>
</li>
<li>
<label>实验班级</label>
<el-select size="small" v-model="form.classId" @change="initData">
<el-option label="不限" value=""></el-option>
<el-option
v-for="(item,index) in classList"
:key="index"
:label="item.className"
:value="item.id"
></el-option>
</el-select>
</li>
<li>
<label>课程名称</label>
<el-select size="small" v-model="form.curriculumId" @change="initData">
<el-option label="不限" value=""></el-option>
<el-option
v-for="(item,index) in courseList"
:key="index"
:label="item.sysName"
:value="item.sysId"
></el-option>
</el-select>
</li>
</ul>
</div>
<el-table v-loading="listLoading" :data="listData" class="table" stripe header-align="center">
<el-table-column type="index" width="100" label="序号" align="center">
<template slot-scope="scope">
@ -91,7 +95,7 @@
<!-- <span class="ellipsis">{{ stuState[scope.row.stuState] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center">
<el-table-column width="100" label="操作" align="center">
<template slot-scope="scope">
<!--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>
@ -478,13 +482,18 @@ export default {
</script>
<style lang="scss" scoped>
.page .tool {
margin-bottom: 14px;
.wrap {
padding: 12px 60px 20px;
}
.page {
padding: 16px;
}
.filter {
display: flex;
width: auto;
flex-wrap: wrap;
li {
margin-bottom: 10px;
margin-bottom: 16px;
}
}
/deep/ .el-tabs__nav-wrap::after {
@ -496,9 +505,4 @@ export default {
.el-radio-group {
white-space: nowrap;
}
@media (max-width: 1430px) {
.wrap {
padding: 12px 100px 20px;
}
}
</style>

103
src/pages/record/list/index.vue
Unescape View File

@ -1,62 +1,64 @@
<template>
<!-- 实验记录 -->
<div class="wrap">
<div class="block overview">
<h6 class="l-title">
<img src="@/assets/img/record5.png" alt="">
实验概览
</h6>
<div class="nums">
<div class="item">
<p class="val">{{ overview.userName }}</p>
<p class="name">姓名</p>
</div>
<div class="inner">
<div class="block overview">
<h6 class="l-title">
<img src="@/assets/img/record5.png" alt="">
实验概览
</h6>
<div class="nums">
<div class="item">
<p class="val">{{ overview.userName }}</p>
<p class="name">姓名</p>
</div>
<div class="item">
<p class="val">{{ overview.experimentalNum }}</p>
<p class="name">实验次数(次)</p>
</div>
<div class="item">
<p class="val">{{ overview.experimentalNum }}</p>
<p class="name">实验次数(次)</p>
</div>
<div class="item">
<p class="val">{{ overview.duration ? overview.duration : 0 }}小时</p>
<p class="name">实验总时长(时)</p>
</div>
<div class="item">
<p class="val">{{ overview.duration ? overview.duration : 0 }}小时</p>
<p class="name">实验总时长(时)</p>
</div>
<div class="item">
<p class="val">{{ overview.avgScore ? overview.avgScore.toFixed(2) : overview.avgScore }}</p>
<p class="name">实验平均分</p>
<div class="item">
<p class="val">{{ overview.avgScore ? overview.avgScore.toFixed(2) : overview.avgScore }}</p>
<p class="name">实验平均分</p>
</div>
</div>
</div>
</div>
<div class="block record">
<h6 class="l-title">
<img src="@/assets/img/record6.png" alt="">
实验记录明细
</h6>
<div class="block record">
<h6 class="l-title">
<img src="@/assets/img/record6.png" alt="">
实验记录明细
</h6>
<div class="tool">
<ul class="filter" style="justify-content: space-between;">
<div class="tabs">
<a class="item" v-for="(item,index) in tabList" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a>
</div>
<li style="margin-right: 0">
<label>课程选择：</label>
<el-select v-model="curriculumId">
<el-option
v-for="item in curriculumList"
:key="item.cid"
:label="item.curriculumName"
:value="item.cid"
></el-option>
</el-select>
<el-button style="margin-left: 20px;" type="primary" @click="exportData">导出数据</el-button>
</li>
</ul>
</div>
<div class="tool">
<ul class="filter" style="justify-content: space-between;">
<div class="tabs">
<a class="item" v-for="(item,index) in tabList" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a>
</div>
<li style="margin-right: 0">
<label>课程选择：</label>
<el-select v-model="curriculumId">
<el-option
v-for="item in curriculumList"
:key="item.cid"
:label="item.curriculumName"
:value="item.cid"
></el-option>
</el-select>
<el-button style="margin-left: 20px;" type="primary" @click="exportData">导出数据</el-button>
</li>
</ul>
</div>
<practice v-if="active == 'practice'" :curriculumId.sync="curriculumId" :key="curriculumId"></practice>
<ass v-else :curriculumId.sync="curriculumId" :key="curriculumId"></ass>
<practice v-if="active == 'practice'" :curriculumId.sync="curriculumId" :key="curriculumId"></practice>
<ass v-else :curriculumId.sync="curriculumId" :key="curriculumId"></ass>
</div>
</div>
</div>
</template>
@ -153,8 +155,11 @@ export default {
<style lang="scss" scoped>
.main .view {
width: 1280px;
padding: 12px 0 20px;
.inner {
width: $min-width;
margin: 0 auto;
}
}
.block {
padding: 16px;

2
src/pages/record/show/index.vue
Unescape View File

@ -81,7 +81,7 @@
{{ scope.$index + 1 }}
</template>
</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">
<template slot-scope="scope">
<div v-for="(item, index) in scope.row.lcRuleRecords">

2
src/pages/station/list/index.vue
Unescape View File

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

1
src/styles/common.scss
Unescape View File

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

Write Preview
Loading…
Cancel
Save