From a5b05a0e2a3be1597d3cea46258a61a7cbb5b941 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 2 Jun 2021 20:23:59 +0800 Subject: [PATCH 1/4] commit --- .../zTree/css/zTreeStyle/zTreeStyle.css | 65 ++++++++++++++++++- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/src/assets/zTree/css/zTreeStyle/zTreeStyle.css b/src/assets/zTree/css/zTreeStyle/zTreeStyle.css index a97979f65..d178df759 100644 --- a/src/assets/zTree/css/zTreeStyle/zTreeStyle.css +++ b/src/assets/zTree/css/zTreeStyle/zTreeStyle.css @@ -28,9 +28,68 @@ website: http://code.google.com/p/jquerytree/ .ztree li span {line-height:16px; margin-right:2px} .ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle; border:0 none; cursor: pointer;outline:none; - background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; - background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")} - + /*background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;*/ + /*background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")*/ +} +.ztree li span.button.roots_open{ + width: 0px !important; + height: 0px !important; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid rgb(192, 196, 204); +} +.ztree li span.button.roots_close{ + width: 0px !important; + height: 0px !important; + border-bottom: 5px solid transparent; + border-left: 5px solid rgb(192, 196, 204); + border-top: 5px solid transparent; + margin-right: 5px; +} +.ztree li span.button.center_open{ + width: 0px !important; + height: 0px !important; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid rgb(192, 196, 204); +} +.ztree li span.button.center_close{ + width: 0px !important; + height: 0px !important; + border-bottom: 5px solid transparent; + border-left: 5px solid rgb(192, 196, 204); + border-top: 5px solid transparent; + margin-right: 5px; +} +.ztree li span.button.bottom_open{ + width: 0px !important; + height: 0px !important; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid rgb(192, 196, 204); +} +.ztree li span.button.bottom_close{ + width: 0px !important; + height: 0px !important; + border-bottom: 5px solid transparent; + border-left: 5px solid rgb(192, 196, 204); + border-top: 5px solid transparent; + margin-right: 5px; +} +.ztree li a.curSelectedNode { + border: 1px solid transparent !important; + color: #2d8cf0; + background: transparent; +} +.ztree li ul.line { + background: transparent; +} +.ico_open { + width: 2px !important; +} +.ico_close { + width: 2px !important; +} .ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto} .ztree li span.button.chk.checkbox_false_full {background-position:0 0} .ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px} From 59d9fc8c7da83a5fe96649db53df102b8f6eae82 Mon Sep 17 00:00:00 2001 From: youyuzihan Date: Wed, 2 Jun 2021 23:42:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=EF=BC=9A=E4=BF=9D=E7=95=99=E4=BE=A7?= =?UTF-8?q?=E8=BE=B9=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardForComments/index.vue | 20 ++++++++++++++----- src/router/index.js | 7 ++++--- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index 9dec62b78..a13958301 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -61,7 +61,7 @@ label="类别" align="center"> @@ -291,15 +291,25 @@ export default { window.open(routeUrl.href, '_blank') }, oldPreview (item) { - let routeUrl = this.$router.resolve({ + sessionStorage.setItem('accessRow', JSON.stringify(item)) + this.$store.commit('setDetailMap', this.$route.path) + this.$router.push({ name: 'categoryDetails', params: { - id: item.id, - pageType: 'INLAND_STAND' + id: item.id } }) - window.open(routeUrl.href, '_blank') }, + // oldPreview (item) { + // let routeUrl = this.$router.resolve({ + // name: 'categoryDetails', + // params: { + // id: item.id, + // pageType: 'INLAND_STAND' + // } + // }) + // window.open(routeUrl.href, '_self') + // }, // handlePreview (params) { // if (params.compareType === '条款比对') { // this.$store.commit('setDetailMap', this.$route.path) diff --git a/src/router/index.js b/src/router/index.js index 87204de87..0c919fc82 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2410,15 +2410,16 @@ const routes = [ } }, { - path: '/categoryDetails/:id/:pageType', + path: '/categoryDetails/:id', name: 'categoryDetails', component: () => import('@/pages/details/categoryDetails/index'), meta: { requireAuth: true, + parentPath: '/standardForComments', title: '管理征求意见', - isBoolean: true, - menuId: '' + // isBoolean: true, + // menuId: '' } }, { From 6202d047084cfe6f01e8010c566adaecd68849b7 Mon Sep 17 00:00:00 2001 From: youyuzihan Date: Thu, 3 Jun 2021 00:07:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=EF=BC=9A=E4=BF=9D=E7=95=99=E4=BE=A7?= =?UTF-8?q?=E8=BE=B9=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/categoryDetails/index.vue | 5 +++-- src/pages/regulatoryRepository/standardForComments/index.vue | 3 ++- src/router/index.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/details/categoryDetails/index.vue b/src/pages/details/categoryDetails/index.vue index b21b69040..26decb214 100644 --- a/src/pages/details/categoryDetails/index.vue +++ b/src/pages/details/categoryDetails/index.vue @@ -1,11 +1,11 @@