diff --git a/hx-ai-intelligent/src/api/airConditioningSystem.ts b/hx-ai-intelligent/src/api/airConditioningSystem.ts index 2cd6a00..b644428 100644 --- a/hx-ai-intelligent/src/api/airConditioningSystem.ts +++ b/hx-ai-intelligent/src/api/airConditioningSystem.ts @@ -3,5 +3,5 @@ import { BASE_URL } from './index'; export enum airConditioningSystemApi { getVentHostCtrlList = `${BASE_URL}/api/ventHostCtrl/getDeviceState`, // 查询新风主机最新状态 getAcBoxCtrlList = `${BASE_URL}/api/acBoxCtrl/getDeviceState`, // 查询空调箱最新状态 - getTempSysCtrlList = `${BASE_URL}/api/tempSysCtrl/getFloorHeatingState`, // 查询地暖最新状态 + getTempSysCtrlList = `${BASE_URL}/tempSysCtrl/getFloorHeatingState`, // 查询地暖最新状态 } diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue index 7859fee..0011a7a 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue @@ -27,24 +27,6 @@ - - - - - { - if (intervalDuration && intervalDuration > 0) { - cbfn(); - } else { - cbfn('请输入正确的间隔时长'); - } - if (!infoObject.value.intervalDurationUnit) { - cbfn('请选择间隔时长单位'); - } - }, - }, - ], repetitions: [ { required: true, @@ -234,7 +199,6 @@ data.createWorkOrder = Number(data.createWorkOrder); if (data.alarmFrequency === 1) { data.repetitions = null; - data.intervalDuration = null; data.intervalDurationUnit = null; } //调用接口 diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts index 93c1be5..52246db 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts @@ -42,11 +42,6 @@ const tableKeyMap = [ width: 120, }, { - title: '频率间隔', - dataIndex: 'interval', - width: 120, - }, - { title: '监测时长', dataIndex: 'monitorFrequency', width: 120, @@ -139,7 +134,6 @@ export const energyAlarmConfigs = ( obj.createWorkOrder = obj.createWorkOrder + ''; if (obj.alarmFrequency === 1) { obj.repetitions = null; - obj.intervalDuration = null; obj.intervalDurationUnit = null; } if (obj.alarmFrequency === 3) { diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue index dc246fc..9e34657 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue @@ -22,7 +22,7 @@
设置
- {{ item.setUpNumber }}℃ + {{ item.temp }}{{ item.tempUnit }}
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts index 64411a1..7a0fb99 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts @@ -1,38 +1,37 @@ //传感器位置 export const devicePosition = [ - { left: '28%', bottom: '44%' }, - { left: '35%', bottom: '23%' }, - { left: '47%', bottom: '31%' }, - { left: '38.5%', bottom: '49%' }, - { left: '65%', bottom: '43%' }, - { left: '52%', bottom: '55.5%' }, - { left: '76%', bottom: '48%' }, - { left: '63%', bottom: '60%' }, + { left: '30%', bottom: '54%' }, + { left: '38%', bottom: '33%' }, + { left: '50%', bottom: '41%' }, + { left: '42%', bottom: '59%' }, + { left: '68%', bottom: '53%' }, + { left: '55%', bottom: '65.5%' }, + { left: '79%', bottom: '58%' }, + { left: '66%', bottom: '70%' }, ]; // 新风主机 export const newTrendPosition = [ - { left: '43%', bottom: '44%' }, - { left: '45%', bottom: '23%' }, - { left: '61.5%', bottom: '54%' }, - { left: '63%', bottom: '36%' }, + { left: '46%', bottom: '54%' }, + { left: '48%', bottom: '33%' }, + { left: '64.5%', bottom: '64%' }, + { left: '66%', bottom: '46%' }, ]; //空调箱 export const airConditioningPosition = [ - { styleText: { left: '13%', bottom: '23%' }, lineType: 1 }, - { styleText: { left: '28%', bottom: '28%' }, lineType: 1 }, - { styleText: { left: '38%', bottom: '45.5%' }, lineType: 1 }, - { styleText: { left: '38%', bottom: '45.5%' }, lineType: 1 }, - { styleText: { left: '57%', bottom: '53%' }, lineType: 1 }, - { styleText: { left: '73%', bottom: '53%' }, lineType: 1 }, - { styleText: { left: '68%', bottom: '38%' }, lineType: '' }, - { styleText: { left: '43.5%', bottom: '22%' }, lineType: '' }, + { styleText: { left: '16%', bottom: '33%' }, lineType: 1 }, + { styleText: { left: '31%', bottom: '38%' }, lineType: 1 }, + { styleText: { left: '41%', bottom: '55.5%' }, lineType: 1 }, + { styleText: { left: '60%', bottom: '63%' }, lineType: 1 }, + { styleText: { left: '76%', bottom: '63%' }, lineType: 1 }, + { styleText: { left: '71%', bottom: '48%' }, lineType: '' }, + { styleText: { left: '46.5%', bottom: '32%' }, lineType: '' }, ]; //地暖 export const floorHeatingPosition = [ - { styleText: { left: '13.5%', bottom: '34%' }, lineType: '' }, - { styleText: { left: '19.5%', bottom: '38.5%' }, lineType: 1 }, - { styleText: { left: '33%', bottom: '43%' }, lineType: 1 }, - { styleText: { left: '46%', bottom: '49.5%' }, lineType: 1 }, - { styleText: { left: '57.5%', bottom: '56%' }, lineType: 1 }, - { styleText: { left: '69.5%', bottom: '62%' }, lineType: 1 }, + { styleText: { left: '13%', bottom: '44%' }, lineType: '' }, + { styleText: { left: '22%', bottom: '48%' }, lineType: 1 }, + { styleText: { left: '34%', bottom: '53%' }, lineType: 1 }, + { styleText: { left: '49%', bottom: '59%' }, lineType: 1 }, + { styleText: { left: '60.5%', bottom: '65.5%' }, lineType: 1 }, + { styleText: { left: '72%', bottom: '72%' }, lineType: 1 }, ]; diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue index 6ec4541..6863593 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue @@ -128,7 +128,7 @@
@@ -518,8 +518,8 @@ title: item.deviceInfoName, styleText: floorHeatingPosition[index].styleText, type: '地暖', - number: item.record.temp, - numberUnit: item.record.tempUnit, + number: item.record.currentTemp, + numberUnit: item.record.currentTempUnit, lineType: floorHeatingPosition[index].lineType, ...item.record, }); @@ -618,7 +618,7 @@ width: 95%; height: 100%; position: relative; - background-image: url(../image/bg.jpg); + background-image: url(../image/floor-1.png); background-size: 100% 100%; background-repeat: no-repeat; overflow: hidden; diff --git a/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue b/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue index 9b75557..fa83be5 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue @@ -26,10 +26,10 @@
{{ dataSource.type === '地暖' ? '设置' : '风量' }}
- {{ dataSource.type === '地暖' ? dataSource.setUpNumber : dataSource.airVol }} + {{ dataSource.type === '地暖' ? dataSource.temp : dataSource.airVol }} {{ - dataSource.type === '地暖' ? '℃' : dataSource.airVolUnit + dataSource.type === '地暖' ? dataSource.tempUnit : dataSource.airVolUnit }}