Merge branch 'hongchao-dev'
This commit is contained in:
commit
c4a6e9d71f
|
|
@ -72,9 +72,11 @@ const getSelectId = (list: any, id: any) => {
|
||||||
if (list[i].id == id) {
|
if (list[i].id == id) {
|
||||||
//查询到就返回该数组对象的value
|
//查询到就返回该数组对象的value
|
||||||
console.log('21',list[i].propertyNames)
|
console.log('21',list[i].propertyNames)
|
||||||
list[i].propertyNames.forEach((item:any) =>{
|
if( list[i].propertyNames!=null){
|
||||||
|
list[i].propertyNames.forEach((item:any) =>{
|
||||||
options.value.push({'label':item,'value':item})
|
options.value.push({'label':item,'value':item})
|
||||||
})
|
})
|
||||||
|
}
|
||||||
return [list[i].id]
|
return [list[i].id]
|
||||||
}
|
}
|
||||||
if (list[i].children) {
|
if (list[i].children) {
|
||||||
|
|
@ -408,6 +410,7 @@ const countDisabled = ref(false)
|
||||||
const dialogTypeCascader = ref()
|
const dialogTypeCascader = ref()
|
||||||
//装备类目-change
|
//装备类目-change
|
||||||
const dialogTypeChange = async () => {
|
const dialogTypeChange = async () => {
|
||||||
|
options.value=[]
|
||||||
const deviceTypeList = dialogTypeCascader.value.getCheckedNodes()
|
const deviceTypeList = dialogTypeCascader.value.getCheckedNodes()
|
||||||
// console.log(deviceTypeList)
|
// console.log(deviceTypeList)
|
||||||
// equipmentDeploymentParams.value.unitName = deviceTypeList[0].data.unitName
|
// equipmentDeploymentParams.value.unitName = deviceTypeList[0].data.unitName
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue