Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
This commit is contained in:
@@ -531,7 +531,7 @@ module.exports = {
|
|||||||
newClause: 'New Clause',
|
newClause: 'New Clause',
|
||||||
clauseNo: 'Item No.',
|
clauseNo: 'Item No.',
|
||||||
functionalAreas: 'Functional Areas',
|
functionalAreas: 'Functional Areas',
|
||||||
technicalField: 'Tech field',
|
technicalField: 'Tech Field',
|
||||||
informationCategory: 'Info Type',
|
informationCategory: 'Info Type',
|
||||||
contentValidity: 'Content Validity',
|
contentValidity: 'Content Validity',
|
||||||
content: 'Content',
|
content: 'Content',
|
||||||
@@ -1051,7 +1051,7 @@ module.exports = {
|
|||||||
ParameterNo: 'Number',
|
ParameterNo: 'Number',
|
||||||
NRequired: 'Required',
|
NRequired: 'Required',
|
||||||
NParameterName: 'Para Name',
|
NParameterName: 'Para Name',
|
||||||
NtechnicalField: 'Tech field',
|
NtechnicalField: 'Tech Field',
|
||||||
NparameterBatch: 'Params Batch',
|
NparameterBatch: 'Params Batch',
|
||||||
NareaOfResponsibility: 'Responsible Field',
|
NareaOfResponsibility: 'Responsible Field',
|
||||||
NParameterDescription: 'Description',
|
NParameterDescription: 'Description',
|
||||||
|
|||||||
@@ -238,13 +238,6 @@
|
|||||||
postAction(this.url.getParagraphInfoList, query).then((res) => {
|
postAction(this.url.getParagraphInfoList, query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.conList = res.result.records
|
this.conList = res.result.records
|
||||||
if (this.conList && this.conList.length > 0) {
|
|
||||||
this.conList.forEach(val => {
|
|
||||||
if (val.content) {
|
|
||||||
val.content = this.getText(val.content)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
this.total = res.result.total
|
this.total = res.result.total
|
||||||
this.loading = false
|
this.loading = false
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -213,13 +213,6 @@
|
|||||||
postAction(this.url.getInfoList, query).then((res) => {
|
postAction(this.url.getInfoList, query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.conList = res.result.records
|
this.conList = res.result.records
|
||||||
if (this.conList && this.conList.length > 0) {
|
|
||||||
this.conList.forEach(val => {
|
|
||||||
if (val.content) {
|
|
||||||
val.content = this.getText(val.content)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
this.total = res.result.total
|
this.total = res.result.total
|
||||||
} else {
|
} else {
|
||||||
this.conList = []
|
this.conList = []
|
||||||
|
|||||||
Reference in New Issue
Block a user