From 59d1e6807db6539ff7b7cbc4286e021e98ac5079 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 22 Nov 2021 09:53:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=A6=81=E5=B1=95=E5=BC=80=EF=BC=8C=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=AD=90=E6=A0=91=E9=BB=98=E8=AE=A4=E6=94=B6?= =?UTF-8?q?=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5c7e9f408..38acdcbe4 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -20,7 +20,6 @@ highlight-current @node-click="treeClick" :filter-node-method="filterNode" - default-expand-all :expand-on-click-node="false"> @@ -1895,7 +1894,7 @@ export default { loading: false, importLoading: false, isCollapse: true, - sideClose: true, // 边栏收展状态 + sideClose: false, // 边栏收展状态 isAdvancedSearch: false, // 高级检索窗口是否打开 replaceStandNumModel: false, lawsExplainQuoteModel: false, From 057bd0aafc39d6d9e2341909cac8d07840e89f50 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 22 Nov 2021 09:58:18 +0800 Subject: [PATCH 2/3] commit --- src/components/roleTree/index.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index 1e4eefd67..9abd493f7 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -135,10 +135,7 @@ this.isVisible2 = false }, saveUserInfo () { - if (this.nodeList[0].length === 0) { - this.isVisible2 = false - this.$emit('checkedRole', this.roleList) - } else if (this.nodeList.length > 0) { + if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) { let ids = '' this.nodeList.forEach(item => { if (ids.length > 0) { From 16934a0317c57786fbaa964015cab7d8b7588bfc Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 22 Nov 2021 09:58:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=A6=81=E5=B1=95=E5=BC=80=EF=BC=8C=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=AD=90=E6=A0=91=E9=BB=98=E8=AE=A4=E6=94=B6?= =?UTF-8?q?=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/mechanismManage/index.vue | 2 +- src/pages/config/pages/roleManage/index.vue | 2 +- .../components/EnterpriseStandardDatabase.vue | 3 +-- .../regulatoryRepository/foreignRegulationsDatabase/index.vue | 3 +-- .../foreignStandardsAndRegulations/index.vue | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 032eb92f6..6f613fbf6 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -265,7 +265,7 @@ export default { total: 0, total2: 0, pageSize: this.$store.getters.userInfo.configContent, - sideClose: true, + sideClose: false, data: [], // table数据 treeLoading: false, Loading: false, diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 45f01ce8f..35dd4fc35 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -313,7 +313,7 @@ export default { }, nodeList2: [], modalflag: false, - sideClose: true, // 边栏收展状态 + sideClose: false, // 边栏收展状态 filterText: '', treeData: [], defaultProps: { diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 42053dd5a..505e10a72 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -23,7 +23,6 @@ highlight-current @node-click="treeClick" :filter-node-method="filterNode" - default-expand-all :expand-on-click-node="false"> @@ -1961,7 +1960,7 @@ export default { creationTime: '' }, removeOneId: '', - sideClose: true, // 边栏收展状态 + sideClose: false, // 边栏收展状态 twoOptions: [], threeOptions: [], orgData: [], diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index dc938191f..064cd101c 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -21,7 +21,6 @@ highlight-current @node-click="treeClick" :filter-node-method="filterNode" - default-expand-all :expand-on-click-node="false"> @@ -2129,7 +2128,7 @@ creationTime: '' }, removeOneId: '', - sideClose: true, // 边栏收展状态 + sideClose: false, // 边栏收展状态 twoOptions: [], threeOptions: [], orgData: [], diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 9b4c410c1..0ca0a8d12 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -21,7 +21,6 @@ highlight-current @node-click="treeClick" :filter-node-method="filterNode" - default-expand-all :expand-on-click-node="false"> @@ -1751,7 +1750,7 @@ export default { // 分页查询过程中用到的对象 loading: false, isCollapse: true, - sideClose: true, // 边栏收展状态 + sideClose: false, // 边栏收展状态 isAdvancedSearch: false, // 高级检索窗口是否打开 replaceStandNumModel: false, lawsExplainQuoteModel: false,