修改菜单

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

@@ -6,6 +6,7 @@
             :showReset="false"
             @selectChange="selectChange"
             datePicker
+             :timeKeyList="prop.timeKey"
             v-if="fullscreen"
         ></TableHeader>
         <my-echart
@@ -28,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/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

@@ -7,7 +7,7 @@
             @selectChange="selectChange"
             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

@@ -6,11 +6,11 @@
             @selectChange="selectChange"
             v-if="fullscreen"
             ref="TableHeaderRef" 
-            :timeKeyList="['4', '5']"
+            :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: {
@@ -168,20 +204,22 @@ const setEchart = () => {
         },
         yAxis: [
             {},
-            indicatorName ? {
-                min: 0,
-                max: 1,
-                axisLabel: {
-                    formatter: function(value: number) {
-                        if (value === 0) {
-                            return '不越限'
-                        } else if (value === 1) {
-                            return '越限'
-                        }
-                        return value
-                    }
-                }
-            } : {}
+            indicatorName
+                ? {
+                      min: 0,
+                      max: 1,
+                      axisLabel: {
+                          formatter: function (value: number) {
+                              if (value === 0) {
+                                  return '不越限'
+                              } else if (value === 1) {
+                                  return '越限'
+                              }
+                              return value
+                          }
+                      }
+                  }
+                : {}
         ],
         grid: {
             left: '10px',
@@ -209,6 +247,7 @@ const setEchart = () => {
                 {
                     name: indicatorName, // 动态设置指标名称
                     type: 'line',
+                    step: 'end',
                     showSymbol: false,
                     // smooth: true,
                     data: [],

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,32 +111,6 @@ 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',
@@ -146,16 +120,33 @@ const tableStore: any = new TableStore({
                 return `<span style='cursor: pointer;text-decoration: underline;'>${row.lineName}</span>`
             }
         },
-        { title: '监测类型', field: 'position', minWidth: '70' },
+        { title: '监测类型', field: 'position', minWidth: '80' },
         {
             title: '监测点状态',
             field: 'runStatus',
-            minWidth: '80',
+            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',

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',
-            width: '180'
+            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,12 +123,12 @@ const tableStore: any = new TableStore({
         {
             title: '持续时间(S)',
             field: 'persistTime',
-            width: '100'
+            minWidth: '100'
         },
         {
             title: '严重度',
             field: 'severity',
-            width: '80'
+            minWidth: '80'
         },
         {
             title: '波形',
@@ -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
 

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>(), {
@@ -98,10 +99,7 @@ const filteredTimeOptions = computed(() => {
         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/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

@@ -3,7 +3,7 @@
         <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"
+                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps" clearable
                         style="width: 100%" />
                 </el-form-item>
                 <el-form-item label="菜单名称">
@@ -92,6 +92,7 @@ const open = (text: string, data: anyObj) => {
 }
 const submit = async () => {
     if (form.id) {
+        form.pid =  form.pid||'0'
         await updateMenu(form)
     } else {
         form.code = 'menu'

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

@@ -1,13 +1,8 @@
 <template>
     <div class="default-main" :style="height">
-        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+        <splitpanes style="height: 100%"  id="navigation-splitpanes">
             <pane :size="size">
-                <!-- <pointTreeWx
-                    :default-expand-all="false"
-                    template
-                    @node-click="handleNodeClick"
-                    @init="handleNodeClick"
-                ></pointTreeWx> -->
+               
                 <CloudDeviceEntryTree
                     ref="TerminalRef"
                     @node-click="handleNodeClick"
@@ -81,7 +76,7 @@ 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'
+    name: 'harmonic-boot/report/word'
 })
 const height = mainHeight(20)
 const size = ref(0)

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/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="{
@@ -22,9 +23,9 @@
             </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">
@@ -52,7 +53,7 @@ import { mainHeight } from '@/utils/layout'
 const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-    timeKey: { type: [String, Number] },
+    timeKey: { type: Array as () => string[] },
     timeValue: { type: Object }
 })
 
@@ -63,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('')
@@ -186,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()
 
@@ -261,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%;