fix:修改新风图例位置 能耗告警去掉间隔时长

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`, // 查询地暖最新状态
 }

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue

@@ -27,24 +27,6 @@
       <a-form-item v-if="infoObject.alarmFrequency === 2" name="repetitions" label="重复次数">
         <ns-input-number v-model:value="infoObject.repetitions" placeholder="请输入重复次数" />
       </a-form-item>
-      <a-form-item
-        v-if="infoObject.alarmFrequency === 2 || infoObject.alarmFrequency === 3"
-        name="intervalDuration"
-        label="间隔时长">
-        <ns-input-number
-          style="width: 100%"
-          v-model:value="infoObject.intervalDuration"
-          placeholder="请输入间隔时长">
-          <template #addonAfter>
-            <a-select
-              v-model:value="infoObject.intervalDurationUnit"
-              placeholder="请选择间隔时长单位"
-              style="width: 80px"
-              allowClear
-              :options="intervalDurationUnitData" />
-          </template>
-        </ns-input-number>
-      </a-form-item>
       <a-form-item label="优先级" name="priority">
         <a-select
           v-model:value="infoObject.priority"
@@ -138,23 +120,6 @@
       },
     ],
     alarmFrequency: [{ required: true, message: '请选择告警频率', trigger: 'change' }],
-    intervalDuration: [
-      {
-        required: true,
-        message: '请输入正确的间隔时长',
-        trigger: 'change',
-        validator: (rules: any, intervalDuration: any, cbfn: any) => {
-          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;
       }
       //调用接口

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) {

hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/floorHeatingModel.vue

@@ -22,7 +22,7 @@
               <div class="box-bottom-item-line">
                 设置
                 <div class="box-bottom-item-line-value">
-                  <span style="color: #00ffd2">{{ item.setUpNumber }}℃</span>
+                  <span style="color: #00ffd2">{{ item.temp }}{{ item.tempUnit }}</span>
                 </div>
               </div>
               <div class="box-bottom-item-line">

hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts

@@ -1,38 +1,37 @@
 //传感器位置
 export const devicePosition = [
-  { left: '28%', bottom: '44%' },
+  { left: '30%', bottom: '54%' },
-  { left: '35%', bottom: '23%' },
+  { left: '38%', bottom: '33%' },
-  { left: '47%', bottom: '31%' },
+  { left: '50%', bottom: '41%' },
-  { left: '38.5%', bottom: '49%' },
+  { left: '42%', bottom: '59%' },
-  { left: '65%', bottom: '43%' },
+  { left: '68%', bottom: '53%' },
-  { left: '52%', bottom: '55.5%' },
+  { left: '55%', bottom: '65.5%' },
-  { left: '76%', bottom: '48%' },
+  { left: '79%', bottom: '58%' },
-  { left: '63%', bottom: '60%' },
+  { left: '66%', bottom: '70%' },
 ];
 // 新风主机
 export const newTrendPosition = [
-  { left: '43%', bottom: '44%' },
+  { left: '46%', bottom: '54%' },
-  { left: '45%', bottom: '23%' },
+  { left: '48%', bottom: '33%' },
-  { left: '61.5%', bottom: '54%' },
+  { left: '64.5%', bottom: '64%' },
-  { left: '63%', bottom: '36%' },
+  { left: '66%', bottom: '46%' },
 ];
 //空调箱
 export const airConditioningPosition = [
-  { styleText: { left: '13%', bottom: '23%' }, lineType: 1 },
+  { styleText: { left: '16%', bottom: '33%' }, lineType: 1 },
-  { styleText: { left: '28%', bottom: '28%' }, lineType: 1 },
+  { styleText: { left: '31%', bottom: '38%' }, lineType: 1 },
-  { styleText: { left: '38%', bottom: '45.5%' }, lineType: 1 },
+  { styleText: { left: '41%', bottom: '55.5%' }, lineType: 1 },
-  { styleText: { left: '38%', bottom: '45.5%' }, lineType: 1 },
+  { styleText: { left: '60%', bottom: '63%' }, lineType: 1 },
-  { styleText: { left: '57%', bottom: '53%' }, lineType: 1 },
+  { styleText: { left: '76%', bottom: '63%' }, lineType: 1 },
-  { styleText: { left: '73%', bottom: '53%' }, lineType: 1 },
+  { styleText: { left: '71%', bottom: '48%' }, lineType: '' },
-  { styleText: { left: '68%', bottom: '38%' }, lineType: '' },
+  { styleText: { left: '46.5%', bottom: '32%' }, lineType: '' },
-  { styleText: { left: '43.5%', bottom: '22%' }, lineType: '' },
 ];
 //地暖
 export const floorHeatingPosition = [
-  { styleText: { left: '13.5%', bottom: '34%' }, lineType: '' },
+  { styleText: { left: '13%', bottom: '44%' }, lineType: '' },
-  { styleText: { left: '19.5%', bottom: '38.5%' }, lineType: 1 },
+  { styleText: { left: '22%', bottom: '48%' }, lineType: 1 },
-  { styleText: { left: '33%', bottom: '43%' }, lineType: 1 },
+  { styleText: { left: '34%', bottom: '53%' }, lineType: 1 },
-  { styleText: { left: '46%', bottom: '49.5%' }, lineType: 1 },
+  { styleText: { left: '49%', bottom: '59%' }, lineType: 1 },
-  { styleText: { left: '57.5%', bottom: '56%' }, lineType: 1 },
+  { styleText: { left: '60.5%', bottom: '65.5%' }, lineType: 1 },
-  { styleText: { left: '69.5%', bottom: '62%' }, lineType: 1 },
+  { styleText: { left: '72%', bottom: '72%' }, lineType: 1 },
 ];

hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue

@@ -128,7 +128,7 @@
       <div v-if="selectIndex === 4">
         <template v-for="(item, index) in floorHeatingData" :key="index">
           <div
-            style="position: absolute"
+            style="position: absolute; z-index: 1"
             :style="{
               left:
                 'calc(' + item.styleText.left + (item.lineType === 1 ? ' - 12.9%)' : ' - 13.3%)'),
@@ -138,7 +138,7 @@
             <doubleSingleModel :dataSource="item" />
           </div>
           <img
-            style="width: 50px; height: 75px; position: absolute; z-index: 1"
+            style="width: 50px; height: 75px; position: absolute"
             :style="{
               left: 'calc(' + item.styleText.left + (item.lineType === 1 ? ' - 1.5%)' : ' - 2%)'),
               bottom: 'calc(' + item.styleText.bottom + (item.lineType === 1 ? ' + 4%)' : ' - 9%)'),
@@ -146,7 +146,7 @@
             }"
             src="../image/liftState/lift/line.png" />
           <img
-            style="width: 42px; height: 42px; position: absolute"
+            style="width: 42px; height: 42px; position: absolute; z-index: 1"
             :style="{ left: item.styleText.left, bottom: item.styleText.bottom }"
             src="../image/airConditioningSystem/floorHeatingIcon.png" />
         </template>
@@ -518,8 +518,8 @@
               title: item.deviceInfoName,
               styleText: floorHeatingPosition[index].styleText,
               type: '地暖',
-              number: item.record.temp,
+              number: item.record.currentTemp,
-              numberUnit: item.record.tempUnit,
+              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;

hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue

@@ -26,10 +26,10 @@
         <div style="margin-top: 4px"> {{ dataSource.type === '地暖' ? '设置' : '风量' }} </div>
         <div style="margin-top: -5px">
           <span style="font-size: 18px; color: #0dffff; font-style: italic">
-            {{ dataSource.type === '地暖' ? dataSource.setUpNumber : dataSource.airVol }}
+            {{ dataSource.type === '地暖' ? dataSource.temp : dataSource.airVol }}
           </span>
           <span style="font-size: 10px; margin-left: 5px">{{
-            dataSource.type === '地暖' ? '℃' : dataSource.airVolUnit
+            dataSource.type === '地暖' ? dataSource.tempUnit : dataSource.airVolUnit
           }}</span>
         </div>
       </div>