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 7db152c..16386d2 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 1051d8b..ecd870a 100644 --- a/web/src/views/system/device.vue +++ b/web/src/views/system/device.vue @@ -232,12 +232,11 @@ export default { diff --git a/web/src/views/system/permission.vue b/web/src/views/system/permission.vue index f4a5773..2a68aae 100644 --- a/web/src/views/system/permission.vue +++ b/web/src/views/system/permission.vue @@ -58,6 +58,8 @@ export default { props: {}, data() { return { + tableData:[], + formModal: false, formState: {}, formStatus: 'add', //表单状态辑状态 add:新增 edit:编辑 @@ -145,7 +147,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/policy.vue b/web/src/views/system/policy.vue index 6372d1b..58ae16b 100644 --- a/web/src/views/system/policy.vue +++ b/web/src/views/system/policy.vue @@ -232,11 +232,10 @@ export default { .policy { // width: 100%; height: 100%; - padding: 0 10px; + padding: 0 20px; .content-table { width: 100%; height: calc(100% - 90px); - padding: 0 10px; } } diff --git a/web/src/views/system/role.vue b/web/src/views/system/role.vue index e49b796..6ed5186 100644 --- a/web/src/views/system/role.vue +++ b/web/src/views/system/role.vue @@ -67,6 +67,8 @@ export default { props: {}, data() { return { + tableData:[], + formModal: false, formState: {}, formStatus: 'add', //表单状态辑状态 add:新增 edit:编辑 @@ -279,7 +281,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/service.vue b/web/src/views/system/service.vue index 9eabb52..b36201d 100644 --- a/web/src/views/system/service.vue +++ b/web/src/views/system/service.vue @@ -58,6 +58,8 @@ export default { props: {}, data() { return { + tableData:[], + tableOption: { select: false }, @@ -184,7 +186,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/station.vue b/web/src/views/system/station.vue index 2d91cd3..30e278d 100644 --- a/web/src/views/system/station.vue +++ b/web/src/views/system/station.vue @@ -62,6 +62,7 @@ export default { props: {}, data() { return { + tableData:[], tableOption: { select: false }, @@ -196,7 +197,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/user.vue b/web/src/views/system/user.vue index 4669ab1..d6de1b2 100644 --- a/web/src/views/system/user.vue +++ b/web/src/views/system/user.vue @@ -54,6 +54,7 @@ export default { props: {}, data() { return { + tableData:[], tableOption: { select: false },