更新

src/views/vent/monitorManager/alarmMonitor/warn/ventilateWarn.vue

@@ -124,6 +124,10 @@ let handlerToggle = () => {
   echartDataFc1.minData.data.length = 0;
   echartDataFc1.aveValue.data.length = 0;
   echartDataFc1.xData.length = 0;
+  getData()
+};
+//实时报表数据
+function getData(){
   ventilateTopList[0].value = monitor.value ? toggleData.faceIntM3 : toggleData.jin;
   ventilateTopList[1].value = monitor.value ? toggleData.faceRetM3 : toggleData.hui;
   if (monitor.value) {
@@ -145,7 +149,7 @@ let handlerToggle = () => {
       echartDataFc1.xData.push(v.time);
     });
   }
-};
+}
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
 function getMonitor(flag?) {
@@ -241,27 +245,7 @@ function getDetailList(param) {
         echartDataFc1.xData.push(v.time);
       });
     } else {
-      ventilateTopList[0].value = monitor.value ? param.faceIntM3 : param.jin;
-      ventilateTopList[1].value = monitor.value ? param.faceRetM3 : param.hui;
-      if (monitor.value) {
-        param.history_report.forEach((v) => {
-          echartDataFc1.maxData.data.push(parseFloat(v.faceIntM3));
-          echartDataFc1.minData.data.push(parseFloat(v.faceRetM3));
-          echartDataFc1.aveValue.data.push(0);
-          echartDataFc1.xData.push(v.time);
-        });
-      } else {
-        param.history.forEach((v) => {
-          echartDataFc1.maxData.data.push(parseFloat(v.jin));
-          echartDataFc1.minData.data.push(parseFloat(v.hui));
-          if (ventilateTopList[2].value && ventilateTopList[2].value != '--') {
-            echartDataFc1.aveValue.data.push(ventilateTopList[2].value);
-          } else {
-            echartDataFc1.aveValue.data.push(0);
-          }
-          echartDataFc1.xData.push(v.time);
-        });
-      }
+      getData()
     }
 
     let echartD = [echartDataFc1.maxData.data, echartDataFc1.minData.data]

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

@@ -78,8 +78,8 @@
             <template #container>
               <div class="overflow-y-auto max-h-300px">
                 <template v-for="monitor in safetyMonitorData" :key="monitor.deviceId">
-                  <div class="parameter-title group-parameter-title"
-                    ><SvgIcon class="icon" size="14" name="fiber-title" />
+                  <div class="parameter-title group-parameter-title">
+                    <SvgIcon class="icon" size="14" name="fiber-title" />
                     <span>{{ monitor.strinstallpos }}</span>
                   </div>
                   <div class="input-box">
@@ -99,8 +99,8 @@
             <template #container>
               <div class="overflow-y-auto max-h-400px">
                 <template v-for="monitor in windowMonitorData" :key="monitor.deviceId">
-                  <div class="parameter-title group-parameter-title"
-                    ><SvgIcon class="icon" size="14" name="fiber-title" />
+                  <div class="parameter-title group-parameter-title">
+                    <SvgIcon class="icon" size="14" name="fiber-title" />
                     <span>风窗：{{ monitor.strinstallpos }}</span>
                   </div>
                   <div class="input-box">
@@ -112,8 +112,8 @@
                   </div>
                 </template>
                 <template v-for="monitor in fanlocalMonitorData" :key="monitor.deviceId">
-                  <div class="parameter-title group-parameter-title"
-                    ><SvgIcon class="icon" size="14" name="fiber-title" />
+                  <div class="parameter-title group-parameter-title">
+                    <SvgIcon class="icon" size="14" name="fiber-title" />
                     <span>局扇：{{ monitor.strinstallpos }}</span>
                   </div>
                   <div class="input-box">
@@ -133,222 +133,234 @@
   </a-spin>
 </template>
 <script setup lang="ts">
-  import { onBeforeMount, ref, onMounted, onUnmounted, reactive, defineProps, watch } from 'vue';
-  import ventBox1 from '/@/components/vent/ventBox1.vue';
-  import { SvgIcon } from '/@/components/Icon';
-  import { mountedThree, destroy, setModelType, updateText, play } from '../balancePress.threejs';
-  import { settingParam1, settingParam2, settingParam3, windowParam, localFanParam, monitorParam, windrectParam } from '../balancePress.data';
-  import { list ,submit,subList} from '../balancePress.api';
-  import { message } from 'ant-design-vue';
-  import { get } from 'lodash-es';
+import { onBeforeMount, ref, onMounted, onUnmounted, reactive, defineProps, watch } from 'vue';
+import ventBox1 from '/@/components/vent/ventBox1.vue';
+import { SvgIcon } from '/@/components/Icon';
+import { mountedThree, destroy, setModelType, updateText, play } from '../balancePress.threejs';
+import { settingParam1, settingParam2, settingParam3, windowParam, localFanParam, monitorParam, windrectParam } from '../balancePress.data';
+import { list, submit, subList } from '../balancePress.api';
+import { message } from 'ant-design-vue';
+import { get } from 'lodash-es';
 
-  const props = defineProps({
-    deviceId: {
-      type: String,
-      require: true,
-    },
-  });
+const props = defineProps({
+  deviceId: {
+    type: String,
+    require: true,
+  },
+});
 
-  const loading = ref(false);
+const loading = ref(false);
 
-  // 默认初始是第一行
-  const isAutoControl = ref('1');
+// 默认初始是第一行
+const isAutoControl = ref('1');
 
-  // 监测数据
-  const selectData = reactive({
-    frontRearDP: '-',
-    sourcePressure: '-',
-    fault: '-',
-  });
+// 监测数据
+const selectData = reactive({
+  frontRearDP: '-',
+  sourcePressure: '-',
+  fault: '-',
+});
 
-  const changeType = (isAutoControl) => {
-    isAutoControl;
-    //
-  };
+const changeType = (isAutoControl) => {
+  isAutoControl;
+  //
+};
+const formData = ref({
+  coMaxStart: 0,
+  o2MinStart: 0,
+  coRiseStart: 0,
+  o2DownStart: 0,
+  windowAreaSetGrad: 0,
+  windowSetTime: 0,
+  windowMinArea: 0,
+  windowAreaDef: 0,
+  setMinTime: 0,
+  coEnd: 0,
+  coTimeEnd: 0,
+  o2End: 0,
+  o2TimeEnd: 0,
+});
+const safetyMonitorData = ref<any[]>([]);
+const fanlocalMonitorData = ref<any[]>([]);
+const windowMonitorData = ref<any[]>([]);
+const windrectMonitorData = ref<any[]>([]);
 
-  // https获取监测数据
-  let timer: any = null;
-  function getMonitor(flag?) {
-    if (Object.prototype.toString.call(timer) === '[object Null]') {
-      timer = setTimeout(
-        async () => {
-          if (props.deviceId) {
-            const data = await getDataSource(props.deviceId);
-            Object.assign(selectData, data);
-            updateText(selectData);
-          }
-          if (timer) {
-            timer = null;
-          }
-          await getMonitor();
-          loading.value = false;
-        },
-        flag ? 0 : 1000
-      );
-    }
+// https获取监测数据
+let timer: any = null;
+function getMonitor(flag?) {
+  if (Object.prototype.toString.call(timer) === '[object Null]') {
+    timer = setTimeout(
+      async () => {
+        if (props.deviceId) {
+          const data = await getDataSource(props.deviceId);
+          Object.assign(selectData, data);
+          updateText(selectData);
+        }
+        if (timer) {
+          timer = null;
+        }
+        await getMonitor();
+        loading.value = false;
+      },
+      flag ? 0 : 1000
+    );
   }
+}
 
-  const safetyMonitorData = ref<any[]>([]);
-  const fanlocalMonitorData = ref<any[]>([]);
-  const windowMonitorData = ref<any[]>([]);
-  const windrectMonitorData = ref<any[]>([]);
 
-  async function getDataSource(systemID) {
-    const res = await list({ devicetype: 'sys', systemID });
-    const result = res.msgTxt;
-    safetyMonitorData.value = [];
-    fanlocalMonitorData.value = [];
-    windowMonitorData.value = [];
-    windrectMonitorData.value = [];
-    result.forEach((item) => {
-      if (item.type.startsWith('safetymonitor') || item.type.startsWith('avgpressure_lowoxygen')) {
-        safetyMonitorData.value.push(...item.datalist);
-      }
-      if (item.type.startsWith('fanlocal')) {
-        item.datalist.forEach((e) => {
-          const f1Run = e.readData.Fan1StartStatus == '1';
-          e.FanfHz = f1Run ? e.readData.Fan1_Frequency : e.readData.Fan2_Frequency;
-          e.FanRun = f1Run ? '1#风机' : '2#风机';
-        });
-        fanlocalMonitorData.value.push(...item.datalist);
-      }
-      if (item.type.startsWith('window')) {
-        windowMonitorData.value.push(...item.datalist);
-      }
-      if (item.type.startsWith('windrect')) {
-        windrectMonitorData.value.push(...item.datalist);
-      }
-    });
-  }
 
-  // 喷粉操作
-  async function onSubmit() {
-    let res=await submit(formData.value)
-    if(res.code==500){
-      message.success(res.message);
-    }else {
-      initParamList()
-      message.success('提交成功');
+async function getDataSource(systemID) {
+  const res = await list({ devicetype: 'sys', systemID });
+  const result = res.msgTxt;
+  safetyMonitorData.value = [];
+  fanlocalMonitorData.value = [];
+  windowMonitorData.value = [];
+  windrectMonitorData.value = [];
+  result.forEach((item) => {
+    if (item.type.startsWith('safetymonitor') || item.type.startsWith('avgpressure_lowoxygen')) {
+      safetyMonitorData.value.push(...item.datalist);
+    }
+    if (item.type.startsWith('fanlocal')) {
+      item.datalist.forEach((e) => {
+        const f1Run = e.readData.Fan1StartStatus == '1';
+        e.FanfHz = f1Run ? e.readData.Fan1_Frequency : e.readData.Fan2_Frequency;
+        e.FanRun = f1Run ? '1#风机' : '2#风机';
+      });
+      fanlocalMonitorData.value.push(...item.datalist);
     }
+    if (item.type.startsWith('window')) {
+      windowMonitorData.value.push(...item.datalist);
+    }
+    if (item.type.startsWith('windrect')) {
+      windrectMonitorData.value.push(...item.datalist);
+    }
+  });
+}
+
+// 喷粉操作
+async function onSubmit() {
+  let res = await submit(formData.value)
+  if (res.code == 500) {
+    message.success(res.message);
+  } else {
+    initParamList()
+    message.success('提交成功');
+  }
+}
+
+//获取低氧参数监测返显列表
+async function initParamList() {
+  let res = await subList()
+  if (res && res.records.length != 0) {
+    formData.value = res.records[0]
   }
+}
 
-  //获取低氧参数监测返显列表
-  async function initParamList(){
-    let res=await subList()
-    if(res && res.records.length!=0){
-      formData.value=res.records[0]
+watch(
+  () => props.deviceId,
+  (newVal, oldVal) => {
+    if (newVal && oldVal != undefined) {
+      setModelType('balancePressBase');
     }
+    loading.value = true;
+    //     loading.value = true;
   }
+);
 
-  watch(
-    () => props.deviceId,
-    (newVal, oldVal) => {
-      if (newVal && oldVal != undefined) {
-        setModelType('balancePressBase');
-      }
-      loading.value = true;
-  //     loading.value = true;
-  //   }
-  // );
 
-  const formData = ref({
-    coMaxStart: 0,
-    o2MinStart: 0,
-    coRiseStart: 0,
-    o2DownStart: 0,
-    windowAreaSetGrad: 0,
-    windowSetTime: 0,
-    windowMinArea: 0,
-    windowAreaDef: 0,
-    setMinTime: 0,
-    coEnd: 0,
-    coTimeEnd: 0,
-    o2End: 0,
-    o2TimeEnd: 0,
-  });
 
-  onBeforeMount(() => {});
+onBeforeMount(() => { });
 
-  onMounted(() => {
-    loading.value = true;
-    mountedThree().then(async () => {
-      await setModelType('balancePressTun'); //balancePressBase
-      loading.value = false;
-      timer = null;
-      await initParamList()
-      await getMonitor(true); 
-      play('startSmoke', 'top', 30, 'open', 0);
-    });
+onMounted(() => {
+  loading.value = true;
+  mountedThree().then(async () => {
+    await setModelType('balancePressTun'); //balancePressBase
+    loading.value = false;
+    timer = null;
+    await initParamList()
+    await getMonitor(true);
+    play('startSmoke', 'top', 30, 'open', 0);
   });
+});
 
-  onUnmounted(() => {
-    destroy();
-    if (timer) {
-      clearTimeout(timer);
-    }
-  });
+onUnmounted(() => {
+  destroy();
+  if (timer) {
+    clearTimeout(timer);
+  }
+});
 </script>
 <style lang="less" scoped>
-  @import '/@/design/vent/modal.less';
-  @import '../../comment/less/workFace.less';
-  @ventSpace: zxm;
-  .monitor-container {
-    margin-top: 60px;
-  }
-  .lr {
-    width: 340px !important;
-  }
-  .auto-control {
-    padding: 10px 8px;
-    margin: 0 4px 4px 4px;
-    border-radius: 4px;
-    border: 1px solid #ffffff05;
-    background-image: linear-gradient(to left, #39deff15, #3977e500, #39deff15);
-  }
-  .divider-line {
-    position: relative;
-    color: aqua;
-    padding-left: 20px;
-    font-size: 14px;
-    &::before {
-      position: absolute;
-      content: '';
-      display: block;
-      top: 10px;
-      left: 0;
-      height: 1px;
-      width: 15px;
-      background-color: #ffffff33;
-    }
-    &::after {
-      position: absolute;
-      content: '';
-      display: block;
-      top: 10px;
-      right: 0;
-      height: 1px;
-      width: calc(100% - 85px);
-      background-color: #ffffff33;
-    }
-  }
-  .input-value {
-    width: 120px !important;
-  }
-  .unit {
-    text-align: right;
-  }
-  .btn-box {
-    margin: 10px 4px;
-    .btn1 {
-      padding: 4px 0;
-    }
+@import '/@/design/vent/modal.less';
+@import '../../comment/less/workFace.less';
+@ventSpace: zxm;
+
+.monitor-container {
+  margin-top: 60px;
+}
+
+.lr {
+  width: 340px !important;
+}
+
+.auto-control {
+  padding: 10px 8px;
+  margin: 0 4px 4px 4px;
+  border-radius: 4px;
+  border: 1px solid #ffffff05;
+  background-image: linear-gradient(to left, #39deff15, #3977e500, #39deff15);
+}
+
+.divider-line {
+  position: relative;
+  color: aqua;
+  padding-left: 20px;
+  font-size: 14px;
+
+  &::before {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 10px;
+    left: 0;
+    height: 1px;
+    width: 15px;
+    background-color: #ffffff33;
   }
 
-  :deep(.@{ventSpace}-tabs-tabpane-active) {
-    overflow: auto;
+  &::after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 10px;
+    right: 0;
+    height: 1px;
+    width: calc(100% - 85px);
+    background-color: #ffffff33;
   }
+}
 
-  :deep(.@{ventSpace}-input-number) {
-    border-color: #ffffff88 !important;
+.input-value {
+  width: 120px !important;
+}
+
+.unit {
+  text-align: right;
+}
+
+.btn-box {
+  margin: 10px 4px;
+
+  .btn1 {
+    padding: 4px 0;
   }
+}
+
+:deep(.@{ventSpace}-tabs-tabpane-active) {
+  overflow: auto;
+}
+
+:deep(.@{ventSpace}-input-number) {
+  border-color: #ffffff88 !important;
+}
 </style>