From ca9a92cfc2f2bd8c724020ee5e46094633eb80a5 Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期五, 12 七月 2024 17:39:45 +0800
Subject: [PATCH] 处理冲突
---
src/views/grade-list/data-list/index.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/grade-list/data-list/index.vue b/src/views/grade-list/data-list/index.vue
index fc82f87..221d3a2 100644
--- a/src/views/grade-list/data-list/index.vue
+++ b/src/views/grade-list/data-list/index.vue
@@ -1,15 +1,18 @@
<template>
<div class="list-container w-full h-full">
<el-scrollbar>
- <el-card shadow="hover" class="mb-3" v-for="item in props.dataList">
+ <el-card shadow="hover" class="mb-3" v-for="item in props.dataList" :key="item.id">
<div class="item flex justify-between items-center">
<div class="left-container flex flex-col justify-between">
<div class="top-container flex items-center">
<div class="title mr-5 text-xl font-bold">{{ item.examName }}</div>
<div class="tag">
- <el-tag type="primary" effect="light" round>
+ <el-tag type="primary" effect="light" round v-if="item.status === 0">
宸叉壒鏀�
</el-tag>
+ <el-tag type="danger" effect="light" round v-if="item.status === 1">
+ 缂鸿��
+ </el-tag>
</div>
</div>
<div class="mid-container flex items-center my-4 text-gray-700">
--
Gitblit v1.8.0