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
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 previewDocSplit = (params) => postAction('/laws/DocumentTool/documentSplit/queryView', params)
// 文档拆分-导入拆分结果
const importSplitResult = (params) => postAction('/split/sarFileSplitItems/importSplitResult', params)
// 文档拆分-拆分已入库文本-拆分
const addDocSplit = (params) => postAction('/split/sarFileSplitInfo/add', params)
@@ -78,6 +80,7 @@ export {
changePermission,
withdraw,
previewDocSplit,
importSplitResult,
// 文档拆分-详情
getDocSplitTableHeader,
src/permission.js
+1 -1
View File
@@ -14,7 +14,7 @@ whiteList.push(OAUTH2_LOGIN_PAGE_PATH)
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 userInfo = result.userInfo
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>
</template>
<div class="detail-content">
<div class="detail-content-header">
<a-checkbox @change="onChange" :indeterminate="indeterminate" :checked="checkAll" style="margin-left: 20px;float: left"></a-checkbox>
<div class="result-content">
<div class="result-content-header">
<a-checkbox @change="onChange" :indeterminate="indeterminate" :checked="checkAll"></a-checkbox>
<div class="detail-content-header-content">
<div class="detail-content-header-content-left"
:title="resultData.serialNumberLeft + resultData.fileNameLeft"
@@ -356,63 +356,24 @@ export default {
</script>
<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 {
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 {
.result-content {
padding: 24px 32px 0 32px;
box-sizing: border-box;
background: #fff;
height: 100%;
&-header {
width: 100%;
height: 56px;
line-height: 56px;
margin-bottom: 20px;
}
&-header > .ant-checkbox-wrapper {
margin-left: 20px;
float: left;
}
}
.scroll-content {
@@ -420,13 +381,6 @@ export default {
overflow: auto;
}
.detail-content-header {
width: 100%;
height: 56px;
line-height: 56px;
margin-bottom: 20px;
}
.detail-content-header-content {
width: calc(100% - 56px);
margin-left: 20px;
src/views/documentTool/documentComparison/DocumentDataComparison.vue
+43 -114
View File
@@ -58,7 +58,8 @@
</a-tree>
</div>
</div>
<div class="detail-content-content-right-top">
<!--左侧标准信息-->
<div class="detail-content-left-container">
<!--标准名称-->
<div class="standard-name">
<a-tooltip placement="topLeft">
@@ -68,19 +69,21 @@
<span>{{ resultData.serialNumberLeft }} {{ resultData.fileNameLeft }}</span>
</a-tooltip>
</div>
<div class="detail-content-content-right">
<div class="detail-content-content-right-data" @click="detailLeft(index,item)"
<div class="detail-content-left-scroll">
<div class="detail-content-left-item" @click="detailLeft(index,item)"
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'}">
<div class="detail-content-content-right-data-text" style="margin-bottom: 10px;color: #040B29">
:class="{'detail-content-item-selected': leftHighlightMenuId === item.menuId,'detail-content-item-saved':item.reviewed === '1'}">
<div class="detail-content-item-text" style="margin-bottom: 10px;color: #040B29">
{{ item.itemsNum + ' ' + item.itemsName }}
</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 class="detail-content-right">
<!--右侧目录-->
<div class="standard-catalogue part-common" :class="{'hide-catalogue': !rightCatalogueShow}">
<div class="catalogue-show" @click="changeRightCatalogueShow">
<a-icon :type="rightCatalogueShow ? 'left' : 'right'" />
@@ -101,7 +104,8 @@
</a-tree>
</div>
</div>
<div class="detail-content-content-right-right-top">
<!--右侧标准信息-->
<div class="detail-content-right-container">
<!--标准名称-->
<div class="standard-name">
<a-tooltip placement="topLeft">
@@ -111,14 +115,14 @@
<span>{{ resultData.serialNumberRight }} {{ resultData.fileNameRight }}</span>
</a-tooltip>
</div>
<div class="detail-content-content-right-right">
<div class="detail-content-content-right-data-right" @click="detailRight(index,item)"
<div class="detail-content-right-scroll">
<div class="detail-content-right-item" @click="detailRight(index,item)"
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'}">
<div class="detail-content-content-right-data-text" style="margin-bottom: 10px;color: #040B29">
:class="{'detail-content-item-selected': item.menuId === rightHighlightMenuId, 'detail-content-item-saved':item.reviewed === '1'}">
<div class="detail-content-item-text" style="margin-bottom: 10px;color: #040B29">
{{ item.itemsNum + ' ' + item.itemsName }}
</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>
@@ -265,20 +269,17 @@ export default {
}
this.resultData.textRight.forEach(val => {
if (val.id === this.dataRight.id) {
val.reviewed = 1
val.reviewed = '1'
}
})
this.resultData.textLeft.forEach(val => {
if (val.id === this.dataLeft.id) {
val.reviewed = 1
val.reviewed = '1'
}
})
this.resultData = { ...this.resultData }
this.dataLeft = {}
this.dataRight = {}
// this.$router.push({
// path: '/documentComparison'
// })
} else {
this.$message.warning(res.message)
}
@@ -419,6 +420,7 @@ export default {
},
// 右侧树选中
onSelectRight (selectedKeys, exports) {
debugger
const node = exports.node.$vnode.data.props.dataRef
const index = this.resultData.textRight.findIndex(tt => tt.menuId === node.menuId)
this.dataRight = this.resultData.textRight[index]
@@ -430,7 +432,7 @@ export default {
if (this.isMatching) {
const indexLeft = this.dataRight.targetStand
if (indexLeft > -1) {
this.dataLeft = this.resultData.textRight[indexLeft]
this.dataLeft = this.resultData.textLeft[indexLeft]
this.dataLeft.numIndex = indexLeft
this.leftHighlightMenuId = this.dataLeft.menuId
this.leftTreeSelectedKeys = [this.dataLeft.menuId]
@@ -444,8 +446,8 @@ export default {
*/
handleJumpLeftData (index) {
if (index > -1) {
const scrollContent = document.getElementsByClassName('detail-content-content-right')
const clauseItemDom = document.getElementsByClassName('detail-content-content-right-data')
const scrollContent = document.getElementsByClassName('detail-content-left-scroll')
const clauseItemDom = document.getElementsByClassName('detail-content-left-item')
scrollContent[0].scrollTop = clauseItemDom[index].offsetTop - 150
}
},
@@ -454,8 +456,8 @@ export default {
*/
handleJumpRightData (index) {
if (index > -1) {
const detailContent = document.getElementsByClassName('detail-content-content-right-right')
const detailRight = document.getElementsByClassName('detail-content-content-right-data-right')
const detailContent = document.getElementsByClassName('detail-content-right-scroll')
const detailRight = document.getElementsByClassName('detail-content-right-item')
detailContent[0].scrollTop = detailRight[index].offsetTop - 150
}
},
@@ -488,37 +490,6 @@ export default {
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 {
height: calc(100% - 131px);
background-color: #eff1f4;
@@ -610,7 +581,7 @@ export default {
overflow: auto;
}
.detail-content-content-right-top {
.detail-content-left-container {
height: 100%;
overflow-y: auto;
transition: all 1s;
@@ -618,7 +589,7 @@ export default {
flex: 1;
}
.detail-content-content-right-right-top {
.detail-content-right-container {
height: 100%;
overflow-y: auto;
transition: all 1s;
@@ -630,7 +601,7 @@ export default {
}
}
.detail-content-content-right {
.detail-content-left-scroll {
height: calc(100% - 25px - 40px);
width: calc(100% - 20px);
display: inline-block;
@@ -639,7 +610,7 @@ export default {
background-color: white;
}
.detail-content-content-right-right {
.detail-content-right-scroll {
height: calc(100% - 25px - 40px);
width: calc(100% - 10px);
display: inline-block;
@@ -648,7 +619,7 @@ export default {
background-color: white;
}
.detail-content-content-right-data {
.detail-content-left-item {
padding: 16px 20px;
box-sizing: border-box;
border: 1px solid #EFF1F3;
@@ -656,7 +627,7 @@ export default {
background-color: white;
}
.detail-content-content-right-data-right {
.detail-content-right-item {
padding: 16px 20px;
box-sizing: border-box;
border: 1px solid #EFF1F3;
@@ -664,83 +635,41 @@ export default {
background-color: white;
}
.detail-content-content-right-data:last-child {
.detail-content-left-item:last-child {
margin-bottom: 0;
}
.detail-content-content-right-data-text {
.detail-content-item-text {
font-size: 16px;
font-weight: 400;
color: #040B29;
word-break: break-word;
}
.detail-content-left-header-text {
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;
}
/deep/ table {
width: 100%;
}
.detail-content-left-header-text-right {
text-align: right;
display: inline-block;
width: 200px;
float: right;
}
.doc-detail-right {
width: 600px;
line-height: 68px;
display: flex;
.doc-detail-btn {
margin-left: 10px;
/deep/ img {
max-width: 100%;
}
}
.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;
}
.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 {
.detail-content-item-selected {
border: 2px red solid;
}
.detail-content-content-right-data-color-right {
border: 2px red solid;
.detail-content-item-saved {
border: 2px #21c9cc solid;
}
::v-deep .delClass {
background: #ff7168;
color: #ff7168;
font-weight: 700;
}
::v-deep .insertClass {
background: rgba(85, 183, 255, .6);
color: green;
font-weight: 700;
}
src/views/documentTool/documentSplit/DocumentSplit.vue
+4 -6
View File
@@ -45,7 +45,7 @@
$t('docTool.split.splitText')
}}
</a-button>
<!--TODO 导入拆分结果-->
<!--导入拆分结果-->
<a-button icon="download" type="primary" ghost @click="handleExport" v-has="'split:sarFileSplitInfo:splitResult'">
{{ $t('docTool.split.importResults') }}
</a-button>
@@ -88,12 +88,11 @@
import '../../../assets/less/common.less'
import JTable from '../../../components/jero/JTable.vue'
import SplitText from './modules/SplitText.vue'
import { JeroListMixin } from '../../../mixins/JeroListMixin.js'
import { releaseSplitStandard, changePermission, withdraw } from '../../../api/documentToolApi.js'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import { releaseSplitStandard, changePermission, withdraw } from '@api/documentToolApi'
import ImportSplitResultModal from './modules/ImportSplitResultModal.vue'
import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
import { SplitStatus } from '../../../enums/commonEnums.js'
import { mapState } from 'vuex'
import { SplitStatus } from '@/enums/commonEnums'
export default {
name: 'DocumentSplit',
@@ -212,7 +211,6 @@ export default {
list: '/laws/DocumentTool/documentSplit/queryByPage', // 表格数据
deleteBatch: '/laws/DocumentTool/documentSplit/deleteBatch', // 批量删除
delete: '/laws/DocumentTool/documentSplit/delete',
backDocument: '' // 回传至文档库
}
}
},
src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+1 -1
View File
@@ -89,7 +89,7 @@
type="primary"
ghost
v-has="'split:sarFileSplitItems:export'"
@click="handleExportXls($t('standardRegulationLibrary.domesticStandard.exportFileName'))">
@click="handleExportXls($t('standardRegulationLibrary.domesticStandard.exportFileName'), 'zip')">
{{ $t('export') }}
</a-button>
<!--批量删除-->
src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
+85 -48
View File
@@ -11,42 +11,54 @@
@ok="handleOk"
@cancel="handleCancel">
<a-form :form="form">
<!--标准号-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardNumber')">
<standard-selection :placeholder="$t('pleaseSelect') + $t('standardSelect.standardNumber')"
v-decorator="['projectSource', validatorRules.projectSource]" />
</a-form-item>
<!--标准名称-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')">
<a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')"
@change="event => event.target.value = event.target.value.trim()"
:maxLength="50"
v-decorator="['projectName', validatorRules.projectName]" />
</a-form-item>
<!--文本状态-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.comparison.textStatus')">
<j-dict-select-tag v-decorator="['projectSource', validatorRules.projectSource]"
dict-code="process_manuscript"
:placeholder="$t('pleaseSelect') + $t('docTool.comparison.textStatus')" />
</a-form-item>
<!--拆分结果文件-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.split.splitResultFile')">
<j-upload v-decorator="['resultFileId', validatorRules.resultFileId]" class="line-btn" />
<a-button class="line-btn">{{ $t('templateDownload') }}</a-button>
</a-form-item>
</a-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')"
type="radio"
@nameChange="handleStandardNumberChange"
v-decorator="['standardNumber', validatorRules.standardNumber]" />
</a-form-item>
<!--标准名称-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')">
<a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')"
@change="event => event.target.value = event.target.value.trim()"
:maxLength="50"
disabled
v-decorator="['standardName', validatorRules.standardName]" />
</a-form-item>
<!--文本状态-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.comparison.textStatus')">
<j-dict-select-tag
class="box-input"
v-decorator="['standardFileType', validatorRules.standardFileType]"
:placeholder="$t('pleaseSelect') + $t('docTool.comparison.textStatus')"
:type="'select'"
: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">
<a-icon type="exclamation-circle" class="tip-icon" />
<span>{{ $t('docTool.split.splitImportResultTip') }}</span>
<span class="tip-click" @click="showTips">{{ $t('docTool.split.clickToView') }}</span>
</div>
<div class="tip">
<a-icon type="exclamation-circle" class="tip-icon" />
<span>{{ $t('docTool.split.splitImportResultTip') }}</span>
<span class="tip-click" @click="showTips">{{ $t('docTool.split.clickToView') }}</span>
</div>
</a-spin>
</j-modal>
</template>
<script>
import StandardSelection from '../../../../components/selection/StandardSelection.vue'
import { importSplitResult } from '@api/documentToolApi'
export default {
name: 'ImportSplitResultModal',
@@ -66,29 +78,24 @@ export default {
sm: { span: 16 }
},
validatorRules: {
// 项目来源
projectSource: {
rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.nodeName') }],
// 标准号
standardNumber: {
rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardSelect.standardNumber') }],
validateTrigger: 'change'
},
// 项目名称
projectName: {
rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('projectLibrary.projectName') }],
// 标准名称
standardName: {
rules: [{ required: false, message: this.$t('pleaseEnter') + this.$t('standardSelect.standardName') }],
validateTrigger: 'blur'
},
// 工作令编号
workNumber: {
rules: [{ required: false, message: this.$t('pleaseEnter') + this.$t('projectLibrary.workOrderNumber') }],
validateTrigger: 'blur'
},
// 项目负责人
projectLeader: {
rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('projectLibrary.vehicleItemLibrary.projectLeader') }],
// 文本状态
standardFileType: {
rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('docTool.comparison.textStatus') }],
validateTrigger: 'change'
},
// 项目健康度
projectHealth: {
rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('projectLibrary.projectHealthStatus') }],
// 拆分结果文件
fileId: {
rules: [{ required: true, message: this.$t('uploadFile.pleaseUpload') + this.$t('docTool.split.splitResultFile') }],
validateTrigger: 'change'
}
}
@@ -99,13 +106,30 @@ export default {
this.visible = true
},
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 () {
this.close()
},
close () {
this.visible = false
this.form.resetFields()
},
showTips () {
this.$info({
@@ -122,6 +146,9 @@ export default {
return contentDomArr
}
})
},
handleStandardNumberChange (name) {
this.form.setFieldsValue({ standardName: name })
}
}
}
@@ -149,4 +176,14 @@ export default {
cursor: pointer;
}
}
.result-file-box {
display: flex;
align-items: baseline;
}
.result-file-box > div {
flex: 1;
width: 0;
}
</style>