From ce59cac766bd4f0fb70555bff1c08875181e03bf Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:14:42 +0800
Subject: [PATCH] 处理冲突
---
src/views/home/data-table/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/home/data-table/index.vue b/src/views/home/data-table/index.vue
index 2ca25e1..96dfd61 100644
--- a/src/views/home/data-table/index.vue
+++ b/src/views/home/data-table/index.vue
@@ -4,7 +4,7 @@
<el-card class="data-card" :body-style="{ height: '100%' }">
<div class="card-content">
<div class="title-container">
- <h1>鏍哥畻鎶ヨ〃</h1>
+ <h1>杩愮淮鍒版湡棰勮</h1>
<div class="more-button">
<span>鏇村</span>
<i class="el-icon-arrow-right"></i>
@@ -18,10 +18,15 @@
</el-table-column>
<el-table-column prop="date" label="杩愮淮鎴鏃堕棿" align="center">
</el-table-column>
+ <el-table-column prop="date" label="鐘舵��" align="center">
+ <template slot-scope="scope">
+ <el-tag type="warning"
+ disable-transitions>涓存湡</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
<el-button size="mini">缂栬緫</el-button>
- <el-button size="mini" type="danger">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0