From e0840398a505c912bd35c92cb1d0d6c40c35620c Mon Sep 17 00:00:00 2001 From: luohairen <3399054449@qq.com> Date: 星期三, 30 十月 2024 20:15:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/train/data-list/index.vue | 46 +++++++++++++++++++++++++++++++--------------- src/views/class-management/ClassStaff.vue | 7 +++++-- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/views/class-management/ClassStaff.vue b/src/views/class-management/ClassStaff.vue index 762f043..92f1cfa 100644 --- a/src/views/class-management/ClassStaff.vue +++ b/src/views/class-management/ClassStaff.vue @@ -5,7 +5,7 @@ <div style="padding-bottom:20px"> <span class="item">{{ this.$route.query.className }}</span> <el-button class="item" @click="handlerAddStudent" type="primary" size="small">鏂板瀛﹀憳</el-button> - <el-button class="item" @click="open = true" type="primary" size="small">瀛﹀憳璋冩暣</el-button> + <el-button class="item" @click="openManage" type="primary" size="small">瀛﹀憳璋冩暣</el-button> </div> <div> <el-form :inline="true" :model="searchForm" class="demo-form-inline"> @@ -220,6 +220,10 @@ this.getStudentList() }, methods: { + openManage () { + this.getClassesCurrentUserList(this.classes.id) + this.open = true + }, handlerEditStudent (row) { this.studentForm = row this.studentTitle = '缂栬緫瀛﹀憳' @@ -238,7 +242,6 @@ editClassesUser(this.studentForm).then(res => { this.addOpen = false this.$message.success(res.data.message) - this.submitForm() this.page() this.resetStudentForm() }) diff --git a/src/views/train/data-list/index.vue b/src/views/train/data-list/index.vue index c6c77e7..1db3240 100644 --- a/src/views/train/data-list/index.vue +++ b/src/views/train/data-list/index.vue @@ -1,23 +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="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-title">{{ item.meetName }}</div> - <div class="info-teacherName"> - <div class="info-label">涓昏:</div> - <div class="info-text">{{ item.teacherNamesStr }}</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"> - <div class="info-label">鐘舵��:</div> - <div class="info-text">{{ translateStatus(item.status) }}</div> - </div> - <div class="info-time"> + <div class="info-time" style="margin-top: 10px"> <div class="info-label">寮�濮嬫椂闂�:</div> <div class="info-text">{{ item.startTime }}</div> </div> @@ -101,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