瓦斯日报，人工瓦斯巡检，预警管控修改-提交

src/views/vent/gas/gasReportInspect/ceshi.json

@@ -1,74 +0,0 @@
-[
-    {
-    "o2_min": "20.03",//O2(%)-最小值
-    "c2h4_ave": "0.00",//C2H4(PPM)-平均值
-    "o2_ave": "20.32",//O2(%)-平均值
-    "co_ave": "2.57",//CO(PPM)-平均值
-    "jcdd": "42206采空区回风侧25联巷",//监测地点
-    "co_max": "4.00",//CO(PPM)-最大值
-    "ch4_ave": "0.12",//CH4(%)-平均值
-    "co2_max": "1.13",//CO2(%)-最大值
-    "c2h4_max": "0.00",//C2H4(PPM)-最大值
-    "c2h2_max": "0.00",//C2H2(PPM)-最大值
-    "xh": "1",//序号
-    "fxcs": "36",//分析次数
-    "btTriBlast": {//爆炸三角形信息-与现有束管监测详情页面爆炸三角形的字段一样
-    "G_y": 10.52,
-    "G_x": 0,
-    "F_y": 0,
-    "A_x": 5.01,
-    "B_x": 15.03,
-    "A_y": 19.93,
-    "B_y": 17.83,
-    "E_y": 9.9968,
-    "F_x": 9.57,
-    "E_x": 5.01
-    },
-    "co2_ave": "0.74",//CO2(%)-平均值
-    "c2h2_ave": "0.00",//C2H2(PPM)-平均值
-    "ch4_max": "0.24",//CH4(%)-最大值
-    "sbmc":"束管监测",//设备名称***
-    "sbbh":"01",//设备编号***
-    "glbh":"01",//管路编号***
-    "n2_max":"0.00",//N2(%)-最大值***
-    "n2_ave":"0.00",//N2(%)-平均值***
-    "no2_max":"0.00",//NO2(ppm)-最大值***
-    "no2_ave":"0.00"//NO2(ppm)-平均值***
-    },
-    {
-    "o2_min": "20.47",
-    "c2h4_ave": "0.00",
-    "o2_ave": "20.63",
-    "co_ave": "4.29",
-    "jcdd": "42206综采回风隅角",
-    "co_max": "8.00",
-    "ch4_ave": "0.06",
-    "co2_max": "0.16",
-    "c2h4_max": "0.00",
-    "c2h2_max": "0.00",
-    "xh": "2",
-    "fxcs": "36",
-    "btTriBlast": {
-    "G_y": 10.52,
-    "G_x": 0,
-    "F_y": 0,
-    "A_x": 5.02,
-    "B_x": 15.09,
-    "A_y": 19.93,
-    "B_y": 17.81,
-    "E_y": 9.9893,
-    "F_x": 9.58,
-    "E_x": 5.02
-    },
-    "co2_ave": "0.04",
-    "c2h2_ave": "0.00",
-    "ch4_max": "0.17",
-    "sbmc":"束管监测",//设备名称***
-    "sbbh":"01",//设备编号***
-    "glbh":"01",//管路编号***
-    "n2_max":"0.00",//N2(%)-最大值***
-    "n2_ave":"0.00",//N2(%)-平均值***
-    "no2_max":"0.00",//NO2(ppm)-最大值***
-    "no2_ave":"0.00"//NO2(ppm)-平均值***
-    }
-    ]

src/views/vent/gas/gasReportInspect/gasReportInspect.data.ts

@@ -49,13 +49,278 @@ export const columnsType: BasicColumn[] = [
         align: 'center',
     },  
 ];
+export const columnsGas1: BasicColumn[] = [
+    {
+        title: '序号',
+        width: 60,
+        align: 'center',
+        customRender: ({ index }: { index: number }) => `${index + 1}`
+    },
+    {
+        title: '监测地点',
+        dataIndex: 'jcdd',
+        key: 'jcdd',
+        width:180,
+        align: 'center',
+    },
+    {
+        title: '夜班',
+        children: [
+            {
+                title: 'CH₄‌(%)',
+                dataIndex: 'ch4Night',
+                key: 'ch4Night',
+                align: 'center',
+            },
+            {
+                title: 'CO₂‌(%)',
+                dataIndex: 'co2Night',
+                key: 'co2Night',
+                align: 'center',
+            },
+            {
+                title: 'CO(ppm)',
+                dataIndex: 'coNight',
+                key: 'coNight',
+                align: 'center',
+            },
+            {
+                title: 'O₂‌(%)',
+                dataIndex: 'o2Night',
+                key: 'o2Night',
+                align: 'center',
+            },
+            {
+                title: 'T(°C)',
+                dataIndex: 'tNight',
+                key: 'tNight',
+                align: 'center',
+            },
+        ]
+    },
+    {
+        title: '早班',
+        children: [
+            {
+                title: 'CH₄‌(%)',
+                dataIndex: 'ch4Early',
+                key: 'ch4Early',
+                align: 'center',
+            },
+            {
+                title: 'CO₂‌(%)',
+                dataIndex: 'co2Early',
+                key: 'co2Early',
+                align: 'center',
+            },
+            {
+                title: 'CO(ppm)',
+                dataIndex: 'coEarly',
+                key: 'coEarly',
+                align: 'center',
+            },
+            {
+                title: 'O₂‌(%)',
+                dataIndex: 'o2Early',
+                key: 'o2Early',
+                align: 'center',
+            },
+            {
+                title: 'T(°C)',
+                dataIndex: 'tEarly',
+                key: 'tEarly',
+                align: 'center',
+            },
+        ]
+
+    },
+    {
+        title: '中班',
+        children: [
+            {
+                title: 'CH₄‌(%)',
+                dataIndex: 'ch4Noon',
+                key: 'ch4Noon',
+                align: 'center',
+            },
+            {
+                title: 'CO₂‌(%)',
+                dataIndex: 'co2Noon',
+                key: 'co2Noon',
+                align: 'center',
+            },
+            {
+                title: 'CO(ppm)',
+                dataIndex: 'coNoon',
+                key: 'coNoon',
+                align: 'center',
+            },
+            {
+                title: 'O₂‌(%)',
+                dataIndex: 'o2Noon',
+                key: 'o2Noon',
+                align: 'center',
+            },
+            {
+                title: 'T(°C)',
+                dataIndex: 'tNoon',
+                key: 'tNoon',
+                align: 'center',
+            },
+        ]
 
-//分页参数
-export const pagination = {
-    current: 1, // 当前页码
-    pageSize: 15, // 每页显示条数
-    total: 0, // 总条目数，后端返回
-    // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
-    showSizeChanger: true, // 是否可改变每页显示条数
-    pageSizeOptions: ['10','15', '20','25', '50'], // 可选的每页显示条数
-};
+    },
+    
+];
+
+export const columnsGas2: BasicColumn[] = [
+    {
+        title: '序号',
+        width: 60,
+        align: 'center',
+        customRender: ({ index }: { index: number }) => `${index + 1}`
+    },
+    {
+        title: '监测地点',
+        dataIndex: 'jcdd',
+        key: 'jcdd',
+        width:130,
+        align: 'center',
+    },
+    {
+        title: '煤层',
+        dataIndex: 'mc',
+        width:80,
+        key: 'mc',
+        align: 'center',
+    },
+    {
+        title: '夜班',
+        children: [
+            {
+                title: 'CH₄‌(%)',
+                dataIndex: 'ch4Night',
+                key: 'ch4Night',
+                align: 'center',
+            },
+            {
+                title: 'CO₂‌(%)',
+                dataIndex: 'co2Night',
+                key: 'co2Night',
+                align: 'center',
+            },
+            {
+                title: 'CO(ppm)',
+                dataIndex: 'coNight',
+                key: 'coNight',
+                width:80,
+                align: 'center',
+            },
+            {
+                title: 'O₂‌(%)',
+                dataIndex: 'o2Night',
+                key: 'o2Night',
+                align: 'center',
+            },
+            {
+                title: 'T(°C)',
+                dataIndex: 'tNight',
+                key: 'tNight',
+                align: 'center',
+            },
+            {
+                title: '巡检员',
+                dataIndex: 'checkPersonNight',
+                key: 'checkPersonNight',
+                align: 'center',
+            },
+        ]
+    },
+    {
+        title: '早班',
+        children: [
+            {
+                title: 'CH₄‌(%)',
+                dataIndex: 'ch4Early',
+                key: 'ch4Early',
+                align: 'center',
+            },
+            {
+                title: 'CO₂‌(%)',
+                dataIndex: 'co2Early',
+                key: 'co2Early',
+                align: 'center',
+            },
+            {
+                title: 'CO(ppm)',
+                dataIndex: 'coEarly',
+                key: 'coEarly',
+                width:80,
+                align: 'center',
+            },
+            {
+                title: 'O₂‌(%)',
+                dataIndex: 'o2Early',
+                key: 'o2Early',
+                align: 'center',
+            },
+            {
+                title: 'T(°C)',
+                dataIndex: 'tEarly',
+                key: 'tEarly',
+                align: 'center',
+            },
+            {
+                title: '巡检员',
+                dataIndex: 'checkPersonEarly',
+                key: 'checkPersonEarly',
+                align: 'center',
+            },
+        ]
+
+    },
+    {
+        title: '中班',
+        children: [
+            {
+                title: 'CH₄‌(%)',
+                dataIndex: 'ch4Noon',
+                key: 'ch4Noon',
+                align: 'center',
+            },
+            {
+                title: 'CO₂‌(%)',
+                dataIndex: 'co2Noon',
+                key: 'co2Noon',
+                align: 'center',
+            },
+            {
+                title: 'CO(ppm)',
+                dataIndex: 'coNoon',
+                key: 'coNoon',
+                width:80,
+                align: 'center',
+            },
+            {
+                title: 'O₂‌(%)',
+                dataIndex: 'o2Noon',
+                key: 'o2Noon',
+                align: 'center',
+            },
+            {
+                title: 'T(°C)',
+                dataIndex: 'tNoon',
+                key: 'tNoon',
+                align: 'center',
+            },
+            {
+                title: '巡检员',
+                dataIndex: 'checkPersonNoon',
+                key: 'checkPersonNoon',
+                align: 'center',
+            },
+        ]
+
+    },
+    
+];

src/views/vent/gas/gasReportInspect/index-time.vue

@@ -0,0 +1,165 @@
+<template>
+    <div class="index-time">
+        <div class="content">
+            <div class="left-box">
+                <!-- 左侧树菜单 -->
+                <div class="card-toggle">
+                    <div :class="gasType == 'gasDayNight' ? 'card-item1' : 'card-item'"
+                        @click="handlerToggle('gasDayNight')">夜班</div>
+                    <div :class="gasType == 'gasDayEarly' ? 'card-item1' : 'card-item'"
+                        @click="handlerToggle('gasDayEarly')">早班</div>
+                    <div :class="gasType == 'gasDayNoon' ? 'card-item1' : 'card-item'"
+                        @click="handlerToggle('gasDayNoon')">中班</div>
+                </div>
+                <div v-if="listArr.length != 0" class="card-file">
+                    <fileSystem :selected="selected" :list="listArr" :draggable="true" @on-click="onClick">
+                        <template #icon="{ item }">
+                            <template v-if="item.isFolder">
+                                <SvgIcon v-if="item.isexpanded" size="18" name="file-open" />
+                                <SvgIcon v-else size="18" name="file-close" />
+                            </template>
+                            <treeIcon class="iconfont" :title="item.title" v-else />
+                        </template>
+                    </fileSystem>
+                </div>
+            </div>
+            <div class="right-box">
+                <a-table :columns="columnsType" size="small" :data-source="tableData" :scroll="{ y: 754 }"
+                    class="tableW" :pagination="false"></a-table>
+            </div>
+        </div>
+    </div>1
+</template>
+
+<script setup lang="ts">
+import { ref, nextTick, reactive, onMounted } from 'vue';
+import fileSystem from './comment/common/cameraTree.vue';
+import { SvgIcon } from '/@/components/Icon';
+import treeIcon from './comment/common/Icon/treeIcon.vue';
+import { columnsType,  } from './gasReportInspect.data';
+import { queryReportData } from './gasReportInspect.api';
+
+let gasType = ref('gasDayNight')
+//左侧菜单列表
+let listArr = reactive<any[]>([]);
+//lxh 当前选中树节点
+let selected = reactive<any>({
+    id: null,
+    pid: null,
+    title: '',
+    isFolder: false,
+});
+let tableData = ref<any[]>([])
+let handlerToggle = (param) => {
+    gasType.value = param
+    getTreeList(gasType.value)
+}
+//获取左侧菜单树
+async function getTreeList(param) {
+    listArr.length = 0
+    const res = await queryReportData({ type: param })
+    console.log(res, '早中晚----------------')
+    if (res) {
+        listArr.push({
+            id: res.id,
+            pid: null,
+            title: res.fileName,
+            isFolder: true,
+        })
+        tableData.value = JSON.parse(res.content)
+    }
+
+}
+//点击目录
+function onClick(node) {
+    selected.id = node.id;
+    selected.pid = node.pid;
+    selected.title = node.title;
+    selected.isFolder = node.isFolder;
+    selected.ppid = node.ppid
+};
+
+onMounted(() => {
+    getTreeList(gasType.value)
+})
+</script>
+
+<style lang="less" scoped>
+.index-time {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    .content {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: flex-start;
+        position: relative;
+
+        // z-index: 999;
+        .left-box {
+            width: 15%;
+            height: 100%;
+            padding: 20px;
+            border: 1px solid #99e8ff66;
+            background: #27546e1a;
+            box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+            -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+            -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
+            overflow-y: auto;
+
+            .card-toggle {
+                height: 30px;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 10px;
+                color: #fff;
+
+                .card-item {
+                    width: calc(33.3% - 5px);
+                    height: 100%;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    background: #1a5b7f;
+                    border-radius: 5px;
+                    cursor: pointer;
+                }
+
+                .card-item1 {
+                    width: calc(33.3% - 5px);
+                    height: 100%;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    background: #5dd8f7;
+                    border-radius: 5px;
+                    cursor: pointer;
+                }
+            }
+
+            .card-file {
+                height: calc(100% - 40px);
+                overflow-y: auto;
+            }
+
+            // lxh
+            .iconfont {
+                color: #fff;
+                font-size: 12px;
+                margin-left: 5px;
+            }
+        }
+
+        .right-box {
+            width: 85%;
+            height: 100%;
+            padding: 0px 0px 0px 15px;
+            box-sizing: border-box;
+        }
+    }
+}
+</style>

src/views/vent/gas/gasReportInspect/index-type.vue

@@ -0,0 +1,168 @@
+<template>
+    <div class="index-type">
+        <div class="content">
+            <div class="left-box">
+                <!-- 左侧树菜单 -->
+                <div class="card-toggle">
+                    <div :class="gasType=='gasDay1' ? 'card-item1' : 'card-item'" @click="handlerToggle('gasDay1')">一次巡检</div>
+                    <div :class="gasType=='gasDay2' ? 'card-item1' : 'card-item' " @click="handlerToggle('gasDay2')">二次巡检</div>
+                </div>
+                <fileSystem :selected="selected" :list="listArr" :draggable="true" @on-click="onClick">
+                    <template #icon="{ item }">
+                        <template v-if="item.isFolder">
+                            <SvgIcon v-if="item.isexpanded" size="18" name="file-open" />
+                            <SvgIcon v-else size="18" name="file-close" />
+                        </template>
+                        <treeIcon class="iconfont" :title="item.title" v-else />
+                    </template>
+                </fileSystem>
+            </div>
+            <div class="right-box">
+                <a-table :columns="columnsType" size="small" :data-source="tableData" :scroll="{ y: 754 }"
+                    class="tableW" :pagination="false"></a-table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, nextTick, reactive, onMounted } from 'vue';
+import fileSystem from './comment/common/cameraTree.vue';
+import { SvgIcon } from '/@/components/Icon';
+import treeIcon from './comment/common/Icon/treeIcon.vue';
+import { columnsGas1,columnsGas2, } from './gasReportInspect.data';
+import { queryReportData } from './gasReportInspect.api';
+
+
+let gasType = ref('gasDay1')
+//左侧菜单列表
+let listArr = reactive<any[]>([]);
+//lxh 当前选中树节点
+let selected = reactive<any>({
+    id: null,
+    pid: null,
+    title: '',
+    isFolder: false,
+});
+let tableData = ref<any[]>([])
+let columnsType = ref<any[]>(columnsGas1)
+let handlerToggle = (param) => {
+    gasType.value = param
+    switch (gasType.value) {
+        case 'gasDay1':
+            columnsType.value = columnsGas1
+            getTreeList()
+            break;
+        case 'gasDay2':
+            columnsType.value=columnsGas2
+            getTreeList()
+            break;
+    }
+}
+//获取左侧菜单树
+async function getTreeList() {
+    listArr.length = 0
+    const res = await queryReportData({ type: gasType.value })
+    if (res) {
+        listArr.push({
+            id: res.id,
+            pid: null,
+            title: res.fileName,
+            isFolder: true,
+        })
+        tableData.value = JSON.parse(res.content)
+    }
+}
+//点击目录
+function onClick(node) {
+    selected.id = node.id;
+    selected.pid = node.pid;
+    selected.title = node.title;
+    selected.isFolder = node.isFolder;
+    selected.ppid = node.ppid
+};
+
+onMounted(() => {
+    getTreeList()
+})
+</script>
+
+<style lang="less" scoped>
+.index-type {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    .content {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: flex-start;
+        position: relative;
+
+        // z-index: 999;
+        .left-box {
+            width: 15%;
+            height: 100%;
+            padding: 20px;
+            border: 1px solid #99e8ff66;
+            background: #27546e1a;
+            box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+            -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+            -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
+            overflow-y: auto;
+
+            .card-toggle {
+                height: 30px;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 10px;
+                color: #fff;
+
+                .card-item {
+                    width: calc(50% - 5px);
+                    height: 100%;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    background: #1a5b7f;
+                    border-radius: 5px;
+                    cursor: pointer;
+                }
+
+                .card-item1 {
+                    width: calc(50% - 5px);
+                    height: 100%;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    background: #5dd8f7;
+                    border-radius: 5px;
+                    cursor: pointer;
+                }
+            }
+
+            .card-file {
+                height: calc(100% - 40px);
+                overflow-y: auto;
+            }
+
+            // lxh
+            .iconfont {
+                color: #fff;
+                font-size: 12px;
+                margin-left: 5px;
+            }
+        }
+
+        .right-box {
+            width: 85%;
+            height: 100%;
+            padding: 0px 0px 0px 15px;
+            box-sizing: border-box;
+        }
+    }
+}
+</style>

src/views/vent/gas/gasReportInspect/index.vue

@@ -2,91 +2,38 @@
     <div class="gasReportInspect">
         <customHeader>报表管理中心</customHeader>
         <div class="content">
-            <div class="left-box">
-                <!-- 左侧树菜单 -->
-                <div class="card-toggle">
-                    <div :class="gasType == 'gasDayNight' ? 'card-item1' : 'card-item'"
-                        @click="handlerToggle('gasDayNight')">夜班</div>
-                    <div :class="gasType == 'gasDayEarly' ? 'card-item1' : 'card-item'"
-                        @click="handlerToggle('gasDayEarly')">早班</div>
-                    <div :class="gasType == 'gasDayNoon' ? 'card-item1' : 'card-item'"
-                        @click="handlerToggle('gasDayNoon')">中班</div>
-                </div>
-                <div v-if="listArr.length != 0" class="card-file">
-                    <fileSystem :selected="selected" :list="listArr" :draggable="true" @on-click="onClick">
-                        <template #icon="{ item }">
-                            <template v-if="item.isFolder">
-                                <SvgIcon v-if="item.isexpanded" size="18" name="file-open" />
-                                <SvgIcon v-else size="18" name="file-close" />
-                            </template>
-                            <treeIcon class="iconfont" :title="item.title" v-else />
-                        </template>
-                    </fileSystem>
-                </div>
-
-            </div>
-            <div class="right-box">
-                <a-table :columns="columnsType" size="small" :data-source="tableData" :scroll="{ y: 700 }"
-                    class="tableW" :pagination="false"></a-table>
-            </div>
+            <component :is="currentComponent"></component>
         </div>
     </div>1
 </template>
 
 <script setup lang="ts">
-import { ref, nextTick, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
+import { useGlobSetting } from '/@/hooks/setting';
+import indexTime from './index-time.vue'
+import indexType from './index-type.vue'
 import customHeader from '/@/components/vent/customHeader.vue';
-import fileSystem from './comment/common/cameraTree.vue';
-import { SvgIcon } from '/@/components/Icon';
-import treeIcon from './comment/common/Icon/treeIcon.vue';
-import { columnsType, pagination } from './gasReportInspect.data';
-import { queryReportData } from './gasReportInspect.api';
-
-
-let gasType = ref('gasDayNight')
-//左侧菜单列表
-let listArr = reactive<any[]>([]);
-//lxh 当前选中树节点
-let selected = reactive<any>({
-    id: null,
-    pid: null,
-    title: '',
-    isFolder: false,
-});
-let tableData = ref<any[]>([])
-let handlerToggle = (param) => {
-    gasType.value = param
-    pagination.current = 1
-    getTreeList(gasType.value)
-}
-//获取左侧菜单树
-async function getTreeList(param) {
-    listArr.length = 0
-    const res = await queryReportData({ type: param })
-    console.log(res, '早中晚----------------')
-    if (res) {
-        listArr.push({
-            id: res.id,
-            pid: null,
-            title: res.fileName,
-            isFolder: true,
-        })
-        tableData.value = JSON.parse(res.content)
-        // pagination.total = Math.ceil(tableData.value.length / pagination.pageSize)
+let currentComponent = ref<any>('')//当前加载组件
+
+let getInit = () => {
+    const { sysOrgCode } = useGlobSetting();
+    switch (sysOrgCode) {
+        case 'sdmtjtbetmk'://布尔台
+            currentComponent.value = indexType
+            break;
+        case 'sdmtjtswmk'://上湾
+            currentComponent.value = indexTime
+            break;
+        case 'sdmtjtdltmk'://大柳塔
+            currentComponent.value = indexTime
+            break;
+        default:
+            currentComponent.value = indexTime
     }
-
 }
-//点击目录
-function onClick(node) {
-    selected.id = node.id;
-    selected.pid = node.pid;
-    selected.title = node.title;
-    selected.isFolder = node.isFolder;
-    selected.ppid = node.ppid
-};
 
 onMounted(() => {
-    getTreeList(gasType.value)
+    getInit()
 })
 </script>
 
@@ -97,77 +44,10 @@ onMounted(() => {
     padding: 80px 10px 15px 10px;
     box-sizing: border-box;
     position: relative;
+
     .content {
         width: 100%;
-        height: calc(100% - 30px);
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        align-items: flex-start;
-        position: relative;
-
-        // z-index: 999;
-        .left-box {
-            width: 15%;
-            height: 100%;
-            padding: 20px;
-            border: 1px solid #99e8ff66;
-            background: #27546e1a;
-            box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
-            -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
-            -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
-            overflow-y: auto;
-
-            .card-toggle {
-                height: 30px;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                margin-bottom: 10px;
-                color: #fff;
-
-                .card-item {
-                    width: calc(33.3% - 5px);
-                    height: 100%;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    background: #1a5b7f;
-                    border-radius: 5px;
-                    cursor: pointer;
-                }
-
-                .card-item1 {
-                    width: calc(33.3% - 5px);
-                    height: 100%;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    background: #5dd8f7;
-                    border-radius: 5px;
-                    cursor: pointer;
-                }
-            }
-
-            .card-file {
-                height: calc(100% - 40px);
-                overflow-y: auto;
-            }
-
-            // lxh
-            .iconfont {
-                color: #fff;
-                font-size: 12px;
-                margin-left: 5px;
-            }
-        }
-
-        .right-box {
-            width: 85%;
-            height: 100%;
-            padding: 0px 0px 0px 15px;
-            box-sizing: border-box;
-        }
+        height: 100%;
     }
 }
 </style>

src/views/vent/monitorManager/alarmMonitor/common/warnFire-bd.vue

@@ -75,7 +75,18 @@
     () => props.tableList,
     (newV, oldV) => {
       if (newV.length != 0) {
-        tableData.value = newV;
+         tableData.value = newV.map(el => {
+          return {
+            alarmType: el.alarmType,
+            alarmdes: el.sublist[0].alarmdes,
+            level: el.sublist[0].level,
+            temperature: el.sublist[0].temperature,
+            alarmName: el.alarmName,
+            id: el.id,
+            alarmInfo: el.sublist[0].alarmInfo,
+            alarmcode: el.sublist[0].alarmcode,
+          }
+        });
       }
     },
     { immediate: true, deep: true }

src/views/vent/monitorManager/alarmMonitor/common/warnFire-brt.vue

@@ -10,155 +10,168 @@
       </a-table>
     </div>
     <div class="bot-area">
-      <warnZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas" :heightCanvas="heightCanvas" />
+      <warnZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas"
+        :heightCanvas="heightCanvas" />
     </div>
   </div>
 </template>
 <script setup lang="ts">
-  import { ref, reactive, watch } from 'vue';
-  import { useGlobSetting } from '/@/hooks/setting';
-  import warnZb from './warnZb.vue';
-  let props = defineProps({
-    tableList: {
-      type: Array,
-      default: () => {
-        return [];
-      },
+import { ref, reactive, watch } from 'vue';
+import { useGlobSetting } from '/@/hooks/setting';
+import warnZb from './warnZb.vue';
+let props = defineProps({
+  tableList: {
+    type: Array,
+    default: () => {
+      return [];
     },
-  });
+  },
+});
 
-  let widthV = ref('80%');
-  let heightV = ref('80%');
-  let coordDw = ref<any[]>([30,56, 119]);
-  let widthCanvas = ref(1240);
-  let heightCanvas = ref(364);
-  let tableData = ref<any[]>([]);
+let widthV = ref('80%');
+let heightV = ref('80%');
+let coordDw = ref<any[]>([30, 56, 119]);
+let widthCanvas = ref(1240);
+let heightCanvas = ref(364);
+let tableData = ref<any[]>([]);
 
-  let columns = reactive([
-    {
-      title: '序号',
-      dataIndex: '',
-      key: 'rowIndex',
-      width: 80,
-      align: 'center',
-      customRender: ({ index }) => {
-        return `${index + 1}`;
-      },
+let columns = reactive([
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 80,
+    align: 'center',
+    customRender: ({ index }) => {
+      return `${index + 1}`;
     },
-    {
-      title: '预警等级',
-      dataIndex: 'level',
-      align: 'center',
-    },
-    {
-      title: '煤自燃阶段',
-      dataIndex: 'alarmName',
-      align: 'center',
-    },
-    {
-      title: '指标气体',
-      align: 'center',
-      dataIndex: 'alarmInfo',
-    },
-    {
-      title: '指标气体浓度范围',
-      align: 'center',
-      dataIndex: 'alarmdes',
-    },
-    {
-      title: '温度',
-      align: 'center',
-      dataIndex: 'temperature',
-    },
-  ]);
+  },
+  {
+    title: '预警等级',
+    dataIndex: 'level',
+    align: 'center',
+  },
+  {
+    title: '煤自燃阶段',
+    dataIndex: 'alarmName',
+    align: 'center',
+  },
+  {
+    title: '指标气体',
+    align: 'center',
+    dataIndex: 'alarmInfo',
+  },
+  {
+    title: '指标气体浓度范围',
+    align: 'center',
+    dataIndex: 'alarmdes',
+  },
+  {
+    title: '温度',
+    align: 'center',
+    dataIndex: 'temperature',
+  },
+]);
+
+watch(
+  () => props.tableList,
+  (newV, oldV) => {
+    let { sysOrgCode } = useGlobSetting();
+    if (sysOrgCode == 'A02A02') {
+      tableData.value = [
+        {
+          alarmType: 'fireWarn',
+          alarmdes: '0-13.75ppm',
+          level: '绿色预警',
+          temperature: '0-30℃',
+          alarmName: '潜伏期阶段',
+          id: '1811650465072791911',
+          alarmInfo: 'CO',
+          alarmcode: 'coval,coCo2,',
+        },
+        {
+          alarmType: 'fireWarn',
+          alarmdes: '13.75-67.2ppm,0.036-0.095',
+          level: '黄色预警',
+          temperature: '30-70℃',
+          alarmName: '缓慢氧化升温阶段',
+          id: '1811650534094258912',
+          alarmInfo: 'CO,CO / CO₂‌',
+          alarmcode: 'coval,coCo2,ch2val,',
+        },
+        {
+          alarmType: 'fireWarn',
+          alarmdes: '67.2-1606.3ppm,0.095-0.322,<2,<1.5',
+          level: '橙色预警',
+          temperature: '70-120℃',
+          alarmName: '加速氧化升温阶段',
+          id: '1811650534094258912',
+          alarmInfo: 'CO,CO / CO₂‌,C₂H₄,CH₃CH₂CH₃ / CH₃CH₃‌‌',
+          alarmcode: 'coval,coCo2,ch2val,',
+        },
+        {
+          alarmType: 'fireWarn',
+          alarmdes: '>1606.3ppm,>0.322,>2,>1.5,>0',
+          level: '红色预警',
+          temperature: '>120℃',
+          alarmName: '剧烈氧化升温阶段',
+          id: '1811650769583423913',
+          alarmInfo: 'CO,CO / CO₂‌,C₂H₄,CH₃CH₂CH₃ / CH₃CH₃‌‌,C₂H₂',
+          alarmcode: 'coval,coCo2,ch2val,chval,',
+        },
+      ];
+    } else {
+      if (newV.length != 0) {
+        tableData.value = newV.map(el => {
+          return {
+            alarmType: el.alarmType,
+            alarmdes: el.sublist[0].alarmdes,
+            level: el.sublist[0].level,
+            temperature: el.sublist[0].temperature,
+            alarmName: el.alarmName,
+            id: el.id,
+            alarmInfo: el.sublist[0].alarmInfo,
+            alarmcode: el.sublist[0].alarmcode,
+          }
+        });
 
-  watch(
-    () => props.tableList,
-    (newV, oldV) => {
-      let { sysOrgCode } = useGlobSetting();
-      if (sysOrgCode == 'A02A02') {
-        tableData.value = [
-          {
-            alarmType: 'fireWarn',
-            alarmdes: '0-13.75ppm',
-            level: '绿色预警',
-            temperature: '0-30℃',
-            alarmName: '潜伏期阶段',
-            id: '1811650465072791911',
-            alarmInfo: 'CO',
-            alarmcode: 'coval,coCo2,',
-          },
-          {
-            alarmType: 'fireWarn',
-            alarmdes: '13.75-67.2ppm,0.036-0.095',
-            level: '黄色预警',
-            temperature: '30-70℃',
-            alarmName: '缓慢氧化升温阶段',
-            id: '1811650534094258912',
-            alarmInfo: 'CO,CO / CO₂‌',
-            alarmcode: 'coval,coCo2,ch2val,',
-          },
-          {
-            alarmType: 'fireWarn',
-            alarmdes: '67.2-1606.3ppm,0.095-0.322,<2,<1.5',
-            level: '橙色预警',
-            temperature: '70-120℃',
-            alarmName: '加速氧化升温阶段',
-            id: '1811650534094258912',
-            alarmInfo: 'CO,CO / CO₂‌,C₂H₄,CH₃CH₂CH₃ / CH₃CH₃‌‌',
-            alarmcode: 'coval,coCo2,ch2val,',
-          },
-          {
-            alarmType: 'fireWarn',
-            alarmdes: '>1606.3ppm,>0.322,>2,>1.5,>0',
-            level: '红色预警',
-            temperature: '>120℃',
-            alarmName: '剧烈氧化升温阶段',
-            id: '1811650769583423913',
-            alarmInfo: 'CO,CO / CO₂‌,C₂H₄,CH₃CH₂CH₃ / CH₃CH₃‌‌,C₂H₂',
-            alarmcode: 'coval,coCo2,ch2val,chval,',
-          },
-        ];
-      } else {
-        if (newV.length != 0) {
-          tableData.value = newV;
-        }
       }
-    },
-    { immediate: true, deep: true }
-  );
+    }
+  },
+  { immediate: true, }
+);
 </script>
 
 <style lang="less" scoped>
-  @import '/@/design/theme.less';
+@import '/@/design/theme.less';
 
-  @{theme-deepblue} {
-    .warnTargetFire-brt {
-      --image-bj1: url('/@/assets/images/themify/deepblue/fire/bj1.png');
-    }
+@{theme-deepblue} {
+  .warnTargetFire-brt {
+    --image-bj1: url('/@/assets/images/themify/deepblue/fire/bj1.png');
   }
+}
 
-  .warnTargetFire-brt {
-    --image-bj1: url('/@/assets/images/fire/bj1.png');
-    width: 100%;
-    height: 100%;
-    margin: 15px 0px 0px 0px;
-    padding: 20px;
-    // background: url('../../../../../assets//images/fire/border.png') no-repeat center;
-    // background-size: 100% 100%;
-    box-sizing: border-box;
+.warnTargetFire-brt {
+  --image-bj1: url('/@/assets/images/fire/bj1.png');
+  width: 100%;
+  height: 100%;
+  margin: 15px 0px 0px 0px;
+  padding: 20px;
+  // background: url('../../../../../assets//images/fire/border.png') no-repeat center;
+  // background-size: 100% 100%;
+  box-sizing: border-box;
 
-    .top-area {
-      height: 40%;
-      margin-bottom: 15px;
-      background: var(--image-bj1) no-repeat center;
-      background-size: 100% 100%;
-    }
+  .top-area {
+    height: 40%;
+    margin-bottom: 15px;
+    background: var(--image-bj1) no-repeat center;
+    background-size: 100% 100%;
+  }
 
-    .bot-area {
-      height: calc(60% - 15px);
-      background: var(--image-bj1) no-repeat center;
-      background-size: 100% 100%;
-    }
+  .bot-area {
+    height: calc(60% - 15px);
+    background: var(--image-bj1) no-repeat center;
+    background-size: 100% 100%;
   }
+}
 </style>

src/views/vent/monitorManager/comment/comment.data.ts

@@ -600,3 +600,290 @@ export const ColumnsReport: BasicColumn[] = [
     slots: { customRender: 'action' },
   },
 ];
+export const columnsGas1: BasicColumn[] = [
+  {
+      title: '序号',
+      width: 60,
+      align: 'center',
+      customRender: ({ index }: { index: number }) => `${index + 1}`
+  },
+  {
+      title: '监测地点',
+      dataIndex: 'jcdd',
+      key: 'jcdd',
+      width:180,
+      align: 'center',
+  },
+  {
+      title: '夜班',
+      children: [
+          {
+              title: 'CH₄‌(%)',
+              dataIndex: 'ch4Night',
+              key: 'ch4Night',
+              align: 'center',
+          },
+          {
+              title: 'CO₂‌(%)',
+              dataIndex: 'co2Night',
+              key: 'co2Night',
+              align: 'center',
+          },
+          {
+              title: 'CO(ppm)',
+              dataIndex: 'coNight',
+              key: 'coNight',
+              align: 'center',
+          },
+          {
+              title: 'O₂‌(%)',
+              dataIndex: 'o2Night',
+              key: 'o2Night',
+              align: 'center',
+          },
+          {
+              title: 'T(°C)',
+              dataIndex: 'tNight',
+              key: 'tNight',
+              align: 'center',
+          },
+      ]
+  },
+  {
+      title: '早班',
+      children: [
+          {
+              title: 'CH₄‌(%)',
+              dataIndex: 'ch4Early',
+              key: 'ch4Early',
+              align: 'center',
+          },
+          {
+              title: 'CO₂‌(%)',
+              dataIndex: 'co2Early',
+              key: 'co2Early',
+              align: 'center',
+          },
+          {
+              title: 'CO(ppm)',
+              dataIndex: 'coEarly',
+              key: 'coEarly',
+              align: 'center',
+          },
+          {
+              title: 'O₂‌(%)',
+              dataIndex: 'o2Early',
+              key: 'o2Early',
+              align: 'center',
+          },
+          {
+              title: 'T(°C)',
+              dataIndex: 'tEarly',
+              key: 'tEarly',
+              align: 'center',
+          },
+      ]
+
+  },
+  {
+      title: '中班',
+      children: [
+          {
+              title: 'CH₄‌(%)',
+              dataIndex: 'ch4Noon',
+              key: 'ch4Noon',
+              align: 'center',
+          },
+          {
+              title: 'CO₂‌(%)',
+              dataIndex: 'co2Noon',
+              key: 'co2Noon',
+              align: 'center',
+          },
+          {
+              title: 'CO(ppm)',
+              dataIndex: 'coNoon',
+              key: 'coNoon',
+              align: 'center',
+          },
+          {
+              title: 'O₂‌(%)',
+              dataIndex: 'o2Noon',
+              key: 'o2Noon',
+              align: 'center',
+          },
+          {
+              title: 'T(°C)',
+              dataIndex: 'tNoon',
+              key: 'tNoon',
+              align: 'center',
+          },
+      ]
+
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 120,
+    align: 'center',
+    slots: { customRender: 'action' },
+  },
+];
+
+export const columnsGas2: BasicColumn[] = [
+  {
+      title: '序号',
+      width: 60,
+      align: 'center',
+      customRender: ({ index }: { index: number }) => `${index + 1}`
+  },
+  {
+      title: '监测地点',
+      dataIndex: 'jcdd',
+      key: 'jcdd',
+      width:130,
+      align: 'center',
+  },
+  {
+      title: '煤层',
+      dataIndex: 'mc',
+      width:80,
+      key: 'mc',
+      align: 'center',
+  },
+  {
+      title: '夜班',
+      children: [
+          {
+              title: 'CH₄‌(%)',
+              dataIndex: 'ch4Night',
+              key: 'ch4Night',
+              align: 'center',
+          },
+          {
+              title: 'CO₂‌(%)',
+              dataIndex: 'co2Night',
+              key: 'co2Night',
+              align: 'center',
+          },
+          {
+              title: 'CO(ppm)',
+              dataIndex: 'coNight',
+              key: 'coNight',
+              width:80,
+              align: 'center',
+          },
+          {
+              title: 'O₂‌(%)',
+              dataIndex: 'o2Night',
+              key: 'o2Night',
+              align: 'center',
+          },
+          {
+              title: 'T(°C)',
+              dataIndex: 'tNight',
+              key: 'tNight',
+              align: 'center',
+          },
+          {
+              title: '巡检员',
+              dataIndex: 'checkPersonNight',
+              key: 'checkPersonNight',
+              align: 'center',
+          },
+      ]
+  },
+  {
+      title: '早班',
+      children: [
+          {
+              title: 'CH₄‌(%)',
+              dataIndex: 'ch4Early',
+              key: 'ch4Early',
+              align: 'center',
+          },
+          {
+              title: 'CO₂‌(%)',
+              dataIndex: 'co2Early',
+              key: 'co2Early',
+              align: 'center',
+          },
+          {
+              title: 'CO(ppm)',
+              dataIndex: 'coEarly',
+              key: 'coEarly',
+              width:80,
+              align: 'center',
+          },
+          {
+              title: 'O₂‌(%)',
+              dataIndex: 'o2Early',
+              key: 'o2Early',
+              align: 'center',
+          },
+          {
+              title: 'T(°C)',
+              dataIndex: 'tEarly',
+              key: 'tEarly',
+              align: 'center',
+          },
+          {
+              title: '巡检员',
+              dataIndex: 'checkPersonEarly',
+              key: 'checkPersonEarly',
+              align: 'center',
+          },
+      ]
+
+  },
+  {
+      title: '中班',
+      children: [
+          {
+              title: 'CH₄‌(%)',
+              dataIndex: 'ch4Noon',
+              key: 'ch4Noon',
+              align: 'center',
+          },
+          {
+              title: 'CO₂‌(%)',
+              dataIndex: 'co2Noon',
+              key: 'co2Noon',
+              align: 'center',
+          },
+          {
+              title: 'CO(ppm)',
+              dataIndex: 'coNoon',
+              key: 'coNoon',
+              width:80,
+              align: 'center',
+          },
+          {
+              title: 'O₂‌(%)',
+              dataIndex: 'o2Noon',
+              key: 'o2Noon',
+              align: 'center',
+          },
+          {
+              title: 'T(°C)',
+              dataIndex: 'tNoon',
+              key: 'tNoon',
+              align: 'center',
+          },
+          {
+              title: '巡检员',
+              dataIndex: 'checkPersonNoon',
+              key: 'checkPersonNoon',
+              align: 'center',
+          },
+      ]
+
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 120,
+    align: 'center',
+    slots: { customRender: 'action' },
+  },
+];

src/views/vent/monitorManager/comment/gasReport.vue

@@ -27,7 +27,7 @@
             <a v-if="column.dataIndex === 'operation'" class="table-action-link" @click="handlerLocation(record)">定位</a>
           </template> -->
                 <template #action="{ record }">
-                    <a class="table-action-link" @click="handlerLocation(record)">编辑</a>
+                    <a class="table-action-link" @click="handlerLocation(record)">定位</a>
                 </template>
             </a-table>
         </div>

src/views/vent/monitorManager/comment/gasReportCount.vue

@@ -0,0 +1,139 @@
+<template>
+    <div class="gasReport">
+        <div class="search-area">
+            <a-row>
+                <a-col :span="4">
+                    <div class="area-item">
+                        <div class="item-text">巡检类型：</div>
+                        <a-select ref="select" v-model:value="searchData.insType" style="width: 240px"
+                            placeholder="请选择巡检类型" @change="typeChange">
+                            <a-select-option v-for="(item, index) in classList" :key="item.value" :value="item.value">{{
+                                item.label }}</a-select-option>
+                        </a-select>
+                    </div>
+                </a-col>
+                <a-col :span="4">
+                    <a-button type="primary" preIcon="ant-design:search-outlined" style="margin-left: 10px"
+                        @click="getSearch">查询</a-button>
+                    <a-button preIcon="ant-design:sync-outlined" style="margin: 0px 15px"
+                        @click="getReset">重置</a-button>
+                </a-col>
+            </a-row>
+        </div>
+        <div class="content-area">
+            <a-table :columns="ColumnsReport" size="small" :data-source="gaspatrolTableData" class="tableW"
+                :pagination="false">
+                <template #action="{ record }">
+                    <a class="table-action-link" @click="handlerLocation(record)">定位</a>
+                </template>
+            </a-table>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, watch } from 'vue';
+import { columnsGas1, columnsGas2 } from './comment.data';
+let props = defineProps({
+    tableData: {
+        type: Array,
+        default: () => {
+            return [];
+        },
+    },
+});
+
+let searchData = reactive({
+    insType: 'gasDay1',
+});
+let classList = reactive<any[]>([
+    { label: '一次巡检', value: 'gasDay1' },
+    { label: '二次巡检', value: 'gasDay2' },
+]);
+let ColumnsReport = ref<any>(columnsGas1)
+let gaspatrolTableData = ref<any[]>([]);
+let $emit = defineEmits(['getSearchReport', 'locate']);
+//巡检班次选项切换
+let typeChange = (val) => {
+    searchData.insType = val;
+    switch (searchData.insType) {
+        case 'gasDay1':
+            ColumnsReport.value = columnsGas1
+            break;
+        case 'gasDay2':
+            ColumnsReport.value = columnsGas2
+            break;
+    }
+};
+//查询
+let getSearch = () => {
+    $emit('getSearchReport', searchData.insType);
+};
+//重置
+let getReset = () => {
+    searchData.insType = '';
+};
+//定位
+function handlerLocation(record) {
+    $emit('locate', record);
+}
+watch(
+    () => props.tableData,
+    (newV, oldV) => {
+        gaspatrolTableData.value = newV
+    },
+    { immediate: true }
+);
+onMounted(() => { });
+</script>
+
+<style lang="less" scoped>
+@ventSpace: zxm;
+
+.gasReport {
+    .search-area {
+        margin: 15px;
+
+        .area-item {
+            display: flex;
+            align-items: center;
+
+            .item-text {
+                color: #fff;
+            }
+        }
+    }
+
+    .zxm-picker,
+    .zxm-input {
+        border: 1px solid #3ad8ff77;
+        background-color: #ffffff00;
+        color: #fff;
+    }
+}
+
+:deep(.@{ventSpace}-table-body) {
+    height: auto !important;
+
+    tr>td {
+        background: #ffffff00 !important;
+    }
+
+    tr.@{ventSpace}-table-row-selected {
+        td {
+            background: #007cc415 !important;
+        }
+    }
+}
+
+:deep(.jeecg-basic-table .@{ventSpace}-table-wrapper .@{ventSpace}-table-title) {
+    min-height: 0;
+}
+
+:deep(.@{ventSpace}-pagination) {
+    margin-right: 20px !important;
+}
+
+// :deep(.zxm-table-thead > tr > th:last-child) {
+//   border-right: 1px solid #91e9fe55 !important;
+// }</style>

src/views/vent/monitorManager/comment/gaspatrolTable.vue

@@ -46,7 +46,7 @@
           <a v-if="column.dataIndex === 'operation'" class="table-action-link" @click="handlerLocation(record)">定位</a>
         </template> -->
         <template #action="{ record }">
-          <a class="table-action-link" @click="handlerLocation(record)">编辑</a>
+          <a class="table-action-link" @click="handlerLocation(record)">定位</a>
         </template>
       </a-table>
     </div>

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -153,13 +153,13 @@
         </div>
         <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange" id="tabsBox">
           <a-tab-pane key="1" :tab="deviceType.startsWith('gasDay_normal')
-              ? '当日巡检监测'
-              : deviceType.startsWith('dustDayReport') ||
-                deviceType.startsWith('dustDayReport') ||
-                deviceType.startsWith('bundleDayReport') ||
-                deviceType.startsWith('bundleSpyDayReport')
-                ? '最新监测报表'
-                : '实时监测'
+            ? '当日巡检监测'
+            : deviceType.startsWith('dustDayReport') ||
+              deviceType.startsWith('dustDayReport') ||
+              deviceType.startsWith('bundleDayReport') ||
+              deviceType.startsWith('bundleSpyDayReport')
+              ? '最新监测报表'
+              : '实时监测'
             ">
             <template
               v-if="(deviceType.startsWith('fanlocal') || deviceType.startsWith('fanmain')) && activeKey == '1'">
@@ -167,22 +167,22 @@
                 :scroll="scroll" :isAction="true" :isShowSelect="false">
                 <template #action="{ record }">
                   <TableAction :actions="haveDetailArr.find((item) => deviceType.startsWith(item))
-                      ? [
-                        {
-                          label: '详情',
-                          onClick: goDetail.bind(null, record),
-                        },
-                        {
-                          label: '定位',
-                          onClick: goLocation.bind(null, record),
-                        },
-                      ]
-                      : [
-                        {
-                          label: '定位',
-                          onClick: goLocation.bind(null, record),
-                        },
-                      ]
+                    ? [
+                      {
+                        label: '详情',
+                        onClick: goDetail.bind(null, record),
+                      },
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    : [
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
                     " />
                 </template>
               </GroupMonitorTable>
@@ -197,22 +197,22 @@
                 title="设备监测" :form-config="formConfig" :scroll="{ y: scroll.y - 110 }">
                 <template #action="{ record }">
                   <TableAction :actions="haveDetailArr.find((item) => deviceType.startsWith(item))
-                      ? [
-                        {
-                          label: '详情',
-                          onClick: goDetail.bind(null, record),
-                        },
-                        {
-                          label: '定位',
-                          onClick: goLocation.bind(null, record),
-                        },
-                      ]
-                      : [
-                        {
-                          label: '定位',
-                          onClick: goLocation.bind(null, record),
-                        },
-                      ]
+                    ? [
+                      {
+                        label: '详情',
+                        onClick: goDetail.bind(null, record),
+                      },
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    : [
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
                     " />
                 </template>
                 <template #filterCell="{ column, record }">
@@ -258,16 +258,18 @@
             </template>
             <!-- 瓦斯人工巡检 -->
             <template v-else-if="deviceType.startsWith('gasDay_normal') && activeKey == '1'">
-              <gaspatrolTable
-                :tableData="gaspatrolData"
-                @getSearch="getSearch"
-                @locate="goLocation"
-              ></gaspatrolTable>
+              <gaspatrolTable :tableData="gaspatrolData" @getSearch="getSearch" @locate="goLocation"></gaspatrolTable>
             </template>
             <!-- 瓦斯日报 -->
-            <template v-else-if="deviceType.startsWith('gasDayReport') && activeKey == '1'">
-              <gasReport :tableData="reportTableData" 
-                @getSearchReport="getSearchReport" @locate="goLocation"></gasReport>
+            <template
+              v-else-if="deviceType.startsWith('gasDayReport') && activeKey == '1' && glob.sysOrgCode != 'sdmtjtbetmk'">
+              <gasReport :tableData="reportTableData" @getSearchReport="getSearchReport" @locate="goLocation">
+              </gasReport>
+            </template>
+            <template
+              v-else-if="deviceType.startsWith('gasDayReport') && activeKey == '1' && glob.sysOrgCode == 'sdmtjtbetmk'">
+              <gasReportCount :tableData="reportTableData" @getSearchReport="getSearchReport" @locate="goLocation">
+              </gasReportCount>
             </template>
             <!-- 粉尘监测报表-->
             <template v-else-if="deviceType.startsWith('dustDayReport') && activeKey == '1'">
@@ -292,22 +294,22 @@
                 title="设备监测" :scroll="{ y: scroll.y - 30 }">
                 <template #action="{ record }">
                   <TableAction :actions="haveDetailArr.find((item) => deviceType.startsWith(item))
-                      ? [
-                        {
-                          label: '详情',
-                          onClick: goDetail.bind(null, record),
-                        },
-                        {
-                          label: '定位',
-                          onClick: goLocation.bind(null, record),
-                        },
-                      ]
-                      : [
-                        {
-                          label: '定位',
-                          onClick: goLocation.bind(null, record),
-                        },
-                      ]
+                    ? [
+                      {
+                        label: '详情',
+                        onClick: goDetail.bind(null, record),
+                      },
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    : [
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
                     " />
                 </template>
                 <template #filterCell="{ column, record }">
@@ -469,6 +471,7 @@ import MonitorTable from '../../../comment/MonitorTable.vue';
 import GroupMonitorTable from '../../../comment/GroupMonitorTable.vue';
 import gaspatrolTable from '../../../comment/gaspatrolTable.vue';
 import gasReport from '../../../comment/gasReport.vue'
+import gasReportCount from '../../../comment/gasReportCount.vue'
 import dustMonitorTable from '../../../comment/dustMonitorTable.vue';
 import bundleMonitorTable from '../../../comment/bundleMonitorTable.vue';
 import DustingTable from '../../../comment/DustingTable.vue';
@@ -593,7 +596,8 @@ const scroll = reactive({
 const treeData = ref<TreeProps['treeData']>([]);
 let departmentInfo: Null | Object = null;
 let startMonitorTimer = 0;
-let searchReportParam = ref('gasDayNight')//瓦斯日报查询条件
+let searchReportParam = ref('gasDayNight')//瓦斯日报查询条件-非布尔台
+let searchReportParam1 = ref('gasDay1')//瓦斯日报查询条件-布尔台
 let reportTableData = ref<any[]>([])//瓦斯日报列表数据
 
 //树形菜单选择事件
@@ -694,7 +698,8 @@ function getMonitor(flag?) {
           if (deviceType.value.startsWith('gasDay_normal')) {
             await queryNowGasInsInfoList();//人工瓦斯巡检
           } else if (deviceType.value.startsWith('gasDayReport')) {
-            await getSearchReport(searchReportParam.value)//瓦斯日报
+            let searchParams=glob.sysOrgCode=='sdmtjtbetmk' ? searchReportParam1.value : searchReportParam.value
+            await getSearchReport(searchParams)//瓦斯日报
           } else {
             await getDataSource();
           }
@@ -870,7 +875,7 @@ async function getDataSource() {
         }
       } else {
         dataSource.value = [];
-      } 
+      }
     }
   }
 }
@@ -883,7 +888,7 @@ function goLocation(record) {
     actions.setGlobalState({ locationName: record.jcdd, locationObj: null, pageObj: null, type: record['deviceType'] });
   } else if (deviceType.value == 'gasDay_normal') {
     actions.setGlobalState({ locationName: record.strInstallPos, locationObj: null, pageObj: null, type: record['deviceType'] });
-  } else if(deviceType.value == 'gasDayReport'){
+  } else if (deviceType.value == 'gasDayReport') {
     actions.setGlobalState({ locationName: record.jcdd, locationObj: null, pageObj: null, type: record['deviceType'] });
   } else {
     if (deviceType.value.startsWith('location')) {
@@ -913,10 +918,10 @@ async function queryNowGasInsInfoList() {
 }
 //查询巡检弹窗信息
 async function getSearch(param) {
-  addressData.value=param.address
-  personData.value=param.userName
-  instypeData.value=param.insType
-  classData.value=param.class
+  addressData.value = param.address
+  personData.value = param.userName
+  instypeData.value = param.insType
+  classData.value = param.class
   if (!param.insType) {
     message.warning('请选择巡检类型!');
   } else if (!param.class) {
@@ -936,7 +941,12 @@ async function getSearch(param) {
 }
 //查询瓦斯日报列表数据
 async function getSearchReport(param) {
-  let res = await queryReportData({ type:param })
+  if(glob.sysOrgCode=='sdmtjtbetmk'){
+    searchReportParam1.value=param
+  }else {
+    searchReportParam.value=param
+  }
+  let res = await queryReportData({ type: param })
   console.log(res, '瓦斯日报列表')
   reportTableData.value = JSON.parse(res.content) || []
 }
@@ -1046,11 +1056,11 @@ function goDetail(record?) {
   }
 }
 function goGasDayReport() {
-  const newPage = router.resolve({ path: '/gas/gas-report/home' });
+  const newPage = router.resolve({ path: '/gas/gas-report-inspect/home' });
   window.open(newPage.href, '_blank');
 }
-function gogasDayReportHis(){
-  const newPage = router.resolve({ path: '/gas/gas-report-inspect/home' });
+function gogasDayReportHis() {
+  const newPage = router.resolve({ path: '/gas/gasDayReport/home' });
   window.open(newPage.href, '_blank');
 }
 function goDustDayReport() {