[Feat 0000]基于大气压氧气浓度预测功能优化

src/views/vent/home/configurable/components/detail/CustomChart.vue

@@ -89,15 +89,22 @@ const genChartOption = () => {
       textStyle,
       legend: {
         show: legend.show,
-        top: 10,
-        left: 10,
-        textStyle,
+        top: 0,
+        left: 0,
+        orient: 'vertical',
+        height: '10%',
+        textStyle: {
+          width: 80,
+          overflow: 'break',
+          color: '#fff',
+          fontSize: 10,
+        },
       },
       grid: {
         left: 40,
-        top: 30,
+        top: 60,
         right: 37,
-        bottom: 45,
+        bottom: 30,
       },
       dataZoom: [
         {
@@ -226,8 +233,8 @@ const genChartOption = () => {
         return {
           yAxisIndex: index,
           ...serie,
-          type: series[index].type,
           symbolSize: 5,
+          type: series[index].type,
         };
       }),
       tooltip: {

src/views/vent/monitorManager/balancePressMonitor/balancePressO2.data.ts

@@ -22,7 +22,7 @@ export const PressO2Option: ModuleDataChart = {
   series: [
     {
       type: 'scatter',
-      readFrom: 'o2List',
+      readFrom: 'chartData',
       xprop: 'dateTime',
       yprop: 'o2Val',
       label: '氧气',
@@ -31,7 +31,7 @@ export const PressO2Option: ModuleDataChart = {
     },
     {
       type: 'line',
-      readFrom: 'o2List',
+      readFrom: 'chartData',
       xprop: 'dateTime',
       yprop: 'o2Val',
       label: '氧气曲线',
@@ -40,7 +40,7 @@ export const PressO2Option: ModuleDataChart = {
     },
     {
       type: 'scatter',
-      readFrom: 'o2List',
+      readFrom: 'chartData',
       xprop: 'dateTime',
       yprop: 'pressureVal',
       label: '大气压',
@@ -49,7 +49,7 @@ export const PressO2Option: ModuleDataChart = {
     },
     {
       type: 'line',
-      readFrom: 'o2List',
+      readFrom: 'chartData',
       xprop: 'dateTime',
       yprop: 'pressureVal',
       label: '大气压曲线',
@@ -58,40 +58,8 @@ export const PressO2Option: ModuleDataChart = {
     },
   ],
 };
-export const mockData = {
-  o2HistoryDataList: [
-    {
-      dateTime: '2025-10-14 08:00:00',
-      o2Val: '13.85',
-      pressureVal: '887',
-    },
-    {
-      dateTime: '2025-10-14 09:00:00',
-      o2Val: '14.01',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-14 10:00:00',
-      o2Val: '14.0',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-14 11:00:00',
-      o2Val: '14.06',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-14 12:00:00',
-      o2Val: '13.9',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-14 14:00:00',
-      o2Val: '13.79',
-      pressureVal: '890',
-    },
-  ],
-  o2List: [
+export const mockData1 = {
+  chartData: [
     {
       dateTime: '2025-10-14 14:00:00',
       o2Val: '14.08',
@@ -117,335 +85,5 @@ export const mockData = {
       o2Val: '14.08',
       pressureVal: '890',
     },
-    {
-      dateTime: '2025-10-14 19:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-14 20:00:00',
-      o2Val: '14.12',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-14 21:00:00',
-      o2Val: '14.12',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-14 22:00:00',
-      o2Val: '14.12',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-14 23:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-15 00:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-15 01:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 02:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 03:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 04:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-15 05:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-15 06:00:00',
-      o2Val: '14.12',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-15 07:00:00',
-      o2Val: '14.12',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-15 08:00:00',
-      o2Val: '14.12',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-15 09:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-15 10:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-15 11:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 12:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 13:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 14:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 15:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 16:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 17:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 18:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 19:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 20:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 21:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 22:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-15 23:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-16 00:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-16 01:00:00',
-      o2Val: '14.07',
-      pressureVal: '891',
-    },
-    {
-      dateTime: '2025-10-16 02:00:00',
-      o2Val: '14.07',
-      pressureVal: '891',
-    },
-    {
-      dateTime: '2025-10-16 03:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-16 04:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-16 05:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-16 06:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-16 07:00:00',
-      o2Val: '14.12',
-      pressureVal: '888',
-    },
-    {
-      dateTime: '2025-10-16 08:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-16 09:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-16 10:00:00',
-      o2Val: '14.1',
-      pressureVal: '889',
-    },
-    {
-      dateTime: '2025-10-16 11:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-16 12:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-16 13:00:00',
-      o2Val: '14.08',
-      pressureVal: '890',
-    },
-    {
-      dateTime: '2025-10-16 14:00:00',
-      o2Val: '14.07',
-      pressureVal: '891',
-    },
-    {
-      dateTime: '2025-10-16 15:00:00',
-      o2Val: '14.06',
-      pressureVal: '892',
-    },
-    {
-      dateTime: '2025-10-16 16:00:00',
-      o2Val: '14.05',
-      pressureVal: '893',
-    },
-    {
-      dateTime: '2025-10-16 17:00:00',
-      o2Val: '14.05',
-      pressureVal: '893',
-    },
-    {
-      dateTime: '2025-10-16 18:00:00',
-      o2Val: '14.04',
-      pressureVal: '894',
-    },
-    {
-      dateTime: '2025-10-16 19:00:00',
-      o2Val: '14.04',
-      pressureVal: '894',
-    },
-    {
-      dateTime: '2025-10-16 20:00:00',
-      o2Val: '14.04',
-      pressureVal: '894',
-    },
-    {
-      dateTime: '2025-10-16 21:00:00',
-      o2Val: '14.04',
-      pressureVal: '894',
-    },
-    {
-      dateTime: '2025-10-16 22:00:00',
-      o2Val: '14.04',
-      pressureVal: '895',
-    },
-    {
-      dateTime: '2025-10-16 23:00:00',
-      o2Val: '14.04',
-      pressureVal: '895',
-    },
-    {
-      dateTime: '2025-10-17 00:00:00',
-      o2Val: '14.04',
-      pressureVal: '896',
-    },
-    {
-      dateTime: '2025-10-17 01:00:00',
-      o2Val: '14.04',
-      pressureVal: '897',
-    },
-    {
-      dateTime: '2025-10-17 02:00:00',
-      o2Val: '14.04',
-      pressureVal: '897',
-    },
-    {
-      dateTime: '2025-10-17 03:00:00',
-      o2Val: '14.04',
-      pressureVal: '897',
-    },
-    {
-      dateTime: '2025-10-17 04:00:00',
-      o2Val: '14.04',
-      pressureVal: '897',
-    },
-    {
-      dateTime: '2025-10-17 05:00:00',
-      o2Val: '14.04',
-      pressureVal: '897',
-    },
-    {
-      dateTime: '2025-10-17 06:00:00',
-      o2Val: '14.04',
-      pressureVal: '896',
-    },
-    {
-      dateTime: '2025-10-17 07:00:00',
-      o2Val: '14.04',
-      pressureVal: '895',
-    },
-    {
-      dateTime: '2025-10-17 08:00:00',
-      o2Val: '14.04',
-      pressureVal: '896',
-    },
-    {
-      dateTime: '2025-10-17 09:00:00',
-      o2Val: '14.04',
-      pressureVal: '896',
-    },
-    {
-      dateTime: '2025-10-17 10:00:00',
-      o2Val: '14.04',
-      pressureVal: '896',
-    },
-    {
-      dateTime: '2025-10-17 11:00:00',
-      o2Val: '14.04',
-      pressureVal: '897',
-    },
-    {
-      dateTime: '2025-10-17 12:00:00',
-      o2Val: '14.04',
-      pressureVal: '897',
-    },
   ],
 };

src/views/vent/monitorManager/balancePressMonitor/components/balancePressHome.vue

@@ -70,7 +70,7 @@
             <template #title>
               <div>基于大气压的氧气浓度预测值</div>
             </template>
-            <template #container> <CustomChart :chart-config="PressO2Option" :chart-data="chartData" height="220px" /> </template>
+            <template #container> <CustomChart :chart-config="PressO2Option" :chart-data="mockData" height="220px" /> </template>
           </ventBox1>
         </div>
       </div>
@@ -139,10 +139,10 @@
   </a-spin>
 </template>
 <script setup lang="ts" name="balancePressHome">
-import { onBeforeMount, ref, onMounted, onUnmounted, reactive, defineProps, watch } from 'vue';
+import { onBeforeMount, ref, onMounted, onUnmounted, reactive, defineProps, watch, computed } from 'vue';
 import ventBox1 from '/@/components/vent/ventBox1.vue';
 import CustomChart from '@/views/vent/home/configurable/components/detail/CustomChart.vue';
-import { PressO2Option, mockData } from '../balancePressO2.data';
+import { PressO2Option, mockData1 } from '../balancePressO2.data';
 import { SvgIcon } from '/@/components/Icon';
 import { mountedThree, destroy, setModelType, updateText, play } from '../balancePress.threejs';
 import { settingParam1, settingParam2, settingParam3, windowParam, localFanParam, windrectParam } from '../balancePress.data';
@@ -206,7 +206,10 @@ const fanlocalMonitorData = ref<any[]>([]);
 const windowMonitorData = ref<any[]>([]);
 const windrectMonitorData = ref<any[]>([]);
 const modelsensorO2Data = ref<any[]>([]);
-const chartData = ref<any[]>([]);
+const mockData = ref<{ chartData: { dateTime: string; o2Val: string; pressureVal: string }[] }>({
+  chartData: [],
+});
+const chartData1 = ref<any[]>([]);
 async function getDataSource(systemID) {
   const res = await list({ devicetype: 'sys', systemID });
   const result = res.msgTxt;
@@ -247,9 +250,11 @@ async function getO2Press(params) {
   const param = {
     deviceId: deviceID,
   };
-  chartData.value = [];
   const res = await getO2PressData(param);
-  chartData.value = [...res.o2HistoryDataList, ...res.o2List];
+
+  const chartData = [...res.o2HistoryDataList, ...res.o2List];
+  mockData.value = { chartData };
+  O2PressDataFetched.value = true;
 }
 
 // 喷粉操作