From 2b6c807e0336063b25ce751dbe7f71de4ebb38e1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 20:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/train/data-list/index.vue | 81 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 19 deletions(-)
diff --git a/src/views/train/data-list/index.vue b/src/views/train/data-list/index.vue
index 8ae8f7f..1db3240 100644
--- a/src/views/train/data-list/index.vue
+++ b/src/views/train/data-list/index.vue
@@ -1,19 +1,30 @@
<template>
<div class="list-container w-full h-full">
<div class="list-content w-full overflow-x-hidden">
- <el-row :gutter="20">
+ <el-row :gutter="10">
<el-col :span="6" v-for="item in tableData" class="margin-col">
<el-card shadow="hover" class="list-card cursor-pointer" :body-style="{ padding: 0 }">
<div class="img-container w-full">
<img src="@/assets/list-card-bg.jpg" class="width-img">
</div>
- <div class="item-info p-3">
- <div class="info-title">{{ item.meetName }}</div>
- <div class="info-teacherName">
- <div class="info-label">涓昏:</div>
- <div class="info-text">{{ item.teacherName }}</div>
+ <div class="item-info p-3" style="position: relative">
+ <div class="info-text" style="position: absolute; top: 2px; right: 2px">
+ <el-tag type="info" effect="dark" v-if="item.status === 0">
+ 寰呭紑濮�
+ </el-tag>
+ <el-tag type="danger" effect="dark" v-else-if="item.status === 1">
+ 杩涜涓�
+ </el-tag>
+ <el-tag type="warning" effect="dark" v-else-if="item.status === 2">
+ 宸茬粨鏉�
+ </el-tag>
</div>
- <div class="info-time">
+ <div class="info-title">{{ item.meetName }}</div>
+ <div class="info-teacherName" style="margin-top: 5px">
+ <div class="info-label" style="flex: 1">涓昏:</div>
+ <div class="info-text" style="flex:6">{{ item.teacherNamesStr }}</div>
+ </div>
+ <div class="info-time" style="margin-top: 10px">
<div class="info-label">寮�濮嬫椂闂�:</div>
<div class="info-text">{{ item.startTime }}</div>
</div>
@@ -22,9 +33,15 @@
<div class="info-text">{{ item.endTime }}</div>
</div>
<div class="button-container">
- <el-button @click="start(item)">寮�濮嬩笂璇�</el-button>
- <el-button @click="handleUpdate(item)">缂栬緫</el-button>
- <el-button @click="remove(item)">鍒犻櫎</el-button>
+ <el-button v-if="item.status!==2" @click="start(item)" type="primary" size="small">寮�濮嬩笂璇�</el-button>
+ <el-button @click="handleUpdate(item)" type="warning" size="small">缂栬緫</el-button>
+ <el-popconfirm
+ style="margin: 0 5px"
+ title="纭畾瑕佸垹闄よ鍩硅鍚楋紵"
+ @confirm="remove(item)"
+ >
+ <el-button slot="reference" type="danger" size="small" >鍒犻櫎</el-button>
+ </el-popconfirm>
</div>
</div>
</el-card>
@@ -36,22 +53,39 @@
<script>
+import examPaperApi from "@/api/examPaper";
+
export default {
props: {
tableData: []
},
methods: {
handleUpdate (item) {
- this.$emit('handleUpdate',item)
+ this.$emit('handleUpdate', item)
},
remove (item) {
- this.$emit('remove',item)
+ this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ垚鍛�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.$emit('remove', item)
+ })
},
start (item) {
- this.$emit('start',item)
+ this.$emit('start', item)
+ },
+ translateStatus (status) {
+ if (status === 0) {
+ return '寰呭紑濮�'
+ } else if (status === 1) {
+ return '杩涜涓�'
+ } else {
+ return '宸茬粨鏉�'
+ }
}
}
-};
+}
</script>
<style lang="scss" scoped>
@@ -74,20 +108,29 @@
.list-card {
border-radius: 10px;
+ height: 330px;
}
.item-info {
padding: 12px;
color: #8a8a8a;
}
+.info-teacherName {
+ display: flex;
+ flex-direction: row;
+ font-size: 14px;
+}
+.info-label {
+ display: flex;
+ flex-wrap: nowrap;
+}
+.info-text {
+ display: flex;
+ flex-wrap: wrap;
+}
.info-title {
font-weight: bold;
-}
-
-.info-teacherName {
- display: flex;
- font-size: 14px;
}
.info-time {
--
Gitblit v1.8.0