diff --git a/src/components/cockpit/listOfMainMonitoringPoints/index.vue b/src/components/cockpit/listOfMainMonitoringPoints/index.vue
index 1c0bff9..47411d5 100644
--- a/src/components/cockpit/listOfMainMonitoringPoints/index.vue
+++ b/src/components/cockpit/listOfMainMonitoringPoints/index.vue
@@ -172,7 +172,7 @@ const setEchart = () => {
         tooltip: {
             trigger: 'axis',
             formatter: function (params: any) {
-                let result = params[0].name
+                let result = params[0].axisValueLabel
                 params.forEach((item: any) => {
                     if (item.seriesName === indicatorName) {
                         // 对于电能质量指标，格式化Y轴值显示
diff --git a/src/components/cockpit/monitoringPointList/index.vue b/src/components/cockpit/monitoringPointList/index.vue
index 32d36cf..326e21e 100644
--- a/src/components/cockpit/monitoringPointList/index.vue
+++ b/src/components/cockpit/monitoringPointList/index.vue
@@ -156,17 +156,21 @@ const tableStore: any = new TableStore({
                 停运: 'danger',
                 退运: 'danger',
                 运行: 'success',
+                在线: 'success',
                 中断: 'warning',
+                离线: 'danger',
                 检修: 'warning',
                 调试: 'warning',
                 null: 'info'
             },
             replaceValue: {
                 运行: '运行',
+                在线: '在线',
                 退运: '退运',
                 停运: '停运',
                 中断: '中断',
                 检修: '检修',
+                离线: '离线',
                 调试: '调试',
                 null: '/'
             }
@@ -183,7 +187,10 @@ const tableStore: any = new TableStore({
         {
             title: '电压等级',
             field: 'volGrade',
-            minWidth: '80'
+            minWidth: '80',
+            formatter: (row: any) => {
+                return row.cellValue==0?'/': row.cellValue+'kV' || '/'
+            }
         },
         {
             title: '是否治理',
diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue
index bf201e2..ea52dd7 100644
--- a/src/components/echarts/rmsboxi.vue
+++ b/src/components/echarts/rmsboxi.vue
@@ -1,8 +1,8 @@
 <template>
     <div v-loading="loading" style="position: relative; height: 100%">
         <div id="boxr">
-            <div id="rmsp" :style="`height:${vh};overflow: hidden;`">
-                <div class="bx" id="rms"></div>
+            <div id="rmsp" :style="`height:${vh};overflow: hidden;min-height: 200px;`">
+                <div class="bx" id="rms" style="min-height: 200px;"></div>
             </div>
         </div>
     </div>
@@ -594,10 +594,10 @@ const initWave = (
         for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
             const rmsId = 'rms' + step
             const newDivRms = $(
-                `<div style="height:${vh.value};overflow: hidden;"><div class='bx' id='${rmsId}'></div></div>`
+                `<div style="height:${vh.value};overflow: hidden;min-height: 200px;"><div class='bx' id='${rmsId}'></div></div>`
             )
             newDivRms.insertAfter($('#rmsp'))
-            $(`#${rmsId}`).css('height', picHeight).css('width', vw.value)
+            $(`#${rmsId}`).css('height', picHeight).css('width', vw.value).css('min-height', '200px')
         }
     } else {
         titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue
index e9061d3..f9f7e78 100644
--- a/src/components/echarts/shushiboxi.vue
+++ b/src/components/echarts/shushiboxi.vue
@@ -1,8 +1,8 @@
 <template>
     <div v-loading="loading" class="boxbx" style="position: relative; height: 100%">
         <div id="boxsj">
-            <div id="shushi" :style="`height:${vh};overflow: hidden;`">
-                <div class="bx" id="wave"></div>
+            <div id="shushi" :style="`height:${vh};overflow: hidden;min-height: 200px;`">
+                <div class="bx" id="wave" style="min-height: 200px;"></div>
             </div>
         </div>
     </div>
@@ -327,11 +327,11 @@ const initWave = (
 
         for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
             const waveId = 'wave' + step
-            const newDivShunshi = $(`<div style="height:${vh.value};overflow: hidden;">
+            const newDivShunshi = $(`<div style="height:${vh.value};overflow: hidden;min-height: 200px;">
         <div class='bx1' id='${waveId}'></div>
       </div>`)
             newDivShunshi.insertAfter($('#shushi'))
-            $(`#${waveId}`).css('height', picHeight).css('width', vw.value)
+            $(`#${waveId}`).css('height', picHeight).css('width', vw.value).css('min-height', '200px')
         }
     } else {
         titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
@@ -591,7 +591,7 @@ const initWave = (
 
 const drawPics = (
     waveDataTemp: WaveData,
-    picHeight: string,
+    picHeight: any,
     step: number,
     show: boolean,
     myChartes1: echarts.ECharts,
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index c0a989c..2964f8e 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -91,6 +91,7 @@
                     :name="item.id"
                     v-for="(item, index) in deviceData.dataSetList"
                     :key="index"
+                    :disabled="tableLoading"
                 >
                     <template #label>
                         <span class="custom-tabs-label">
diff --git a/src/views/govern/device/control/moduleData.vue b/src/views/govern/device/control/moduleData.vue
index 6203e99..4093714 100644
--- a/src/views/govern/device/control/moduleData.vue
+++ b/src/views/govern/device/control/moduleData.vue
@@ -380,7 +380,7 @@ const changeDataType = () => {
         let data2 = dataType.value.includes(1)
             ? list.value[activeTab.value]?.modOutList.map(k => (k.data == 3.14159 ? 0 : k.data))
             : [0]
-        let [modOuMin, modOuMax] = yMethod([...data1, ...data2])
+        let [modOuMin, modOuMax] = yMethod([...data1||[0], ...data2||[0]])
         console.log("🚀 ~ changeDataType ~ modOuMin:", modOuMin,modOuMax)
 
         echartsData.value.yAxis[0] = {
diff --git a/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue b/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
index 08f3f6f..4eb6235 100644
--- a/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
+++ b/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
@@ -20,12 +20,13 @@
 
             <el-button @click="handleBack" :icon="Back">返回</el-button>
         </div>
+           <!-- v-loading="loading" -->
         <el-tabs
             class="home_body"
             type="border-card"
             v-model.trim="activeName1"
             @tab-click="handleClick"
-            v-loading="loading"
+         
         >
             <el-tab-pane label="瞬时波形" name="ssbx" :style="'height:' + bxecharts + ';overflow-y: auto;'">
                 <shushiboxi
@@ -122,7 +123,7 @@ const changeView = () => {
     }, 500)
     setTimeout(() => {
         loading.value = false
-    }, 1500)
+    }, 1000)
 }
 const bxecharts: any = ref(mainHeight(190).height as any)
 
@@ -133,7 +134,7 @@ const handleClick = (tab: any, event: any) => {
     }, 500)
     setTimeout(() => {
         loading.value = false
-    }, 1500)
+    }, 1000)
 }
 const handleBack = () => {
     emit('handleHideCharts')
diff --git a/src/views/govern/device/control/tabs/event.vue b/src/views/govern/device/control/tabs/event.vue
index 83bf035..2a5bcc2 100644
--- a/src/views/govern/device/control/tabs/event.vue
+++ b/src/views/govern/device/control/tabs/event.vue
@@ -72,7 +72,7 @@ const tableStore: any = new TableStore({
             title: '持续时间(s)',
             minWidth: 110,
             formatter: (row: any) => {
-                console.log('🚀 ~  row.cellValue:', row.cellValue)
+                // console.log('🚀 ~  row.cellValue:', row.cellValue)
 
                 return row.cellValue ? (row.cellValue - 0).toFixed(2) : '/'
             },
@@ -136,7 +136,8 @@ const tableStore: any = new TableStore({
 
                         nextTick(() => {
                             waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value)
-                            waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(200, 345)
+                            // waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(200, 345)
+                            waveFormAnalysisRef.value && waveFormAnalysisRef.value.setHeight(350, 345)
                         })
                     }
                 },
diff --git a/src/views/govern/log/debug.vue b/src/views/govern/log/debug.vue
index c34fc82..01ac23a 100644
--- a/src/views/govern/log/debug.vue
+++ b/src/views/govern/log/debug.vue
@@ -1,10 +1,14 @@
 <template>
     <div class="default-main">
-        <TableHeader datePicker>
+        <TableHeader datePicker showExport>
             <template v-slot:select>
                 <el-form-item label="设备名称">
-                    <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue"
-                        placeholder="请输入设备名称" />
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="tableStore.table.params.searchValue"
+                        placeholder="请输入设备名称"
+                    />
                 </el-form-item>
             </template>
         </TableHeader>
@@ -25,7 +29,7 @@ const tableStore = new TableStore({
     url: '/cs-device-boot/process/queryPage',
     method: 'POST',
     column: [
-         {
+        {
             field: 'index',
             title: '序号',
             width: '80',
@@ -36,22 +40,41 @@ const tableStore = new TableStore({
         { title: '设备名称', field: 'devName', align: 'center' },
         { title: '操作用户', field: 'operatorName', align: 'center' },
         {
-            title: '操作内容', field: 'process', align: 'center', formatter: (row: any) => {
-                return row.cellValue == 1 ? '设备登记' : row.cellValue == 2 ? '功能调试' : row.cellValue == 3 ? '出厂调试' : row.cellValue == 4 ? '设备投运' : ''
+            title: '操作内容',
+            field: 'process',
+            align: 'center',
+            formatter: (row: any) => {
+                return row.cellValue == 1
+                    ? '设备登记'
+                    : row.cellValue == 2
+                    ? '功能调试'
+                    : row.cellValue == 3
+                    ? '出厂调试'
+                    : row.cellValue == 4
+                    ? '设备投运'
+                    : ''
             }
         },
         { title: '开始时间', field: 'startTime', align: 'center', sortable: true },
-        { title: '结束时间', field: 'endTime', align: 'center', sortable: true }
+        {
+            title: '结束时间',
+            field: 'endTime',
+            align: 'center',
+            sortable: true,
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        }
     ],
 
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
             item.result = item.result === 1 ? '成功' : '失败'
-            for (let key in item) {
-                if (typeof item[key] !== 'number') {
-                    item[key] = item[key] || '/'
-                }
-            }
+            // for (let key in item) {
+            //     if (typeof item[key] !== 'number') {
+            //         item[key] = item[key] || '/'
+            //     }
+            // }
         })
     }
 })
@@ -65,5 +88,5 @@ onMounted(() => {
     tableStore.index()
 })
 
-const addMenu = () => { }
+const addMenu = () => {}
 </script>
diff --git a/src/views/govern/log/opera.vue b/src/views/govern/log/opera.vue
index 110358c..83c0a0e 100644
--- a/src/views/govern/log/opera.vue
+++ b/src/views/govern/log/opera.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader datePicker></TableHeader>
+        <TableHeader datePicker showExport></TableHeader>
         <Table ref="tableRef" :isGroup="true" />
     </div>
 </template>
@@ -17,7 +17,8 @@ defineOptions({
 const tableStore = new TableStore({
     url: '/cs-device-boot/cslog/queryLog',
     method: 'POST',
-    column: [ {
+    column: [
+        {
             field: 'index',
             title: '序号',
             width: '80',
@@ -29,17 +30,41 @@ const tableStore = new TableStore({
         { title: '操作描述', field: 'operate', align: 'center', minWidth: '300' },
         { title: '用户名称', field: 'userName', align: 'center', minWidth: '130' },
         { title: '更新时间', field: 'updateTime', align: 'center', sortable: true, minWidth: '150' },
-        { title: '失败原因', field: 'failReason', align: 'center', minWidth: '200' },
-        { title: '状态', field: 'result', align: 'center', minWidth: '100' },
-        { title: '登录名', field: 'loginName', align: 'center', minWidth: '120' }
+        {
+            title: '失败原因',
+            field: 'failReason',
+            align: 'center',
+            minWidth: '200',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+        {
+            title: '状态',
+            field: 'result',
+            align: 'center',
+            minWidth: '100',
+            formatter: (row: any) => {
+                return row.cellValue == 1 ? '成功' : '失败'
+            }
+        },
+        {
+            title: '登录名',
+            field: 'loginName',
+            align: 'center',
+            minWidth: '120',
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        }
     ],
 
     loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.failReason = item.failReason || '/'
-            item.result = item.result === 1 ? '成功' : '失败'
-            item.loginName = item.loginName || '/'
-        })
+        // tableStore.table.data.forEach((item: any) => {
+        //     item.failReason = item.failReason || '/'
+        //     item.result = item.result === 1 ? '成功' : '失败'
+        //     item.loginName = item.loginName || '/'
+        // })
     }
 })
 
diff --git a/src/views/govern/manage/basic/version.vue b/src/views/govern/manage/basic/version.vue
index f13ff07..5f93c31 100644
--- a/src/views/govern/manage/basic/version.vue
+++ b/src/views/govern/manage/basic/version.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader ref="tableHeaderRef">
+        <TableHeader ref="tableHeaderRef" :showReset="false" showExport>
             <template #select>
                 <el-form-item label="装置型号:">
                     <el-select v-model.trim="tableStore.table.params.devType" placeholder="请选择装置型号" clearable>
diff --git a/src/views/govern/manage/gplot/popupEdit.vue b/src/views/govern/manage/gplot/popupEdit.vue
index 44f365e..05943ff 100644
--- a/src/views/govern/manage/gplot/popupEdit.vue
+++ b/src/views/govern/manage/gplot/popupEdit.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog class="cn-operate-dialog" v-model.trim="dialogVisible" title="编辑拓扑图信息">
         <el-form :label-width="140">
-            <el-form-item label="拓扑图:" style="height: auto !important">
+            <el-form-item label="拓扑图:" style="height: auto !important" class="form-one">
                 <div class="gplot-content">
                     <VueDraggableResizable class-name-draggable="gplot-content-item"
                         class-name-active="gplot-content-item-active" :active="editorIndex == index" :resizable="false"
diff --git a/src/views/govern/monitorRecall/eventRecall.vue b/src/views/govern/monitorRecall/eventRecall.vue
index 14e4409..e76773a 100644
--- a/src/views/govern/monitorRecall/eventRecall.vue
+++ b/src/views/govern/monitorRecall/eventRecall.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="view" style="height: 100%">
-        <TableHeader datePicker ref="TableHeaderRef" :showReset="false">
+    <div class="view">
+        <TableHeader datePicker ref="TableHeaderRef" :showReset="false" showExport>
             <template #operation>
                 <el-button type="primary" :icon="Setting" @click="recall1">事件补召</el-button>
                 <el-button type="primary" :icon="Setting" @click="recall2">波形补召</el-button>
@@ -29,8 +29,9 @@ const props = defineProps({
 
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/csTerminalReply/bzLogs',
-    publicHeight: 10,
+    publicHeight: 80,
     method: 'POST',
+    exportName: '暂态补召',
     column: [
         {
             title: '序号',
diff --git a/src/views/govern/monitorRecall/steadyRecall.vue b/src/views/govern/monitorRecall/steadyRecall.vue
index 7901e9d..538b943 100644
--- a/src/views/govern/monitorRecall/steadyRecall.vue
+++ b/src/views/govern/monitorRecall/steadyRecall.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="view" style="height: 100%">
-        <TableHeader datePicker ref="headerRef">
+    <div class="view">
+        <TableHeader datePicker ref="headerRef" :showReset="false" showExport>
             <template v-slot:operation>
                 <el-button type="primary" :icon="Setting" @click="exportTab">补召</el-button>
             </template>
@@ -29,8 +29,9 @@ const headerRef = ref()
 
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/portableOfflLog/queryMainLogPage',
-    publicHeight: 0,
+    publicHeight: 80,
     method: 'POST',
+    exportName: '稳态补召',
     column: [
         {
             title: '序号',
@@ -69,7 +70,8 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '100',
             render: 'buttons',
             buttons: [
diff --git a/src/views/govern/sensitiveLoadMange/index.vue b/src/views/govern/sensitiveLoadMange/index.vue
index f9cf68a..00d047e 100644
--- a/src/views/govern/sensitiveLoadMange/index.vue
+++ b/src/views/govern/sensitiveLoadMange/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader :showReset="false">
+        <TableHeader :showReset="false" showExport>
             <template #operation>
                 <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增</el-button>
             </template>