From 192a6c1536d3f9017343634c17dc300c6fd98ff6 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期三, 02 八月 2023 09:36:23 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/yuanchu_code/frontend-zhongtian-ocean
---
src/components/view/standard-table/technology.vue | 103 ++++++++++++++++++++-------------------------------
1 files changed, 40 insertions(+), 63 deletions(-)
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 3d980c1..8cdabda 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -37,24 +37,49 @@
.standard .el-table__body {
height: 100%;
}
+ .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
+ padding-left: 23px !important;
+ }
</style>
<template>
<div class="standard">
- <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange" row-key="id" border
- default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+ <el-table :data="tableData" border style="width: 100%" row-key="id"
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="50">
</el-table-column>
- <el-table-column type="index" label="搴忓彿" width="75">
+ <template v-if="tableType==1">
+ <el-table-column type="index" label="搴忓彿" width="70">
+ <template slot-scope="scope">
+ {{ scope.row.index }}
+ </template>
</el-table-column>
- <el-table-column prop="date" label="椤圭洰" width="350">
+ <el-table-column prop="name" label="椤圭洰">
+ <template slot-scope="scope">
+ <el-tag size="mini" :type="scope.row.index? '':'success'" :style="{borderRadius: '40%',marginRight: '12px'}">{{ scope.row.index? '01':'02'}}</el-tag>
+ {{scope.row.name}}
+ </template>
</el-table-column>
- <el-table-column prop="name" label="鍗曚綅" width="180">
+ <el-table-column prop="unit" label="鍗曚綅">
</el-table-column>
- <el-table-column prop="address" label="鏍囧噯鍊�">
+ <el-table-column prop="required" label="鏍囧噯鍊�">
</el-table-column>
- <el-table-column prop="address" label="鍐呮帶鍊�">
+ <el-table-column prop="internal" label="鍐呮帶鍊�">
</el-table-column>
+ </template>
+ <template v-else>
+ <el-table-column prop="name" label="宸ヨ壓鍚嶇О">
+ </el-table-column>
+ <el-table-column prop="device_group" label="璁惧缁�">
+ </el-table-column>
+ <el-table-column label="鍖归厤璁惧">
+ <template>
+ <el-button type="text">閫夋嫨</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="quota" label="宸ユ椂瀹氶">
+ </el-table-column>
+ </template>
</el-table>
</div>
</template>
@@ -63,68 +88,20 @@
export default {
data() {
return {
- tableData: [{
- id: 1,
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- id: 2,
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�'
- }, {
- id: 3,
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
- children: [{
- id: 31,
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
- }, {
- id: 32,
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
- }]
- }, {
- id: 4,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- }],
- tableData1: [{
- id: 1,
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- id: 2,
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�'
- }, {
- id: 3,
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
- hasChildren: true
- }, {
- id: 4,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- }],
selects: []
}
},
- mounted() {},
+ props:['tableData','tableType'],
+ created() {
+ console.log(this.tableData,this.tableType)
+ },
+ mounted() {
+
+ },
methods: {
handleSelectionChange(val) {
this.selects = val;
}
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3