From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001 From: seatonwan9 <seatonwan9@163.com> Date: 星期五, 21 五月 2021 14:30:44 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/table/components/componented/refinery.vue | 83 ++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 50 deletions(-) diff --git a/src/components/table/components/componented/refinery.vue b/src/components/table/components/componented/refinery.vue index c530888..c54ae24 100644 --- a/src/components/table/components/componented/refinery.vue +++ b/src/components/table/components/componented/refinery.vue @@ -1,36 +1,13 @@ <template> <div class="refinery"> - <el-table - :data="tableData" - border - style="width: 100%"> + <el-table :data="tableData" border style="width: 100%"> + <el-table-column label="搴忓彿" width="45px" type="index"></el-table-column> <el-table-column - label="搴忓彿" - width="45px" - type="index"> - </el-table-column> - <el-table-column - prop="date" - label="鎺掓斁鐐�" - width="180"> - </el-table-column> - <el-table-column - prop="name" - label="鍗曚綅閮ㄩ棬" - width="180"> - </el-table-column> - <el-table-column - prop="address" - label="搴熸按浜х敓閲忥紙m3锛�"> - </el-table-column> - <el-table-column - prop="address" - label="COD (t)"> - </el-table-column> - <el-table-column - prop="address" - label="姘ㄦ爱(t)"> - </el-table-column> + v-for="(item,index) in tableHeader" + :key="index" + :prop="item.propS" + :label="item.name" + :width="item.width"></el-table-column> </el-table> </div> </template> @@ -40,30 +17,36 @@ name: 'refinery', data () { return { - tableData: [{ - date: '2016-05-02', - name: '鐜嬪皬铏�', - address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�' - }, { - date: '2016-05-04', - name: '鐜嬪皬铏�', - address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�' - }, { - date: '2016-05-01', - name: '鐜嬪皬铏�', - address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�' - }, { - date: '2016-05-03', - name: '鐜嬪皬铏�', - address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�' - }] + tableData: [] } + }, + props: { + tableHeader: { + type: Array, + default: () => { + return [] + }, + tableContent: { + type: Array, + default: () => { + return [] + } + } + } + }, + watch: { + param: { + tableContent (newValue, oldValue) { + this.tableData = newValue + console.log(newValue) + }, + deep: true + } + } } </script> <style scoped lang="less"> -.refinery { - background-color: #0E3565; -} + </style> -- Gitblit v1.8.0