diff --git a/web/src/utils/btnList.js b/web/src/utils/btnList.js index 5bf058e..064ae7d 100644 --- a/web/src/utils/btnList.js +++ b/web/src/utils/btnList.js @@ -7,16 +7,18 @@ const btnList = [ ] function getBtns(arr) { - const curPermission = - JSON.parse(localStorage.getItem('permission')).find( - (item) => item.route == this.$route.fullPath - ) || {} + // console.log(this.$route, JSON.parse(localStorage.getItem('permission')), 'this.$route') + // const curPermission = + // JSON.parse(localStorage.getItem('permission')).find( + // (item) => item.route == '/' + this.$route.name + // ) || {} // console.log(this.$route, curPermission, localStorage.getItem('permission'), 'curPermission') const btns = [] + // console.log(curPermission, 'curPermission') btnList.forEach((item) => { if (arr.includes(item.label)) { - // item.disabled = !Boolean(curPermission[item.disFlag]) + // item.disabled = !Boolean(+curPermission[item.disFlag]) btns.push(item) } }) diff --git a/web/src/views/system/alarmLog.vue b/web/src/views/system/alarmLog.vue index 2aa4693..7d7827a 100644 --- a/web/src/views/system/alarmLog.vue +++ b/web/src/views/system/alarmLog.vue @@ -133,7 +133,7 @@ export default { // 删除操作 async handleDelete(id, callback) { const that = this - Modal.confirm({ + this.$Modal.confirm({ title: '你确认删除数据吗?', icon: createVNode(ExclamationCircleOutlined), diff --git a/web/src/views/system/device.vue b/web/src/views/system/device.vue index 42b53d1..f0d8fb2 100644 --- a/web/src/views/system/device.vue +++ b/web/src/views/system/device.vue @@ -224,7 +224,7 @@ export default {