|
|
@@ -333,7 +333,10 @@
|
|
|
</vxe-toolbar> -->
|
|
|
<vxe-table
|
|
|
border
|
|
|
+<<<<<<< HEAD
|
|
|
:row-class-name="colorTableRowClassName"
|
|
|
+=======
|
|
|
+>>>>>>> 86a03ca0a37388eb26f2044b29005e1070c45553
|
|
|
resizable
|
|
|
header-align="center"
|
|
|
ref="xTree"
|
|
|
@@ -573,6 +576,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+<<<<<<< HEAD
|
|
|
colorTableRowClassName({ row, rowIndex }) {
|
|
|
if (rowIndex % 2 == 0) {
|
|
|
return "statistics-warning-row";
|
|
|
@@ -580,6 +584,8 @@ export default {
|
|
|
return "";
|
|
|
}
|
|
|
},
|
|
|
+=======
|
|
|
+>>>>>>> 86a03ca0a37388eb26f2044b29005e1070c45553
|
|
|
getTree(records) {
|
|
|
console.log(records);
|
|
|
let tableResult = JSON.parse(JSON.stringify(records));
|
