diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue index 9881856..ea2e97d 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue @@ -242,12 +242,15 @@ dynamicParams: { deviceCode: 'deviceInfoCode', //帮定上级联动数据 }, + defaultParams: { + type: 0, + }, componentProps: { api: device.queryDevicePoint, allowClear: true, resultField: 'data', placeholder: '请选择设备点位', - labelField: 'code', + labelField: 'name', valueField: 'id', dependency: 'deviceInfoCode', showSearch: true, diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue index cfa4053..1b70726 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue @@ -217,13 +217,14 @@ //获取设备点位 const getDevicePoint = (value: any) => { devicePointData.value = []; + value.type = 0; http.post(device.queryDevicePoint, value).then((res) => { if (res.msg === 'success') { res.data.forEach((item: any) => { //显示格式 devicePointData.value.push({ value: item.id, - label: item.code + ' ( ' + item.unit + ' ) ', + label: item.name + ' ( ' + item.unit + ' ) ', }); }); } diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue index 90de931..70227bf 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue @@ -10,7 +10,7 @@ @close="handleClose">
-
+
告警编号:{{ infoObject.alarmCode }} @@ -271,7 +271,7 @@ });