BYD/structureplugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2024-03-07 10:22:21 +08:00
parent 444cd13bf7 9bd41a0aeb
commit 1c3eaf73d4
12 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/InternalDetailPage.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="page-title"> <div class="page-title">
<slot name="customIcon" v-if="customIcon" /> <slot name="customIcon" v-if="customIcon" />
<i class="iconfont icon-chexiao" v-else @click="handleBack" /> <i class="iconfont icon-chexiao" v-else @click="handleBack" />
<div class="page-title-text"> <div class="page-title-text" :title="title">
{{ title }} {{ title }}
<a-tooltip v-if="subTitleTooltip"> <a-tooltip v-if="subTitleTooltip">
<template slot="title">{{ subTitle }}</template> <template slot="title">{{ subTitle }}</template>
jero-web/src/components/selection/StandardSelection.vue
+1 -1
View File
@@ -6,7 +6,7 @@
:title="value" :title="value"
@input="indexClick($event)" @input="indexClick($event)"
:disabled="disabled || selectOnly" :disabled="disabled || selectOnly"
:max-length="500" :max-length="200"
@change="event => event.target.value = event.target.value.trim()" @change="event => event.target.value = event.target.value.trim()"
:placeholder="placeholder"/> :placeholder="placeholder"/>
<a-button v-if="!disabled" type="primary" class="button-box" @click="standardClick"> <a-button v-if="!disabled" type="primary" class="button-box" @click="standardClick">
jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue
+6 -6
View File
@@ -118,7 +118,7 @@ export default {
columns: [ columns: [
// 旧文档文本号 // 旧文档文本号
{ {
title: '标准编号1', title: '旧标准编号',
dataIndex: 'serialNumberLeft', dataIndex: 'serialNumberLeft',
width: 170, width: 170,
ellipsis: true, ellipsis: true,
@@ -126,34 +126,34 @@ export default {
}, },
// 旧文档文本名称 // 旧文档文本名称
{ {
title: '标准名称1', title: '旧标准名称',
dataIndex: 'titleLeft', dataIndex: 'titleLeft',
width: 170, width: 170,
scopedSlots: { customRender: 'oldTextDetail' } scopedSlots: { customRender: 'oldTextDetail' }
}, },
// 旧文本状态 // 旧文本状态
{ {
title: '文本状态', title: '旧文本状态',
width: 150, width: 150,
dataIndex: 'fileTypeLeft_dictText' dataIndex: 'fileTypeLeft_dictText'
}, },
// 新文档文本号 // 新文档文本号
{ {
title: '标准编号2', title: '新标准编号',
dataIndex: 'serialNumberRight', dataIndex: 'serialNumberRight',
width: 170, width: 170,
scopedSlots: { customRender: 'newTextDetail' } scopedSlots: { customRender: 'newTextDetail' }
}, },
// 新文档文本名称 // 新文档文本名称
{ {
title: '标准名称2', title: '新标准名称',
dataIndex: 'titleRight', dataIndex: 'titleRight',
width: 170, width: 170,
scopedSlots: { customRender: 'newTextDetail' } scopedSlots: { customRender: 'newTextDetail' }
}, },
// 新文本状态 // 新文本状态
{ {
title: '文本状态', title: '新文本状态',
width: 150, width: 150,
dataIndex: 'fileTypeRight_dictText' dataIndex: 'fileTypeRight_dictText'
}, },
jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
+3 -3
View File
@@ -81,7 +81,7 @@
<div @click="closeView(item)" class="addRemarkBtn" v-show="item.closeBtn"> <div @click="closeView(item)" class="addRemarkBtn" v-show="item.closeBtn">
<a-icon type="close-circle" class="iconClass"/></div> <a-icon type="close-circle" class="iconClass"/></div>
</div> </div>
<div v-if="item.addModalState"> <div v-if="item.addModalState" style="margin-top: 18px">
<a-textarea <a-textarea
v-model.trim="item.remark" v-model.trim="item.remark"
:maxlength="500" :maxlength="500"
@@ -165,7 +165,7 @@
<div @click="closeView(item)" class="addRemarkBtn" v-show="item.closeBtn"> <div @click="closeView(item)" class="addRemarkBtn" v-show="item.closeBtn">
<a-icon type="close-circle" class="iconClass"/></div> <a-icon type="close-circle" class="iconClass"/></div>
</div> </div>
<div v-if="item.addModalState"> <div v-if="item.addModalState" style="margin-top: 18px">
<a-textarea <a-textarea
v-model.trim="item.remark" v-model.trim="item.remark"
:maxlength="500" :maxlength="500"
@@ -844,7 +844,7 @@ export default {
.addRemarkBtn{ .addRemarkBtn{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: -10px; right: -19px;
/*z-index: 10;*/ /*z-index: 10;*/
} }
.iconClass{ .iconClass{
jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue
+40 -40
View File
@@ -6,14 +6,14 @@
<a-form layout="inline" @keyup.enter.native="searchQueryLeft"> <a-form layout="inline" @keyup.enter.native="searchQueryLeft">
<a-row> <a-row>
<a-col :md="8" :sm="8"> <a-col :md="8" :sm="8">
<a-form-item :label="$t('number')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="标准编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('number')" <a-input :placeholder="$t('pleaseEnter')+'标准编号'"
v-model="queryParamLeft.serialNumber"></a-input> v-model="queryParamLeft.serialNumber"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="8" :sm="8"> <a-col :md="8" :sm="8">
<a-form-item :label="$t('title')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="'标准名称'" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('title')" <a-input :placeholder="$t('pleaseEnter')+'标准名称'"
v-model="queryParamLeft.title"></a-input> v-model="queryParamLeft.title"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -41,33 +41,33 @@
@change="tableChangeLeft" @change="tableChangeLeft"
> >
</j-table> </j-table>
<div class="box-button-standard"> <!-- <div class="box-button-standard">-->
<span class="box-button-standard-left" :title="$t('docTool.comparison.selectedStandard')"> <!-- <span class="box-button-standard-left" :title="$t('docTool.comparison.selectedStandard')">-->
{{ $t('docTool.comparison.selectedStandard') }} <!-- {{ $t('docTool.comparison.selectedStandard') }}-->
</span> <!-- </span>-->
<span class="box-button-standard-right" <!-- <span class="box-button-standard-right"-->
@click="selectLeftClick(selectedRowsLeft[0])" <!-- @click="selectLeftClick(selectedRowsLeft[0])"-->
:title="selectedRowsLeft[0]?selectedRowsLeft[0].serialNumber+' '+selectedRowsLeft[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')" <!-- :title="selectedRowsLeft[0]?selectedRowsLeft[0].serialNumber+' '+selectedRowsLeft[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"-->
:class="{'box-button-standard-right-color':selectedRowsLeft[0]}"> <!-- :class="{'box-button-standard-right-color':selectedRowsLeft[0]}">-->
{{ <!-- {{-->
selectedRowsLeft[0] ? selectedRowsLeft[0].serialNumber + ' ' + selectedRowsLeft[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected') <!-- selectedRowsLeft[0] ? selectedRowsLeft[0].serialNumber + ' ' + selectedRowsLeft[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')-->
}} <!-- }}-->
</span> <!-- </span>-->
</div> <!-- </div>-->
</div> </div>
<div class="detail-content-right"> <div class="detail-content-right">
<a-form layout="inline" @keyup.enter.native="searchQueryRight"> <a-form layout="inline" @keyup.enter.native="searchQueryRight">
<a-row> <a-row>
<a-col :md="8" :sm="8"> <a-col :md="8" :sm="8">
<a-form-item :label="$t('number')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="'标准编号'" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('number')" <a-input :placeholder="$t('pleaseEnter')+'标准编号'"
@change="event => event.target.value = event.target.value.trim()" @change="event => event.target.value = event.target.value.trim()"
v-model="queryParamRight.serialNumber"></a-input> v-model="queryParamRight.serialNumber"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="8" :sm="8"> <a-col :md="8" :sm="8">
<a-form-item :label="$t('title')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="'标准名称'" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('title')" <a-input :placeholder="$t('pleaseEnter')+'标准名称'"
@change="event => event.target.value = event.target.value.trim()" @change="event => event.target.value = event.target.value.trim()"
v-model="queryParamRight.title"></a-input> v-model="queryParamRight.title"></a-input>
</a-form-item> </a-form-item>
@@ -96,19 +96,19 @@
@change="tableChangeRight" @change="tableChangeRight"
> >
</j-table> </j-table>
<div class="box-button-standard"> <!-- <div class="box-button-standard">-->
<span class="box-button-standard-left" :title="$t('docTool.comparison.selectedStandard')"> <!-- <span class="box-button-standard-left" :title="$t('docTool.comparison.selectedStandard')">-->
{{ $t('docTool.comparison.selectedStandard') }} <!-- {{ $t('docTool.comparison.selectedStandard') }}-->
</span> <!-- </span>-->
<span class="box-button-standard-right" <!-- <span class="box-button-standard-right"-->
@click="selectLeftClick(selectedRowsRight[0])" <!-- @click="selectLeftClick(selectedRowsRight[0])"-->
:title="selectedRowsRight[0]?selectedRowsRight[0].serialNumber+' '+selectedRowsRight[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')" <!-- :title="selectedRowsRight[0]?selectedRowsRight[0].serialNumber+' '+selectedRowsRight[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"-->
:class="{'box-button-standard-right-color':selectedRowsRight[0]}"> <!-- :class="{'box-button-standard-right-color':selectedRowsRight[0]}">-->
{{ <!-- {{-->
selectedRowsRight[0] ? selectedRowsRight[0].serialNumber + ' ' + selectedRowsRight[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected') <!-- selectedRowsRight[0] ? selectedRowsRight[0].serialNumber + ' ' + selectedRowsRight[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')-->
}} <!-- }}-->
</span> <!-- </span>-->
</div> <!-- </div>-->
</div> </div>
</div> </div>
@@ -163,10 +163,10 @@ export default {
return { return {
loading: false, loading: false,
labelCol: { labelCol: {
span: 6 span: 8
}, },
wrapperCol: { wrapperCol: {
span: 18 span: 16
}, },
loadingLeft: false, loadingLeft: false,
queryParamLeft: {}, queryParamLeft: {},
@@ -221,13 +221,13 @@ export default {
} }
}, },
{ {
title: this.$t('number'), title: '标准编号',
ellipsis: true, ellipsis: true,
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
width: 100 width: 100
}, },
{ {
title: this.$t('title'), title: '标准名称',
ellipsis: true, ellipsis: true,
dataIndex: 'title', dataIndex: 'title',
width: 100 width: 100
@@ -254,13 +254,13 @@ export default {
} }
}, },
{ {
title: this.$t('number'), title: '标准编号',
ellipsis: true, ellipsis: true,
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
width: 100 width: 100
}, },
{ {
title: this.$t('title'), title: '标准名称',
ellipsis: true, ellipsis: true,
dataIndex: 'title', dataIndex: 'title',
width: 100 width: 100
jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue
+1 -1
View File
@@ -274,7 +274,7 @@ export default {
this.loading = true this.loading = true
clauseComparisonEvent(query).then((res) => { clauseComparisonEvent(query).then((res) => {
if (res.success) { if (res.success) {
this.similarityDegree = res.result.similarityDegree + '%' this.similarityDegree = res.result.similarityDegree
if (parseFloat(res.result.similarityDegree) < parseFloat('75%')) { if (parseFloat(res.result.similarityDegree) < parseFloat('75%')) {
this.textContent = '不相似' this.textContent = '不相似'
} else if (parseFloat(res.result.similarityDegree) >= parseFloat('75%') && parseFloat(res.result.similarityDegree) !== parseFloat('100%')) { } else if (parseFloat(res.result.similarityDegree) >= parseFloat('75%') && parseFloat(res.result.similarityDegree) !== parseFloat('100%')) {
jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue
+1 -1
View File
@@ -306,6 +306,6 @@ export default {
.addRemarkBtn{ .addRemarkBtn{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: 0; right: -20px;
} }
</style> </style>
jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue
+2 -1
View File
@@ -74,10 +74,11 @@
@operationClick="operationClick"> @operationClick="operationClick">
<!--跳转标准详情--> <!--跳转标准详情-->
<!-- @click="toDetailPage(record)"-->
<template v-slot:detail="{text, record}"> <template v-slot:detail="{text, record}">
<a-tooltip overlay-class-name="tooltip-style"> <a-tooltip overlay-class-name="tooltip-style">
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template> <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
<div class="table-text can-click-table-text" v-if="text || text === 0" @click="toDetailPage(record)">{{ text }}</div> <div class="table-text" v-if="text || text === 0">{{ text }}</div>
<div v-else class="table-text">{{ global.emptyLine }}</div> <div v-else class="table-text">{{ global.emptyLine }}</div>
</a-tooltip> </a-tooltip>
</template> </template>
jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+13 -7
View File
@@ -20,12 +20,12 @@
<a-icon class="parent-node-icon" <a-icon class="parent-node-icon"
type="folder" type="folder"
v-if="record.dataRef.children && record.dataRef.children.length > 0" /> v-if="record.dataRef.children && record.dataRef.children.length > 0" />
<a-tooltip> <!-- <a-tooltip arrowPointAtCenter placement="topLeft">-->
<template #title> <!-- <template #title>-->
{{ record.name }}{{ record.itemName }} <!-- {{ record.name }}{{ record.itemName }}-->
</template> <!-- </template>-->
<span class="tree-node-custom-title">{{ record.name }} {{ record.itemName }}</span> <span class="tree-node-custom-title" :title="record.name + record.itemName">{{ record.name }} {{ record.itemName }}</span>
</a-tooltip> <!-- </a-tooltip>-->
<div class="tree-operate-node-btn-box" <div class="tree-operate-node-btn-box"
:class="{'tree-operate-node-btn-box-hide': record.id !== mouseInNodeKey}"> :class="{'tree-operate-node-btn-box-hide': record.id !== mouseInNodeKey}">
<!--新增--> <!--新增-->
@@ -339,7 +339,13 @@ export default {
computed: { computed: {
// 页面标题是标准名称 // 页面标题是标准名称
pageTitle () { pageTitle () {
return this.$route.query.infoNumber + ' ' + this.$route.query.standardName let name = ''
if (this.$route.query.standardName) {
name = this.$route.query.infoNumber + ' ' + this.$route.query.standardName
} else {
name = this.$route.query.infoNumber
}
return name
}, },
yScrollHeight () { yScrollHeight () {
/** /**
jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
+1 -1
View File
@@ -31,7 +31,7 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')">
<a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')" <a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')"
@change="event => event.target.value = event.target.value.trim()" @change="event => event.target.value = event.target.value.trim()"
:maxLength="50" :maxLength="200"
v-decorator="['title', validatorRules.title]" /> v-decorator="['title', validatorRules.title]" />
</a-form-item> </a-form-item>
<!--文本状态--> <!--文本状态-->
jero-web/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue
+2
View File
@@ -76,6 +76,7 @@ export default {
add (nodeItem, infoId) { add (nodeItem, infoId) {
this.title = this.$t('add') this.title = this.$t('add')
this.form = {} this.form = {}
this.form = { ...this.form }
this.visible = true this.visible = true
this.nodeItem = nodeItem this.nodeItem = nodeItem
this.infoId = infoId this.infoId = infoId
@@ -88,6 +89,7 @@ export default {
this.form.name = nodeItem.name this.form.name = nodeItem.name
this.form.itemName = nodeItem.itemName this.form.itemName = nodeItem.itemName
this.form.displaySeq = nodeItem.displaySeq this.form.displaySeq = nodeItem.displaySeq
this.form = { ...this.form }
this.infoId = infoId this.infoId = infoId
this.visible = true this.visible = true
}, },
jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
+3 -3
View File
@@ -31,7 +31,7 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')">
<a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')" <a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')"
@change="event => event.target.value = event.target.value.trim()" @change="event => event.target.value = event.target.value.trim()"
:maxLength="50" :maxLength="200"
v-decorator="['title', validatorRules.title]" /> v-decorator="['title', validatorRules.title]" />
</a-form-item> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="'拆分文档类型'"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="'拆分文档类型'">
@@ -123,12 +123,12 @@ export default {
validatorRules: { validatorRules: {
// 标准号 // 标准号
serialNumber: { serialNumber: {
rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardSelect.standardNumber') }], rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardSelect.standardNumber') }, { max: 200, message: '标准编号最大输入200字符' }],
validateTrigger: 'blur' validateTrigger: 'blur'
}, },
// 标准名称 // 标准名称
title: { title: {
rules: [{ required: false, message: this.$t('pleaseEnter') + this.$t('standardSelect.standardName') }], rules: [{ required: false, message: this.$t('pleaseEnter') + this.$t('standardSelect.standardName') }, { max: 200, message: '标准名称最大输入200字符' }],
validateTrigger: 'blur' validateTrigger: 'blur'
}, },
// 文本状态 // 文本状态