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

Merge remote-tracking branch 'origin/master'

Browse Source
UI_2022-02-10
e 3 years ago
parent 0b90ce047e d861727bb9
commit 8d57b00630
4 changed files with 24 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/pages/ass/list/index.vue
  2. 4
      src/pages/course/details/index.vue
  3. 1
      src/pages/info/details/index.vue
  4. 16
      src/pages/record/show/index.vue

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

@ -7,7 +7,7 @@
<ul class="filter"> <ul class="filter">
<li> <li>
<label>考核时间</label> <label>考核时间</label>
<el-radio-group size="small" v-model="form.month" @change="initData"> <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 }}
</el-radio> </el-radio>
@ -62,7 +62,7 @@
</ul> </ul>
</div> </div>
<el-table :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">
{{ scope.$index + (page - 1) * pageSize + 1 }} {{ scope.$index + (page - 1) * pageSize + 1 }}
@ -87,12 +87,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实验状态" align="center"> <el-table-column label="实验状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope" v-if="scope.row.show">
<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 label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope" v-if="scope.row.show">
<!--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>
<el-button v-if="scope.row.status !== 2 && (scope.row.stuState === 0 || scope.row.stuState === 1)" type="text" <el-button v-if="scope.row.status !== 2 && (scope.row.stuState === 0 || scope.row.stuState === 1)" type="text"
@ -185,6 +185,7 @@ export default {
page: 1, page: 1,
pageSize: 10, pageSize: 10,
totals: 0, totals: 0,
listLoading:false,// 列表加载
icVisible: false, icVisible: false,
invitationCode: "", invitationCode: "",
searchTimer: null, searchTimer: null,
@ -214,7 +215,7 @@ export default {
this.form.startTime = ""; this.form.startTime = "";
this.form.endTime = ""; this.form.endTime = "";
} }
this.getData(); this.initData();
}, },
keyword: function(val) { keyword: function(val) {
clearTimeout(this.searchTimer); clearTimeout(this.searchTimer);
@ -260,11 +261,14 @@ export default {
item.status = 2; item.status = 2;
} }
} }
item.show = true;
this.$set(this.listData, i, item); this.$set(this.listData, i, item);
} }
}, 1000); }, 1000);
}, },
getData() { getData() {
this.listLoading = true;
this.listData.splice(0);
if (this.ticker) { if (this.ticker) {
clearInterval(this.ticker); clearInterval(this.ticker);
} }
@ -277,6 +281,7 @@ export default {
this.listData = res.list; this.listData = res.list;
this.totals = res.total; this.totals = res.total;
this.listData.forEach(i => { this.listData.forEach(i => {
i.show = false;
if (i.status === 2) { // 已结束 if (i.status === 2) { // 已结束
i.countDown = 0; i.countDown = 0;
} else { } else {
@ -300,7 +305,10 @@ export default {
} }
}); });
this.beginTimer(); this.beginTimer();
}).catch(err => {}); this.listLoading = false;
}).catch(err => {
this.listLoading = false;
});
}, },
initData() { initData() {
this.page = 1; this.page = 1;

4
src/pages/course/details/index.vue
Unescape View File

@ -47,13 +47,13 @@
<h4 class="title">{{courseName}}</h4> <h4 class="title">{{courseName}}</h4>
<div class="desc-wrap"> <div class="desc-wrap">
<div class="desc" :class="{active: desShrink}" v-html="description"></div> <div class="desc" :class="{active: desShrink}" v-html="description"></div>
<i class="arrow" :class="{active: desShrink}" v-if="description.length > 40"> <i class="arrow" :class="{active: desShrink}" v-if="description && description.length > 40">
<span>...</span> <span>...</span>
<img src="@/assets/img/arrow-down.png" alt="" @click="desShrink = !desShrink"> <img src="@/assets/img/arrow-down.png" alt="" @click="desShrink = !desShrink">
</i> </i>
</div> </div>
<div class="chapters"> <div class="chapters">
<template v-if="videoList.length"> <template v-if="videoList && videoList.length">
<div class="chapter" v-for="(item,index) in videoList" :key="index"> <div class="chapter" v-for="(item,index) in videoList" :key="index">
<div class="chapterName">{{item.name}}</div> <div class="chapterName">{{item.name}}</div>
<div class="section" v-if="item.subsectionList.length"> <div class="section" v-if="item.subsectionList.length">

1
src/pages/info/details/index.vue
Unescape View File

@ -35,7 +35,6 @@ import 'quill/dist/quill.core.css';
import 'quill/dist/quill.snow.css'; import 'quill/dist/quill.snow.css';
import 'quill/dist/quill.bubble.css'; import 'quill/dist/quill.bubble.css';
export default { export default {
name: 'article',
data() { data() {
return { return {
firstName: this.$route.query.first, firstName: this.$route.query.first,

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

@ -74,38 +74,38 @@
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">实验数据</p> <p class="meta-title">实验数据</p>
</div> </div>
<el-table :data="expData" class="table" stripe header-align="center"> <el-table :data="expData" class="table" border 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">
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="judgmentName" label="任务名称"></el-table-column> <el-table-column prop="judgmentName" label="任务名称"></el-table-column>
<el-table-column prop="userAnswer" label="学生答案"> <el-table-column prop="ruleAnswer" label="参考答案">
<!-- <!--
<template slot-scope="scope"> <template slot-scope="scope">
<pre v-html="scope.row.userAnswer" style="white-space: pre-wrap"></pre> <pre v-html="scope.row.answer" style="white-space: pre-wrap"></pre>
</template> </template>
--> -->
<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">
<span>{{index+1}}. </span>{{item.userAnswer}} <span>{{index+1}}. </span>{{item.ruleAnswer}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ruleAnswer" label="参考答案"> <el-table-column prop="userAnswer" label="学生答案">
<!-- <!--
<template slot-scope="scope"> <template slot-scope="scope">
<pre v-html="scope.row.answer" style="white-space: pre-wrap"></pre> <pre v-html="scope.row.userAnswer" style="white-space: pre-wrap"></pre>
</template> </template>
--> -->
<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">
<span>{{index+1}}. </span>{{item.ruleAnswer}} <span>{{index+1}}. </span>{{item.userAnswer}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="score" label="得分" align="center"></el-table-column> <el-table-column prop="score" label="得分" align="center" width="100"></el-table-column>
</el-table> </el-table>
</div> </div>

Write Preview
Loading…
Cancel
Save