diff --git a/jero-web/src/components/InternalDetailPage.vue b/jero-web/src/components/InternalDetailPage.vue index edccef9..2105947 100644 --- a/jero-web/src/components/InternalDetailPage.vue +++ b/jero-web/src/components/InternalDetailPage.vue @@ -4,7 +4,7 @@
-
+
{{ title }} diff --git a/jero-web/src/components/selection/StandardSelection.vue b/jero-web/src/components/selection/StandardSelection.vue index 67ffcd9..844e4b1 100644 --- a/jero-web/src/components/selection/StandardSelection.vue +++ b/jero-web/src/components/selection/StandardSelection.vue @@ -6,7 +6,7 @@ :title="value" @input="indexClick($event)" :disabled="disabled || selectOnly" - :max-length="500" + :max-length="200" @change="event => event.target.value = event.target.value.trim()" :placeholder="placeholder"/> diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue index 45fc52e..cb230bb 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -118,7 +118,7 @@ export default { columns: [ // 旧文档文本号 { - title: '标准编号1', + title: '旧标准编号', dataIndex: 'serialNumberLeft', width: 170, ellipsis: true, @@ -126,34 +126,34 @@ export default { }, // 旧文档文本名称 { - title: '标准名称1', + title: '旧标准名称', dataIndex: 'titleLeft', width: 170, scopedSlots: { customRender: 'oldTextDetail' } }, // 旧文本状态 { - title: '文本状态', + title: '旧文本状态', width: 150, dataIndex: 'fileTypeLeft_dictText' }, // 新文档文本号 { - title: '标准编号2', + title: '新标准编号', dataIndex: 'serialNumberRight', width: 170, scopedSlots: { customRender: 'newTextDetail' } }, // 新文档文本名称 { - title: '标准名称2', + title: '新标准名称', dataIndex: 'titleRight', width: 170, scopedSlots: { customRender: 'newTextDetail' } }, // 新文本状态 { - title: '文本状态', + title: '新文本状态', width: 150, dataIndex: 'fileTypeRight_dictText' }, diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue index 6b19121..6382c02 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue @@ -81,7 +81,7 @@
-
+
-
+
- - + - - + @@ -41,33 +41,33 @@ @change="tableChangeLeft" > -
- - {{ $t('docTool.comparison.selectedStandard') }} - - - {{ - selectedRowsLeft[0] ? selectedRowsLeft[0].serialNumber + ' ' + selectedRowsLeft[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected') - }} - -
+ + + + + + + + + + + + +
- - + - - + @@ -96,19 +96,19 @@ @change="tableChangeRight" > -
- - {{ $t('docTool.comparison.selectedStandard') }} - - - {{ - selectedRowsRight[0] ? selectedRowsRight[0].serialNumber + ' ' + selectedRowsRight[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected') - }} - -
+ + + + + + + + + + + + +
@@ -163,10 +163,10 @@ export default { return { loading: false, labelCol: { - span: 6 + span: 8 }, wrapperCol: { - span: 18 + span: 16 }, loadingLeft: false, queryParamLeft: {}, @@ -221,13 +221,13 @@ export default { } }, { - title: this.$t('number'), + title: '标准编号', ellipsis: true, dataIndex: 'serialNumber', width: 100 }, { - title: this.$t('title'), + title: '标准名称', ellipsis: true, dataIndex: 'title', width: 100 @@ -254,13 +254,13 @@ export default { } }, { - title: this.$t('number'), + title: '标准编号', ellipsis: true, dataIndex: 'serialNumber', width: 100 }, { - title: this.$t('title'), + title: '标准名称', ellipsis: true, dataIndex: 'title', width: 100 diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue index 28fc3ea..045c953 100644 --- a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue +++ b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue @@ -274,7 +274,7 @@ export default { this.loading = true clauseComparisonEvent(query).then((res) => { if (res.success) { - this.similarityDegree = res.result.similarityDegree + '%' + this.similarityDegree = res.result.similarityDegree if (parseFloat(res.result.similarityDegree) < parseFloat('75%')) { this.textContent = '不相似' } else if (parseFloat(res.result.similarityDegree) >= parseFloat('75%') && parseFloat(res.result.similarityDegree) !== parseFloat('100%')) { diff --git a/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue b/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue index ad4bc02..78ecb59 100644 --- a/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue +++ b/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue @@ -306,6 +306,6 @@ export default { .addRemarkBtn{ position: absolute; bottom: 0; - right: 0; + right: -20px; } diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue index 1464f35..1ad9297 100644 --- a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue +++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue @@ -74,10 +74,11 @@ @operationClick="operationClick"> + diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue index 1d6ae11..7071c40 100644 --- a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue +++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue @@ -20,12 +20,12 @@ - - - {{ record.name }} {{ record.itemName }} - + + + + + {{ record.name }} {{ record.itemName }} +
@@ -339,7 +339,13 @@ export default { computed: { // 页面标题是标准名称 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 () { /** diff --git a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue index a20c6c3..7b25ac2 100644 --- a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue +++ b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue @@ -31,7 +31,7 @@ diff --git a/jero-web/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue b/jero-web/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue index 4161693..b2d8adc 100644 --- a/jero-web/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue +++ b/jero-web/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue @@ -76,6 +76,7 @@ export default { add (nodeItem, infoId) { this.title = this.$t('add') this.form = {} + this.form = { ...this.form } this.visible = true this.nodeItem = nodeItem this.infoId = infoId @@ -88,6 +89,7 @@ export default { this.form.name = nodeItem.name this.form.itemName = nodeItem.itemName this.form.displaySeq = nodeItem.displaySeq + this.form = { ...this.form } this.infoId = infoId this.visible = true }, diff --git a/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue b/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue index 2093308..dbf1c0e 100644 --- a/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue +++ b/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue @@ -31,7 +31,7 @@ @@ -123,12 +123,12 @@ export default { validatorRules: { // 标准号 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' }, // 标准名称 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' }, // 文本状态