Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/monitorManager/compressor/components/nitrogenHome1.vue

@@ -77,7 +77,7 @@
                 </div>
                 <div class="monitor-box">
                   <div class="parameter-title device-parameter-title">
-                    <SvgIcon class="icon" size="32" name="device-paramer" /><span>电机数据</span>
+                    <SvgIcon class="icon" size="32" name="device-paramer" /><span>空压机数据</span>
                   </div>
                   <div class="state-item" v-for="(data, index) in deviceParameterData" :key="index">
                     <div class="item-col">
@@ -140,14 +140,14 @@
               <div>设备实时监测曲线</div>
             </template>
             <template #container>
-              <BarAndLineCustom xAxisPropType="readTime" :chartData="monitorData" height="240px"
-                :propTypeArr="['flowRate']" :option="zhudanOption" />
+              <BarAndLineCustom xAxisPropType="readTime" :chartData="echartData" height="240px"
+                :propTypeArr="['FluxTotal1','InputFlux']" :option="zhudanOption" />
             </template>
           </ventBox1>
-          <div class="vent-margin-t-10">
+          <!-- <div class="vent-margin-t-10">
             <LivePlayer id="fm-player1" style="height: 250px;" ref="player1" :videoUrl="flvURL1()" muted live loading
               controls />
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
@@ -155,16 +155,15 @@
   <!-- <DetailModal @register="registerModal" /> -->
 </template>
 <script lang="ts" setup name="nitrogenHome">
-import { onMounted, onUnmounted, ref, watch, reactive, defineProps } from 'vue'
+import { onMounted, onUnmounted, ref, watch, reactive, defineProps, nextTick} from 'vue'
 import ventBox1 from '/@/components/vent/ventBox1.vue'
 import fourBorderBg from '../../../comment/components/fourBorderBg.vue'
 import { mountedThree, destroy, setModelType } from '../nitrogen.threejs'
 import { getDevice } from '../nitrogen.api'
 import { SvgIcon } from '/@/components/Icon'
-import LivePlayer from '@liveqing/liveplayer-v3';
+// import LivePlayer from '@liveqing/liveplayer-v3';
 import BarAndLineCustom from '/@/components/chart/BarAndLineCustom.vue';
 import { zhudanOption } from '../nitrogen.data.ts'
-import { nextTick } from 'vue'
 
 
 // import DetailModal from './DetailModal.vue';
@@ -208,12 +207,12 @@ const groupParameterData = [
 ];
 const deviceParameterData = [
   {
-    AirCompressor_ExhaustPre: '空压机排气压力(KPa)',
-    AirCompressor_ExhaustTemp: '空压机排气温度(­°C)',
+    AirCompressor_ExhaustPre: '排气压力(KPa)',
+    AirCompressor_ExhaustTemp: '排气温度(­°C)',
   },
   {
-    AirCompressor_RunTime: '空压机运行时间',
-    AirCompressor_LoadTime: '空压机加载时间',
+    AirCompressor_RunTime: '运行时间',
+    AirCompressor_LoadTime: '加载时间',
   },
 
 
@@ -239,6 +238,9 @@ const monitorData = ref(new Array(3).fill({
   // controlModel: 'LOC'
 }));
 
+//图表数据
+let echartData=reactive<any>([])
+
 
 // //详情弹框
 // const [registerModal, { openModal, closeModal }] = useModal();
@@ -264,22 +266,29 @@ async function getMonitor(flag?) {
         timer = null;
       }
       await getMonitor();
-    }, flag ? 0 : 1000);
+    }, flag ? 0 : 3000);
   }
 };
 
 async function getDataSource(systemID) {
-  console.log(monitorData, 'monitorData')
   const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
-  if (res.success) {
-    const result = res.result;
+  console.log(res,'res---------------')
+  if (res) {
+    const result = res;
     if (!result || result.msgTxt.length < 1) return
     result.msgTxt.forEach(item => {
-      if (item.type == 'zd_12s302zd') {
+      if (item.typeName.indexOf('制氮机')!=-1) {
         monitorData.value = item['datalist'].filter((data) => {
           const item = data.readData;
           return Object.assign(data, item);
         });
+        //图表数据
+          if(echartData.length<=5){
+            monitorData.value.forEach(el=>{
+              echartData.push(el)
+            })
+          }
+
         airCompressorState.length = 0
         item['datalist'].forEach(v => {
           airCompressorState.push({
@@ -287,10 +296,10 @@ async function getDataSource(systemID) {
             compressRunSigF1: false,
             controlModel: false
           })
-
         })
       }
     })
+    console.log(echartData,'echart----------')
     monitorDataGroupNum.value = monitorData.value.length
   }
 };

src/views/vent/monitorManager/compressor/nitrogen.data.ts

@@ -63,7 +63,7 @@ export const zhudanOption = reactive({
   legend: {
     top: '0',
     icon: 'rect',
-    data: ['注氮压力', '氮气流量'],
+    data: ['累计流量', '瞬时流量'],
     right: '10px',
     textStyle: { fontSize: 12, color: '#fff' },
   },
@@ -79,7 +79,7 @@ export const zhudanOption = reactive({
   yAxis: [
     {
       type: 'value',
-      name: 'MPa',
+      name: 'm³/h',
       max: 10,
       axisTick: {
         show: false,
@@ -104,7 +104,7 @@ export const zhudanOption = reactive({
   ],
   series: [
     {
-      name: '注氮压力',
+      name: '累计流量',
       type: 'line',
 
       smooth: true,
@@ -135,7 +135,7 @@ export const zhudanOption = reactive({
       data: [],
     },
     {
-      name: '氮气流量',
+      name: '瞬时流量',
       type: 'line',
 
       smooth: true,

src/views/vent/monitorManager/safetyMonitor/index.vue

@@ -71,7 +71,7 @@
           </MonitorTable>
         </template>
         <!-- 图表 -->
-        <div style="width:100%;height:280px;margin: 20px 0px;">
+        <!-- <div style="width:100%;height:280px;margin: 20px 0px;">
           <BarAndLine v-if="deviceType == 'windrect'" xAxisPropType="strname" :dataSource="dataSource" height="100%"
             :chartsColumns="chartsColumnsRect" chartsType="" :option="echartsOption" />
           <BarAndLine v-else-if="deviceType == 'fanlocal'" xAxisPropType="strname" :dataSource="dataSource" height="100%"
@@ -86,7 +86,7 @@
             height="100%" :chartsColumns="chartsColumnsBun" chartsType="" :option="echartsOption" />
           <BarAndLine v-else xAxisPropType="strname" :dataSource="dataSource" height="100%"
             :chartsColumns="chartsColumnsreal" chartsType="" :option="echartsOption" />
-        </div>
+        </div> -->
 
       </a-tab-pane>
       <a-tab-pane key="2" tab="历史数据">
@@ -96,7 +96,7 @@
             designScope="device-history" :scroll="scroll" @change="changeHis" />
         </div>
         <!-- 图表 -->
-        <div v-if="alive" style="width:100%;height:280px;margin: 20px 0px;">
+        <!-- <div v-if="alive" style="width:100%;height:280px;margin: 20px 0px;">
 
           <BarAndLine v-if="deviceType == 'windrect'" xAxisPropType="gdevicename" :dataSource="dataSourceHis"
             height="100%" :chartsColumns="chartsColumnsRect" chartsType="" :option="echartsOption" />
@@ -112,7 +112,7 @@
             height="100%" :chartsColumns="chartsColumnsBun" chartsType="" :option="echartsOption" />
           <BarAndLine v-else xAxisPropType="gdevicename" :dataSource="dataSourceHis" height="100%"
             :chartsColumns="chartsColumnsreal" chartsType="" :option="echartsOption" />
-        </div>
+        </div> -->
       </a-tab-pane>
       <a-tab-pane key="3" tab="报警历史">
         <div class="tab-item">
@@ -148,19 +148,19 @@ import { formConfig, chartsColumnsreal, chartsColumnsRect, chartsColumnsFan, cha
 
 // import { BorderBox8 as DvBorderBox8 } from '@kjgl77/datav-vue3';
 
-const echartsOption = {
-  grid: {
-    top: '60px',
-    left: '10px',
-    right: '25px',
-    bottom: '5%',
-    containLabel: true,
-  },
-  toolbox: {
-    feature: {},
-  },
-};
-let alive = ref(true)
+// const echartsOption = {
+//   grid: {
+//     top: '60px',
+//     left: '10px',
+//     right: '25px',
+//     bottom: '5%',
+//     containLabel: true,
+//   },
+//   toolbox: {
+//     feature: {},
+//   },
+// };
+// let alive = ref(true)
 
 type DeviceType = { deviceType: string, deviceName: string, datalist: any[] };
 
@@ -185,16 +185,16 @@ const activeKey = ref('1'); // tab key
 const dataSource = shallowRef([]) // 实时监测数据
 const deviceType = ref('') // 监测设备类型
 
-let dataSourceHis = shallowRef([])//历史数据
+// let dataSourceHis = shallowRef([])//历史数据
 
 //历史数据
 async function changeHis(data) {
-  alive.value = false
-  nextTick(() => {
-    dataSourceHis = data
-    alive.value = true
+  // alive.value = false
+  // nextTick(() => {
+  //   dataSourceHis = data
+  //   alive.value = true
 
-  })
+  // })
 
 }