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} diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index 9dec62b78..02911a309 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -61,7 +61,7 @@ label="类别" align="center"> - {{ scope.row.oldStandNum }} + {{ scope.row.oldStandNum }} @@ -158,7 +158,8 @@ export default { readFlag: '', validFlag: '', modifyTime: '', - creationTime: '' + creationTime: '', + oldStandName: '', }, // 收藏标准 personCollect: { @@ -291,15 +292,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) @@ -548,10 +559,10 @@ export default { } ::v-deep .el-drawer__header{ &>span:first-child{ - outline: none!important; + outline:0 !important; } } ::v-deep .el-drawer{ - outline: none!important; + outline:0 !important; } diff --git a/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue index 0ace7a58b..d3d39c845 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue @@ -1,11 +1,11 @@ - + - 管理征求意见 + {{ personShareEO.oldStandName }} @@ -32,37 +32,42 @@ + type="selection" + width="55" + align="center"> + prop="date" + label="章节编号" + width="180"> + + @@ -71,11 +76,11 @@ handlePageChange('newModel', page)" - @pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"> + style="position: static;" + :page="newModelPageConfig.page" + :total="newModelPageConfig.total" + @pageChange="page => handlePageChange('newModel', page)" + @pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"> @@ -107,6 +112,7 @@ export default { uploadTime: '2002-11-23', opinionCycle: '2001-02-21到 2012-02-02' }, + personShareEO:{}, opinionContent: { number:'', content: '', @@ -192,7 +198,7 @@ export default { diff --git a/src/router/index.js b/src/router/index.js index e43743cf4..eac358835 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/regulatoryRepository/standardForComments/pags/categoryDetails'), meta: { requireAuth: true, + parentPath: '/standardForComments', title: '管理征求意见', - isBoolean: true, - menuId: '' + // isBoolean: true, + // menuId: '' } }, {