|
@@ -848,6 +848,10 @@ const handleMenuSelect = ({key}) => {
|
|
specialModalShow()
|
|
specialModalShow()
|
|
} else if (key === 'device') {
|
|
} else if (key === 'device') {
|
|
deviceModal.value = true
|
|
deviceModal.value = true
|
|
|
|
+ nextTick(()=>{
|
|
|
|
+ deviceTableRef.value?.clearSelection();
|
|
|
|
+
|
|
|
|
+ })
|
|
getequipmentMenusData()
|
|
getequipmentMenusData()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1050,6 +1054,7 @@ const getDeviceTableData =async () => {
|
|
if (!error && code === 200) {
|
|
if (!error && code === 200) {
|
|
deviceTableData.value = getArrValue(data['records'])
|
|
deviceTableData.value = getArrValue(data['records'])
|
|
equipmentPage.value.total = data.total || 0
|
|
equipmentPage.value.total = data.total || 0
|
|
|
|
+
|
|
//去重
|
|
//去重
|
|
let uniqueArray =getnewArr(checkList.value)
|
|
let uniqueArray =getnewArr(checkList.value)
|
|
deviceTableKeys.value=uniqueArray
|
|
deviceTableKeys.value=uniqueArray
|
|
@@ -1083,11 +1088,16 @@ const deviceTableKeys = ref([]);
|
|
//选中的设备仪器
|
|
//选中的设备仪器
|
|
const checkList=ref([])
|
|
const checkList=ref([])
|
|
const deviceTableSelection = (rows) => {
|
|
const deviceTableSelection = (rows) => {
|
|
|
|
+
|
|
// deviceTableKeys.value = rows
|
|
// deviceTableKeys.value = rows
|
|
if(rows.length>0){
|
|
if(rows.length>0){
|
|
rows.forEach((item)=>{
|
|
rows.forEach((item)=>{
|
|
checkList.value.push(item)
|
|
checkList.value.push(item)
|
|
})
|
|
})
|
|
|
|
+ //去重
|
|
|
|
+ let uniqueArray =getnewArr(checkList.value)
|
|
|
|
+ deviceTableKeys.value=uniqueArray
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -1117,15 +1127,22 @@ const deviceModalSave = () => {
|
|
})
|
|
})
|
|
deviceModal.value = false;
|
|
deviceModal.value = false;
|
|
emit('updeviceUseIds', idval)
|
|
emit('updeviceUseIds', idval)
|
|
|
|
+
|
|
}else{
|
|
}else{
|
|
window?.$message?.warning('请先选择引用容器设备')
|
|
window?.$message?.warning('请先选择引用容器设备')
|
|
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ deviceTableKeys.value=[];
|
|
|
|
+ checkList.value=[]
|
|
|
|
+ temp=[]
|
|
|
|
+
|
|
}
|
|
}
|
|
//关闭
|
|
//关闭
|
|
const deviceModalClose = () => {
|
|
const deviceModalClose = () => {
|
|
deviceModal.value = false
|
|
deviceModal.value = false
|
|
|
|
+ deviceTableKeys.value=[];
|
|
|
|
+ checkList.value=[]
|
|
|
|
+ temp=[]
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|