From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/components/Table/index.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index ca39951..d1afdbc 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -2,11 +2,9 @@
<div class="Table">
<div class="datatable">
<el-table ref="multipleTable" :data="tableData" style="width: 100%"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ :header-cell-style="{'font-size':'14px','font-weight':'650','line-height':'45px'}"
:row-class-name="tableRowClassName">
- <el-table-column type="selection" :min-width="5">
- </el-table-column>
- <el-table-column v-for="(item,idx) in option.group" :key="item.prop" :label="item.label"
+ <el-table-column v-for="item in option.group" :key="item.prop" :label="item.label"
:prop="item.prop" :min-width="item['min-width'] ? item['item.min-width']:'10'">
<template slot-scope="scope">
<div v-if="item.type === 'text'">
@@ -17,7 +15,9 @@
</slot>
<slot name="status" v-else-if="item.type === 'status'" :info="scope">
</slot>
- <div class=""></div>
+ <slot name='time' v-else-if="item.type === 'time'" :timeobj="scope">
+
+ </slot>
</template>
</el-table-column>
</el-table>
@@ -76,6 +76,10 @@
}
},
props: {
+ getTableList: {
+ type: Function,
+ default: () => {}
+ },
// 琛ㄦ牸鏁版嵁
tableData: {
type: Array,
@@ -118,12 +122,11 @@
methods: {
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
@@ -168,7 +171,7 @@
width: 100%;
.el-table {
- color: #4b9bb7;
+ // color: #4b9bb7;
}
.tools {
@@ -181,7 +184,7 @@
display: flex;
.sp-item {
- border: 1px solid #17324c;
+ // border: 1px solid #17324c;
}
.funsItem {
@@ -203,7 +206,7 @@
&::v-deep .el-input__inner {
border: none;
- background-color: #09152f;
+ // background-color: #09152f;
}
&:hover .el-checkbox {
--
Gitblit v1.8.0