瓦斯故障诊断更新

src/components/chart/BarAndLine.vue

@@ -166,7 +166,7 @@
             } else if (digitCount < 6) {
               const n = Number((Number(max.toFixed(0)) / 10000).toFixed(0));
               if (max < n * 10000 + 5000) {
-                yMax = (n + 1) * 1000;
+                yMax = (n + 1) * 10000;
               } else {
                 yMax = (n + 1) * 10000 + 5000;
               }

src/views/vent/dust/dustMonitorTable/index.vue

@@ -70,7 +70,7 @@ import {
   Bdcolumns,
   Bltcolumns,
   Sgtcolumns,
-  Yjlcolumns
+  Yjlcolumns,
   dataColumns,
   dataDltColumns,
   dataSwColumns,
@@ -249,7 +249,7 @@ function processTableData(data: any) {
     const SwMaxValues = [
       { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
       { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-    ];
+    ];  
     const HjtMaxValues = [
       { key: 'sc_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
       { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },

src/views/vent/monitorManager/alarmMonitor/common.api.ts

@@ -5,6 +5,7 @@ enum Api {
   sysWarn = '/safety/ventanalyAlarmLog/sysWarn',
   getDevice = '/monitor/device',//实时数据
   listdays='/safety/ventanalyMonitorData/listdays',//历史数据
+  getHistoryData='/monitor/history/getHistoryData',//历史数据1
   bjlist='/safety/ventanalyAlarmLog/list'//报警历史数据
 }
 
@@ -33,6 +34,12 @@ export const getDevice = (params) => defHttp.post({ url: Api.getDevice, params }
 export const listdays = (params) => defHttp.get({ url: Api.listdays, params }, { joinParamsToUrl: true });
 
 /**
+ *历史数据1
+ * @param params
+ */
+ export const getHistoryData = (params) => defHttp.post({ url: Api.getHistoryData, params });
+
+/**
  * 报警历史数据
  * @param params
  */

src/views/vent/monitorManager/alarmMonitor/common.data.ts

@@ -36,9 +36,6 @@ export function getMonitorComponent() {
     case 'sdmtjtbetmk': //布尔台
       typeMenuListGas = [{ name: '预警监测' }, { name: '预警指标' }, { name: '瓦斯参数' }];
       return typeMenuListGas;
-    // default:
-    //   typeMenuListGas = [{ name: '预警监测' }, { name: '预警指标' }];
-    //   return typeMenuListGas;
     default:
       // typeMenuListGas = [{ name: '预警监测' },{ name: '管道故障诊断' }, { name: '预警指标' }];
       typeMenuListGas = [{ name: '预警监测' }, { name: '预警指标' }];

src/views/vent/monitorManager/alarmMonitor/common/echartLine.vue

@@ -33,6 +33,13 @@
         };
       },
     },
+    //报警历史交点坐标
+    pointHisWarnData:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
+    }
   });
   //获取dom元素节点
   let line = ref<any>();
@@ -218,6 +225,26 @@
           {
             name: echartDataGqs.maxData ? echartDataGqs.maxData.lengedData : '',
             type: 'line',
+        
+            markPoint: {
+              symbol: 'circle',
+          data: [
+    {
+      coord: [345.44, 94250.0],
+      name: '交点',
+    },
+    
+  ],
+          symbolSize: 10,
+          itemStyle: {
+            color: '#19a3df',
+              borderColor: '#a3c8d8',
+          },
+          label: {
+            fontSize: 10,
+            color: '#fff',
+          },
+        },
             smooth: true,
             symbol: 'none',
             zlevel: 3,

src/views/vent/monitorManager/alarmMonitor/common/faultDiagnose.vue

@@ -42,12 +42,25 @@
                         <a-button type="primary" @click="getSearchHis">查询</a-button>
                     </a-form-item>
                 </a-form>
-                <div class="echart-area-box"></div>
+                <div class="echart-area-box">
+                    <BarAndLine
+                class="echarts-line"
+                :xAxisPropType="xAxisPropType"
+                :dataSource="hisEchartData"
+                height="100%"
+                width="100%"
+                :chartsColumns="chartsColumnList"
+                :option="echatsOption"
+              />
+                </div>
             </div>
             <div class="right-area-box">
                 <div class="title-t">
                     <div class="text-t">瓦斯抽采泵信息</div>
                 </div>
+                <div class="echart-area-box">
+                <echartLine :echartDataGq="echartData" :maxY="maxY" :echartDw="echartDw" :gridV="gridV" :pointHisWarnData="pointHisWarnData" />
+              </div>
             </div>
         </div>
     </div>
@@ -58,6 +71,8 @@ import { ref, reactive, watch } from 'vue';
 import dayjs from 'dayjs';
 import imgUrl from '/@/assets/images/fire/pie.png';
 import { SvgIcon } from '/@/components/Icon';
+import echartLine from './echartLine.vue';
+import BarAndLine from '/@/components/chart/BarAndLine.vue';
 let props = defineProps({
     timeData: {
         type: String,
@@ -69,6 +84,31 @@ let props = defineProps({
         default:()=>{
             return  []
         }
+    },
+    //历史数据图表
+    xAxisPropType:{
+        type:String,
+        default:''
+    },
+    hisEchartData:{
+        type:Array,
+        default:()=>{
+            return []
+        }
+    },
+    //报警历史数据曲线
+    echartData:{
+        type:Object,
+        default:()=>{
+            return {}
+        }
+    },
+    //报警历史曲线交点坐标
+    pointHisWarnDatas:{
+        type:Object,
+        default:()=>{
+            return {}
+        }
     }
 })
 
@@ -76,25 +116,69 @@ let formState = reactive({
     ttime_begin: '',
     ttime_end: ''
 })
+  let maxY=ref(100000)
+  let echartDw = ref('(m³/min)');
+    let chartsColumnList =reactive([
+  {
+    legend: '流量',
+    seriesName: '(m³/min)',
+    ymax: 15,
+    yname: 'ppm',
+    linetype: 'line',
+    yaxispos: 'left',
+    color: '#FDB146',
+    sort: 1,
+    xRotate: 0,
+    dataIndex: 'gdlyVal',
+  },
+  {
+    legend: '负压',
+    seriesName: '(Pa)',
+    ymax: 20,
+    yname: '%',
+    linetype: 'line',
+    yaxispos: 'right',
+    color: '#9C83D9',
+    sort: 2,
+    xRotate: 0,
+    dataIndex: 'fyVal',
+  },
+]) 
+let echatsOption = reactive({
+        grid: {
+          top: '10%',
+          left: '4',
+          right: '18',
+          bottom: '2%',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: null,
+        },
+      })
+
+      let gridV=reactive({
+          top: '5%',
+          left: '2%',
+          bottom: '2%',
+          right: '2%',
+          containLabel: true,
+      })
+let pointHisWarnData=reactive({})
 let $emit = defineEmits(['getSearchHis'])
 const topList = ref<any[]>()
 
 
 const getSearchHis = () => {
-    console.log(formState, '000===')
     $emit('getSearchHis', formState)
 }
 
 watch(() => props.timeData, (newV, oldV) => {
-    console.log(newV, 'time---')
     if (newV) {
         let index = newV.indexOf(' ')
         let specificTime = dayjs(`${newV.substring(0, index)}T${newV.substring(index + 1)}`)
-        console.log(specificTime, 'specificTime')
         formState.ttime_begin = specificTime.subtract(30, 'minute').format('YYYY-MM-DD HH:mm:ss')
-        console.log('前半个小时:', formState.ttime_begin);
         formState.ttime_end = specificTime.add(30, 'minute').format('YYYY-MM-DD HH:mm:ss')
-        console.log('后半个小时:', formState.ttime_end);
     }
 }, {
     immediate: true
@@ -106,6 +190,9 @@ if(newT){
 },{
     immediate:true
 })
+watch(()=>props.pointHisWarnDatas,(newP,oldP)=>{
+    pointHisWarnData=Object.assign({},newP)
+},{deep:true})
 </script>
 
 <style lang="less" scoped>
@@ -282,6 +369,9 @@ if(newT){
             background: var(--image-bj1) no-repeat center;
             background-size: 100% 100%;
             box-sizing: border-box;
+            .echart-area-box {
+                height: calc(100% - 40px)
+            }
         }
     }
 

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

@@ -79,15 +79,15 @@
         <gasParamter />
       </div>
       <div style="width: 100%; height: 100%" v-else-if="isShow == 'gzzd'">
-       <faultDiagnose :timeData="gzTime" :topData="topData" @getSearchHis="getlistdaysData1"></faultDiagnose>
+       <faultDiagnose :timeData="gzTime" :topData="topData" :xAxisPropType="xAxisPropType" :hisEchartData="hisEchartData" :echartData="echartData" :pointHisWarnDatas="pointHisWarnDatas" @getSearchHis="getlistdaysData1"></faultDiagnose>
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, onUnmounted } from 'vue';
-import { sysTypeWarnList, sysWarn,getDevice,listdays,bjlist } from '../common.api';
+import { ref, reactive, onMounted, onUnmounted,computed } from 'vue';
+import { sysTypeWarnList, sysWarn,getDevice,listdays,bjlist,getHistoryData } from '../common.api';
 import { useSystemSelect } from '/@/hooks/vent/useSystemSelect';
 import { useRouter } from 'vue-router';
 import CustomHeader from '/@/components/vent/customHeader.vue';
@@ -117,25 +117,45 @@ let router = useRouter();
 //监测/指标激活索引
 let activeIndex = ref(0);
 let isShow = ref('yjjc');
-let historySearch = reactive({
-    ttime_begin: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    ttime_end: dayjs().format('YYYY-MM-DD HH:mm:ss')
-})
 //故障诊断开始时间
 let gzTime=ref('')
 //故障诊断顶部区域数据
 let topData=ref<any[]>([])
+//根据诊断类型判断调用哪个历史数据接口
+let zdType=ref('')
+let historySearch = reactive({
+    ttime_begin:'',
+    ttime_end: '',
+})
+//实时历史图表
+let xAxisPropType=ref('')
+let hisEchartData=ref<any[]>([])
+//报警历史图表
+let echartData = reactive<any>({
+    maxData: {
+      lengedData: '',
+      data: [],
+    },
+    minData: {
+      lengedData: '',
+      data: [],
+    },
+    xData: [],
+  });
+  //报警历史交点坐标
+let pointHisWarnDatas=reactive({
+  x:0,
+  y:0
+})
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
 function getMonitor(flag?) {
   timer = setTimeout(
     async () => {
       const { sysOrgCode } = useGlobSetting();
-      if (sysOrgCode == 'sdmtjtbetmk') {
-        await getMenuList()
-      } else if(sysOrgCode != 'sdmtjtbetmk' && activeIndex.value==1) {
-       await getBjlist()
-      }else {
+      if (sysOrgCode == 'sdmtjtbdmk') {
+        await getBjlist()
+      } else {
         await getMenuList()
       }
      
@@ -238,12 +258,18 @@ async function getBjlist(){
         name: el.devicename,
         warn: '故障',
         deviceID: el.deviceid,
-        time:el.starttime
+        time:el.createTime
         // strtype: el.strtype,
         // detail: el.detail
       });
     });
     gzTime.value=menuList[activeIndex1.value].time
+    let index = gzTime.value.indexOf(' ')
+        let specificTime = dayjs(`${ gzTime.value.substring(0, index)}T${ gzTime.value.substring(index + 1)}`)
+        if(!historySearch.ttime_begin &&  !historySearch.ttime_end){
+          historySearch.ttime_begin = specificTime.subtract(30, 'minute').format('YYYY-MM-DD HH:mm:ss')
+          historySearch.ttime_end = specificTime.add(30, 'minute').format('YYYY-MM-DD HH:mm:ss')
+        }
     //获取实时数据-报警历史
     getDeviceList(menuList[activeIndex1.value].deviceID)
     //获取历史数据
@@ -255,6 +281,9 @@ async function getBjlist(){
 async function getDeviceList(param){
   let res=await getDevice({ids:param,devicetype: "gasmonitor"})
   if(res && res.msgTxt.length!=0){
+    echartData.maxData.data.length=0
+    echartData.minData.data.length=0
+    echartData.xData.length=0
     let data=res.msgTxt[0].datalist[0]
     topData.value=[
     {
@@ -297,22 +326,61 @@ async function getDeviceList(param){
         value: data.netStatus=='0' ? '断开' : '连接',
     },
 ]
-
+zdType.value=data.stationtype || ''
+let list=JSON.parse(data.readData.gasGlFaultDia)
+echartData.maxData.data=[list.y1 || 0,list.ld_y,list.y2 || 0]
+echartData.minData.data=[list.y3 || 0,list.ld_y,list.y4 || 0]
+echartData.xData=[...new Set([list.x1,list.ld_x,list.x2,list.x3,list.x4])].sort((a,b)=>a-b)
+pointHisWarnDatas.x =list.ld_x
+pointHisWarnDatas.y=list.ld_y
   }
-  console.log(res,'寸草塔二矿实时数据-报警历史')
 
 }
 //获取历史数据-寸草塔二矿
 async function getlistdaysData(Ids,param){
-  let res=await listdays({strtype: 'gasmonitor_normal',gdeviceid:Ids,...param})
-  console.log(res,'获取历史数据-寸草塔二矿')
+  if(zdType.value!='redis'){
+    let res=await listdays({strtype: 'gasmonitor_normal',gdeviceid:Ids,...param})
+    console.log(res,'获取历史数据-寸草塔二矿')
+    xAxisPropType.value='ttime'
+    let data = res.datalist.records;
+          if (data.length != 0) {
+            data.forEach((el) => {
+              Object.assign(el, el.readData);
+            });
+          }
+          hisEchartData.value = data;
+          console.log(  hisEchartData.value,'  hisEchartData.value')
+  }else {
+let res=await getHistoryData({ pageNum: 1,pageSize: 100,deviceId:Ids,isEmployee: true,...param})
+console.log(res,'获取历史数据-寸草塔二矿')
+xAxisPropType.value='time'
+          hisEchartData.value = res['records'];
+  }
+ 
 }
 async function getlistdaysData1(param){
-  console.log(param,'param---')
   historySearch.ttime_begin=param.ttime_begin
   historySearch.ttime_end=param.ttime_end
   let res=await listdays({strtype: 'gasmonitor_normal',gdeviceid:menuList[activeIndex1.value].deviceID,...historySearch})
   console.log(res,'获取历史数据-寸草塔二矿')
+
+  if(zdType.value!='redis'){
+    let res=await listdays({strtype: 'gasmonitor_normal',gdeviceid:menuList[activeIndex1.value].deviceID,...historySearch})
+    console.log(res,'获取历史数据-寸草塔二矿')
+    xAxisPropType.value='ttime'
+    let data = res.datalist.records;
+          if (data.length != 0) {
+            data.forEach((el) => {
+              Object.assign(el, el.readData);
+            });
+          }
+          hisEchartData.value = data;
+  }else {
+let res=await getHistoryData({ pageNum: 1,pageSize: 100,deviceId:menuList[activeIndex1.value].deviceID,isEmployee: true,...param})
+console.log(res,'获取历史数据-寸草塔二矿')
+xAxisPropType.value='time'
+          hisEchartData.value = res['records'];
+  }
 }
 
 //监测/预警指标选项切换
@@ -324,18 +392,21 @@ function btnClick(ind) {
       activeIndex1.value = 0;
       isShow.value = 'yjjc';
       break;
-    // case 1:
-    //   const { sysOrgCode } = useGlobSetting();
-    //   if (sysOrgCode == 'sdmtjtbetmk') {
-    //     activeIndex1.value = 0;
-    //     isShow.value = 'yjzb';
-    //   } else {
-    //     activeIndex1.value = 0;
-    //     isShow.value = 'gzzd';
-    //     getMonitor(true);
-    //   }
-    //   break;
     case 1:
+      const { sysOrgCode } = useGlobSetting();
+      if (sysOrgCode == 'sdmtjtbetmk') {
+        activeIndex1.value = 0;
+        isShow.value = 'yjzb';
+      } else if(sysOrgCode == 'sdmtjtbdmk') {
+        activeIndex1.value = 0;
+        isShow.value = 'gzzd';
+        getMonitor(true);
+      }else {
+        activeIndex1.value = 0;
+        isShow.value = '';
+      }
+      break;
+    case 2:
       activeIndex1.value = 0;
       isShow.value = 'wscs';
       break;

src/views/vent/safetyList/common/detail.vue

@@ -511,17 +511,18 @@ async function getDeviceList() {
   if (res) {
     let data = await get158StationData();
     let list = data.filter((v) => v.stationId == devStationId.value)[0];
-    formView = {
-      dylfsfx: list.dylfsfx,
-      dylbjzt: list.dylbjzt,
-      dyl1f2sADz: list.dyl1f2sADz,
-      dyl2f1sADz: list.dyl2f1sADz,
-      tfl: list.tfl,
-      yjbb: list.yjbb,
-      rjbb: list.rjbb,
-      zxlxbz: list.zxlxbz,
-      rqsj: list.rqsj,
-    };
+    // formView = {
+    //   dylfsfx: list.dylfsfx,
+    //   dylbjzt: list.dylbjzt,
+    //   dyl1f2sADz: list.dyl1f2sADz,
+    //   dyl2f1sADz: list.dyl2f1sADz,
+    //   tfl: list.tfl,
+    //   yjbb: list.yjbb,
+    //   rjbb: list.rjbb,
+    //   zxlxbz: list.zxlxbz,
+    //   rqsj: list.rqsj,
+    // };
+    formView=Object.assign({},list)
   }
 }
 //tab选项切换