From 558fbd9d6fbb10a8cc674a10213c395ab8ee3d95 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 09:53:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
src/views/exam/personalRandomTemplate/list.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/exam/personalRandomTemplate/list.vue b/src/views/exam/personalRandomTemplate/list.vue
index 751e7a0..75adcf9 100644
--- a/src/views/exam/personalRandomTemplate/list.vue
+++ b/src/views/exam/personalRandomTemplate/list.vue
@@ -21,18 +21,19 @@
<!-- </router-link>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
- <router-link :to="{path:'/exam/personalRandomTemplate/edit'}" class="link-left">
- <el-button type="primary">娣诲姞</el-button>
+ <router-link :to="{path:'/exam/personalRandomTemplate/edit'}">
+ <el-button type="primary" size="small" style="margin-bottom: 5px">娣诲姞</el-button>
</router-link>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="subjectNames" label="璇剧洰" width="120px" />
+ <el-table-column prop="subjectNames" label="璇剧洰" />
<el-table-column prop="name" label="鍚嶇О" />
+ <el-table-column prop="createDepartment" label="鍒涘缓閮ㄩ棬" />
<el-table-column label="鎿嶄綔" align="center" width="360px">
<template slot-scope="{row}">
- <el-button size="mini" @click="$router.push({path:'/exam/personalRandomTemplate/edit',query:{id:row.id}})" >缂栬緫</el-button>
- <el-button size="mini" type="primary" @click="missExam(row)">琛ヨ��</el-button>
- <el-button size="mini" type="danger" @click="deletePaper(row)" class="link-left">鍒犻櫎</el-button>
- <el-button size="mini" type="danger" @click="handleExport(row)" class="link-left">瀵煎嚭</el-button>
+ <el-button size="small" @click="$router.push({path:'/exam/personalRandomTemplate/edit',query:{id:row.id}})" >缂栬緫</el-button>
+ <el-button size="small" type="primary" @click="missExam(row)">琛ヨ��</el-button>
+ <el-button size="small" type="danger" @click="deletePaper(row)" class="link-left">鍒犻櫎</el-button>
+ <el-button size="small" type="danger" @click="handleExport(row)" class="link-left">瀵煎嚭</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0