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',
|
||||
clauseNo: 'Item No.',
|
||||
functionalAreas: 'Functional Areas',
|
||||
technicalField: 'Tech field',
|
||||
technicalField: 'Tech Field',
|
||||
informationCategory: 'Info Type',
|
||||
contentValidity: 'Content Validity',
|
||||
content: 'Content',
|
||||
@@ -1051,7 +1051,7 @@ module.exports = {
|
||||
ParameterNo: 'Number',
|
||||
NRequired: 'Required',
|
||||
NParameterName: 'Para Name',
|
||||
NtechnicalField: 'Tech field',
|
||||
NtechnicalField: 'Tech Field',
|
||||
NparameterBatch: 'Params Batch',
|
||||
NareaOfResponsibility: 'Responsible Field',
|
||||
NParameterDescription: 'Description',
|
||||
|
||||
@@ -238,13 +238,6 @@
|
||||
postAction(this.url.getParagraphInfoList, query).then((res) => {
|
||||
if (res.success) {
|
||||
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.loading = false
|
||||
} else {
|
||||
|
||||
@@ -213,13 +213,6 @@
|
||||
postAction(this.url.getInfoList, query).then((res) => {
|
||||
if (res.success) {
|
||||
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
|
||||
} else {
|
||||
this.conList = []
|
||||
|
||||
Reference in New Issue
Block a user