From 84d5b525a5c7b93a28f2c6b14cfdde575c6dd1d4 Mon Sep 17 00:00:00 2001
From: waibao2 <1@qq.com>
Date: Fri, 28 Nov 2025 15:43:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/currdata/index-jd.vue | 311 ++++++++++++++++++++
 src/views/data/currdata/index.vue    | 405 ++++++++++++---------------
 2 files changed, 489 insertions(+), 227 deletions(-)
 create mode 100644 src/views/data/currdata/index-jd.vue

diff --git a/src/views/data/currdata/index-jd.vue b/src/views/data/currdata/index-jd.vue
new file mode 100644
index 0000000..a8621a3
--- /dev/null
+++ b/src/views/data/currdata/index-jd.vue
@@ -0,0 +1,311 @@
+<template>
+    <div class="app-container app-container-bg">
+        <el-card class="first-card" ref='firstCard' shadow="always">
+            <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
+                <el-form-item label="测站属性" prop="prop">
+                    <el-select v-model="queryParams.prop" placeholder="请选择测站属性" style="width:100%" @change="propChange">
+                        <el-option v-for="dict in propsList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="测站名称" prop="stnmId">
+                    <el-select v-model="queryParams.stnmId" placeholder="请选择测站名称" style="width:100%" @change="handleQuery">
+                        <el-option v-for="dict in stationList" :key="dict.stnmId" :label="dict.stnm" :value="dict.stnmId"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                    <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['data:currdata:export']">导出</el-button>
+                </el-col>
+            </el-row>
+        </el-card>
+        <div class="el-card-p card-shadow carder-border mt10 pad10 currdata" v-loading="fullscreenLoading">
+            <div class="table-container" v-if="processedTables.length > 0" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="30">
+                <div class="table-grid" :style="{ gridTemplateColumns: `repeat(${itemsPerRow}, 1fr)` }">
+                    <div class="table-item" v-for="(table, index) in processedTables" :key="index">
+                        <el-table :data="table.data" class="double-header-table" :show-header="true" :header-cell-style="{ backgroundColor: '#3F7DEC !important',  }" style="width: 100%;" size="mini">
+                            <el-table-column :label="table.stnm" width="120" show-overflow-tooltip>
+                                <template #header #default="scope">
+                                    <div class="header-content">
+                                        <el-tooltip effect="dark" :content="table.stnm" placement="top-end" :open-delay="300">
+                                            <div class="item-station cursor">
+                                                <div>
+                                                    {{ table.stnm }}
+                                                </div>
+                                                <div>{{ table.stcd }}</div>
+                                            </div>
+                                        </el-tooltip>
+                                        <div class="header-right ">
+                                            <span class="item-time">{{ table.tm }}</span>
+                                        </div>
+                                    </div>
+                                </template>
+                                <el-table-column prop="typeName" label="名称" show-overflow-tooltip />
+                                <el-table-column prop="value" label="值" :class-name="value-name" />
+                                <el-table-column prop="unit" label="单位" width="80" />
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </div>
+            </div>
+            <el-empty class="table-container " v-else :image-size="200"></el-empty>
+        </div>
+    </div>
+</template>
+<script setup>
+    import { ref, reactive, onMounted, } from 'vue'
+    import _ from 'lodash'
+    const { proxy } = getCurrentInstance()
+    const alignment = 'center'
+    const queryParams = reactive({
+        page: 1,
+        limit: 10,
+        stnmId: '',
+        prop: "",
+        mainType: "A"
+    })
+    const fullscreenLoading = ref(false)
+    let currdataList = []
+    let total = 0
+    const getList = async () => {
+        fullscreenLoading.value = true;
+        try {
+            const res = await proxy.axiosGet('/data/currdata/queryAll', queryParams)
+            if (res.code == 0) {
+                currdataList = res.data
+                total = currdataList.length
+                formatTableData()
+            }
+
+        } catch (error) {
+        } finally {
+            fullscreenLoading.value = false
+        }
+    }
+    let tableList = ref([])
+    const formatTableData = () => {
+        const result = _.chain(currdataList)
+            .groupBy('stnm')
+            .map((group, stnm) => ({
+                stnm,
+                stcd: group[0].stcd,
+                tm: group[0].latestTm,
+                data: group.map(item => ({
+                    ...item,
+                    value: item.val !== null ? item.val : item.latestValue
+                }))
+            }))
+            .value();
+        tableList.value = result
+    }
+    // 滚动加载更多
+    const busy = ref(false)
+    const loadMore = async () => {
+        let all = total <= queryParams.page * queryParams.limit
+        if (busy.value && all) return; // 如果已经在加载中，则不执行加载操作
+        busy.value = true; // 设置加载状态为忙碌
+        queryParams.page += 1
+        let response = await proxy.axiosGet('/data/currdata/queryAll', queryParams);
+        if (response.code == 0) {
+            let rawData = response.data
+            let concatData = currdataList.concat(rawData)
+            currdataList = concatData
+            formatTableData()
+        }
+        busy.value = false;
+
+    }
+    const itemsPerRow = ref(5)
+    const processedTables = computed(() => {
+        let data = tableList.value
+        const result = [];
+        const rows = Math.ceil(data.length / itemsPerRow.value);
+
+        for (let i = 0; i < rows; i++) {
+            const startIndex = i * itemsPerRow.value;
+            const endIndex = Math.min(startIndex + itemsPerRow.value, data.length);
+            const rowTables = data.slice(startIndex, endIndex);
+
+            // 找出当前行中数据最多的表格
+            const maxRows = Math.max(...rowTables.map(table => table.data.length));
+
+            // 处理当前行的每个表格
+            rowTables.forEach(table => {
+                const newTable = { ...table };
+
+                // 如果数据行数不足，补充空行
+                if (table.data.length < maxRows) {
+                    const emptyRows = Array(maxRows - table.data.length).fill({});
+                    newTable.data = [...table.data, ...emptyRows];
+                }
+
+
+                result.push(newTable);
+            });
+        }
+
+        return result;
+    })
+    // 根据测站属性获取测站名称
+    const stationList = ref([])
+    const propChange = async () => {
+        try {
+            let res = await proxy.axiosGet('/basic/station/queryStnmandStnmId', queryParams);
+            if (res.code == 200) {
+                stationList.value = res.data;
+            }
+        } catch (error) {
+
+        }
+    }
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.pageNum = 1
+        getList()
+    }
+    const resetQuery = () => {
+        proxy.resetForm("queryForm");
+        handleQuery();
+    }
+    // 导出按钮
+    const handleExport = async () => {
+        let p = {
+            page: 1,
+            limit: 9999,
+            stnm: queryParams.stnm,
+            mainType: queryParams.mainType,
+        }
+        let res = await proxy.axiosGet('/data/currdata/queryAll', p);
+        if (res.code === 0) {
+            let table = [];
+            table.push({
+                A: "站点名称",
+                B: "设备ID",
+                C: "类型",
+                D: "最新数值",
+                E: "最新上传时间",
+            });
+            res.data.forEach(d => {
+                let row = {
+                    A: d.stnm,
+                    B: d.stcd,
+                    C: d.typeName,
+                    D: d.latestValue,
+                    E: d.latestTm
+                };
+                table.push(row);
+            });
+            let header = ["A", "B", "C", "D", "E"];
+            let fileName = "站点实时数据";
+            proxy.exportExcel(header, table, fileName);
+        }
+    }
+
+    onMounted(() => {
+        getList()
+        propChange()
+    })
+    const propsList = ref([
+        { label: '水文测站', value: 0 },
+        { label: '气象站', value: 1 }
+    ])
+</script>
+
+<style lang="scss" scoped>
+    .currdata {
+        overflow-y: scroll;
+    }
+
+    .table-container {
+        width: 100%;
+
+        .table-grid {
+            display: grid;
+            grid-template-columns: repeat(var(--grid-columns), 1fr);
+            gap: 20px;
+            width: 100%;
+
+            .table-item {
+                min-width: 240px;
+                /* 防止表格溢出*/
+            }
+        }
+
+        .header-content {
+            display: flex;
+            justify-content: space-between;
+            flex-wrap: nowrap;
+
+            .item-station {
+                width: 150px;
+                white-space: nowrap !important;
+                text-overflow: ellipsis;
+                word-break: break-all;
+                overflow: hidden;
+            }
+
+
+            .item-station,
+            .item-icon,
+            .item-time {
+                font-size: 12px;
+                color: #fff;
+                /* flex-wrap: nowrap; */
+
+            }
+
+            .item-icon {
+                cursor: pointer;
+                margin-left: 2px;
+            }
+
+        }
+    }
+
+    /* 表格样式 */
+    :deep(.double-header-table) {
+        border-radius: 12px;
+
+        &::before {
+            display: none;
+        }
+
+        .el-table__fixed-right::before {
+            display: none;
+        }
+
+        .el-table__body-wrapper::-webkit-scrollbar {
+            display: none;
+        }
+
+        /* 统一行高 */
+        .el-table__row {
+            height: 39.6667px;
+        }
+
+        /* 空行样式 */
+        .el-table__row--empty {
+            background-color: #f5f7fa;
+        }
+
+        /* 隐藏子表头 */
+        .el-table__header tr:nth-child(2) {
+            display: none;
+        }
+
+        /* 调整主表头样式 */
+        .el-table__header tr:first-child th {
+            background: #f5f7fa;
+            font-weight: bold;
+        }
+    }
+
+    /** 取消表格滑上的背景色 */
+    :deep(.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell) {
+        background: #fff !important;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/data/currdata/index.vue b/src/views/data/currdata/index.vue
index a8621a3..7a28dc0 100644
--- a/src/views/data/currdata/index.vue
+++ b/src/views/data/currdata/index.vue
@@ -2,14 +2,13 @@
     <div class="app-container app-container-bg">
         <el-card class="first-card" ref='firstCard' shadow="always">
             <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
-                <el-form-item label="测站属性" prop="prop">
-                    <el-select v-model="queryParams.prop" placeholder="请选择测站属性" style="width:100%" @change="propChange">
-                        <el-option v-for="dict in propsList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-                    </el-select>
+                <el-form-item label="测站名称" prop="stnm">
+                    <el-input v-model="queryParams.stnm" placeholder="请输入测站名称" clearable @keyup.enter.native="handleQuery" />
                 </el-form-item>
-                <el-form-item label="测站名称" prop="stnmId">
-                    <el-select v-model="queryParams.stnmId" placeholder="请选择测站名称" style="width:100%" @change="handleQuery">
-                        <el-option v-for="dict in stationList" :key="dict.stnmId" :label="dict.stnm" :value="dict.stnmId"></el-option>
+                <el-form-item label="测站类型" prop="mainType">
+                    <el-select v-model="queryParams.mainType" placeholder="请选择测站类型" @change="handleQuery">
+                        <el-option v-for="item in mainTypes" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -23,143 +22,91 @@
                 </el-col>
             </el-row>
         </el-card>
-        <div class="el-card-p card-shadow carder-border mt10 pad10 currdata" v-loading="fullscreenLoading">
-            <div class="table-container" v-if="processedTables.length > 0" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="30">
-                <div class="table-grid" :style="{ gridTemplateColumns: `repeat(${itemsPerRow}, 1fr)` }">
-                    <div class="table-item" v-for="(table, index) in processedTables" :key="index">
-                        <el-table :data="table.data" class="double-header-table" :show-header="true" :header-cell-style="{ backgroundColor: '#3F7DEC !important',  }" style="width: 100%;" size="mini">
-                            <el-table-column :label="table.stnm" width="120" show-overflow-tooltip>
-                                <template #header #default="scope">
-                                    <div class="header-content">
-                                        <el-tooltip effect="dark" :content="table.stnm" placement="top-end" :open-delay="300">
-                                            <div class="item-station cursor">
-                                                <div>
-                                                    {{ table.stnm }}
-                                                </div>
-                                                <div>{{ table.stcd }}</div>
-                                            </div>
-                                        </el-tooltip>
-                                        <div class="header-right ">
-                                            <span class="item-time">{{ table.tm }}</span>
-                                        </div>
-                                    </div>
-                                </template>
-                                <el-table-column prop="typeName" label="名称" show-overflow-tooltip />
-                                <el-table-column prop="value" label="值" :class-name="value-name" />
-                                <el-table-column prop="unit" label="单位" width="80" />
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </div>
-            </div>
-            <el-empty class="table-container " v-else :image-size="200"></el-empty>
+        <div class="el-card-p card-shadow carder-border mt10 pad10 ">
+            <el-table class="table-box" border v-table-height v-loading="loading" :data="currentData" :span-method="objectSpanMethod">
+                <el-table-column label="名称" :align="alignment" prop="stnm" />
+                <el-table-column label="设备ID" :align="alignment" prop="stcd" />
+                <el-table-column label="最新数值" :align="alignment" prop="latestValue" />
+                <el-table-column label="最新上传时间" :align="alignment" prop="latestTm" width="180" />
+                <el-table-column label="保证水位" :align="alignment" prop="bzsw" v-if="dataType == 'B' || dataType =='C' " />
+                <el-table-column label="警戒水位" :align="alignment" prop="jjsw" v-if="dataType == 'B' || dataType =='C' " />
+                <el-table-column label="操作" :align="alignment" class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['data:currdata:edit']">修改</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
         </div>
+        <el-dialog class="custom-dialog" :title="title" v-model="open" width="500px" append-to-body>
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
+                <el-form-item label="设备ID" prop="stcd">
+                    <el-input v-model="form.stcd" :disabled="true" />
+                </el-form-item>
+                <el-form-item label="最新数值" prop="latestValue">
+                    <el-input v-model="form.latestValue" placeholder="请输入最新数值" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="submitForm(formRef)" v-loading='btnLoading'>确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 <script setup>
     import { ref, reactive, onMounted, } from 'vue'
-    import _ from 'lodash'
     const { proxy } = getCurrentInstance()
     const alignment = 'center'
+
+
+
+    // 测站类型选项
+    const mainTypes = [
+        {
+            label: '雨量站',
+            value: 'A'
+        },
+        {
+            label: '河道站',
+            value: 'B'
+        },
+        {
+            label: '水库站',
+            value: 'C'
+        },
+        {
+            label: '潮位站',
+            value: 'D'
+        },
+        {
+            label: '流量站',
+            value: 'E'
+        }
+    ]
     const queryParams = reactive({
-        page: 1,
-        limit: 10,
-        stnmId: '',
-        prop: "",
-        mainType: "A"
+        pageNum: 1,
+        pageSize: 10,
+        stnm: '',
+        mainType:"A"
     })
-    const fullscreenLoading = ref(false)
-    let currdataList = []
-    let total = 0
+    const loading = ref(false)
+    const total = ref(0)
+    const currentData = ref([])
     const getList = async () => {
-        fullscreenLoading.value = true;
+        loading.value = true;
         try {
             const res = await proxy.axiosGet('/data/currdata/queryAll', queryParams)
             if (res.code == 0) {
-                currdataList = res.data
-                total = currdataList.length
-                formatTableData()
+                currentData.value = res.data
+                total.value = res.count
             }
 
         } catch (error) {
         } finally {
-            fullscreenLoading.value = false
-        }
-    }
-    let tableList = ref([])
-    const formatTableData = () => {
-        const result = _.chain(currdataList)
-            .groupBy('stnm')
-            .map((group, stnm) => ({
-                stnm,
-                stcd: group[0].stcd,
-                tm: group[0].latestTm,
-                data: group.map(item => ({
-                    ...item,
-                    value: item.val !== null ? item.val : item.latestValue
-                }))
-            }))
-            .value();
-        tableList.value = result
-    }
-    // 滚动加载更多
-    const busy = ref(false)
-    const loadMore = async () => {
-        let all = total <= queryParams.page * queryParams.limit
-        if (busy.value && all) return; // 如果已经在加载中，则不执行加载操作
-        busy.value = true; // 设置加载状态为忙碌
-        queryParams.page += 1
-        let response = await proxy.axiosGet('/data/currdata/queryAll', queryParams);
-        if (response.code == 0) {
-            let rawData = response.data
-            let concatData = currdataList.concat(rawData)
-            currdataList = concatData
-            formatTableData()
-        }
-        busy.value = false;
-
-    }
-    const itemsPerRow = ref(5)
-    const processedTables = computed(() => {
-        let data = tableList.value
-        const result = [];
-        const rows = Math.ceil(data.length / itemsPerRow.value);
-
-        for (let i = 0; i < rows; i++) {
-            const startIndex = i * itemsPerRow.value;
-            const endIndex = Math.min(startIndex + itemsPerRow.value, data.length);
-            const rowTables = data.slice(startIndex, endIndex);
-
-            // 找出当前行中数据最多的表格
-            const maxRows = Math.max(...rowTables.map(table => table.data.length));
-
-            // 处理当前行的每个表格
-            rowTables.forEach(table => {
-                const newTable = { ...table };
-
-                // 如果数据行数不足，补充空行
-                if (table.data.length < maxRows) {
-                    const emptyRows = Array(maxRows - table.data.length).fill({});
-                    newTable.data = [...table.data, ...emptyRows];
-                }
-
-
-                result.push(newTable);
-            });
-        }
-
-        return result;
-    })
-    // 根据测站属性获取测站名称
-    const stationList = ref([])
-    const propChange = async () => {
-        try {
-            let res = await proxy.axiosGet('/basic/station/queryStnmandStnmId', queryParams);
-            if (res.code == 200) {
-                stationList.value = res.data;
-            }
-        } catch (error) {
-
+            loading.value = false
         }
     }
     /** 搜索按钮操作 */
@@ -171,141 +118,145 @@
         proxy.resetForm("queryForm");
         handleQuery();
     }
+    const open = ref(false)
+    const title = ref('')
+    const form = ref({})
+    // 修改按钮操作
+    const handleUpdate = async (row) => {
+        reset();
+        let id = row.id
+        try {
+            let res = await proxy.axiosGet('/data/currdata/info/' + id);
+            if (res.code === 0) {
+                form.value = JSON.parse(JSON.stringify(res.data))
+                open.value = true;
+                title.value = "修改实时数据";
+            }
+        } catch (error) {
+            console.log(error)
+        }
+    }
     // 导出按钮
     const handleExport = async () => {
-        let p = {
+        let param = {
             page: 1,
             limit: 9999,
             stnm: queryParams.stnm,
-            mainType: queryParams.mainType,
+            mainType: queryParams.mainType
         }
-        let res = await proxy.axiosGet('/data/currdata/queryAll', p);
+        let res = await proxy.axiosGet('/data/currdata/queryAll', param);
         if (res.code === 0) {
             let table = [];
             table.push({
                 A: "站点名称",
                 B: "设备ID",
-                C: "类型",
-                D: "最新数值",
-                E: "最新上传时间",
+                C: "最新数值",
+                D: "最新上传时间",
             });
             res.data.forEach(d => {
                 let row = {
                     A: d.stnm,
                     B: d.stcd,
-                    C: d.typeName,
-                    D: d.latestValue,
-                    E: d.latestTm
+                    C: d.latestValue,
+                    D: d.latestTm,
                 };
                 table.push(row);
             });
-            let header = ["A", "B", "C", "D", "E"];
+            let header = ["A", "B", "C", "D"];
             let fileName = "站点实时数据";
             proxy.exportExcel(header, table, fileName);
         }
     }
+    /********************************  弹窗  ***************************** */
 
-    onMounted(() => {
-        getList()
-        propChange()
-    })
-    const propsList = ref([
-        { label: '水文测站', value: 0 },
-        { label: '气象站', value: 1 }
-    ])
-</script>
-
-<style lang="scss" scoped>
-    .currdata {
-        overflow-y: scroll;
+    const formRef = ref(null)
+    const cancel = () => {
+        open.value = false
+        reset()
     }
 
-    .table-container {
-        width: 100%;
-
-        .table-grid {
-            display: grid;
-            grid-template-columns: repeat(var(--grid-columns), 1fr);
-            gap: 20px;
-            width: 100%;
-
-            .table-item {
-                min-width: 240px;
-                /* 防止表格溢出*/
-            }
+    const reset = () => {
+        form.value = {
+            id: null,
+            stcd: "",
+            latestValue: "",
         }
-
-        .header-content {
-            display: flex;
-            justify-content: space-between;
-            flex-wrap: nowrap;
-
-            .item-station {
-                width: 150px;
-                white-space: nowrap !important;
-                text-overflow: ellipsis;
-                word-break: break-all;
-                overflow: hidden;
-            }
-
-
-            .item-station,
-            .item-icon,
-            .item-time {
-                font-size: 12px;
-                color: #fff;
-                /* flex-wrap: nowrap; */
-
+        proxy.resetForm("formRef")
+    }
+    const submitForm = async (formEl) => {
+        if (!formEl) return
+        await formEl.validate((valid, fields) => {
+            if (valid) {
+                if (form.id != null) {
+                    editMethod();
+                } else {
+                    addMethod();
+                }
             }
+        })
+    }
 
-            .item-icon {
-                cursor: pointer;
-                margin-left: 2px;
+    // 警戒水位新增方法
+    const addMethod = async () => {
+        btnLoading.value = true
+        try {
+            let res = await proxy.axiosPost('/data/currdata/add', form);
+            if (res.code === 0) {
+                proxy.$modal.msgSuccess("新增成功");
+                open.value = false;
+                getList()
+                btnLoading.value = false
             }
-
+        } catch (error) {
+            btnLoading.value = false
         }
     }
 
-    /* 表格样式 */
-    :deep(.double-header-table) {
-        border-radius: 12px;
-
-        &::before {
-            display: none;
-        }
-
-        .el-table__fixed-right::before {
-            display: none;
-        }
-
-        .el-table__body-wrapper::-webkit-scrollbar {
-            display: none;
-        }
-
-        /* 统一行高 */
-        .el-table__row {
-            height: 39.6667px;
+    // 修改方法
+    const editMethod = async () => {
+        btnLoading.value = true
+        try {
+            let res = await proxy.axiosPost('/data/currdata/edit', form);
+            if (res.code === 0) {
+                proxy.$modal.msgSuccess("修改成功");
+                open.value = false;
+                getList()
+                btnLoading.value = false
+            }
+        } catch (error) {
+            btnLoading.value = false
         }
+    }
+    const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+        if (column.property === 'stnm') {
+            // 查找当前行之前是否有相同的stnm
+            let spanCount = 0;
+            for (let i = 0; i <= rowIndex; i++) {
+                if (currentData.value[i].stnm === row.stnm) {
+                    spanCount++;
+                }
+            }
 
-        /* 空行样式 */
-        .el-table__row--empty {
-            background-color: #f5f7fa;
-        }
+            // 如果不是第一个相同stnm，则隐藏
+            if (spanCount > 1) {
+                return { rowspan: 0, colspan: 0 };
+            }
 
-        /* 隐藏子表头 */
-        .el-table__header tr:nth-child(2) {
-            display: none;
-        }
+            // 计算需要合并多少行
+            let rowspan = 1;
+            for (let i = rowIndex + 1; i < currentData.value.length; i++) {
+                if (currentData.value[i].stnm === row.stnm) {
+                    rowspan++;
+                } else {
+                    break;
+                }
+            }
 
-        /* 调整主表头样式 */
-        .el-table__header tr:first-child th {
-            background: #f5f7fa;
-            font-weight: bold;
+            return { rowspan, colspan: 1 };
         }
-    }
-
-    /** 取消表格滑上的背景色 */
-    :deep(.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell) {
-        background: #fff !important;
-    }
-</style>
\ No newline at end of file
+        return { rowspan: 1, colspan: 1 };
+    };
+    onMounted(() => {
+        getList()
+    })
+</script>
\ No newline at end of file