修改菜单

src/api/cs-harmonic-boot/datatrend.ts

@@ -1,22 +1,31 @@
-import createAxios from '@/utils/request'
-
-// 查询设备数据趋势
-export function getDeviceDataTrend(data: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/datatrend/querydatatrend',
-        method: 'POST',
-        data
-    })
-}
-
-
-
-// 波形下载
-export function getFileZip(params: any) {
-    return createAxios({
-        url: '/cs-harmonic-boot/event/getFileZip',
-        method: 'get',
-        params,
-        responseType: 'blob'
-    })
-}
+import createAxios from '@/utils/request'
+
+// 查询设备数据趋势
+export function getDeviceDataTrend(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/datatrend/querydatatrend',
+        method: 'POST',
+        data
+    })
+}
+
+
+
+// 波形下载
+export function getFileZip(params: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/event/getFileZip',
+        method: 'get',
+        params,
+        responseType: 'blob'
+    })
+}
+
+export function exportModel(data: any) {
+    return createAxios({
+        url: '/cs-harmonic-boot/exportmodel/exportModel',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}

src/api/harmonic-boot/cockpit/cockpit.ts

@@ -261,4 +261,13 @@ export function getSimpleLine() {
 }
 
 
+export function getLineExport(data:any) {
+    return request({
+        url: '/cs-harmonic-boot/eventReport/getLineExport',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}
+
 

src/components/cockpit/F47Curve/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <!--F47曲线 -->
-        <TableHeader ref="TableHeaderRef" :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader ref="TableHeaderRef" :showReset="false"  :timeKeyList="prop.timeKey" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
         <el-descriptions class="mt2" direction="vertical" :column="4" border>
             <el-descriptions-item align="center" label="名称">{{ data.name }}</el-descriptions-item>
             <el-descriptions-item align="center" label="事件总数">{{ data.gs }}</el-descriptions-item>
@@ -22,7 +22,6 @@
         <el-dialog v-model="isWaveCharts" v-if="isWaveCharts" draggable :title="dialogTitle" append-to-body width="70%">
             <waveFormAnalysis
                 v-loading="loading"
-              
                 ref="waveFormAnalysisRef"
                 @handleHideCharts="isWaveCharts = false"
                 :wp="wp"
@@ -45,7 +44,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -447,7 +446,7 @@ const handleTolerableEventClick = async (row: any) => {
     nextTick(() => {
         if (waveFormAnalysisRef.value) {
             //waveFormAnalysisRef.value.setHeight(false, 360)
-            waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
+            // waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
         }
     })
    const messageInstance = ElMessage.info(`正在加载，请稍等...`)
@@ -475,6 +474,7 @@ const handleTolerableEventClick = async (row: any) => {
         })
 
     nextTick(() => {
+        waveFormAnalysisRef.value &&  waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
         waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value, true)
     })
 }

src/components/cockpit/directionStatistics/index.vue

@@ -1,14 +1,25 @@
 <template>
     <div>
         <!--暂降方向统计 -->
-        <TableHeader ref="TableHeaderRef" :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
-        <my-echart class="tall" :options="echartList" :style="{ width: prop.width, height: `calc(${prop.height} )` }" />
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+             :timeKeyList="prop.timeKey"
+            v-if="fullscreen"
+        ></TableHeader>
+        <my-echart
+            v-loading="tableStore.table.loading"
+            class="tall"
+            :options="echartList"
+            :style="{ width: prop.width, height: `calc(${prop.height} )` }"
+        />
     </div>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { getTime } from '@/utils/formatTime'
@@ -18,7 +29,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -49,84 +60,99 @@ const fullscreen = computed(() => {
     }
 })
 
-const data = [
-    {
-        name: '来自电网',
-        value: 4
-    },
-    {
-        name: '来自负荷',
-        value: 41
-    }
-]
-const echartList = ref({
-    title: {},
+const echartList = ref({})
 
-    tooltip: {
-        trigger: 'item'
-    },
-    legend: {
-        orient: 'vertical',
-        top: 'center',
-        right: '5%',
-        formatter: function (e: any) {
-            return e + '   ' + data.filter(item => item.name == e)[0].value + '次'
-        }
-    },
-    xAxis: {
-        show: false
-    },
-    yAxis: {
-        show: false
-    },
-    grid: {
-        left: '10px',
-        right: '20px'
-    },
+// const data = [
+//     {
+//         name: '来自电网',
+//         value: 4
+//     },
+//     {
+//         name: '来自负荷',
+//         value: 41
+//     }
+// ]
 
-    options: {
-        dataZoom: null,
-        title: [
-            {
-                text: '暂降方向统计',
-                left: 'center'
-            },
-            {
-                text: data[0].value + data[1].value + '次',
-                left: 'center',
-                top: 'center'
-            }
-        ],
-        series: [
-            {
-                type: 'pie',
-                center: 'center',
-                radius: ['55%', '75%'],
-                label: {
-                    show: false,
-                    position: 'outside',
-                    textStyle: {
-                        //数值样式
-                    }
-                },
-                name: '事件统计',
-                data: data
-            }
-        ]
-    }
-})
 const OverLimitDetailsRef = ref()
 const tableStore: any = new TableStore({
-    url: '/user-boot/dept/deptTree',
+    url: '/cs-harmonic-boot/csevent/getEventDirectionData',
     method: 'POST',
-
     showPage: false,
-
     column: [],
     beforeSearchFun: () => {
         setTime()
     },
-    loadCallback: () => {}
+    loadCallback: () => {
+        if (!tableStore.table.data || !Array.isArray(tableStore.table.data)) {
+            return []
+        }
+        const chartData = ref(
+            tableStore.table.data.map((item: any) => ({
+                name: item.source === 'load' ? '来自负荷' : '来自电网',
+                value: item.times
+            }))
+        )
+
+        const total = chartData.value.reduce((sum: any, item: any) => sum + item.value, 0)
+
+        echartList.value = {
+            title: {},
+
+            tooltip: {
+                trigger: 'item'
+            },
+            legend: {
+                orient: 'vertical',
+                top: '50',
+                right: '10',
+                formatter: function (name: string) {
+                    const item = chartData.value.find((i: any) => i.name === name)
+                    return item ? `${name}   ${item.value}次` : name
+                }
+            },
+            xAxis: {
+                show: false
+            },
+            yAxis: {
+                show: false
+            },
+            grid: {
+                left: '10px',
+                right: '20px'
+            },
+
+            options: {
+                dataZoom: null,
+                title: [
+                    {
+                        text: '暂降方向统计',
+                        left: 'center'
+                    },
+                    {
+                        text: total + '次',
+                        left: 'center',
+                        top: 'center'
+                    }
+                ],
+                series: [
+                    {
+                        type: 'pie',
+                        center: 'center',
+                        radius: ['55%', '75%'],
+                        label: {
+                            show: false,
+                            position: 'outside',
+                            textStyle: {
+                                //数值样式
+                            }
+                        },
+                        name: '事件统计',
+                        data: chartData.value
+                    }
+                ]
+            }
+        }
+    }
 })
 
 const tableRef = ref()
@@ -156,7 +182,6 @@ const setTime = () => {
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name') {
-        console.log(row)
         OverLimitDetailsRef.value.open(row)
     }
 }
@@ -173,12 +198,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true

src/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue

@@ -17,7 +17,7 @@ import { yMethod } from '@/utils/echartMethod'
 const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object }
 })
 

src/components/cockpit/exceedanceLevel/index.vue

@@ -6,6 +6,7 @@
             :showReset="false"
             @selectChange="selectChange"
             datePicker
+             :timeKeyList="prop.timeKey"
             v-if="fullscreen"
         ></TableHeader>
         <my-echart
@@ -38,7 +39,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -97,7 +98,7 @@ const tableStore: any = new TableStore({
         {
             title: '越限最大值',
             field: 'maxValue',
-            minWidth: '60',
+            minWidth: '70',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 const extentValue =
@@ -115,7 +116,7 @@ const tableStore: any = new TableStore({
         {
             title: '越限程度(%)',
             field: 'extent',
-            minWidth: '60',
+            minWidth: '70',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 // 保留两个小数

src/components/cockpit/governanceReport/index.vue

@@ -1,15 +1,15 @@
 <template>
     <div>
         <!--治理效果报表 -->
-        <TableHeader :showReset="false" ref="TableHeaderRef" datePicker @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" datePicker @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
                 <el-form-item label="报表模板">
-                    <el-select v-model="tableStore.table.params.tempId" placeholder="请选择报表模板" clearable>
+                    <el-select filterable v-model="tableStore.table.params.tempId" placeholder="请选择报表模板" clearable>
                         <el-option v-for="item in templateList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="监测对象">
-                    <el-select v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
+                    <el-select filterable v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
                         <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -43,7 +43,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue

@@ -16,6 +16,7 @@
                             v-model="searchForm.index"
                             placeholder="请选择统计指标"
                             @change="onIndexChange($event)"
+                            filterable
                         >
                             <el-option
                                 v-for="item in indexOptions"
@@ -36,6 +37,7 @@
                             style="min-width: 120px !important"
                             placeholder="请选择"
                             v-model="searchForm.valueType"
+                            filterable
                         >
                             <el-option value="max" label="最大值"></el-option>
                             <el-option value="min" label="最小值"></el-option>
@@ -59,6 +61,7 @@
                                 placeholder="请选择谐波次数"
                                 style="width: 100px"
                                 class="mr20"
+                                filterable
                             >
                                 <el-option
                                     v-for="vv in item.countOptions"

src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue

@@ -9,6 +9,7 @@
                             v-model="tableStore.table.params.lineId"
                             placeholder="请选择监测点"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in options"
@@ -48,7 +49,7 @@ const loop50 = (key: string) => {
         list.push({
             title: i + '次',
             field: key + i + 'Overtime',
-            width: '80',
+            width: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
@@ -86,7 +87,7 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(%)',
             field: 'flickerOvertime',
-            width: '80',
+            width: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`

src/components/cockpit/gridSideStatistics/index.vue

@@ -5,7 +5,7 @@
             :showReset="false"
             ref="TableHeaderRef"
             @selectChange="selectChange"
-            datePicker
+            datePicker  :timeKeyList="prop.timeKey"
             v-if="fullscreen"
         ></TableHeader>
         <my-echart
@@ -41,7 +41,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/indicatorDetails/index.vue

@@ -5,9 +5,9 @@
             :showReset="false"
             ref="TableHeaderRef"
             @selectChange="selectChange"
-            datePicker
+            datePicker 
             v-if="fullscreen"
-            :timeKeyList="['3']"
+            :timeKeyList="prop.timeKey"
         ></TableHeader>
         <el-calendar
             v-model="value"
@@ -32,7 +32,7 @@
                         <template #content>
                             <span v-html="getTextForDate(data.day)"></span>
                         </template>
-                        <div class="details" v-html="getTextForDate(data.day)"></div>
+                         <div class="details" v-html="fullscreen ? getTextForDate(data.day) : '有越限'"></div>
                     </el-tooltip>
                 </div>
             </template>
@@ -51,7 +51,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/indicatorDistribution/index.vue

@@ -1,10 +1,10 @@
 <template>
     <div>
         <!--指标越限概率分布 -->
-        <TableHeader :showReset="false" ref="TableHeaderRef" @selectChange="selectChange" datePicker v-if="fullscreen">
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" @selectChange="selectChange" datePicker v-if="fullscreen">
             <template v-slot:select>
                 <el-form-item label="监测点">
-                    <el-select size="small" v-model="tableStore.table.params.lineId">
+                    <el-select size="small" filterable v-model="tableStore.table.params.lineId">
                         <el-option
                             v-for="item in lineList"
                             :key="item.lineId"
@@ -48,7 +48,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue

@@ -16,6 +16,7 @@
                             v-model="searchForm.index"
                             placeholder="请选择统计指标"
                             @change="onIndexChange($event)"
+                            filterable
                         >
                             <el-option
                                 v-for="item in indexOptions"
@@ -36,6 +37,7 @@
                             style="min-width: 120px !important"
                             placeholder="请选择"
                             v-model="searchForm.valueType"
+                            filterable
                         >
                             <el-option value="max" label="最大值"></el-option>
                             <el-option value="min" label="最小值"></el-option>
@@ -59,6 +61,7 @@
                                 placeholder="请选择谐波次数"
                                 style="width: 100px"
                                 class="mr20"
+                                filterable
                             >
                                 <el-option
                                     v-for="vv in item.countOptions"

src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue

@@ -9,6 +9,7 @@
                             v-model="tableStore.table.params.lineId"
                             placeholder="请选择监测点"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in options"
@@ -53,7 +54,7 @@ const loop50 = (key: string) => {
         list.push({
             title: i + '次',
             field: key + i + 'Overtime',
-            width: '80',
+            width: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
@@ -91,7 +92,7 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(分钟)',
             field: 'flickerOvertime',
-            width: '80',
+            width: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`

src/components/cockpit/indicatorFittingChart/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <!--主要监测点列表 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" v-if="fullscreen" datePicker ref="TableHeaderRef">
+        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" @selectChange="selectChange" v-if="fullscreen" datePicker ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="关键词">
                     <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输关键字" />
@@ -32,7 +32,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/listOfMainMonitoringPoints/index.vue

@@ -5,12 +5,12 @@
             datePicker
             @selectChange="selectChange"
             v-if="fullscreen"
-            ref="TableHeaderRef"
-            :timeKeyList="['4', '5']"
+            ref="TableHeaderRef" 
+            :timeKeyList="prop.timeKey"
         >
             <template v-slot:select>
                 <el-form-item label="监测点">
-                    <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点" clearable>
+                    <el-select filterable v-model="tableStore.table.params.lineId" placeholder="请选择监测点" clearable>
                         <el-option
                             v-for="item in lineList"
                             :key="item.lineId"
@@ -20,7 +20,12 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="用户功率">
-                    <el-select v-model="tableStore.table.params.power" placeholder="请选择用户功率" clearable>
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.power"
+                        placeholder="请选择用户功率"
+                        clearable
+                    >
                         <el-option v-for="item in powerList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -29,6 +34,7 @@
                         style="min-width: 120px !important"
                         placeholder="请选择"
                         v-model="tableStore.table.params.valueType"
+                        filterable
                     >
                         <el-option value="max" label="最大值"></el-option>
                         <el-option value="min" label="最小值"></el-option>
@@ -37,7 +43,12 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="电能质量指标">
-                    <el-select v-model="tableStore.table.params.indicator" placeholder="请选择电能质量指标" clearable>
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.indicator"
+                        placeholder="请选择电能质量指标"
+                        clearable
+                    >
                         <el-option v-for="item in indicatorList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -48,6 +59,7 @@
                             v-model="tableStore.table.params.harmonicCount"
                             placeholder="请选择谐波次数"
                             style="min-width: 80px !important"
+                            filterable
                         >
                             <el-option
                                 v-for="num in harmonicCountOptions"
@@ -88,7 +100,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -156,6 +168,30 @@ const setEchart = () => {
         title: {
             text: `${indicatorName}与${powerName}负荷曲线拟合图`
         },
+        tooltip: {
+            trigger: 'axis',
+            formatter: function (params: any) {
+                let result = params[0].name
+                params.forEach((item: any) => {
+                    if (item.seriesName === indicatorName) {
+                        // 对于电能质量指标，格式化Y轴值显示
+                        let valueText = ''
+                        if (item.value[1] == 0) {
+                            valueText = '不越限'
+                        } else if (item.value[1] == 1) {
+                            valueText = '越限'
+                        } else {
+                            valueText = item.value[1]
+                        }
+                        result += `<br/>${item.marker}${item.seriesName}: ${valueText}`
+                    } else {
+                        // 对于功率数据，正常显示数值
+                        result += `<br/>${item.marker}${item.seriesName}: ${item.value[1]}`
+                    }
+                })
+                return result
+            }
+        },
         xAxis: {
             type: 'time',
             axisLabel: {
@@ -166,7 +202,25 @@ const setEchart = () => {
                 }
             }
         },
-        yAxis: [{}, {}],
+        yAxis: [
+            {},
+            indicatorName
+                ? {
+                      min: 0,
+                      max: 1,
+                      axisLabel: {
+                          formatter: function (value: number) {
+                              if (value === 0) {
+                                  return '不越限'
+                              } else if (value === 1) {
+                                  return '越限'
+                              }
+                              return value
+                          }
+                      }
+                  }
+                : {}
+        ],
         grid: {
             left: '10px',
             right: '20px'
@@ -193,6 +247,7 @@ const setEchart = () => {
                 {
                     name: indicatorName, // 动态设置指标名称
                     type: 'line',
+                    step: 'end',
                     showSymbol: false,
                     // smooth: true,
                     data: [],
@@ -417,7 +472,6 @@ watch(
         deep: true
     }
 )
-
 </script>
 <style lang="scss" scoped>
 // :deep(.el-select) {

src/components/cockpit/monitoringPointList/components/overLimitDetails.vue

@@ -9,6 +9,7 @@
                             v-model="tableStore.table.params.lineId"
                             placeholder="请选择监测点"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in options"
@@ -48,7 +49,7 @@ const loop50 = (key: string) => {
         list.push({
             title: i + '次',
             field: key + i + 'Overtime',
-            width: '80',
+            width: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
@@ -86,7 +87,7 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(%)',
             field: 'flickerOvertime',
-            width: '80',
+            width: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`

src/components/cockpit/monitoringPointList/index.vue

@@ -6,7 +6,7 @@
             :showReset="false"
             @selectChange="selectChange"
             datePicker
-            v-if="fullscreen"
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
         ></TableHeader>
         <Table
             ref="tableRef"
@@ -59,7 +59,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -111,51 +111,42 @@ const tableStore: any = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        {
-            title: '治理对象',
-            field: 'sensitiveUser',
-            minWidth: '80'
-        },
-
-        {
-            title: '电压等级',
-            field: 'volGrade',
-            minWidth: '70'
-        },
-        {
-            title: '是否治理',
-            field: 'govern',
-            minWidth: '70'
-        },
-
-        // {
-        //     title: '治理前报告',
-        //     field: 'reportFileName',
-        //     minWidth: '80',
-        //     render: 'customTemplate',
-        //     customTemplate: (row: any) => {
-        //         return `<span style='cursor: pointer;text-decoration: underline;'>${row.reportFileName}</span>`
-        //     }
-        // },
         {
             title: '监测点名称',
             field: 'lineName',
-            minWidth: '70',
+            minWidth: '120',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
             }
         },
-        { title: '监测类型', field: 'position', minWidth: '60' },
+        { title: '监测类型', field: 'position', minWidth: '80' },
         {
             title: '监测点状态',
             field: 'runStatus',
-            minWidth: '60',
+            minWidth: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='color: ${row.runStatus === '中断' ? '#FF0000' : ''}'>${row.runStatus}</span>`
             }
         },
+        {
+            title: '治理对象',
+            field: 'sensitiveUser',
+            minWidth: '90'
+        },
+
+        {
+            title: '电压等级',
+            field: 'volGrade',
+            minWidth: '80'
+        },
+        {
+            title: '是否治理',
+            field: 'govern',
+            minWidth: '80'
+        },
+
         {
             title: '最新数据时间',
             field: 'latestTime',
@@ -171,7 +162,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '操作',
-            minWidth: 120,
+            minWidth: 80,
             // fixed: 'right',
             render: 'buttons',
             buttons: [

src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue

@@ -16,6 +16,7 @@
                             v-model="searchForm.index"
                             placeholder="请选择统计指标"
                             @change="onIndexChange($event)"
+                            filterable
                         >
                             <el-option
                                 v-for="item in indexOptions"
@@ -36,6 +37,7 @@
                             style="min-width: 120px !important"
                             placeholder="请选择"
                             v-model="searchForm.valueType"
+                            filterable
                         >
                             <el-option value="max" label="最大值"></el-option>
                             <el-option value="min" label="最小值"></el-option>
@@ -59,6 +61,7 @@
                                 placeholder="请选择谐波次数"
                                 style="width: 100px"
                                 class="mr20"
+                                filterable
                             >
                                 <el-option
                                     v-for="vv in item.countOptions"

src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue

@@ -9,6 +9,7 @@
                             v-model="tableStore.table.params.lineId"
                             placeholder="请选择监测点"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in options"
@@ -48,7 +49,7 @@ const loop50 = (key: string) => {
         list.push({
             title: i + '次',
             field: key + i + 'Overtime',
-            width: '80',
+            width: '60',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row[key + i + 'Overtime']}</span>`
@@ -86,7 +87,7 @@ const tableStore: any = new TableStore({
         {
             title: '闪变越限(%)',
             field: 'flickerOvertime',
-            width: '80',
+            width: '90',
             render: 'customTemplate',
             customTemplate: (row: any) => {
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.flickerOvertime}</span>`

src/components/cockpit/overLimitStatistics/index.vue

@@ -6,7 +6,7 @@
             ref="TableHeaderRef"
             @selectChange="selectChange"
             datePicker
-            v-if="fullscreen"
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
         ></TableHeader>
         <my-echart
             class="tall"
@@ -43,7 +43,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/sensitiveLoad/index.vue

@@ -6,7 +6,7 @@
             :showReset="false"
             @selectChange="selectChange"
             datePicker
-            v-if="fullscreen"
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
         ></TableHeader>
         <Table
             ref="tableRef"
@@ -29,7 +29,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/transientDetails/components/transientList.vue

@@ -132,7 +132,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '波形',
-            width: '100',
+            minWidth: '100',
             render: 'buttons',
             buttons: [
                 {

src/components/cockpit/transientDetails/index.vue

@@ -7,7 +7,7 @@
             @selectChange="selectChange"
             datePicker
             v-if="fullscreen"
-            :timeKeyList="['3']"
+             :timeKeyList="prop.timeKey"
         ></TableHeader>
         <el-calendar
             v-model="value"
@@ -43,9 +43,15 @@
                             v-for="item in list?.filter((item:any) => item.name == data.day)"
                             @click="descentClick(item)"
                         >
-                            <div>电压暂降:{{ item.eventDown || 0 }}</div>
-                            <div>电压中断:{{ item.eventOff || 0 }}</div>
-                            <div>电压暂升:{{ item.eventUp || 0 }}</div>
+                            <!-- <div>电压暂降:{{ item.eventDown || 0 }}</div>
+                                <div>电压中断:{{ item.eventOff || 0 }}</div>
+                                <div>电压暂升:{{ item.eventUp || 0 }}</div> -->
+                            <template v-if="fullscreen">
+                                <div>电压暂降:{{ item.eventDown || 0 }}</div>
+                                <div>电压中断:{{ item.eventOff || 0 }}</div>
+                                <div>电压暂升:{{ item.eventUp || 0 }}</div>
+                            </template>
+                            <template v-else>暂态事件</template>
                         </div>
                     </el-tooltip>
                 </div>
@@ -68,7 +74,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/transientDistribution/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <!--暂态事件概率分布 -->
-        <TableHeader ref="TableHeaderRef" :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader ref="TableHeaderRef"  :timeKeyList="prop.timeKey" :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
@@ -33,7 +33,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })

src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue

@@ -5,12 +5,12 @@
             <TableHeader datePicker showExport :showReset="false" ref="tableHeaderRef" @selectChange="selectChange">
                 <template v-slot:select>
                     <el-form-item label="监测点">
-                        <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
+                        <el-select filterable v-model="tableStore.table.params.lineId" placeholder="请选择监测点名称">
                             <el-option
                                 v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
+                                :key="item.lineId"
+                                :label="item.name"
+                                :value="item.lineId"
                             />
                         </el-select>
                     </el-form-item>
@@ -58,9 +58,9 @@ const boxoList: any = ref({})
 const tableHeaderRef = ref()
 
 const options = ref()
-const heightRef = ref(mainHeight(168, 2.1).height)
+const heightRef = ref(mainHeight(168, 2.2).height)
 const selectChange = (flag: boolean, h: any) => {
-    heightRef.value = mainHeight(h, 2.1).height
+    heightRef.value = mainHeight(h, 2.2).height
 }
 
 const getSimpleLineList = async () => {
@@ -68,7 +68,6 @@ const getSimpleLineList = async () => {
     options.value = res.data
 }
 
-
 const tableStore: any = new TableStore({
     url: '/cs-harmonic-boot/event/pageEvent',
     method: 'POST',
@@ -86,27 +85,27 @@ const tableStore: any = new TableStore({
         {
             title: '暂态时间',
             field: 'startTime',
-            minWidth: '150'
+            minWidth: '180'
         },
         {
             title: '测点名称',
             field: 'lineName',
-            width: '150'
+            minWidth: '150'
         },
         {
             title: '暂态类型',
             field: 'tag',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '特征幅值(%)',
             field: 'amplitude',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '暂降深度(%)',
             field: 'depth',
-            width: '100',
+            minWidth: '100',
             formatter: (row: any) => {
                 // 当暂态类型不是电压暂升时，计算暂降深度 = 100 - 特征幅值
                 if (row.row.tag !== '电压暂升') {
@@ -124,16 +123,16 @@ const tableStore: any = new TableStore({
         {
             title: '持续时间(S)',
             field: 'persistTime',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '严重度',
             field: 'severity',
-            width: '80'
+            minWidth: '80'
         },
         {
             title: '波形',
-            width: '100',
+            width: '90',
             render: 'buttons',
             buttons: [
                 {
@@ -192,7 +191,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                        return !(!row.wavePath && row.evtParamTm < 20)
+                        return !!row.wavePath
                     }
                 }
             ]

src/components/cockpit/transientStatistics/index.vue

@@ -6,7 +6,7 @@
             :showReset="false"
             @selectChange="selectChange"
             datePicker
-            v-if="fullscreen"
+            v-if="fullscreen"  :timeKeyList="prop.timeKey"
         ></TableHeader>
         <my-echart
             class="tall"
@@ -41,7 +41,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+   timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -50,6 +50,7 @@ const TableHeaderRef = ref()
 
 const headerHeight = ref(57)
 
+
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -106,8 +107,8 @@ const eventEcharts = () => {
             },
             legend: {
                 orient: 'vertical',
-                top: 'center',
-                right: '5%',
+                top: '50',
+                right: '10',
                 formatter: function (e: any) {
                     return e + '   ' + data.value.filter((item: any) => item.name == e)[0].value + '次'
                 }

src/components/cockpit/trendComparison/index.vue

@@ -4,14 +4,19 @@
         <TableHeader
             datePicker
             ref="TableHeaderRef"
-            :timeKeyList="['4', '5']"
+            :timeKeyList="prop.timeKey"
             :showReset="false"
             @selectChange="selectChange"
             v-if="fullscreen"
         >
             <template v-slot:select>
                 <el-form-item label="监测对象">
-                    <el-select v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.sensitiveUserId"
+                        placeholder="请选择监测对象"
+                        clearable
+                    >
                         <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -93,7 +98,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -449,7 +454,6 @@ watch(
         }
     }
 )
-
 </script>
 <style lang="scss" scoped>
 // :deep(.el-select) {

src/components/echarts/rmsWorker.js

@@ -258,7 +258,7 @@ self.onmessage = function (e) {
                 boxoList.measurementPointName +
                 ' 发生时刻：' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值：' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
                 '% 持续时间：' +
                 boxoList.duration +
@@ -269,7 +269,7 @@ self.onmessage = function (e) {
                 boxoList.equipmentName +
                 ' 发生时刻：' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值：' +
                 boxoList.evtParamVVaDepth +
                 ' 持续时间：' +
                 boxoList.evtParamTm +
@@ -280,7 +280,7 @@ self.onmessage = function (e) {
                 boxoList.lineName +
                 ' 发生时刻：' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值：' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
                 '% 持续时间：' +
                 boxoList.persistTime +
@@ -293,7 +293,7 @@ self.onmessage = function (e) {
                 boxoList.lineName +
                 ' 发生时刻：' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值：' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
                 '% 持续时间：' +
                 boxoList.duration +

src/components/echarts/rmsboxi.vue

@@ -109,7 +109,7 @@ const myChartess5 = ref<echarts.ECharts | null>(null)
 
 const vh = computed(() => {
     if (props.parentHeight == 999) {
-        return '310px'
+        return `calc((60vh - 150px) / 2 )`
     } else if (props.parentHeight != 0) {
         return mainHeight(props.parentHeight, 2).height
     }
@@ -600,7 +600,7 @@ const initWave = (
             $(`#${rmsId}`).css('height', picHeight).css('width', vw.value)
         }
     } else {
-        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
             Number(eventValue.value) * 1
         ).toFixed(0)}% 持续时间：${persistTime.value}s`
     }
@@ -837,7 +837,7 @@ const initWave = (
                 data: rmscu
             },
             {
-                name: '最小残余电压',
+                name: '最小暂降(骤升)幅值',
                 type: 'scatter',
                 symbol: 'image://' + url2,
                 itemStyle: { width: 45, height: 45 },

src/components/echarts/shuWorker.js

@@ -131,7 +131,7 @@ self.addEventListener('message', function (e) {
             boxoList.measurementPointName +
             ' 发生时刻：' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值：' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
             '% 持续时间：' +
             boxoList.duration +
@@ -142,7 +142,7 @@ self.addEventListener('message', function (e) {
             boxoList.equipmentName +
             ' 发生时刻：' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值：' +
             boxoList.evtParamVVaDepth +
             ' 持续时间：' +
             boxoList.evtParamTm +
@@ -153,7 +153,7 @@ self.addEventListener('message', function (e) {
             boxoList.lineName +
             ' 发生时刻：' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值：' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
             '% 持续时间：' +
             boxoList.persistTime +
@@ -166,7 +166,7 @@ self.addEventListener('message', function (e) {
             boxoList.lineName +
             ' 发生时刻：' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值：' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
             '% 持续时间：' +
             boxoList.duration +

src/components/echarts/shushiboxi.vue

@@ -88,7 +88,7 @@ const myChartess5 = ref<echarts.ECharts | null>(null)
 
 const vh = computed(() => {
     if (props.parentHeight == 999) {
-        return '310px'
+        return `calc((60vh - 150px) / 2 )`
     } else if (props.parentHeight != 0) {
         return mainHeight(props.parentHeight, 2).height
     }
@@ -334,7 +334,7 @@ const initWave = (
             $(`#${waveId}`).css('height', picHeight).css('width', vw.value)
         }
     } else {
-        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
             Number(eventValue.value) * 1
         ).toFixed(0)}% 持续时间：${persistTime.value}s`
     }

src/components/form/datePicker/index.vue

@@ -20,6 +20,7 @@
             value-format="YYYY-MM-DD"
             :shortcuts="shortcuts"
         />
+
         <el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button>
         <el-button type="primary" :icon="VideoPause" @click="nowTime">当前</el-button>
         <el-button :disabled="preDisabled" type="primary" :icon="DArrowRight" @click="next"></el-button>
@@ -35,7 +36,7 @@ interface Props {
     theCurrentTime?: boolean
     initialInterval?: number
     initialTimeValue?: any
-    timeKeyList?: string[]  //日期下拉
+    timeKeyList?: string[] //日期下拉
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -97,11 +98,8 @@ const filteredTimeOptions = computed(() => {
     if (!props.timeKeyList || props.timeKeyList.length === 0) {
         return timeOptions.value
     }
-    
-    return timeOptions.value.filter((option: any) => 
-        props.timeKeyList.includes(option.value.toString())
-    )
 
+    return timeOptions.value.filter((option: any) => props.timeKeyList.includes(option.value.toString()))
 })
 
 onMounted(() => {
@@ -128,9 +126,13 @@ const checkInitialButtonStatus = () => {
         const endTime = timeValue.value[1]
         const currentDate = window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
 
-        // 如果结束时间小于当前日期，则不禁用"下一个"按钮
-        if (new Date(endTime + ' 00:00:00').getTime() < new Date(currentDate + ' 00:00:00').getTime()) {
-            preDisabled.value = false
+        // 只有当 props.nextFlag 为 false 时才应用限制
+        if (!props.nextFlag) {
+            // 如果结束时间早于当前日期，则按钮可用（preDisabled = false）
+            // 如果结束时间晚于或等于当前日期，则按钮禁用（preDisabled = true）
+            const endDateTime = new Date(endTime).getTime()
+            const currentDateTime = new Date(currentDate).getTime()
+            preDisabled.value = endDateTime >= currentDateTime
         }
     }
 }
@@ -179,30 +181,15 @@ const timeChange = (e: number) => {
         timeFlag.value = 1
     }
 
-    // 检查按钮状态
-    checkButtonStatus()
+   nextTick(() => {
+        // 检查按钮状态
+    checkInitialButtonStatus()
+   })
 
     // 触发 change 事件
     emitChange()
 }
 
-// 添加按钮状态检查方法
-const checkButtonStatus = () => {
-    if (timeValue.value && timeValue.value.length >= 2) {
-        const endTime = timeValue.value[1]
-        const currentDate = window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd')
-
-        // 如果结束时间大于等于当前日期，且 nextFlag 为 false，则禁用"下一个"按钮
-        if (!props.nextFlag) {
-            if (new Date(endTime + ' 00:00:00').getTime() >= new Date(currentDate + ' 00:00:00').getTime()) {
-                preDisabled.value = true
-            } else {
-                preDisabled.value = false
-            }
-        }
-    }
-}
-
 // 当前
 const nowTime = () => {
     // console.log(interval.value, '000000000')

src/components/table/header/index.vue

@@ -90,7 +90,7 @@ interface Props {
     showReset?: boolean //是否显示重置
     showExport?: boolean //导出控制
     timeCacheFlag?: boolean //是否取缓存时间
-    timeKeyList?: Array<string> //日期下拉列表
+    timeKeyList?: string[] //日期下拉列表
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -102,7 +102,7 @@ const props = withDefaults(defineProps<Props>(), {
     showReset: true,
     showExport: false,
     timeCacheFlag: true,
-    timeKeyList: () => [] // 修改为箭头函数返回空数组
+    timeKeyList: () => ['1', '2', '3', '4', '5'] // 修改为箭头函数返回空数组
 })
 
 // 处理 DatePicker 值变化事件

src/components/tree/govern/cloudDeviceEntryTree.vue

@@ -1,5 +1,5 @@
 <template>
-    <Tree ref="treRef" :width="width" :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
+    <Tree ref="treRef" :width="width" :showPush="props.showPush"  :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
 </template>
 
 <script lang="ts" setup>
@@ -12,9 +12,11 @@ import { useDictData } from '@/stores/dictData'
 
 interface Props {
     template?: boolean
+    showPush?: boolean
 }
 const props = withDefaults(defineProps<Props>(), {
-    template: false
+    template: false,
+    showPush: false
 })
 defineOptions({
     name: 'govern/deviceTree'
@@ -95,13 +97,16 @@ const info = (selectedNodeId?: string) => {
                 tree.value = []
             }
             nextTick(() => {
+              
                 if (arr1.length) {
-                    // 安全检查 treRef 和 treeRef1 是否存在
-                    if (treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey) {
+                    // 安全检查 treRef 和 treeRef 是否存在
+                        console.log("🚀 ~ info ~ treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey:", treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey)
+
+                    if (treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey) {
                         // 如果传入了要选中的节点ID，则选中该节点，否则选中第一个节点
                         console.log('selectedNodeId:', selectedNodeId);
                         if (selectedNodeId) {
-                            treRef.value.treeRef1.setCurrentKey(selectedNodeId);
+                            treRef.value.treeRef.setCurrentKey(selectedNodeId);
                             // 查找对应的节点数据并触发事件
                             let selectedNode = null;
                             const findNode = (nodes: any[]) => {
@@ -127,7 +132,7 @@ const info = (selectedNodeId?: string) => {
                             }
                         } else {
                             // 初始化选中第一个节点
-                            treRef.value.treeRef1.setCurrentKey(arr1[0].id);
+                            treRef.value.treeRef.setCurrentKey(arr1[0].id);
                             emit('init', {
                                 level: 2,
                                 ...arr1[0]

src/components/tree/govern/deviceTree.vue

@@ -124,9 +124,7 @@ getDeviceTree().then(res => {
             })
             return
         }
-        console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3.length)
         if (arr3.length) {
-            console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3)
             treRef.value.treeRef3.setCurrentKey(arr3[0].id)
             // 注册父组件事件
             emit('init', {

src/components/tree/govern/pointTreeWx.vue

@@ -1,181 +1,196 @@
-<template>
-    <div>
-        <div style="transition: all 0.3s; overflow: hidden; height: 100%">
-
-            <div class="cn-tree">
-                <div style="display: flex; align-items: center" class="mb10">
-                    <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
-                        <template #prefix>
-                            <Icon name="el-icon-Search" style="font-size: 16px" />
-                        </template>
-                    </el-input>
-                </div>
-                <el-tree style="flex: 1; overflow: auto" :props="defaultProps" highlight-current
-                    :filter-node-method="filterNode" node-key="id" v-bind="$attrs" default-expand-all :data="tree"
-                    ref="treRef" @node-click="clickNode" :expand-on-click-node="false">
-                    <template #default="{ node, data }">
-                        <span class="custom-tree-node">
-                            <div class="left">
-                                <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                                    v-if="data.icon" />
-                                <span>{{ node.label }}</span>
-                            </div>
-
-                        </span>
-                    </template>
-                </el-tree>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, nextTick, watch, defineProps, defineEmits } from 'vue'
-import { getSchemeTree, getTestRecordInfo } from '@/api/cs-device-boot/planData'
-import { useConfig } from '@/stores/config'
-import useCurrentInstance from '@/utils/useCurrentInstance'
-import { ElTree } from 'element-plus'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
-import { useDictData } from '@/stores/dictData'
-defineOptions({
-    name: 'govern/schemeTree'
-})
-
-interface Props {
-    template?: boolean
-
-}
-const dictData = useDictData()
-const props = withDefaults(defineProps<Props>(), {
-    template: false,
-
-})
-const filterText = ref('')
-watch(filterText, val => {
-    treRef.value!.filter(val)
-})
-
-const filterNode = (value: string, data: any, node: any) => {
-    if (!value) return true
-    // return data.name.includes(value)
-    if (data.name) {
-        return chooseNode(value, data, node)
-    }
-}
-const chooseNode = (value: string, data: any, node: any) => {
-    if (data.name.indexOf(value) !== -1) {
-        return true
-    }
-    const level = node.level
-    // 如果传入的节点本身就是一级节点就不用校验了
-    if (level === 1) {
-        return false
-    }
-    // 先取当前节点的父节点
-    let parentData = node.parent
-    // 遍历当前节点的父节点
-    let index = 0
-    while (index < level - 1) {
-        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
-        if (parentData.data.name.indexOf(value) !== -1) {
-            return true
-        }
-        // 否则的话再往上一层做匹配
-        parentData = parentData.parent
-        index++
-    }
-    // 没匹配到返回false
-    return false
-}
-/** 树形结构数据 */
-const defaultProps = {
-    children: 'children',
-    label: 'name',
-    value: 'id'
-}
-
-
-const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'Policy'])
-const config = useConfig()
-const tree = ref()
-const treRef = ref()
-const id: any = ref(null)
-const treeData = ref({})
-//获取方案树形数据
-const getTreeList = () => {
-    getSchemeTree().then(res => {
-        let arr: any[] = []
-
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-Menu'
-            item.color = config.getColorVal('elementUiPrimary')
-            item?.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-Document'
-                item2.color = config.getColorVal('elementUiPrimary')
-                arr.push(item2)
-            })
-        })
-        tree.value = res.data
-        nextTick(() => {
-            if (arr.length) {
-                treRef.value.setCurrentKey(id.value || arr[0].id)
-                let list = id.value ? arr.find((item: any) => item.id == id.value) : arr[0]
-                // 注册父组件事件
-                emit('init', {
-                    level: 2,
-                    ...list
-                })
-            } else {
-                emit('init')
-            }
-        })
-    })
-}
-
-//方案id
-const planId: any = ref('')
-
-const clickNode = (e: anyObj) => {
-    e?.children ? (planId.value = e.id) : (planId.value = e.pid)
-    id.value = e.id
-    emit('nodeChange', e)
-}
-
-
-if (props.template) {
-    getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
-        emit('Policy', res.data)
-        getTreeList()
-    }).catch(err => {
-        getTreeList()
-    })
-} else {
-    getTreeList()
-}
-
-</script>
-<style lang="scss" scoped>
-.cn-tree {
-    flex-shrink: 0;
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    padding: 10px;
-    height: 100%;
-    width: 100%;
-    height: calc(100vh - 125px);
-    overflow-y: auto;
-
-    :deep(.el-tree) {
-        border: 1px solid var(--el-border-color);
-    }
-
-    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
-        background-color: var(--el-color-primary-light-7);
-    }
-
-    .menu-collapse {
-        color: var(--el-color-primary);
-    }
-}
-</style>
+<template>
+    <div>
+        <div style="transition: all 0.3s; overflow: hidden; height: 100%">
+            <div class="cn-tree">
+                <div style="display: flex; align-items: center" class="mb10">
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="filterText"
+                        placeholder="请输入内容"
+                        clearable
+                    >
+                        <template #prefix>
+                            <Icon name="el-icon-Search" style="font-size: 16px" />
+                        </template>
+                    </el-input>
+                </div>
+                <el-tree
+                    style="flex: 1; overflow: auto"
+                    :props="defaultProps"
+                    highlight-current
+                    :filter-node-method="filterNode"
+                    node-key="id"
+                    v-bind="$attrs"
+                    default-expand-all
+                    :data="tree"
+                    ref="treRef"
+                    @node-click="clickNode"
+                    :expand-on-click-node="false"
+                >
+                    <template #default="{ node, data }">
+                        <span class="custom-tree-node">
+                            <div class="left" style="display: flex; align-items: center">
+                                <Icon
+                                    :name="data.icon"
+                                    style="font-size: 16px"
+                                    :style="{ color: data.color }"
+                                    v-if="data.icon"
+                                />
+                                <span style="margin-left: 5px;">{{ node.label }}</span>
+                            </div>
+                        </span>
+                    </template>
+                </el-tree>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, watch, defineProps, defineEmits } from 'vue'
+import { getSchemeTree, getTestRecordInfo } from '@/api/cs-device-boot/planData'
+import { useConfig } from '@/stores/config'
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { useDictData } from '@/stores/dictData'
+defineOptions({
+    name: 'govern/schemeTree'
+})
+
+interface Props {
+    template?: boolean
+}
+const dictData = useDictData()
+const props = withDefaults(defineProps<Props>(), {
+    template: false
+})
+const filterText = ref('')
+watch(filterText, val => {
+    treRef.value!.filter(val)
+})
+
+const filterNode = (value: string, data: any, node: any) => {
+    if (!value) return true
+    // return data.name.includes(value)
+    if (data.name) {
+        return chooseNode(value, data, node)
+    }
+}
+const chooseNode = (value: string, data: any, node: any) => {
+    if (data.name.indexOf(value) !== -1) {
+        return true
+    }
+    const level = node.level
+    // 如果传入的节点本身就是一级节点就不用校验了
+    if (level === 1) {
+        return false
+    }
+    // 先取当前节点的父节点
+    let parentData = node.parent
+    // 遍历当前节点的父节点
+    let index = 0
+    while (index < level - 1) {
+        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
+        if (parentData.data.name.indexOf(value) !== -1) {
+            return true
+        }
+        // 否则的话再往上一层做匹配
+        parentData = parentData.parent
+        index++
+    }
+    // 没匹配到返回false
+    return false
+}
+/** 树形结构数据 */
+const defaultProps = {
+    children: 'children',
+    label: 'name',
+    value: 'id'
+}
+
+const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'Policy'])
+const config = useConfig()
+const tree = ref()
+const treRef = ref()
+const id: any = ref(null)
+const treeData = ref({})
+//获取方案树形数据
+const getTreeList = () => {
+    getSchemeTree().then(res => {
+        let arr: any[] = []
+
+        res.data.forEach((item: any) => {
+            item.icon = 'el-icon-Menu'
+            item.color = config.getColorVal('elementUiPrimary')
+            item?.children.forEach((item2: any) => {
+                item2.icon = 'el-icon-Document'
+                item2.color = config.getColorVal('elementUiPrimary')
+                arr.push(item2)
+            })
+        })
+        tree.value = res.data
+        nextTick(() => {
+            if (arr.length) {
+                treRef.value.setCurrentKey(id.value || arr[0].id)
+                let list = id.value ? arr.find((item: any) => item.id == id.value) : arr[0]
+                // 注册父组件事件
+                emit('init', {
+                    level: 2,
+                    ...list
+                })
+            } else {
+                emit('init')
+            }
+        })
+    })
+}
+
+//方案id
+const planId: any = ref('')
+
+const clickNode = (e: anyObj) => {
+    e?.children ? (planId.value = e.id) : (planId.value = e.pid)
+    id.value = e.id
+    emit('nodeChange', e)
+}
+
+if (props.template) {
+    getTemplateByDept({ id: dictData.state.area[0].id })
+        .then((res: any) => {
+            emit('Policy', res.data)
+            getTreeList()
+        })
+        .catch(err => {
+            getTreeList()
+        })
+} else {
+    getTreeList()
+}
+</script>
+<style lang="scss" scoped>
+.cn-tree {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+    height: calc(100vh - 125px);
+    overflow-y: auto;
+
+    :deep(.el-tree) {
+        border: 1px solid var(--el-border-color);
+    }
+
+    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+        background-color: var(--el-color-primary-light-7);
+    }
+
+    .menu-collapse {
+        color: var(--el-color-primary);
+    }
+}
+</style>

src/components/tree/index.vue

@@ -10,7 +10,7 @@
                         <Icon name='el-icon-Search' style='font-size: 16px' />
                     </template>
                 </el-input>
-                <el-tooltip placement="bottom" :hide-after="0">
+                <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
                         <template #content>
                             <span>台账推送</span>
                         </template>
@@ -23,7 +23,7 @@
                         :style="{ color: config.getColorVal('elementUiPrimary') }" 
                         @click="onAdd" />
                 </el-tooltip>
-                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'" v-else
                     :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
                     style='cursor: pointer' v-if='props.canExpand' /> -->
             </div>
@@ -58,11 +58,13 @@ defineOptions({
 interface Props {
     width?: string
     canExpand?: boolean
+    showPush?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
     width: '280px',
-    canExpand: true
+    canExpand: true,
+    showPush: false
 })
 const config = useConfig()
 const { proxy } = useCurrentInstance()

src/utils/formatTime.ts

@@ -372,7 +372,7 @@ export function getTimeOfTheMonth(key: any): [string, string] {
  * @param fullscreen // 全屏是否全屏
  */
 export function getTime(interval: number | 3, timeList: any, externalTime: any) {
-    console.log('🚀 ~ getTime ~ timeList:', timeList)
+    // console.log('🚀 ~ getTime ~ timeList:', timeList)
     // 1、先匹配时间
     // 检查 interval 是否在 timeList 中
     if (timeList && timeList.includes(interval.toString())) {

src/views/auth/menu/popupMenu.vue

@@ -1,107 +1,108 @@
-<template>
-    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
-                <el-form-item label="上级菜单">
-                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps"
-                        style="width: 100%" />
-                </el-form-item>
-                <el-form-item label="菜单名称">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
-                </el-form-item>
-                <el-form-item label="图标">
-                    <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
-                </el-form-item>
-                <el-form-item label="菜单路由">
-                    <el-input v-model.trim="form.path" placeholder="请输入菜单名称" />
-                </el-form-item>
-                <el-form-item label="组件路径">
-                    <el-input v-model.trim="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
-                </el-form-item>
-                <el-form-item label="排序">
-                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
-                </el-form-item>
-                <el-form-item label="菜单描述">
-                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
-                        placeholder="请输入描述" />
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import TableStore from '@/utils/tableStore'
-import IconSelector from '@/components/baInput/components/iconSelector.vue'
-import { updateMenu, addMenu } from '@/api/systerm'
-
-defineOptions({
-    name: 'auth/menu/popupMenu'
-})
-const emits = defineEmits<{
-    (e: 'init'): void
-}>()
-const tableStore = inject('tableStore') as TableStore
-const cascaderProps = {
-    label: 'title',
-    value: 'id',
-    checkStrictly: true,
-    emitPath: false
-}
-const form: any = reactive({
-    code: '',
-    icon: '',
-    id: '',
-    name: '',
-    path: '',
-    pid: '0',
-    remark: '',
-    routeName: '',
-    sort: 100,
-    type: 0
-})
-
-const dialogVisible = ref(false)
-const title = ref('新增菜单')
-const open = (text: string, data: anyObj) => {
-    title.value = text
-    // 重置表单
-    for (let key in form) {
-        form[key] = ''
-    }
-    form.pid = data.pid || '0'
-    form.sort = 100
-    form.type = 0
-
-    if (data.id) {
-        for (let key in form) {
-            form[key] = data[key] ? data[key] : data[key] === 0 ? 0 : ''
-        }
-        form.path = data.routePath || ''
-        form.name = data.title || ''
-    }
-    dialogVisible.value = true
-}
-const submit = async () => {
-    if (form.id) {
-        await updateMenu(form)
-    } else {
-        form.code = 'menu'
-        let obj = JSON.parse(JSON.stringify(form))
-        delete obj.id
-        await addMenu(obj)
-    }
-    emits('init')
-    dialogVisible.value = false
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
+                <el-form-item label="上级菜单">
+                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps" clearable
+                        style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="菜单名称">
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="图标">
+                    <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
+                </el-form-item>
+                <el-form-item label="菜单路由">
+                    <el-input v-model.trim="form.path" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="组件路径">
+                    <el-input v-model.trim="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
+                </el-form-item>
+                <el-form-item label="排序">
+                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
+                </el-form-item>
+                <el-form-item label="菜单描述">
+                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
+                        placeholder="请输入描述" />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import TableStore from '@/utils/tableStore'
+import IconSelector from '@/components/baInput/components/iconSelector.vue'
+import { updateMenu, addMenu } from '@/api/systerm'
+
+defineOptions({
+    name: 'auth/menu/popupMenu'
+})
+const emits = defineEmits<{
+    (e: 'init'): void
+}>()
+const tableStore = inject('tableStore') as TableStore
+const cascaderProps = {
+    label: 'title',
+    value: 'id',
+    checkStrictly: true,
+    emitPath: false
+}
+const form: any = reactive({
+    code: '',
+    icon: '',
+    id: '',
+    name: '',
+    path: '',
+    pid: '0',
+    remark: '',
+    routeName: '',
+    sort: 100,
+    type: 0
+})
+
+const dialogVisible = ref(false)
+const title = ref('新增菜单')
+const open = (text: string, data: anyObj) => {
+    title.value = text
+    // 重置表单
+    for (let key in form) {
+        form[key] = ''
+    }
+    form.pid = data.pid || '0'
+    form.sort = 100
+    form.type = 0
+
+    if (data.id) {
+        for (let key in form) {
+            form[key] = data[key] ? data[key] : data[key] === 0 ? 0 : ''
+        }
+        form.path = data.routePath || ''
+        form.name = data.title || ''
+    }
+    dialogVisible.value = true
+}
+const submit = async () => {
+    if (form.id) {
+        form.pid =  form.pid||'0'
+        await updateMenu(form)
+    } else {
+        form.code = 'menu'
+        let obj = JSON.parse(JSON.stringify(form))
+        delete obj.id
+        await addMenu(obj)
+    }
+    emits('init')
+    dialogVisible.value = false
+}
+
+defineExpose({ open })
+</script>

src/views/govern/device/control/index.vue

@@ -979,10 +979,10 @@ const getRealDataMqttMsg = async () => {
                     })
                 }, 30000)
                 mqttRef.value.on('message', (topic: any, message: any) => {
-                    // console.log(
-                    //     '实时数据&实时趋势---mqtt接收到消息',
-                    //     JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
-                    // )
+                    console.log(
+                        '实时数据&实时趋势---mqtt接收到消息',
+                        JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
+                    )
                     let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
                   
                     if (lineId.value != obj.lineId || adminInfo.userIndex != obj.userId) return

src/views/govern/device/control/tabs/components/waveFormAnalysis.vue

@@ -139,12 +139,13 @@ const handleBack = () => {
     emit('handleHideCharts')
 }
 const setHeight = (h: any, vh: any, num = 1) => {
+    console.log('🚀 ~ setHeight ~ h:', h)
     if (h != false) {
         parentHeight.value = h
     }
 
     setTimeout(() => {
-        bxecharts.value = mainHeight(vh,num).height
+        bxecharts.value = mainHeight(vh, num).height
     }, 100)
 }
 onMounted(() => {})

src/views/govern/mxgraph/graphList/index.vue

@@ -142,7 +142,7 @@ const editd = (e: any) => {
 const Aclick = (e: any) => {
     //window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=zl`)
     window.open(
-        'http://192.168.1.128:4001' +
+       window.location.origin +
             `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=${VITE_FLAG ? 'ypt' : 'zl'}`
     )
 }

src/views/govern/reportCore/lineReport/index.vue

@@ -0,0 +1,267 @@
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" id="navigation-splitpanes">
+            <pane :size="size">
+                <CloudDeviceEntryTree
+                    ref="TerminalRef"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></CloudDeviceEntryTree>
+            </pane>
+            <pane style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" date-picker :show-search="false">
+                    <template v-slot:select>
+                        <!-- <el-form-item label=" 模板策略">
+                            <el-select v-model="value" placeholder="请选择" @change="changeFn" clearable>
+                                <el-option
+                                    v-for="item in templatePolicy"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item> -->
+                    </template>
+                    <template #operation>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">生成报告</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box" :style="`height: calc(${tableStore.table.height} + 65px)`">
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">监测点详情</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.xq">监测点详情</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降事件列表</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.lb">表格</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降密度</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.mdbg">表格</el-checkbox>
+                            <el-checkbox v-model="formd.mdtx">图形</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降事件点</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.sjdITIC">ITIC</el-checkbox>
+                            <el-checkbox v-model="formd.sjdF47">F47</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">概率分布</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.glfbfz">暂降幅值</el-checkbox>
+                            <el-checkbox v-model="formd.glfbsj">持续时间</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">月份统计</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.tjbg">表格</el-checkbox>
+                            <el-checkbox v-model="formd.tjtx">图形</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降原因</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.yybg">表格</el-checkbox>
+                            <el-checkbox v-model="formd.yytx">图形</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                    <el-row>
+                        <el-col :span="12" class="mTop">
+                            <div class="grid-content">
+                                <div class="divBox">暂降类型</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="12" class="mTop">
+                            <el-checkbox v-model="formd.lxbg">表格</el-checkbox>
+                            <el-checkbox v-model="formd.lxtx">图形</el-checkbox>
+                        </el-col>
+                    </el-row>
+                    <el-divider></el-divider>
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import TableStore from '@/utils/tableStore'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
+import type { UploadProps, UploadUserFile } from 'element-plus'
+import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
+import { getLineExport } from '@/api/harmonic-boot/cockpit/cockpit'
+defineOptions({
+    name: 'TransientReport/monitoringpointReport'
+})
+const height = mainHeight(20)
+const size = ref(0)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+const uploadList: any = ref([])
+
+const formd: any = ref({
+    xq: true,
+    lb: true,
+    mdbg: false,
+    mdtx: false,
+    sjdITIC: false,
+    sjdF47: false,
+    glfbfz: false,
+    glfbsj: false,
+    tjbg: false,
+    tjtx: false,
+    yybg: false,
+    yytx: false,
+    lxbg: false,
+    lxtx: false,
+    type: 0
+})
+
+const tableStore = new TableStore({
+    url: '',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
+})
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 100)
+    }
+})
+
+const handleNodeClick = (data: any, node: any) => {
+    dotList.value = data
+}
+// 上传
+const choose = (files: any) => {
+    const isJPG = files.raw.type === 'image/jpg'
+    const isJPEG = files.raw.type === 'image/jpeg'
+    const isPNG = files.raw.type === 'image/png'
+    if (!isJPG && !isPNG && !isJPEG) {
+        ElMessage.warning('上传文件只能是 JPG/PNG 格式!')
+        return false
+    }
+
+    uploadList.value = files
+    ElMessage.success('上传成功')
+}
+
+//生成报告
+const exportEvent = () => {
+    if (dotList.value?.level != 4) {
+        return ElMessage.warning('请选择监测点进行报告生成!')
+    }
+    let a = ''
+
+    // formd.value.lineId = monitoringPoint.state.lineId
+    // formd.value.lineName = monitoringPoint.state.lineName.split('>').at(-1)
+    formd.value.lineId = dotList.value.id
+    formd.value.lineName = dotList.value.name
+    formd.value.searchBeginTime = TableHeaderRef.value.datePickerRef.timeValue[0]
+    formd.value.searchEndTime = TableHeaderRef.value.datePickerRef.timeValue[1]
+    formd.value.flag = TableHeaderRef.value.datePickerRef.interval
+    ElMessage('生成报告中,请稍等!')
+    getLineExport(formd.value).then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+        })
+        // createObjectURL(blob); //创建下载的链接
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = '监测点报告' // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+.grid-content {
+    text-align: center;
+}
+.divBox {
+    width: 250px;
+    height: 31px;
+    margin: auto;
+    line-height: 32px;
+    border: 1px solid #c9c9c9;
+    &:hover {
+        border: 1px solid #002255;
+    }
+}
+.box {
+    padding: 10px;
+    // margin-top: 10px;
+    overflow-y: auto;
+    font-size: 15px;
+}
+.el-divider--horizontal {
+    margin: 10px 0;
+}
+.mTop {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+</style>

src/views/govern/reportCore/report/index.vue

@@ -0,0 +1,175 @@
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%"  id="navigation-splitpanes">
+            <pane :size="size">
+               
+                <CloudDeviceEntryTree
+                    ref="TerminalRef"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></CloudDeviceEntryTree>
+            </pane>
+            <pane style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" datePicker :show-search="false">
+                    <template v-slot:select>
+                        <el-form-item label="客户名称">
+                            <el-input
+                                v-model="tableStore.table.params.crmName"
+                                maxlength="32"
+                                show-word-limit
+                                clearable
+                                placeholder="请输入客户名称"
+                            />
+                        </el-form-item>
+                        <el-form-item label="报表编号">
+                            <el-input
+                                v-model="tableStore.table.params.reportNumber"
+                                clearable
+                                placeholder="请输入报表编号"
+                                maxlength="12"
+                                show-word-limit
+                            />
+                        </el-form-item>
+                    </template>
+                    <template #operation>
+                        <el-upload
+                            :show-file-list="false"
+                            ref="uploadRef"
+                            action=""
+                            accept=".png,.jpg"
+                            :on-change="choose"
+                            :auto-upload="false"
+                        >
+                            <template #trigger>
+                                <el-button icon="el-icon-Upload" type="primary" class="mr10 ml10">上传接线图</el-button>
+                            </template>
+                        </el-upload>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">生成</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box">
+                    <div id="luckysheet">
+                        <img
+                            width="100%"
+                            :style="`height: calc(${tableStore.table.height} + 40px)`"
+                            src="@/assets/img/jss.png"
+                        />
+                    </div>
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import TableStore from '@/utils/tableStore'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
+import type { UploadProps, UploadUserFile } from 'element-plus'
+import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
+import { exportModel } from '@/api/cs-harmonic-boot/datatrend'
+defineOptions({
+    name: 'harmonic-boot/report/word'
+})
+const height = mainHeight(20)
+const size = ref(0)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+const uploadList: any = ref([])
+
+const tableStore = new TableStore({
+    url: '',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
+})
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 100)
+    }
+})
+
+const handleNodeClick = (data: any, node: any) => {
+    dotList.value = data
+}
+// 上传
+const choose = (files: any) => {
+    const isJPG = files.raw.type === 'image/jpg'
+    const isJPEG = files.raw.type === 'image/jpeg'
+    const isPNG = files.raw.type === 'image/png'
+    if (!isJPG && !isPNG && !isJPEG) {
+        ElMessage.warning('上传文件只能是 JPG/PNG 格式!')
+        return false
+    }
+
+    uploadList.value = files
+    ElMessage.success('上传成功')
+}
+// 生成
+const exportEvent = () => {
+    console.log("🚀 ~ exportEvent ~ dotList.value:", dotList.value)
+    if (dotList.value?.level != 4) {
+        return ElMessage.warning('请选择监测点进行报告生成!')
+    }
+
+    let form = new FormData()
+    form.append('lineIndex', dotList.value.id)
+    form.append('name', dotList.value.name)
+    form.append('crmName', tableStore.table.params.crmName || '')
+    form.append('reportNumber', tableStore.table.params.reportNumber || '')
+    form.append('type', '0')
+    form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0])
+    form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1])
+    console.log('🚀 ~ exportEvent ~ uploadList.value:', uploadList.value?.raw)
+    form.append('file', uploadList.value?.raw || '')
+    // 特殊字符正则表达式
+    const specialCharRegex = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/
+    if (
+        specialCharRegex.test(tableStore.table.params.crmName) ||
+        specialCharRegex.test(tableStore.table.params.reportNumber)
+    ) {
+        ElNotification({
+            type: 'error',
+            message: '包含特殊字符，请注意修改!'
+        })
+    } else {
+        ElMessage('生成报告中...')
+        exportModel(form).then((res: any) => {
+            let blob = new Blob([res], {
+                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+            })
+            // createObjectURL(blob); //创建下载的链接
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download = dotList.value.name // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+        })
+    }
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+
+.box {
+    padding: 10px;
+}
+</style>

src/views/pqs/cockpit/homePage/index.vue

@@ -25,7 +25,11 @@
             :vertical-compact="false"
             prevent-collision
             :col-num="12"
-            :style="{ zoom: zoom }"
+            :style="{
+                transform: `scale(${zoom})`,
+                transformOrigin: 'top left',
+                width: zoom !== 1 ? `${100 / zoom}%` : '100%'
+            }"
         >
             <template #item="{ item }">
                 <div class="box">

src/views/pqs/cockpit/realTimeData/iframeDia.vue

@@ -1,539 +0,0 @@
-<template>
-    <div class="container">
-        <!-- 使用 v-for 遍历四个角落 -->
-        <div v-for="corner in corners" :key="corner.id" :class="['corner', corner.className]">
-            <div class="content">
-                <div class="title">{{ corner.title }}</div>
-                <el-descriptions :column="1" size="small" label-width="70px" border>
-                    <el-descriptions-item v-for="(item, index) in corner.data" :key="index" :label="item.label">
-                        <div v-html="item.value" v-if="item.label !== '暂降次数'"></div>
-                        <!-- 跑马灯 -->
-                        <!-- <div v-else style="display: flex">
-                            <div style="width: 30px">{{ corner.raceLists.length }}次</div>
-                            <div class="simple-marquee">
-                                <div class="marquee-content">
-                                    <span
-                                        style="margin-right: 15px"
-                                        v-for="(event, index) in corner.raceLists"
-                                        :key="index"
-                                        @click="goToRace(event)"
-                                    >
-                                        {{
-                                            index +
-                                            1 +
-                                            '、' +
-                                            event.startTime +
-                                            '发生' +
-                                            event.eventType +
-                                            ',' +
-                                            '残余电压：' +
-                                            (event.featureAmplitude * 100).toFixed(2) +
-                                            '%' +
-                                            ',' +
-                                            '持续时间:' +
-                                            event.duration +
-                                            'S'
-                                        }}
-                                    </span>
-                                </div>
-                            </div>
-                        </div> -->
-                    </el-descriptions-item>
-                </el-descriptions>
-            </div>
-            <span class="close-btn" @click="closeCorner(corner.id)">
-                <Close />
-            </span>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, onBeforeUnmount, nextTick, reactive } from 'vue'
-import { clickImage } from '@/api/manage_wx'
-import { Close } from '@element-plus/icons-vue'
-import socketClient from '@/utils/webSocketClient'
-// import { useStore } from 'vuex'
-// 定义接收的 props
-const props = defineProps<{
-    eventList?: []
-}>()
-//开始创建webSocket客户端
-const dataSocket = reactive({
-    socketServe: socketClient.Instance
-})
-// 定义四个角落的数据
-const corners = ref([
-    {
-        id: 'topLeft',
-        title: '左上',
-        className: 'top-left',
-        show: false,
-        data: [] as { label: string; value: string }[],
-        elementId: '', // 记录该角落对应的元素ID
-        raceLists: [] as any[] // 为每个角落添加独立的跑马灯数据存储
-    },
-    {
-        id: 'topRight',
-        title: '右上',
-        className: 'top-right',
-        show: false,
-        data: [] as { label: string; value: string }[],
-        elementId: '',
-        raceLists: [] as any[] // 为每个角落添加独立的跑马灯数据存储
-    }
-    // {
-    //   id: "bottomLeft",
-    //   title: "左下",
-    //   className: "bottom-left",
-    //   show: false,
-    //   data: [] as { label: string; value: string }[],
-    //   elementId: "",
-    // },
-    // {
-    //   id: "bottomRight",
-    //   title: "右下",
-    //   className: "bottom-right",
-    //   show: false,
-    //   data: [] as { label: string; value: string }[],
-    //   elementId: "",
-    // },
-])
-const steadyStateList = ref([])
-// const store = useStore()
-const selectedId = ref('')
-
-// 内部响应式数据
-const eventList = ref([])
-
-// 点击跑马灯展示弹框
-const dipDetail = ref(null)
-
-// const handleClickImage = async (elementId: string) => {
-//     // 检查 elementId 是否有值，没有值则直接返回空数组
-//     if (!elementId) {
-//         eventList.value = []
-//         return
-//     }
-//     try {
-//         // 发送点击图片请求
-//         const res = await clickImage({
-//             lineId: elementId,
-//             searchBeginTime: store.state.timeValue[0],
-//             searchEndTime: store.state.timeValue[1]
-//         })
-
-//         // 确保返回的数据是数组格式，并且过滤掉 null/undefined 元素
-//         let dataToStore: any[] = []
-
-//         if (Array.isArray(res.data)) {
-//             dataToStore = res.data.filter(item => item !== null && item !== undefined)
-//         } else if (res.data && Array.isArray(res.data.records)) {
-//             dataToStore = res.data.records.filter(item => item !== null && item !== undefined)
-//         } else if (res.data) {
-//             // 如果是单个对象且不为 null
-//             if (res.data !== null && res.data !== undefined) {
-//                 dataToStore = [res.data]
-//             }
-//         }
-
-//         eventList.value = dataToStore
-//     } catch (error) {
-//         console.error('调用 clickImage 接口出错:', error)
-//         // 出错时设置为空数组，避免后续处理出错
-//         eventList.value = []
-//     }
-// }
-
-// 监听 props 变化
-// watch(
-//   () => props.eventList,
-//   (newVal) => {
-//     if (newVal && Array.isArray(newVal)) {
-//       eventList.value = [...newVal];
-//       dataLoaded.value = true;
-//     } else {
-//       dataLoaded.value = false;
-//     }
-//   },
-//   { immediate: true, deep: true }
-// );
-
-// 记录显示顺序，用于循环替换
-const displayOrder = ref<number[]>([])
-
-// 计算跑马灯动画时长（毫秒）
-const calculateMarqueeDuration = corner => {
-    if (!corner.raceLists || corner.raceLists.length === 0) {
-        return 25000 // 默认25秒
-    }
-
-    // 计算所有事件文本的总长度
-    let totalTextLength = 0
-    corner.raceLists.forEach((event, index) => {
-        const text = `${index + 1}、${event.startTime}发生${event.eventType},残余电压：${(
-            event.featureAmplitude * 100
-        ).toFixed(2)}%,持续时间:${event.duration}S`
-        totalTextLength += text.length
-    })
-
-    // 添加分隔符长度和边距
-    const separatorLength = corner.raceLists.length > 1 ? (corner.raceLists.length - 1) * 15 : 0 // margin-right: 15px
-    totalTextLength += separatorLength
-
-    // 根据文本长度计算时长（减慢速度）
-    // 将每字符需要的时间从50ms增加到80ms，最少8秒，最多90秒
-    const duration = Math.min(Math.max(totalTextLength * 80, 8000), 90000)
-    return duration
-}
-
-// 更新指定角落数据的函数
-const updateCornerData = (cornerIndex: number, dataItem: any, elementId: string) => {
-    // 更新标题为 objName
-    if (dataItem.objName) {
-        corners.value[cornerIndex].title = dataItem.objName
-    } else {
-        corners.value[cornerIndex].title = dataItem.stationName
-    }
-
-    // 格式化数据
-    corners.value[cornerIndex].data = [
-        { label: '监测点', value: dataItem.lineName },
-        // {
-        //   label: "暂降次数",
-        //   value: dataItem.eventIds.length,
-        // },
-        {
-            label: '暂降次数',
-            value: ``
-        },
-        // { label: "稳态指标", value: "Ua:65.5   Ub:65.02   Uc:65.27   Uac:112.85  Uab:112.67   Ubc:112.85"  },
-        {
-            label: '稳态指标',
-            value: ``
-        }
-    ]
-
-    // 记录该角落对应的元素ID
-    corners.value[cornerIndex].elementId = elementId
-    corners.value[cornerIndex].show = true
-
-    // 设置动画时长
-    nextTick(() => {
-        const duration = calculateMarqueeDuration(corners.value[cornerIndex])
-        const marqueeElement = document.querySelector(`.${corners.value[cornerIndex].className} .marquee-content`)
-        if (marqueeElement) {
-            ;(marqueeElement as HTMLElement).style.setProperty('--marquee-duration', `${duration}ms`)
-        }
-    })
-}
-
-// 显示下一个角落的函数
-const showNextCorner = (elementId: string) => {
-    // 检查该元素ID是否已经显示过
-    const existingCornerIndex = corners.value.findIndex(corner => corner.elementId === elementId && corner.show)
-
-    if (existingCornerIndex !== -1) {
-        // 如果该元素已经显示过，不更新数据
-        return
-    }
-
-    // 确保 eventList.value 是数组并且过滤掉 null/undefined 元素
-    if (!Array.isArray(eventList.value)) {
-        console.warn('eventList.value 不是数组格式:', eventList.value)
-        return
-    }
-
-    // 过滤掉 null 和 undefined 元素，然后查找匹配项
-    const validItems = eventList.value.filter(item => item !== null && item !== undefined)
-    const dataItem = validItems.find(item => item.lineId === elementId)
-
-    // 如果没有找到匹配的数据项，则不更新数据
-    if (!dataItem) {
-        console.warn('未找到匹配的数据项:', elementId)
-        return
-    }
-
-    // 查找一个未显示的角落
-    const availableCornerIndex = corners.value.findIndex(corner => !corner.show)
-
-    if (availableCornerIndex !== -1) {
-        // 有空闲角落，显示在该角落
-        updateCornerData(availableCornerIndex, dataItem, elementId)
-        // 将事件数据存储到该角落
-        corners.value[availableCornerIndex].raceLists = dataItem.eventList || []
-        // 记录显示顺序
-        displayOrder.value.push(availableCornerIndex)
-    } else {
-        // 没有空闲角落，按顺序替换角落
-        // 获取需要替换的角落索引（循环替换）
-        const replaceIndex = displayOrder.value.shift() || 0
-        updateCornerData(replaceIndex, dataItem, elementId)
-        // 将事件数据存储到该角落
-        corners.value[replaceIndex].raceLists = dataItem.eventList || []
-        // 将替换的索引重新加入队列末尾
-        displayOrder.value.push(replaceIndex)
-    }
-}
-
-// 关闭指定角落的函数
-const closeCorner = (id: string) => {
-    const cornerIndex = corners.value.findIndex(c => c.id === id)
-    if (cornerIndex !== -1) {
-        corners.value[cornerIndex].show = false
-        corners.value[cornerIndex].elementId = '' // 清空元素ID记录
-
-        // 从显示顺序中移除该角落索引
-        const orderIndex = displayOrder.value.indexOf(cornerIndex)
-        if (orderIndex !== -1) {
-            displayOrder.value.splice(orderIndex, 1)
-        }
-    }
-    send()
-}
-
-// 关闭所有角落的函数
-const closeAllCorners = () => {
-    corners.value.forEach(corner => {
-        corner.show = false
-        corner.elementId = ''
-    })
-    displayOrder.value = []
-}
-
-// 组件挂载后初始化监听器
-onMounted(() => {
-    init()
-    // 初始化时不显示任何内容
-})
-
-// 连接webSocket客户端
-const init = () => {
-    if (!dataSocket.socketServe) {
-        console.error('WebSocket 客户端实例不存在')
-        return
-    }
-    dataSocket.socketServe.connect(new Date().getTime())
-    dataSocket.socketServe.registerCallBack('message', (res: any) => {
-        if (res.type == 1) {
-            //稳态指标数据
-            let steadyState = JSON.parse(res.message)
-
-            // console.log(steadyState, "8990hhhhh");
-            if (steadyState == null || steadyState.length == 0) return
-            steadyStateList.value = steadyState
-            corners.value.forEach((corner, index) => {
-                let str = ``
-                steadyState
-                    .filter(item => item.lineId == corner.elementId)
-                    .forEach(item => {
-                        if (item.value == 3.1415926) {
-                            str += `<div>${item.statisticalName}：/</div>`
-                        } else {
-                            str += `<div>${item.statisticalName}：${item.value}${item.unit}</div>`
-                        }
-                    })
-
-                corner.data.length > 0
-                    ? (corner.data[2].value = `<div style="max-height: 100px;overflow-y: auto;">${str} </div>`)
-                    : ''
-
-                // 更新跑马灯动画时长
-                nextTick(() => {
-                    const duration = calculateMarqueeDuration(corner)
-                    const marqueeElement = document.querySelector(`.${corner.className} .marquee-content`)
-                    if (marqueeElement) {
-                        ;(marqueeElement as HTMLElement).style.setProperty('--marquee-duration', `${duration}ms`)
-                    }
-                })
-            })
-        }
-    })
-}
-
-const time = ref(null)
-// 推送消息
-const send = () => {
-    dataSocket.socketServe.send({
-        pageId: selectedId.value,
-        lineIdList: corners.value.filter(item => item.show == true).map(corner => corner.elementId)
-    })
-    if (time.value) {
-        clearTimeout(time.value)
-    }
-    if (corners.value.filter(item => item.show == true).map(corner => corner.elementId).length == 0) return
-    time.value = setInterval(() => {
-        dataSocket.socketServe.send({
-            pageId: selectedId.value,
-            lineIdList: corners.value.filter(item => item.show == true).map(corner => corner.elementId)
-        })
-    }, 1000 * 60)
-}
-
-const goToRace = row => {
-    dipDetail.value.open(row.measurementPointId)
-}
-
-// 监听来自 iframe 的消息
-window.addEventListener('message', async function (event) {
-    // 安全起见，可以验证消息来源（origin）
-    // if (event.origin !== 'https://trusted-origin.com') return;
-
-    // 处理从 iframe 发送过来的消息
-    if (event.data.action === 'coreClick') {
-        const clickedElementId = event.data.coreId
-        selectedId.value = event.data.selectedId
-
-        // 调用接口获取最新数据
-        // await handleClickImage(clickedElementId)
-
-        // 根据接收到的元素LineId显示对应数据
-        await showNextCorner(clickedElementId)
-
-        await send()
-    }
-})
-
-// 页面卸载时清除定时器
-onBeforeUnmount(() => {
-    clearTimeout(time.value)
-    dataSocket.socketServe?.closeWs()
-})
-</script>
-
-<style>
-/* 走马灯样式 - 支持逐条显示 */
-.simple-marquee {
-    width: 230px;
-    height: 24px;
-    overflow: hidden;
-    position: relative;
-    white-space: nowrap;
-}
-
-.marquee-content {
-    display: inline-block;
-    padding-left: 100%;
-    /* animation: marquee-single 15s linear infinite; */
-    animation: marquee-single var(--marquee-duration, 25s) linear infinite;
-    line-height: 24px;
-    text-decoration: underline;
-    text-decoration-color: #4877f6;
-}
-
-@keyframes marquee-single {
-    0% {
-        transform: translateX(0);
-    }
-    100% {
-        transform: translateX(-100%);
-    }
-}
-
-/* 鼠标悬停时暂停动画 */
-.simple-marquee:hover .marquee-content {
-    animation-play-state: paused;
-    cursor: pointer;
-}
-</style>
-
-<style scoped lang="scss">
-.container {
-    position: relative;
-}
-
-.corner {
-    width: 240px;
-    /* height: 135px; */
-    background-color: #2b2d3a90;
-    position: absolute;
-    color: 000;
-    /* font-weight: bold; */
-    /* 添加弹出动画 */
-    opacity: 0;
-    transform: scale(0.3);
-    transition: all 0.4s ease-out;
-    border-radius: 8px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
-}
-
-/* 显示状态的样式 */
-.corner:not([style*='display: none']):not([style*='display:none']) {
-    opacity: 1;
-    transform: scale(1);
-}
-
-.top-left {
-    top: 10px;
-    left: 10px;
-}
-
-.top-right {
-    top: 10px;
-    right: 10px;
-}
-
-.bottom-left {
-    top: 170px;
-    left: 10px;
-}
-
-.bottom-right {
-    top: 170px;
-    right: 10px;
-}
-
-.content {
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-}
-
-.title {
-    font-size: 16px;
-    /* text-align: center; */
-    /* margin-bottom: 8px; */
-    padding: 8px;
-    /* color: #409eff; */
-    border-bottom: 1px solid #fff;
-    background-color: #fff;
-    border-radius: 8px 8px 0 0;
-}
-
-.data-item {
-    display: flex;
-    margin-bottom: 4px;
-    font-size: 12px;
-}
-
-.label {
-    /* font-weight: bold; */
-    width: 55px;
-    flex-shrink: 0;
-}
-
-.value {
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-/* 关闭按钮样式 */
-.close-btn {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    width: 14px;
-    color: white;
-    font-size: 14px;
-    font-weight: bold;
-    cursor: pointer;
-}
-
-.indicator {
-    display: flex;
-}
-</style>

src/views/pqs/cockpit/realTimeData/index.vue

@@ -1,8 +1,9 @@
 <template>
     <div class="default-main" :style="{ padding: prop.height ? '0px !important' : '10px' }">
         <!-- 实时数据 -->
+        <!-- 实时数据 走驾驶舱-->
         <!-- 添加加载事件监听 -->
-        <div class="dataBox" :style="{ height: prop.height || pageHeight.height }">
+        <div class="dataBox" :style="{ height: prop.height ? prop.height : pageHeight.height }">
             <div
                 class="iframe-container"
                 :style="{
@@ -19,13 +20,12 @@
                     id="iframeLeft"
                     @load="onIframeLoad"
                 ></iframe>
-                <IframeDia style="position: absolute; top: 0px; right: 0px; left: 0px" />
             </div>
 
             <el-card class="bottom-container" style="min-height: 230px">
-                <div class="buttonBox">
+                <!-- <div class="buttonBox">
                     <el-button type="primary" icon="el-icon-Aim" @click="reset">复位</el-button>
-                </div>
+                </div> -->
                 <div class="tableBox">
                     <!-- <Table ref="tableRef"  height="100%"></Table> -->
                     <vxe-table border auto-resize height="100%" :data="tableData" ref="tableRef">
@@ -44,7 +44,6 @@ import { ref, watch, onMounted, onUnmounted, provide } from 'vue'
 import Table from '@/components/table/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
-import IframeDia from './iframeDia.vue'
 // import { getActive } from "@/api/manage_wx/index";
 
 // const props = defineProps<{
@@ -54,7 +53,7 @@ import IframeDia from './iframeDia.vue'
 const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
     timeValue: { type: Object }
 })
 
@@ -65,102 +64,34 @@ window.addEventListener('message', function (event) {
     const { action, data } = event.data
 
     if (action == 'securityDetailData') {
-        console.log('tableArray:', data)
         // 处理接收到的 tableArray 数据
         tableData.value = data
     }
 })
 
-// const tableStore: any = new TableStore({
-//     url: '/user-boot/role/selectRoleDetail?id=0',
-//     method: 'POST',
-
-//     showPage: false,
-
-//     column: [
-//         {
-//             field: 'index',
-//             title: '序号',
-//             width: '80',
-//             formatter: (row: any) => {
-//                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-//             }
-//         },
-//         {
-//             title: '时间',
-//             field: 'whetherToGovern',
-//             minWidth: '70'
-//         },
-//         {
-//             title: '监测点名',
-//             field: 'name',
-//             minWidth: '90'
-
-//             // render: 'customTemplate',
-//             // customTemplate: (row: any) => {
-//             //     return `<span style='cursor: pointer;text-decoration: underline;'>${row.name}</span>`
-//             // }
-//         },
-
-//         { title: '事件描述', field: 'question', minWidth: '200' }
-//     ],
-//     beforeSearchFun: () => {
-//         // tableStore.table.params.searchBeginTime = prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-//         //     tableStore.table.params.searchEndTime = prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
-//     },
-//     loadCallback: () => {
-//         tableStore.table.data = [
-//             {
-//                 name: '10kV1#电动机',
-//                 type: '电动机',
-//                 whetherToGovern: '2025-01-01 15:00:00',
-//                 question: '3次谐波电压、5次谐波电流、电压不平衡度超标'
-//             },
-//             {
-//                 name: '10kV2#(治理后)',
-//                 type: '电焊机',
-//                 whetherToGovern: '2025-05-01 16:00:00',
-//                 question: '所有指标均合格'
-//             },
-//             {
-//                 name: '380V电焊机(治理前)',
-//                 type: '电焊机',
-//                 whetherToGovern: '2025-06-01 15:00:00',
-//                 question: '5次谐波电流、电压不平衡度超标'
-//             },
-//             {
-//                 name: '380V水泵机',
-//                 type: '电动机',
-//                 whetherToGovern: '2025-08-01 15:00:00',
-//                 question: '所有指标均合格'
-//             }
-//         ]
-//     }
-// })
 const tableRef = ref()
-// provide('tableRef', tableRef)
-// const pageHeight = mainHeight(40)
-// provide('tableStore', tableStore)
+
+const pageHeight = mainHeight(40)
 
 const reset = () => {
-  // 向 iframe 发送复位事件
-  sendResetToIframe();
-  // 清空表格数据
-//   tableData.value = [];
+    // 向 iframe 发送复位事件
+    sendResetToIframe()
+    // 清空表格数据
+    //   tableData.value = [];
 }
 
 // 向 iframe 发送复位消息的函数
 const sendResetToIframe = () => {
-  const iframe = document.getElementById('iframeLeft') as HTMLIFrameElement;
-  if (iframe && iframe.contentWindow) {
-    iframe.contentWindow.postMessage(
-      {
-        type: 'RESET_EVENT',
-        payload: true
-      },
-      '*'  // 生产环境中应替换为具体的域名
-    );
-  }
+    const iframe = document.getElementById('iframeLeft') as HTMLIFrameElement
+    if (iframe && iframe.contentWindow) {
+        iframe.contentWindow.postMessage(
+            {
+                type: 'RESET_EVENT',
+                payload: true
+            },
+            '*' // 生产环境中应替换为具体的域名
+        )
+    }
 }
 
 const iframeSrc = ref('')
@@ -188,7 +119,7 @@ const iframeSrc = ref('')
 
 onMounted(() => {
     iframeSrc.value =
-        'http://192.168.1.128:4001' + `/zutai/?id=4b4f7f4260198776594f5f9d93a532e8&&name=stt&&preview=true#/preview_YPT`
+        window.location.origin + `/zutai/?id=4b4f7f4260198776594f5f9d93a532e8&&name=stt&&preview=true#/preview_YPT`
 
     // tableStore.index()
 
@@ -263,16 +194,19 @@ const sendKeysToIframe = (keyList: string[]) => {
 .iframe-container {
     flex: 3.5;
 }
+
 :deep(.el-card__body) {
     display: flex;
     padding: 10px;
     height: 100%;
+
     .buttonBox {
         display: flex;
         width: 150px;
         align-items: center;
         justify-content: center;
     }
+
     .tableBox {
         flex: 1;
         width: 100%;