From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/accidentManagementSystem/accidentReport/index.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/views/accidentManagementSystem/accidentReport/index.vue b/src/views/accidentManagementSystem/accidentReport/index.vue
index 6694d4b..b13db29 100644
--- a/src/views/accidentManagementSystem/accidentReport/index.vue
+++ b/src/views/accidentManagementSystem/accidentReport/index.vue
@@ -15,7 +15,7 @@
<Plus />
</el-icon>新建
</el-button>
- <el-button size="default" type="warning" plain :disabled="warning">
+ <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deletAll[0])">
<el-icon>
<Edit />
</el-icon>修改
@@ -74,14 +74,15 @@
</el-table>
<div class="pages">
<el-pagination
- v-model:currentPage="pageIndex"
- v-model:page-size="pageSize"
- :page-sizes="[10, 20, 30]"
- :pager-count="5"
- layout="total, sizes, prev, pager, next, jumper"
- :total="40"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
+ v-if="tableData.length == 0 ? false : true"
+ v-model:currentPage="pageIndex"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 20, 30]"
+ :pager-count="5"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
/>
</div>
</el-tab-pane>
@@ -194,7 +195,7 @@
arr.push(valId[i].id);
}
deletAll.value = arr;
- // console.log(deletAll.value);
+ console.log(deletAll.value);
if (val.length == 1) {
warning.value = false;
danger.value = false;
@@ -331,7 +332,8 @@
onMyAdd,
onDeleteAll,
onEdit,
- editableTabs
+ editableTabs,
+ deletAll
};
},
});
@@ -384,4 +386,4 @@
min-width: 30px;
border-radius: 2px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2