From 1fba2d9c88a1bd746a9346138f89cb783e612e43 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 28 May 2024 20:01:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 16 ++++++++++++++-- pages/alarmPage/indexTwo.vue | 2 +- pages/alarmPage/manualCapture/index.vue | 2 +- .../InspectionRoute/inspecteddetail.vue | 2 +- pages/projectEnd/carManage/index.vue | 2 +- pages/projectEnd/dangerBigProject/details.vue | 2 +- pages/projectEnd/emergencyDisposal/detail.vue | 4 ++-- pages/projectEnd/qualityManage/details.vue | 4 ++-- pages/projectEnd/qualityManage/index.vue | 2 +- pages/projectEnd/safeSame/details.vue | 4 ++-- pages/projectEnd/safeSame/index.vue | 2 +- .../specialOperations/bindPlatePlug/detail.vue | 2 +- .../specialOperations/fireWork/detail.vue | 2 +- .../specialOperations/groundSafe/detail.vue | 2 +- .../specialOperations/highJob/detail.vue | 2 +- .../specialOperations/hoistSafe/detail.vue | 2 +- .../specialOperations/limitSpaceWork/detail.vue | 2 +- .../specialOperations/openCircuit/detail.vue | 2 +- .../specialOperations/tempElectricity/detail.vue | 2 +- pages/projectEnd/trainPlan/list.vue | 2 +- .../visitorsManage/visitorsDetails.vue | 2 +- pages/standardScheduleNews/auditDetail.vue | 8 +++++--- 22 files changed, 42 insertions(+), 28 deletions(-) diff --git a/main.js b/main.js index e122d229..9b8451d9 100644 --- a/main.js +++ b/main.js @@ -305,8 +305,8 @@ Vue.prototype.sendRequest = function(param) { } }); } -// 判断权限的函数 -Vue.prototype.checkPermission = function(permission) { +// 判断按钮权限的函数 +Vue.prototype.checkBtnPermission = function(permission) { var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList; // var permissions = store.state.userInfo.menuAuthority.menuList; permissions = permissions.filter( @@ -321,6 +321,18 @@ Vue.prototype.checkPermission = function(permission) { ) return index != -1 ? true : false; } +Vue.prototype.checkMenuPermission = function(permission) { + var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList; + // var permissions = store.state.userInfo.menuAuthority.menuList; + permissions = permissions.filter( + (x) => x.path == permission.menuPath + )[0]; + if (!permissions) { + return false; + } else { + return true; + } +} const app = new Vue({ ...App }) diff --git a/pages/alarmPage/indexTwo.vue b/pages/alarmPage/indexTwo.vue index e7bb5118..99c1b515 100644 --- a/pages/alarmPage/indexTwo.vue +++ b/pages/alarmPage/indexTwo.vue @@ -83,7 +83,7 @@ } }, onLoad() { - this.btnAuth = this.checkPermission({key: 'ai_disposition', menuPath: '/project/aiAnalysis/warningList'}) + this.btnAuth = this.checkBtnPermission({key: 'ai_disposition', menuPath: '/project/aiAnalysis/warningList'}) }, onShow(){ this.systemInfo = uni.getStorageSync('systemInfo') diff --git a/pages/alarmPage/manualCapture/index.vue b/pages/alarmPage/manualCapture/index.vue index cb6a63a4..a91a3ffe 100644 --- a/pages/alarmPage/manualCapture/index.vue +++ b/pages/alarmPage/manualCapture/index.vue @@ -144,7 +144,7 @@ } }, onLoad(option) { - this.btnAuth = this.checkPermission({key: 'dealPush_push', menuPath: '/project/aiAnalysis/dealPushManage'}) + this.btnAuth = this.checkBtnPermission({key: 'dealPush_push', menuPath: '/project/aiAnalysis/dealPushManage'}) this.alarmItem = JSON.parse(decodeURIComponent(option.item)); console.log('alarmItem', this.alarmItem) }, diff --git a/pages/projectEnd/InspectionRoute/inspecteddetail.vue b/pages/projectEnd/InspectionRoute/inspecteddetail.vue index 4cabd6f6..b92fbc5f 100644 --- a/pages/projectEnd/InspectionRoute/inspecteddetail.vue +++ b/pages/projectEnd/InspectionRoute/inspecteddetail.vue @@ -119,7 +119,7 @@ } }, onLoad(options) { - this.btnAuth = this.checkPermission({key: 'selfInspect_scanCheck', menuPath: '/project/inspecPoint/selfInspect'}) + this.btnAuth = this.checkBtnPermission({key: 'selfInspect_scanCheck', menuPath: '/project/inspecPoint/selfInspect'}) this.info = JSON.parse(options.info); this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn; diff --git a/pages/projectEnd/carManage/index.vue b/pages/projectEnd/carManage/index.vue index e4ca6d30..301bcbb4 100644 --- a/pages/projectEnd/carManage/index.vue +++ b/pages/projectEnd/carManage/index.vue @@ -189,7 +189,7 @@ - diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue index 5dd23b0d..8ac6e288 100644 --- a/pages/projectEnd/dangerBigProject/details.vue +++ b/pages/projectEnd/dangerBigProject/details.vue @@ -157,7 +157,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({key: 'wdgc_add', menuPath: '/project/dangerousBigProject/parameter'}) + this.btnAuth = this.checkBtnPermission({key: 'wdgc_add', menuPath: '/project/dangerousBigProject/parameter'}) this.detailId = val.id // if(val.) // this.initData() diff --git a/pages/projectEnd/emergencyDisposal/detail.vue b/pages/projectEnd/emergencyDisposal/detail.vue index faef4334..becefb50 100644 --- a/pages/projectEnd/emergencyDisposal/detail.vue +++ b/pages/projectEnd/emergencyDisposal/detail.vue @@ -236,11 +236,11 @@ }, onLoad(options) { - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'emergencyDisposal_add', menuPath: '/project/emergencyDisposal/emergencyDisposal' }) - this.btnEditAuth = this.checkPermission({ + this.btnEditAuth = this.checkBtnPermission({ key: 'emergencyDisposal_edit', menuPath: '/project/emergencyDisposal/emergencyDisposal' }) diff --git a/pages/projectEnd/qualityManage/details.vue b/pages/projectEnd/qualityManage/details.vue index 6842f159..bcf00ff2 100644 --- a/pages/projectEnd/qualityManage/details.vue +++ b/pages/projectEnd/qualityManage/details.vue @@ -226,11 +226,11 @@ } }, onLoad(option) { - this.btnEditAuth = this.checkPermission({ + this.btnEditAuth = this.checkBtnPermission({ key: 'inspectionLedger_edit', menuPath: '/project/quality/inspectionLedger' }) - this.btnDeleteAuth = this.checkPermission({ + this.btnDeleteAuth = this.checkBtnPermission({ key: 'inspectionLedger_delete', menuPath: '/project/quality/inspectionLedger' }) diff --git a/pages/projectEnd/qualityManage/index.vue b/pages/projectEnd/qualityManage/index.vue index 5281bb5c..9ea30bbd 100644 --- a/pages/projectEnd/qualityManage/index.vue +++ b/pages/projectEnd/qualityManage/index.vue @@ -159,7 +159,7 @@ } }, onLoad() { - this.btnAuth = this.checkPermission({key: 'inspectionLedger_add', menuPath: '/project/quality/inspectionLedger'}) + this.btnAuth = this.checkBtnPermission({key: 'inspectionLedger_add', menuPath: '/project/quality/inspectionLedger'}) }, mounted() { this.getTime() diff --git a/pages/projectEnd/safeSame/details.vue b/pages/projectEnd/safeSame/details.vue index 548c9d30..59cb0415 100644 --- a/pages/projectEnd/safeSame/details.vue +++ b/pages/projectEnd/safeSame/details.vue @@ -226,11 +226,11 @@ } }, onLoad(option) { - this.btnEditAuth = this.checkPermission({ + this.btnEditAuth = this.checkBtnPermission({ key: 'inspectionLedger_edit', menuPath: '/project/safeSame/inspectionLedger' }) - this.btnDeleteAuth = this.checkPermission({ + this.btnDeleteAuth = this.checkBtnPermission({ key: 'inspectionLedger_delete', menuPath: '/project/safeSame/inspectionLedger' }) diff --git a/pages/projectEnd/safeSame/index.vue b/pages/projectEnd/safeSame/index.vue index eedd7c5f..1fa5237f 100644 --- a/pages/projectEnd/safeSame/index.vue +++ b/pages/projectEnd/safeSame/index.vue @@ -180,7 +180,7 @@ } }, onLoad() { - this.btnAuth = this.checkPermission({key: 'inspectionLedger_add', menuPath: '/project/safeSame/inspectionLedger'}) + this.btnAuth = this.checkBtnPermission({key: 'inspectionLedger_add', menuPath: '/project/safeSame/inspectionLedger'}) }, mounted() { this.getTime() diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue index 32374f81..a920c6a0 100644 --- a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue +++ b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue @@ -238,7 +238,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'blindPlugWork_add', menuPath: '/project/specialWork/blindPlugWork' }) diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 626992ba..cdf22be1 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -190,7 +190,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'fireWork_add', menuPath: '/project/specialWork/fireWork' }) diff --git a/pages/projectEnd/specialOperations/groundSafe/detail.vue b/pages/projectEnd/specialOperations/groundSafe/detail.vue index 986bcb6e..7add5b5c 100644 --- a/pages/projectEnd/specialOperations/groundSafe/detail.vue +++ b/pages/projectEnd/specialOperations/groundSafe/detail.vue @@ -202,7 +202,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'startBuildingWork_add', menuPath: '/project/specialWork/startBuildingWork' }) diff --git a/pages/projectEnd/specialOperations/highJob/detail.vue b/pages/projectEnd/specialOperations/highJob/detail.vue index f2b83167..4202b67c 100644 --- a/pages/projectEnd/specialOperations/highJob/detail.vue +++ b/pages/projectEnd/specialOperations/highJob/detail.vue @@ -201,7 +201,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'towerOverWork_add', menuPath: '/project/specialWork/towerOverWork' }) diff --git a/pages/projectEnd/specialOperations/hoistSafe/detail.vue b/pages/projectEnd/specialOperations/hoistSafe/detail.vue index c53041cb..88f7a0ed 100644 --- a/pages/projectEnd/specialOperations/hoistSafe/detail.vue +++ b/pages/projectEnd/specialOperations/hoistSafe/detail.vue @@ -201,7 +201,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'riggingOutWork_add', menuPath: '/project/specialWork/riggingOutWork' }) diff --git a/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue b/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue index db5050ac..b0e49287 100644 --- a/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue +++ b/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue @@ -278,7 +278,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'confinedSpaceWork_add', menuPath: '/project/specialWork/confinedSpaceWork' }) diff --git a/pages/projectEnd/specialOperations/openCircuit/detail.vue b/pages/projectEnd/specialOperations/openCircuit/detail.vue index 4003e641..1c9c3c8e 100644 --- a/pages/projectEnd/specialOperations/openCircuit/detail.vue +++ b/pages/projectEnd/specialOperations/openCircuit/detail.vue @@ -210,7 +210,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'disconnectionWork_add', menuPath: '/project/specialWork/disconnectionWork' }) diff --git a/pages/projectEnd/specialOperations/tempElectricity/detail.vue b/pages/projectEnd/specialOperations/tempElectricity/detail.vue index ced7b507..dc44601e 100644 --- a/pages/projectEnd/specialOperations/tempElectricity/detail.vue +++ b/pages/projectEnd/specialOperations/tempElectricity/detail.vue @@ -222,7 +222,7 @@ },200) }, onLoad(val){ - this.btnAuth = this.checkPermission({ + this.btnAuth = this.checkBtnPermission({ key: 'temporaryPowerWork_add', menuPath: '/project/specialWork/temporaryPowerWork' }) diff --git a/pages/projectEnd/trainPlan/list.vue b/pages/projectEnd/trainPlan/list.vue index b5db6295..d164de04 100644 --- a/pages/projectEnd/trainPlan/list.vue +++ b/pages/projectEnd/trainPlan/list.vue @@ -58,7 +58,7 @@ } }, onLoad(options) { - this.btnAuth = this.checkPermission({key: 'trainPlan_add', menuPath: '/project/examSystem2/trainPlan'}) + this.btnAuth = this.checkBtnPermission({key: 'trainPlan_add', menuPath: '/project/examSystem2/trainPlan'}) this.projectSn = JSON.parse(uni.getStorageSync("userInfo")).sn this.getDataList(); }, diff --git a/pages/projectEnd/visitorsManage/visitorsDetails.vue b/pages/projectEnd/visitorsManage/visitorsDetails.vue index 3a3932da..37c86162 100644 --- a/pages/projectEnd/visitorsManage/visitorsDetails.vue +++ b/pages/projectEnd/visitorsManage/visitorsDetails.vue @@ -68,7 +68,7 @@ this.getDetails() }, onLoad(vai) { - this.btnAuth = this.checkPermission({key: 'trainPlan_add', menuPath: '/project/labor/visitRecord'}) + this.btnAuth = this.checkBtnPermission({key: 'trainPlan_add', menuPath: '/project/labor/visitRecord'}) this.id = vai.itemS }, onReachBottom() { diff --git a/pages/standardScheduleNews/auditDetail.vue b/pages/standardScheduleNews/auditDetail.vue index 63028b90..42d5e914 100644 --- a/pages/standardScheduleNews/auditDetail.vue +++ b/pages/standardScheduleNews/auditDetail.vue @@ -73,12 +73,12 @@ - + 驳回 通过 - + 提交 @@ -95,10 +95,12 @@ isPass: true, form: { feedbackContent: '' - } + }, + btnEditAuth: true } }, onLoad(option) { + this.btnEditAuth = this.checkBtnPermission({key: 'jdsp_edit', menuPath: '/project/progressManagementAg/progressApproval'}) this.itemFrom = JSON.parse(option.obj); if (this.itemFrom) { this.filterItemForm();