From e0ff382cd71d451190021e3ed12af99b9a965ee9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/standard-table/material.vue | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/components/view/standard-table/material.vue b/src/components/view/standard-table/material.vue
index d4d1d4d..0e8af0b 100644
--- a/src/components/view/standard-table/material.vue
+++ b/src/components/view/standard-table/material.vue
@@ -1,7 +1,7 @@
<template>
<div class="standard">
<div>
- <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
+ <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="id" border
@selection-change="handleSelectionChange" default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="selection" width="55">
@@ -10,27 +10,19 @@
</el-table-column>
<el-table-column prop="father" label="宸ュ簭" sortable width="200px">
<template slot-scope="scope">
- <el-tag v-if="scope.row.children" :type="scope.row.children ? 'primary' : 'success'">
- <div class="firstDiv" :style="{ color: scope.row.children ? '#16a7ff' : '#58c173' }">
- 01
- </div>
- </el-tag>
- <span style="color: black">
+ <el-tag v-if="scope.row.children" type="primary">01</el-tag>
+ <span style="color: #000000">
{{ scope.row.father }}
</span>
</template>
</el-table-column>
- <el-table-column prop="tanme" sortable label="宸ヨ壓鍚嶇О">
- <!-- <template slot-scope="scope">
- <el-tag v-if="!scope.row.children">
- <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
- 02
- </div>
- </el-tag>
+ <el-table-column prop="name" sortable label="宸ヨ壓鍚嶇О">
+ <template slot-scope="scope">
+ <el-tag type="success" v-if="!scope.row.children">02</el-tag>
<span style="color: black">
- {{ scope.row.tname }}
+ {{ scope.row.name }}
</span>
- </template> -->
+ </template>
</el-table-column>
<el-table-column prop="mname" label="鏉愭枡鍚嶇О">
</el-table-column>
--
Gitblit v1.9.3