瓦斯故障诊断更新

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

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

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

@@ -4,7 +4,8 @@
             <div class="nav" v-for="(item, index) in topList" :key="index">
                 <div class="pic" v-if="item.imgSrc">
                     <img :src="imgUrl" alt="" />
-                     <SvgIcon class="icon-style" :name="item.icon" style=" position: absolute;left: 50%;top:50%;transform: translate(-50%,-50%); width: 60px; height: 38px" />
+                    <SvgIcon class="icon-style" :name="item.icon"
+                        style=" position: absolute;left: 50%;top:50%;transform: translate(-50%,-50%); width: 60px; height: 38px" />
                 </div>
                 <div class="content" v-if="item.label && item.value">
                     <span>{{ item.label }}</span>
@@ -43,15 +44,8 @@
                     </a-form-item>
                 </a-form>
                 <div class="echart-area-box">
-                    <BarAndLine
-                class="echarts-line"
-                :xAxisPropType="xAxisPropType"
-                :dataSource="hisEchartData"
-                height="100%"
-                width="100%"
-                :chartsColumns="chartsColumnList"
-                :option="echatsOption"
-              />
+                    <BarAndLine class="echarts-line" :xAxisPropType="xAxisPropType" :dataSource="hisEchartData"
+                        height="100%" width="100%" :chartsColumns="chartsColumnList" :option="echatsOption" />
                 </div>
             </div>
             <div class="right-area-box">
@@ -59,8 +53,9 @@
                     <div class="text-t">瓦斯抽采泵信息</div>
                 </div>
                 <div class="echart-area-box">
-                <echartLine :echartDataGq="echartData" :maxY="maxY" :echartDw="echartDw" :gridV="gridV" :pointHisWarnData="pointHisWarnData" />
-              </div>
+                    <echartLine :echartDataGq="echartData" :maxY="maxY" :echartDw="echartDw" :gridV="gridV"
+                        :pointHisWarnData="pointHisWarnData" />
+                </div>
             </div>
         </div>
     </div>
@@ -79,92 +74,88 @@ let props = defineProps({
         default: ''
     },
     //顶部区域数据
-    topData:{
-        type:Array,
-        default:()=>{
-            return  []
+    topData: {
+        type: Array,
+        default: () => {
+            return []
         }
     },
     //历史数据图表
-    xAxisPropType:{
-        type:String,
-        default:''
+    xAxisPropType: {
+        type: String,
+        default: ''
     },
-    hisEchartData:{
-        type:Array,
-        default:()=>{
+    hisEchartData: {
+        type: Array,
+        default: () => {
             return []
         }
     },
     //报警历史数据曲线
-    echartData:{
-        type:Object,
-        default:()=>{
+    echartData: {
+        type: Object,
+        default: () => {
             return {}
         }
     },
-    //报警历史曲线交点坐标
-    pointHisWarnDatas:{
-        type:Object,
-        default:()=>{
-            return {}
-        }
-    }
 })
 
 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 maxY = ref<any>(0)
+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({})
+    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({
+    x: 0,
+    y: 0,
+})
 let $emit = defineEmits(['getSearchHis'])
 const topList = ref<any[]>()
 
@@ -183,16 +174,41 @@ watch(() => props.timeData, (newV, oldV) => {
 }, {
     immediate: true
 })
-watch(()=>props.topData,(newT,oldT)=>{
-if(newT){
-    topList.value=newT
-}
-},{
-    immediate:true
+watch(() => props.topData, (newT, oldT) => {
+    if (newT) {
+        topList.value = newT
+    }
+}, {
+    immediate: true
 })
-watch(()=>props.pointHisWarnDatas,(newP,oldP)=>{
-    pointHisWarnData=Object.assign({},newP)
-},{deep:true})
+watch(() => props.echartData, (newE, oldE) => {
+    if (newE.maxData.data.length != 0 && newE.xData.length != 0) {
+        pointHisWarnData.x = newE.xData[1]
+        pointHisWarnData.y = newE.maxData.data[1]
+        let max1 = newE.maxData.data.reduce((acr, cur) => {
+            return acr > cur ? acr : cur;
+        });
+        let max2 = newE.minData.data.reduce((acr1, cur1) => {
+            return acr1 > cur1 ? acr1 : cur1;
+        });
+        maxY.value = max1 >= max2 ? max1 : max2;
+        maxY.value =
+            maxY.value.toString().indexOf('.') == -1 ? maxY.value.toString() : maxY.value.toString().substring(0, maxY.value.toString().indexOf('.'));
+        if (maxY.value.length < 2 && Number(maxY.value) < 1) {
+            maxY.value = 1;
+        } else if (maxY.value.length < 2 && Number(maxY.value) >= 1) {
+            maxY.value = 10;
+        } else if (maxY.value.length < 3) {
+            maxY.value = (Number(maxY.value[0]) + 1) * 10;
+        } else if (maxY.value.length < 4) {
+            maxY.value = (Number(maxY.value[0]) + 1) * 100;
+        } else if (maxY.value.length < 5) {
+            maxY.value = (Number(maxY.value[0]) + 1) * 1000;
+        } else if (maxY.value.length < 6) {
+            maxY.value = (Number(maxY.value[0]) + 1) * 10000;
+        }
+    }
+}, { immediate: true, deep: true })
 </script>
 
 <style lang="less" scoped>
@@ -201,24 +217,24 @@ watch(()=>props.pointHisWarnDatas,(newP,oldP)=>{
 @{theme-deepblue} {
     .faultDiagnose {
         --image-bj1: url('/@/assets/images/themify/deepblue/fire/bj1.png');
-    --image-max: url('/@/assets/images/themify/deepblue/fire/max.svg');
-    --image-min: url('/@/assets/images/themify/deepblue/fire/min.svg');
-    --image-pj: url('/@/assets/images/themify/deepblue/fire/pj.svg');
-    --image-bj1: url('/@/assets/images/themify/deepblue/fire/bj1.png');
-    --image-14174: url('/@/assets/images/themify/deepblue/fire/14174.png');
-    --image-contetn: url('/@/assets/images/themify/deepblue/fire/contetn.png');
+        --image-max: url('/@/assets/images/themify/deepblue/fire/max.svg');
+        --image-min: url('/@/assets/images/themify/deepblue/fire/min.svg');
+        --image-pj: url('/@/assets/images/themify/deepblue/fire/pj.svg');
+        --image-bj1: url('/@/assets/images/themify/deepblue/fire/bj1.png');
+        --image-14174: url('/@/assets/images/themify/deepblue/fire/14174.png');
+        --image-contetn: url('/@/assets/images/themify/deepblue/fire/contetn.png');
     }
 }
 
 .faultDiagnose {
     --image-bj1: url('/@/assets/images/fire/bj1.png');
-  --image-max: url('/@/assets/images/fire/max.svg');
-  --image-min: url('/@/assets/images/fire/min.svg');
-  --image-pj: url('/@/assets/images/fire/pj.svg');
-  --image-bj1: url('/@/assets/images/fire/bj1.png');
-  --image-14174: url('/@/assets/images/fire/14174.png');
-  --image-contetn: url('/@/assets/images/fire/contetn.png');
-  --border-image-2: linear-gradient(to bottom, transparent, #024688, transparent);
+    --image-max: url('/@/assets/images/fire/max.svg');
+    --image-min: url('/@/assets/images/fire/min.svg');
+    --image-pj: url('/@/assets/images/fire/pj.svg');
+    --image-bj1: url('/@/assets/images/fire/bj1.png');
+    --image-14174: url('/@/assets/images/fire/14174.png');
+    --image-contetn: url('/@/assets/images/fire/contetn.png');
+    --border-image-2: linear-gradient(to bottom, transparent, #024688, transparent);
     width: 100%;
     height: 100%;
 
@@ -238,9 +254,9 @@ watch(()=>props.pointHisWarnDatas,(newP,oldP)=>{
             justify-content: center;
             align-items: center;
             flex: 1;
-                height: 100%;
-                border-right: 2px solid;
-                border-image: var(--border-image-2) 1 1 1;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
             // &:nth-child(1) {
             //     flex: 1;
             //     height: 100%;
@@ -275,11 +291,11 @@ watch(()=>props.pointHisWarnDatas,(newP,oldP)=>{
             //     flex: 1.4;
             //     height: 100%;
 
-    
+
             // }
 
             .pic {
-                position:relative;
+                position: relative;
                 width: 30%;
                 height: 82%;
 
@@ -369,6 +385,7 @@ watch(()=>props.pointHisWarnDatas,(newP,oldP)=>{
             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

@@ -1,26 +1,21 @@
 <template>
   <customHeader :options="options" @change="getSelectRow" :optionValue="optionValue"> 瓦斯监测预警 </customHeader>
   <div class="gasWarn">
-    <a-button
-      v-if="!hasPermission('gasWarn:return')"
-      preIcon="ant-design:rollback-outlined"
-      type="text"
-      size="small"
-      style="position: absolute; left: 15px; top: 15px; color: #fff"
-      @click="getBack"
-    >
+    <a-button v-if="!hasPermission('gasWarn:return')" preIcon="ant-design:rollback-outlined" type="text" size="small"
+      style="position: absolute; left: 15px; top: 15px; color: #fff" @click="getBack">
       返回
     </a-button>
     <div class="alarm-menu">
       <div class="type-btn">
-      
+
         <div :class="activeIndex == index ? 'btn1' : 'btn'" v-for="(item, index) in typeMenuListGas" :key="index"
           @click="btnClick(index)">
           {{ item.name }}
         </div>
       </div>
       <div class="card-btn">
-        <div :class="activeIndex1 == ind ? 'btn1' : 'btn'" v-for="(item, ind) in menuList" :key="ind" @click="cardClick(ind, item)">
+        <div :class="activeIndex1 == ind ? 'btn1' : 'btn'" v-for="(item, ind) in menuList" :key="ind"
+          @click="cardClick(ind, item)">
           <div class="text">{{ item.name }}</div>
           <div class="warn">{{ item.warn }}</div>
         </div>
@@ -79,15 +74,16 @@
         <gasParamter />
       </div>
       <div style="width: 100%; height: 100%" v-else-if="isShow == 'gzzd'">
-       <faultDiagnose :timeData="gzTime" :topData="topData" :xAxisPropType="xAxisPropType" :hisEchartData="hisEchartData" :echartData="echartData" :pointHisWarnDatas="pointHisWarnDatas" @getSearchHis="getlistdaysData1"></faultDiagnose>
+        <faultDiagnose :timeData="gzTime" :topData="topData" :xAxisPropType="xAxisPropType"
+          :hisEchartData="hisEchartData" :echartData="echartData" @getSearchHis="getlistdaysData1"></faultDiagnose>
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, onUnmounted,computed } from 'vue';
-import { sysTypeWarnList, sysWarn,getDevice,listdays,bjlist,getHistoryData } 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';
@@ -118,35 +114,31 @@ let router = useRouter();
 let activeIndex = ref(0);
 let isShow = ref('yjjc');
 //故障诊断开始时间
-let gzTime=ref('')
+let gzTime = ref('')
 //故障诊断顶部区域数据
-let topData=ref<any[]>([])
+let topData = ref<any[]>([])
 //根据诊断类型判断调用哪个历史数据接口
-let zdType=ref('')
+let zdType = ref('')
 let historySearch = reactive({
-    ttime_begin:'',
-    ttime_end: '',
+  ttime_begin: '',
+  ttime_end: '',
 })
 //实时历史图表
-let xAxisPropType=ref('')
-let hisEchartData=ref<any[]>([])
+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
-})
+  maxData: {
+    lengedData: '',
+    data: [],
+  },
+  minData: {
+    lengedData: '',
+    data: [],
+  },
+  xData: [],
+});
+
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
 function getMonitor(flag?) {
@@ -158,7 +150,7 @@ function getMonitor(flag?) {
       } else {
         await getMenuList()
       }
-     
+
       if (timer) {
         timer = null;
       }
@@ -248,138 +240,136 @@ async function getMenuList() {
   }
 }
 //寸草塔二矿左侧菜单
-async function getBjlist(){
-  let res=await bjlist({devicetype: 'gasmonitor*',pageNo:1,pageSize:100,isok:'0',})
-  console.log(res,'寸草塔二矿左侧菜单')
-  if (res && res.records.length!=0) {
+async function getBjlist() {
+  let res = await bjlist({ devicetype: 'gasmonitor*', pageNo: 1, pageSize: 100, isok: '0', })
+  console.log(res, '寸草塔二矿左侧菜单')
+  if (res && res.records.length != 0) {
     menuList.length = 0;
     res.records.forEach((el) => {
       menuList.push({
         name: el.devicename,
         warn: '故障',
         deviceID: el.deviceid,
-        time:el.createTime
+        time: el.createTime
         // strtype: el.strtype,
         // detail: el.detail
       });
     });
-    gzTime.value=menuList[activeIndex1.value].time
+    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')
-        }
+    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)
     //获取历史数据
-    getlistdaysData(menuList[activeIndex1.value].deviceID,historySearch)
+    getlistdaysData(menuList[activeIndex1.value].deviceID, historySearch)
   }
 }
 
 //获取实时数据-寸草塔二矿-报警历史
-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=[
-    {
+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 = [
+      {
         id: 0,
         label: '瓦斯浓度(%)',
         imgSrc: true,
-        icon:'link',
+        icon: 'link',
         value: data.readData.gasC || '--',
-      
-    },
-    {
+
+      },
+      {
         id: 1,
         label: '二氧化碳浓度(%)',
         imgSrc: true,
-        icon:'co2val',
+        icon: 'co2val',
         value: data.readData.co2val || '--',
-        
-    },
-    {
+
+      },
+      {
         id: 2,
         label: '瓦斯抽采混量',
         imgSrc: true,
-        icon:'link',
+        icon: 'link',
         value: data.readData.gasMixMass || '--',
-     
-    },
-    {
+
+      },
+      {
         id: 3,
         label: '报警状态',
         imgSrc: true,
-        icon:'alarm-warning',
-        value: data.warnLevel=='101' ? '低风险' : data.warnLevel=='102' ? '一般风险' : data.warnLevel=='103' ? '较大风险' : data.warnLevel=='104' ? '重大风险' : data.warnLevel=='201' ? '报警' : data.warnLevel=='10000' ? '数据超限' : data.warnLevel=='1001'? '网络中断' : '正常',
-     
-    },
-    {
+        icon: 'alarm-warning',
+        value: data.warnLevel == '101' ? '低风险' : data.warnLevel == '102' ? '一般风险' : data.warnLevel == '103' ? '较大风险' : data.warnLevel == '104' ? '重大风险' : data.warnLevel == '201' ? '报警' : data.warnLevel == '10000' ? '数据超限' : data.warnLevel == '1001' ? '网络中断' : '正常',
+
+      },
+      {
         id: 4,
         label: '通信状态',
         imgSrc: true,
-        icon:'link',
-        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
+        icon: 'link',
+        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)
   }
 
 }
 //获取历史数据-寸草塔二矿
-async function getlistdaysData(Ids,param){
-  if(zdType.value!='redis'){
-    let res=await listdays({strtype: 'gasmonitor_normal',gdeviceid:Ids,...param})
-    console.log(res,'获取历史数据-寸草塔二矿')
-    xAxisPropType.value='ttime'
+async function getlistdaysData(Ids, param) {
+  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'];
+    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){
-  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'
+async function getlistdaysData1(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'];
+    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'];
   }
 }
 
@@ -397,11 +387,11 @@ function btnClick(ind) {
       if (sysOrgCode == 'sdmtjtbetmk') {
         activeIndex1.value = 0;
         isShow.value = 'yjzb';
-      } else if(sysOrgCode == 'sdmtjtbdmk') {
+      } else if (sysOrgCode == 'sdmtjtbdmk') {
         activeIndex1.value = 0;
         isShow.value = 'gzzd';
         getMonitor(true);
-      }else {
+      } else {
         activeIndex1.value = 0;
         isShow.value = '';
       }
@@ -417,14 +407,20 @@ function btnClick(ind) {
 function cardClick(ind, item) {
   clearTimeout(timer);
   activeIndex1.value = ind;
-  gzTime.value=item.time
+  gzTime.value = item.time
   chartListWs.length = 0;
   getMonitor(true);
 }
 
 onMounted(() => {
-  getMenuList();
-  getMonitor(true);
+  const { sysOrgCode } = useGlobSetting();
+  if (sysOrgCode == 'sdmtjtbdmk') {
+    getBjlist()
+    getMonitor(true);
+  } else {
+    getMenuList();
+    getMonitor(true);
+  }
 });
 onUnmounted(() => {
   if (timer) {