From 6bd3ad8b423f090af0a8455d882e240b6ac57315 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 21 Jan 2020 10:23:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=BA=E7=94=B5=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E6=A8=A1=E5=BC=8F=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscs/iscsSystem/config/bas/controlBAS.vue | 137 +++++++++++++++--- 1 file changed, 113 insertions(+), 24 deletions(-) diff --git a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue index 3c987f38b..a7b0b6133 100644 --- a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue +++ b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue @@ -11,14 +11,32 @@
火灾指示灯:
@@ -64,56 +82,67 @@ export default { data() { return { - tableTitleStyle: 'text-align: center; height: 35px; padding: 0;background: #45607B;', - rowStyle: 'text-align: center;height: 35px; padding: 0; background: #45607B;', + tableTitleStyle: 'text-align: center; height: 28px; padding: 0;background: #45607B;', + rowStyle: 'text-align: center;height: 28px; padding: 0; background: #45607B;', tableData: [{ date: '2016-05-03', name: '王小虎', province: '上海', city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', zip: 200333 }, { date: '2016-05-02', name: '王小虎', province: '上海', city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', zip: 200333 }, { date: '2016-05-04', name: '王小虎', province: '上海', city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', zip: 200333 }, { date: '2016-05-01', name: '王小虎', province: '上海', city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', zip: 200333 }, { date: '2016-05-08', name: '王小虎', province: '上海', city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', zip: 200333 }, { date: '2016-05-06', name: '王小虎', province: '上海', city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', zip: 200333 }, { date: '2016-05-07', name: '王小虎', province: '上海', city: '普陀区', - address: '上海市普陀区金沙江路 1518 弄', + zip: 200333 + }, { + date: '2016-05-07', + name: '王小虎', + province: '上海', + city: '普陀区', + zip: 200333 + }, { + date: '2016-05-07', + name: '王小虎', + province: '上海', + city: '普陀区', + zip: 200333 + }, { + date: '2016-05-07', + name: '王小虎', + province: '上海', + city: '普陀区', zip: 200333 }] }; @@ -121,11 +150,16 @@ export default { methods: { objectSpanMethod({ row, column, rowIndex, columnIndex }) { if (columnIndex === 0) { // 只有第一行合并 - if (rowIndex % 4 === 0) { + if (rowIndex == 0 || rowIndex == 4) { return { rowspan: 4, colspan: 1 }; + } else if (rowIndex >= 8) { + return { + rowspan: 1, + colspan: 2 + }; } else { return { rowspan: 0, @@ -133,6 +167,17 @@ export default { }; } } + if (columnIndex == 1) { + if (rowIndex >= 8) { + return { + rowspan: 0, + colspan: 0 + }; + } + } + }, + detail(item) { + console.log(item); } } }; @@ -140,20 +185,67 @@ export default {