diff --git a/src/App.vue b/src/App.vue index 947dc7879..5ddb7f29c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -238,7 +238,12 @@ export default { }, // 监听路由 控制isBoolean $route() { - if (this.$route.name !== 'Login' && this.$route.name !== 'Home' && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex') { + if (this.$route.name !== 'Login' && this.$route.name !== 'Home' + && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' + && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' + && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' + && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' + && this.$route.name !== 'blankPage') { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/main.js b/src/main.js index 4d44b6f12..c5055a27d 100644 --- a/src/main.js +++ b/src/main.js @@ -276,7 +276,11 @@ router.beforeEach(function (to, from, next) { } if(path === '/loginVerify'){ if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') + if(isMobile()) { + next('/blankPage') + } else { + next('/Login') + } }else { next() } diff --git a/src/pages/blankPage/index.vue b/src/pages/blankPage/index.vue new file mode 100644 index 000000000..cecd598ee --- /dev/null +++ b/src/pages/blankPage/index.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index e312fcbca..601528c98 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -23,7 +23,7 @@ :data="dataList" border ref="entryTable" - height="49%" + height="80%" @selection-change="selectedDelete" style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 90e3f3259..df7fb02ec 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -13,70 +13,6 @@ -
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 5d4d4594d..6c6776c5b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -28,7 +28,7 @@ border ref="multipleTable" @selection-change="handleSelectionMore" - height="49%" + height="80%" style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 6d13ad4df..3663c097b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -13,76 +13,10 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue index 09501d5fc..69084efee 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue @@ -13,76 +13,10 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 6c902ccab..3264cfc95 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -16,7 +16,7 @@ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 79b6974d5..117aa3e11 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -298,7 +298,7 @@ align="center" label="标准号"> -