Commit 12dda530004caffde3cb94f36d3ab7c145e97af3
Merge branch 'fix/DEFECT-1659' into 'main_dev'
fix :修复批量删除处于禁用状态还能点击,报表查看样式错乱 See merge request yunteng/thingskit-front!943
Showing
2 changed files
with
3 additions
and
1 deletions
@@ -213,6 +213,7 @@ | @@ -213,6 +213,7 @@ | ||
213 | ok-text="确定" | 213 | ok-text="确定" |
214 | cancel-text="取消" | 214 | cancel-text="取消" |
215 | @confirm="handleDelete(getCheckedRecord)" | 215 | @confirm="handleDelete(getCheckedRecord)" |
216 | + :disabled="!getCheckedRecord.length" | ||
216 | > | 217 | > |
217 | <Button type="primary" danger :disabled="!getCheckedRecord.length"> | 218 | <Button type="primary" danger :disabled="!getCheckedRecord.length"> |
218 | 批量删除 | 219 | 批量删除 |
@@ -21,6 +21,7 @@ | @@ -21,6 +21,7 @@ | ||
21 | chartInstance.length % 2 !== 0 ? '' : 'inner', | 21 | chartInstance.length % 2 !== 0 ? '' : 'inner', |
22 | chartInstance.length % 2 !== 0 ? '' : 'item', | 22 | chartInstance.length % 2 !== 0 ? '' : 'item', |
23 | ]" | 23 | ]" |
24 | + class="mb-20" | ||
24 | v-for="item in chartInstance" | 25 | v-for="item in chartInstance" |
25 | :key="item.device" | 26 | :key="item.device" |
26 | > | 27 | > |
@@ -90,7 +91,7 @@ | @@ -90,7 +91,7 @@ | ||
90 | }, | 91 | }, |
91 | }); | 92 | }); |
92 | defineEmits(['register']); | 93 | defineEmits(['register']); |
93 | - const heightNum = ref(800); | 94 | + const heightNum = ref(550); |
94 | 95 | ||
95 | let currentRecord: ExecuteReportRecord = {} as unknown as ExecuteReportRecord; | 96 | let currentRecord: ExecuteReportRecord = {} as unknown as ExecuteReportRecord; |
96 | 97 |