From b17c2ddebcfaeaa48edc1eeca5ee0dc03d9fde90 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 02 七月 2024 09:25:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/exam/paper/list.vue | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/views/exam/paper/list.vue b/src/views/exam/paper/list.vue
index bc8a314..16e86fe 100644
--- a/src/views/exam/paper/list.vue
+++ b/src/views/exam/paper/list.vue
@@ -4,15 +4,6 @@
<el-form-item label="璇曞嵎ID锛�">
<el-input v-model="queryParam.id" clearable></el-input>
</el-form-item>
- <el-form-item label="瀛︾锛�" >
- <el-select
- v-model="queryParam.subjectId"
- placeholder="鍏ㄩ儴绉戠洰"
- clearable
- >
- <el-option v-for="item in subjects" :key="item.id" :label="item.name" :value="item.id"/>
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
<router-link :to="{path:'/exam/paper/edit'}" class="link-left">
@@ -22,11 +13,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
<el-table-column align="center" prop="id" label="Id" width="90px"/>
- <el-table-column align="center" prop="subjectId" label="瀛︾" width="120px" >
- <template slot-scope="scope">
- {{ translate(scope.row.subjectId) }}
- </template>
- </el-table-column>
<el-table-column align="center" prop="name" label="鍚嶇О" />
<el-table-column
align="center"
@@ -123,12 +109,12 @@
})
},
// 鑾峰彇绉戠洰
- getSubjects() {
+ getSubjects () {
subjectApi.list().then(re => {
this.subjects = re.data
})
},
- translate(subjectId) {
+ translate (subjectId) {
const subject = this.subjects.find(subject => subject.id == subjectId);
return subject ? subject.name : '鏈煡';
}
--
Gitblit v1.8.0