Commit 47e20837b4672801b17e3e6a747c61c431c11912
Merge branch 'ft' into 'main_dev'
fix:修改Teambition上的问题 See merge request yunteng/thingskit-front!729
Showing
4 changed files
with
19 additions
and
14 deletions
... | ... | @@ -84,10 +84,9 @@ |
84 | 84 | }); |
85 | 85 | }; |
86 | 86 | const handleRecordContent = (record) => { |
87 | - if (!record?.request?.body?.params) return; | |
88 | - //如果是正常格式则返回params,否则输入什么内容则显示什么内容 | |
89 | - const jsonParams = JSON.parse(record?.request?.body?.params); | |
90 | - commonModalInfo('命令下发内容', jsonParams?.params ? jsonParams?.params : jsonParams); | |
87 | + if (!record?.request?.body) return; | |
88 | + const jsonParams = record?.request?.body; | |
89 | + commonModalInfo('命令下发内容', jsonParams); | |
91 | 90 | }; |
92 | 91 | const handleRecordResponseContent = (record) => { |
93 | 92 | const jsonParams = record?.response; | ... | ... |
1 | 1 | <script lang="ts" setup> |
2 | 2 | import { PageWrapper } from '/@/components/Page'; |
3 | 3 | import { BasicForm, useForm } from '/@/components/Form'; |
4 | - import { List, Button, Tooltip, Card, PaginationProps, Image } from 'ant-design-vue'; | |
4 | + import { List, Button, Tooltip, Card, PaginationProps, Image, Popconfirm } from 'ant-design-vue'; | |
5 | 5 | import { ReloadOutlined } from '@ant-design/icons-vue'; |
6 | 6 | import { computed, onMounted, reactive, ref, unref } from 'vue'; |
7 | 7 | import { |
... | ... | @@ -204,14 +204,16 @@ |
204 | 204 | {{ getSelectAllFlag ? '反选' : '全选' }} |
205 | 205 | </Button> |
206 | 206 | <Authority :value="ProductPermission.DELETE"> |
207 | - <Button | |
208 | - type="primary" | |
209 | - danger | |
210 | - :disabled="!getCheckedRecord.length" | |
211 | - @click="handleDelete(getCheckedRecord)" | |
207 | + <Popconfirm | |
208 | + title="您确定要批量删除数据" | |
209 | + ok-text="确定" | |
210 | + cancel-text="取消" | |
211 | + @confirm="handleDelete(getCheckedRecord)" | |
212 | 212 | > |
213 | - 批量删除 | |
214 | - </Button> | |
213 | + <Button type="primary" danger :disabled="!getCheckedRecord.length"> | |
214 | + 批量删除 | |
215 | + </Button> | |
216 | + </Popconfirm> | |
215 | 217 | </Authority> |
216 | 218 | |
217 | 219 | <ModeSwitchButton :value="$props.mode" @change="handleModeChange" /> | ... | ... |
... | ... | @@ -5,9 +5,9 @@ |
5 | 5 | <Authority value="api:yt:schedule:post"> |
6 | 6 | <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增 </a-button> |
7 | 7 | </Authority> |
8 | - <Authority value="api:yt:schedule:get"> | |
8 | + <!-- <Authority value="api:yt:schedule:get"> | |
9 | 9 | <a-button type="primary"> 导出 </a-button> |
10 | - </Authority> | |
10 | + </Authority> --> | |
11 | 11 | <Authority value="api:yt:schedule:delete"> |
12 | 12 | <Popconfirm |
13 | 13 | title="您确定要批量删除数据" | ... | ... |