[Fix 00000] 1.优化主风机主备风机曲线监测接口对接逻辑 2.保德喷雾详情页面页面样式调整

src/views/vent/monitorManager/comment/FanDeviceEcharts.vue

@@ -319,7 +319,7 @@
               if (props.dataSource['stationtype'] !== 'redis') {
                 resultXAxisPropType.value = 'ttime';
                 historyList = (params) => defHttp.get({ url: '/safety/ventanalyMonitorData/listdays', params });
-                const datas = await historyList({
+                const datas1 = await historyList({
                   ttime_begin: newHistoryParams.ttime_begin,
                   ttime_end: newHistoryParams.ttime_end,
                   strtype: device.deviceType,
@@ -328,14 +328,27 @@
                   pageSize: pageSize.value,
                   pageNo: currentPage.value,
                   column: 'createTime',
+                  deviceNum: 'Fan1',
                 });
-                res = datas['datalist']['records'];
+                const datas2 = await historyList({
+                  ttime_begin: newHistoryParams.ttime_begin,
+                  ttime_end: newHistoryParams.ttime_end,
+                  strtype: device.deviceType,
+                  gdeviceid: newDeviceId,
+                  skip: historyParams.skip,
+                  pageSize: pageSize.value,
+                  pageNo: currentPage.value,
+                  column: 'createTime',
+                  deviceNum: 'Fan2',
+                });
+                res = datas1['datalist']['records'];
+                const res2 = datas2['datalist']['records'];
                 if (res && res.length > 0) {
-                  resultDataSource.value = res.map((item) => Object.assign(item, item.readData));
+                  resultDataSource.value = res.map((item, index) => Object.assign(item, item.readData, res2[index]['readData']));
                 } else {
                   resultDataSource.value = [];
                 }
-                total.value = datas['datalist'].total;
+                total.value = datas1['datalist'].total;
               } else {
                 historyList = (params) => defHttp.post({ url: '/monitor/history/getHistoryData', params });
                 resultXAxisPropType.value = 'time';
@@ -348,6 +361,7 @@
                   strtype: device.deviceType,
                   interval: historyParams.interval,
                   column: 'createTime',
+                  deviceNum: 'Fan2',
                 });
                 if (res && res.records && res.records.length > 0) {
                   resultDataSource.value = res.records.map((item) => Object.assign(item, item.readData));

src/views/vent/monitorManager/deviceMonitor/components/device/modal/atomizing.modal.vue

@@ -99,8 +99,7 @@
                 >
               </div>
             </div>
-
-            <div class="base-item">
+            <!-- <div class="base-item">
               <span class="title">支架主机数量：</span>
               <span class="value">{{ atomizingMonitor['holderCounts'] ? atomizingMonitor['holderCounts'] : '-' }}</span>
             </div>
@@ -111,7 +110,7 @@
             <div class="base-item">
               <span class="title">支架喷雾延时：</span>
               <span class="value">{{ atomizingMonitor['holderDelayed'] ? atomizingMonitor['holderDelayed'] : '-' }} h</span>
-            </div>
+            </div> -->
           </div>
         </div>
         <div class="right-monitor">
@@ -384,7 +383,7 @@
       .base-info {
         .base-box {
           width: calc(100% - 20px);
-          height: 130px;
+          height: 120px;
           font-size: 14px;
           display: flex;
           flex-direction: row;