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/technology.vue | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 835a583..a8f67ba 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -1,43 +1,34 @@
<template>
<div class="standard">
<div>
- <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
+ <el-table :data="tableData" height="800" row-key="id" border
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
@selection-change="handleSelectionChange" default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="selection" width="55">
</el-table-column>
- <el-table-column type="index" width="50" label="搴忓彿">
+ <el-table-column type="index" width="60" label="搴忓彿">
</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>
+ <el-tag v-if="scope.row.children" type="primary">01</el-tag>
<span style="color: black">
{{ scope.row.father }}
</span>
</template>
</el-table-column>
- <el-table-column prop="name" sortable label="宸ヨ壓鍚嶇О">
+ <el-table-column 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>
- <span style="color: black">
- {{ scope.row.name }}
- </span>
- </template>
+ <el-tag type="success" v-if="!scope.row.children">02</el-tag>
+ <span style="color: black">{{ scope.row.name }}</span>
+ </template>
</el-table-column>
<el-table-column prop="dg" label="璁惧缁�">
</el-table-column>
<el-table-column prop="pq" label="鐢熶骇瀹氶">
</el-table-column>
- <el-table-column prop="" label="鎿嶄綔">
- <el-butten style="color: rgb(137, 137, 229);">缂栬緫</el-butten>
+ <el-table-column label="鎿嶄綔">
+ <el-button style="color: rgb(137, 137, 229);">缂栬緫</el-button>
</el-table-column>
</el-table>
</div>
@@ -53,7 +44,7 @@
},
props:['tableData','tableType'],
created() {
- console.log(this.tableData,this.tableType)
+ console.log(this.tableData)
},
mounted() {
--
Gitblit v1.9.3