|
@@ -182,10 +182,10 @@
|
|
|
//关键信息点
|
|
|
this.exhibitionCrux.cruxArray = this.pointData.filter(i => i.KeyWord)
|
|
|
this.exhibitionCrux.cruxArray.map(i => {
|
|
|
- if (this.exampleData.hasOwnProperty(i.Path)) {
|
|
|
+ if (this.instance.hasOwnProperty(i.Path)) {
|
|
|
return {
|
|
|
...i,
|
|
|
- value: this.exampleData[i.Path]
|
|
|
+ value: this.instance[i.Path]
|
|
|
}
|
|
|
}
|
|
|
})
|
|
@@ -200,10 +200,10 @@
|
|
|
} else if (val == 2) { //有值信息点
|
|
|
let list = this.pointData
|
|
|
list.map(j => {
|
|
|
- if (this.exampleData.hasOwnProperty(j.Path)) {
|
|
|
+ if (this.instance.hasOwnProperty(j.Path)) {
|
|
|
return {
|
|
|
...j,
|
|
|
- value: this.exampleData[j.Path]
|
|
|
+ value: this.instance[j.Path]
|
|
|
}
|
|
|
}
|
|
|
arr = list.filter(k => k.value)
|
|
@@ -283,8 +283,17 @@
|
|
|
displayData(arr) {//对数据进行处理传给组件展示
|
|
|
const result = {}
|
|
|
arr.forEach(i => {
|
|
|
- if (this.exampleData.hasOwnProperty(i.Path) && this.currentRadio != 2) {
|
|
|
- i.value = this.exampleData[i.Path]
|
|
|
+ if (this.instance.hasOwnProperty(i.Path) && this.currentRadio != 2) {
|
|
|
+ i.value = this.instance[i.Path]
|
|
|
+ }
|
|
|
+ if (i.DataSource && i.DataSource.length) {
|
|
|
+ let source = JSON.parse(i.DataSource)
|
|
|
+ source.forEach(j => {
|
|
|
+ if (j.Code == this.instance[i.Path]) {
|
|
|
+ console.log(j.Name)
|
|
|
+ i.value = j.Name
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
switch (i.InputMode) {
|
|
|
case "L":
|
|
@@ -300,7 +309,8 @@
|
|
|
InfoPointCode: i.InfoPointCode,
|
|
|
Value: i.value,
|
|
|
Visible: i.Visible,
|
|
|
- KeyWord: i.KeyWord
|
|
|
+ KeyWord: i.KeyWord,
|
|
|
+ InputMode:i.InputMode
|
|
|
})
|
|
|
} else {
|
|
|
result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`] = {
|
|
@@ -310,7 +320,8 @@
|
|
|
InfoPointCode: i.InfoPointCode,
|
|
|
Value: i.value,
|
|
|
Visible: i.Visible,
|
|
|
- KeyWord: i.KeyWord
|
|
|
+ KeyWord: i.KeyWord,
|
|
|
+ InputMode:i.InputMode
|
|
|
}]
|
|
|
}
|
|
|
}
|