|
@@ -324,7 +324,9 @@
|
|
:name="e"
|
|
:name="e"
|
|
:ref="'EnginNodeInfo'+idx"
|
|
:ref="'EnginNodeInfo'+idx"
|
|
:currentContain="(listContain.find(i => i.name == e)).components"
|
|
:currentContain="(listContain.find(i => i.name == e)).components"
|
|
|
|
+ :updateOption='(updateOption.find(i => i.type == e)) || {}'
|
|
:types="currentCheckList"
|
|
:types="currentCheckList"
|
|
|
|
+ :status="enginNodeStatus"
|
|
enginType="民用工程"
|
|
enginType="民用工程"
|
|
/>
|
|
/>
|
|
<!-- <el-tabs type="border-card" >
|
|
<!-- <el-tabs type="border-card" >
|
|
@@ -386,6 +388,7 @@ export default {
|
|
"engin_cycle"],
|
|
"engin_cycle"],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ updateOption:[],
|
|
listContain:[
|
|
listContain:[
|
|
{
|
|
{
|
|
name:'放线',
|
|
name:'放线',
|
|
@@ -720,7 +723,8 @@ export default {
|
|
unitOptions: [], // 单元集合
|
|
unitOptions: [], // 单元集合
|
|
houseOptions: [], // 房间集合
|
|
houseOptions: [], // 房间集合
|
|
enginClassification_list: [], // 室内节点,
|
|
enginClassification_list: [], // 室内节点,
|
|
- checkList: []// 节点集合
|
|
|
|
|
|
+ checkList: [],// 节点集合
|
|
|
|
+ enginNodeStatus:null
|
|
};
|
|
};
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
@@ -742,7 +746,7 @@ export default {
|
|
}, 'add')
|
|
}, 'add')
|
|
},
|
|
},
|
|
currentEnginTypeChanged() {
|
|
currentEnginTypeChanged() {
|
|
- this.$forceUpdate();
|
|
|
|
|
|
+ this.currentCheckList = []
|
|
if (this.queryParams.enginType == undefined || this.queryParams.enginType == ''
|
|
if (this.queryParams.enginType == undefined || this.queryParams.enginType == ''
|
|
|| this.queryParams.currentEnginTypeChange == undefined || this.queryParams.currentEnginTypeChange == ''
|
|
|| this.queryParams.currentEnginTypeChange == undefined || this.queryParams.currentEnginTypeChange == ''
|
|
)
|
|
)
|
|
@@ -784,6 +788,7 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
enginTypeHasChanged() {
|
|
enginTypeHasChanged() {
|
|
|
|
+ this.currentCheckList = []
|
|
this.queryParams.currentEnginTypeChange = ''
|
|
this.queryParams.currentEnginTypeChange = ''
|
|
this.currentEnginTypeChangeOptions = []
|
|
this.currentEnginTypeChangeOptions = []
|
|
getDicts(this.queryParams.enginType).then(res => {
|
|
getDicts(this.queryParams.enginType).then(res => {
|
|
@@ -903,6 +908,7 @@ export default {
|
|
this.nodeDetailVisible = false
|
|
this.nodeDetailVisible = false
|
|
},
|
|
},
|
|
toNodeDetail() {
|
|
toNodeDetail() {
|
|
|
|
+ this.enginNodeStatus = '新增'
|
|
let nodeCollection = []
|
|
let nodeCollection = []
|
|
// 收集节点信息
|
|
// 收集节点信息
|
|
this.currentCheckList.forEach((e,idx) => {
|
|
this.currentCheckList.forEach((e,idx) => {
|
|
@@ -918,6 +924,8 @@ export default {
|
|
type: 'success'
|
|
type: 'success'
|
|
});
|
|
});
|
|
this.open = false
|
|
this.open = false
|
|
|
|
+ console.log('选中节点集合',this.currentCheckList)
|
|
|
|
+ this.currentCheckList = []
|
|
// this.$emit('closeToSucceed')
|
|
// this.$emit('closeToSucceed')
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -956,6 +964,7 @@ export default {
|
|
},
|
|
},
|
|
/** 修改按钮操作 */
|
|
/** 修改按钮操作 */
|
|
handleUpdate(row) {
|
|
handleUpdate(row) {
|
|
|
|
+ this.enginNodeStatus = '修改'
|
|
this.loading = true;
|
|
this.loading = true;
|
|
// this.reset();
|
|
// this.reset();
|
|
const id = row.id || this.ids
|
|
const id = row.id || this.ids
|
|
@@ -969,8 +978,14 @@ export default {
|
|
getEngineeringCivil(id).then(res => {
|
|
getEngineeringCivil(id).then(res => {
|
|
this.loading = false;
|
|
this.loading = false;
|
|
let newData = res.data
|
|
let newData = res.data
|
|
- console.log(newData)
|
|
|
|
- console.log(res.data.zEngineeringNodeBoList[0].type)
|
|
|
|
|
|
+ this.updateOption = res.data.zEngineeringNodeBoList
|
|
|
|
+ // start update修改数据
|
|
|
|
+ res.data.zEngineeringNodeBoList.forEach((e,idx) => {
|
|
|
|
+ this.currentCheckList.push(e.type)
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ console.log('选中节点集合',this.currentCheckList)
|
|
|
|
+ // end
|
|
let zEngineeringNodeBo = {
|
|
let zEngineeringNodeBo = {
|
|
type: res.data.zEngineeringNodeBoList[0].type,
|
|
type: res.data.zEngineeringNodeBoList[0].type,
|
|
zEngineeringInfoBo: res.data.zEngineeringNodeBoList[0].zEngineeringInfoBo
|
|
zEngineeringInfoBo: res.data.zEngineeringNodeBoList[0].zEngineeringInfoBo
|