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

合并代码

Browse Source
This commit is contained in:
宋伟佳
2021-06-03 09:08:30 +08:00
parent 22ca4cac6d 83c12b74e7
commit 43900fcb6e
4 changed files with 167 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/zTree/css/zTreeStyle/zTreeStyle.css
+62 -3
View File
@@ -28,9 +28,68 @@ website: http://code.google.com/p/jquerytree/
.ztree li span {line-height:16px; margin-right:2px} .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; .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; border:0 none; cursor: pointer;outline:none;
background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; /*background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;*/
background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")} /*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 {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 {background-position:0 0}
.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px} .ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px}
src/pages/regulatoryRepository/standardForComments/index.vue
+19 -8
View File
@@ -61,7 +61,7 @@
label="类别" label="类别"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="oldPreview(scope.row)" class="table-jump">{{ scope.row.oldStandNum }}</a> <a class="table-jump" @click.stop="oldPreview(scope.row)">{{ scope.row.oldStandNum }}</a>
</template> </template>
</el-table-column> </el-table-column>
@@ -158,7 +158,8 @@ export default {
readFlag: '', readFlag: '',
validFlag: '', validFlag: '',
modifyTime: '', modifyTime: '',
creationTime: '' creationTime: '',
oldStandName: '',
}, },
// 收藏标准 // 收藏标准
personCollect: { personCollect: {
@@ -291,15 +292,25 @@ export default {
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
oldPreview (item) { 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', name: 'categoryDetails',
params: { params: {
id: item.id, id: item.id
pageType: 'INLAND_STAND'
} }
}) })
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) { // handlePreview (params) {
// if (params.compareType === '条款比对') { // if (params.compareType === '条款比对') {
// this.$store.commit('setDetailMap', this.$route.path) // this.$store.commit('setDetailMap', this.$route.path)
@@ -548,10 +559,10 @@ export default {
} }
::v-deep .el-drawer__header{ ::v-deep .el-drawer__header{
&>span:first-child{ &>span:first-child{
outline: none!important; outline:0 !important;
} }
} }
::v-deep .el-drawer{ ::v-deep .el-drawer{
outline: none!important; outline:0 !important;
} }
</style> </style>
src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue
+82 -36
View File
@@ -1,11 +1,11 @@
<!--管理征求意见详情--> <!--管理征求意见详情-->
<template> <template>
<div class="consultationDetails"> <div class="consultationDetails v-class">
<div class="contentTitle"> <div class="contentTitle">
<div class="back" title="返回" @click="back"> <div class="back" title="返回" @click="back">
<i class="el-icon-back"></i> <i class="el-icon-back"></i>
</div> </div>
<div class="title">管理征求意见<i class="el-icon-s-order" @click="heightShow = !heightShow"></i></div> <div class="title">{{ personShareEO.oldStandName }}<i class="el-icon-s-order" @click="heightShow = !heightShow"></i></div>
</div> </div>
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
<div v-show="heightShow" class="transition-box"> <div v-show="heightShow" class="transition-box">
@@ -32,37 +32,42 @@
<div class="container" style="position:relative;"> <div class="container" style="position:relative;">
<div style="position: absolute;top: 0;left: 0;bottom: 0;right: 0;"> <div style="position: absolute;top: 0;left: 0;bottom: 0;right: 0;">
<el-table <el-table
:data="standinfoList" :data="standinfoList"
height="100%" height="100%"
border border
style="width: 100%" style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="date" prop="date"
label="章节编号" label="章节编号"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="修改意见内容(包括理由或依据)" label="修改意见内容(包括理由或依据)"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="department" prop="department"
label="提出部门" label="提出部门"
width="300" width="300"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="proposer" prop="proposer"
label="提出人" label="提出人"
width="170" width="170">
</el-table-column>
<el-table-column
prop="proposer"
label="提出人"
width="170"
> >
</el-table-column> </el-table-column>
@@ -71,11 +76,11 @@
</div> </div>
<div> <div>
<pagination <pagination
style="position: static;" style="position: static;"
:page="newModelPageConfig.page" :page="newModelPageConfig.page"
:total="newModelPageConfig.total" :total="newModelPageConfig.total"
@pageChange="page => handlePageChange('newModel', page)" @pageChange="page => handlePageChange('newModel', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"></pagination> @pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"></pagination>
</div> </div>
<!--导出文件改名字模态框--> <!--导出文件改名字模态框-->
<el-dialog :visible.sync="exportModelFlag" class="export-dialog" title="导出文件" width="300px"> <el-dialog :visible.sync="exportModelFlag" class="export-dialog" title="导出文件" width="300px">
@@ -107,6 +112,7 @@ export default {
uploadTime: '2002-11-23', uploadTime: '2002-11-23',
opinionCycle: '2001-02-21到 2012-02-02' opinionCycle: '2001-02-21到 2012-02-02'
}, },
personShareEO:{},
opinionContent: { opinionContent: {
number:'', number:'',
content: '', content: '',
@@ -192,7 +198,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.consultationDetails { .consultationDetails{
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -226,7 +232,7 @@ export default {
line-height: 35px; line-height: 35px;
.transition-box-label{ .transition-box-label{
display: inline-block; display: inline-block;
width: 100px; width: 80px;
vertical-align: top; vertical-align: top;
} }
.transition-box-span{ .transition-box-span{
@@ -268,14 +274,10 @@ export default {
} }
} }
} }
.effect {
margin-left: 10px;
}
.container { .container {
height: calc(~'100% - 52px - 55px - 50px'); //height: calc(~'100% - 52px - 55px - 50px');
flex: auto; flex: auto;
display: flex; display: flex;
margin:10px;
flex-direction: column; flex-direction: column;
.el-tabs{ .el-tabs{
height: 100%; height: 100%;
@@ -297,13 +299,57 @@ export default {
} }
} }
} }
.add-demo { /deep/.relateClass{
.search-area { & > button{
height: 100%; height: 30px;
line-height: 30px;
font-size: 14px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
} }
::v-deep .el-textarea__inner { & i{
width: 1000px; display: inline-block;
margin-right: 3px;
width: 18px;
height: 18px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: text-bottom;
} }
.relation-btn{
color: #409EFF;
border: 1px solid #409EFF;
background: rgba(64, 158, 255, 0.1);
.icon-relation{
background-image: url("~assets/images/shangqi/standardDetails/relation.png");
}
}
}
.iconClass{
width: 18px;
height: 18px;
}
.iconClassDia{
width: 30px;
height: 30px;
}
.picBorder{
border: 1px solid #409eff;
}
.add-border{
/*width: 80px;*/
height: 80px;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer
}
}
.relateClass{
.el-dialog__body {
max-height: 460px;
overflow-y: auto;
} }
} }
</style> </style>
src/router/index.js
+4 -3
View File
@@ -2410,15 +2410,16 @@ const routes = [
} }
}, },
{ {
path: '/categoryDetails/:id/:pageType', path: '/categoryDetails/:id',
name: 'categoryDetails', name: 'categoryDetails',
component: () => component: () =>
import('@/pages/regulatoryRepository/standardForComments/pags/categoryDetails'), import('@/pages/regulatoryRepository/standardForComments/pags/categoryDetails'),
meta: { meta: {
requireAuth: true, requireAuth: true,
parentPath: '/standardForComments',
title: '管理征求意见', title: '管理征求意见',
isBoolean: true, // isBoolean: true,
menuId: '' // menuId: ''
} }
}, },
{ {