|
@@ -227,6 +227,9 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
+ if (this.instance.hasOwnProperty(item.path)) {
|
|
|
+ item.value = this.instance[item.path]
|
|
|
+ }
|
|
|
})
|
|
|
let params = { //获取动态参数
|
|
|
groupCode: this.group_code,
|
|
@@ -271,15 +274,8 @@ export default {
|
|
|
},
|
|
|
handleEnclosure() {
|
|
|
//图片文件处理,脱离radio控制
|
|
|
- let isList = this.pointData
|
|
|
let isArr = []
|
|
|
- isList.map(j => {
|
|
|
- if (this.instance.hasOwnProperty(j.path)) {
|
|
|
- j.value = this.instance[j.path]
|
|
|
- return j
|
|
|
- }
|
|
|
- })
|
|
|
- isArr = isList.filter(k => k.value)
|
|
|
+ isArr = this.pointData.filter(k => k.value)
|
|
|
this.handlePicList(isArr)
|
|
|
this.handleFileList(isArr)
|
|
|
},
|
|
@@ -298,31 +294,10 @@ export default {
|
|
|
|
|
|
if (val == 1) { //需采集信息
|
|
|
arr = this.pointData.filter(i => i.visible)
|
|
|
- // // 图片和的处理
|
|
|
- // this.handlePicList(arr)
|
|
|
- // // 文件处理
|
|
|
- // this.handleFileList(arr)
|
|
|
-
|
|
|
} else if (val == 2) { //有值信息点
|
|
|
- let list = this.pointData
|
|
|
- list.map(j => {
|
|
|
- if (this.instance.hasOwnProperty(j.path)) {
|
|
|
- return {
|
|
|
- ...j,
|
|
|
- value: this.instance[j.path]
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- }
|
|
|
- })
|
|
|
- arr = list.filter(k => k.value)
|
|
|
- // this.handlePicList(arr, 2)
|
|
|
- // this.handleFileList(arr, 2)
|
|
|
-
|
|
|
+ arr = this.pointData.filter(k => k.value)
|
|
|
} else { //全部信息点
|
|
|
arr = this.pointData
|
|
|
- // this.handlePicList(arr)
|
|
|
- // this.handleFileList(arr)
|
|
|
}
|
|
|
this.displayData(arr)
|
|
|
},
|