FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-04-27 10:49:34 +08:00
parent 80b8626d42 2933734ed5
commit a88548e75c
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+2 -1
View File
@@ -218,7 +218,8 @@ export default {
&& this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex'
&& this.$route.name !== 'AdvancedSearchExternal' && this.$route.name !== 'LoginVerifyNoEncryption'
&& this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage'
&& this.$route.name !== 'loginStandDetails' && this.$route.name !== 'error') {
&& this.$route.name !== 'loginStandDetails' && this.$route.name !== 'error'
&& this.$route.name !== 'OtherStandardExternalDetails' && this.$route.name !== 'OtherStandardExternalDetails') {
this.isBoolean = true
} else {
this.isBoolean = false
src/pages/loginStandDetails/index.vue
+20 -6
View File
@@ -109,27 +109,41 @@
_this: this
}, res =>{
if(res){
let routeUrl = this.$router.resolve({
this.$router.push({
name: routerName,
params: {
id: dataId,
pageType: pageType
}
});
window.open(routeUrl.href, "_blank");
})
// let routeUrl = this.$router.resolve({
// name: routerName,
// params: {
// id: dataId,
// pageType: pageType
// }
// });
// this.$router.push(routeUrl.href)
}else{
this.$message.warning('您暂无权限查看')
}
})
}else {
let routeUrl = this.$router.resolve({
// let routeUrl = this.$router.resolve({
// name: routerName,
// params: {
// id: dataId,
// pageType: pageType
// }
// });
this.$router.push({
name: routerName,
params: {
id: dataId,
pageType: pageType
}
});
window.open(routeUrl.href, "_blank");
})
// window.open(routeUrl.href, "_blank");
}
}
}, e => {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+1 -3
View File
@@ -1015,9 +1015,7 @@ export default {
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.processNum()
this.queryProcess()
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
this.$router.push("/processCenter");
} else {
this.$message.warning(res.message)
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+1 -1
View File
@@ -2148,7 +2148,7 @@ export default {
let routeUrl = this.$router.resolve({
name: routerName,
params: {
id: data.id,
id: data.id || data.standId,
pageType: this.sarAccessInfo.dataSource
}
})