ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 文档拆分-导入拆分结果；单点登录调整

Browse Source
This commit is contained in:
赵霄
2023-10-23 14:28:48 +08:00
parent 579d535919
commit cf14e50e80
8 changed files with 190 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/index.html
Vendored
+37 -8
View File
@@ -18,12 +18,14 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
.chromeframe { .chromeframe {
margin: 0.2em 0; margin: 0.2em 0;
background: #ccc; background: #ccc;
color: #000; color: #000;
padding: 0.2em 0; padding: 0.2em 0;
} }
#loader-wrapper { #loader-wrapper {
position: fixed; position: fixed;
top: 0; top: 0;
@@ -32,6 +34,7 @@
height: 100%; height: 100%;
z-index: 999999; z-index: 999999;
} }
#loader { #loader {
display: block; display: block;
position: relative; position: relative;
@@ -56,6 +59,7 @@
/* Chrome, Firefox 16+, IE 10+, Opera */ /* Chrome, Firefox 16+, IE 10+, Opera */
z-index: 1001; z-index: 1001;
} }
#loader:before { #loader:before {
content: ""; content: "";
position: absolute; position: absolute;
@@ -78,6 +82,7 @@
animation: spin 3s linear infinite; animation: spin 3s linear infinite;
/* Chrome, Firefox 16+, IE 10+, Opera */ /* Chrome, Firefox 16+, IE 10+, Opera */
} }
#loader:after { #loader:after {
content: ""; content: "";
position: absolute; position: absolute;
@@ -100,6 +105,7 @@
animation: spin 1.5s linear infinite; animation: spin 1.5s linear infinite;
/* Chrome, Firefox 16+, IE 10+, Opera */ /* Chrome, Firefox 16+, IE 10+, Opera */
} }
@-webkit-keyframes spin { @-webkit-keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
@@ -118,6 +124,7 @@
/* Firefox 16+, IE 10+, Opera */ /* Firefox 16+, IE 10+, Opera */
} }
} }
@keyframes spin { @keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
@@ -136,6 +143,7 @@
/* Firefox 16+, IE 10+, Opera */ /* Firefox 16+, IE 10+, Opera */
} }
} }
#loader-wrapper .loader-section { #loader-wrapper .loader-section {
position: fixed; position: fixed;
top: 0; top: 0;
@@ -151,12 +159,15 @@
transform: translateX(0); transform: translateX(0);
/* Firefox 16+, IE 10+, Opera */ /* Firefox 16+, IE 10+, Opera */
} }
#loader-wrapper .loader-section.section-left { #loader-wrapper .loader-section.section-left {
left: 0; left: 0;
} }
#loader-wrapper .loader-section.section-right { #loader-wrapper .loader-section.section-right {
right: 0; right: 0;
} }
/* Loaded */ /* Loaded */
.loaded #loader-wrapper .loader-section.section-left { .loaded #loader-wrapper .loader-section.section-left {
-webkit-transform: translateX(-100%); -webkit-transform: translateX(-100%);
@@ -168,6 +179,7 @@
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
} }
.loaded #loader-wrapper .loader-section.section-right { .loaded #loader-wrapper .loader-section.section-right {
-webkit-transform: translateX(100%); -webkit-transform: translateX(100%);
/* Chrome, Opera 15+, Safari 3.1+ */ /* Chrome, Opera 15+, Safari 3.1+ */
@@ -178,11 +190,13 @@
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
} }
.loaded #loader { .loaded #loader {
opacity: 0; opacity: 0;
-webkit-transition: all 0.3s ease-out; -webkit-transition: all 0.3s ease-out;
transition: all 0.3s ease-out; transition: all 0.3s ease-out;
} }
.loaded #loader-wrapper { .loaded #loader-wrapper {
visibility: hidden; visibility: hidden;
-webkit-transform: translateY(-100%); -webkit-transform: translateY(-100%);
@@ -194,13 +208,16 @@
-webkit-transition: all 0.3s 1s ease-out; -webkit-transition: all 0.3s 1s ease-out;
transition: all 0.3s 1s ease-out; transition: all 0.3s 1s ease-out;
} }
/* JavaScript Turned Off */ /* JavaScript Turned Off */
.no-js #loader-wrapper { .no-js #loader-wrapper {
display: none; display: none;
} }
.no-js h1 { .no-js h1 {
color: #222222; color: #222222;
} }
#loader-wrapper .load_title { #loader-wrapper .load_title {
font-family: 'Open Sans'; font-family: 'Open Sans';
color: #FFF; color: #FFF;
@@ -213,6 +230,7 @@
opacity: 1; opacity: 1;
line-height: 30px; line-height: 30px;
} }
#loader-wrapper .load_title span { #loader-wrapper .load_title span {
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
@@ -220,26 +238,37 @@
color: #FFF; color: #FFF;
opacity: 0.5; opacity: 0.5;
} }
/* 滚动条优化 start */ /* 滚动条优化 start */
::-webkit-scrollbar{ ::-webkit-scrollbar {
width:8px; width: 8px;
height:8px; height: 8px;
} }
::-webkit-scrollbar-track{
::-webkit-scrollbar-track {
background: #f6f6f6; background: #f6f6f6;
border-radius:2px; border-radius: 2px;
} }
::-webkit-scrollbar-thumb{
::-webkit-scrollbar-thumb {
background: #cdcdcd; background: #cdcdcd;
border-radius:2px; border-radius: 2px;
} }
::-webkit-scrollbar-thumb:hover{
::-webkit-scrollbar-thumb:hover {
background: #747474; background: #747474;
} }
::-webkit-scrollbar-corner { ::-webkit-scrollbar-corner {
background: #f6f6f6; background: #f6f6f6;
} }
/* 滚动条优化 end */ /* 滚动条优化 end */
/*tooltip宽度调整*/
.ant-tooltip {
max-width: 500px !important;
}
</style> </style>
<!-- 全局配置 --> <!-- 全局配置 -->
</head> </head>
src/api/documentToolApi.js
+3
View File
@@ -9,6 +9,8 @@ const changePermission = (params) => postAction('/split/sarFileSplitInfo/updateP
const withdraw = (params) => postAction('/laws/DocumentTool/documentSplit/revocation', params) const withdraw = (params) => postAction('/laws/DocumentTool/documentSplit/revocation', params)
// 文档拆分-查看 // 文档拆分-查看
const previewDocSplit = (params) => postAction('/laws/DocumentTool/documentSplit/queryView', params) const previewDocSplit = (params) => postAction('/laws/DocumentTool/documentSplit/queryView', params)
// 文档拆分-导入拆分结果
const importSplitResult = (params) => postAction('/split/sarFileSplitItems/importSplitResult', params)
// 文档拆分-拆分已入库文本-拆分 // 文档拆分-拆分已入库文本-拆分
const addDocSplit = (params) => postAction('/split/sarFileSplitInfo/add', params) const addDocSplit = (params) => postAction('/split/sarFileSplitInfo/add', params)
@@ -78,6 +80,7 @@ export {
changePermission, changePermission,
withdraw, withdraw,
previewDocSplit, previewDocSplit,
importSplitResult,
// 文档拆分-详情 // 文档拆分-详情
getDocSplitTableHeader, getDocSplitTableHeader,
src/permission.js
+1 -1
View File
@@ -14,7 +14,7 @@ whiteList.push(OAUTH2_LOGIN_PAGE_PATH)
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
// 单点登录 // 单点登录
if (to.query.code) { if (to.query.code && top.frames.length > 0) {
const result = await getSSOUserInfo({ code: to.query.code }) const result = await getSSOUserInfo({ code: to.query.code })
const userInfo = result.userInfo const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
src/views/documentTool/documentComparison/ComparisonResults.vue
+16 -62
View File
@@ -38,9 +38,9 @@
</a-button> </a-button>
</template> </template>
<div class="detail-content"> <div class="result-content">
<div class="detail-content-header"> <div class="result-content-header">
<a-checkbox @change="onChange" :indeterminate="indeterminate" :checked="checkAll" style="margin-left: 20px;float: left"></a-checkbox> <a-checkbox @change="onChange" :indeterminate="indeterminate" :checked="checkAll"></a-checkbox>
<div class="detail-content-header-content"> <div class="detail-content-header-content">
<div class="detail-content-header-content-left" <div class="detail-content-header-content-left"
:title="resultData.serialNumberLeft + resultData.fileNameLeft" :title="resultData.serialNumberLeft + resultData.fileNameLeft"
@@ -356,63 +356,24 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.doc-detail-wrap {
.doc-detail-header {
width: 100%;
z-index: 1000;
height: 68px;
line-height: 68px;
padding: 0 0 0 32px;
box-sizing: border-box;
display: flex;
justify-content: space-between;
border-bottom: 2px #eff1f3 solid;
background: #fff;
position: fixed;
top: 0;
.doc-detail-title { .result-content {
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
font-size: 20px;
font-weight: 400;
color: #040B29;
line-height: 68px;
}
}
.doc-detail-right {
width: 600px;
line-height: 68px;
display: flex;
.operator-text-text {
cursor: pointer;
margin-right: 53px;
font-size: 14px;
font-weight: 400;
color: #040B29;
display: inline-block;
width: 33.3%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
text-align: right;
}
}
}
.operator-text-text-text {
color: #00B3BE !important;
}
.detail-content {
padding: 24px 32px 0 32px; padding: 24px 32px 0 32px;
box-sizing: border-box; box-sizing: border-box;
background: #fff; background: #fff;
height: 100%; height: 100%;
&-header {
width: 100%;
height: 56px;
line-height: 56px;
margin-bottom: 20px;
}
&-header > .ant-checkbox-wrapper {
margin-left: 20px;
float: left;
}
} }
.scroll-content { .scroll-content {
@@ -420,13 +381,6 @@ export default {
overflow: auto; overflow: auto;
} }
.detail-content-header {
width: 100%;
height: 56px;
line-height: 56px;
margin-bottom: 20px;
}
.detail-content-header-content { .detail-content-header-content {
width: calc(100% - 56px); width: calc(100% - 56px);
margin-left: 20px; margin-left: 20px;
src/views/documentTool/documentComparison/DocumentDataComparison.vue
+43 -114
View File
@@ -58,7 +58,8 @@
</a-tree> </a-tree>
</div> </div>
</div> </div>
<div class="detail-content-content-right-top"> <!--左侧标准信息-->
<div class="detail-content-left-container">
<!--标准名称--> <!--标准名称-->
<div class="standard-name"> <div class="standard-name">
<a-tooltip placement="topLeft"> <a-tooltip placement="topLeft">
@@ -68,19 +69,21 @@
<span>{{ resultData.serialNumberLeft }} {{ resultData.fileNameLeft }}</span> <span>{{ resultData.serialNumberLeft }} {{ resultData.fileNameLeft }}</span>
</a-tooltip> </a-tooltip>
</div> </div>
<div class="detail-content-content-right"> <div class="detail-content-left-scroll">
<div class="detail-content-content-right-data" @click="detailLeft(index,item)" <div class="detail-content-left-item" @click="detailLeft(index,item)"
v-for="(item,index) in resultData.textLeft" :key="index" v-for="(item,index) in resultData.textLeft" :key="index"
:class="{'detail-content-content-right-data-color': leftHighlightMenuId === item.menuId,'detail-content-content-right-data-blue':item.reviewed === '1'}"> :class="{'detail-content-item-selected': leftHighlightMenuId === item.menuId,'detail-content-item-saved':item.reviewed === '1'}">
<div class="detail-content-content-right-data-text" style="margin-bottom: 10px;color: #040B29"> <div class="detail-content-item-text" style="margin-bottom: 10px;color: #040B29">
{{ item.itemsNum + ' ' + item.itemsName }} {{ item.itemsNum + ' ' + item.itemsName }}
</div> </div>
<div class="detail-content-content-right-data-text" v-html="item.itemsText"></div> <div class="detail-content-item-text" v-html="item.itemsText"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--右侧文档-->
<div class="detail-content-right"> <div class="detail-content-right">
<!--右侧目录-->
<div class="standard-catalogue part-common" :class="{'hide-catalogue': !rightCatalogueShow}"> <div class="standard-catalogue part-common" :class="{'hide-catalogue': !rightCatalogueShow}">
<div class="catalogue-show" @click="changeRightCatalogueShow"> <div class="catalogue-show" @click="changeRightCatalogueShow">
<a-icon :type="rightCatalogueShow ? 'left' : 'right'" /> <a-icon :type="rightCatalogueShow ? 'left' : 'right'" />
@@ -101,7 +104,8 @@
</a-tree> </a-tree>
</div> </div>
</div> </div>
<div class="detail-content-content-right-right-top"> <!--右侧标准信息-->
<div class="detail-content-right-container">
<!--标准名称--> <!--标准名称-->
<div class="standard-name"> <div class="standard-name">
<a-tooltip placement="topLeft"> <a-tooltip placement="topLeft">
@@ -111,14 +115,14 @@
<span>{{ resultData.serialNumberRight }} {{ resultData.fileNameRight }}</span> <span>{{ resultData.serialNumberRight }} {{ resultData.fileNameRight }}</span>
</a-tooltip> </a-tooltip>
</div> </div>
<div class="detail-content-content-right-right"> <div class="detail-content-right-scroll">
<div class="detail-content-content-right-data-right" @click="detailRight(index,item)" <div class="detail-content-right-item" @click="detailRight(index,item)"
v-for="(item,index) in resultData.textRight" :key="index" v-for="(item,index) in resultData.textRight" :key="index"
:class="{'detail-content-content-right-data-color-right': item.menuId === rightHighlightMenuId, 'detail-content-content-right-data-blue-right':item.reviewed === '1'}"> :class="{'detail-content-item-selected': item.menuId === rightHighlightMenuId, 'detail-content-item-saved':item.reviewed === '1'}">
<div class="detail-content-content-right-data-text" style="margin-bottom: 10px;color: #040B29"> <div class="detail-content-item-text" style="margin-bottom: 10px;color: #040B29">
{{ item.itemsNum + ' ' + item.itemsName }} {{ item.itemsNum + ' ' + item.itemsName }}
</div> </div>
<div class="detail-content-content-right-data-text" v-html="item.itemsText"> <div class="detail-content-item-text" v-html="item.itemsText">
</div> </div>
</div> </div>
</div> </div>
@@ -265,20 +269,17 @@ export default {
} }
this.resultData.textRight.forEach(val => { this.resultData.textRight.forEach(val => {
if (val.id === this.dataRight.id) { if (val.id === this.dataRight.id) {
val.reviewed = 1 val.reviewed = '1'
} }
}) })
this.resultData.textLeft.forEach(val => { this.resultData.textLeft.forEach(val => {
if (val.id === this.dataLeft.id) { if (val.id === this.dataLeft.id) {
val.reviewed = 1 val.reviewed = '1'
} }
}) })
this.resultData = { ...this.resultData } this.resultData = { ...this.resultData }
this.dataLeft = {} this.dataLeft = {}
this.dataRight = {} this.dataRight = {}
// this.$router.push({
// path: '/documentComparison'
// })
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
@@ -419,6 +420,7 @@ export default {
}, },
// 右侧树选中 // 右侧树选中
onSelectRight (selectedKeys, exports) { onSelectRight (selectedKeys, exports) {
debugger
const node = exports.node.$vnode.data.props.dataRef const node = exports.node.$vnode.data.props.dataRef
const index = this.resultData.textRight.findIndex(tt => tt.menuId === node.menuId) const index = this.resultData.textRight.findIndex(tt => tt.menuId === node.menuId)
this.dataRight = this.resultData.textRight[index] this.dataRight = this.resultData.textRight[index]
@@ -430,7 +432,7 @@ export default {
if (this.isMatching) { if (this.isMatching) {
const indexLeft = this.dataRight.targetStand const indexLeft = this.dataRight.targetStand
if (indexLeft > -1) { if (indexLeft > -1) {
this.dataLeft = this.resultData.textRight[indexLeft] this.dataLeft = this.resultData.textLeft[indexLeft]
this.dataLeft.numIndex = indexLeft this.dataLeft.numIndex = indexLeft
this.leftHighlightMenuId = this.dataLeft.menuId this.leftHighlightMenuId = this.dataLeft.menuId
this.leftTreeSelectedKeys = [this.dataLeft.menuId] this.leftTreeSelectedKeys = [this.dataLeft.menuId]
@@ -444,8 +446,8 @@ export default {
*/ */
handleJumpLeftData (index) { handleJumpLeftData (index) {
if (index > -1) { if (index > -1) {
const scrollContent = document.getElementsByClassName('detail-content-content-right') const scrollContent = document.getElementsByClassName('detail-content-left-scroll')
const clauseItemDom = document.getElementsByClassName('detail-content-content-right-data') const clauseItemDom = document.getElementsByClassName('detail-content-left-item')
scrollContent[0].scrollTop = clauseItemDom[index].offsetTop - 150 scrollContent[0].scrollTop = clauseItemDom[index].offsetTop - 150
} }
}, },
@@ -454,8 +456,8 @@ export default {
*/ */
handleJumpRightData (index) { handleJumpRightData (index) {
if (index > -1) { if (index > -1) {
const detailContent = document.getElementsByClassName('detail-content-content-right-right') const detailContent = document.getElementsByClassName('detail-content-right-scroll')
const detailRight = document.getElementsByClassName('detail-content-content-right-data-right') const detailRight = document.getElementsByClassName('detail-content-right-item')
detailContent[0].scrollTop = detailRight[index].offsetTop - 150 detailContent[0].scrollTop = detailRight[index].offsetTop - 150
} }
}, },
@@ -488,37 +490,6 @@ export default {
overflow: auto; overflow: auto;
} }
.doc-detail {
background: #fff;
height: 100%;
.doc-detail-wrap {
.doc-detail-header {
width: 100%;
z-index: 1000;
height: 68px;
line-height: 68px;
padding: 0 0 0 32px;
box-sizing: border-box;
display: flex;
justify-content: space-between;
border-bottom: 2px #eff1f3 solid;
background: #fff;
.doc-detail-title {
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
font-size: 20px;
font-weight: 400;
color: #040B29;
line-height: 68px;
}
}
}
}
.detail-content { .detail-content {
height: calc(100% - 131px); height: calc(100% - 131px);
background-color: #eff1f4; background-color: #eff1f4;
@@ -610,7 +581,7 @@ export default {
overflow: auto; overflow: auto;
} }
.detail-content-content-right-top { .detail-content-left-container {
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
transition: all 1s; transition: all 1s;
@@ -618,7 +589,7 @@ export default {
flex: 1; flex: 1;
} }
.detail-content-content-right-right-top { .detail-content-right-container {
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
transition: all 1s; transition: all 1s;
@@ -630,7 +601,7 @@ export default {
} }
} }
.detail-content-content-right { .detail-content-left-scroll {
height: calc(100% - 25px - 40px); height: calc(100% - 25px - 40px);
width: calc(100% - 20px); width: calc(100% - 20px);
display: inline-block; display: inline-block;
@@ -639,7 +610,7 @@ export default {
background-color: white; background-color: white;
} }
.detail-content-content-right-right { .detail-content-right-scroll {
height: calc(100% - 25px - 40px); height: calc(100% - 25px - 40px);
width: calc(100% - 10px); width: calc(100% - 10px);
display: inline-block; display: inline-block;
@@ -648,7 +619,7 @@ export default {
background-color: white; background-color: white;
} }
.detail-content-content-right-data { .detail-content-left-item {
padding: 16px 20px; padding: 16px 20px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #EFF1F3; border: 1px solid #EFF1F3;
@@ -656,7 +627,7 @@ export default {
background-color: white; background-color: white;
} }
.detail-content-content-right-data-right { .detail-content-right-item {
padding: 16px 20px; padding: 16px 20px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #EFF1F3; border: 1px solid #EFF1F3;
@@ -664,83 +635,41 @@ export default {
background-color: white; background-color: white;
} }
.detail-content-content-right-data:last-child { .detail-content-left-item:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.detail-content-content-right-data-text { .detail-content-item-text {
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
color: #040B29; color: #040B29;
word-break: break-word; word-break: break-word;
}
.detail-content-left-header-text { /deep/ table {
width: 100%; width: 100%;
white-space: nowrap; }
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
font-size: 16px;
font-family: Blue Sky Noto;
font-weight: 400;
color: #040B29;
}
.detail-content-left-header-text-right { /deep/ img {
text-align: right; max-width: 100%;
display: inline-block;
width: 200px;
float: right;
}
.doc-detail-right {
width: 600px;
line-height: 68px;
display: flex;
.doc-detail-btn {
margin-left: 10px;
} }
} }
.operator-text-text { .detail-content-item-selected {
cursor: pointer;
margin-right: 53px;
font-size: 14px;
font-weight: 400;
color: #040B29;
display: inline-block;
width: 33.3%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
text-align: right;
}
.detail-content-content-right-data-blue {
border: 2px #21c9cc solid;
}
.detail-content-content-right-data-blue-right {
border: 2px #21c9cc solid;
}
.detail-content-content-right-data-color {
border: 2px red solid; border: 2px red solid;
} }
.detail-content-content-right-data-color-right { .detail-content-item-saved {
border: 2px red solid; border: 2px #21c9cc solid;
} }
::v-deep .delClass { ::v-deep .delClass {
background: #ff7168; color: #ff7168;
font-weight: 700; font-weight: 700;
} }
::v-deep .insertClass { ::v-deep .insertClass {
background: rgba(85, 183, 255, .6); color: green;
font-weight: 700; font-weight: 700;
} }
src/views/documentTool/documentSplit/DocumentSplit.vue
+4 -6
View File
@@ -45,7 +45,7 @@
$t('docTool.split.splitText') $t('docTool.split.splitText')
}} }}
</a-button> </a-button>
<!--TODO 导入拆分结果--> <!--导入拆分结果-->
<a-button icon="download" type="primary" ghost @click="handleExport" v-has="'split:sarFileSplitInfo:splitResult'"> <a-button icon="download" type="primary" ghost @click="handleExport" v-has="'split:sarFileSplitInfo:splitResult'">
{{ $t('docTool.split.importResults') }} {{ $t('docTool.split.importResults') }}
</a-button> </a-button>
@@ -88,12 +88,11 @@
import '../../../assets/less/common.less' import '../../../assets/less/common.less'
import JTable from '../../../components/jero/JTable.vue' import JTable from '../../../components/jero/JTable.vue'
import SplitText from './modules/SplitText.vue' import SplitText from './modules/SplitText.vue'
import { JeroListMixin } from '../../../mixins/JeroListMixin.js' import { JeroListMixin } from '@/mixins/JeroListMixin'
import { releaseSplitStandard, changePermission, withdraw } from '../../../api/documentToolApi.js' import { releaseSplitStandard, changePermission, withdraw } from '@api/documentToolApi'
import ImportSplitResultModal from './modules/ImportSplitResultModal.vue' import ImportSplitResultModal from './modules/ImportSplitResultModal.vue'
import UserSelectModal from '../../../components/selection/UserSelectModal.vue' import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
import { SplitStatus } from '../../../enums/commonEnums.js' import { SplitStatus } from '@/enums/commonEnums'
import { mapState } from 'vuex'
export default { export default {
name: 'DocumentSplit', name: 'DocumentSplit',
@@ -212,7 +211,6 @@ export default {
list: '/laws/DocumentTool/documentSplit/queryByPage', // 表格数据 list: '/laws/DocumentTool/documentSplit/queryByPage', // 表格数据
deleteBatch: '/laws/DocumentTool/documentSplit/deleteBatch', // 批量删除 deleteBatch: '/laws/DocumentTool/documentSplit/deleteBatch', // 批量删除
delete: '/laws/DocumentTool/documentSplit/delete', delete: '/laws/DocumentTool/documentSplit/delete',
backDocument: '' // 回传至文档库
} }
} }
}, },
src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+1 -1
View File
@@ -89,7 +89,7 @@
type="primary" type="primary"
ghost ghost
v-has="'split:sarFileSplitItems:export'" v-has="'split:sarFileSplitItems:export'"
@click="handleExportXls($t('standardRegulationLibrary.domesticStandard.exportFileName'))"> @click="handleExportXls($t('standardRegulationLibrary.domesticStandard.exportFileName'), 'zip')">
{{ $t('export') }} {{ $t('export') }}
</a-button> </a-button>
<!--批量删除--> <!--批量删除-->
src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
+85 -48
View File
@@ -11,42 +11,54 @@
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel"> @cancel="handleCancel">
<a-form :form="form"> <a-spin :spinning="confirmLoading">
<!--标准号--> <a-form :form="form">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardNumber')"> <!--标准号-->
<standard-selection :placeholder="$t('pleaseSelect') + $t('standardSelect.standardNumber')" <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardNumber')">
v-decorator="['projectSource', validatorRules.projectSource]" /> <standard-selection :placeholder="$t('pleaseSelect') + $t('standardSelect.standardNumber')"
</a-form-item> type="radio"
<!--标准名称--> @nameChange="handleStandardNumberChange"
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')"> v-decorator="['standardNumber', validatorRules.standardNumber]" />
<a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')" </a-form-item>
@change="event => event.target.value = event.target.value.trim()" <!--标准名称-->
:maxLength="50" <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')">
v-decorator="['projectName', validatorRules.projectName]" /> <a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')"
</a-form-item> @change="event => event.target.value = event.target.value.trim()"
<!--文本状态--> :maxLength="50"
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.comparison.textStatus')"> disabled
<j-dict-select-tag v-decorator="['projectSource', validatorRules.projectSource]" v-decorator="['standardName', validatorRules.standardName]" />
dict-code="process_manuscript" </a-form-item>
:placeholder="$t('pleaseSelect') + $t('docTool.comparison.textStatus')" /> <!--文本状态-->
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.comparison.textStatus')">
<!--拆分结果文件--> <j-dict-select-tag
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.split.splitResultFile')"> class="box-input"
<j-upload v-decorator="['resultFileId', validatorRules.resultFileId]" class="line-btn" /> v-decorator="['standardFileType', validatorRules.standardFileType]"
<a-button class="line-btn">{{ $t('templateDownload') }}</a-button> :placeholder="$t('pleaseSelect') + $t('docTool.comparison.textStatus')"
</a-form-item> :type="'select'"
</a-form> :triggerChange="false"
:dictCode="'process_manuscript'" />
</a-form-item>
<!--拆分结果文件-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.split.splitResultFile')">
<div class="result-file-box">
<j-upload v-decorator="['fileId', validatorRules.fileId]" return-id :number="1" class="line-btn" />
<a-button class="line-btn">{{ $t('templateDownload') }}</a-button>
</div>
</a-form-item>
</a-form>
<div class="tip"> <div class="tip">
<a-icon type="exclamation-circle" class="tip-icon" /> <a-icon type="exclamation-circle" class="tip-icon" />
<span>{{ $t('docTool.split.splitImportResultTip') }}</span> <span>{{ $t('docTool.split.splitImportResultTip') }}</span>
<span class="tip-click" @click="showTips">{{ $t('docTool.split.clickToView') }}</span> <span class="tip-click" @click="showTips">{{ $t('docTool.split.clickToView') }}</span>
</div> </div>
</a-spin>
</j-modal> </j-modal>
</template> </template>
<script> <script>
import StandardSelection from '../../../../components/selection/StandardSelection.vue' import StandardSelection from '../../../../components/selection/StandardSelection.vue'
import { importSplitResult } from '@api/documentToolApi'
export default { export default {
name: 'ImportSplitResultModal', name: 'ImportSplitResultModal',
@@ -66,29 +78,24 @@ export default {
sm: { span: 16 } sm: { span: 16 }
}, },
validatorRules: { validatorRules: {
// 项目来源 // 标准号
projectSource: { standardNumber: {
rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.nodeName') }], rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardSelect.standardNumber') }],
validateTrigger: 'change' validateTrigger: 'change'
}, },
// 项目名称 // 标准名称
projectName: { standardName: {
rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('projectLibrary.projectName') }], rules: [{ required: false, message: this.$t('pleaseEnter') + this.$t('standardSelect.standardName') }],
validateTrigger: 'blur' validateTrigger: 'blur'
}, },
// 工作令编号 // 文本状态
workNumber: { standardFileType: {
rules: [{ required: false, message: this.$t('pleaseEnter') + this.$t('projectLibrary.workOrderNumber') }], rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('docTool.comparison.textStatus') }],
validateTrigger: 'blur'
},
// 项目负责人
projectLeader: {
rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('projectLibrary.vehicleItemLibrary.projectLeader') }],
validateTrigger: 'change' validateTrigger: 'change'
}, },
// 项目健康度 // 拆分结果文件
projectHealth: { fileId: {
rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('projectLibrary.projectHealthStatus') }], rules: [{ required: true, message: this.$t('uploadFile.pleaseUpload') + this.$t('docTool.split.splitResultFile') }],
validateTrigger: 'change' validateTrigger: 'change'
} }
} }
@@ -99,13 +106,30 @@ export default {
this.visible = true this.visible = true
}, },
handleOk () { handleOk () {
this.form.validateFields((errors, values) => {
if (!errors) {
this.confirmLoading = true
const formData = values
importSplitResult(formData).then(res => {
if (res.success) {
this.$message.success(res.message)
this.$emit('ok')
this.close()
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.confirmLoading = false
})
}
})
}, },
handleCancel () { handleCancel () {
this.close() this.close()
}, },
close () { close () {
this.visible = false this.visible = false
this.form.resetFields()
}, },
showTips () { showTips () {
this.$info({ this.$info({
@@ -122,6 +146,9 @@ export default {
return contentDomArr return contentDomArr
} }
}) })
},
handleStandardNumberChange (name) {
this.form.setFieldsValue({ standardName: name })
} }
} }
} }
@@ -149,4 +176,14 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.result-file-box {
display: flex;
align-items: baseline;
}
.result-file-box > div {
flex: 1;
width: 0;
}
</style> </style>