瓦斯巡检界面及功能-提交

src/design/vent/modal.less

@@ -605,7 +605,7 @@
     border-left: none !important;
     // border-right: none !important;
     &:last-child {
-      border-right: none !important;
+      border-right: none;
     }
   }
 }

src/views/vent/deviceManager/substationTabel/index.vue

@@ -1,72 +1,68 @@
 <template>
   <div class="device-manager-box">
-    <NormalTable
-      ref="normalTabel"
-      :columns="columns"
-      :searchFormSchema="searchFormSchema"
-      :list="list"
-      :formSchema="formSchema"
-      :deleteById="deleteById"
-      :batchDelete="batchDeleteById"
-      :saveOrUpdate="saveOrUpdate"
-      designScope="substation-tabel"
-      title="分站列表"
-      :showTab="false"
-    >
-      <template #filterCell="{ column, record }">
-        <a-tag v-if="column.dataIndex === 'linkstatus'" :color="record.linkstatus == 0 ? '#999' : '#87d068'">{{
-          record.linkstatus == 1 ? '链接' : '断开'
-        }}</a-tag>
-      </template>
-      <template #action="{ record }">
-        <a
-          v-if="
-            record['strtype'] == 'http' ||
-            record['strtype'] == 'kafka' ||
-            record['strtype'] == 'ftp' ||
-            record['strtype'] == 'database' ||
-            record['strtype'] == 'txt'
-          "
-          class="table-action-link"
-          @click="addDevices(record)"
-          >同步设备</a
-        >
-      </template>
-    </NormalTable>
+    <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange" id="tabsBox">
+      <a-tab-pane key="1" tab="实时监测">
+        <NormalTable ref="normalTabel" :columns="columns" :searchFormSchema="searchFormSchema" :list="list"
+          :formSchema="formSchema" :deleteById="deleteById" :batchDelete="batchDeleteById" :saveOrUpdate="saveOrUpdate"
+          designScope="substation-tabel" title="分站列表" :showTab="false">
+          <template #filterCell="{ column, record }">
+            <a-tag v-if="column.dataIndex === 'linkstatus'" :color="record.linkstatus == 0 ? '#999' : '#87d068'">{{
+              record.linkstatus == 1 ? '链接' : '断开'
+            }}</a-tag>
+          </template>
+          <template #action="{ record }">
+            <a v-if="
+              record['strtype'] == 'http' ||
+              record['strtype'] == 'kafka' ||
+              record['strtype'] == 'ftp' ||
+              record['strtype'] == 'database' ||
+              record['strtype'] == 'txt'
+            " class="table-action-link" @click="addDevices(record)">同步设备</a>
+          </template>
+        </NormalTable>
+      </a-tab-pane>
+      <a-tab-pane key="2" tab="历史数据"></a-tab-pane>
+    </a-tabs>
+
   </div>
 </template>
 
 <script lang="ts" name="system-user" setup>
-  //ts语法
-  import { ref, onMounted, onUnmounted } from 'vue';
-  import NormalTable from '../comment/NormalTable.vue';
-  import { columns, searchFormSchema, formSchema } from './substation.data';
-  import { list, getImportUrl, getExportUrl, deleteById, batchDeleteById, saveOrUpdate, addDevice } from './substation.api';
-  import { message } from 'ant-design-vue';
-  const normalTabel = ref();
-  let timer = undefined;
-  function reload() {
-    timer = setInterval(() => {
-      if (normalTabel.value) normalTabel.value.reload();
-    }, 30000);
-  }
+//ts语法
+import { ref, onMounted, onUnmounted } from 'vue';
+import NormalTable from '../comment/NormalTable.vue';
+import { columns, searchFormSchema, formSchema } from './substation.data';
+import { list, getImportUrl, getExportUrl, deleteById, batchDeleteById, saveOrUpdate, addDevice } from './substation.api';
+import { message } from 'ant-design-vue';
+const normalTabel = ref();
+const activeKey = ref('1'); // tab key
+let timer = undefined;
+function reload() {
+  timer = setInterval(() => {
+    if (normalTabel.value) normalTabel.value.reload();
+  }, 30000);
+}
 
-  function addDevices(record) {
-    addDevice({ id: record.id })
-      .then((result) => {
-        // message.success('同步生成')
-      })
-      .catch(() => {
-        message.success('同步失败');
-      });
-  }
-  onMounted(() => {
-    reload();
-  });
+function addDevices(record) {
+  addDevice({ id: record.id })
+    .then((result) => {
+      // message.success('同步生成')
+    })
+    .catch(() => {
+      message.success('同步失败');
+    });
+}
+//tab选项切换
+function tabChange(activeKeyVal) {
+  activeKey.value = activeKeyVal;
+}
+onMounted(() => {
+  reload();
+});
 
-  onUnmounted(() => {
-    clearInterval(timer);
-  });
+onUnmounted(() => {
+  clearInterval(timer);
+});
 </script>
 
 <style scoped></style>

src/views/vent/gas/gasAnalysis/components/echartBox.vue

@@ -0,0 +1,219 @@
+<template>
+    <div class="echartBar">
+        <div class="bar" ref="bar"></div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { defineProps, ref, nextTick, reactive, watch, onMounted } from 'vue';
+import * as echarts from 'echarts';
+
+let props = defineProps({
+    gridV: {
+        type: Object,
+        default: () => {
+            return {
+                left: '2%',
+                right: '4%',
+                bottom: '14%',
+                top: '16%',
+                containLabel: true
+            }
+        }
+    },
+    legendV: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    },
+    xData: {
+        type: Array,
+        default: () => {
+            return []
+        }
+    },
+    maxY: {
+        type: String,
+        default: '10'
+    },
+    datazoomShow: {
+        type: Boolean,
+        default: false,
+    },
+    yData1: {
+        type: Array,
+        default: () => {
+            return []
+        }
+    },
+    yData2: {
+        type: Array,
+        default: () => {
+            return []
+        }
+    },
+    typeV: {
+        type: String,
+        default: 'bar',
+    }
+});
+//获取dom元素节点
+let bar = ref<any>();
+let legendD = reactive({})
+function getOption() {
+    nextTick(() => {
+        let myChart = echarts.init(bar.value);
+        let option = {
+            tooltip: {
+                trigger: 'item',
+                backgroundColor: 'rgba(0, 0, 0, .6)',
+                textStyle: {
+                    color: '#fff',
+                    fontSize: 12,
+                },
+            },
+            grid: props.gridV,
+            legend: legendD || {},
+            xAxis: {
+                type: 'category',
+                data: props.xData || [],
+                axisLine: {
+                    lineStyle: {
+                        color: 'rgba(36, 71, 76,1)'
+
+                    }
+                },
+                axisLabel: {
+                    interval: 'auto',
+                    fontSize: 14,
+                    rotate: 0,
+                    textStyle: {
+                        color: '#fff',
+                        fontFamily: 'Microsoft YaHei'
+                    }
+                },
+            },
+
+            yAxis: {
+                type: 'value',
+                max: props.maxY,
+                axisLine: {
+                    show: false,
+                    lineStyle: {
+                        color: 'white'
+                    }
+                },
+                splitLine: {
+                    show: true,
+                    lineStyle: {
+                        color: 'rgba(36, 71, 76,.6)'
+                    }
+                },
+                axisLabel: {
+                    textStyle: {
+                        color: '#fff',
+                    },
+                    formatter: '{value}',
+                },
+            },
+            // "dataZoom": [{
+            //     "show": props.datazoomShow,
+            //     "height": 12,
+            //     "xAxisIndex": [
+            //         0
+            //     ],
+            //     bottom: '8%',
+            //     "start": 10,
+            //     "end": 90,
+            //     handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+            //     handleSize: '110%',
+            //     handleStyle: {
+            //         color: "#d3dee5",
+
+            //     },
+            //     textStyle: {
+            //         color: "#fff"
+            //     },
+            //     borderColor: "#90979c"
+            // }, {
+            //     "type": "inside",
+            //     "show": true,
+            //     "height": 15,
+            //     "start": 1,
+            //     "end": 35
+            // }],
+            series: [{
+                name: legendD['data'][0],
+                type: props.typeV || '',
+                barWidth: '10%',
+                itemStyle: {
+                    normal: {
+                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                            offset: 0,
+                            color: '#fccb05'
+                        }, {
+                            offset: 1,
+                            color: '#f5804d'
+                        }]),
+                        barBorderRadius: 12,
+                    },
+                },
+                data: props.yData1 || []
+            },
+            {
+                name: legendD['data'][1],
+                type: props.typeV || '',
+                barWidth: '10%',
+                itemStyle: {
+                    normal: {
+                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                            offset: 0,
+                            color: '#8bd46e'
+                        }, {
+                            offset: 1,
+                            color: '#09bcb7'
+                        }]),
+                        barBorderRadius: 12,
+                    }
+
+                },
+                data: props.yData2 || []
+            },
+            ]
+        };
+        myChart.setOption(option);
+        window.onresize = function () {
+            myChart.resize();
+        };
+    });
+}
+
+watch(() => props.legendV, (newV, oldV) => {
+    if (JSON.stringify(newV) != '{}') {
+        legendD = Object.assign({}, newV)
+        getOption()
+        console.log(legendD, 'legendD')
+    }
+}, {
+    immediate: true,
+})
+watch(() => props.yData1, (newY, oldY) => {
+    getOption()
+}, { immediate: true })
+onMounted(() => {
+
+})
+</script>
+
+<style scoped lang="less">
+.echartBar {
+    width: 100%;
+    height: 100%;
+
+    .bar {
+        width: 100%;
+        height: 100%;
+    }
+}
+</style>

src/views/vent/gas/gasAnalysis/gasAnalysis.api.ts

@@ -0,0 +1,20 @@
+import { defHttp } from '/@/utils/http/axios';
+
+
+enum Api {
+    gasReportLogList = '/safety/gasDayReport/gasReportLogList',//瓦斯巡检统计分析查询列表
+    
+
+}
+
+/**
+ * 下载文件目录
+ * @param params
+ */
+export const zipdownload = (params) => defHttp.post({ url: Api.zipdownload, params, responseType: 'blob' },{ joinParamsToUrl: true });
+/**
+ * 瓦斯巡检统计分析查询列表
+ * @param params
+ */
+export const gasReportLogList = (params) => defHttp.get({ url: Api.gasReportLogList,params },{ joinParamsToUrl: true });
+

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

@@ -0,0 +1,78 @@
+import { BasicColumn } from '/@/components/Table';
+export const columns: BasicColumn[] = [
+    {
+        title: '序号',
+        width: 60,
+        align: 'center',
+        customRender: ({ index }: { index: number }) => `${index + 1}`
+    },
+    {
+        title: '时间',
+        dataIndex: 'reportTime',
+        key: 'reportTime',
+        align: 'center',
+    },
+    {
+        title: '班次',
+        dataIndex: 'bc',
+        key: 'bc',
+        align: 'center',
+    },
+    {
+        title: '巡检类别',
+        dataIndex: 'insType',
+        key: 'insType',
+        align: 'center',
+    },
+    {
+        title: '巡检总数',
+        dataIndex: 'xjzs',
+        key: 'xjzs',
+        align: 'center',
+    },
+    {
+        title: '已巡检数',
+        dataIndex: 'yxjs',
+        key: 'yxjs',
+        align: 'center',
+    },
+    {
+        title: '未巡检数',
+        dataIndex: 'wxjs',
+        key: 'wxjs',
+        align: 'center',
+    },
+    {
+        title: '漏检率',
+        dataIndex: 'ljv',
+        key: 'ljv',
+        align: 'center',
+    },
+    {
+        title: '漏检详情',
+        dataIndex: 'ljxq',
+        key: 'ljxq',
+        align: 'center',
+    },
+    {
+        title: '班总漏检率',
+        dataIndex: 'bzljv',
+        key: 'bzljv',
+        align: 'center',
+    },
+    {
+        title: '日总漏检率',
+        dataIndex: 'totalLossDay',
+        key: 'totalLossDay',
+        align: 'center',
+    },
+];
+//分页参数
+export const pagination = {
+    current: 1, // 当前页码
+    pageSize: 20, // 每页显示条数
+    total: 0, // 总条目数，后端返回
+    // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
+    showSizeChanger: true, // 是否可改变每页显示条数
+    pageSizeOptions: ['10', '20', '50'], // 可选的每页显示条数
+};

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

@@ -0,0 +1,233 @@
+<template>
+    <div class="gasReport">
+        <customHeader>瓦斯巡检业务分析</customHeader>
+        <div class="report-container">
+            <div class="search-area">
+                <a-row>
+                    <a-col :span="4">
+                        <div class="area-item">
+                            <div class="item-text">时间：</div>
+                            <a-date-picker style="width:240px" v-model:value="searchTime" :showTime="false"
+                                valueFormat="YYYY-MM-DD" placeholder="请选择时间" />
+                        </div>
+                    </a-col>
+                    <a-col :span="20">
+                        <a-button type="primary" preIcon="ant-design:search-outlined" @click="getSearch">查询</a-button>
+                        <a-button preIcon="ant-design:sync-outlined" style="margin: 0px 15px" @click="getReset">重置</a-button>
+                        <a-button type="primary" preIcon="ant-design:download-outlined">导出</a-button>
+                    </a-col>
+                </a-row>
+            </div>
+            <div class="table-area">
+                <a-table :columns="columns"
+                    :row-selection="{ selectedRowKeys: selectedRowKey, type: 'radio', onChange: onSelectChange }"
+                    size="small" :data-source="tableData" :scroll="{ y: 470 }" class="tableW" :pagination="pagination">
+                    <template #bodyCell="{ column, text }">
+                        <template v-if="column.dataIndex == 'bc'">
+                            <div>夜班</div>
+                            <div style="padding: 32px 0px;">早班</div>
+                            <div>中班</div>
+                        </template>
+                        <template v-if="column.dataIndex == 'insType'">
+                            <div>
+                                <div>一次巡检</div>
+                                <div>二次巡检</div>
+                            </div>
+                            <div style="padding: 10px 0px;">
+                                <div>一次巡检</div>
+                                <div>二次巡检</div>
+                            </div>
+                            <div>
+                                <div>一次巡检</div>
+                                <div>二次巡检</div>
+                            </div>
+                        </template>
+                        <template
+                            v-if="column.dataIndex == 'xjzs' || column.dataIndex == 'yxjs' || column.dataIndex == 'wxjs' || column.dataIndex == 'ljv' || column.dataIndex == 'ljxq'">
+                            <div>
+                                <div>{{ text[0] }}</div>
+                                <div>{{ text[1] }}</div>
+                            </div>
+                            <div style="padding: 10px 0px;">
+                                <div>{{ text[2] }}</div>
+                                <div>{{ text[3] }}</div>
+                            </div>
+                            <div>
+                                <div>{{ text[4] }}</div>
+                                <div>{{ text[5] }}</div>
+                            </div>
+                        </template>
+                        <template v-if="column.dataIndex == 'bzljv'">
+                            <div>{{ text[0] }}</div>
+                            <div style="padding: 32px 0px;">{{ text[1] }}</div>
+                            <div>{{ text[2] }}</div>
+                        </template>
+                    </template>
+                </a-table>
+            </div>
+            <div class="echart-area">
+                <div class="left-echart-area">
+                    <echartBox :legendV="legendData" :xData="xData" :yData1="yDataY" :yData2="yDataN"
+                        :datazoomShow="false">
+                    </echartBox>
+                </div>
+                <div class="right-echart-area">
+                    <echartBox :legendV="legendData1" :xData="xData1" :yData1="yDataL" :datazoomShow="true"
+                        :typeV="typeV">
+                    </echartBox>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed, reactive } from 'vue';
+import customHeader from '/@/components/vent/customHeader.vue';
+import echartBox from './components/echartBox.vue'
+import dayjs from 'dayjs';
+import { columns, pagination, } from './gasAnalysis.data'
+import { gasReportLogList } from './gasAnalysis.api'
+
+
+let searchTime = ref(dayjs().format('YYYY-MM-DD'))//dayjs().format('YYYY-MM-DD HH:mm:ss')
+let tableData = ref<any[]>([
+    { key: '1', bc: '3', insType: '2', xjzs: [1, 1, 1, 1, 1, 1], yxjs: [2, 2, 2, 2, 2, 2], wxjs: [3, 3, 3, 3, 3, 3], ljv: [4, 4, 4, 4, 4, 4], ljxq: [5, 5, 5, 5, 5, 5], bzljv: [1, 2, 3], totalLossDay: 10 },
+    { key: '2', bc: '3', insType: '2', xjzs: [1, 1, 1, 1, 1, 1], yxjs: [5, 5, 5, 5, 5, 5], wxjs: [3, 3, 3, 3, 3, 3], ljv: [4, 4, 4, 4, 4, 4], ljxq: [5, 5, 5, 5, 5, 5], bzljv: [1, 2, 3], totalLossDay: 10 },
+    { key: '3', bc: '3', insType: '2', xjzs: [1, 1, 1, 1, 1, 1], yxjs: [2, 2, 2, 2, 2, 2], wxjs: [3, 3, 3, 3, 3, 3], ljv: [4, 4, 4, 4, 4, 4], ljxq: [5, 5, 5, 5, 5, 5], bzljv: [1, 2, 3], totalLossDay: 10 },
+
+])
+let selectedRowKey = ref<any[]>(['1'])
+//柱状图相关数据
+let legendData = reactive({
+    data: ['已巡检', '未巡检',],
+    right: 'center',
+    top: 5,
+    textStyle: {
+        color: "#fff"
+    },
+    itemWidth: 12,
+    itemHeight: 10,
+    // itemGap: 35
+})
+let xData = ref<any[]>(['夜班1', '夜班2', '早班1', '早班2', '中班1', '中班2'])
+let yDataY = ref<any[]>([])
+let yDataN = ref<any[]>([])
+
+//曲线图相关数据
+let legendData1 = reactive({
+    data: ['日漏检率'],
+    right: 'center',
+    top: 5,
+    textStyle: {
+        color: "#fff"
+    },
+    itemWidth: 12,
+    itemHeight: 10,
+    // itemGap: 35
+})
+let xData1 = ref<any[]>(['2024-12-23', '2024-12-24', '2024-12-25', '2024-12-26', '2024-12-27', '2024-12-28', '2024-12-29',])
+let yDataL = ref<any[]>([1, 4, 6, 8, 10, 7, 4])
+let typeV = ref('line')
+//table选中数据切换
+let onSelectChange = (selectedRowKeys, selectedRows) => {
+    console.log(`当前选中key: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+    selectedRowKey.value=selectedRowKeys
+    yDataY.value = selectedRows[0].yxjs
+    yDataN.value = selectedRows[0].wxjs
+}
+
+//瓦斯巡检统计分析查询列表
+async function gasReportLogLists() {
+    let res = await gasReportLogList({ reportTime: searchTime.value, pageNo: pagination.current, pageSize: pagination.pageSize })
+    console.log(res, '瓦斯巡检统计分析列表')
+
+    if (res.code == 200 && res.records.length != 0) {
+        pagination.current = 1
+        tableData.value = res.records.map(el => {
+            el.bc = '3'
+            el.insType = '2'
+            el.xjzs = [el.totalNight1 || 0, el.totalNight2 || 0, el.totalEarly1 || 0, el.totalEarly2 || 0, el.totalNoon1 || 0, el.totalNoon2 || 0]
+            el.yxjs = [el.finishNight1 || 0, el.finishNight2 || 0, el.finishEarly1 || 0, el.finishEarly2 || 0, el.finishNoon1 || 0, el.finishNoon2 || 0]
+            el.wxjs = [el.missNight1 || 0, el.missNight2 || 0, el.missEarly1 || 0, el.missEarly2 || 0, el.missNoon1 || 0, el.missNoon2 || 0]
+            el.ljv = [el.lossNight1 || 0, el.lossNight2 || 0, el.lossEarly1 || 0, el.lossEarly2 || 0, el.lossNoon1 || 0, el.lossNoon2 || 0]
+            el.ljxq = [el.detailsLossNight1 || 0, el.detailsLossNight2 || 0, el.detailsLossEarly1 || 0, el.detailsLossEarly2 || 0, el.detailsLossNoon1 || 0, el.detailsLossNoon2 || 0]
+            el.bzljv = [el.totalLossNight || 0, el.totalLossEarly || 0, el.totalLossNoon || 0]
+            return el
+        })
+        pagination.total = res.total
+        xData1.value=res.records.map(v=>v.reportTime)
+        yDataL.value=res.records.map(m=>m.totalLossDay)
+    }
+}
+//查询
+let getSearch = () => {
+    gasReportLogLists()
+}
+//重置
+let getReset = () => {
+    searchTime.value = dayjs().format('YYYY-MM-DD')
+    gasReportLogLists()
+}
+onMounted(() => {
+    // gasReportLogLists()
+})
+
+</script>
+
+<style lang="less" scoped>
+.gasReport {
+    width: 100%;
+    height: 100%;
+    padding: 80px 10px 15px 10px;
+    box-sizing: border-box;
+    position: relative;
+
+    .report-container {
+        height: 100%;
+
+        .search-area {
+            margin: 20px 0px;
+
+            .area-item {
+                display: flex;
+                align-items: center;
+
+                .item-text {
+                    color: #fff;
+                }
+            }
+        }
+
+        .table-area {
+            height: 545px;
+        }
+
+        .echart-area {
+            height: calc(100% - 617px);
+            display: flex;
+            justify-content: space-between;
+
+            .left-echart-area,
+            .right-echart-area {
+                width: calc(50% - 10px);
+            }
+        }
+    }
+
+}
+
+:deep(.zxm-table-thead > tr > th:last-child) {
+    border-right: 1px solid #91e9fe !important;
+}
+
+:deep(.zxm-picker-input > input) {
+    color: #fff;
+}
+
+:deep(.zxm-picker) {
+    border: 1px solid #3ad8ff77 !important;
+    background-color: #ffffff00 !important;
+    color: #fff !important;
+}
+</style>

src/views/vent/gas/gasInspect/components/inspectDel.vue

@@ -0,0 +1,50 @@
+<template>
+    <div class="inspectEdit">
+        <div class="card-area">
+
+            <a-popconfirm title="删除内容无法恢复，是否删除" ok-text="确定" cancel-text="取消" @confirm="handleDelCard"
+                @cancel="handleCancelDelCard">
+                <a-button type="primary" preIcon="ant-design:delete-outlined">删除巡检卡</a-button>
+            </a-popconfirm>
+            <a-popconfirm title="删除内容无法恢复，是否删除" ok-text="确定" cancel-text="取消" @confirm="handleDelCardInfo"
+                @cancel="handleCancelDelCard">
+                <a-button type="primary" preIcon="ant-design:delete-outlined">删除巡检信息</a-button>
+            </a-popconfirm>
+
+        </div>
+
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+
+let $emit = defineEmits(['handleDelCard', 'handleDelCardInfo', 'handleCancelDelCard'])
+//删除巡检卡
+let handleDelCard = () => {
+    $emit('handleDelCard')
+}
+//删除巡检卡信息
+let handleDelCardInfo = () => {
+    $emit('handleDelCardInfo')
+}
+//取消删除巡检卡或者巡检信息
+let handleCancelDelCard = () => {
+    $emit('handleCancelDelCard')
+}
+
+</script>
+
+<style lang="less" scoped>
+.inspectEdit {
+    padding: 10px;
+    box-sizing: border-box;
+
+    .card-area {
+        width: 100%;
+        margin: 10px;
+        display: flex;
+        justify-content: space-around;
+    }
+}
+</style>

src/views/vent/gas/gasInspect/components/inspectEdit.vue

@@ -0,0 +1,114 @@
+<template>
+    <div class="inspectEdit">
+        <a-form :model="formStateEdit" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 12 }"
+            autocomplete="off">
+            <a-form-item label="瓦斯巡检卡ID：">
+                <a-input v-model:value="formStateEdit.id" disabled />
+            </a-form-item>
+            <a-form-item label="瓦斯巡检地点：">
+                <a-select ref="select" v-model:value="formStateEdit.strInstallPos" placeholder="请选择...">
+                    <a-select-option v-for="(item, index) in addressList" :key="index">{{ item.label
+                        }}</a-select-option>
+                </a-select>
+            </a-form-item>
+            <a-form-item label="所属区队：">
+                <a-select ref="select" v-model:value="formStateEdit.disTeamId" placeholder="请选择...">
+                    <a-select-option v-for="(item, index) in qdList" :key="index">{{ item.label }}</a-select-option>
+                </a-select>
+            </a-form-item>
+            <a-form-item label="巡检类型：">
+                <JDictSelectTag v-model:value="formStateEdit.insType" placeholder="请选择巡检类型" dictCode="ins_type"
+                    style="width: 240px" />
+            </a-form-item>
+        </a-form>
+        <div class="edit-btn">
+            <a-button type="primary" @click="confirmEdit">提交</a-button>
+            <a-button type="success" @click="cancelEdit">取消</a-button>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, watch } from 'vue'
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { queryAllDisTeam } from '../gasInspect.api'
+
+let props = defineProps({
+    inspectEditData: {
+        type: Object,
+        default: () => {
+            return {}
+        }
+    }
+})
+
+let formStateEdit = reactive<any>({
+    id: '',
+    strInstallPos: '',
+    disTeamId: '',
+    insType: '',
+})
+let addressList = ref<any[]>([//监测地点下拉选项列表
+    // { label: '地址1', value: '1' },
+    // { label: '地址2', value: '2' },
+])
+let qdList = ref<any[]>([])//区队下拉选项列表
+let $emit = defineEmits(['confirmEdit', 'cancelEdit'])
+
+//查询所有区队
+async function queryAllDisTeamList() {
+    let res = await queryAllDisTeam()
+    console.log(res, '区队数据---------------')
+    if (res.length != 0) {
+        qdList.value = res.map(m => {
+            return {
+                label: m.name,
+                value: m.id
+            }
+        })
+    }
+}
+//编辑提交
+let confirmEdit = () => {
+    $emit('confirmEdit', formStateEdit)
+}
+//编辑取消
+let cancelEdit = () => {
+    formStateEdit = {
+        id: '',
+        strInstallPos: '',
+        disTeamId: '',
+        insType: '',
+    }
+    $emit('cancelEdit',)
+}
+watch(() => props.inspectEditData, (newV, oldV) => {
+    formStateEdit = Object.assign({}, newV)
+}, { immediate: true })
+onMounted(() => {
+    queryAllDisTeamList()
+})
+</script>
+
+<style lang="less" scoped>
+.inspectEdit {
+    padding: 10px;
+    box-sizing: border-box;
+
+    .edit-btn {
+        display: flex;
+        justify-content: flex-end;
+
+        .zxm-btn {
+            margin: 0px 10px;
+        }
+    }
+
+}
+
+:deep(.zxm-input) {
+    color: #fff;
+    border: 1px solid #3ad8ff77 !important;
+    background-color: #ffffff00 !important;
+}
+</style>

src/views/vent/gas/gasInspect/components/inspectTask.vue

@@ -0,0 +1,131 @@
+<template>
+    <div class="inspectTask">
+        <a-table :columns="columnsTask" size="small" :data-source="tableDataTask" :pagination="false">
+            <template #bodyCell="{ column, text }">
+                <template v-if="column.dataIndex === 'accountEarly'">
+                    <a-select ref="select" v-model:value="accountEarly" size="small" clearable placeholder="请选择巡检员"
+                        style="width: 140px">
+                        <a-select-option v-for="(item, index) in accountList" :key="index" :value="item.value">{{
+                            item.label
+                            }}</a-select-option>
+                    </a-select>
+                </template>
+                <template v-if="column.dataIndex === 'accountNoon'">
+                    <a-select ref="select" v-model:value="accountNoon" size="small" clearable placeholder="请选择巡检员"
+                        style="width: 140px">
+                        <a-select-option v-for="(item, index) in accountList" :key="index" :value="item.value">{{
+                            item.label
+                            }}</a-select-option>
+                    </a-select>
+                </template>
+                <template v-if="column.dataIndex === 'accountNight'">
+                    <a-select ref="select" v-model:value="accountNight" size="small" clearable placeholder="请选择巡检员"
+                        style="width: 140px">
+                        <a-select-option v-for="(item, index) in accountList" :key="index" :value="item.value">{{
+                            item.label
+                            }}</a-select-option>
+                    </a-select>
+                </template>
+            </template>
+            <template #action="{ record }">
+                <a class="table-action-link" @click="handleTaskSubmit(record)">下发</a>
+            </template>
+        </a-table>
+        <div class="edit-btn">
+
+            <a-button type="primary" @click="handleTaskCancel">返回</a-button>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import { columnsTask } from '../gasInspect.data'
+import { queryAllDisTeam, getAllUserInfo } from '../gasInspect.api'
+
+let tableDataTask = ref<any[]>([])
+let accountEarly = ref('')
+let accountNoon = ref('')
+let accountNight = ref('')
+let accountList = ref<any[]>([//巡检员下拉列表
+    { label: '1', value: '1' }
+])
+
+let $emit = defineEmits(['handleTaskSubmit', 'handleTaskCancel'])
+
+
+//获取任务管理列表
+async function queryAllDisTeamList() {
+    let res = await queryAllDisTeam()
+    console.log(res, '任务管理列表')
+    tableDataTask.value = res || []
+}
+//任务管理下发
+let handleTaskSubmit = (param) => {
+    $emit('handleTaskSubmit', { ...param, accountEarly: accountEarly.value, accountNoon: accountNoon.value, accountNight: accountNight.value })
+}
+//任务管理弹窗关闭
+let handleTaskCancel = () => {
+    accountEarly.value = ''
+    accountNoon.value = ''
+    accountNight.value = ''
+    $emit('handleTaskCancel')
+}
+//获取早中晚班巡检员列表
+async function getAllUserInfoList() {
+    let res = await getAllUserInfo()
+    console.log(res, '巡检员列表')
+    if (res.length != 0) {
+        accountList.value = res.map(el => {
+            return {
+                label: el.realname,
+                value: el.id,
+            }
+        })
+    } else {
+        accountList.value = []
+    }
+}
+onMounted(() => {
+    queryAllDisTeamList()
+    getAllUserInfoList()
+})
+</script>
+
+<style lang="less" scoped>
+.inspectTask {
+    padding: 10px;
+    box-sizing: border-box;
+
+    .edit-btn {
+        padding: 10px 10px 0px 10px;
+        display: flex;
+        justify-content: flex-end;
+    }
+}
+
+:deep(.zxm-input) {
+    color: #fff;
+    border: 1px solid #3ad8ff77 !important;
+    background-color: #ffffff00 !important;
+}
+
+:deep(.zxm-select-selector) {
+    width: 100%;
+    color: #fff;
+    border: 1px solid #3ad8ff77 !important;
+    background-color: #ffffff00 !important;
+}
+
+:deep(.zxm-select-selection-item) {
+    color: #fff !important;
+}
+
+:deep(.zxm-select-selection-placeholder) {
+    color: #ccc !important;
+}
+
+:deep(.zxm-select-arrow) {
+    color: #fff;
+}
+</style>

src/views/vent/gas/gasInspect/components/uploadOrdown.vue

@@ -0,0 +1,103 @@
+<template>
+    <div class="uploadOrdown">
+        <a-form :model="formState" :label-col="{ span: 7 }" :wrapper-col="{ span: 14 }" autocomplete="off">
+            <a-form-item label="巡检类型：">
+                <JDictSelectTag v-model:value="formState.insType" placeholder="请选择巡检类型" dictCode="ins_type"
+                    style="width: 240px" />
+            </a-form-item>
+
+            <a-form-item label="选择文件：" v-if="modalType == 'upload'">
+                <a-upload :before-upload="beforeUpload" @remove="handleRemove" :multiple="false" :file-list="fileList">
+                    <a-button type="primary" preIcon="ant-design:cloud-upload-outlined">选择文件</a-button>
+                </a-upload>
+            </a-form-item>
+        </a-form>
+        <div class="btn">
+            <a-button class="btn-item" type="primary" @click="handlerComfirm">确定</a-button>
+
+            <a-button class="btn-item" @click="handlerCancel">取消</a-button>
+        </div>
+    </div>
+</template>
+
+<script setup lang=ts>
+import { ref, reactive, computed } from 'vue'
+import { message } from 'ant-design-vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+
+let props = defineProps({
+    modalType: {
+        type: String,
+        default: ''
+    }
+})
+
+let formState = reactive({
+    insType: '',
+})
+let fileList = reactive<any[]>([])
+let $emit = defineEmits(['handlerComfirm', 'handlerCancel'])
+
+//选择文件
+let beforeUpload = (file) => {
+    console.log(file, '选中文件');
+    fileList.length = 0;
+    let index = file.name.indexOf('.');
+    let name = file.name.substring(index + 1);
+    if (name == 'png' || name == 'jpg' || name == 'gif' || name == 'psd' || name == 'webp') {
+        message.warning('禁止上传图片类型的文件!');
+    } else {
+        fileList.push(file);
+    }
+};
+// 文件移除
+let handleRemove = (file) => {
+    const index = fileList.indexOf(file);
+    const newFileList = fileList.slice();
+    newFileList.splice(index, 1);
+    fileList.length = 0;
+};
+
+//确认
+let handlerComfirm = () => {
+    if (props.modalType == 'upload') {
+        const formData = new FormData();
+        formData.append('file', fileList[0]);
+        formData.append('insType', formState.insType);
+        $emit('handlerComfirm', formData)
+    } else {
+        $emit('handlerComfirm', formState)
+    }
+}
+//取消
+let handlerCancel = () => {
+    formState.insType = ''
+    $emit('handlerCancel', formState)
+}
+</script>
+
+<style lang="less" scoped>
+.uploadOrdown {
+    position: relative;
+    padding: 10px 15px;
+    box-sizing: border-box;
+
+    .btn {
+        padding: 10px 10px 0px 10px;
+        display: flex;
+        justify-content: flex-end;
+
+        .btn-item {
+            margin: 0px 5px;
+        }
+    }
+}
+
+::v-deep .zxm-upload-list-item-name {
+    color: #fff;
+}
+
+::v-deep .zxm-upload-list-item-name:hover {
+    background-color: transparent !important;
+}
+</style>

src/views/vent/gas/gasInspect/gasInspect.api.ts

@@ -0,0 +1,73 @@
+import { defHttp } from '/@/utils/http/axios';
+
+
+enum Api {
+    list = '/safety/gasInsCard/list',//通过id（巡检卡id）查询
+    importByExcel='/safety/gasDayReport/importByExcel',//导入瓦斯巡检地址
+    exportGasByExcel='/safety/gasDayReport/exportGasByExcel',//导出瓦斯巡检地址
+    queryAllDisTeam='/safety/disTeamInfo/queryAllDisTeam',//查询所有区队
+    moveOrderNum='/safety/gasInsCard/moveOrderNum',//上下移接口
+    edit='/safety/gasInsCard/edit',//瓦斯巡检地点编辑
+    deleteCard='/safety/gasInsCard/delete',//瓦斯巡检卡删除
+    taskSubmit='/safety/disTeamInfo/edit',//任务管理下发
+    clearCardInfo='/safety/gasInsCard/clearCard',//瓦斯巡检卡信息删除
+    getAllUserInfo='/safety/gasInsCard/getAllUserInfo'//获取早中晚班巡检员列表
+
+}
+
+/**
+ * 下载文件目录
+ * @param params
+ */
+export const zipdownload = (params) => defHttp.post({ url: Api.zipdownload, params, responseType: 'blob' },{ joinParamsToUrl: true });
+/**
+ * 通过id（巡检卡id）查询
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list,params },);
+
+/**
+ * 导入瓦斯巡检地址
+ * @param params 
+ */
+export const importByExcel = (params) => defHttp.post({ headers: { 'Content-Type': 'multipart/form-data' }, url: Api.importByExcel, params });
+
+/**
+ * 导出瓦斯巡检地址
+ * @param params 
+ */
+export const exportGasByExcel = (params) => defHttp.get({ url: Api.exportGasByExcel, params, responseType: 'blob' });
+
+/**
+ * 查询所有区队
+ * @param params 
+ */
+export const queryAllDisTeam = () => defHttp.get({ url: Api.queryAllDisTeam, });
+/**
+ * 上下移接口
+ * @param params 
+ */
+export const moveOrderNum = (params) => defHttp.post({ url: Api.moveOrderNum,params });
+/**
+ * 瓦斯巡检地点编辑
+ * @param params 
+ */
+export const edit = (params) => defHttp.post({ url: Api.edit,params });
+
+/**
+ * 瓦斯巡检卡-删除
+ */
+export const deleteCard = (params) => defHttp.delete({ url: Api.deleteCard, params }, { joinParamsToUrl: true });
+/**
+ * 瓦斯巡检卡信息-删除
+ */
+export const clearCardInfo = (params) => defHttp.get({ url: Api.clearCardInfo, params }, { joinParamsToUrl: true });
+/**
+ * 获取早中晚班巡检员列表
+ */
+export const getAllUserInfo = () => defHttp.get({ url: Api.getAllUserInfo, });
+/**
+ * 任务管理下发
+ * @param params 
+ */
+export const taskSubmit = (params) => defHttp.post({ url: Api.taskSubmit,params });

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

@@ -0,0 +1,137 @@
+import { BasicColumn } from '/@/components/Table';
+export const columns: BasicColumn[] = [
+    {
+        title: '序号',
+        width: 60,
+        align: 'center',
+        customRender: ({ index }: { index: number }) => `${index + 1}`
+    },
+    {
+        title: '巡检卡ID',
+        dataIndex: 'id',
+        key: 'id',
+        align: 'center',
+    },
+    {
+        title: '地点',
+        dataIndex: 'strInstallPos',
+        key: 'strInstallPos',
+        align: 'center',
+    },
+    {
+        title: '巡检人',
+        children: [
+            {
+                title: '早班',
+                dataIndex: 'nameEarly',
+                key: 'nameEarly',
+                align: 'center',
+
+            },
+
+            {
+                title: '中班',
+                dataIndex: 'nameNoon',
+                key: 'nameNoon',
+                align: 'center',
+
+            },
+            {
+                title: '晚班',
+                dataIndex: 'nameNight',
+                key: 'nameNight',
+                align: 'center',
+
+            },
+        ],
+    },
+    {
+        title: '是否巡检',
+        children: [
+            {
+                title: '',
+                dataIndex: 'insType',
+                key: 'insType',
+                align: 'center',
+
+            },
+            {
+                title: '早班',
+                dataIndex: 'morning',
+                key: 'morning',
+                align: 'center',
+
+            },
+
+            {
+                title: '中班',
+                dataIndex: 'afterNoon',
+                key: 'afterNoon',
+                align: 'center',
+
+            },
+            {
+                title: '晚班',
+                dataIndex: 'evening',
+                key: 'eevening',
+                align: 'center',
+
+            },
+        ],
+    },
+    {
+        title: '操作',
+        dataIndex: 'action',
+        width: 250,
+        align: 'center',
+        slots: { customRender: 'action' },
+    },
+];
+export const columnsTask: BasicColumn[] = ([
+    {
+        title: '序号',
+        width: 60,
+        align: 'center',
+        customRender: ({ index }: { index: number }) => `${index + 1}`
+    },
+    {
+        title: '所属队别',
+        dataIndex: 'name',
+        key: 'name',
+        align: 'center',
+    },
+    {
+        title: '早班巡检',
+        dataIndex: 'accountEarly',
+        key: 'accountEarly',
+        align: 'center',
+    },
+    {
+        title: '中班巡检',
+        dataIndex: 'accountNoon',
+        key: 'accountNoon',
+        align: 'center',
+    },
+    {
+        title: '晚班巡检',
+        dataIndex: 'accountNight',
+        key: 'accountNight',
+        align: 'center',
+    },
+    {
+        title: '操作',
+        dataIndex: 'action',
+        width: 120,
+        align: 'center',
+        slots: { customRender: 'action' },
+    },
+])
+//分页参数
+export const pagination = {
+    current: 1, // 当前页码
+    pageSize: 10, // 每页显示条数
+    total: 0, // 总条目数，后端返回
+    // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
+    showSizeChanger: true, // 是否可改变每页显示条数
+    pageSizeOptions: ['10', '20', '50'], // 可选的每页显示条数
+};

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

@@ -0,0 +1,357 @@
+<template>
+    <div class="gasReport">
+        <customHeader>瓦斯巡检地点管理</customHeader>
+        <div class="report-container">
+            <div class="search-area">
+                <a-row>
+                    <a-col :span="4">
+                        <div class="area-item">
+                            <div class="item-text">巡检卡ID：</div>
+                            <a-input style="width: 240px" v-model:value="searchId" placeholder="请输入巡检卡ID" />
+                        </div>
+                    </a-col>
+                    <a-col :span="20">
+                        <a-button type="primary" preIcon="ant-design:search-outlined" style="margin-left: 10px;"
+                            @click="getSearchCardId">查询</a-button>
+                        <a-button preIcon="ant-design:sync-outlined" style="margin: 0px 15px"
+                            @click="getReset">重置</a-button>
+                        <a-button type="primary" preIcon="ant-design:import-outlined" @click="getupload">导入</a-button>
+                        <a-button type="primary" preIcon="ant-design:download-outlined" style="margin: 0px 15px"
+                            @click="getdownload">导出</a-button>
+                        <a-button type="primary" preIcon="ant-design:sync-outlined" style="margin-right: 15px;"
+                            @click="handlerTask">任务管理</a-button>
+                        <a-dropdown>
+                            <template #overlay>
+                                <a-menu @click="handlerFilter">
+                                    <a-menu-item key="1">
+                                        <UserOutlined />
+                                        一次
+                                    </a-menu-item>
+                                    <a-menu-divider />
+                                    <a-menu-item key="2">
+                                        <UserOutlined />
+                                        两次
+                                    </a-menu-item>
+                                </a-menu>
+                            </template>
+                            <a-button type="primary">
+                                巡检次数筛选
+                                <DownOutlined />
+                            </a-button>
+                        </a-dropdown>
+                    </a-col>
+                </a-row>
+            </div>
+            <a-table :columns="columns" size="small" :data-source="tableData" :scroll="{ y: 500 }" class="tableW"
+                :pagination="pagination">
+                <template #action="{ record }">
+                    <a class="table-action-link" @click="handlerEdit(record)">编辑</a>
+                    <a class="table-action-link" @click="handlerDel(record)">删除</a>
+                    <a class="table-action-link" @click="moveUp(record)">上移</a>
+                    <a class="table-action-link" @click="moveDown(record)">下移</a>
+                </template>
+                <template #bodyCell="{ column, text }">
+                    <template v-if="column.dataIndex == 'insType'">
+                        <div v-if="text == '2'">
+                            <div class="table-text">第一次</div>
+                            <div>第二次</div>
+                        </div>
+                        <div v-else>第一次</div>
+                    </template>
+                    <template
+                        v-if="column.dataIndex == 'afterNoon' || column.dataIndex == 'morning' || column.dataIndex == 'evening'">
+                        <div v-if="text == '1'">
+                            <div class="table-text text-y ">是</div>
+                            <div class="text-y">是</div>
+                        </div>
+                        <div v-else>
+                            <div class="table-text text-n">否</div>
+                            <div class="text-n">否</div>
+                        </div>
+                    </template>
+
+                </template>
+            </a-table>
+            <!-- 任务管理弹窗 -->
+            <a-modal v-model:visible="visibleTask" width="850px" :footer="null" :title="titleTask" centered
+                destroyOnClose>
+                <inspectTask @handleTaskSubmit="handleTaskSubmit" @handleTaskCancel="handleTaskCancel"></inspectTask>
+            </a-modal>
+            <!-- 编辑弹窗 -->
+            <a-modal v-model:visible="visibleEdit" width="650px" :footer="null" :title="titleEdit" centered
+                destroyOnClose>
+                <inspectEdit :inspectEditData="inspectEditData" @confirmEdit="confirmEdit" @cancelEdit="cancelEdit">
+                </inspectEdit>
+            </a-modal>
+            <!-- 删除弹窗 -->
+            <a-modal v-model:visible="visibleDel" width="450px" :footer="null" :title="titleDel" centered
+                destroyOnClose>
+                <inspectDel @handleDelCard="handleDelCard" @handleDelCardInfo="handleDelCardInfo"
+                    @handleCancelDelCard="handleCancelDelCard"></inspectDel>
+            </a-modal>
+            <!-- 导入弹窗 -->
+            <a-modal v-model:visible="visibleUploadorDown" width="450px" :footer="null" :title="titleUploadorDown"
+                centered destroyOnClose>
+                <uploadOrdown :modalType="modalType" @handlerComfirm="handlerComfirm" @handlerCancel="handlerCancel">
+                </uploadOrdown>
+            </a-modal>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed, reactive } from 'vue';
+import customHeader from '/@/components/vent/customHeader.vue';
+import inspectTask from './components/inspectTask.vue'
+import inspectEdit from './components/inspectEdit.vue'
+import inspectDel from './components/inspectDel.vue'
+import uploadOrdown from './components/uploadOrdown.vue'
+import { message } from 'ant-design-vue';
+import { columns, pagination } from './gasInspect.data'
+import { list, importByExcel, exportGasByExcel, moveOrderNum, edit, deleteCard, taskSubmit, clearCardInfo } from './gasInspect.api'
+
+
+let searchId = ref('')
+let tableData = ref<any[]>([])//巡检列表
+let visibleTask = ref(false)//控制任务管理弹窗的显示与隐藏
+let titleTask = ref('')
+let visibleEdit = ref(false)//控制编辑弹窗的显示与隐藏
+let titleEdit = ref('')//编辑弹窗标题
+let inspectEditData = reactive({})//编辑弹窗数据
+let visibleDel = ref(false)//控制删除弹窗的显示与隐藏
+let titleDel = ref('')//删除弹窗标题
+let inspectDelData = ref('')
+let visibleUploadorDown = ref(false)//控制导入/导出弹窗的显示与隐藏
+let titleUploadorDown = ref('')
+let modalType = ref('')//判断当前是导入/导出弹窗
+
+
+//打开任务管理弹窗
+let handlerTask = () => {
+    visibleTask.value = true
+    titleTask.value = '瓦斯巡检任务管理'
+}
+//任务管理下发
+async function handleTaskSubmit(param) {
+    let res = await taskSubmit({ ...param })
+    console.log(res, '任务管理下发')
+    if (res) {
+        visibleTask.value = false
+        queryByIdList()
+    }
+}
+//任务管理弹窗关闭
+let handleTaskCancel = () => {
+    visibleTask.value = false
+}
+//打开编辑弹窗
+let handlerEdit = (record) => {
+    visibleEdit.value = true
+    titleEdit.value = '瓦斯巡检点编辑'
+    inspectEditData = Object.assign({}, record)
+}
+//编辑提交
+async function confirmEdit(param) {
+    let res = await edit({ ...param })
+    if (res) {
+        queryByIdList()
+    }
+}
+//编辑取消
+let cancelEdit = () => {
+    visibleEdit.value = false
+}
+//代开删除弹窗
+let handlerDel = (record) => {
+    visibleDel.value = true
+    titleDel.value = '瓦斯巡检点删除'
+    inspectDelData.value = record.id
+}
+//删除巡检卡
+async function handleDelCard() {
+    let res = await deleteCard({ id: inspectDelData.value })
+    if (res) {
+        visibleDel.value = false
+        inspectDelData.value = ''
+        queryByIdList()
+    }
+}
+//删除巡检卡信息
+async function handleDelCardInfo() {
+    let res = await clearCardInfo({ id: inspectDelData.value })
+    console.log(res, '瓦斯巡检卡信息删除')
+    if (res) {
+        visibleDel.value = false
+        inspectDelData.value = ''
+        queryByIdList()
+    }
+}
+//取消删除巡检卡或者巡检卡信息
+let handleCancelDelCard = () => {
+    inspectDelData.value = ''
+    visibleDel.value = false
+}
+
+//通过id（巡检卡id）查询
+async function queryByIdList() {
+    let res = await list({ id: searchId.value, pageNo: pagination.current, pageSize: pagination.pageSize })
+    console.log(res, '列表查询---')
+    pagination.current = 1
+    tableData.value = res.records
+    pagination.total = res.total
+}
+//查询
+let getSearchCardId = () => {
+    queryByIdList()
+}
+//重置
+let getReset = () => {
+    searchId.value = ''
+    queryByIdList()
+}
+//导入
+let getupload = () => {
+    modalType.value = 'upload'
+    visibleUploadorDown.value = true
+    titleUploadorDown.value = '导入'
+}
+//确定导入
+async function handlerComfirm(param) {
+    let res = await importByExcel(param)
+    if (res.code == 200) {
+        visibleUploadorDown.value = false
+        message.success('导入成功')
+        queryByIdList()
+    }
+}
+//导出
+let getdownload = () => {
+    modalType.value = 'download'
+    visibleUploadorDown.value = true
+    titleUploadorDown.value = '导出'
+}
+//确定导出
+async function handlerCancel(param) {
+    let res = await exportGasByExcel({ insType: param.insType })
+    console.log(res, '导出数据')
+    if (res) {
+        let filename = '111.xlsx';
+        downFilePublic(res, filename);
+    }
+}
+// 下载公用方法
+function downFilePublic(content, fileName) {
+    const blob = new Blob([content], { type: 'application/xlsx;charset=UTF-8' }); // 构造一个blob对象来处理数据
+    // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+    // IE10以上支持blob但是依然不支持download
+    if ('download' in document.createElement('a')) {
+        // 支持a标签download的浏览器
+        const link = document.createElement('a'); // 创建a标签
+        link.download = fileName; // a标签添加属性
+        link.style.display = 'none';
+        link.href = URL.createObjectURL(blob);
+        document.body.appendChild(link);
+        link.click(); // 执行下载
+        URL.revokeObjectURL(link.href); // 释放url
+        document.body.removeChild(link); // 释放标签
+    } else {
+        // 其他浏览器
+        navigator.msSaveBlob(blob, fileName);
+    }
+}
+//列表上移
+async function moveUp(param) {
+    let res = await moveOrderNum({ id: param.id, moveType: 'upp' })
+    console.log(res, '向上移动')
+    if (res) {
+        queryByIdList()
+    }
+}
+//列表下移
+async function moveDown(param) {
+    let res = await moveOrderNum({ id: param.id, moveType: 'bel' })
+    console.log(res, '向下移动')
+    if (res) {
+        queryByIdList()
+    }
+}
+//巡检次数筛选
+let handlerFilter = (param) => {
+    let data = param.key
+    switch (data) {
+        case '1':
+            pagination.current = 1
+            tableData.value = tableData.value.filter(v => v.insType == '1')
+            break;
+        case '2':
+            pagination.current = 2
+            tableData.value = tableData.value.filter(v => v.insType == '2')
+            break;
+    }
+}
+
+onMounted(() => {
+    queryByIdList()
+})
+
+</script>
+
+<style lang="less" scoped>
+.gasReport {
+    width: 100%;
+    height: 100%;
+    padding: 80px 10px 15px 10px;
+    box-sizing: border-box;
+    position: relative;
+
+    .search-area {
+        margin: 20px 0px;
+
+        .area-item {
+            display: flex;
+            align-items: center;
+
+            .item-text {
+                color: #fff;
+            }
+        }
+    }
+
+    .table-text {
+        margin-bottom: 5px;
+    }
+
+    .text-y {
+        color: #0be716;
+    }
+
+    .text-n {
+        color: #ff0000;
+    }
+
+    .zxm-picker,
+    .zxm-input {
+        border: 1px solid #3ad8ff77 !important;
+        background-color: #ffffff00 !important;
+        color: #fff !important;
+    }
+
+}
+
+:deep(.zxm-table-thead > tr > th:last-child) {
+    border-right: 1px solid #91e9fe !important;
+}
+
+:deep(.zxm-picker-input > input) {
+    color: #fff;
+}
+
+:deep(.zxm-select:not(.zxm-select-customize-input) .zxm-select-selector) {
+    border: 1px solid #3ad8ff77 !important;
+    background-color: #ffffff00 !important;
+}
+
+:deep(.zxm-select-selection-item) {
+    color: #fff !important;
+}
+</style>

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

@@ -67,7 +67,7 @@
           </a-dropdown>
         </a-row>
       </div>
-      <a-table :columns="columns" :data-source="tableData" :scroll="{ y: 500 }" class="tableW" :pagination="pagination"
+      <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 500 }" class="tableW" :pagination="pagination"
         @change="pageChange">
         <template #bodyCell="{ column, text }"></template>
       </a-table>

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

@@ -0,0 +1,175 @@
+import { BasicColumn } from '/@/components/Table';
+export const gaspatrolColumnsTwo: BasicColumn[] = [
+    {
+        title: '序号',
+        width: 60,
+        align: 'center',
+        customRender: ({ index }: { index: number }) => `${index + 1}`
+    },
+    {
+        title: '地点',
+        dataIndex: 'strInstallPos',
+        key: 'strInstallPos',
+        align: 'center',
+    },
+    {
+        title: '第一次',
+        children: [
+            {
+                title: 'CH4(%)',
+                dataIndex: 'ch4One',
+                key: 'ch4One',
+                align: 'center',
+            },
+            {
+                title: 'CO2(%)',
+                dataIndex: 'co2One',
+                key: 'co2One',
+                align: 'center',
+            },
+            {
+                title: 'CO(ppm)',
+                dataIndex: 'coOne',
+                key: 'coOne',
+                align: 'center',
+            },
+            {
+                title: 'O2(%)',
+                dataIndex: 'o2One',
+                key: 'o2One',
+                align: 'center',
+            },
+            {
+                title: '温度(°C)',
+                dataIndex: 'tOne',
+                key: 'tOne',
+                align: 'center',
+            },
+            {
+                title: '时间',
+                dataIndex: 'timeOne',
+                key: 'timeOne',
+                align: 'center',
+            },
+        ]
+    },
+    {
+        title: '第二次',
+        children: [
+            {
+                title: 'CH4(%)',
+                dataIndex: 'ch4Two',
+                key: 'ch4Two',
+                align: 'center',
+            },
+            {
+                title: 'CO2(%)',
+                dataIndex: 'co2Two',
+                key: 'co2Two',
+                align: 'center',
+            },
+            {
+                title: 'CO(ppm)',
+                dataIndex: 'coTwo',
+                key: 'coTwo',
+                align: 'center',
+            },
+            {
+                title: 'O2(%)',
+                dataIndex: 'o2Two',
+                key: 'o2Two',
+                align: 'center',
+            },
+            {
+                title: '温度(°C)',
+                dataIndex: 'tTwo',
+                key: 'tTwo',
+                align: 'center',
+            },
+            {
+                title: '时间',
+                dataIndex: 'timeTwo',
+                key: 'timeTwo',
+                align: 'center',
+            },
+        ]
+    },
+    {
+        title: '瓦检员',
+        dataIndex: 'checkPerson',
+        key: 'checkPerson',
+        align: 'center',
+    },
+
+    {
+        title: '操作',
+        dataIndex: 'action',
+        width: 120,
+        align: 'center',
+        slots: { customRender: 'action' },
+    },
+];
+export const gaspatrolColumnsOne : BasicColumn[] = [
+    {
+        title: '序号',
+        width: 60,
+        align: 'center',
+        customRender: ({ index }: { index: number }) => `${index + 1}`
+    },
+    {
+        title: '地点',
+        dataIndex: 'strInstallPos',
+        key: 'strInstallPos',
+        align: 'center',
+    },
+    {
+        title: 'CH4(%)',
+        dataIndex: 'ch4One',
+        key: 'ch4One',
+        align: 'center',
+    },
+    {
+        title: 'CO2(%)',
+        dataIndex: 'co2One',
+        key: 'co2One',
+        align: 'center',
+    },
+    {
+        title: 'CO(ppm)',
+        dataIndex: 'coOne',
+        key: 'coOne',
+        align: 'center',
+    },
+    {
+        title: 'O2(%)',
+        dataIndex: 'o2One',
+        key: 'o2One',
+        align: 'center',
+    },
+    {
+        title: '温度(°C)',
+        dataIndex: 'tOne',
+        key: 'tOne',
+        align: 'center',
+    },
+    {
+        title: '时间',
+        dataIndex: 'timeOne',
+        key: 'timeOne',
+        align: 'center',
+    },
+    {
+        title: '瓦检员',
+        dataIndex: 'checkPerson',
+        key: 'checkPerson',
+        align: 'center',
+    },
+    {
+        title: '操作',
+        dataIndex: 'action',
+        width: 200,
+        align: 'center',
+        slots: { customRender: 'action' },
+    },
+];
+

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

@@ -0,0 +1,305 @@
+<template>
+    <div class="gaspatrolTable">
+        <div class="search-area">
+            <a-row>
+                <a-col :span="5">
+                    <div class="area-item">
+                        <div class="item-text">巡检地点：</div>
+                        <a-input style="width: 240px" v-model:value="searchData.address" placeholder="请输入巡检地点"
+                            @change="addressInput" />
+                    </div>
+                </a-col>
+                <a-col :span="5">
+                    <div class="area-item">
+                        <div class="item-text">巡检员：</div>
+                        <a-input style="width: 240px" v-model:value="searchData.userName" placeholder="请输入巡检员"
+                            @change="userInput" />
+                    </div>
+                </a-col>
+                <a-col :span="5">
+                    <div class="area-item">
+                        <div class="item-text">巡检类型：</div>
+                        <a-select ref="select" v-model:value="searchData.insType" style="width: 240px"
+                            placeholder="请输入巡检类型" @change="insTypeChange">
+                            <a-select-option v-for="(item, index) in insTypeList" :key="item.value" :value="item.value">{{
+                                item.label }}</a-select-option>
+                        </a-select>
+                    </div>
+                </a-col>
+                <a-col :span="5">
+                    <div class="area-item">
+                        <div class="item-text">巡检班次：</div>
+                        <a-select ref="select" v-model:value="searchData.class" style="width: 240px"
+                            placeholder="请输入巡检班次" @change="classChange">
+                            <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;">查询</a-button>
+                    <a-button preIcon="ant-design:sync-outlined" style="margin: 0px 15px">重置</a-button>
+
+                </a-col>
+            </a-row>
+        </div>
+        <div class="content-area">
+            <a-table :columns="Columns" size="small"  :data-source="gaspatrolTableData" class="tableW"
+                :pagination="false">
+
+            </a-table>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, watch } from 'vue'
+import { gaspatrolColumnsOne, gaspatrolColumnsTwo, } from './comment.data'
+let props = defineProps({
+    addressData: {
+        type: String,
+        default: ''
+    },
+    personData: {
+        type: String,
+        default: ''
+    },
+    instypeData: {
+        type: String,
+        default: ''
+    },
+    classData: {
+        type: String,
+        default: ''
+    },
+    tableData: {
+        type: Array,
+        default: () => {
+            return []
+        }
+    }
+})
+
+let searchData = reactive({
+    address: '',
+    userName: '',
+    insType: '1',
+    class: 'night'
+})
+let insTypeList = reactive<any[]>([
+    { label: '一次', value: '1' },
+    { label: '两次', value: '2' }
+])
+let classList = reactive<any[]>([
+    { label: '夜班', value: 'night' },
+    { label: '早班', value: 'early' },
+    { label: '中班', value: 'noon' },
+])
+let Columns = ref<any[]>(gaspatrolColumnsOne)
+let gaspatrolTableData = ref<any[]>([])
+let $emit = defineEmits(['addressInput', 'userInput', 'insTypeChange', 'classChange'])
+//巡检类型选项切换
+let insTypeChange = (val) => {
+    searchData.insType = val
+    $emit('insTypeChange', val)
+    if (val == '1') {
+        Columns.value = gaspatrolColumnsOne
+    } else {
+        Columns.value = gaspatrolColumnsTwo
+    }
+}
+//巡检班次选项切换
+let classChange = (val) => {
+    searchData.class = val
+    $emit('classChange', val)
+}
+//巡检地点输入
+let addressInput = (val) => {
+    searchData.address = val.target.value
+    $emit('addressInput', searchData.address)
+}
+//巡检员输入
+let userInput = (val) => {
+    searchData.userName = val.target.value
+    $emit('userInput', searchData.userName)
+}
+watch(() => props.tableData, (newV, oldV) => {
+    if (newV && newV.length != 0) {
+        if (searchData.insType == '1' && searchData.class == 'early') {
+            gaspatrolTableData.value = newV.map((el: any) => {
+                return {
+                    strInstallPos: el.strInstallPos,
+                    ch4One: el.ch4Early1,
+                    co2One: el.co2Early1,
+                    coOne: el.coEarly1,
+                    o2One: el.o2Early1,
+                    tOne: el.tearly1,
+                    timeOne: el.timeEarly1,
+                    checkPerson: el.checkPersonEarly,
+                }
+            })
+        } else if (searchData.insType == '2' && searchData.class == 'early') {
+            gaspatrolTableData.value = newV.map((el: any) => {
+                return {
+                    strInstallPos: el.strInstallPos,
+                    ch4One: el.ch4Early1,
+                    co2One: el.co2Early1,
+                    coOne: el.coEarly1,
+                    o2One: el.o2Early1,
+                    tOne: el.tearly1,
+                    timeOne: el.timeEarly1,
+                    ch4Two: el.ch4Early2,
+                    co2Two: el.co2Early2,
+                    coTwo: el.coEarly2,
+                    o2Two: el.o2Early2,
+                    tTwo: el.tearly2,
+                    timeTwo: el.timeEarly2,
+                    checkPerson: el.checkPersonEarly,
+                }
+            })
+        } else if (searchData.insType == '1' && searchData.class == 'noon') {
+            gaspatrolTableData.value = newV.map((el: any) => {
+                return {
+                    strInstallPos: el.strInstallPos,
+                    ch4One: el.ch4Noon1,
+                    co2One: el.co2Noon1,
+                    coOne: el.coNoon1,
+                    o2One: el.o2Noon1,
+                    tOne: el.tnoon1,
+                    timeOne: el.timeNoon1,
+                    checkPerson: el.checkPersonNoon,
+                }
+            })
+        } else if (searchData.insType == '2' && searchData.class == 'noon') {
+            gaspatrolTableData.value = newV.map((el: any) => {
+                return {
+                    strInstallPos: el.strInstallPos,
+                    ch4One: el.ch4Noon1,
+                    co2One: el.co2Noon1,
+                    coOne: el.coNoon1,
+                    o2One: el.o2Noon1,
+                    tOne: el.tnoon1,
+                    timeOne: el.timeNoon1,
+                    ch4Two: el.ch4Noon2,
+                    co2Two: el.co2Noon2,
+                    coTwo: el.coNoon2,
+                    o2Two: el.o2Noon2,
+                    tTwo: el.tnoon2,
+                    timeTwo: el.timeNoon2,
+                    checkPerson: el.checkPersonNoon,
+                }
+            })
+        } else if (searchData.insType == '1' && searchData.class == 'night') {
+            gaspatrolTableData.value = newV.map((el: any) => {
+                return {
+                    strInstallPos: el.strInstallPos,
+                    ch4One: el.ch4Night1,
+                    co2One: el.co2Night1,
+                    coOne: el.coNight1,
+                    o2One: el.o2Night1,
+                    tOne: el.tnight1,
+                    timeOne: el.timeNight1,
+                    checkPerson: el.checkPersonNight,
+                }
+            })
+        } else if (searchData.insType == '2' && searchData.class == 'night') {
+            gaspatrolTableData.value = newV.map((el: any) => {
+                return {
+                    strInstallPos: el.strInstallPos,
+                    ch4One: el.ch4Night1,
+                    co2One: el.co2Night1,
+                    coOne: el.coNight1,
+                    o2One: el.o2Night1,
+                    tOne: el.tnight1,
+                    timeOne: el.timeNight1,
+                    ch4Two: el.ch4Night2,
+                    co2Two: el.co2Night2,
+                    coTwo: el.coNight2,
+                    o2Two: el.o2Night2,
+                    tTwo: el.tnight2,
+                    timeTwo: el.timeNight2,
+                    checkPerson: el.checkPersonNoon,
+                }
+            })
+        } else {
+            gaspatrolTableData.value = newV.map((el: any) => {
+                return {
+                    strInstallPos: el.strInstallPos,
+                    ch4One: el.ch4Night1,
+                    co2One: el.co2Night1,
+                    coOne: el.coNight1,
+                    o2One: el.o2Night1,
+                    tOne: el.tnight1,
+                    timeOne: el.timeNight1,
+                    checkPerson: el.checkPersonNight,
+                }
+            })
+        }
+        console.log( gaspatrolTableData.value,' gaspatrolTableData.value')
+    } else {
+        gaspatrolTableData.value = []
+    }
+
+},{immediate:true})
+onMounted(() => {
+    searchData.address = props.addressData
+    searchData.userName = props.personData
+    searchData.insType = props.instypeData
+    searchData.class = props.classData
+})
+
+</script>
+
+<style lang="less" scoped>
+@ventSpace: zxm;
+
+.gaspatrolTable {
+    .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/deviceMonitor/components/device/device.api.ts

@@ -13,6 +13,7 @@ enum Api {
   getHistoryData = '/monitor/history/getHistoryData',
   safetyDeviceList = '/monitor/codeDict',
   exportXlsUrl = '/monitor/exportXls',
+  queryNowGasInsInfo='/safety/gasDayReport/queryNowGasInsInfo'//查询当前各班瓦斯巡检信息
 }
 /**
  * 列表接口
@@ -36,5 +37,6 @@ export const getDepartmentInfo = (params) => defHttp.get({ url: Api.getDepartmen
 export const listdays = (params) => defHttp.get({ url: Api.listdays, params });
 export const getHistoryData = (params) => defHttp.post({ url: Api.getHistoryData, params });
 export const safetyDeviceList = (params) => defHttp.post({ url: Api.safetyDeviceList, params });
+export const queryNowGasInsInfo = (params) => defHttp.post({ url: Api.queryNowGasInsInfo, params });
 
 export const getExportUrl = Api.exportXlsUrl;

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

@@ -101,22 +101,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>
@@ -131,22 +131,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 }">
@@ -190,6 +190,12 @@
                 </template>
               </MonitorTable>
             </template>
+            <!-- 瓦斯巡检 -->
+            <template v-else-if="deviceType.startsWith('gaspatrol') && activeKey == '1'">
+              <gaspatrolTable :addressData="addressData" :personData="personData" :instypeData="instypeData"
+                :classData="classData" :tableData="gaspatrolData" @addressInput="addressInput" @userInput="userInput"
+                @insTypeChange="insTypeChange" @classChange="classChange"></gaspatrolTable>
+            </template>
             <template v-else>
               <!-- 工作面echarts图标 -->
               <BarAndLine v-if="activeKey == '1' && deviceType == 'surface_history'" class="echarts-line"
@@ -200,62 +206,62 @@
                 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 }">
                   <template v-if="deviceType.startsWith('gate') || deviceType.startsWith('door')">
-                    <a-tag v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '0' && record.frontGateClose == '0'" color="red"
-                      >正在运行</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '0' && record.frontGateClose == 1" color="default"
-                      >关闭</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '1' && record.frontGateClose == '0'" color="#46C66F"
-                      >打开</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '1' && record.frontGateClose == '1'" color="#FF0000"
-                      >点位异常</a-tag
-                    >
-                    <a-tag v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '0' && record.rearGateClose == '0'" color="red"
-                      >正在运行</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '0' && record.rearGateClose == '1'" color="default"
-                      >关闭</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '1' && record.rearGateClose == '0'" color="#46C66F"
-                      >打开</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '1' && record.rearGateClose == '1'" color="#FF0000"
-                      >点位异常</a-tag
-                    >
-                    <a-tag v-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '0' && record.midGateClose == '0'" color="red"
-                      >正在运行</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '0' && record.midGateClose == 1" color="default"
-                      >关闭</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '0'" color="#46C66F"
-                      >打开</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '1'" color="#FF0000"
-                      >点位异常</a-tag
-                    >
+                    <a-tag
+                      v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '0' && record.frontGateClose == '0'"
+                      color="red">正在运行</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '0' && record.frontGateClose == 1"
+                      color="default">关闭</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '1' && record.frontGateClose == '0'"
+                      color="#46C66F">打开</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '1' && record.frontGateClose == '1'"
+                      color="#FF0000">点位异常</a-tag>
+                    <a-tag
+                      v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '0' && record.rearGateClose == '0'"
+                      color="red">正在运行</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '0' && record.rearGateClose == '1'"
+                      color="default">关闭</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '1' && record.rearGateClose == '0'"
+                      color="#46C66F">打开</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '1' && record.rearGateClose == '1'"
+                      color="#FF0000">点位异常</a-tag>
+                    <a-tag
+                      v-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '0' && record.midGateClose == '0'"
+                      color="red">正在运行</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '0' && record.midGateClose == 1"
+                      color="default">关闭</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '0'"
+                      color="#46C66F">打开</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '1'"
+                      color="#FF0000">点位异常</a-tag>
                     <template v-if="column.dataIndex === 'doorUse'">
                       <span v-if="record.doorUse == 1" color="default">行车风门</span>
                       <span v-else-if="record.doorUse == 2">行人风门</span>
@@ -288,8 +294,10 @@
                     <a-tag v-if="column.dataIndex === 'stateConn' && record.stateConn == '0'" color="red">断开</a-tag>
                   </template>
                   <template v-else-if="deviceType.startsWith('gaspatrol')">
-                    <a-tag v-if="column.dataIndex === 'deviceConnect_str' && record.deviceConnect_str.endsWith('正常')" color="green">{{record.deviceConnect_str}}</a-tag>
-                    <a-tag v-if="column.dataIndex === 'deviceConnect_str' && record.deviceConnect_str.endsWith('断开')" color="red">{{record.deviceConnect_str}}</a-tag>
+                    <a-tag v-if="column.dataIndex === 'deviceConnect_str' && record.deviceConnect_str.endsWith('正常')"
+                      color="green">{{ record.deviceConnect_str }}</a-tag>
+                    <a-tag v-if="column.dataIndex === 'deviceConnect_str' && record.deviceConnect_str.endsWith('断开')"
+                      color="red">{{ record.deviceConnect_str }}</a-tag>
                   </template>
                   <a-tag v-if="column.dataIndex === 'warnFlag'"
                     :color="record.warnFlag == 0 ? 'green' : record.warnFlag == 1 ? '#FF5812' : 'gray'">
@@ -352,12 +360,13 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, ComponentOptions, shallowRef, reactive, defineProps, watch } from 'vue';
 import { SendOutlined, FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons-vue';
-import { list, getDeviceList, getDeviceTypeList, devPosition, getDepartmentInfo, getExportUrl } from './device.api';
+import { list, getDeviceList, getDeviceTypeList, devPosition, getDepartmentInfo, getExportUrl, queryNowGasInsInfo, } from './device.api';
 import AlarmHistoryTable from '../../../comment/AlarmHistoryTable.vue';
 import HistoryTable from '../../../comment/HistoryTable.vue';
 import HandlerHistoryTable from '../../../comment/HandlerHistoryTable.vue';
 import MonitorTable from '../../../comment/MonitorTable.vue';
 import GroupMonitorTable from '../../../comment/GroupMonitorTable.vue';
+import gaspatrolTable from '../../../comment/gaspatrolTable.vue'
 import HistoryBall from './modal/history-ball.vue'
 import { TreeProps, message, Progress, Input, Select } from 'ant-design-vue';
 import { TableAction } from '/@/components/Table';
@@ -387,6 +396,13 @@ import { useMethods } from '/@/hooks/system/useMethods';
 import { useGo } from '/@/hooks/web/usePage';
 import { useGlobSetting } from '/@/hooks/setting';
 
+//瓦斯巡检查询参数
+const addressData = ref('')//巡检地点
+const personData = ref('')//巡检员
+const instypeData = ref('')//巡检类型
+const classData = ref('')//巡检班次
+const gaspatrolData = ref<any[]>([])
+
 const glob = useGlobSetting();
 // import { BorderBox8 as DvBorderBox8 } from '@kjgl77/datav-vue3';
 
@@ -488,12 +504,12 @@ const onSelect: TreeProps['onSelect'] = (keys, e) => {
   //   clearTimeout(startMonitorTimer);
   // }
   dataSource.value = [];
-  if(!startMonitorTimer){
+  if (!startMonitorTimer) {
     startMonitorTimer = setTimeout(() => {
       expandedKeys.value = keys;
       selectedKeys.value = keys;
       treeNodeTitle.value = e.node.title;
-     
+
       // if (e.node.children?.length < 1 && timer) {
       //   getMonitor(true);
       // }
@@ -558,7 +574,11 @@ function getMonitor(flag?) {
     if (Object.prototype.toString.call(timer) === '[object Null]') {
       timer = setTimeout(
         async () => {
-          await getDataSource();
+          if (!deviceType.value.startsWith('gaspatrol')) {
+            await getDataSource();
+          } else {
+            await queryNowGasInsInfoList();
+          }
           if (timer) {
             getMonitor();
           }
@@ -736,15 +756,41 @@ async function getDataSource() {
   }
 }
 
+//查询当前各班瓦斯巡检信息
+async function queryNowGasInsInfoList() {
+  let res = await queryNowGasInsInfo({ address: addressData.value, userName: personData.value, insType: instypeData.value, class: classData.value })
+  console.log(res, '查询当前各班瓦斯巡检信息')
+  if (res.length) {
+    gaspatrolData.value = res
+  } else {
+    gaspatrolData.value = []
+  }
+}
+//巡检地点输入
+let addressInput = (param) => {
+  addressData.value = param
+}
+//巡检员输入
+let userInput = (param) => {
+  personData.value = param
+}
+//巡检类型选项切换
+let insTypeChange = (param) => {
+  instypeData.value = param
+}
+//巡检班次选项切换
+let classChange = (param) => {
+  classData.value = param
+}
 function goLocation(record) {
-  if(record['deviceType'] == 'person_bd' || record['deviceType'] == 'car_bd'){
+  if (record['deviceType'] == 'person_bd' || record['deviceType'] == 'car_bd') {
     actions.setGlobalState({ locationId: record.devNum, locationObj: null, pageObj: null, type: record['deviceType'].split('_')[0] });
-  }else{
-    if(deviceType.value.startsWith('location')){
+  } else {
+    if (deviceType.value.startsWith('location')) {
       actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null, type: 'person' });
-    }else if(deviceType.value.startsWith('vehicle')) {
+    } else if (deviceType.value.startsWith('vehicle')) {
       actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null, type: 'car' });
-    }else{
+    } else {
       actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null });
     }
   }
@@ -785,7 +831,7 @@ function goDetail(record?) {
     } else if (deviceType.value.indexOf('windrect') != -1) {
       const newPage = router.resolve({ path: '/monitorChannel/monitor-windrect', query: { id: activeID.value, deviceType: deviceType.value } });
       window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('fanmain') != -1 ) {
+    } else if (deviceType.value.indexOf('fanmain') != -1) {
       const newPage = router.resolve({ path: '/monitorChannel/monitor-fanmain', query: { id: activeID.value, deviceType: deviceType.value } });
       window.open(newPage.href, '_blank');
     } else if (deviceType.value.indexOf('fanlocal') != -1 && glob.sysOrgCode !== 'ymdnymdn') {
@@ -812,7 +858,7 @@ function goDetail(record?) {
     } else if (systemType.value.indexOf('nitrogen') != -1) {
       const newPage = router.resolve({ path: '/nitrogen-home', query: { id: systemID.value } });
       window.open(newPage.href, '_blank');
-    }else if (deviceType.value.indexOf('forcFan') != -1) {
+    } else if (deviceType.value.indexOf('forcFan') != -1) {
       const newPage = router.resolve({ path: '/forcFan/home', query: { id: activeID.value } });
       window.open(newPage.href, '_blank');
     } else if (deviceType.value.indexOf('pulping') != -1) {
@@ -1015,15 +1061,15 @@ watch(
 onMounted(async () => {
   const pageObj = props.pageData;
   if (!pageObj) return;
-  if (pageObj && pageObj.pageType ) {
-    if(pageObj.pageType.startsWith('sys_')){
+  if (pageObj && pageObj.pageType) {
+    if (pageObj.pageType.startsWith('sys_')) {
       await getDeviceType(pageObj.pageType);
       findTreeDataValue({ deviceType: pageObj.pageType, deviceid: pageObj.deviceid });
-    }else{
+    } else {
       await getDeviceType();
       findTreeDataValue({ deviceType: pageObj.pageType });
     }
-  }else{
+  } else {
     await getDeviceType();
     findTreeDataValue({ deviceid: pageObj.deviceid });
   }

src/views/vent/monitorManager/deviceMonitor/staticSheets/gasSheet.vue

@@ -31,31 +31,31 @@
           </tr>
           <tr height="30">
             <td colspan="10" class="et42">绝对瓦斯涌出量</td>
-            <td colspan="7" class="et42">29.92m³/min</td>
+            <td colspan="7" class="et42">29.45 m3/min</td>
             <td colspan="14" class="et42">抽放泵站地点</td>
             <td colspan="8" class="et42">抽放工作面</td>
             <td colspan="12" class="et42">设备型号</td>
           </tr>
           <tr height="30">
             <td colspan="10" class="et42">相对瓦斯涌出量</td>
-            <td colspan="7" class="et42">0.83m³/t</td>
-            <td colspan="14" class="et42">二水平中部辅运大巷1860米</td>
-            <td colspan="8" class="et42">42205综放面</td>
-            <td colspan="12" class="et42">ZWY270/355</td>
+            <td colspan="7" class="et42">0.72m³/t</td>
+            <td colspan="14" class="et42">12煤组辅运大巷485米处</td>
+            <td colspan="8" class="et42">12上302综放面</td>
+            <td colspan="12" class="et42">ZWY300/355</td>
           </tr>
           <tr height="30">
             <td colspan="10" class="et42">综采最大涌出量</td>
-            <td colspan="7" class="et42">3.16m³/min</td>
-            <td colspan="14" class="et42">12煤组辅运大巷480米</td>
-            <td colspan="8" class="et42">12上302综放面</td>
-            <td colspan="12" class="et42">ZWY300/355</td>
+            <td colspan="7" class="et42">3.40m³/min</td>
+            <td colspan="14" class="et42">22煤二盘区辅运大巷4000米</td>
+            <td colspan="8" class="et42">22210综放面</td>
+            <td colspan="12" class="et42">ZWY270/355</td>
           </tr>
           <tr height="30">
             <td colspan="10" class="et42">掘进最大涌出量</td>
-            <td colspan="7" class="et42">0.68m³/min</td>
-            <td colspan="14" class="et42">12煤二盘区辅运大巷1280米</td>
-            <td colspan="8" class="et42">12201综采面</td>
-            <td colspan="12" class="et42">ZWY300/355</td>
+            <td colspan="7" class="et42">0.83 m³/min</td>
+            <td colspan="14" class="et42">42煤二盘区1760米处</td>
+            <td colspan="8" class="et42">42205综放面</td>
+            <td colspan="12" class="et42">ZWY270/355</td>
           </tr>
           <tr height="30">
             <td colspan="51" rowspan="2" class="et5"
@@ -87,59 +87,59 @@
           </tr>
           <tr height="30">
             <td colspan="4" class="et42">12上</td>
-            <td colspan="4" class="et42">1.88</td>
-            <td colspan="5" class="et42">0.25</td>
-            <td colspan="7" class="et42">0.1483-0.9281</td>
-            <td colspan="4" class="et42">35.115</td>
-            <td colspan="4" class="et42">0.481</td>
-            <td colspan="4" class="et22">6.90</td>
-            <td colspan="4" class="et22">13.23</td>
-            <td colspan="4" class="et22">14.30</td>
-            <td colspan="4" class="et22">4.44</td>
-            <td colspan="4" class="et42">0.7</td>
-            <td colspan="3" class="et42">19.5</td>
+            <td colspan="4" class="et42">2.78</td>
+            <td colspan="5" class="et42">0.204</td>
+            <td colspan="7" class="et42">0.4092~0.4671</td>
+            <td colspan="4" class="et42">29.3002</td>
+            <td colspan="4" class="et42">0.9879</td>
+            <td colspan="4" class="et22">6.86</td>
+            <td colspan="4" class="et22">11.04</td>
+            <td colspan="4" class="et22">31.34</td>
+            <td colspan="4" class="et22">12.26</td>
+            <td colspan="4" class="et42">0.96</td>
+            <td colspan="3" class="et42">26</td>
           </tr>
           <tr height="30">
             <td colspan="4" class="et42">22</td>
-            <td colspan="4" class="et42">2.29</td>
-            <td colspan="5" class="et42">-</td>
-            <td colspan="7" class="et42">0.1364-0.2564</td>
-            <td colspan="4" class="et42">33.333</td>
-            <td colspan="4" class="et42">0.696</td>
-            <td colspan="4" class="et22">13.23</td>
-            <td colspan="4" class="et22">10.75</td>
-            <td colspan="4" class="et22">40.95</td>
-            <td colspan="4" class="et22">7.53</td>
-            <td colspan="4" class="et42">-</td>
-            <td colspan="3" class="et42">-</td>
+            <td colspan="4" class="et42">2.28</td>
+            <td colspan="5" class="et42">0.161</td>
+            <td colspan="7" class="et42">0.2563~0.3121</td>
+            <td colspan="4" class="et42">27.5599</td>
+            <td colspan="4" class="et42">0.8335</td>
+            <td colspan="4" class="et22">7.06</td>
+            <td colspan="4" class="et22">9.58</td>
+            <td colspan="4" class="et22">34.91</td>
+            <td colspan="4" class="et22">11.41</td>
+            <td colspan="4" class="et42">1.2</td>
+            <td colspan="3" class="et42">16</td>
           </tr>
           <tr height="30">
             <td colspan="4" class="et42">42</td>
-            <td colspan="4" class="et42">2.43</td>
-            <td colspan="5" class="et42">-</td>
-            <td colspan="7" class="et42">0.1588-0.2651</td>
-            <td colspan="4" class="et42">32.362</td>
-            <td colspan="4" class="et42">0.702</td>
-            <td colspan="4" class="et22">12.83</td>
-            <td colspan="4" class="et22">1.59</td>
-            <td colspan="4" class="et22">37.51</td>
-            <td colspan="4" class="et22">7.19</td>
-            <td colspan="4" class="et42">-</td>
-            <td colspan="3" class="et42">-</td>
+            <td colspan="4" class="et42">2.38</td>
+            <td colspan="5" class="et42">0.203</td>
+            <td colspan="7" class="et42">0.2528~0.2672</td>
+            <td colspan="4" class="et42">25.0463</td>
+            <td colspan="4" class="et42">1.1652</td>
+            <td colspan="4" class="et22">5.99</td>
+            <td colspan="4" class="et22">7.47</td>
+            <td colspan="4" class="et22">35.62</td>
+            <td colspan="4" class="et22">10.2</td>
+            <td colspan="4" class="et42">1.1</td>
+            <td colspan="3" class="et42">24</td>
           </tr>
           <tr height="30">
             <td colspan="4" class="et42">12</td>
-            <td colspan="4" class="et42">1.98</td>
-            <td colspan="5" class="et42">0.24</td>
-            <td colspan="7" class="et42">0.0182-1.3335</td>
-            <td colspan="4" class="et42">32.575</td>
-            <td colspan="4" class="et42">0.825</td>
-            <td colspan="4" class="et22">5.36</td>
-            <td colspan="4" class="et22">3.84</td>
-            <td colspan="4" class="et22">26.84</td>
-            <td colspan="4" class="et22">7.09</td>
-            <td colspan="4" class="et42">0.675</td>
-            <td colspan="3" class="et42">10.293</td>
+            <td colspan="4" class="et42">2.07</td>
+            <td colspan="5" class="et42">0.214</td>
+            <td colspan="7" class="et42">0.5579~0.6002</td>
+            <td colspan="4" class="et42">31.752</td>
+            <td colspan="4" class="et42">0.9444</td>
+            <td colspan="4" class="et22">7.33</td>
+            <td colspan="4" class="et22">8.19</td>
+            <td colspan="4" class="et22">30.53</td>
+            <td colspan="4" class="et22">8.84</td>
+            <td colspan="4" class="et42">1.1</td>
+            <td colspan="3" class="et42">23</td>
           </tr>
         </tbody>
       </table>

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

@@ -14,14 +14,17 @@
                             <div class="title-fz">
                                 <span>分站：</span>
                                 <span>
-                                    [通讯正常]
+                                    [连接]
                                     <span class="zd-open">{{ openNum || 0 }}</span>
                                 </span>
                                 <span>
-                                    [通讯中断]
+                                    [断开]
                                     <span class="zd-close">{{ clsoeNum || 0 }}</span>
                                 </span>
-                              
+                                <span>
+                                    [未启用]
+                                    <span class="zd-wait">{{ waitNum || 0 }}</span>
+                                </span>
                             </div>
                             <a-button type="primary" size="small" @click="getAllShow">显示全部</a-button>
                         </div>
@@ -325,6 +328,7 @@ let ljList = reactive<any[]>([
 ])
 let openNum = ref(0)
 let clsoeNum = ref(0)
+let waitNum=ref(0)
 let stationId = ref('')
 let tableData = ref<any[]>([])
 let tableData1 = ref<any[]>([])
@@ -429,6 +433,20 @@ function getMonitor1(flag = false) {
         flag ? 0 : 5000
     );
 }
+
+let timer2: null | NodeJS.Timeout = null;
+function getMonitor2(flag = false) {
+    timer2 = setTimeout(
+        async () => {
+            await getSubStationList()
+            if (timer2) {
+                timer2 = null;
+            }
+            getMonitor2();
+        },
+        flag ? 0 : 5000
+    );
+}
 async function getDeviceList() {
     let res = await set158StationRead({ stationId: devStationId.value, deviceId: formEdit.cgq })
     if (res) {
@@ -455,7 +473,7 @@ function onChangeTab(tab) {
         getSubStationList()
         getStationList1({ subId: stationId.value, pageNo: pagination.current, pageSize: pagination.pageSize, })
     } else {
-        getSubStationList()
+        clearTimeout(timer2)
         getStationList()
         getMonitor1()
     }
@@ -648,6 +666,7 @@ async function getSubStationList() {
         cardList.value = res
         openNum.value = cardList.value?.filter(v => v.linkstatus == 1)['length']
         clsoeNum.value = cardList.value?.filter(v => v.linkstatus == 0)['length']
+        waitNum.value=cardList.value?.filter(v=>v.isNewAccess==1)['length']
     } else {
         cardList.value = []
     }
@@ -681,7 +700,7 @@ async function getStationList1(param) {
     res.forEach(el => {
         el.key = el.id
         el.linkIdC = el.linkId || ''
-        el.stripC=el.strip  || ''
+        el.stripC = el.strip || ''
         el.linkstatusC = el.linkstatus ? '连接' : '断开'
         el.gdmsC = el.gdms == '1' ? '直流供电' : el.gdms == '0' ? '交流供电' : ''
         // el.debugTitle = '调试'
@@ -689,7 +708,7 @@ async function getStationList1(param) {
         el.children.forEach(v => {
             v.key = v.id
             v.debugTitle = '调试'
-            v.stripC=v.strserno || ''
+            v.stripC = v.strserno || ''
             v.linkstatusC = v.netStatus ? '连接' : '断开'
             v.linkIdC = v.linkId == '0' ? '未启用' : v.linkId == '1' ? '启用' : v.linkId == '2' ? '设备异常' : ''
             v.updateTime = v.time
@@ -701,10 +720,10 @@ async function getStationList1(param) {
     pagination.total = res.total
 }
 //显示全部
-function getAllShow(){
+function getAllShow() {
     pagination.current = 1
-    stationId.value=''
-    getStationList1({ pageNo: pagination.current, pageSize: pagination.pageSize,})
+    stationId.value = ''
+    getStationList1({ pageNo: pagination.current, pageSize: pagination.pageSize, })
 }
 //启动新设备
 function handlerunDeviceMonitor(record, val) {
@@ -879,6 +898,7 @@ function pageChange(val) {
 onMounted(() => {
     getSubStationList()
     getStationList1({ subId: stationId.value, pageNo: pagination.current, pageSize: pagination.pageSize, })
+    getMonitor2()
 })
 onUnmounted(() => {
     if (timer) {
@@ -889,6 +909,10 @@ onUnmounted(() => {
         clearTimeout(timer1);
         timer1 = undefined;
     }
+    if (timer2) {
+        clearTimeout(timer2);
+        timer2 = undefined;
+    }
 });
 </script>
 
@@ -985,6 +1009,9 @@ onUnmounted(() => {
                         .zd-close {
                             color: #ff0000;
                         }
+                        .zd-wait{
+                            color: #489cdc;
+                        }
 
                         .title-fz {
                             margin-right: 25px;