@@ -371,16 +371,23 @@ const frequencyData = ref([])
const serialNumberOptions = ref([])
const siteId = ref(0)
const tunnelName = ref('')
-const getSerialNumberOptions = (row) => {
- console.info("🚀 ~ file:index method:getSerialNumberOptions line:375 -----", row)
- getEquipmentSerialNumberOptions(tunnelId,row.equipmentId).then(res => {
- if (res.code === 1000) {
- serialNumberOptions.value = res.data
- } else {
- ElMessage.error(res.msg)
- }
- })
+const getSerialNumberOptions =async (equipmentId) => {
+ console.log('tunnelId',tunnelId)
+ let {data,code,msg}=await getEquipmentSerialNumberOptions(tunnelId,equipmentId)
+ if(code===1000){
+ return data
+ }else{
+ ElMessage.error(msg)
+ }
+ // getEquipmentSerialNumberOptions(tunnelId,equipmentId).then(res => {
+ // if (res.code === 1000) {
+ // serialNumberOptions.value = res.data
+ // } else {
+ // ElMessage.error(res.msg)
+ // }
+ // })
}
+// getSerialNumberOptions()
const changeFan = (e) => {
// const fanObj = {
// acquisitionPeriod: e * 1000,
@@ -468,6 +475,7 @@ const editEquip = debounce(() => {
sensorList: newSensor,
// shuntList: editFenLiuData.value,
}
+ console.info("🚀 ~ file:index method: line:478 -----",basicData)
editEquipment(basicData).then(res => {
if (res.code === 1000) {
ElMessage.success('修改成功')
@@ -482,25 +490,34 @@ const handleChangeMenu = (e) => {
changeIndex.value = e
}
-const getList = () => {
+const getList =async () => {
const loading = ElLoading.service({
lock: true,
text: '正在加载系统资源...',
background: 'rgba(0, 0, 0, 0.7)',
customClass: 'allLoading'
})
- getEquipmentList(tunnelId).then(res => {
+ await getEquipmentList(tunnelId).then( res => {
if (res.code === 1000) {
fanData.value = res.data.frequencyChangerList
+ fanData.value?.forEach( async item => {
+ item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
+ })
res.data.windPressureSensorList?.forEach(item => {
item.offset = item.offset + 4000
})
winData.value = res.data.windPressureSensorList
+ winData.value?.forEach( async item => {
+ item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
+ })
res.data.sensorList?.forEach(item => {
item.offset = item.offset + 4000
})
otherData.value = res.data.sensorList
- res.data.acquisitionList?.map(item => {
+ otherData.value?.forEach( async item => {
+ item.serialNumberOption =await getSerialNumberOptions(item.equipmentId)
+ })
+ res.data.acquisitionList.map(item => {
item.acquisitionPeriod = item.acquisitionPeriod / 1000
if (item.typeKey === 'frequency') {
fanFrequency.value = item.acquisitionPeriod
@@ -528,7 +545,18 @@ getList()