diff --git a/src/api/harmonic-boot/cockpit/cockpit.ts b/src/api/harmonic-boot/cockpit/cockpit.ts
new file mode 100644
index 00000000..c62a8032
--- /dev/null
+++ b/src/api/harmonic-boot/cockpit/cockpit.ts
@@ -0,0 +1,119 @@
+import request from '@/utils/request'
+
+// 主要监测点列表查询>>分页
+export function mainLineList(data: any) {
+    return request({
+        url: '/harmonic-boot/mainLine/list',
+        method: 'post',
+        data: data
+    })
+}
+// 主要监测点指标越限详情
+export function statLimitRateDetails(data: any) {
+    return request({
+        url: '/harmonic-boot/mainLine/statLimitRateDetails',
+        method: 'post',
+        data: data
+    })
+}
+
+// 查询监测点列表=全部>>不分页
+export function cslineList(data: any) {
+    return request({
+        url: '/cs-device-boot/csline/list',
+        method: 'post',
+        data: data
+    })
+}
+
+// 监测点详情 趋势图数据
+export function trendData(data: any) {
+    return request({
+        url: '/cs-device-boot/csGroup/trendData',
+        method: 'post',
+        data: data
+    })
+}
+
+// 每日越限占比统计
+export function totalLimitStatisticsDetails(data: any) {
+    return request({
+        url: '/harmonic-boot/totalLimitStatistics/details',
+        method: 'post',
+        data: data
+    })
+}
+
+// 总体指标越限统计列表
+export function totalLimitStatisticsList(data: any) {
+    return request({
+        url: '/harmonic-boot/totalLimitStatistics/list',
+        method: 'post',
+        data: data
+    })
+}
+
+// 总体指标越限统计数据
+export function totalLimitStatisticsData(data: any) {
+    return request({
+        url: '/harmonic-boot/totalLimitStatistics/data',
+        method: 'post',
+        data: data
+    })
+}
+
+// 指标越限程度数据
+export function limitExtentData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitExtentData',
+        method: 'post',
+        data: data
+    })
+}
+// 指标日趋势图数据
+export function limitExtentDayData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitExtentDayData',
+        method: 'post',
+        data: data
+    })
+}
+
+// 指标越限明细日历数据
+export function limitCalendarData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitCalendarData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标拟合图数据
+export function fittingData(data: any) {
+    return request({
+        url: '/cs-device-boot/csGroup/fittingData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标越限时间概率分布
+export function limitTimeProbabilityData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitTimeProbabilityData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标越限程度概率分布
+export function limitProbabilityData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitProbabilityData',
+        method: 'post',
+        data: data
+    })
+}
+
+
+
diff --git a/src/api/system-boot/csstatisticalset.ts b/src/api/system-boot/csstatisticalset.ts
index 259ab59a..7ddae609 100644
--- a/src/api/system-boot/csstatisticalset.ts
+++ b/src/api/system-boot/csstatisticalset.ts
@@ -1,70 +1,87 @@
-import createAxios from '@/utils/request'
-// 查询指标
-export const queryStatistical = (id: string) => {
-    let form = new FormData()
-    form.append('id', id)
-    return createAxios({
-        url: '/system-boot/csstatisticalset/queryStatistical',
-        method: 'post',
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-        },
-        data: form
-    })
-}
-
-// 绑定指标
-export const addStatistical = (params: any) => {
-    return createAxios({
-        url: '/system-boot/csstatisticalset/addStatistical',
-        method: 'post',
-        data: params
-    })
-}
-// 新增驾驶舱页面
-export const addDashboard = (data: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/addDashboard',
-        method: 'post',
-        data: data
-    })
-}
-// 修改驾驶舱页面
-export const updateDashboard = (data: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/updateDashboard',
-        method: 'post',
-        data: data
-    })
-}
-// 删除驾驶舱页面
-export const deleteDashboard = (params: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/deleteDashboard',
-        method: 'post',
-        params
-    })
-}
-// 激活的驾驶舱页面
-export const activatePage = (params: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/activatePage',
-        method: 'post',
-        params
-    })
-}
-// 查询激活的驾驶舱页面
-export const queryActivatePage = () => {
-    return createAxios({
-        url: '/system-boot/dashboard/queryActivatePage',
-        method: 'post'
-    })
-}
-// 更具id 查询驾驶舱页面
-export const queryById = (params: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/queryById',
-        method: 'post',
-        params
-    })
-}
+import createAxios from '@/utils/request'
+// 查询指标
+export const queryStatistical = (id:string) => {
+    let form = new FormData()
+    form.append('id', id)
+    return createAxios({
+        url: '/system-boot/csstatisticalset/queryStatistical',
+        method: 'post',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        },
+        data: form
+    })
+}
+
+// 绑定指标
+export const addStatistical = (params:any) => {
+    return createAxios({
+        url: '/system-boot/csstatisticalset/addStatistical',
+        method: 'post',
+        data: params
+    })
+}
+
+// 新增驾驶舱页面
+export const addDashboard = (data: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/addDashboard',
+        method: 'post',
+        data: data
+    })
+}
+// 修改驾驶舱页面
+export const updateDashboard = (data: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/updateDashboard',
+        method: 'post',
+        data: data
+    })
+}
+// 删除驾驶舱页面
+export const deleteDashboard = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/deleteDashboard',
+        method: 'post',
+        params
+    })
+}
+// 激活的驾驶舱页面
+export const activatePage = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/activatePage',
+        method: 'post',
+        params
+    })
+}
+// 查询激活的驾驶舱页面
+export const queryActivatePage = () => {
+    return createAxios({
+        url: '/system-boot/dashboard/queryActivatePage',
+        method: 'post'
+    })
+}
+// 更具id 查询驾驶舱页面
+export const queryById = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/queryById',
+        method: 'post',
+        params
+    })
+}
+// 更具id 查询驾驶舱页面
+export const queryByPagePath = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/queryByPagePath',
+        method: 'post',
+        params
+    })
+}
+// 根据用户id查询用户驾驶舱
+export const getDashboardPageByUserId = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/getDashboardPageByUserId',
+        method: 'post',
+        params
+    })
+}
diff --git a/src/assets/img/amplify.png b/src/assets/img/amplify.png
new file mode 100644
index 00000000..b9fb4497
Binary files /dev/null and b/src/assets/img/amplify.png differ
diff --git a/src/assets/img/reduce.png b/src/assets/img/reduce.png
new file mode 100644
index 00000000..de9c23b0
Binary files /dev/null and b/src/assets/img/reduce.png differ
diff --git a/src/assets/img/view.vue b/src/assets/img/view.vue
new file mode 100644
index 00000000..60059d27
--- /dev/null
+++ b/src/assets/img/view.vue
@@ -0,0 +1,295 @@
+<template>
+    <div class="default-main">
+        <!-- <div class=" layoutHeader">
+            <div class="title">{{title}}</div>
+            <back-component />
+        </div> -->
+        <TableHeader :showSearch="false">
+            <template v-slot:select>
+                <el-form-item label="日期">
+                    <DatePicker ref="datePickerRef" :nextFlag="false" :theCurrentTime="true"></DatePicker>
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <back-component />
+            </template>
+        </TableHeader>
+        <GridLayout
+            v-model:layout="layout"
+            :row-height="rowHeight"
+            :is-resizable="false"
+            :is-draggable="false"
+            :responsive="false"
+            :vertical-compact="false"
+            prevent-collision
+            :col-num="12"
+        >
+            <template #item="{ item }">
+                <div class="box">
+                    <div class="title">
+                        <div style="display: flex; align-items: center">
+                            <Icon class="HelpFilled" :name="item.icon" />
+                            {{ item.name }}
+                        </div>
+                        <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
+                        <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
+                    </div>
+                    <div>
+                        <component
+                            :is="item.component"
+                            v-if="item.component"
+                            class="pd10"
+                            :key="key"
+                            :timeValue="datePickerRef.timeValue"
+                            :height="rowHeight * item.h - seRowHeight(item.h) + 'px'"
+                            :width="rowWidth * item.w - 30 + 'px'"
+                            :timeKey="item.timeKey"
+                        />
+                        <div v-else class="pd10">组件加载失败...</div>
+                    </div>
+                </div>
+            </template>
+        </GridLayout>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, markRaw, onUnmounted, defineAsyncComponent, type Component } from 'vue'
+import { GridLayout } from 'grid-layout-plus'
+import { useDebounceFn } from '@vueuse/core'
+import { useRouter } from 'vue-router'
+import TableHeader from '@/components/table/header/index.vue'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import BackComponent from '@/components/icon/back/index.vue'
+import { queryById } from '@/api/system-boot/csstatisticalset'
+import { HelpFilled, FullScreen } from '@element-plus/icons-vue'
+import { useRoute } from 'vue-router'
+// defineOptions({
+//     name: 'cockpit/view'
+// })
+const { query } = useRoute()
+// 定义类型
+interface LayoutItem {
+    x: number
+    y: number
+    w: number
+    h: number
+    i: string | number
+    name: string
+    path: string
+    component?: Component | string
+    loading?: boolean
+    error?: any
+}
+const datePickerRef = ref()
+const title = ref('')
+const key = ref(0)
+const img = new URL(`@/assets/img/amplify.png`, import.meta.url)
+const img1 = new URL(`@/assets/img/reduce.png`, import.meta.url)
+// 响应式数据
+const rowHeight = ref(0)
+const rowWidth = ref(0)
+const layout: any = ref<LayoutItem[]>([
+    // {
+    //     x: 4,
+    //     y: 0,
+    //     w: 4,
+    //     h: 2,
+    //     i: '1',
+    //     name: '',
+    //     path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
+    // },
+])
+const layoutCopy = ref<LayoutItem[]>([])
+const flag = ref(true)
+// 组件映射
+const componentMap = reactive(new Map<string, Component | string>())
+
+// 获取主内容区域高度
+const getMainHeight = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetHeight || 0) - 70
+}
+// 获取主内容区域高度
+const getMainWidth = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetWidth || 0) - 20
+}
+
+// 初始化行高
+const initRowHeight = () => {
+    rowHeight.value = Math.max(0, (getMainHeight() - 72) / 6)
+    rowWidth.value = Math.max(0, getMainWidth() / 12)
+}
+
+// 动态注册组件
+const registerComponent = (path: string): Component | string | null => {
+    if (!path) return null
+
+    const cacheKey = path
+
+    // 使用缓存的组件
+    if (componentMap.has(cacheKey)) {
+        return componentMap.get(cacheKey)!
+    }
+
+    try {
+        // 动态导入组件
+        const modules = import.meta.glob('@/**/*.vue')
+        if (!modules[path]) {
+            console.error(`组件加载失败: ${path}`)
+            return null
+        }
+
+        const AsyncComponent = defineAsyncComponent({
+            loader: modules[path],
+            loadingComponent: () => h('div', '加载中...'),
+            errorComponent: ({ error }) => h('div', `加载错误: ${error.message}`),
+            delay: 200,
+            timeout: 10000
+        })
+
+        // 保存到映射中
+        componentMap.set(cacheKey, markRaw(AsyncComponent))
+        return AsyncComponent
+    } catch (error) {
+        console.error('注册组件失败:', error)
+        return null
+    }
+}
+// 缩放
+const zoom = (value: any) => {
+    if (flag.value) {
+        layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }]
+    } else {
+        layout.value = layoutCopy.value.map((item, index) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+    }
+    flag.value = !flag.value
+    key.value += 1
+}
+// 获取布局数据
+const fetchLayoutData = async () => {
+    try {
+        const { data } = await queryById({ id: query.id })
+        title.value = data.pageName + '_预览'
+        const parsedLayout = JSON.parse(data.containerConfig || '[]') as LayoutItem[]
+        // 处理布局数据
+        layout.value = parsedLayout.map((item, index) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+        layoutCopy.value = JSON.parse(JSON.stringify(layout.value))
+    } catch (error) {
+        console.error('获取布局数据失败:', error)
+        // 可以添加错误提示逻辑
+    }
+}
+// 计算组件高度
+const seRowHeight = (value: any) => {
+    if (value == 6) return 0
+    if (value == 5) return 12
+    if (value == 4) return 20
+    if (value == 3) return 30
+    if (value == 2) return 40
+    if (value == 1) return 50
+    return 0
+}
+
+// 窗口大小变化处理 - 使用防抖
+const handleResize = useDebounceFn(() => {
+    initRowHeight()
+    key.value += 1
+}, 200)
+
+// 生命周期钩子
+onMounted(() => {
+    initRowHeight()
+    fetchLayoutData()
+
+    // 添加窗口大小变化监听器
+    window.addEventListener('resize', handleResize)
+})
+
+onUnmounted(() => {
+    // 移除监听器防止内存泄漏
+    window.removeEventListener('resize', handleResize)
+})
+</script>
+
+<style lang="scss" scoped>
+.vgl-layout {
+    background-color: #f8f9fa;
+    border-radius: 4px;
+    overflow: hidden;
+}
+
+:deep(.vgl-item:not(.vgl-item--placeholder)) {
+    background-color: #ffffff;
+    border-radius: 4px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+    transition: all 0.3s ease;
+}
+
+:deep(.vgl-item:hover:not(.vgl-item--placeholder)) {
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.12);
+}
+
+:deep(.vgl-item--static) {
+    background-color: #f0f2f5;
+}
+
+.text {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    color: #606266;
+}
+
+:deep(.vgl-item) {
+    overflow: hidden;
+}
+
+.box {
+    overflow: hidden;
+
+    .title {
+        border-bottom: 1px solid #000;
+        font-size: 14px;
+        height: 30px;
+        font-weight: 600;
+        padding: 0px 10px;
+        color: #fff;
+        background-color: var(--el-color-primary);
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .HelpFilled {
+        height: 16px;
+        width: 16px;
+        color: #fff !important;
+        margin-right: 5px;
+    }
+}
+
+.layoutHeader {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 20px;
+    font-size: 16px;
+
+    .title {
+        font-weight: 600;
+    }
+}
+</style>
diff --git a/src/components/cockpit/dataCleaning/index.vue b/src/components/cockpit/dataCleaning/index.vue
new file mode 100644
index 00000000..24d6087a
--- /dev/null
+++ b/src/components/cockpit/dataCleaning/index.vue
@@ -0,0 +1,512 @@
+<template>
+    <div>
+        <!--异常数据清洗 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">监测点统计</div>
+
+                <div>
+                    <div class="statistics">
+                        <div class="divBox">
+                            <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                            <span class="divBox_title">监测点总数</span>
+                            <span class="divBox_num" style="color: #57bc6e">
+                                {{ monitoringPoints.runNum }}
+                            </span>
+                        </div>
+                        <div class="divBox mt10">
+                            <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
+                            <span class="divBox_title">异常测点数</span>
+                            <span class="divBox_num" style="color: #ff6600">
+                                {{ monitoringPoints.abnormalNum }}
+                            </span>
+                        </div>
+                    </div>
+                    <div class="echartTitle">
+                        <div class="title">异常占比</div>
+                        <div>
+                            {{
+                                isNaN((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 100)
+                                    ? 0
+                                    : ((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 100).toFixed(2)
+                            }}%
+                        </div>
+                    </div>
+                    <div style="height: 30px">
+                        <MyEchart :options="percentage"></MyEchart>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">异常指标统计</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented
+                        style="height: 100%"
+                        v-model="segmented"
+                        :options="segmentedList"
+                        block
+                        @change="change"
+                    >
+                        <template #default="scope">
+                            <div>
+                                <div
+                                    class="segmentedIcon"
+                                    :style="{
+                                        backgroundColor:
+                                            scope.item.num > 0 ? '#FF9100' : scope.item.num > 99 ? '#ff0000' : '#007D7B'
+                                    }"
+                                >
+                                    {{ scope.item.num > 99 ? '99+' : scope.item.num }}
+                                </div>
+                                <div>{{ scope.item.label }}</div>
+                            </div>
+                        </template>
+                    </el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 170px; text-align: left">指标名称</span>
+                    <span style="flex: 1">合理范围</span>
+                    <span style="width: 90px">异常测点数</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal.filter(item => item.remark == segmented)" class="abnormal mb10">
+                        <span style="width: 170px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.ids.length > 0 ? '#FF9100' : '' }"></div>
+                            {{ o.targetName }}
+                        </span>
+                        <span style="flex: 1; text-align: center">
+                            <!-- 合理范围： -->
+                            <span style="color: #388e3c" class="text">{{ o.rangeDesc }}</span>
+                        </span>
+                        <span style="width: 90px; text-align: center">
+                            <span style="color: #388e3c" :class="` ${o.ids.length > 0 ? 'text-red' : ''}`" class="text">
+                                {{ o.ids.length }}
+                            </span>
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+const TableHeaderRef = ref()
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0
+})
+const segmented = ref('base')
+const percentage = ref({})
+const segmentedList = ref([
+    {
+        label: '基础指标',
+        value: 'base',
+        num: 0
+    },
+    {
+        label: '稳态指标',
+        value: 'harmonic',
+        num: 0
+    },
+    {
+        label: '暂态指标',
+        value: 'event',
+        num: 0
+    }
+])
+const abnormal: any = ref([])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/dataVerify/getMonitorVerifyData',
+    method: 'POST',
+    showPage: false,
+    column: [],
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+    },
+
+    loadCallback: () => {
+        segmentedList.value[0].num = 0
+        segmentedList.value[1].num = 0
+        segmentedList.value[2].num = 0
+        monitoringPoints.value.runNum = tableStore.table.data.runNum //总数
+        monitoringPoints.value.abnormalNum = tableStore.table.data.abnormalNum //异常测点数
+        abnormal.value = tableStore.table.data.targetList
+        abnormal.value.forEach(item => {
+            const { remark, ids } = item
+            if (remark === 'base') segmentedList.value[0].num += ids.length
+            else if (remark === 'harmonic') segmentedList.value[1].num += ids.length
+            else if (remark === 'event') segmentedList.value[2].num += ids.length
+        })
+
+        echart()
+    }
+})
+tableStore.table.params.deptId = dictData.state.area[0].id
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '异常总数',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '异常占比',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [
+                        (monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100 == 0
+                            ? ''
+                            : ((monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100).toFixed(2)
+                    ],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#FF9100' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+const change = () => {
+    tableStore.table.loading = true
+    setTimeout(() => {
+        tableStore.table.loading = false
+    }, 500)
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.monitoringPoints {
+    display: flex;
+    .statistics {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        .divBox {
+            width: 100%;
+            height: 70px;
+            padding: 10px;
+            display: flex;
+
+            .iconfont {
+                font-size: 40px;
+                margin-right: 5px;
+            }
+            .divBox_title {
+                font-weight: 550;
+            }
+            .divBox_num {
+                font-size: 20px;
+                font-weight: 550;
+                margin-left: auto;
+                font-family: AlimamaDongFangDaKai;
+            }
+            align-items: center;
+            // text-align: center;
+            border-radius: 5px;
+            &:nth-child(1) {
+                background-color: #eef8f0;
+            }
+            &:nth-child(2) {
+                background-color: #fff6ed;
+            }
+            &:nth-child(3) {
+                background-color: #e5f8f6;
+            }
+        }
+    }
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    right: calc(50% - 44px);
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+</style>
diff --git a/src/components/cockpit/integrity/index.vue b/src/components/cockpit/integrity/index.vue
new file mode 100644
index 00000000..26a0ce80
--- /dev/null
+++ b/src/components/cockpit/integrity/index.vue
@@ -0,0 +1,491 @@
+<template>
+    <div>
+        <!--监测点数据完整性 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">监测点统计</div>
+
+                <div>
+                    <div class="statistics">
+                        <div class="divBox">
+                            <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                            <span class="divBox_title">监测点总数</span>
+                            <span class="divBox_num" style="color: #57bc6e">
+                                {{ monitoringPoints.runNum }}
+                            </span>
+                        </div>
+                        <div class="divBox mt10">
+                            <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
+                            <span class="divBox_title">低于90%监测点数</span>
+                            <span class="divBox_num" style="color: #ff6600">
+                                {{ monitoringPoints.abnormalNum }}
+                            </span>
+                        </div>
+                    </div>
+                    <div class="echartTitle">
+                        <div class="title">总的数据完整性</div>
+                        <div>
+                           <div>{{ monitoringPoints.totalOnlineRate }}%</div>
+                        </div>
+                    </div>
+                    <div style="height: 30px">
+                        <MyEchart :options="percentage"></MyEchart>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">完整性统计</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented
+                        style="height: 100%"
+                        v-model="segmented"
+                        :props="props"
+                        :options="segmentedList"
+                        block
+                        @change="tableStore.index()"
+                    ></el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 110px; text-align: left">
+                        {{
+                            segmented == 'Power_Network'
+                                ? '区域'
+                                : segmented == 'Manufacturer'
+                                ? '终端厂家'
+                                : '电网标志'
+                        }}
+                    </span>
+                    <span style="width: 90px">监测点总数</span>
+                    <span style="flex: 1">低于90%监测点数</span>
+                    <span style="width: 80px">完整性(%)</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal" class="abnormal mb10">
+                        <span style="width: 110px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                            {{ o.citName }}
+                        </span>
+                        <!-- 监测点总数 -->
+                        <span style="width: 90px; color: #388e3c" class="text">
+                            {{ o.citTotalNum }}
+                        </span>
+                        <!-- 低于90%监测点数 -->
+                        <span style="flex: 1; color: #ff9100" class="text">
+                            {{ o.citBelowNum }}
+                        </span>
+                        <span
+                            style="width: 80px; color: #388e3c"
+                            :class="` ${o.citTotalOnlineRate < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.citTotalOnlineRate }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const segmented = ref('Power_Network')
+const percentage = ref({})
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const abnormal: any = ref([])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/LineIntegrityData/data',
+    method: 'POST',
+
+    showPage: false,
+
+    column: [],
+
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+
+    loadCallback: () => {
+        monitoringPoints.value.runNum = tableStore.table.data.totalNum
+        monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
+        monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
+        abnormal.value = tableStore.table.data.citDetailList
+    }
+})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '异常总数',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '异常占比',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [
+                        (monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100 == 0
+                            ? ''
+                            : ((monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100).toFixed(2)
+                    ],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#FF9100' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    setTimeout(() => {
+        echart()
+    }, 100)
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.monitoringPoints {
+    display: flex;
+    .statistics {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        .divBox {
+            width: 100%;
+            height: 70px;
+            padding: 10px;
+            display: flex;
+
+            .iconfont {
+                font-size: 40px;
+                margin-right: 5px;
+            }
+            .divBox_title {
+                font-weight: 550;
+            }
+            .divBox_num {
+                font-size: 20px;
+                font-weight: 550;
+                margin-left: auto;
+                font-family: AlimamaDongFangDaKai;
+            }
+            align-items: center;
+            // text-align: center;
+            border-radius: 5px;
+            &:nth-child(1) {
+                background-color: #eef8f0;
+            }
+            &:nth-child(2) {
+                background-color: #fff6ed;
+            }
+            &:nth-child(3) {
+                background-color: #e5f8f6;
+            }
+        }
+    }
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+</style>
diff --git a/src/components/cockpit/onlineRate/index.vue b/src/components/cockpit/onlineRate/index.vue
new file mode 100644
index 00000000..a516e95d
--- /dev/null
+++ b/src/components/cockpit/onlineRate/index.vue
@@ -0,0 +1,489 @@
+<template>
+    <div>
+        <!--终端在线率 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">终端统计</div>
+
+                <div>
+                    <div class="statistics">
+                        <div class="divBox">
+                            <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                            <span class="divBox_title">终端总数</span>
+                            <span class="divBox_num" style="color: #57bc6e">
+                                {{ monitoringPoints.runNum }}
+                            </span>
+                        </div>
+                        <div class="divBox mt10">
+                            <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
+                            <span class="divBox_title">低于90%终端数</span>
+                            <span class="divBox_num" style="color: #ff6600">
+                                {{ monitoringPoints.abnormalNum }}
+                            </span>
+                        </div>
+                    </div>
+                    <div class="echartTitle">
+                        <div class="title">总的数据在线率</div>
+                        <div>{{ monitoringPoints.totalOnlineRate }}%</div>
+                    </div>
+                    <div style="height: 30px">
+                        <MyEchart :options="percentage"></MyEchart>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">在线率统计</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented
+                        style="height: 100%"
+                        v-model="segmented"
+                        :props="props"
+                        :options="segmentedList"
+                        block
+                        @change="tableStore.index()"
+                    ></el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 110px; text-align: left">
+                        {{
+                            segmented == 'Power_Network'
+                                ? '区域'
+                                : segmented == 'Manufacturer'
+                                ? '终端厂家'
+                                : '电网标志'
+                        }}
+                    </span>
+                    <span style="width: 90px">终端总数</span>
+                    <span style="flex: 1">低于90%终端数</span>
+                    <span style="width: 80px">在线率(%)</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal" class="abnormal mb10">
+                        <span style="width: 110px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                            {{ o.citName }}
+                        </span>
+                        <!-- 终端总数 -->
+                        <span style="width: 90px; color: #388e3c" class="text">
+                            {{ o.citTotalNum }}
+                        </span>
+                        <!-- 低于90%终端数 -->
+                        <span style="flex: 1; color: #ff9100" class="text">
+                            {{ o.citBelowNum }}
+                        </span>
+                        <span
+                            style="width: 80px; color: #388e3c"
+                            :class="` ${o.citTotalOnlineRate < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.citTotalOnlineRate }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const segmented = ref('Power_Network')
+const percentage = ref({})
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const abnormal: any = ref([])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/onLineRate/deviceOnlineRateInfo',
+    method: 'POST',
+
+    showPage: false,
+
+    column: [],
+
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+
+    loadCallback: () => {
+        monitoringPoints.value.runNum = tableStore.table.data.totalNum
+        monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
+        monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
+        abnormal.value = tableStore.table.data.citDetailList
+    }
+})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '异常总数',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '异常占比',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [
+                        (monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100 == 0
+                            ? ''
+                            : ((monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100).toFixed(2)
+                    ],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#FF9100' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    setTimeout(() => {
+        echart()
+    }, 100)
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.monitoringPoints {
+    display: flex;
+    .statistics {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        .divBox {
+            width: 100%;
+            height: 70px;
+            padding: 10px;
+            display: flex;
+
+            .iconfont {
+                font-size: 40px;
+                margin-right: 5px;
+            }
+            .divBox_title {
+                font-weight: 550;
+            }
+            .divBox_num {
+                font-size: 20px;
+                font-weight: 550;
+                margin-left: auto;
+                font-family: AlimamaDongFangDaKai;
+            }
+            align-items: center;
+            // text-align: center;
+            border-radius: 5px;
+            &:nth-child(1) {
+                background-color: #eef8f0;
+            }
+            &:nth-child(2) {
+                background-color: #fff6ed;
+            }
+            &:nth-child(3) {
+                background-color: #e5f8f6;
+            }
+        }
+    }
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+</style>
diff --git a/src/components/cockpit/terminalEvaluation/index.vue b/src/components/cockpit/terminalEvaluation/index.vue
new file mode 100644
index 00000000..71617a26
--- /dev/null
+++ b/src/components/cockpit/terminalEvaluation/index.vue
@@ -0,0 +1,430 @@
+<template>
+    <div>
+        <!--监测点数据完整性 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">终端统计</div>
+                <div style="height: 135px" class="box1">
+                    <div class="boxDiv hexagon">
+                        <div style="color: #fff">{{ statisticsList.allNum }}</div>
+                        <div class="mt10 divBot">总数</div>
+                    </div>
+                    <div class="boxDiv hexagon hexagon1">
+                        <div style="color: #fff">{{ statisticsList.runNum }}</div>
+                        <div class="mt10 divBot">在运</div>
+                    </div>
+                </div>
+                <div style="height: 135px" class="box1">
+                    <div class="boxDiv hexagon hexagon2">
+                        <div style="color: #fff">{{ statisticsList.checkNum }}</div>
+                        <div class="mt10 divBot">检修</div>
+                    </div>
+                    <div class="boxDiv hexagon hexagon3">
+                        <div style="color: #fff">{{ statisticsList.stopRunNum }}</div>
+                        <div class="mt10 divBot">停运</div>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">完整性统计</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented
+                        style="height: 100%"
+                        v-model="segmented"
+                        :props="props"
+                        :options="segmentedList"
+                        block
+                        @change="tableStore.index()"
+                    ></el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 110px; text-align: left">
+                        {{
+                            segmented == 'Power_Network'
+                                ? '区域'
+                                : segmented == 'Manufacturer'
+                                ? '终端厂家'
+                                : '电网标志'
+                        }}
+                    </span>
+                    <span style="width: 90px">终端总数</span>
+                    <span style="flex: 1">完整性(%)</span>
+                    <span style="flex: 1">在线率(%)</span>
+                    <span style="flex: 1">合格率(%)</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal" class="abnormal mb10">
+                        <span style="width: 110px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                            {{ o.name }}
+                        </span>
+                        <!-- 终端总数 -->
+                        <span style="width: 90px; color: #388e3c" class="text">
+                            {{ o.count }}
+                        </span>
+                        <!--  -->
+                        <sp
+                            style="flex: 1; color: #ff9100"
+                            class="text"
+                            :class="` ${o.integrity < 90 ? 'text-red' : ''}`"
+                        >
+                            {{ o.integrity }}
+                        </sp>
+                        <span
+                            style="flex: 1; color: #388e3c"
+                            :class="` ${o.online < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.online }}
+                        </span>
+                        <span
+                            style="flex: 1; color: #388e3c"
+                            :class="` ${o.qualified < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.qualified }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const segmented = ref('Power_Network')
+const percentage = ref({})
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const statisticsList: any = ref({
+    allNum: 0,
+    runNum: 0,
+    checkNum: 0,
+    stopRunNum: 0
+})
+const abnormal: any = ref([])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+const totalData = ref([])
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/deviceRunEvaluate/getRunEvaluateInfo',
+    method: 'POST',
+
+    showPage: false,
+
+    column: [],
+
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+
+    loadCallback: () => {
+        totalData.value = Array.from(
+            tableStore.table.data
+                .map((item: any) => item.list)
+                .flat()
+                .reduce((map: any, item: any) => {
+                    if (!map.has(item.id)) {
+                        map.set(item.id, item)
+                    }
+                    return map
+                }, new Map())
+                .values()
+        )
+
+        // tableStore.table.data
+        statisticsList.value.allNum = totalData.value.length
+        statisticsList.value.runNum = tableStore.table.data.allNum
+        statisticsList.value.checkNum = tableStore.table.data.allNum
+        statisticsList.value.stopRunNum = tableStore.table.data.allNum
+
+        abnormal.value = tableStore.table.data
+    }
+})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.monitoringPoints {
+    display: flex;
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+.box1 {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    .boxDiv {
+        // flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+        margin: 0 5px;
+
+        div:nth-child(1) {
+            position: absolute;
+            font-size: 30px;
+            top: -10px;
+            font-weight: 700;
+        }
+        .divBot {
+            font-size: 16px;
+            position: absolute;
+            top: 20px;
+        }
+        color: #fff;
+    }
+}
+.hexagon {
+    position: relative;
+    width: 100px;
+    height: 55px;
+    background-color: #19a094;
+    margin: 50px auto;
+    &::before {
+        border-bottom: 27.5px solid #19a094;
+    }
+    &::after {
+        border-top: 27.5px solid #19a094;
+    }
+}
+
+.hexagon::before,
+.hexagon::after {
+    content: '';
+    position: absolute;
+    width: 0;
+    border-left: 50px solid transparent;
+    border-right: 50px solid transparent;
+}
+
+.hexagon::before {
+    bottom: 98%;
+}
+
+.hexagon::after {
+    top: 98%;
+}
+.hexagon1 {
+    background-color: #2e8b57;
+    &::before {
+        border-bottom: 27.5px solid #2e8b57;
+    }
+    &::after {
+        border-top: 27.5px solid #2e8b57;
+    }
+}
+.hexagon2 {
+    background-color: #ffbf00;
+    &::before {
+        border-bottom: 27.5px solid #ffbf00;
+    }
+    &::after {
+        border-top: 27.5px solid #ffbf00;
+    }
+}
+.hexagon3 {
+    background-color: #a52a2a;
+    &::before {
+        border-bottom: 27.5px solid #a52a2a;
+    }
+    &::after {
+        border-top: 27.5px solid #a52a2a;
+    }
+}
+</style>
diff --git a/src/components/cockpit/terminalEvaluation/index1.vue b/src/components/cockpit/terminalEvaluation/index1.vue
new file mode 100644
index 00000000..7bfa07fd
--- /dev/null
+++ b/src/components/cockpit/terminalEvaluation/index1.vue
@@ -0,0 +1,450 @@
+<template>
+    <div>
+        <!--终端运行评价 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">终端统计</div>
+                <div style="height: 135px" class="box1">
+                    <div class="boxDiv hexagon">
+                        <div style="color: #fff">100</div>
+                        <div class="mt10 divBot">总数</div>
+                    </div>
+                    <div class="boxDiv hexagon hexagon1">
+                        <div style="color: #fff">50</div>
+                        <div class="mt10 divBot">在运</div>
+                    </div>
+                </div>
+                <div style="height: 135px" class="box1">
+                    <div class="boxDiv hexagon hexagon2">
+                        <div style="color: #fff">25</div>
+                        <div class="mt10 divBot">检修</div>
+                    </div>
+                    <div class="boxDiv hexagon hexagon3">
+                        <div style="color: #fff">25</div>
+                        <div class="mt10 divBot">停运</div>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">终端运行评价</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented style="height: 100%" v-model="segmented" :options="segmentedList" block>
+                        <template #default="scope">
+                            <div>
+                                <div>{{ typeof scope.item === 'object' ? scope.item.label : scope.item }}</div>
+                            </div>
+                        </template>
+                    </el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 110px; text-align: left">
+                        {{ segmented == 0 ? '区域' : segmented == 1 ? '终端厂家' : '电网标志' }}
+                    </span>
+                    <span style="flex: 1">在运终端数</span>
+                    <span style="width: 80px">评价</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal" class="abnormal mb10">
+                        <span style="width: 110px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.integrity < 90 ? '#FF9100' : '' }"></div>
+                            {{ o.targetName }}
+                        </span>
+
+                        <!-- 在运终端数 -->
+                        <span style="flex: 1; color: #388e3c" class="text">
+                            {{ o.rangeDesc }}
+                        </span>
+                        <span
+                            style="width: 80px; color: #388e3c"
+                            :class="` ${o.integrity < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.integrity }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const monitoringPoints = ref({
+    runNum: 110,
+    abnormalNum: 10
+})
+const segmented = ref(0)
+const percentage = ref({})
+const segmentedList = ref([
+    {
+        label: '区域',
+        value: 0,
+        num: 0
+    },
+    {
+        label: '终端厂家',
+        value: 1,
+        num: 0
+    },
+    {
+        label: '电网标志',
+        value: 2,
+        num: 0
+    }
+])
+const abnormal: any = ref([
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: 92
+    }
+])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const value = ref(new Date())
+
+const list = ref()
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/deviceRunEvaluate/getRunEvaluateInfo',
+    method: 'POST',
+
+    showPage: false,
+
+    column: [],
+
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+    },
+
+    loadCallback: () => {
+        list.value = tableStore.table.data
+    }
+})
+tableStore.table.params.deptId = dictData.state.area[0].id
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.monitoringPoints {
+    display: flex;
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+.box1 {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    .boxDiv {
+        // flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+        margin: 0 5px;
+
+        div:nth-child(1) {
+            position: absolute;
+            font-size: 30px;
+            top: -10px;
+            font-weight: 700;
+        }
+        .divBot {
+            font-size: 16px;
+            position: absolute;
+            top: 20px;
+        }
+        color: #fff;
+    }
+}
+.hexagon {
+    position: relative;
+    width: 100px;
+    height: 55px;
+    background-color: #19a094;
+    margin: 50px auto;
+    &::before {
+        border-bottom: 27.5px solid #19a094;
+    }
+    &::after {
+        border-top: 27.5px solid #19a094;
+    }
+}
+
+.hexagon::before,
+.hexagon::after {
+    content: '';
+    position: absolute;
+    width: 0;
+    border-left: 50px solid transparent;
+    border-right: 50px solid transparent;
+}
+
+.hexagon::before {
+    bottom: 98%;
+}
+
+.hexagon::after {
+    top: 98%;
+}
+.hexagon1 {
+    background-color: #2e8b57;
+    &::before {
+        border-bottom: 27.5px solid #2e8b57;
+    }
+    &::after {
+        border-top: 27.5px solid #2e8b57;
+    }
+}
+.hexagon2 {
+    background-color: #ffbf00;
+    &::before {
+        border-bottom: 27.5px solid #ffbf00;
+    }
+    &::after {
+        border-top: 27.5px solid #ffbf00;
+    }
+}
+.hexagon3 {
+    background-color: #a52a2a;
+    &::before {
+        border-bottom: 27.5px solid #a52a2a;
+    }
+    &::after {
+        border-top: 27.5px solid #a52a2a;
+    }
+}
+</style>
diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue
index bb54159b..7580b78f 100644
--- a/src/components/form/datePicker/index.vue
+++ b/src/components/form/datePicker/index.vue
@@ -1,563 +1,563 @@
-<template>
-    <div style="width: 540px">
-        <el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange">
-            <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-
-        <el-date-picker
-            v-model="timeValue"
-            type="daterange"
-            :disabled="disabledPicker"
-            :disabled-date="isFutureDate"
-            style="width: 220px; margin-right: 10px"
-            unlink-panels
-            :clearable="false"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            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>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { DArrowLeft, VideoPause, DArrowRight } from '@element-plus/icons-vue'
-import { ref, onMounted, nextTick, watch } from 'vue'
-
-interface Props {
-    nextFlag?: boolean
-    theCurrentTime?: boolean
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    nextFlag: false,
-    theCurrentTime: false
-})
-
-const interval = ref(3)
-const timeFlag = ref(1)
-const count = ref(0)
-const disabledPicker = ref(true)
-const timeValue = ref()
-const backDisabled = ref(false)
-const preDisabled = ref(true)
-const timeOptions: any = ref([
-    { label: '年份', value: 1 },
-    { label: '季度', value: 2 },
-    { label: '月份', value: 3 },
-    { label: '周', value: 4 },
-    { label: '自定义', value: 5 }
-])
-const shortcuts = [
-    {
-        text: '最近一周',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            return [start, end]
-        }
-    },
-    {
-        text: '最近一个月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            return [start, end]
-        }
-    },
-    {
-        text: '最近3个月',
-        value: () => {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            return [start, end]
-        }
-    }
-]
-const isFutureDate = time => {
-    return time && time > Date.now()
-}
-onMounted(() => {
-    timeChange(3)
-})
-// 选择时间范围
-const timeChange = (e: number) => {
-    backDisabled.value = false
-    preDisabled.value = props.nextFlag ? false : true
-    count.value = 0
-    if (e == 1) {
-        disabledPicker.value = true
-
-        timeValue.value = [setTime(1), setTime()]
-    } else if (e == 2) {
-        disabledPicker.value = true
-        timeValue.value = [setTime(2), setTime()]
-    } else if (e == 3) {
-        disabledPicker.value = true
-        timeValue.value = [setTime(3), setTime()]
-    } else if (e == 4) {
-        let year = parseInt(setTime().substring(0, 4))
-        let month = parseInt(setTime().substring(5, 7))
-        let date = parseInt(setTime().substring(8, 10))
-
-        var start = new Date(year, month - 1, date)
-        var dayOfWeek = start.getDay() == 0 ? 7 : start.getDay() - 1 // 如果为周日，则置为7天
-
-        disabledPicker.value = true
-        timeValue.value = [setTime(0, dayOfWeek), setTime(0, -6 + dayOfWeek)]
-    } else if (e == 5) {
-        disabledPicker.value = false
-        backDisabled.value = true
-        preDisabled.value = props.nextFlag ? false : true
-        timeValue.value = [setTime(), setTime()]
-    }
-    if (e == 1 || e == 2) {
-        timeFlag.value = 0
-    } else {
-        timeFlag.value = 1
-    }
-}
-
-// 当前
-const nowTime = () => {
-    console.log(interval.value, '000000000')
-    timeChange(interval.value)
-}
-// 上一个
-const preClick = () => {
-    preDisabled.value = false
-    let startTime = timeValue.value[0]
-    let endTime = timeValue.value[1]
-    let year = parseInt(startTime.substring(0, 4))
-    let month = parseInt(startTime.substring(5, 7))
-    let date = parseInt(startTime.substring(8, 10))
-    //按月
-    if (interval.value == 3) {
-        // 换年份
-        if (month == 1) {
-            year = year - 1
-            startTime = year + '-12-01'
-            endTime = year + '-12-31'
-        } else if (month <= 10) {
-            month = month - 1
-            startTime = year + '-0' + month + '-01'
-            let day = getDays(year, month)
-            endTime = year + '-0' + month + '-' + day
-        } else {
-            month = month - 1
-            startTime = year + '-' + month + '-01'
-            let day = getDays(year, month)
-            endTime = year + '-' + month + '-' + day
-        }
-        //按周
-    } else if (interval.value == 4) {
-        //根据开始时间推
-        let start = new Date(year, month - 1, date)
-        start.setDate(start.getDate() - 7)
-        startTime = formatTime(start)
-        var end = new Date(start)
-        end.setDate(start.getDate() + 6)
-        endTime = formatTime(end)
-        //按季度
-    } else if (interval.value == 2) {
-        // 换年份
-        if (month == 1) {
-            year = year - 1
-            startTime = year + '-10-01'
-            endTime = year + '-12-31'
-        } else {
-            // 还是本年
-            month = month - 3
-            startTime = year + '-0' + month + '-01'
-            month = month + 2
-            var day = getDays(year, month)
-            endTime = year + '-0' + month + '-' + day
-        }
-        //自定义
-    } else if (interval.value == 1) {
-        year = year - 1
-        startTime = year + '-01-01'
-        endTime = year + '-12-31'
-    }
-    timeValue.value = [startTime, endTime]
-
-    // 判断向后键的状态
-    // var temp = NowgetEndTime()
-    // timeStatus(temp, endTime)
-}
-//下一个
-const next = () => {
-    //向后
-    let startTime = timeValue.value[0]
-    let endTime = timeValue.value[1]
-    let year = parseInt(startTime.substring(0, 4))
-    let month = parseInt(startTime.substring(5, 7))
-    let date = parseInt(startTime.substring(8, 10))
-    var now = new Date()
-    // 获取当前年份
-    var presentY = now.getFullYear()
-    // 获取当前月份
-    var presentM = now.getMonth() + 1
-    // 获取当前日期
-    var presentD = now.getDate()
-    if (interval.value == 3) {
-        if (month == 12) {
-            year = year + 1
-
-            // 年份进位后，大于当前的年份，是不科学的
-            if (presentY < year && !props.nextFlag) {
-                startTime = presentY + '-12-01'
-                if (presentD < 10) {
-                    endTime = presentY + '-12' + '-0' + presentD
-                } else {
-                    endTime = presentY + '-12' + '-' + presentD
-                }
-                // 年份进位后，等于当前的年份
-            } else if (presentY == year) {
-                startTime = year + '-01-01'
-                if (presentM > 1) {
-                    endTime = year + '-01-31'
-                } else {
-                    if (presentD < 10) {
-                        endTime = year + '-01' + '-0' + presentD
-                    } else {
-                        endTime = year + '-01' + '-' + presentD
-                    }
-                }
-                // 年份进位后，依旧小于当前的年份
-            } else {
-                startTime = year + '-01-01'
-                endTime = year + '-01-31'
-            }
-        } else {
-            month = month + 1
-            // 年份等于当前年份
-            if (presentY == year) {
-                // 月份超过当前月份，是不科学的
-                if (month >= presentM && !props.nextFlag) {
-                    if (presentM < 10) {
-                        startTime = year + '-0' + presentM + '-01'
-                        if (presentD < 10) {
-                            endTime = year + '-0' + presentM + '-0' + presentD
-                        } else {
-                            endTime = year + '-0' + presentM + '-' + presentD
-                        }
-                    } else {
-                        startTime = year + '-' + presentM + '-01'
-                        if (presentD < 10) {
-                            endTime = year + '-' + presentM + '-0' + presentD
-                        } else {
-                            endTime = year + '-' + presentM + '-' + presentD
-                        }
-                    }
-                } else {
-                    if (month < 10) {
-                        startTime = year + '-0' + month + '-01'
-                        var day = getDays(year, month)
-                        endTime = year + '-0' + month + '-' + day
-                    } else {
-                        startTime = year + '-' + month + '-01'
-                        var day = getDays(year, month)
-                        endTime = year + '-' + month + '-' + day
-                    }
-                }
-                // 年份小于当前的年份
-            } else {
-                if (month < 10) {
-                    startTime = year + '-0' + month + '-01'
-                    var day = getDays(year, month)
-                    endTime = year + '-0' + month + '-' + day
-                } else {
-                    startTime = year + '-' + month + '-01'
-                    var day = getDays(year, month)
-                    endTime = year + '-' + month + '-' + day
-                }
-            }
-        }
-    } else if (interval.value == 2) {
-        // 前进需要年份进位
-        if (month == 10) {
-            year = year + 1
-            // 年份进位后大于当前年份是不科学的
-            if (year > presentY && !props.nextFlag) {
-                startTime = presentY + '-10-01'
-                if (presentD < 10) {
-                    endTime = year + '-' + presentM + '-0' + presentD
-                } else {
-                    endTime = year + '-' + presentM + '-' + presentD
-                }
-            } else if (year == presentY) {
-                startTime = year + '-01-01'
-                // 当前月份大约3月份
-                if (presentM > 3) {
-                    endTime = year + '-03-31'
-                } else {
-                    // 当前月份也在第一季度里
-                    if (presentD < 10) {
-                        endTime = year + '-0' + presentM + '-0' + presentD
-                    } else {
-                        endTime = year + '-0' + presentM + '-' + presentD
-                    }
-                }
-            } else {
-                startTime = year + '-01-01'
-                endTime = year + '-03-31'
-            }
-        } else {
-            month = month + 3
-            console.log('🚀 ~ next ~ presentM:', presentM, month)
-
-            // 季度进位后，超过当前月份是不科学的
-            if (year == presentY && !props.nextFlag) {
-                if (month >= presentM) {
-                    // 当季度进位后大于当前月，以当前月的时间显示季度
-                    if (presentM > 0 && presentM < 4) {
-                        // 第一季度
-                        startTime = year + '-01-01'
-                        if (presentD < 10) {
-                            endTime = year + '-0' + presentM + '-0' + presentD
-                        } else {
-                            endTime = year + '-0' + presentM + '-' + presentD
-                        }
-                    } else if (presentM > 3 && presentM < 7) {
-                        console.log(123123)
-                        // 第二季度
-                        startTime = year + '-04-01'
-                        if (presentD < 10) {
-                            endTime = year + '-0' + presentM + '-0' + presentD
-                        } else {
-                            endTime = year + '-0' + presentM + '-' + presentD
-                        }
-                    } else if (presentM > 6 && presentM < 10) {
-                        // 第三季度
-                        startTime = year + '-07-01'
-                        if (presentD < 10) {
-                            endTime = year + '-0' + presentM + '-0' + presentD
-                        } else {
-                            endTime = year + '-0' + presentM + '-' + presentD
-                        }
-                    } else {
-                        // 第四季度
-                        startTime = year + '-10-01'
-                        if (presentD < 10) {
-                            endTime = year + '-' + presentM + '-0' + presentD
-                        } else {
-                            endTime = year + '-' + presentM + '-' + presentD
-                        }
-                    }
-                } else {
-                    if (month == 10) {
-                        startTime = year + '-' + month + '-01'
-                    } else {
-                        startTime = year + '-0' + month + '-01'
-                    }
-                    month = month + 2
-                    if (month >= presentM) {
-                        endTime = NowgetEndTime()
-                    } else {
-                        var day = getDays(year, month)
-                        endTime = year + '-0' + month + '-' + day
-                    }
-                }
-            } else {
-                if (month == 10) {
-                    startTime = year + '-' + month + '-01'
-                    month = month + 2
-                    var day = getDays(year, month)
-                    endTime = year + '-' + month + '-' + day
-                } else {
-                    startTime = year + '-0' + month + '-01'
-                    month = month + 2
-                    var day = getDays(year, month)
-                    endTime = year + '-0' + month + '-' + day
-                }
-            }
-        }
-        console.log(startTime, endTime)
-    } else if (interval.value == 5) {
-    } else if (interval.value == 4) {
-        //根据开始时间推
-        var start = new Date(year, month - 1, date)
-        start.setDate(start.getDate() + 7)
-        startTime = formatTime(start)
-        var end = new Date(start)
-        end.setDate(start.getDate() + 6)
-        endTime = formatTime(end)
-    } else {
-        year = year + 1
-        // 年份进位后大于当前年份，是不科学的
-        if (year >= presentY && !props.nextFlag) {
-            startTime = presentY + '-01-01'
-            if (presentM < 10) {
-                if (presentD < 10) {
-                    endTime = presentY + '-0' + presentM + '-0' + presentD
-                } else {
-                    endTime = presentY + '-0' + presentM + '-' + presentD
-                }
-            } else {
-                if (presentD < 10) {
-                    endTime = presentY + '-' + presentM + '-0' + presentD
-                } else {
-                    endTime = presentY + '-' + presentM + '-' + presentD
-                }
-            }
-        } else {
-            startTime = year + '-01-01'
-            endTime = year + '-12-31'
-        }
-    }
-    if (!props.nextFlag) {
-        if (
-            new Date(endTime + ' 00:00:00').getTime() >=
-            new Date(window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd ') + ' 00:00:00').getTime()
-        ) {
-            preDisabled.value = props.nextFlag ? false : true
-        }
-    }
-
-    timeValue.value = [startTime, endTime]
-}
-
-const setTime = (flag = 0, e = 0) => {
-    let dd = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'dd')
-
-    let data = ''
-
-    if ((dd < 2 || dd == 0) && interval.value != 4 && !props.theCurrentTime) {
-        data = window.XEUtils.toDateString(new Date().getTime() - (e + dd) * 3600 * 1000 * 24, 'yyyy-MM-dd')
-    } else {
-        data = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'yyyy-MM-dd')
-    }
-
-    if (flag == 1) {
-        data = data.slice(0, 5) + '01-01'
-    } else if (flag == 2) {
-        let quarter = parseInt(data.slice(5, 7))
-        if (0 < quarter && quarter <= 3) {
-            data = data.slice(0, 5) + '01-01'
-        } else if (3 < quarter && quarter <= 6) {
-            data = data.slice(0, 5) + '04-01'
-        } else if (6 < quarter && quarter <= 9) {
-            data = data.slice(0, 5) + '07-01'
-        } else {
-            data = data.slice(0, 5) + '10-01'
-        }
-    }
-    if (flag == 3) {
-        data = data.slice(0, 8) + '01'
-    }
-
-    return data
-}
-
-// 获取月份的天数
-const getDays = (year: any, month: any) => {
-    let max = new Date(year, month, 0).getDate()
-    return max
-}
-// 时间格式化
-const formatTime = (time: any) => {
-    return (
-        time.getFullYear() +
-        '-' +
-        (time.getMonth() + 1 < 10 ? '0' : '') +
-        (time.getMonth() + 1) +
-        '-' +
-        (time.getDate() < 10 ? '0' : '') +
-        time.getDate()
-    )
-}
-const NowgetEndTime = () => {
-    let now = new Date()
-    let sep = '-'
-    let year = now.getFullYear()
-    let month: any = now.getMonth() + 1
-    if (month < 10) {
-        month = '0' + month
-    }
-    let date: any = now.getDate()
-    if (date < 10) {
-        date = '0' + date
-    }
-
-    // 拼接当前的日期
-    let endTime = year + sep + month + sep + date
-    return endTime
-}
-const setTimeOptions = (list: any) => {
-    timeOptions.value = list
-}
-const setTheDate = (value: any) => {
-    interval.value = value
-    timeChange(value)
-}
-
-// 获取时间范围的同比
-function getYearOnYear(startDate: string, endDate: string): [string, string] {
-    const startYearAgo = new Date(startDate)
-    startYearAgo.setFullYear(startYearAgo.getFullYear() - 1)
-
-    const endYearAgo = new Date(endDate)
-    endYearAgo.setFullYear(endYearAgo.getFullYear() - 1)
-
-    return [formatDate(startYearAgo), formatDate(endYearAgo)]
-}
-
-// 获取时间范围的环比
-function getMonthOnMonth(startDate: string, endDate: string): [string, string] {
-    const start = new Date(startDate)
-    const end = new Date(endDate)
-
-    const diffTime = end.getTime() - start.getTime() + 60 * 60 * 24 * 1000 // 计算时间差
-    const startMonthAgo = new Date(start)
-    startMonthAgo.setTime(startMonthAgo.getTime() - diffTime) // 将开始时间向前推移相同的时间差
-
-    const endMonthAgo = new Date(start)
-    endMonthAgo.setDate(start.getDate() - 1) // 结束时间是开始时间的前一天
-
-    return [formatDate(startMonthAgo), formatDate(endMonthAgo)]
-}
-
-// 格式化日期为 YYYY-MM-DD
-function formatDate(date: Date): string {
-    const year = date.getFullYear()
-    const month = String(date.getMonth() + 1).padStart(2, '0')
-    const day = String(date.getDate()).padStart(2, '0')
-    return `${year}-${month}-${day}`
-}
-defineExpose({ timeValue, interval, timeFlag, setTimeOptions, setTheDate, getYearOnYear, getMonthOnMonth, timeChange })
-</script>
-
-<style scoped>
-.demo-date-picker {
-    display: flex;
-    width: 100%;
-    padding: 0;
-    flex-wrap: wrap;
-}
-
-.demo-date-picker .block {
-    padding: 30px 0;
-    text-align: center;
-    border-right: solid 1px var(--el-border-color);
-    flex: 1;
-}
-
-.demo-date-picker .block:last-child {
-    border-right: none;
-}
-
-.demo-date-picker .demonstration {
-    display: block;
-    color: var(--el-text-color-secondary);
-    font-size: 14px;
-    margin-bottom: 20px;
-}
-</style>
+<template>
+    <div style="width: 540px">
+        <el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange">
+            <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+
+        <el-date-picker
+            v-model="timeValue"
+            type="daterange"
+            :disabled="disabledPicker"
+            :disabled-date="isFutureDate"
+            style="width: 220px; margin-right: 10px"
+            unlink-panels
+            :clearable="false"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            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>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { DArrowLeft, VideoPause, DArrowRight } from '@element-plus/icons-vue'
+import { ref, onMounted, nextTick, watch } from 'vue'
+
+interface Props {
+    nextFlag?: boolean
+    theCurrentTime?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    nextFlag: false,
+    theCurrentTime: false
+})
+
+const interval = ref(3)
+const timeFlag = ref(1)
+const count = ref(0)
+const disabledPicker = ref(true)
+const timeValue = ref()
+const backDisabled = ref(false)
+const preDisabled = ref(true)
+const timeOptions: any = ref([
+    { label: '年份', value: 1 },
+    { label: '季度', value: 2 },
+    { label: '月份', value: 3 },
+    { label: '周', value: 4 },
+    { label: '自定义', value: 5 }
+])
+const shortcuts = [
+    {
+        text: '最近一周',
+        value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            return [start, end]
+        }
+    },
+    {
+        text: '最近一个月',
+        value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            return [start, end]
+        }
+    },
+    {
+        text: '最近3个月',
+        value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            return [start, end]
+        }
+    }
+]
+const isFutureDate = time => {
+    return time && time > Date.now()
+}
+onMounted(() => {
+    timeChange(3)
+})
+// 选择时间范围
+const timeChange = (e: number) => {
+    backDisabled.value = false
+    preDisabled.value = props.nextFlag ? false : true
+    count.value = 0
+    if (e == 1) {
+        disabledPicker.value = true
+
+        timeValue.value = [setTime(1), setTime()]
+    } else if (e == 2) {
+        disabledPicker.value = true
+        timeValue.value = [setTime(2), setTime()]
+    } else if (e == 3) {
+        disabledPicker.value = true
+        timeValue.value = [setTime(3), setTime()]
+    } else if (e == 4) {
+        let year = parseInt(setTime().substring(0, 4))
+        let month = parseInt(setTime().substring(5, 7))
+        let date = parseInt(setTime().substring(8, 10))
+
+        var start = new Date(year, month - 1, date)
+        var dayOfWeek = start.getDay() == 0 ? 7 : start.getDay() - 1 // 如果为周日，则置为7天
+
+        disabledPicker.value = true
+        timeValue.value = [setTime(0, dayOfWeek), setTime(0, -6 + dayOfWeek)]
+    } else if (e == 5) {
+        disabledPicker.value = false
+        backDisabled.value = true
+        preDisabled.value = props.nextFlag ? false : true
+        timeValue.value = [setTime(), setTime()]
+    }
+    if (e == 1 || e == 2) {
+        timeFlag.value = 0
+    } else {
+        timeFlag.value = 1
+    }
+}
+
+// 当前
+const nowTime = () => {
+    console.log(interval.value, '000000000')
+    timeChange(interval.value)
+}
+// 上一个
+const preClick = () => {
+    preDisabled.value = false
+    let startTime = timeValue.value[0]
+    let endTime = timeValue.value[1]
+    let year = parseInt(startTime.substring(0, 4))
+    let month = parseInt(startTime.substring(5, 7))
+    let date = parseInt(startTime.substring(8, 10))
+    //按月
+    if (interval.value == 3) {
+        // 换年份
+        if (month == 1) {
+            year = year - 1
+            startTime = year + '-12-01'
+            endTime = year + '-12-31'
+        } else if (month <= 10) {
+            month = month - 1
+            startTime = year + '-0' + month + '-01'
+            let day = getDays(year, month)
+            endTime = year + '-0' + month + '-' + day
+        } else {
+            month = month - 1
+            startTime = year + '-' + month + '-01'
+            let day = getDays(year, month)
+            endTime = year + '-' + month + '-' + day
+        }
+        //按周
+    } else if (interval.value == 4) {
+        //根据开始时间推
+        let start = new Date(year, month - 1, date)
+        start.setDate(start.getDate() - 7)
+        startTime = formatTime(start)
+        var end = new Date(start)
+        end.setDate(start.getDate() + 6)
+        endTime = formatTime(end)
+        //按季度
+    } else if (interval.value == 2) {
+        // 换年份
+        if (month == 1) {
+            year = year - 1
+            startTime = year + '-10-01'
+            endTime = year + '-12-31'
+        } else {
+            // 还是本年
+            month = month - 3
+            startTime = year + '-0' + month + '-01'
+            month = month + 2
+            var day = getDays(year, month)
+            endTime = year + '-0' + month + '-' + day
+        }
+        //自定义
+    } else if (interval.value == 1) {
+        year = year - 1
+        startTime = year + '-01-01'
+        endTime = year + '-12-31'
+    }
+    timeValue.value = [startTime, endTime]
+
+    // 判断向后键的状态
+    // var temp = NowgetEndTime()
+    // timeStatus(temp, endTime)
+}
+//下一个
+const next = () => {
+    //向后
+    let startTime = timeValue.value[0]
+    let endTime = timeValue.value[1]
+    let year = parseInt(startTime.substring(0, 4))
+    let month = parseInt(startTime.substring(5, 7))
+    let date = parseInt(startTime.substring(8, 10))
+    var now = new Date()
+    // 获取当前年份
+    var presentY = now.getFullYear()
+    // 获取当前月份
+    var presentM = now.getMonth() + 1
+    // 获取当前日期
+    var presentD = now.getDate()
+    if (interval.value == 3) {
+        if (month == 12) {
+            year = year + 1
+
+            // 年份进位后，大于当前的年份，是不科学的
+            if (presentY < year && !props.nextFlag) {
+                startTime = presentY + '-12-01'
+                if (presentD < 10) {
+                    endTime = presentY + '-12' + '-0' + presentD
+                } else {
+                    endTime = presentY + '-12' + '-' + presentD
+                }
+                // 年份进位后，等于当前的年份
+            } else if (presentY == year) {
+                startTime = year + '-01-01'
+                if (presentM > 1) {
+                    endTime = year + '-01-31'
+                } else {
+                    if (presentD < 10) {
+                        endTime = year + '-01' + '-0' + presentD
+                    } else {
+                        endTime = year + '-01' + '-' + presentD
+                    }
+                }
+                // 年份进位后，依旧小于当前的年份
+            } else {
+                startTime = year + '-01-01'
+                endTime = year + '-01-31'
+            }
+        } else {
+            month = month + 1
+            // 年份等于当前年份
+            if (presentY == year) {
+                // 月份超过当前月份，是不科学的
+                if (month >= presentM && !props.nextFlag) {
+                    if (presentM < 10) {
+                        startTime = year + '-0' + presentM + '-01'
+                        if (presentD < 10) {
+                            endTime = year + '-0' + presentM + '-0' + presentD
+                        } else {
+                            endTime = year + '-0' + presentM + '-' + presentD
+                        }
+                    } else {
+                        startTime = year + '-' + presentM + '-01'
+                        if (presentD < 10) {
+                            endTime = year + '-' + presentM + '-0' + presentD
+                        } else {
+                            endTime = year + '-' + presentM + '-' + presentD
+                        }
+                    }
+                } else {
+                    if (month < 10) {
+                        startTime = year + '-0' + month + '-01'
+                        var day = getDays(year, month)
+                        endTime = year + '-0' + month + '-' + day
+                    } else {
+                        startTime = year + '-' + month + '-01'
+                        var day = getDays(year, month)
+                        endTime = year + '-' + month + '-' + day
+                    }
+                }
+                // 年份小于当前的年份
+            } else {
+                if (month < 10) {
+                    startTime = year + '-0' + month + '-01'
+                    var day = getDays(year, month)
+                    endTime = year + '-0' + month + '-' + day
+                } else {
+                    startTime = year + '-' + month + '-01'
+                    var day = getDays(year, month)
+                    endTime = year + '-' + month + '-' + day
+                }
+            }
+        }
+    } else if (interval.value == 2) {
+        // 前进需要年份进位
+        if (month == 10) {
+            year = year + 1
+            // 年份进位后大于当前年份是不科学的
+            if (year > presentY && !props.nextFlag) {
+                startTime = presentY + '-10-01'
+                if (presentD < 10) {
+                    endTime = year + '-' + presentM + '-0' + presentD
+                } else {
+                    endTime = year + '-' + presentM + '-' + presentD
+                }
+            } else if (year == presentY) {
+                startTime = year + '-01-01'
+                // 当前月份大约3月份
+                if (presentM > 3) {
+                    endTime = year + '-03-31'
+                } else {
+                    // 当前月份也在第一季度里
+                    if (presentD < 10) {
+                        endTime = year + '-0' + presentM + '-0' + presentD
+                    } else {
+                        endTime = year + '-0' + presentM + '-' + presentD
+                    }
+                }
+            } else {
+                startTime = year + '-01-01'
+                endTime = year + '-03-31'
+            }
+        } else {
+            month = month + 3
+            console.log('🚀 ~ next ~ presentM:', presentM, month)
+
+            // 季度进位后，超过当前月份是不科学的
+            if (year == presentY && !props.nextFlag) {
+                if (month >= presentM) {
+                    // 当季度进位后大于当前月，以当前月的时间显示季度
+                    if (presentM > 0 && presentM < 4) {
+                        // 第一季度
+                        startTime = year + '-01-01'
+                        if (presentD < 10) {
+                            endTime = year + '-0' + presentM + '-0' + presentD
+                        } else {
+                            endTime = year + '-0' + presentM + '-' + presentD
+                        }
+                    } else if (presentM > 3 && presentM < 7) {
+                        console.log(123123)
+                        // 第二季度
+                        startTime = year + '-04-01'
+                        if (presentD < 10) {
+                            endTime = year + '-0' + presentM + '-0' + presentD
+                        } else {
+                            endTime = year + '-0' + presentM + '-' + presentD
+                        }
+                    } else if (presentM > 6 && presentM < 10) {
+                        // 第三季度
+                        startTime = year + '-07-01'
+                        if (presentD < 10) {
+                            endTime = year + '-0' + presentM + '-0' + presentD
+                        } else {
+                            endTime = year + '-0' + presentM + '-' + presentD
+                        }
+                    } else {
+                        // 第四季度
+                        startTime = year + '-10-01'
+                        if (presentD < 10) {
+                            endTime = year + '-' + presentM + '-0' + presentD
+                        } else {
+                            endTime = year + '-' + presentM + '-' + presentD
+                        }
+                    }
+                } else {
+                    if (month == 10) {
+                        startTime = year + '-' + month + '-01'
+                    } else {
+                        startTime = year + '-0' + month + '-01'
+                    }
+                    month = month + 2
+                    if (month >= presentM) {
+                        endTime = NowgetEndTime()
+                    } else {
+                        var day = getDays(year, month)
+                        endTime = year + '-0' + month + '-' + day
+                    }
+                }
+            } else {
+                if (month == 10) {
+                    startTime = year + '-' + month + '-01'
+                    month = month + 2
+                    var day = getDays(year, month)
+                    endTime = year + '-' + month + '-' + day
+                } else {
+                    startTime = year + '-0' + month + '-01'
+                    month = month + 2
+                    var day = getDays(year, month)
+                    endTime = year + '-0' + month + '-' + day
+                }
+            }
+        }
+        console.log(startTime, endTime)
+    } else if (interval.value == 5) {
+    } else if (interval.value == 4) {
+        //根据开始时间推
+        var start = new Date(year, month - 1, date)
+        start.setDate(start.getDate() + 7)
+        startTime = formatTime(start)
+        var end = new Date(start)
+        end.setDate(start.getDate() + 6)
+        endTime = formatTime(end)
+    } else {
+        year = year + 1
+        // 年份进位后大于当前年份，是不科学的
+        if (year >= presentY && !props.nextFlag) {
+            startTime = presentY + '-01-01'
+            if (presentM < 10) {
+                if (presentD < 10) {
+                    endTime = presentY + '-0' + presentM + '-0' + presentD
+                } else {
+                    endTime = presentY + '-0' + presentM + '-' + presentD
+                }
+            } else {
+                if (presentD < 10) {
+                    endTime = presentY + '-' + presentM + '-0' + presentD
+                } else {
+                    endTime = presentY + '-' + presentM + '-' + presentD
+                }
+            }
+        } else {
+            startTime = year + '-01-01'
+            endTime = year + '-12-31'
+        }
+    }
+    if (!props.nextFlag) {
+        if (
+            new Date(endTime + ' 00:00:00').getTime() >=
+            new Date(window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd ') + ' 00:00:00').getTime()
+        ) {
+            preDisabled.value = props.nextFlag ? false : true
+        }
+    }
+
+    timeValue.value = [startTime, endTime]
+}
+
+const setTime = (flag = 0, e = 0) => {
+    let dd = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'dd')
+
+    let data = ''
+
+    if ((dd < 2 || dd == 0) && interval.value != 4 && !props.theCurrentTime) {
+        data = window.XEUtils.toDateString(new Date().getTime() - (e + dd) * 3600 * 1000 * 24, 'yyyy-MM-dd')
+    } else {
+        data = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'yyyy-MM-dd')
+    }
+
+    if (flag == 1) {
+        data = data.slice(0, 5) + '01-01'
+    } else if (flag == 2) {
+        let quarter = parseInt(data.slice(5, 7))
+        if (0 < quarter && quarter <= 3) {
+            data = data.slice(0, 5) + '01-01'
+        } else if (3 < quarter && quarter <= 6) {
+            data = data.slice(0, 5) + '04-01'
+        } else if (6 < quarter && quarter <= 9) {
+            data = data.slice(0, 5) + '07-01'
+        } else {
+            data = data.slice(0, 5) + '10-01'
+        }
+    }
+    if (flag == 3) {
+        data = data.slice(0, 8) + '01'
+    }
+
+    return data
+}
+
+// 获取月份的天数
+const getDays = (year: any, month: any) => {
+    let max = new Date(year, month, 0).getDate()
+    return max
+}
+// 时间格式化
+const formatTime = (time: any) => {
+    return (
+        time.getFullYear() +
+        '-' +
+        (time.getMonth() + 1 < 10 ? '0' : '') +
+        (time.getMonth() + 1) +
+        '-' +
+        (time.getDate() < 10 ? '0' : '') +
+        time.getDate()
+    )
+}
+const NowgetEndTime = () => {
+    let now = new Date()
+    let sep = '-'
+    let year = now.getFullYear()
+    let month: any = now.getMonth() + 1
+    if (month < 10) {
+        month = '0' + month
+    }
+    let date: any = now.getDate()
+    if (date < 10) {
+        date = '0' + date
+    }
+
+    // 拼接当前的日期
+    let endTime = year + sep + month + sep + date
+    return endTime
+}
+const setTimeOptions = (list: any) => {
+    timeOptions.value = list
+}
+const setTheDate = (value: any) => {
+    interval.value = value
+    timeChange(value)
+}
+
+// 获取时间范围的同比
+function getYearOnYear(startDate: string, endDate: string): [string, string] {
+    const startYearAgo = new Date(startDate)
+    startYearAgo.setFullYear(startYearAgo.getFullYear() - 1)
+
+    const endYearAgo = new Date(endDate)
+    endYearAgo.setFullYear(endYearAgo.getFullYear() - 1)
+
+    return [formatDate(startYearAgo), formatDate(endYearAgo)]
+}
+
+// 获取时间范围的环比
+function getMonthOnMonth(startDate: string, endDate: string): [string, string] {
+    const start = new Date(startDate)
+    const end = new Date(endDate)
+
+    const diffTime = end.getTime() - start.getTime() + 60 * 60 * 24 * 1000 // 计算时间差
+    const startMonthAgo = new Date(start)
+    startMonthAgo.setTime(startMonthAgo.getTime() - diffTime) // 将开始时间向前推移相同的时间差
+
+    const endMonthAgo = new Date(start)
+    endMonthAgo.setDate(start.getDate() - 1) // 结束时间是开始时间的前一天
+
+    return [formatDate(startMonthAgo), formatDate(endMonthAgo)]
+}
+
+// 格式化日期为 YYYY-MM-DD
+function formatDate(date: Date): string {
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    return `${year}-${month}-${day}`
+}
+defineExpose({ timeValue, interval, timeFlag, setTimeOptions, setTheDate, getYearOnYear, getMonthOnMonth, timeChange })
+</script>
+
+<style scoped>
+.demo-date-picker {
+    display: flex;
+    width: 100%;
+    padding: 0;
+    flex-wrap: wrap;
+}
+
+.demo-date-picker .block {
+    padding: 30px 0;
+    text-align: center;
+    border-right: solid 1px var(--el-border-color);
+    flex: 1;
+}
+
+.demo-date-picker .block:last-child {
+    border-right: none;
+}
+
+.demo-date-picker .demonstration {
+    display: block;
+    color: var(--el-text-color-secondary);
+    font-size: 14px;
+    margin-bottom: 20px;
+}
+</style>
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index a064f508..edecbff2 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -1,375 +1,379 @@
-<template>
-    <div ref="tableHeader" class="cn-table-header">
-        <div class="table-header ba-scroll-style">
-            <el-form
-                style="flex: 1; height: 32px; display: flex; flex-wrap: wrap"
-                ref="headerForm"
-                @submit.prevent=""
-                @keyup.enter="onComSearch"
-                label-position="left"
-                :inline="true"
-            >
-                <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 590px">
-                    <template #label>
-                        <el-checkbox v-if="showTimeAll" v-model="timeAll" label="时间" />
-                        <span v-else>时间</span>
-                    </template>
-                    <DatePicker
-                        ref="datePickerRef"
-                        v-if="timeAll"
-                        :nextFlag="nextFlag"
-                        :theCurrentTime="theCurrentTime"
-                    ></DatePicker>
-                </el-form-item>
-
-                <el-form-item label="区域" v-if="area">
-                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" />
-                </el-form-item>
-                <slot name="select"></slot>
-            </el-form>
-            <template v-if="$slots.select || datePicker || showSearch">
-                <el-button type="primary" @click="showSelectChange" v-if="showUnfoldButton">
-                    <Icon size="14" name="el-icon-ArrowUp" style="color: #fff" v-if="showSelect" />
-                    <Icon size="14" name="el-icon-ArrowDown" style="color: #fff" v-else />
-                </el-button>
-                <el-button
-                    @click="onComSearch"
-                    v-if="showSearch"
-                    :loading="tableStore.table.loading"
-                    type="primary"
-                    :icon="Search"
-                >
-                    查询
-                </el-button>
-                <el-button
-                    @click="onResetForm"
-                    v-if="showSearch && showReset"
-                    :loading="tableStore.table.loading"
-                    :icon="RefreshLeft"
-                >
-                    重置
-                </el-button>
-                <el-button
-                    @click="onExport"
-                    v-if="showExport"
-                    :loading="tableStore.table.loading"
-                    type="primary"
-                    icon="el-icon-Download"
-                >
-                    导出
-                </el-button>
-            </template>
-            <slot name="operation"></slot>
-        </div>
-        <el-form
-            :style="showSelect && showUnfoldButton ? headerFormSecondStyleOpen : headerFormSecondStyleClose"
-            ref="headerFormSecond"
-            @submit.prevent=""
-            @keyup.enter="onComSearch"
-            label-position="left"
-            :inline="true"
-        ></el-form>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { inject, ref, onMounted, nextTick, onUnmounted, watch } from 'vue'
-import type TableStore from '@/utils/tableStore'
-import DatePicker from '@/components/form/datePicker/index.vue'
-import Area from '@/components/form/area/index.vue'
-import { mainHeight } from '@/utils/layout'
-import { useDictData } from '@/stores/dictData'
-import { Search, RefreshLeft } from '@element-plus/icons-vue'
-import { defineProps } from 'vue'
-const emit = defineEmits(['selectChange'])
-const tableStore = inject('tableStore') as TableStore
-const tableHeader = ref()
-const datePickerRef = ref()
-const dictData = useDictData()
-const areaRef = ref()
-const headerForm = ref()
-const headerFormSecond = ref()
-const timeAll = ref(true)
-interface Props {
-    datePicker?: boolean
-    area?: boolean
-    showSearch?: boolean
-    nextFlag?: boolean //控制时间是否可以往后推
-    theCurrentTime?: boolean //控制时间前3天展示上个月时间
-    showReset?: boolean //是否显示重置按钮
-    showExport?: boolean //导出控制
-    showTimeAll?: boolean //控制时间是否显示
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    datePicker: false,
-    area: false,
-    showSearch: true,
-    nextFlag: false,
-    theCurrentTime: false,
-    showReset: true,
-    showExport: false,
-    showTimeAll: false
-})
-// 动态计算table高度
-const resizeObserver = new ResizeObserver(entries => {
-    for (const entry of entries) {
-        handlerHeight()
-        computedSearchRow()
-    }
-})
-const showUnfoldButton = ref(false)
-const headerFormSecondStyleOpen = {
-    opacity: 1,
-    height: 'auto',
-    padding: '0 15px 13px 15px'
-}
-const headerFormSecondStyleClose = {
-    opacity: 0,
-    height: '0',
-    padding: '0'
-}
-
-watch(
-    () => tableStore.table.params.deptIndex,
-    newVal => {
-        setTimeout(() => {
-            areaRef.value && areaRef.value.change()
-        }, 0)
-    }
-)
-watch(
-    () => timeAll.value,
-    newVal => {
-        tableStore.timeAll = newVal
-        setTimeout(() => {
-            computedSearchRow()
-        }, 500)
-    }
-)
-onMounted(() => {
-    timeAll.value = props.showTimeAll ? false : true
-    if (props.datePicker && timeAll.value) {
-        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
-        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
-        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
-        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
-        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
-        tableStore.table.params.interval = datePickerRef.value.interval
-    }
-    if (props.area) {
-        tableStore.table.params.deptIndex = dictData.state.area[0].id
-    }
-    nextTick(() => {
-        resizeObserver.observe(tableHeader.value)
-        setTimeout(() => {
-            computedSearchRow()
-        }, 500)
-    })
-})
-onUnmounted(() => {
-    resizeObserver.disconnect()
-})
-
-const handlerHeight = () => {
-    tableStore.table.publicHeight + tableHeader.value.offsetHeight + (tableStore.showPage ? 58 : 0) + 20
-    tableStore.table.height = mainHeight(
-        tableStore.table.publicHeight + tableHeader.value.offsetHeight + (tableStore.showPage ? 58 : 0) + 20
-    ).height as string
-}
-const computedSearchRow = () => {
-    if (!headerForm.value.$el) return
-    // 清空headerFormSecond.value.$el下的元素
-    while (headerFormSecond.value.$el.firstChild) {
-        headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
-    }
-    // 获取第一行放了几个表单
-    const elFormItem = headerForm.value.$el.querySelectorAll('.el-form-item')
-
-    //  把第一行放不下的复制一份放到headerFormSecond.value.$el
-    let width = 0
-    for (let i = 0; i < elFormItem.length; i++) {
-        width += elFormItem[i].offsetWidth + 32
-
-        if (width > headerForm.value.$el.offsetWidth) {
-            headerFormSecond.value.$el.appendChild(elFormItem[i])
-        }
-    }
-
-    // 判断是否需要折叠
-    if (headerFormSecond.value.$el.scrollHeight > 0) {
-        showUnfoldButton.value = true
-    } else {
-        showUnfoldButton.value = false
-    }
-}
-
-const showSelect = ref(false)
-const showSelectChange = () => {
-    showSelect.value = !showSelect.value
-    emit('selectChange', showSelect.value)
-}
-const onComSearch = async () => {
-    if (props.datePicker && timeAll.value) {
-        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
-        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
-        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
-        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
-        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
-        tableStore.table.params.interval = datePickerRef.value.interval
-    }
-
-    await tableStore.onTableAction('search', {})
-}
-const setDatePicker = (list: any) => {
-    datePickerRef.value.setTimeOptions(list)
-}
-const onResetForm = () => {
-    //时间重置成默认值
-    datePickerRef.value?.setTheDate(3)
-    tableStore.onTableAction('reset', {})
-}
-const setTheDate = (val: any) => {
-    datePickerRef.value.setTheDate(val)
-}
-// 导出
-const onExport = () => {
-    console.log('导出')
-    tableStore.onTableAction('export', { showAllFlag: true })
-}
-
-defineExpose({
-    onComSearch,
-    areaRef,
-    setDatePicker,
-    setTheDate,
-    datePickerRef,
-    showSelectChange,
-    showSelect,
-    computedSearchRow,
-    onExport
-})
-</script>
-
-<style scoped lang="scss">
-.cn-table-header {
-    border: 1px solid var(--el-border-color);
-}
-
-.table-header {
-    position: relative;
-    overflow-x: auto;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    width: 100%;
-    max-width: 100%;
-    background-color: var(--ba-bg-color-overlay);
-
-    border-bottom: none;
-    padding: 13px 15px;
-    font-size: 14px;
-    overflow: hidden;
-    .table-header-operate-text {
-        margin-left: 6px;
-    }
-}
-
-.table-com-search {
-    box-sizing: border-box;
-    width: 100%;
-    max-width: 100%;
-    background-color: var(--ba-bg-color-overlay);
-    border: 1px solid var(--ba-border-color);
-    border-bottom: none;
-    padding: 13px 15px 20px 15px;
-    font-size: 14px;
-}
-
-#header-form-second,
-#header-form {
-    // display: flex;
-    // flex-wrap: wrap;
-    transition: all 0.3s;
-}
-
-.mlr-12 {
-    margin-left: 12px;
-}
-
-.mlr-12 + .el-button {
-    margin-left: 12px;
-}
-
-.table-search {
-    display: flex;
-    margin-left: auto;
-
-    .quick-search {
-        width: auto;
-    }
-}
-
-.table-search-button-group {
-    display: flex;
-    margin-left: 12px;
-    border: 1px solid var(--el-border-color);
-    border-radius: var(--el-border-radius-base);
-    overflow: hidden;
-
-    button:focus,
-    button:active {
-        background-color: var(--ba-bg-color-overlay);
-    }
-
-    button:hover {
-        background-color: var(--el-color-info-light-7);
-    }
-
-    .table-search-button-item {
-        height: 30px;
-        border: none;
-        border-radius: 0;
-    }
-
-    .el-button + .el-button {
-        margin: 0;
-    }
-
-    .right-border {
-        border-right: 1px solid var(--el-border-color);
-    }
-}
-
-html.dark {
-    .table-search-button-group {
-        button:focus,
-        button:active {
-            background-color: var(--el-color-info-dark-2);
-        }
-
-        button:hover {
-            background-color: var(--el-color-info-light-7);
-        }
-
-        button {
-            background-color: var(--ba-bg-color-overlay);
-
-            el-icon {
-                color: white !important;
-            }
-        }
-    }
-}
-
-#header-form,
-#header-form-second {
-    :deep(.el-select) {
-        --el-select-width: 220px;
-    }
-
-    :deep(.el-input) {
-        --el-input-width: 220px;
-    }
-}
-</style>
+<template>
+    <div ref="tableHeader" class="cn-table-header">
+        <div class="table-header ba-scroll-style">
+            <el-form
+                style="flex: 1; height: 32px; display: flex; flex-wrap: wrap"
+                ref="headerForm"
+                @submit.prevent=""
+                @keyup.enter="onComSearch"
+                label-position="left"
+                :inline="true"
+            >
+                <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 620px">
+                    <template #label>
+                        <el-checkbox v-if="showTimeAll" v-model="timeAll" label="时间" />
+                        <span v-else>{{ dateLabel }}</span>
+                    </template>
+                    <DatePicker
+                        ref="datePickerRef"
+                        v-if="timeAll"
+                        :nextFlag="nextFlag"
+                        :theCurrentTime="theCurrentTime"
+                    ></DatePicker>
+                </el-form-item>
+
+                <el-form-item label="区域" v-if="area">
+                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" />
+                </el-form-item>
+                <slot name="select"></slot>
+            </el-form>
+            <template v-if="$slots.select || datePicker || showSearch">
+                <el-button type="primary" @click="showSelectChange" v-if="showUnfoldButton">
+                    <Icon size="14" name="el-icon-ArrowUp" style="color: #fff" v-if="showSelect" />
+                    <Icon size="14" name="el-icon-ArrowDown" style="color: #fff" v-else />
+                </el-button>
+                <el-button
+                    @click="onComSearch"
+                    v-if="showSearch"
+                    :loading="tableStore.table.loading"
+                    type="primary"
+                    :icon="Search"
+                >
+                    查询
+                </el-button>
+                <el-button
+                    @click="onResetForm"
+                    v-if="showSearch && showReset"
+                    :loading="tableStore.table.loading"
+                    :icon="RefreshLeft"
+                >
+                    重置
+                </el-button>
+                <el-button
+                    @click="onExport"
+                    v-if="showExport"
+                    :loading="tableStore.table.loading"
+                    type="primary"
+                    icon="el-icon-Download"
+                >
+                    导出
+                </el-button>
+            </template>
+            <slot name="operation"></slot>
+        </div>
+        <el-form
+            :style="showSelect && showUnfoldButton ? headerFormSecondStyleOpen : headerFormSecondStyleClose"
+            ref="headerFormSecond"
+            @submit.prevent=""
+            @keyup.enter="onComSearch"
+            label-position="left"
+            :inline="true"
+        ></el-form>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { inject, ref, onMounted, nextTick, onUnmounted, watch } from 'vue'
+import type TableStore from '@/utils/tableStore'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import Area from '@/components/form/area/index.vue'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { Search, RefreshLeft } from '@element-plus/icons-vue'
+import { defineProps } from 'vue'
+const emit = defineEmits(['selectChange'])
+const tableStore = inject('tableStore') as TableStore
+const tableHeader = ref()
+const datePickerRef = ref()
+const dictData = useDictData()
+const areaRef = ref()
+const headerForm = ref()
+const headerFormSecond = ref()
+const timeAll = ref(true)
+interface Props {
+    datePicker?: boolean
+    area?: boolean
+    showSearch?: boolean
+    nextFlag?: boolean //控制时间是否可以往后推
+    theCurrentTime?: boolean //控制时间前3天展示上个月时间
+    showReset?: boolean //是否显示重置按钮
+    showExport?: boolean //导出控制
+    showTimeAll?: boolean //控制时间是否显示
+    dateLabel?: string //设置时间名称
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    datePicker: false,
+    area: false,
+    showSearch: true,
+    nextFlag: false,
+    theCurrentTime: false,
+    showReset: true,
+    showExport: false,
+    showTimeAll: false,
+    dateLabel: '时间'
+})
+// 动态计算table高度
+const resizeObserver = new ResizeObserver(entries => {
+    for (const entry of entries) {
+        handlerHeight()
+        computedSearchRow()
+    }
+})
+const showUnfoldButton = ref(false)
+const headerFormSecondStyleOpen = {
+    opacity: 1,
+    height: 'auto',
+    padding: '0 15px 13px 15px'
+}
+const headerFormSecondStyleClose = {
+    opacity: 0,
+    height: '0',
+    padding: '0'
+}
+
+watch(
+    () => tableStore?.table.params.deptIndex,
+    newVal => {
+        setTimeout(() => {
+            areaRef.value && areaRef.value.change()
+        }, 0)
+    }
+)
+watch(
+    () => timeAll.value,
+    newVal => {
+        tableStore.timeAll = newVal
+        setTimeout(() => {
+            computedSearchRow()
+        }, 500)
+    }
+)
+onMounted(() => {
+    timeAll.value = props.showTimeAll ? false : true
+    if (props.datePicker && timeAll.value) {
+        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
+        tableStore.table.params.interval = datePickerRef.value.interval
+    }
+    if (props.area) {
+        tableStore.table.params.deptIndex = dictData.state.area[0].id
+    }
+    nextTick(() => {
+        resizeObserver.observe(tableHeader.value)
+        setTimeout(() => {
+            computedSearchRow()
+        }, 500)
+    })
+})
+onUnmounted(() => {
+    resizeObserver.disconnect()
+})
+
+const handlerHeight = () => {
+    if (tableStore && tableStore.table) {
+        tableStore.table.publicHeight + tableHeader.value.offsetHeight + (tableStore.showPage ? 58 : 0) + 20
+        tableStore.table.height = mainHeight(
+            tableStore.table.publicHeight + tableHeader.value.offsetHeight + (tableStore.showPage ? 58 : 0) + 20
+        ).height as string
+    }
+}
+const computedSearchRow = () => {
+    if (!headerForm.value.$el) return
+    // 清空headerFormSecond.value.$el下的元素
+    while (headerFormSecond.value.$el.firstChild) {
+        headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
+    }
+    // 获取第一行放了几个表单
+    const elFormItem = headerForm.value.$el.querySelectorAll('.el-form-item')
+
+    //  把第一行放不下的复制一份放到headerFormSecond.value.$el
+    let width = 0
+    for (let i = 0; i < elFormItem.length; i++) {
+        width += elFormItem[i].offsetWidth + 32
+
+        if (width > headerForm.value.$el.offsetWidth) {
+            headerFormSecond.value.$el.appendChild(elFormItem[i])
+        }
+    }
+
+    // 判断是否需要折叠
+    if (headerFormSecond.value.$el.scrollHeight > 0) {
+        showUnfoldButton.value = true
+    } else {
+        showUnfoldButton.value = false
+    }
+}
+
+const showSelect = ref(false)
+const showSelectChange = () => {
+    showSelect.value = !showSelect.value
+    emit('selectChange', showSelect.value)
+}
+const onComSearch = async () => {
+    if (props.datePicker && timeAll.value) {
+        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
+        tableStore.table.params.interval = datePickerRef.value.interval
+    }
+
+    await tableStore.onTableAction('search', {})
+}
+const setDatePicker = (list: any) => {
+    datePickerRef.value.setTimeOptions(list)
+}
+const onResetForm = () => {
+    //时间重置成默认值
+    datePickerRef.value?.setTheDate(3)
+    tableStore.onTableAction('reset', {})
+}
+const setTheDate = (val: any) => {
+    datePickerRef.value.setTheDate(val)
+}
+// 导出
+const onExport = () => {
+    console.log('导出')
+    tableStore.onTableAction('export', { showAllFlag: true })
+}
+
+defineExpose({
+    onComSearch,
+    areaRef,
+    setDatePicker,
+    setTheDate,
+    datePickerRef,
+    showSelectChange,
+    showSelect,
+    computedSearchRow,
+    onExport
+})
+</script>
+
+<style scoped lang="scss">
+.cn-table-header {
+    border: 1px solid var(--el-border-color);
+}
+
+.table-header {
+    position: relative;
+    overflow-x: auto;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+
+    border-bottom: none;
+    padding: 13px 15px;
+    font-size: 14px;
+    overflow: hidden;
+    .table-header-operate-text {
+        margin-left: 6px;
+    }
+}
+
+.table-com-search {
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+    border: 1px solid var(--ba-border-color);
+    border-bottom: none;
+    padding: 13px 15px 20px 15px;
+    font-size: 14px;
+}
+
+#header-form-second,
+#header-form {
+    // display: flex;
+    // flex-wrap: wrap;
+    transition: all 0.3s;
+}
+
+.mlr-12 {
+    margin-left: 12px;
+}
+
+.mlr-12 + .el-button {
+    margin-left: 12px;
+}
+
+.table-search {
+    display: flex;
+    margin-left: auto;
+
+    .quick-search {
+        width: auto;
+    }
+}
+
+.table-search-button-group {
+    display: flex;
+    margin-left: 12px;
+    border: 1px solid var(--el-border-color);
+    border-radius: var(--el-border-radius-base);
+    overflow: hidden;
+
+    button:focus,
+    button:active {
+        background-color: var(--ba-bg-color-overlay);
+    }
+
+    button:hover {
+        background-color: var(--el-color-info-light-7);
+    }
+
+    .table-search-button-item {
+        height: 30px;
+        border: none;
+        border-radius: 0;
+    }
+
+    .el-button + .el-button {
+        margin: 0;
+    }
+
+    .right-border {
+        border-right: 1px solid var(--el-border-color);
+    }
+}
+
+html.dark {
+    .table-search-button-group {
+        button:focus,
+        button:active {
+            background-color: var(--el-color-info-dark-2);
+        }
+
+        button:hover {
+            background-color: var(--el-color-info-light-7);
+        }
+
+        button {
+            background-color: var(--ba-bg-color-overlay);
+
+            el-icon {
+                color: white !important;
+            }
+        }
+    }
+}
+
+#header-form,
+#header-form-second {
+    :deep(.el-select) {
+        --el-select-width: 220px;
+    }
+
+    :deep(.el-input) {
+        --el-input-width: 220px;
+    }
+}
+</style>
diff --git a/src/components/tree/pqs/pointTree.vue b/src/components/tree/pqs/pointTree.vue
index 83e779f6..0342cc80 100644
--- a/src/components/tree/pqs/pointTree.vue
+++ b/src/components/tree/pqs/pointTree.vue
@@ -1,154 +1,154 @@
-<template>
-    <div class="point-tree">
-        <el-select
-            v-model="formData.statisticalType"
-            placeholder="请选择"
-            style="min-width: unset; padding: 10px 10px 0"
-            @change="loadData"
-            v-if="props.showSelect"
-        >
-            <el-option
-                v-for="item in classificationData"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-            ></el-option>
-        </el-select>
-        <div style="flex: 1; overflow: hidden">
-            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { nextTick, onMounted, ref, useAttrs } from 'vue'
-import Tree from '../index.vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
-import { useConfig } from '@/stores/config'
-import { defineProps } from 'vue'
-defineOptions({
-    name: 'pms/pointTree'
-})
-interface Props {
-    showSelect?: boolean
-}
-const props = withDefaults(defineProps<Props>(), {
-    showSelect: true
-})
-const emit = defineEmits(['init'])
-const attrs = useAttrs()
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const config = useConfig()
-const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-const tree = ref()
-const treeRef = ref()
-const formData = ref({
-    deptIndex: adminInfo.$state.deptIndex,
-    monitorFlag: 2,
-    powerFlag: 2,
-    loadType: null,
-    manufacturer: null,
-    serverName: 'event-boot',
-    statisticalType: classificationData[0].id,
-    scale: null
-})
-const loadData = () => {
-    let obj = classificationData.find(function (i) {
-        return i.id === formData.value.statisticalType
-    }) || { code: '' }
-    let form = JSON.parse(JSON.stringify(formData.value))
-    form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
-    let nodeKey = ''
-    getTerminalTreeForFive(form).then(res => {
-        //console.log('---',res)
-        if (obj.code == 'Power_Network') {
-            res.data = [
-                {
-                    name: '电网拓扑',
-                    level: -1,
-                    id: 0,
-                    children: res.data
-                }
-            ]
-        }
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-HomeFilled'
-            item.color = config.getColorVal('elementUiPrimary')
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-CollectionTag'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.children.forEach((item3: any) => {
-                    item3.icon = 'el-icon-Flag'
-                    item3.color = config.getColorVal('elementUiPrimary')
-                    item3.children.forEach((item4: any) => {
-                        item4.icon = 'el-icon-OfficeBuilding'
-                        item4.color = config.getColorVal('elementUiPrimary')
-                        item4.children.forEach((item5: anyObj) => {
-                            if (item5.level == 7) {
-                                item5.icon = 'el-icon-DataAnalysis'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                item5.children.forEach((item6: anyObj) => {
-                                    item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
-                                    item6.pid = item4.id
-                                    item6.icon = 'fa-solid fa-location-dot'
-                                    item6.color = config.getColorVal('elementUiPrimary')
-                                    if (item6.comFlag == 0) {
-                                        item6.color = 'red !important'
-                                    } else if (item6.comFlag == 1) {
-                                        item6.color = '#00f93b !important'
-                                    } else if (item6.comFlag == 2) {
-                                        item6.color = '#8c8c8c !important'
-                                    }
-                                })
-                            } else {
-                                item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
-                                item5.pid = item4.id
-                                item5.icon = 'fa-solid fa-location-dot'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                if (item5.comFlag == 0) {
-                                    item5.color = 'red !important'
-                                } else if (item5.comFlag == 1) {
-                                    item5.color = '#00f93b !important'
-                                } else if (item5.comFlag == 2) {
-                                    item5.color = '#8c8c8c !important'
-                                }
-                            }
-                        })
-                    })
-                })
-            })
-        })
-
-        nodeKey =
-            res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
-            res.data[0].children[0].children[0].children[0].children[0]?.id
-        emit(
-            'init',
-            res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
-                res.data[0].children[0].children[0].children[0].children[0]
-        )
-
-        tree.value = res.data
-        if (nodeKey) {
-            nextTick(() => {
-                treeRef.value.treeRef.setCurrentKey(nodeKey)
-                // treeRef.value.treeRef.setExpandedKeys(nodeKey)
-            })
-        }
-    })
-}
-loadData()
-</script>
-<style lang="scss">
-.point-tree {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    background: #fff;
-    border: 1px solid var(--el-border-color);
-}
-</style>
+<template>
+    <div class="point-tree">
+        <el-select
+            v-model="formData.statisticalType"
+            placeholder="请选择"
+            style="min-width: unset; padding: 10px 10px 0"
+            @change="loadData"
+            v-if="props.showSelect"
+        >
+            <el-option
+                v-for="item in classificationData"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            ></el-option>
+        </el-select>
+        <div style="flex: 1; overflow: hidden">
+            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
+import { useConfig } from '@/stores/config'
+import { defineProps } from 'vue'
+defineOptions({
+    name: 'pms/pointTree'
+})
+interface Props {
+    showSelect?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+    showSelect: true
+})
+const emit = defineEmits(['init'])
+const attrs = useAttrs()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const config = useConfig()
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const tree = ref()
+const treeRef = ref()
+const formData = ref({
+    deptIndex: adminInfo.$state.deptIndex,
+    monitorFlag: 2,
+    powerFlag: 2,
+    loadType: null,
+    manufacturer: null,
+    serverName: 'event-boot',
+    statisticalType: classificationData[0].id,
+    scale: null
+})
+const loadData = () => {
+    let obj = classificationData.find(function (i) {
+        return i.id === formData.value.statisticalType
+    }) || { code: '' }
+    let form = JSON.parse(JSON.stringify(formData.value))
+    form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
+    let nodeKey = ''
+    getTerminalTreeForFive(form).then(res => {
+        //console.log('---',res)
+        if (obj.code == 'Power_Network') {
+            res.data = [
+                {
+                    name: '电网拓扑',
+                    level: -1,
+                    id: 0,
+                    children: res.data
+                }
+            ]
+        }
+        res.data.forEach((item: any) => {
+            item.icon = 'el-icon-HomeFilled'
+            item.color = config.getColorVal('elementUiPrimary')
+            item.children.forEach((item2: any) => {
+                item2.icon = 'el-icon-CollectionTag'
+                item2.color = config.getColorVal('elementUiPrimary')
+                item2.children.forEach((item3: any) => {
+                    item3.icon = 'el-icon-Flag'
+                    item3.color = config.getColorVal('elementUiPrimary')
+                    item3.children.forEach((item4: any) => {
+                        item4.icon = 'el-icon-OfficeBuilding'
+                        item4.color = config.getColorVal('elementUiPrimary')
+                        item4.children.forEach((item5: anyObj) => {
+                            if (item5.level == 7) {
+                                item5.icon = 'el-icon-DataAnalysis'
+                                item5.color = config.getColorVal('elementUiPrimary')
+                                item5.children.forEach((item6: anyObj) => {
+                                    item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
+                                    item6.pid = item4.id
+                                    item6.icon = 'fa-solid fa-location-dot'
+                                    item6.color = config.getColorVal('elementUiPrimary')
+                                    if (item6.comFlag == 0) {
+                                        item6.color = 'red !important'
+                                    } else if (item6.comFlag == 1) {
+                                        item6.color = '#00f93b !important'
+                                    } else if (item6.comFlag == 2) {
+                                        item6.color = '#8c8c8c !important'
+                                    }
+                                })
+                            } else {
+                                item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
+                                item5.pid = item4.id
+                                item5.icon = 'fa-solid fa-location-dot'
+                                item5.color = config.getColorVal('elementUiPrimary')
+                                if (item5.comFlag == 0) {
+                                    item5.color = 'red !important'
+                                } else if (item5.comFlag == 1) {
+                                    item5.color = '#00f93b !important'
+                                } else if (item5.comFlag == 2) {
+                                    item5.color = '#8c8c8c !important'
+                                }
+                            }
+                        })
+                    })
+                })
+            })
+        })
+
+        nodeKey =
+            res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
+            res.data[0].children[0].children[0].children[0].children[0]?.id
+        emit(
+            'init',
+            res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
+                res.data[0].children[0].children[0].children[0].children[0]
+        )
+
+        tree.value = res.data
+        if (nodeKey) {
+            nextTick(() => {
+                treeRef.value.treeRef.setCurrentKey(nodeKey)
+                // treeRef.value.treeRef.setExpandedKeys(nodeKey)
+            })
+        }
+    })
+}
+loadData()
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>
diff --git a/src/layouts/admin/router-view/main.vue b/src/layouts/admin/router-view/main.vue
index f42c52b6..236401d9 100644
--- a/src/layouts/admin/router-view/main.vue
+++ b/src/layouts/admin/router-view/main.vue
@@ -1,104 +1,104 @@
-<template>
-    <el-main class="layout-main" :style="mainHeight()">
-        <router-view v-slot="{ Component }">
-            <transition :name="config.layout.mainAnimation" mode="out-in">
-                <keep-alive :include="state.keepAliveComponentNameList">
-                    <component :is="Component" :key="state.componentKey" />
-                </keep-alive>
-            </transition>
-        </router-view>
-    </el-main>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted, watch, onBeforeMount, onUnmounted, nextTick, provide } from 'vue'
-import { useRoute, type RouteLocationNormalized } from 'vue-router'
-import { mainHeight } from '@/utils/layout'
-import useCurrentInstance from '@/utils/useCurrentInstance'
-import { useConfig } from '@/stores/config'
-import { useNavTabs } from '@/stores/navTabs'
-
-defineOptions({
-    name: 'layout/main'
-})
-
-const { proxy } = useCurrentInstance()
-
-const route = useRoute()
-const config = useConfig()
-const navTabs = useNavTabs()
-
-const state: {
-    componentKey: string
-    keepAliveComponentNameList: string[]
-} = reactive({
-    componentKey: route.path,
-    keepAliveComponentNameList: []
-})
-
-const addKeepAliveComponentName = function (keepAliveName: string | undefined) {
-    if (keepAliveName) {
-        let exist = state.keepAliveComponentNameList.find((name: string) => {
-            return name === keepAliveName
-        })
-        if (exist) return
-        state.keepAliveComponentNameList.push(keepAliveName)
-    }
-}
-
-onBeforeMount(() => {
-    proxy.eventBus.on('onTabViewRefresh', (menu: RouteLocationNormalized) => {
-        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
-            (name: string) => menu.meta.keepalive !== name
-        )
-        state.componentKey = ''
-        nextTick(() => {
-            state.componentKey = menu.path
-            addKeepAliveComponentName(menu.meta.keepalive as string)
-        })
-    })
-    proxy.eventBus.on('onTabViewClose', (menu: RouteLocationNormalized) => {
-        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
-            (name: string) => menu.meta.keepalive !== name
-        )
-    })
-})
-
-onUnmounted(() => {
-    proxy.eventBus.off('onTabViewRefresh')
-    proxy.eventBus.off('onTabViewClose')
-})
-
-onMounted(() => {
-    // 确保刷新页面时也能正确取得当前路由 keepalive 参数
-    if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
-        addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
-    }
-})
-
-watch(
-    () => route.path,
-    () => {
-        state.componentKey = route.path
-        if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
-            addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
-        }
-    }
-)
-
-</script>
-
-<style scoped lang="scss">
-.layout-container .layout-main {
-    padding: 0 !important;
-    overflow: hidden;
-    width: 100%;
-    height: 100%;
-}
-
-.layout-main-scrollbar {
-    width: 100%;
-    position: relative;
-    //overflow: hidden;
-}
-</style>
+<template>
+    <el-main class="layout-main" :style="mainHeight()">
+        <router-view v-slot="{ Component }">
+            <transition :name="config.layout.mainAnimation" mode="out-in">
+                <keep-alive :include="state.keepAliveComponentNameList">
+                    <component :is="Component" :key="state.componentKey" />
+                </keep-alive>
+            </transition>
+        </router-view>
+    </el-main>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, watch, onBeforeMount, onUnmounted, nextTick, provide } from 'vue'
+import { useRoute, type RouteLocationNormalized } from 'vue-router'
+import { mainHeight } from '@/utils/layout'
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { useConfig } from '@/stores/config'
+import { useNavTabs } from '@/stores/navTabs'
+
+defineOptions({
+    name: 'layout/main'
+})
+
+const { proxy } = useCurrentInstance()
+
+const route = useRoute()
+const config = useConfig()
+const navTabs = useNavTabs()
+
+const state: {
+    componentKey: string
+    keepAliveComponentNameList: string[]
+} = reactive({
+    componentKey: route.path,
+    keepAliveComponentNameList: []
+})
+
+const addKeepAliveComponentName = function (keepAliveName: string | undefined) {
+    if (keepAliveName) {
+        let exist = state.keepAliveComponentNameList.find((name: string) => {
+            return name === keepAliveName
+        })
+        if (exist) return
+        state.keepAliveComponentNameList.push(keepAliveName)
+    }
+}
+
+onBeforeMount(() => {
+    proxy.eventBus.on('onTabViewRefresh', (menu: RouteLocationNormalized) => {
+        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
+            (name: string) => menu.meta.keepalive !== name
+        )
+        state.componentKey = ''
+        nextTick(() => {
+            state.componentKey = menu.path
+            addKeepAliveComponentName(menu.meta.keepalive as string)
+        })
+    })
+    proxy.eventBus.on('onTabViewClose', (menu: RouteLocationNormalized) => {
+        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
+            (name: string) => menu.meta.keepalive !== name
+        )
+    })
+})
+
+onUnmounted(() => {
+    proxy.eventBus.off('onTabViewRefresh')
+    proxy.eventBus.off('onTabViewClose')
+})
+
+onMounted(() => {
+    // 确保刷新页面时也能正确取得当前路由 keepalive 参数
+    if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
+        addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
+    }
+})
+
+watch(
+    () => route.path,
+    () => {
+        state.componentKey = route.path
+        if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
+            addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
+        }
+    }
+)
+
+</script>
+
+<style scoped lang="scss">
+.layout-container .layout-main {
+    padding: 0 !important;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+}
+
+.layout-main-scrollbar {
+    width: 100%;
+    position: relative;
+    //overflow: hidden;
+}
+</style>
diff --git a/src/stores/timeCache.ts b/src/stores/timeCache.ts
new file mode 100644
index 00000000..a68ba757
--- /dev/null
+++ b/src/stores/timeCache.ts
@@ -0,0 +1,34 @@
+// src/stores/timeCache.ts
+import { defineStore } from 'pinia'
+import { RouteLocationNormalizedLoaded } from 'vue-router'
+
+// 时间组件的缓存值   用于驾驶舱放大的时候和内部的时间组件同步
+interface TimeCacheState {
+  cache: Map<string, {
+    interval: number | undefined  // 时间组件的月份、年份、时间、时间格式的缓存值
+    timeValue: any   // 时间组件的值
+  }>
+}
+
+export const useTimeCacheStore = defineStore('timeCache', {
+  state: (): TimeCacheState => ({
+    cache: new Map()
+  }),
+  
+  actions: {
+    setCache(routePath: string, interval: number | undefined, timeValue: any) {
+      this.cache.set(routePath, {
+        interval,
+        timeValue
+      })
+    },
+    
+    getCache(routePath: string) {
+      return this.cache.get(routePath)
+    },
+    
+    hasCache(routePath: string) {
+      return this.cache.has(routePath)
+    }
+  }
+})
\ No newline at end of file
diff --git a/src/utils/pageBubble.ts b/src/utils/pageBubble.ts
index f024753c..75a8dd06 100644
--- a/src/utils/pageBubble.ts
+++ b/src/utils/pageBubble.ts
@@ -1,104 +1,114 @@
-// 页面气泡效果
-
-const bubble: {
-    width: number
-    height: number
-    bubbleEl: any
-    canvas: any
-    ctx: any
-    circles: any[]
-    animate: boolean
-    requestId: any
-} = {
-    width: 0,
-    height: 0,
-    bubbleEl: null,
-    canvas: null,
-    ctx: {},
-    circles: [],
-    animate: true,
-    requestId: null,
-}
-
-export const init = function (): void {
-    bubble.width = window.innerWidth
-    bubble.height = window.innerHeight
-
-    bubble.bubbleEl = document.getElementById('bubble')
-    bubble.bubbleEl.style.height = bubble.height + 'px'
-
-    bubble.canvas = document.getElementById('bubble-canvas')
-    bubble.canvas.width = bubble.width
-    bubble.canvas.height = bubble.height
-    bubble.ctx = bubble.canvas.getContext('2d')
-
-    // create particles
-    bubble.circles = []
-    for (let x = 0; x < bubble.width * 0.5; x++) {
-        const c = new Circle()
-        bubble.circles.push(c)
-    }
-    animate()
-    addListeners()
-}
-
-function scrollCheck() {
-    bubble.animate = document.body.scrollTop > bubble.height ? false : true
-}
-
-function resize() {
-    bubble.width = window.innerWidth
-    bubble.height = window.innerHeight
-    bubble.bubbleEl.style.height = bubble.height + 'px'
-    bubble.canvas.width = bubble.width
-    bubble.canvas.height = bubble.height
-}
-
-function animate() {
-    if (bubble.animate) {
-        bubble.ctx.clearRect(0, 0, bubble.width, bubble.height)
-        for (const i in bubble.circles) {
-            bubble.circles[i].draw()
-        }
-    }
-    bubble.requestId = requestAnimationFrame(animate)
-}
-
-class Circle {
-    pos: {
-        x: number
-        y: number
-    }
-    alpha: number
-    scale: number
-    velocity: number
-    draw: () => void
-    constructor() {
-        this.pos = {
-            x: Math.random() * bubble.width,
-            y: bubble.height + Math.random() * 100,
-        }
-        this.alpha = 0.1 + Math.random() * 0.3
-        this.scale = 0.1 + Math.random() * 0.3
-        this.velocity = Math.random()
-        this.draw = function () {
-            this.pos.y -= this.velocity
-            this.alpha -= 0.0005
-            bubble.ctx.beginPath()
-            bubble.ctx.arc(this.pos.x, this.pos.y, this.scale * 10, 0, 2 * Math.PI, false)
-            bubble.ctx.fillStyle = 'rgba(255,255,255,' + this.alpha + ')'
-            bubble.ctx.fill()
-        }
-    }
-}
-
-function addListeners() {
-    window.addEventListener('scroll', scrollCheck)
-    window.addEventListener('resize', resize)
-}
-
-export function removeListeners() {
-    window.removeEventListener('scroll', scrollCheck)
-    window.removeEventListener('resize', resize)
-    cancelAnimationFrame(bubble.requestId)
-}
+// 页面气泡效果
+
+const bubble: {
+    width: number
+    height: number
+    bubbleEl: any
+    canvas: any
+    ctx: any
+    circles: any[]
+    animate: boolean
+    requestId: any
+} = {
+    width: 0,
+    height: 0,
+    bubbleEl: null,
+    canvas: null,
+    ctx: {},
+    circles: [],
+    animate: true,
+    requestId: null
+}
+
+export const init = function (): void {
+    bubble.width = window.innerWidth
+    bubble.height = window.innerHeight
+
+    bubble.bubbleEl = document.getElementById('bubble')
+    bubble.bubbleEl.style.height = bubble.height + 'px'
+
+    bubble.canvas = document.getElementById('bubble-canvas')
+    bubble.canvas.width = bubble.width
+    bubble.canvas.height = bubble.height
+    bubble.ctx = bubble.canvas.getContext('2d')
+
+    // create particles
+    bubble.circles = []
+    for (let x = 0; x < bubble.width * 0.5; x++) {
+        const c = new Circle()
+        bubble.circles.push(c)
+    }
+    animate()
+    addListeners()
+}
+
+function scrollCheck() {
+    bubble.animate = document.body.scrollTop > bubble.height ? false : true
+}
+
+function resize() {
+    bubble.width = window.innerWidth
+    bubble.height = window.innerHeight
+    bubble.bubbleEl.style.height = bubble.height + 'px'
+    bubble.canvas.width = bubble.width
+    bubble.canvas.height = bubble.height
+}
+
+function animate() {
+    if (bubble.animate) {
+        bubble.ctx.clearRect(0, 0, bubble.width, bubble.height)
+        for (const i in bubble.circles) {
+            bubble.circles[i].draw()
+        }
+    }
+    bubble.requestId = requestAnimationFrame(animate)
+}
+
+class Circle {
+    pos: {
+        x: number
+        y: number
+    }
+    alpha: number
+    scale: number
+    velocity: number
+    draw: () => void
+    constructor() {
+        this.pos = {
+            x: Math.random() * bubble.width,
+            y: bubble.height + Math.random() * 100
+        }
+        this.alpha = 0.1 + Math.random() * 0.3
+        this.scale = 0.1 + Math.random() * 0.3
+        this.velocity = Math.random()
+        this.draw = function () {
+            this.pos.y -= this.velocity
+            this.alpha -= 0.0005
+            // 当气泡超出顶部或透明度为 0 时，重置位置和属性
+            if (this.pos.y < -10 || this.alpha < 0) {
+                this.pos = {
+                    x: Math.random() * bubble.width,
+                    y: bubble.height + Math.random() * 100
+                }
+                this.alpha = 0.1 + Math.random() * 0.35
+                this.scale = 0.1 + Math.random() * 0.35
+                this.velocity = Math.random()
+            }
+            bubble.ctx.beginPath()
+            bubble.ctx.arc(this.pos.x, this.pos.y, this.scale * 10, 0, 2 * Math.PI, false)
+            bubble.ctx.fillStyle = 'rgba(255,255,255,' + this.alpha + ')'
+            bubble.ctx.fill()
+        }
+    }
+}
+
+function addListeners() {
+    window.addEventListener('scroll', scrollCheck)
+    window.addEventListener('resize', resize)
+}
+
+export function removeListeners() {
+    window.removeEventListener('scroll', scrollCheck)
+    window.removeEventListener('resize', resize)
+    cancelAnimationFrame(bubble.requestId)
+}
diff --git a/src/utils/router.ts b/src/utils/router.ts
index 65610d61..11cf4612 100644
--- a/src/utils/router.ts
+++ b/src/utils/router.ts
@@ -7,8 +7,10 @@ import { useNavTabs } from '@/stores/navTabs'
 import { closeShade } from '@/utils/pageShade'
 import { adminBaseRoute } from '@/router/static'
 import { compact, isEmpty, reverse } from 'lodash-es'
+import { getRouteMenu, dictDataCache } from '@/api/auth'
 import { isAdminApp } from '@/utils/common'
-
+import { adminBaseRoutePath } from '@/router/static'
+const route:any = useRouter()
 /**
  * 导航失败有错误消息的路由push
  * @param to — 导航位置，同 router.push
@@ -293,3 +295,37 @@ const getParentNames = (name: string) => {
     }
     return reverse(parentNames)
 }
+// 刷新菜单
+export const getMenu = () => {
+    getRouteMenu().then((res: any) => {
+        const handlerMenu = (data: any) => {
+            data.forEach((item: any) => {
+                item.routePath =
+                    item.routePath[0] == '/' ? item.routePath.substring(1, item.routePath.length) : item.routePath
+                item.path = item.routePath
+                item.name = item.routePath
+                item.keepalive = item.routePath
+                item.component = item.routeName
+                    ? item.routeName.indexOf('/src/views/') > -1
+                        ? item.routeName
+                        : `/src/views/${item.routeName}/index.vue`
+                    : ''
+                item.type = item.children && item.children.length > 0 ? 'menu_dir' : 'menu'
+                item.menu_type = item.children && item.children.length > 0 ? null : 'tab'
+                if (item.children) {
+                    handlerMenu(item.children)
+                }
+            })
+        }
+        handlerMenu(res.data)
+        handleAdminRoute(res.data)
+        if (route?.params.to) {
+            const lastRoute = JSON.parse(route.params.to as string)
+            if (lastRoute.path != adminBaseRoutePath) {
+                let query = !isEmpty(lastRoute.query) ? lastRoute.query : {}
+                routePush({ path: lastRoute.path, query: query })
+                return
+            }
+        }
+    })
+}
diff --git a/src/views/pqs/cockpit/homePage/components/routingConfig.vue b/src/views/pqs/cockpit/homePage/components/routingConfig.vue
new file mode 100644
index 00000000..0de4b55c
--- /dev/null
+++ b/src/views/pqs/cockpit/homePage/components/routingConfig.vue
@@ -0,0 +1,161 @@
+<template>
+    <div>
+        <el-dialog v-model="dialogVisible" title="设置" width="600">
+            <div style="display: flex; justify-content: end" class="mb10">
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+            </div>
+            <div style="height: calc(100vh / 2); max-height: 400px">
+                <vxe-table
+                    border
+                    ref="tableRef"
+                    :data="pageList.filter((item: any) => item.pagePath != 'dashboard/index')"
+                    align="center"
+                    height="auto"
+                    v-bind="defaultAttribute"
+                >
+                    <vxe-column field="pageName" title="菜单名称"></vxe-column>
+
+                    <vxe-column field="icon" title="图标" width="80">
+                        <template #default="{ row }">
+                            <Icon class="ba-icon-dark" :name="row.icon || ''" />
+                        </template>
+                    </vxe-column>
+                    <vxe-column field="startTime" title="是否激活">
+                        <template #default="{ row }">
+                            <el-switch
+                                v-model="row.state"
+                                inline-prompt
+                                :active-value="1"
+                                :inactive-value="0"
+                                active-text="已激活"
+                                inactive-text="未激活"
+                                :before-change="() => beforeChange(row)"
+                            />
+                        </template>
+                    </vxe-column>
+                    <vxe-column field="startTime" title="操作">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="edit(row)">编辑</el-button>
+
+                            <el-button type="danger" link @click="deletes(row)">删除</el-button>
+                        </template>
+                    </vxe-column>
+                </vxe-table>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { useRouter } from 'vue-router'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { getDashboardPageByUserId, deleteDashboard, activatePage } from '@/api/system-boot/csstatisticalset'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+import { getMenu } from '@/utils/router'
+
+const { push } = useRouter()
+const dialogVisible = ref(false)
+const route = useRouter()
+const adminInfo = useAdminInfo()
+const pageList: any = ref([])
+
+const open = () => {
+    dialogVisible.value = true
+    init()
+}
+const init = () => {
+    getDashboardPageByUserId({ id: adminInfo.id, state: false }).then(res => {
+        pageList.value = res.data
+    })
+}
+// 新增
+const add = () => {
+    push(`/admin/cockpit/popup?path=${String(getNextPagePath(pageList.value))}`)
+}
+// 修改
+const edit = (row: any) => {
+    push(`/admin/cockpit/popup?id=${row?.id}&&path=${row.pagePath}`)
+}
+// 激活
+const beforeChange = (row: any): Promise<boolean> => {
+    return new Promise(resolve => {
+        // setTimeout(() => {
+        //     loading1.value = false
+        //     ElMessage.success('Switch success')
+        //     return resolve(true)
+        // }, 1000)
+        ElMessageBox.confirm('此操作将激活该页面, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+                activatePage({ id: row.id, state: row.state == 0 ? 1 : 0 }).then((res: any) => {
+                    if (res.code == 'A0000') {
+                        ElMessage({
+                            type: 'success',
+                            message: '操作成功!'
+                        })
+                    }
+                    init()
+                    resolve(true)
+                    getMenu()
+                })
+            })
+            .catch(() => {
+                ElMessage({
+                    type: 'info',
+                    message: '已取消删除'
+                })
+            })
+    })
+}
+// 删除
+const deletes = (row: any) => {
+    ElMessageBox.confirm('此操作将永久删除该菜单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    })
+        .then(() => {
+            deleteDashboard({ id: row.id }).then((res: any) => {
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除页面成功!'
+                    })
+                }
+                init()
+                getMenu()
+            })
+        })
+        .catch(() => {
+            ElMessage({
+                type: 'info',
+                message: '已取消删除'
+            })
+        })
+}
+function getNextPagePath(pages: any) {
+    // 提取所有pagePath中的数字部分
+    const numbers = pages.map((page: any) => {
+        const match = page.pagePath.match(/dashboard\/index(\d*)$/)
+        if (match && match[1]) {
+            return parseInt(match[1], 10)
+        }
+        return 0 // 没有数字时视为0
+    })
+
+    // 找到最大数字并加1
+    const maxNum = Math.max(...numbers)
+    const nextNum = maxNum + 1
+
+    // 生成下一个pagePath
+    return `dashboard/index${nextNum}`
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/pqs/cockpit/homePage/index.vue b/src/views/pqs/cockpit/homePage/index.vue
index 05db3d64..dcbd1412 100644
--- a/src/views/pqs/cockpit/homePage/index.vue
+++ b/src/views/pqs/cockpit/homePage/index.vue
@@ -1,245 +1,338 @@
-<template>
-    <GridLayout
-        class="default-main"
-        v-model:layout="layout"
-        :row-height="rowHeight"
-        :is-resizable="false"
-        :is-draggable="false"
-        :responsive="false"
-        :vertical-compact="false"
-        prevent-collision
-        :col-num="12"
-    >
-        <template #item="{ item }">
-            <div class="box">
-                <div class="title">
-                    <div style="display: flex; align-items: center">
-                        <Icon class="HelpFilled" :name="item.icon" />
-                        {{ item.name }}
-                    </div>
-                    <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
-                    <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
-                </div>
-                <div>
-                    <component
-                        :is="item.component"
-                        v-if="item.component"
-                        class="pd10"
-                        :key="key"
-                        :height="rowHeight * item.h - (item.h == 6 ? -20 : item.h == 2 ? 20 : 5) + 'px'"
-                        :width="rowWidth * item.w - 5 + 'px'"
-                        :timeKey="item.timeKey"
-                    />
-                    <div v-else class="pd10">组件加载失败...</div>
-                </div>
-            </div>
-        </template>
-    </GridLayout>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted, markRaw, onUnmounted, defineAsyncComponent, type Component } from 'vue'
-import { GridLayout } from 'grid-layout-plus'
-import { useDebounceFn } from '@vueuse/core'
-import { queryActivatePage } from '@/api/system-boot/csstatisticalset'
-import { HelpFilled, FullScreen } from '@element-plus/icons-vue'
-// defineOptions({
-//     name: 'cockpit/homePage'
-// })
-// 定义类型
-interface LayoutItem {
-    x: number
-    y: number
-    w: number
-    h: number
-    i: string | number
-    name: string
-    path: string
-    component?: Component | string
-    loading?: boolean
-    error?: any
-}
-const key = ref(0)
-const img = new URL(`@/assets/imgs/amplify.png`, import.meta.url)
-const img1 = new URL(`@/assets/imgs/reduce.png`, import.meta.url)
-// 响应式数据
-const rowHeight = ref(0)
-const rowWidth = ref(0)
-const layout = ref<LayoutItem[]>([
-    // {
-    //     x: 4,
-    //     y: 0,
-    //     w: 4,
-    //     h: 2,
-    //     i: '1',
-    //     name: '',
-    //     path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
-    // },
-])
-const layoutCopy = ref<LayoutItem[]>([])
-const flag = ref(true)
-// 组件映射
-const componentMap = reactive(new Map<string, Component | string>())
-
-// 获取主内容区域高度
-const getMainHeight = () => {
-    const elMain = document.querySelector('.el-main')
-    return (elMain?.offsetHeight || 0) - 70
-}
-// 获取主内容区域高度
-const getMainWidth = () => {
-    const elMain = document.querySelector('.el-main')
-    return (elMain?.offsetWidth || 0) - 20
-}
-
-// 初始化行高
-const initRowHeight = () => {
-    rowHeight.value = Math.max(0, (getMainHeight() - 20) / 6)
-    rowWidth.value = Math.max(0, getMainWidth() / 12)
-}
-
-// 动态注册组件
-const registerComponent = (path: string): Component | string | null => {
-    if (!path) return null
-
-    const cacheKey = path
-
-    // 使用缓存的组件
-    if (componentMap.has(cacheKey)) {
-        return componentMap.get(cacheKey)!
-    }
-
-    try {
-        // 动态导入组件
-        const modules = import.meta.glob('@/views/**/*.vue')
-        if (!modules[path]) {
-            console.error(`组件加载失败: ${path}`)
-            return null
-        }
-
-        const AsyncComponent = defineAsyncComponent({
-            loader: modules[path],
-            loadingComponent: () => h('div', '加载中...'),
-            errorComponent: ({ error }) => h('div', `加载错误: ${error.message}`),
-            delay: 200,
-            timeout: 10000
-        })
-
-        // 保存到映射中
-        componentMap.set(cacheKey, markRaw(AsyncComponent))
-        return AsyncComponent
-    } catch (error) {
-        console.error('注册组件失败:', error)
-        return null
-    }
-}
-// 缩放
-const zoom = (value: any) => {
-    if (flag.value) {
-        layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }]
-    } else {
-        layout.value = layoutCopy.value.map((item, index) => ({
-            ...item,
-            i: item.i || index, // 确保有唯一标识
-            component: registerComponent(item.path)
-        }))
-    }
-    flag.value = !flag.value
-    key.value += 1
-}
-// 获取布局数据
-const fetchLayoutData = async () => {
-    try {
-        const { data } = await queryActivatePage()
-        const parsedLayout = JSON.parse(data.containerConfig || '[]') as LayoutItem[]
-        // 处理布局数据
-        layout.value = parsedLayout.map((item, index) => ({
-            ...item,
-            i: item.i || index, // 确保有唯一标识
-            component: registerComponent(item.path)
-        }))
-        layoutCopy.value = JSON.parse(JSON.stringify(layout.value))
-    } catch (error) {
-        console.error('获取布局数据失败:', error)
-        // 可以添加错误提示逻辑
-    }
-}
-
-// 窗口大小变化处理 - 使用防抖
-const handleResize = useDebounceFn(() => {
-    initRowHeight()
-    key.value += 1
-}, 200)
-
-// 生命周期钩子
-onMounted(() => {
-    initRowHeight()
-    fetchLayoutData()
-
-    // 添加窗口大小变化监听器
-    window.addEventListener('resize', handleResize)
-})
-
-onUnmounted(() => {
-    // 移除监听器防止内存泄漏
-    window.removeEventListener('resize', handleResize)
-})
-</script>
-
-<style lang="scss" scoped>
-.vgl-layout {
-    background-color: #f8f9fa;
-    border-radius: 4px;
-    overflow: hidden;
-}
-
-:deep(.vgl-item:not(.vgl-item--placeholder)) {
-    background-color: #ffffff;
-    border-radius: 4px;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
-    transition: all 0.3s ease;
-}
-
-:deep(.vgl-item:hover:not(.vgl-item--placeholder)) {
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.12);
-}
-
-:deep(.vgl-item--static) {
-    background-color: #f0f2f5;
-}
-
-.text {
-    position: absolute;
-    inset: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 16px;
-    color: #606266;
-}
-
-:deep(.vgl-item) {
-    overflow: hidden;
-}
-.box {
-    overflow: hidden;
-    .title {
-        border-bottom: 1px solid #000;
-        font-size: 14px;
-        height: 30px;
-        font-weight: 600;
-        padding: 0px 10px;
-        color: #fff;
-        background-color: var(--el-color-primary);
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
-    .HelpFilled {
-        height: 16px;
-        width: 16px;
-        color: #fff !important;
-        margin-right: 5px;
-    }
-}
-</style>
+<template>
+    <div class="default-main">
+        <TableHeader :showSearch="false" v-show="flag">
+            <template v-slot:select>
+                <el-form-item label="日期">
+                    <DatePicker
+                        ref="datePickerRef"
+                        :nextFlag="false"
+                        :theCurrentTime="true"
+                        @change="handleDatePickerChange"
+                    ></DatePicker>
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <el-button type="primary" icon="el-icon-Edit" @click="editd">编辑</el-button>
+                <!-- <el-button type="primary" icon="el-icon-Tools" @click="settings">设置</el-button> -->
+            </template>
+        </TableHeader>
+
+        <GridLayout
+            v-model:layout="layout"
+            :row-height="rowHeight"
+            :is-resizable="false"
+            :is-draggable="false"
+            :responsive="false"
+            :vertical-compact="false"
+            prevent-collision
+            :col-num="12"
+        >
+            <template #item="{ item }">
+                <div class="box">
+                    <div class="title">
+                        <div style="display: flex; align-items: center">
+                            <Icon class="HelpFilled" :name="(item as LayoutItem).icon" />
+                            {{ (item as LayoutItem).name }}
+                        </div>
+                        <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
+                        <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
+                    </div>
+                    <div>
+                        <component
+                            :is="(item as LayoutItem).component"
+                            v-if="(item as LayoutItem).component"
+                            class="pd10"
+                            :key="key"
+                            :timeValue="datePickerRef?.timeValue || 3"
+                            :height="rowHeight * item.h - seRowHeight(item.h) + 'px'"
+                            :width="rowWidth * item.w - 30 + 'px'"
+                            :timeKey="(item as LayoutItem).timeKey"
+                            :interval="datePickerRef?.interval"
+                            :w="item.w"
+                            :h="item.h"
+                        />
+                        <div v-else class="pd10">组件加载失败...</div>
+                    </div>
+                </div>
+            </template>
+        </GridLayout>
+        <!-- 设置 -->
+        <RoutingConfig ref="RoutingConfigRef" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, markRaw, onUnmounted, computed, defineAsyncComponent, type Component } from 'vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { GridLayout } from 'grid-layout-plus'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import { useDebounceFn } from '@vueuse/core'
+import { queryActivatePage, queryByPagePath } from '@/api/system-boot/csstatisticalset'
+import RoutingConfig from '@/views/pqs/cockpit/homePage/components/routingConfig.vue'
+import { useRouter, useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+const { push } = useRouter()
+const datePickerRef = ref()
+const router = useRouter()
+const route = useRoute()
+const timeCacheStore = useTimeCacheStore()
+
+defineOptions({
+    // name: 'dashboard/index'
+})
+// 定义类型
+interface LayoutItem {
+    x: number
+    y: number
+    w: number
+    h: number
+    timeKey: number | string
+    i: string | number
+    name: string
+    path: string
+    icon?: string // 新增 icon 可选字段
+    component?: Component | string
+    loading?: boolean
+    error?: any
+}
+const RoutingConfigRef = ref()
+const key = ref(0)
+const img = new URL(`@/assets/img/amplify.png`, import.meta.url).href
+const img1 = new URL(`@/assets/img/reduce.png`, import.meta.url).href
+// 响应式数据
+const rowHeight = ref(0)
+const rowWidth = ref(0)
+const layout: any = ref([
+    // {
+    //     x: 4,
+    //     y: 0,
+    //     w: 4,
+    //     h: 2,
+    //     i: '1',
+    //     name: '',
+    //     path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
+    // },
+])
+const layoutCopy: any = ref([])
+const flag = ref(true)
+// 组件映射
+const componentMap = reactive(new Map<string, Component | string>())
+const dataList: any = ref({})
+// 获取主内容区域高度
+const getMainHeight = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetHeight || 0) - 70
+}
+// 获取主内容区域高度
+const getMainWidth = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetWidth || 0) - 20
+}
+
+// 初始化行高
+const initRowHeight = () => {
+    rowHeight.value = Math.max(0, (getMainHeight() - 77 + (flag.value ? 0 : 56)) / 6)
+    rowWidth.value = Math.max(0, getMainWidth() / 12)
+}
+
+// 动态注册组件
+const registerComponent = (path: string): Component | string | null => {
+    if (!path) return null
+
+    const cacheKey = path
+
+    // 使用缓存的组件
+    if (componentMap.has(cacheKey)) {
+        return componentMap.get(cacheKey)!
+    }
+
+    try {
+        // 动态导入组件
+        const modules = import.meta.glob('@/**/*.vue')
+        if (!modules[path]) {
+            console.error(`组件加载失败: ${path}`)
+            return null
+        }
+
+        const AsyncComponent = defineAsyncComponent({
+            loader: modules[path],
+            loadingComponent: () => h('div', '加载中...'),
+            errorComponent: ({ error }) => h('div', `加载错误: ${error.message}`),
+            delay: 200,
+            timeout: 10000
+        })
+
+        // 保存到映射中
+        componentMap.set(cacheKey, markRaw(AsyncComponent))
+        return AsyncComponent
+    } catch (error) {
+        console.error('注册组件失败:', error)
+        return null
+    }
+}
+// 缩放
+const zoom = (value: any) => {
+    if (flag.value) {
+        layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }]
+    } else {
+        layout.value = layoutCopy.value.map((item: any, index: number) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+    }
+    console.log('🚀 ~ zoom ~ layout.value:', layout.value)
+
+    flag.value = !flag.value
+
+    initRowHeight()
+    key.value += 1
+}
+// 计算组件高度
+const seRowHeight = (value: any) => {
+    if (value == 6) return 0
+    if (value == 5) return 12
+    if (value == 4) return 20
+    if (value == 3) return 30
+    if (value == 2) return 40
+    if (value == 1) return 50
+    return 0
+}
+
+// 获取布局数据
+const fetchLayoutData = async () => {
+    try {
+        // const { data } = await queryByPagePath({ pagePath: router.currentRoute.value.name })
+        // dataList.value = data
+        dataList.value = {
+            createBy: 'e6a67ccbe789493687766c4304fcb228',
+            createTime: '2025-11-26 08:43:56',
+            updateBy: 'e6a67ccbe789493687766c4304fcb228',
+            updateTime: '2025-11-26 08:43:56',
+            id: 'e8218545cc11e32d5d6b87c92fdd0fbc',
+            pageName: '测试',
+            thumbnail: '',
+            remark: '',
+            containerConfig:
+                '[{"x":0,"y":0,"w":6,"h":3,"i":0.9274640143002512,"name":"终端在线率","path":"/src/components/cockpit/onlineRate/index.vue","icon":"local-审计列表","timeKey":"3","moved":false},{"x":6,"y":0,"w":6,"h":3,"i":0.9154814002445102,"name":"监测点数据完整性","path":"/src/components/cockpit/integrity/index.vue","icon":"local-告警中心","timeKey":"3","moved":false},{"x":0,"y":3,"w":6,"h":3,"i":0.6560899767923003,"name":"终端运行评价","path":"/src/components/cockpit/terminalEvaluation/index.vue","icon":"local-稳态指标超标明细","timeKey":"3","moved":false},{"x":6,"y":3,"w":6,"h":3,"i":0.5812302648025226,"name":"异常数据清洗","path":"/src/components/cockpit/dataCleaning/index.vue","icon":"local-区域暂态评估","timeKey":"3","moved":false}]',
+            sort: 100,
+            state: 1,
+            pagePath: 'dashboard/index6',
+            pathName: null,
+            routeName: '/src/views/pqs/cockpit/homePage/index.vue',
+            icon: ''
+        }
+        const parsedLayout = JSON.parse(dataList.value.containerConfig || '[]') as LayoutItem[]
+        // 处理布局数据
+        layout.value = parsedLayout.map((item, index) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+        layoutCopy.value = JSON.parse(JSON.stringify(layout.value))
+        initRowHeight()
+    } catch (error) {
+        console.error('获取布局数据失败:', error)
+        // 可以添加错误提示逻辑
+    }
+}
+
+// 窗口大小变化处理 - 使用防抖
+const handleResize = useDebounceFn(() => {
+    initRowHeight()
+    // key.value += 1
+}, 200)
+
+// 修改
+const editd = (e: any) => {
+    if (dataList.value?.id) {
+        push(`/admin/cockpit/popup?id=${dataList.value?.id}&&path=${String(router.currentRoute.value.name)}`)
+    } else {
+        push(`/admin/cockpit/popup?path=${String(router.currentRoute.value.name)}`)
+    }
+}
+// 设置
+const settings = () => {
+    RoutingConfigRef.value.open()
+}
+
+// 处理 DatePicker 值变化事件
+const handleDatePickerChange = (value: any) => {
+    // 将值缓存到 timeCache
+    if (value) {
+        timeCacheStore.setCache(route.path, value.interval, value.timeValue)
+    }
+}
+
+// 生命周期钩子
+onMounted(() => {
+    // initRowHeight()
+    fetchLayoutData()
+
+    // 添加窗口大小变化监听器
+    window.addEventListener('resize', handleResize)
+})
+
+onUnmounted(() => {
+    // 移除监听器防止内存泄漏
+    window.removeEventListener('resize', handleResize)
+})
+</script>
+
+<style lang="scss" scoped>
+.vgl-layout {
+    background-color: #f8f9fa;
+    border-radius: 4px;
+    overflow: hidden;
+}
+
+:deep(.vgl-item:not(.vgl-item--placeholder)) {
+    background-color: #ffffff;
+    border-radius: 4px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+    transition: all 0.3s ease;
+}
+
+:deep(.vgl-item:hover:not(.vgl-item--placeholder)) {
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.12);
+}
+
+:deep(.vgl-item--static) {
+    background-color: #f0f2f5;
+}
+
+.text {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    color: #606266;
+}
+
+:deep(.vgl-item) {
+    overflow: hidden;
+}
+.box {
+    overflow: hidden;
+    .title {
+        border-bottom: 1px solid #000;
+        font-size: 14px;
+        height: 30px;
+        font-weight: 600;
+        padding: 0px 10px;
+        color: #fff;
+        background-color: var(--el-color-primary);
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+    .HelpFilled {
+        height: 16px;
+        width: 16px;
+        color: #fff !important;
+        margin-right: 5px;
+    }
+}
+</style>
diff --git a/src/views/pqs/cockpit/realTimeData/iframeDia.vue b/src/views/pqs/cockpit/realTimeData/iframeDia.vue
new file mode 100644
index 00000000..884d0cc2
--- /dev/null
+++ b/src/views/pqs/cockpit/realTimeData/iframeDia.vue
@@ -0,0 +1,459 @@
+<template>
+    <div class="container">
+        <!-- 使用 v-for 遍历四个角落 -->
+        <div v-for="corner in corners" v-show="corner.show"  :key="corner.id" :class="['corner', corner.className]">
+            <div class="content">
+                <div class="title" style="display: flex">
+                    <img src="@/assets/img/lightning.png" class="title_img" />
+                    <span>{{ corner.title }}</span>
+                </div>
+                <vxe-table
+                    :data="corner.data"
+                    size="small"
+                    border
+                    show-header
+                    :header-cell-style="{ textAlign: 'center' }"
+                    :cell-style="{ textAlign: 'center' }"
+                    height="200"
+                    style="padding: 5px;"
+                >
+                    <vxe-column field="name" title="名称"></vxe-column>
+                    <vxe-column field="a" title="A" width="40"></vxe-column>
+                    <vxe-column field="b" title="B" width="40"></vxe-column>
+                    <vxe-column field="c" title="C" width="40"></vxe-column>
+                </vxe-table>
+            </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'
+
+//开始创建webSocket客户端
+const dataSocket = reactive({
+    socketServe: socketClient.Instance
+})
+// 定义四个角落的数据
+const corners = ref([
+    {
+        id: 'topLeft',
+        title: '左上',
+        className: 'top-left',
+        show: false,
+        data: [
+            { name: '电压', a: 1098, b: 2080, c: 3006 },
+            { name: '电流', a: 15, b: 25, c: 35 },
+            { name: '电压畸变率', a: 12, b: 22, c: 32 },
+            { name: '电流畸变率', a: 18, b: 28, c: 38 },
+            { name: '电压偏值', a: 12, b: 22, c: 32 },
+            { name: '电压不平衡', a: 18, b: 28, c: 38 }
+        ] as any[],
+        elementId: '', // 记录该角落对应的元素ID
+        raceLists: [] as any[] // 为每个角落添加独立的跑马灯数据存储
+    },
+    {
+        id: 'topRight',
+        title: '右上',
+        className: 'top-right',
+        show: false,
+        data: [] as any[],
+        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: "",
+    // },
+])
+
+interface DataTableItem {
+    name: string
+    a: number
+    b: number
+    c: number
+}
+
+const tableData = ref<DataTableItem[]>([
+    { name: '电压', a: 1098, b: 2080, c: 3006 },
+    { name: '电流', a: 15, b: 25, c: 35 },
+    { name: '电压畸变率', a: 12, b: 22, c: 32 },
+    { name: '电流畸变率', a: 18, b: 28, c: 38 },
+    { name: '电压偏值', a: 12, b: 22, c: 32 },
+    { name: '电压不平衡', a: 18, b: 28, c: 38 }
+])
+
+const steadyStateList = ref([])
+
+const selectedId = ref('')
+
+// 内部响应式数据
+const eventList = ref<any[]>([])
+
+// const handleClickImage = async (elementId: string) => {
+//   // 检查 elementId 是否有值，没有值则直接返回空数组
+//   if (!elementId) {
+//     eventList.value = [];
+//     return;
+//   }
+//   try {
+//     // 发送点击图片请求
+//     const res = await clickImage({ lineId: elementId });
+
+//     // 确保返回的数据是数组格式，并且过滤掉 null/undefined 元素
+//     let dataToStore: any[] = [];
+
+//     if (Array.isArray(res.data)) {
+//       dataToStore = res.data.filter(
+//         (item:any) => item !== null && item !== undefined
+//       );
+//     } else if (res.data && Array.isArray(res.data.records)) {
+//       dataToStore = res.data.records.filter(
+//         (item:any) => 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 = [];
+//   }
+// };
+
+// 记录显示顺序，用于循环替换
+const displayOrder = ref<number[]>([])
+
+// 更新指定角落数据的函数
+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
+}
+
+// 显示下一个角落的函数
+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: any) => item.lineId == corner.elementId)
+                    .forEach((item: any) => {
+                        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>`)
+                    : ''
+            })
+        }
+    })
+}
+
+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)
+}
+
+// 监听来自 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 scoped lang="scss">
+.container {
+    position: relative;
+}
+
+.corner {
+    width: 240px;
+    /* height: 135px; */
+    background-color: #fff;
+    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;
+    padding: 5px;
+     color: #fff; 
+    border-bottom: 1px solid #444;
+    background-color: var(--el-color-primary);
+    border-radius: 8px 8px 0 0;
+}
+
+.title_img {
+    width: 25px;
+    height: 25px;
+    margin-right: 10px;
+}
+
+.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;
+}
+
+.table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.table th,
+.table td {
+    border: 1px solid #000;
+    text-align: center;
+    font-size: 12px;
+}
+</style>
diff --git a/src/views/pqs/cockpit/realTimeData/index.vue b/src/views/pqs/cockpit/realTimeData/index.vue
new file mode 100644
index 00000000..83f6e7ca
--- /dev/null
+++ b/src/views/pqs/cockpit/realTimeData/index.vue
@@ -0,0 +1,244 @@
+<template>
+    <div class="default-main" :style="{ padding: prop.height ? '0px !important' : '10px' }">
+        <!-- 实时数据 -->
+        <!-- 添加加载事件监听 -->
+        <div class="dataBox" :style="{ height: prop.height || pageHeight.height }" >
+            <div
+                class="iframe-container"
+                :style="{
+                    boxShadow: `var(--el-box-shadow-light)`
+                }"
+                style="position: relative;"
+            >
+                <iframe
+                    :src="iframeSrc"
+                    width="100%"
+                    height="100%"
+                    frameborder="0"
+                    scrolling="no"
+                    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">
+                    <el-button type="primary" icon="el-icon-Aim">复位</el-button>
+                </div>
+                <div class="tableBox">
+                    <Table ref="tableRef"  height="100%"></Table>
+                </div>
+            </el-card>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+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<{
+//     project: { id: string; name: string } | null
+// }>()
+
+const prop = defineProps({
+    width: { type:  [String, Number]},
+    height: { type:  [String, Number]},
+    timeKey: { type:  [String, Number]},
+    timeValue: { type: Object }
+})
+
+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 iframeSrc = ref('')
+
+// 监听 props 变化
+// watch(
+//     () => props.project,
+//     newVal => {
+//         if (newVal && newVal.id && newVal.name) {
+//             //   window.location.origin
+//             //   iframeSrc.value =
+//             //     "http://192.168.1.179:4001" +
+//             //     `/zutai/?id=${newVal.id}&&name=${encodeURIComponent(
+//             //       newVal.name
+//             //     )}&&preview=true&&display=true&&graphicDisplay=wx#/preview`;
+//             iframeSrc.value =
+//                 'http://192.168.1.179:4001' +
+//                 `/zutai/?id=4b4f7f4260198776594f5f9d93a532e8&&name=stt&&preview=true&&display=true#/preview_YPT`
+
+//             // console.log("更新 iframeSrc:", iframeSrc.value);
+//         }
+//     },
+//     { immediate: true, deep: true }
+// )
+
+onMounted(() => {
+    iframeSrc.value =
+        'http://192.168.1.179:4001' +
+        `/zutai/?id=4b4f7f4260198776594f5f9d93a532e8&&name=stt&&preview=true#/preview_YPT`
+
+    tableStore.index()
+
+    // 监听来自 eventStatistics 组件的消息
+    window.addEventListener('message', handleMessage)
+
+    //   getActive({}).then((res: any) => {
+    //     if (res.code == "A0000") {
+    //       //   window.location.origin
+    //       iframeSrc.value =
+    //         "http://192.168.1.179:4001" +
+    //         `/zutai/?id=${res.data.id}&&name=${encodeURIComponent(
+    //           res.data.name
+    //         )}&&preview=true&&display=true&&graphicDisplay=wx#/preview`;
+    //     }
+    //   });
+})
+
+onUnmounted(() => {
+    // 清理事件监听器
+    window.removeEventListener('message', handleMessage)
+})
+
+// iframe 加载完成回调  添加加载事件监听
+const onIframeLoad = () => {
+    // console.log("iframe 加载完成");
+    // 通知 securityDetail.vue 组件 iframe 已加载完成
+    window.postMessage(
+        {
+            type: 'IFRAME_LOADED',
+            data: { loaded: true }
+        },
+        '*'
+    )
+}
+
+// 处理来自 eventStatistics 组件的消息
+const handleMessage = (event: MessageEvent) => {
+    // 验证消息来源（在生产环境中应该验证 origin）
+    // if (event.origin !== 'trusted-origin') return;
+
+    const { type, payload } = event.data
+
+    if (type === 'SEND_KEYS_TO_IFRAME') {
+        // 将数据转发给 iframe
+        sendKeysToIframe(payload)
+    }
+}
+
+// 向 iframe 发送 keyList 数据
+const sendKeysToIframe = (keyList: string[]) => {
+    const iframe = document.getElementById('iframeLeft') as HTMLIFrameElement
+    if (iframe && iframe.contentWindow) {
+        iframe.contentWindow.postMessage(
+            {
+                type: 'ANALYSIS_KEYS',
+                payload: keyList
+            },
+            '*'
+        ) // 在生产环境中应该指定具体的域名而不是 '*'
+    }
+}
+</script>
+<style lang="scss" scoped>
+.dataBox {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
+.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%;
+    }
+}
+</style>
diff --git a/src/views/pqs/cockpit/setUp/components/popup.vue b/src/views/pqs/cockpit/setUp/components/popup.vue
index eac422de..9577fdb3 100644
--- a/src/views/pqs/cockpit/setUp/components/popup.vue
+++ b/src/views/pqs/cockpit/setUp/components/popup.vue
@@ -1,29 +1,29 @@
 <template>
     <div class="pd10">
         <el-card>
-            <el-form ref="formRef" inline :rules="rules" :model="form" label-width="120px" class="form-four">
-                <el-form-item label="页面名称:" prop="pageName">
+            <el-form ref="formRef" inline :rules="rules" :model="form" label-width="auto" class="form-four">
+                <el-form-item label="页面名称" prop="pageName">
                     <el-input
+                        style="width: 100%"
                         maxlength="32"
                         show-word-limit
                         v-model.trim="form.pageName"
                         placeholder="请输入页面名称"
                     ></el-input>
                 </el-form-item>
-
-                <el-form-item label="页面排序:" prop="sort">
-                    <el-input
-                        maxlength="32"
-                        show-word-limit-number
-                        v-model.trim.number="form.sort"
-                        :min="0"
-                        :step="1"
-                        step-strictly
-                        style="width: 100%"
-                    />
+                <el-form-item label="图标">
+                    <IconSelector v-model.trim="form.icon" style="width: 80%" placeholder="请选择图标" />
                 </el-form-item>
+                <el-form-item label="页面排序" prop="sort">
+                    <el-input-number style="width: 100%" v-model.trim="form.sort" :min="0" :max="10000" :step="1" />
+                </el-form-item>
+                <!-- <el-form-item label="绑定页面">
+                    <el-select v-model="form.pagePath" filterable placeholder="请选择绑定页面" style="width: 100%" clearable>
+                        <el-option v-for="item in pageList" :key="item.path" :label="item.name" :value="item.path" />
+                    </el-select>
+                </el-form-item> -->
 
-                <el-form-item label="备注:" class="top">
+                <el-form-item label="备注" class="top">
                     <el-input
                         maxlength="300"
                         show-word-limit
@@ -87,6 +87,7 @@
                         <template #item="{ item }">
                             <div class="imgBox">
                                 <div class="textName">{{ item.name }}</div>
+
                                 <img
                                     :src="getImg(item.path)"
                                     :style="{
@@ -106,6 +107,7 @@
                                             'px'
                                     }"
                                 />
+
                                 <CloseBold class="remove" @click="removeItem(item.i)" />
                             </div>
                             <!-- <span class="text">{{ `${item?.name}` }}</span>
@@ -118,11 +120,12 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
 import { useRouter } from 'vue-router'
 import BackComponent from '@/components/icon/back/index.vue'
 import { mainHeight } from '@/utils/layout'
 import type { CollapseIconPositionType } from 'element-plus'
+import IconSelector from '@/components/baInput/components/iconSelector.vue'
 import { componentTree } from '@/api/user-boot/user'
 import { GridLayout, GridItem } from 'grid-layout-plus'
 import { throttle } from 'lodash-es'
@@ -130,11 +133,18 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Tools, CloseBold } from '@element-plus/icons-vue'
 import { addDashboard, updateDashboard, queryById } from '@/api/system-boot/csstatisticalset'
 import html2canvas from 'html2canvas'
+import { useRoute } from 'vue-router'
+import { getMenu } from '@/utils/router'
+// defineOptions({
+//     name: 'cockpit/popup'
+// })
 const { go } = useRouter()
 const { query } = useRoute()
+const router = useRouter()
 const height = mainHeight(108)
 const indicatorHeight = mainHeight(128)
 const rowHeight = ref(0)
+const pageList: any = ref([])
 const GridHeight = ref(0)
 const position = ref<CollapseIconPositionType>('left')
 const form: any = reactive({
@@ -143,7 +153,11 @@ const form: any = reactive({
     containerConfig: [],
     sort: '100',
     id: '',
-    remark: ''
+
+    icon: '',
+    pagePath: '',
+    remark: '',
+    routeName: '/src/views/pqs/cockpit/homePage/index.vue'
 })
 const activeNames = ref([])
 const activeNames1 = ref([])
@@ -167,6 +181,13 @@ const layout: any = ref([
 const treeComponents: any = ref([]) //组件树
 const treeComponentsCopy: any = ref([]) //组件树
 const info = () => {
+    pageList.value = router
+        .getRoutes()
+        .filter(item => item?.meta?.component == '/src/views/pqs/cockpit/homePage/index.vue')
+        .map(item => {
+            return { name: item?.meta?.title, path: item?.meta?.path }
+        })
+
     activeNames.value = []
     activeNames1.value = []
     componentTree().then(res => {
@@ -184,10 +205,14 @@ const info = () => {
         queryById({ id: query.id }).then(res => {
             layout.value = JSON.parse(res.data.containerConfig)
             form.pageName = res.data.pageName
+            form.pagePath = query.path || res.data.pagePath
             form.sort = res.data.sort
             form.remark = res.data.remark
             form.id = res.data.id
+            form.icon = res.data.icon
         })
+    } else {
+        form.pagePath = query.path
     }
 }
 
@@ -286,7 +311,6 @@ const drag = throttle(row => {
 })
 
 function dragEnd(row: any) {
-    console.log('🚀 ~ drag ~ row:', row)
     const parentRect = wrapper.value?.getBoundingClientRect()
 
     if (!parentRect || !gridLayout.value) return
@@ -309,7 +333,7 @@ function dragEnd(row: any) {
         y: dragItem.y,
         w: dragItem.w,
         h: dragItem.h,
-        i: dragItem.i,
+        i: Math.random(), //dragItem.i,
         name: row.name,
         path: row.path,
         icon: row.icon,
@@ -327,18 +351,19 @@ const onSubmit = () => {
     if (layout.value.length == 0) {
         return ElMessage.warning('页面设计不能为空!')
     }
-    const maxValue = Math.max(...layout.value.map(item => item.y + item.h))
-    if (maxValue > 6) {
-        return ElMessage.warning('组件不能超出当前容器!')
-    }
+    // const maxValue = Math.max(...layout.value.map(item => item.y + item.h))
+    // if (maxValue > 6) {
+    //     return ElMessage.warning('组件不能超出当前容器!')
+    // }
 
     formRef.value.validate(async (valid: boolean) => {
         let url = ''
-        await html2canvas(document.querySelector('.GridLayout'), {
-            useCORS: true
-        }).then(canvas => {
-            url = canvas.toDataURL('image/png')
-        })
+        // await html2canvas(document.querySelector('.GridLayout'), {
+        //     useCORS: true
+        // }).then(canvas => {
+        //     url = canvas.toDataURL('image/png')
+        // })
+        form.pagePath = form.pagePath || ''
 
         if (valid) {
             if (form.id == '') {
@@ -346,6 +371,7 @@ const onSubmit = () => {
                     (res: any) => {
                         ElMessage.success('新增页面成功!')
                         go(-1)
+                        getMenu()
                     }
                 )
             } else {
@@ -353,6 +379,7 @@ const onSubmit = () => {
                     (res: any) => {
                         ElMessage.success('修改页面成功!')
                         go(-1)
+                        getMenu()
                     }
                 )
             }
@@ -362,6 +389,7 @@ const onSubmit = () => {
 const getImg = throttle((path: string) => {
     if (path != undefined) return treeComponentsCopy.value.filter(item => item.path == path)[0]?.image
 })
+
 onMounted(() => {
     info()
 
@@ -436,7 +464,9 @@ onBeforeUnmount(() => {
 .vgl-layout {
     background-color: #eee;
 }
-
+:deep(.el-input-group) {
+    width: 90%;
+}
 .remove {
     position: absolute;
     top: 5px;
@@ -462,4 +492,7 @@ onBeforeUnmount(() => {
     background-color: #fff;
     border: 1px solid black;
 }
+:deep(.el-form--inline .el-form-item) {
+    margin-right: 0px;
+}
 </style>
diff --git a/src/views/pqs/cockpit/setUp/components/view.vue b/src/views/pqs/cockpit/setUp/components/view.vue
index 5f5668fe..60059d27 100644
--- a/src/views/pqs/cockpit/setUp/components/view.vue
+++ b/src/views/pqs/cockpit/setUp/components/view.vue
@@ -1,265 +1,295 @@
-<template>
-    <div class="default-main">
-        <div class=" layoutHeader">
-            <div class="title">{{title}}</div>
-            <back-component />
-        </div>
-        <GridLayout
-            v-model:layout="layout"
-            :row-height="rowHeight"
-            :is-resizable="false"
-            :is-draggable="false"
-            :responsive="false"
-            :vertical-compact="false"
-            prevent-collision
-            :col-num="12"
-        >
-            <template #item="{ item }">
-                <div class="box">
-                    <div class="title">
-                        <div style="display: flex; align-items: center">
-                            <Icon class="HelpFilled" :name="item.icon" />
-                            {{ item.name }}
-                        </div>
-                        <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
-                        <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
-                    </div>
-                    <div>
-                        <component
-                            :is="item.component"
-                            v-if="item.component"
-                            class="pd10"
-                            :key="key"
-                            :height="rowHeight * item.h - (item.h == 6 ? -20 : item.h == 2 ? 20 : 5) + 'px'"
-                            :width="rowWidth * item.w - 5 + 'px'"
-                            :timeKey="item.timeKey"
-                        />
-                        <div v-else class="pd10">组件加载失败...</div>
-                    </div>
-                </div>
-            </template>
-        </GridLayout>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted, markRaw, onUnmounted, defineAsyncComponent, type Component } from 'vue'
-import { GridLayout } from 'grid-layout-plus'
-import { useDebounceFn } from '@vueuse/core'
-import { useRouter } from 'vue-router'
-import BackComponent from '@/components/icon/back/index.vue'
-import { queryById } from '@/api/system-boot/csstatisticalset'
-import { HelpFilled, FullScreen } from '@element-plus/icons-vue'
-// defineOptions({
-//     name: 'cockpit/homePage'
-// })
-const { query } = useRoute()
-// 定义类型
-interface LayoutItem {
-    x: number
-    y: number
-    w: number
-    h: number
-    i: string | number
-    name: string
-    path: string
-    component?: Component | string
-    loading?: boolean
-    error?: any
-}
-const title = ref('')
-const key = ref(0)
-const img = new URL(`@/assets/imgs/amplify.png`, import.meta.url)
-const img1 = new URL(`@/assets/imgs/reduce.png`, import.meta.url)
-// 响应式数据
-const rowHeight = ref(0)
-const rowWidth = ref(0)
-const layout = ref<LayoutItem[]>([
-    // {
-    //     x: 4,
-    //     y: 0,
-    //     w: 4,
-    //     h: 2,
-    //     i: '1',
-    //     name: '',
-    //     path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
-    // },
-])
-const layoutCopy = ref<LayoutItem[]>([])
-const flag = ref(true)
-// 组件映射
-const componentMap = reactive(new Map<string, Component | string>())
-
-// 获取主内容区域高度
-const getMainHeight = () => {
-    const elMain = document.querySelector('.el-main')
-    return (elMain?.offsetHeight || 0) - 70
-}
-// 获取主内容区域高度
-const getMainWidth = () => {
-    const elMain = document.querySelector('.el-main')
-    return (elMain?.offsetWidth || 0) - 20
-}
-
-// 初始化行高
-const initRowHeight = () => {
-    rowHeight.value = Math.max(0, (getMainHeight() - 72) / 6)
-    rowWidth.value = Math.max(0, getMainWidth() / 12)
-}
-
-// 动态注册组件
-const registerComponent = (path: string): Component | string | null => {
-    if (!path) return null
-
-    const cacheKey = path
-
-    // 使用缓存的组件
-    if (componentMap.has(cacheKey)) {
-        return componentMap.get(cacheKey)!
-    }
-
-    try {
-        // 动态导入组件
-        const modules = import.meta.glob('@/views/**/*.vue')
-        if (!modules[path]) {
-            console.error(`组件加载失败: ${path}`)
-            return null
-        }
-
-        const AsyncComponent = defineAsyncComponent({
-            loader: modules[path],
-            loadingComponent: () => h('div', '加载中...'),
-            errorComponent: ({ error }) => h('div', `加载错误: ${error.message}`),
-            delay: 200,
-            timeout: 10000
-        })
-
-        // 保存到映射中
-        componentMap.set(cacheKey, markRaw(AsyncComponent))
-        return AsyncComponent
-    } catch (error) {
-        console.error('注册组件失败:', error)
-        return null
-    }
-}
-// 缩放
-const zoom = (value: any) => {
-    if (flag.value) {
-        layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }]
-    } else {
-        layout.value = layoutCopy.value.map((item, index) => ({
-            ...item,
-            i: item.i || index, // 确保有唯一标识
-            component: registerComponent(item.path)
-        }))
-    }
-    flag.value = !flag.value
-    key.value += 1
-}
-// 获取布局数据
-const fetchLayoutData = async () => {
-    try {
-        const { data } = await queryById({ id: query.id })
-        title.value = data.pageName+'_预览'
-        const parsedLayout = JSON.parse(data.containerConfig || '[]') as LayoutItem[]
-        // 处理布局数据
-        layout.value = parsedLayout.map((item, index) => ({
-            ...item,
-            i: item.i || index, // 确保有唯一标识
-            component: registerComponent(item.path)
-        }))
-        layoutCopy.value = JSON.parse(JSON.stringify(layout.value))
-    } catch (error) {
-        console.error('获取布局数据失败:', error)
-        // 可以添加错误提示逻辑
-    }
-}
-
-// 窗口大小变化处理 - 使用防抖
-const handleResize = useDebounceFn(() => {
-    initRowHeight()
-    key.value += 1
-}, 200)
-
-// 生命周期钩子
-onMounted(() => {
-    initRowHeight()
-    fetchLayoutData()
-
-    // 添加窗口大小变化监听器
-    window.addEventListener('resize', handleResize)
-})
-
-onUnmounted(() => {
-    // 移除监听器防止内存泄漏
-    window.removeEventListener('resize', handleResize)
-})
-</script>
-
-<style lang="scss" scoped>
-.vgl-layout {
-    background-color: #f8f9fa;
-    border-radius: 4px;
-    overflow: hidden;
-}
-
-:deep(.vgl-item:not(.vgl-item--placeholder)) {
-    background-color: #ffffff;
-    border-radius: 4px;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
-    transition: all 0.3s ease;
-}
-
-:deep(.vgl-item:hover:not(.vgl-item--placeholder)) {
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.12);
-}
-
-:deep(.vgl-item--static) {
-    background-color: #f0f2f5;
-}
-
-.text {
-    position: absolute;
-    inset: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 16px;
-    color: #606266;
-}
-
-:deep(.vgl-item) {
-    overflow: hidden;
-}
-.box {
-    overflow: hidden;
-    .title {
-        border-bottom: 1px solid #000;
-        font-size: 14px;
-        height: 30px;
-        font-weight: 600;
-        padding: 0px 10px;
-        color: #fff;
-        background-color: var(--el-color-primary);
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
-    .HelpFilled {
-        height: 16px;
-        width: 16px;
-        color: #fff !important;
-        margin-right: 5px;
-    }
-}
-.layoutHeader{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 10px 20px;
-    font-size: 16px;
-    .title{
-        font-weight: 600;
-    }
-}
-</style>
+<template>
+    <div class="default-main">
+        <!-- <div class=" layoutHeader">
+            <div class="title">{{title}}</div>
+            <back-component />
+        </div> -->
+        <TableHeader :showSearch="false">
+            <template v-slot:select>
+                <el-form-item label="日期">
+                    <DatePicker ref="datePickerRef" :nextFlag="false" :theCurrentTime="true"></DatePicker>
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <back-component />
+            </template>
+        </TableHeader>
+        <GridLayout
+            v-model:layout="layout"
+            :row-height="rowHeight"
+            :is-resizable="false"
+            :is-draggable="false"
+            :responsive="false"
+            :vertical-compact="false"
+            prevent-collision
+            :col-num="12"
+        >
+            <template #item="{ item }">
+                <div class="box">
+                    <div class="title">
+                        <div style="display: flex; align-items: center">
+                            <Icon class="HelpFilled" :name="item.icon" />
+                            {{ item.name }}
+                        </div>
+                        <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
+                        <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
+                    </div>
+                    <div>
+                        <component
+                            :is="item.component"
+                            v-if="item.component"
+                            class="pd10"
+                            :key="key"
+                            :timeValue="datePickerRef.timeValue"
+                            :height="rowHeight * item.h - seRowHeight(item.h) + 'px'"
+                            :width="rowWidth * item.w - 30 + 'px'"
+                            :timeKey="item.timeKey"
+                        />
+                        <div v-else class="pd10">组件加载失败...</div>
+                    </div>
+                </div>
+            </template>
+        </GridLayout>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, markRaw, onUnmounted, defineAsyncComponent, type Component } from 'vue'
+import { GridLayout } from 'grid-layout-plus'
+import { useDebounceFn } from '@vueuse/core'
+import { useRouter } from 'vue-router'
+import TableHeader from '@/components/table/header/index.vue'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import BackComponent from '@/components/icon/back/index.vue'
+import { queryById } from '@/api/system-boot/csstatisticalset'
+import { HelpFilled, FullScreen } from '@element-plus/icons-vue'
+import { useRoute } from 'vue-router'
+// defineOptions({
+//     name: 'cockpit/view'
+// })
+const { query } = useRoute()
+// 定义类型
+interface LayoutItem {
+    x: number
+    y: number
+    w: number
+    h: number
+    i: string | number
+    name: string
+    path: string
+    component?: Component | string
+    loading?: boolean
+    error?: any
+}
+const datePickerRef = ref()
+const title = ref('')
+const key = ref(0)
+const img = new URL(`@/assets/img/amplify.png`, import.meta.url)
+const img1 = new URL(`@/assets/img/reduce.png`, import.meta.url)
+// 响应式数据
+const rowHeight = ref(0)
+const rowWidth = ref(0)
+const layout: any = ref<LayoutItem[]>([
+    // {
+    //     x: 4,
+    //     y: 0,
+    //     w: 4,
+    //     h: 2,
+    //     i: '1',
+    //     name: '',
+    //     path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
+    // },
+])
+const layoutCopy = ref<LayoutItem[]>([])
+const flag = ref(true)
+// 组件映射
+const componentMap = reactive(new Map<string, Component | string>())
+
+// 获取主内容区域高度
+const getMainHeight = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetHeight || 0) - 70
+}
+// 获取主内容区域高度
+const getMainWidth = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetWidth || 0) - 20
+}
+
+// 初始化行高
+const initRowHeight = () => {
+    rowHeight.value = Math.max(0, (getMainHeight() - 72) / 6)
+    rowWidth.value = Math.max(0, getMainWidth() / 12)
+}
+
+// 动态注册组件
+const registerComponent = (path: string): Component | string | null => {
+    if (!path) return null
+
+    const cacheKey = path
+
+    // 使用缓存的组件
+    if (componentMap.has(cacheKey)) {
+        return componentMap.get(cacheKey)!
+    }
+
+    try {
+        // 动态导入组件
+        const modules = import.meta.glob('@/**/*.vue')
+        if (!modules[path]) {
+            console.error(`组件加载失败: ${path}`)
+            return null
+        }
+
+        const AsyncComponent = defineAsyncComponent({
+            loader: modules[path],
+            loadingComponent: () => h('div', '加载中...'),
+            errorComponent: ({ error }) => h('div', `加载错误: ${error.message}`),
+            delay: 200,
+            timeout: 10000
+        })
+
+        // 保存到映射中
+        componentMap.set(cacheKey, markRaw(AsyncComponent))
+        return AsyncComponent
+    } catch (error) {
+        console.error('注册组件失败:', error)
+        return null
+    }
+}
+// 缩放
+const zoom = (value: any) => {
+    if (flag.value) {
+        layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }]
+    } else {
+        layout.value = layoutCopy.value.map((item, index) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+    }
+    flag.value = !flag.value
+    key.value += 1
+}
+// 获取布局数据
+const fetchLayoutData = async () => {
+    try {
+        const { data } = await queryById({ id: query.id })
+        title.value = data.pageName + '_预览'
+        const parsedLayout = JSON.parse(data.containerConfig || '[]') as LayoutItem[]
+        // 处理布局数据
+        layout.value = parsedLayout.map((item, index) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+        layoutCopy.value = JSON.parse(JSON.stringify(layout.value))
+    } catch (error) {
+        console.error('获取布局数据失败:', error)
+        // 可以添加错误提示逻辑
+    }
+}
+// 计算组件高度
+const seRowHeight = (value: any) => {
+    if (value == 6) return 0
+    if (value == 5) return 12
+    if (value == 4) return 20
+    if (value == 3) return 30
+    if (value == 2) return 40
+    if (value == 1) return 50
+    return 0
+}
+
+// 窗口大小变化处理 - 使用防抖
+const handleResize = useDebounceFn(() => {
+    initRowHeight()
+    key.value += 1
+}, 200)
+
+// 生命周期钩子
+onMounted(() => {
+    initRowHeight()
+    fetchLayoutData()
+
+    // 添加窗口大小变化监听器
+    window.addEventListener('resize', handleResize)
+})
+
+onUnmounted(() => {
+    // 移除监听器防止内存泄漏
+    window.removeEventListener('resize', handleResize)
+})
+</script>
+
+<style lang="scss" scoped>
+.vgl-layout {
+    background-color: #f8f9fa;
+    border-radius: 4px;
+    overflow: hidden;
+}
+
+:deep(.vgl-item:not(.vgl-item--placeholder)) {
+    background-color: #ffffff;
+    border-radius: 4px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+    transition: all 0.3s ease;
+}
+
+:deep(.vgl-item:hover:not(.vgl-item--placeholder)) {
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.12);
+}
+
+:deep(.vgl-item--static) {
+    background-color: #f0f2f5;
+}
+
+.text {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    color: #606266;
+}
+
+:deep(.vgl-item) {
+    overflow: hidden;
+}
+
+.box {
+    overflow: hidden;
+
+    .title {
+        border-bottom: 1px solid #000;
+        font-size: 14px;
+        height: 30px;
+        font-weight: 600;
+        padding: 0px 10px;
+        color: #fff;
+        background-color: var(--el-color-primary);
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .HelpFilled {
+        height: 16px;
+        width: 16px;
+        color: #fff !important;
+        margin-right: 5px;
+    }
+}
+
+.layoutHeader {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 20px;
+    font-size: 16px;
+
+    .title {
+        font-weight: 600;
+    }
+}
+</style>
diff --git a/src/views/pqs/cockpit/setUp/index.vue b/src/views/pqs/cockpit/setUp/index.vue
index baee025f..04bae3dd 100644
--- a/src/views/pqs/cockpit/setUp/index.vue
+++ b/src/views/pqs/cockpit/setUp/index.vue
@@ -1,284 +1,286 @@
-<template>
-    <div class="default-main">
-        <TableHeader>
-            <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>
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <el-button type="primary" @click="onSubmitadd" icon="el-icon-Plus">新增</el-button>
-            </template>
-        </TableHeader>
-        <!-- <Table ref="tableRef" /> -->
-        <div
-            style="overflow-x: hidden; overflow-y: scroll; padding: 0 10px"
-            v-loading="tableStore.table.loading"
-            :style="{ height: tableStore.table.height }"
-        >
-            <el-row :gutter="12">
-                <el-col :span="6" v-for="item in tableStore.table.data" :key="item.id" class="mt10">
-                    <el-card class="box-card" shadow="hover">
-                        <div slot="header" class="clearfix">
-                            <span
-                                style="display: flex; align-items: center; font-weight: 550"
-                                :style="{ color: item.state == 1 ? `var(--el-color-primary)` : '' }"
-                            >
-                                {{ item.pageName }}
-                            </span>
-                            <div style="display: flex; justify-content: end">
-                                <el-button
-                                    class="color"
-                                    icon="el-icon-Position"
-                                    style="padding: 3px 0"
-                                    type="text"
-                                    v-if="item.state == 0"
-                                    @click="activation(item)"
-                                >
-                                    激活
-                                </el-button>
-                                <el-button
-                                    class="color"
-                                    icon="el-icon-View"
-                                    style="padding: 3px 0"
-                                    type="text"
-                                    @click="preview(item)"
-                                >
-                                    预览
-                                </el-button>
-                                <el-button
-                                    class="color"
-                                    icon="el-icon-Edit"
-                                    style="padding: 3px 0"
-                                    type="text"
-                                    @click="editd(item)"
-                                >
-                                    修改
-                                </el-button>
-
-                                <el-button
-                                    icon="el-icon-Delete"
-                                    style="padding: 3px 0; color: red"
-                                    type="text"
-                                    @click="deleted(item)"
-                                >
-                                    删除
-                                </el-button>
-                            </div>
-                        </div>
-                        <img v-if="item.thumbnail" :src="item.thumbnail" class="image" />
-                        <el-empty style="height: 220px" v-else description="暂无设计" />
-                    </el-card>
-                </el-col>
-            </el-row>
-        </div>
-        <div class="table-pagination">
-            <el-pagination
-                :currentPage="tableStore.table.params!.pageNum"
-                :page-size="tableStore.table.params!.pageSize"
-                :page-sizes="[10, 20, 50, 100]"
-                background
-                :layout="'sizes,total, ->, prev, pager, next, jumper'"
-                :total="tableStore.table.total"
-                @size-change="onTableSizeChange"
-                @current-change="onTableCurrentChange"
-            ></el-pagination>
-        </div>
-    </div>
-</template>
-<script setup lang="ts">
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import TableHeader from '@/components/table/header/index.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Edit } from '@element-plus/icons-vue'
-import { useRouter } from 'vue-router'
-const { push } = useRouter()
-import { deleteDashboard, activatePage } from '@/api/system-boot/csstatisticalset'
-defineOptions({
-    // name: 'cockpit/setUp'
-})
-const tableRef = ref()
-
-const tableStore = new TableStore({
-    showPage: false,
-    url: '/system-boot/dashboard/queryPage',
-    method: 'POST',
-    publicHeight: 60,
-    column: [],
-    loadCallback: () => {}
-})
-provide('tableStore', tableStore)
-tableStore.table.params.searchValue = ''
-onMounted(() => {
-    tableStore.table.ref = tableRef.value
-    tableStore.index()
-    tableStore.table.loading = false
-})
-// 查询
-const onSubmitadd = () => {
-    push(`/admin/cockpit/popup`)
-}
-// 预览
-const preview = (e: any) => {
-    push(`/admin/cockpit/view?id=${e.id}`)
-}
-// 修改
-const editd = (e: any) => {
-    push(`/admin/cockpit/popup?id=${e.id}`)
-}
-// 删除
-const deleted = (e: any) => {
-    ElMessageBox.confirm('此操作将永久删除该页面, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    })
-        .then(() => {
-            deleteDashboard({ id: e.id }).then((res: any) => {
-                if (res.code == 'A0000') {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除页面成功!'
-                    })
-                }
-                tableStore.index()
-            })
-        })
-        .catch(() => {
-            ElMessage({
-                type: 'info',
-                message: '已取消删除'
-            })
-        })
-}
-// 激活
-const activation = (e: any) => {
-    ElMessageBox.confirm('此操作将激活该页面, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    })
-        .then(() => {
-            activatePage({ id: e.id }).then((res: any) => {
-                if (res.code == 'A0000') {
-                    ElMessage({
-                        type: 'success',
-                        message: '激活成功!'
-                    })
-                }
-                tableStore.index()
-            })
-        })
-        .catch(() => {
-            ElMessage({
-                type: 'info',
-                message: '已取消删除'
-            })
-        })
-}
-
-const onTableSizeChange = (val: number) => {
-    tableStore.onTableAction('page-size-change', { size: val })
-}
-
-const onTableCurrentChange = (val: number) => {
-    tableStore.onTableAction('current-page-change', { page: val })
-}
-</script>
-<style lang="scss" scoped>
-.text {
-    font-size: 14px;
-}
-
-span {
-    font-size: 16px;
-}
-
-.item {
-    margin-bottom: 18px;
-}
-
-.image {
-    display: block;
-    width: 100%;
-    height: 220px;
-}
-
-.clearfix::before,
-.clearfix::after {
-    display: table;
-    content: '';
-}
-
-.clearfix::after {
-    clear: both;
-}
-
-.box-card {
-    width: 100%;
-    // border: 1px solid #000;
-    box-shadow: var(--el-box-shadow-light);
-}
-
-.setstyle {
-    min-height: 200px;
-    padding: 0 !important;
-    margin: 0;
-    overflow: auto;
-    cursor: default !important;
-}
-
-.color {
-    color: var(--el-color-primary);
-}
-
-:deep(.el-select-dropdown__wrap) {
-    max-height: 300px;
-}
-
-:deep(.el-tree) {
-    padding-top: 15px;
-    padding-left: 10px;
-
-    // 不可全选样式
-    .el-tree-node {
-        .is-leaf + .el-checkbox .el-checkbox__inner {
-            display: inline-block;
-        }
-
-        .el-checkbox .el-checkbox__inner {
-            display: none;
-        }
-    }
-}
-
-:deep(.el-card__header) {
-    padding: 13px 20px;
-    height: 44px;
-}
-
-.table-pagination {
-    height: 58px;
-    box-sizing: border-box;
-    width: 100%;
-    max-width: 100%;
-    background-color: var(--ba-bg-color-overlay);
-    padding: 13px 15px;
-    border-left: 1px solid #e4e7e9;
-    border-right: 1px solid #e4e7e9;
-    border-bottom: 1px solid #e4e7e9;
-}
-
-:deep(.el-pagination__sizes) {
-    .el-select {
-        min-width: 128px;
-    }
-}
-</style>
+<template>
+    <div class="default-main">
+        <TableHeader>
+            <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>
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <el-button type="primary" @click="onSubmitadd" icon="el-icon-Plus">新增</el-button>
+            </template>
+        </TableHeader>
+        <!-- <Table ref="tableRef" /> -->
+        <div
+            style="overflow-x: hidden; overflow-y: scroll; padding: 0 10px"
+            v-loading="tableStore.table.loading"
+            :style="{ height: tableStore.table.height }"
+        >
+            <el-row :gutter="12">
+                <el-col :span="6" v-for="item in tableStore.table.data" :key="item.id" class="mt10">
+                    <el-card class="box-card" shadow="hover">
+                        <div slot="header" class="clearfix">
+                            <span
+                                style="display: flex; align-items: center; font-weight: 550"
+                                :style="{ color: item.state == 1 ? `var(--el-color-primary)` : '' }"
+                            >
+                                {{ item.pageName }}
+                            </span>
+                           
+
+                            <div style="display: flex; justify-content: end">
+                                <!-- <el-button
+                                    class="color"
+                                    icon="el-icon-Position"
+                                    style="padding: 3px 0"
+                                    type="text"
+                                    v-if="item.state == 0"
+                                    @click="activation(item)"
+                                >
+                                    激活
+                                </el-button> -->
+                                <el-button
+                                    class="color"
+                                    icon="el-icon-View"
+                                    style="padding: 3px 0"
+                                    type="text"
+                                    @click="preview(item)"
+                                >
+                                    预览
+                                </el-button>
+                                <el-button
+                                    class="color"
+                                    icon="el-icon-Edit"
+                                    style="padding: 3px 0"
+                                    type="text"
+                                    @click="editd(item)"
+                                >
+                                    修改
+                                </el-button>
+
+                                <el-button
+                                    icon="el-icon-Delete"
+                                    style="padding: 3px 0; color: red"
+                                    type="text"
+                                    @click="deleted(item)"
+                                >
+                                    删除
+                                </el-button>
+                            </div>
+                        </div>
+                        <img v-if="item.thumbnail" :src="item.thumbnail" class="image" />
+                        <el-empty style="height: 220px" v-else description="暂无设计" />
+                    </el-card>
+                </el-col>
+            </el-row>
+        </div>
+        <div class="table-pagination">
+            <el-pagination
+                :currentPage="tableStore.table.params!.pageNum"
+                :page-size="tableStore.table.params!.pageSize"
+                :page-sizes="[10, 20, 50, 100]"
+                background
+                :layout="'sizes,total, ->, prev, pager, next, jumper'"
+                :total="tableStore.table.total"
+                @size-change="onTableSizeChange"
+                @current-change="onTableCurrentChange"
+            ></el-pagination>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Edit } from '@element-plus/icons-vue'
+import { useRouter } from 'vue-router'
+const { push } = useRouter()
+import { deleteDashboard, activatePage } from '@/api/system-boot/csstatisticalset'
+defineOptions({
+    // name: 'cockpit/setUp'
+})
+const tableRef = ref()
+
+const tableStore = new TableStore({
+    showPage: false,
+    url: '/system-boot/dashboard/queryPage',
+    method: 'POST',
+    publicHeight: 60,
+    column: [],
+    loadCallback: () => {}
+})
+provide('tableStore', tableStore)
+tableStore.table.params.searchValue = ''
+onMounted(() => {
+    tableStore.table.ref = tableRef.value
+    tableStore.index()
+    tableStore.table.loading = false
+})
+// 查询
+const onSubmitadd = () => {
+    push(`/admin/cockpit/popup`)
+}
+// 预览
+const preview = (e: any) => {
+    push(`/admin/cockpit/view?id=${e.id}`)
+}
+// 修改
+const editd = (e: any) => {
+    push(`/admin/cockpit/popup?id=${e.id}`)
+}
+// 删除
+const deleted = (e: any) => {
+    ElMessageBox.confirm('此操作将永久删除该页面, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    })
+        .then(() => {
+            deleteDashboard({ id: e.id }).then((res: any) => {
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除页面成功!'
+                    })
+                }
+                tableStore.index()
+            })
+        })
+        .catch(() => {
+            ElMessage({
+                type: 'info',
+                message: '已取消删除'
+            })
+        })
+}
+// 激活
+const activation = (e: any) => {
+    ElMessageBox.confirm('此操作将激活该页面, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    })
+        .then(() => {
+            activatePage({ id: e.id }).then((res: any) => {
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        type: 'success',
+                        message: '激活成功!'
+                    })
+                }
+                tableStore.index()
+            })
+        })
+        .catch(() => {
+            ElMessage({
+                type: 'info',
+                message: '已取消删除'
+            })
+        })
+}
+
+const onTableSizeChange = (val: number) => {
+    tableStore.onTableAction('page-size-change', { size: val })
+}
+
+const onTableCurrentChange = (val: number) => {
+    tableStore.onTableAction('current-page-change', { page: val })
+}
+</script>
+<style lang="scss" scoped>
+.text {
+    font-size: 14px;
+}
+
+span {
+    font-size: 16px;
+}
+
+.item {
+    margin-bottom: 18px;
+}
+
+.image {
+    display: block;
+    width: 100%;
+    height: 220px;
+}
+
+.clearfix::before,
+.clearfix::after {
+    display: table;
+    content: '';
+}
+
+.clearfix::after {
+    clear: both;
+}
+
+.box-card {
+    width: 100%;
+    // border: 1px solid #000;
+    box-shadow: var(--el-box-shadow-light);
+}
+
+.setstyle {
+    min-height: 200px;
+    padding: 0 !important;
+    margin: 0;
+    overflow: auto;
+    cursor: default !important;
+}
+
+.color {
+    color: var(--el-color-primary);
+}
+
+:deep(.el-select-dropdown__wrap) {
+    max-height: 300px;
+}
+
+:deep(.el-tree) {
+    padding-top: 15px;
+    padding-left: 10px;
+
+    // 不可全选样式
+    .el-tree-node {
+        .is-leaf + .el-checkbox .el-checkbox__inner {
+            display: inline-block;
+        }
+
+        .el-checkbox .el-checkbox__inner {
+            display: none;
+        }
+    }
+}
+
+:deep(.el-card__header) {
+    padding: 13px 20px;
+    height: 44px;
+}
+
+.table-pagination {
+    height: 58px;
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+    padding: 13px 15px;
+    border-left: 1px solid #e4e7e9;
+    border-right: 1px solid #e4e7e9;
+    border-bottom: 1px solid #e4e7e9;
+}
+
+:deep(.el-pagination__sizes) {
+    .el-select {
+        min-width: 128px;
+    }
+}
+</style>
diff --git a/src/views/pqs/harmonicMonitoring/embed/dataOverview_JB/index.vue b/src/views/pqs/harmonicMonitoring/embed/dataOverview_JB/index.vue
new file mode 100644
index 00000000..37fe3593
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/embed/dataOverview_JB/index.vue
@@ -0,0 +1,377 @@
+<template>
+    <div class="default-main">
+        <TableHeader :showSearch="false" v-show="flag">
+            <template v-slot:select>
+                <el-form-item label="日期">
+                    <DatePicker
+                        ref="datePickerRef"
+                        :nextFlag="false"
+                        :theCurrentTime="true"
+                        @change="handleDatePickerChange"
+                    ></DatePicker>
+                </el-form-item>
+            </template>
+            <template v-slot:operation></template>
+        </TableHeader>
+
+        <GridLayout
+            v-model:layout="layout"
+            :row-height="rowHeight"
+            :is-resizable="false"
+            :is-draggable="false"
+            :responsive="false"
+            :vertical-compact="false"
+            prevent-collision
+            :col-num="12"
+        >
+            <template #item="{ item }">
+                <div class="box">
+                    <div class="title">
+                        <div style="display: flex; align-items: center">
+                            <Icon class="HelpFilled" :name="(item as LayoutItem).icon" />
+                            {{ (item as LayoutItem).name }}
+                        </div>
+                        <!-- <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" /> -->
+                        <el-tooltip effect="dark" content="查看详情" placement="top">
+                            <View style="cursor: pointer; height: 16px" @click="jump(item)" />
+                        </el-tooltip>
+                    </div>
+                    <div>
+                        <component
+                            :is="(item as LayoutItem).component"
+                            v-if="(item as LayoutItem).component"
+                            class="pd10"
+                            :key="key"
+                            :timeValue="datePickerRef?.timeValue || 3"
+                            :height="rowHeight * item.h - seRowHeight(item.h) + 'px'"
+                            :width="rowWidth * item.w - 30 + 'px'"
+                            :timeKey="(item as LayoutItem).timeKey"
+                            :interval="datePickerRef?.interval"
+                            :w="item.w"
+                            :h="item.h"
+                        />
+                        <div v-else class="pd10">组件加载失败...</div>
+                    </div>
+                </div>
+            </template>
+        </GridLayout>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, markRaw, onUnmounted, computed, defineAsyncComponent, type Component } from 'vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { GridLayout } from 'grid-layout-plus'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import { useDebounceFn } from '@vueuse/core'
+import { useRouter, useRoute } from 'vue-router'
+import { View } from '@element-plus/icons-vue'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { adminBaseRoutePath } from '@/router/static'
+const { push } = useRouter()
+const datePickerRef = ref()
+const router = useRouter()
+const route = useRoute()
+const timeCacheStore = useTimeCacheStore()
+
+defineOptions({
+    name: 'harmonic-boot/preview'
+})
+// 定义类型
+interface LayoutItem {
+    x: number
+    y: number
+    w: number
+    h: number
+    timeKey: number | string
+    i: string | number
+    name: string
+    path: string
+    icon?: string // 新增 icon 可选字段
+    component?: Component | string
+    loading?: boolean
+    error?: any
+}
+const key = ref(0)
+const img = new URL(`@/assets/img/amplify.png`, import.meta.url).href
+const img1 = new URL(`@/assets/img/reduce.png`, import.meta.url).href
+// 响应式数据
+const rowHeight = ref(0)
+const rowWidth = ref(0)
+const layout: any = ref([
+    // {
+    //     x: 4,
+    //     y: 0,
+    //     w: 4,
+    //     h: 2,
+    //     i: '1',
+    //     name: '',
+    //     path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
+    // },
+])
+const layoutCopy: any = ref([])
+const flag = ref(true)
+// 组件映射
+const componentMap = reactive(new Map<string, Component | string>())
+const dataList: any = ref({})
+// 获取主内容区域高度
+const getMainHeight = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetHeight || 0) - 70
+}
+// 获取主内容区域高度
+const getMainWidth = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetWidth || 0) - 20
+}
+
+// 初始化行高
+const initRowHeight = () => {
+    rowHeight.value = Math.max(0, (getMainHeight() - 77 + (flag.value ? 0 : 56)) / 6)
+    rowWidth.value = Math.max(0, getMainWidth() / 12)
+}
+
+// 动态注册组件
+const registerComponent = (path: string): Component | string | null => {
+    if (!path) return null
+
+    const cacheKey = path
+
+    // 使用缓存的组件
+    if (componentMap.has(cacheKey)) {
+        return componentMap.get(cacheKey)!
+    }
+
+    try {
+        // 动态导入组件
+        const modules = import.meta.glob('@/**/*.vue')
+        if (!modules[path]) {
+            console.error(`组件加载失败: ${path}`)
+            return null
+        }
+
+        const AsyncComponent = defineAsyncComponent({
+            loader: modules[path],
+            loadingComponent: () => h('div', '加载中...'),
+            errorComponent: ({ error }) => h('div', `加载错误: ${error.message}`),
+            delay: 200,
+            timeout: 10000
+        })
+
+        // 保存到映射中
+        componentMap.set(cacheKey, markRaw(AsyncComponent))
+        return AsyncComponent
+    } catch (error) {
+        console.error('注册组件失败:', error)
+        return null
+    }
+}
+// 缩放
+const zoom = (value: any) => {
+    if (flag.value) {
+        layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }]
+    } else {
+        layout.value = layoutCopy.value.map((item: any, index: number) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+    }
+
+    flag.value = !flag.value
+
+    initRowHeight()
+    key.value += 1
+}
+// 跳转
+const jump = (item: any) => {
+    if (item.routerPath) {
+        push(adminBaseRoutePath + item.routerPath)
+    }
+}
+// 计算组件高度
+const seRowHeight = (value: any) => {
+    if (value == 6) return 0
+    if (value == 5) return 12
+    if (value == 4) return 20
+    if (value == 3) return 30
+    if (value == 2) return 40
+    if (value == 1) return 50
+    return 0
+}
+// 获取布局数据
+const fetchLayoutData = async () => {
+    try {
+        // const { data } = await queryByPagePath({ pagePath: router.currentRoute.value.name })
+        // dataList.value = data
+        dataList.value = {
+            createBy: 'e6a67ccbe789493687766c4304fcb228',
+            createTime: '2025-11-26 08:43:56',
+            updateBy: 'e6a67ccbe789493687766c4304fcb228',
+            updateTime: '2025-11-26 08:43:56',
+            id: 'e8218545cc11e32d5d6b87c92fdd0fbc',
+            pageName: '测试',
+            thumbnail: '',
+            remark: '',
+            containerConfig: [
+                {
+                    x: 0,
+                    y: 0,
+                    w: 6,
+                    h: 3,
+                    i: 0.9274640143002512,
+                    name: '终端运行评价',
+                    path: '/src/components/cockpit/terminalEvaluation/index.vue',
+                    icon: 'local-审计列表',
+                    timeKey: '3',
+                    routerPath: '/runManage/runEvaluate',
+                    moved: false
+                },
+                {
+                    x: 6,
+                    y: 0,
+                    w: 6,
+                    h: 3,
+                    i: 0.9154814002445102,
+                    name: '终端在线率',
+                    path: '/src/components/cockpit/onlineRate/index.vue',
+                    icon: 'local-告警中心',
+                    timeKey: '3',
+                    routerPath: '/harmonic-boot/area/OnlineRate',
+                    moved: false
+                },
+                {
+                    x: 0,
+                    y: 3,
+                    w: 6,
+                    h: 3,
+                    i: 0.6560899767923003,
+                    name: '监测点数据完整性',
+                    path: '/src/components/cockpit/integrity/index.vue',
+                    icon: 'local-稳态指标超标明细',
+                    timeKey: '3',
+                    routerPath: '/harmonic-boot/harmonic/getIntegrityData',
+                    moved: false
+                },
+                {
+                    x: 6,
+                    y: 3,
+                    w: 6,
+                    h: 3,
+                    i: 0.5812302648025226,
+                    name: '异常数据清洗',
+                    path: '/src/components/cockpit/dataCleaning/index.vue',
+                    icon: 'local-区域暂态评估',
+                    timeKey: '3',
+                    routerPath: '/runManage/cleaning',
+                    moved: false
+                }
+            ],
+            sort: 100,
+            state: 1,
+            pagePath: 'dashboard/index6',
+            pathName: null,
+            routeName: '/src/views/pqs/cockpit/homePage/index.vue',
+            icon: ''
+        }
+        const parsedLayout = (dataList.value.containerConfig || '[]') as LayoutItem[]
+        // 处理布局数据
+        layout.value = parsedLayout.map((item, index) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+        layoutCopy.value = JSON.parse(JSON.stringify(layout.value))
+        initRowHeight()
+    } catch (error) {
+        console.error('获取布局数据失败:', error)
+        // 可以添加错误提示逻辑
+    }
+}
+
+// 窗口大小变化处理 - 使用防抖
+const handleResize = useDebounceFn(() => {
+    initRowHeight()
+    // key.value += 1
+}, 200)
+
+// 处理 DatePicker 值变化事件
+const handleDatePickerChange = (value: any) => {
+    // 将值缓存到 timeCache
+    if (value) {
+        timeCacheStore.setCache(route.path, value.interval, value.timeValue)
+    }
+}
+
+// 生命周期钩子
+onMounted(() => {
+    // initRowHeight()
+    fetchLayoutData()
+
+    // 添加窗口大小变化监听器
+    window.addEventListener('resize', handleResize)
+})
+
+onUnmounted(() => {
+    // 移除监听器防止内存泄漏
+    window.removeEventListener('resize', handleResize)
+})
+</script>
+
+<style lang="scss" scoped>
+.vgl-layout {
+    background-color: #f8f9fa;
+    border-radius: 4px;
+    overflow: hidden;
+}
+
+:deep(.vgl-item:not(.vgl-item--placeholder)) {
+    background-color: #ffffff;
+    border-radius: 4px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+    transition: all 0.3s ease;
+}
+
+:deep(.vgl-item:hover:not(.vgl-item--placeholder)) {
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.12);
+}
+
+:deep(.vgl-item--static) {
+    background-color: #f0f2f5;
+}
+
+.text {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    color: #606266;
+}
+
+:deep(.vgl-item) {
+    overflow: hidden;
+}
+.box {
+    overflow: hidden;
+    .title {
+        border-bottom: 1px solid #000;
+        font-size: 14px;
+        height: 30px;
+        font-weight: 600;
+        padding: 0px 10px;
+        color: #fff;
+        background-color: var(--el-color-primary);
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+    .HelpFilled {
+        height: 16px;
+        width: 16px;
+        color: #fff !important;
+        margin-right: 5px;
+    }
+}
+</style>
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue
index a55bc838..84f3d310 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue
@@ -1,291 +1,291 @@
-<template>
-    <TableHeader area datePicker ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="统计类型:">
-                <el-select
-                    v-model="tableStore.table.params.statisticalType"
-                    value-key="id"
-                    placeholder="请选择统计类型"
-                >
-                    <el-option
-                        v-for="item in classificationData"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="电压等级:">
-                <el-select
-                    v-model="tableStore.table.params.scale"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择电压等级"
-                >
-                    <el-option
-                        v-for="item in voltageleveloption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="终端厂家:">
-                <el-select
-                    v-model="tableStore.table.params.manufacturer"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择终端厂家"
-                >
-                    <el-option
-                        v-for="item in terminaloption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="干扰源类型:">
-                <el-select
-                    v-model="tableStore.table.params.loadType"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择干扰源类型"
-                >
-                    <el-option
-                        v-for="item in interfereoption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-    </TableHeader>
-    <my-echart class="mt10" :style="`height: calc(${tableStore.table.height} - 75px)`" :options="options" />
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, nextTick } 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 { useDictData } from '@/stores/dictData'
-import * as echarts from 'echarts/core'
-const dictData = useDictData()
-const options = ref({})
-
-const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
-const terminaloption = dictData.getBasicData('Dev_Manufacturers')
-const interfereoption = dictData.getBasicData('Interference_Source')
-
-const TableHeaderRef = ref()
-const tableStore = new TableStore({
-    url: '/device-boot/LineIntegrityData/getIntegrityIcon',
-
-    showPage: false,
-    method: 'POST',
-    column: [],
-
-    loadCallback: () => {
-        // tableStore.table.data.type
-        let code = tableStore.table.params.statisticalType.code
-        let title = '',
-            titleX = ''
-        if (code == 'Power_Network') {
-            title = '区域'
-            titleX = '区域'
-        } else if (code == 'Manufacturer') {
-            title = '终端厂家'
-            titleX = '终端\n厂家'
-        } else if (code == 'Voltage_Level') {
-            title = '电压等级'
-            titleX = '电压\n等级'
-        } else if (code == 'Load_Type') {
-            title = '干扰源类型'
-            titleX = '干扰\n源类型'
-        } else if (code == 'Report_Type') {
-            title = '上报类型'
-            titleX = '上报\n类型'
-        }
-        options.value = {
-            title: {
-                text: title
-            },
-            tooltip: {
-                formatter: function (params: any) {
-                    var tips = ''
-
-                    for (var i = 0; i < params.length; i++) {
-                        if (params[i].value == 1) {
-                            tips += params[i].name + '</br>'
-                            tips += '完整性:暂无数据'
-                        } else {
-                            tips += params[i].name + '</br>'
-                            tips += '完整性:' + params[i].value.toFixed(2)
-                        }
-                    }
-                    return tips
-                }
-            },
-            grid: {
-                top: '50px',
-                right: '80px'
-            },
-            xAxis: {
-                name: titleX,
-                data: tableStore.table.data.map((item: any) => item.type)
-            },
-            yAxis: {
-                name: '%',
-                max: 100
-            },
-            options: {
-                series: [
-                    {
-                        name: '完整性',
-                        type: 'bar',
-                        data: tableStore.table.data.map((item: any) => item.single),
-                        itemStyle: {
-                            normal: {
-                                // 随机显示
-                                //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
-
-                                // 定制显示（按顺序）
-                                color: function (params: any) {
-                                    if (params.value >= 90) {
-                                        return new echarts.graphic.LinearGradient(
-                                            0,
-                                            1,
-                                            0,
-                                            0,
-                                            [
-                                                {
-                                                    offset: 1,
-                                                    color: '#339966'
-                                                }
-                                            ],
-                                            false
-                                        )
-                                    } else if (params.value >= 60 && params.value <= 90) {
-                                        return new echarts.graphic.LinearGradient(
-                                            0,
-                                            1,
-                                            0,
-                                            0,
-                                            [
-                                                {
-                                                    offset: 1,
-                                                    color: '#FFCC33'
-                                                }
-                                            ],
-                                            false
-                                        )
-                                    } else if (params.value <= 60 && params.value > 1) {
-                                        return new echarts.graphic.LinearGradient(
-                                            0,
-                                            1,
-                                            0,
-                                            0,
-                                            [
-                                                {
-                                                    offset: 1,
-                                                    color: '#A52a2a'
-                                                }
-                                            ],
-                                            false
-                                        )
-                                    } else if (params.value > 0 && params.value <= 1) {
-                                        return new echarts.graphic.LinearGradient(
-                                            0,
-                                            1,
-                                            0,
-                                            0,
-                                            [
-                                                {
-                                                    offset: 1,
-                                                    color: '#ccc'
-                                                }
-                                            ],
-                                            false
-                                        )
-                                    }
-                                }
-                            }
-                        },
-                        markLine: {
-                            silent: false,
-                            symbol: 'circle',
-                            data: [
-                                {
-                                    name: '',
-                                    yAxis: 100,
-                                    lineStyle: {
-                                        color: '#339966'
-                                    },
-                                    label: {
-                                        //position: "middle",
-                                        formatter: '{b}',
-                                        textStyle: {
-                                            color: '#339966'
-                                        }
-                                    }
-                                },
-                                {
-                                    name: '',
-                                    yAxis: 90,
-                                    lineStyle: {
-                                        color: '#FFCC33'
-                                    },
-                                    label: {
-                                        // position: "middle",
-                                        formatter: '{b}',
-                                        textStyle: {
-                                            color: '#FFCC33'
-                                        }
-                                    }
-                                },
-                                {
-                                    name: '',
-                                    yAxis: 60,
-                                    lineStyle: {
-                                        color: '#A52a2a'
-                                    },
-                                    label: {
-                                        //position: "middle",
-                                        formatter: '{b}',
-                                        textStyle: {
-                                            color: '#A52a2a'
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        }
-    }
-})
-
-tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0]
-tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = 2
-tableStore.table.params.serverName = 'harmonicBoot'
-
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    tableStore.index()
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="统计类型:">
+                <el-select
+                    v-model="tableStore.table.params.statisticalType"
+                    value-key="id"
+                    placeholder="请选择统计类型"
+                >
+                    <el-option
+                        v-for="item in classificationData"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="电压等级:">
+                <el-select
+                    v-model="tableStore.table.params.scale"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择电压等级"
+                >
+                    <el-option
+                        v-for="item in voltageleveloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="终端厂家:">
+                <el-select
+                    v-model="tableStore.table.params.manufacturer"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择终端厂家"
+                >
+                    <el-option
+                        v-for="item in terminaloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select
+                    v-model="tableStore.table.params.loadType"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择干扰源类型"
+                >
+                    <el-option
+                        v-for="item in interfereoption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+    </TableHeader>
+    <my-echart class="mt10" :style="`height: calc(${tableStore.table.height} - 75px)`" :options="options" />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } 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 { useDictData } from '@/stores/dictData'
+import * as echarts from 'echarts/core'
+const dictData = useDictData()
+const options = ref({})
+
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+const interfereoption = dictData.getBasicData('Interference_Source')
+
+const TableHeaderRef = ref()
+const tableStore = new TableStore({
+    url: '/device-boot/LineIntegrityData/getIntegrityIcon',
+
+    showPage: false,
+    method: 'POST',
+    column: [],
+
+    loadCallback: () => {
+        // tableStore.table.data.type
+        let code = tableStore.table.params.statisticalType.code
+        let title = '',
+            titleX = ''
+        if (code == 'Power_Network') {
+            title = '区域'
+            titleX = '区域'
+        } else if (code == 'Manufacturer') {
+            title = '终端厂家'
+            titleX = '终端\n厂家'
+        } else if (code == 'Voltage_Level') {
+            title = '电压等级'
+            titleX = '电压\n等级'
+        } else if (code == 'Load_Type') {
+            title = '干扰源类型'
+            titleX = '干扰\n源类型'
+        } else if (code == 'Report_Type') {
+            title = '上报类型'
+            titleX = '上报\n类型'
+        }
+        options.value = {
+            title: {
+                text: title
+            },
+            tooltip: {
+                formatter: function (params: any) {
+                    var tips = ''
+
+                    for (var i = 0; i < params.length; i++) {
+                        if (params[i].value == 3.14159) {
+                            tips += params[i].name + '</br>'
+                            tips += '完整性:暂无数据'
+                        } else {
+                            tips += params[i].name + '</br>'
+                            tips += '完整性:' + params[i].value.toFixed(2)
+                        }
+                    }
+                    return tips
+                }
+            },
+            grid: {
+                top: '50px',
+                right: '80px'
+            },
+            xAxis: {
+                name: titleX,
+                data: tableStore.table.data.map((item: any) => item.type)
+            },
+            yAxis: {
+                name: '%',
+                max: 100
+            },
+            options: {
+                series: [
+                    {
+                        name: '完整性',
+                        type: 'bar',
+                        data: tableStore.table.data.map((item: any) => item.single),
+                        itemStyle: {
+                            normal: {
+                                // 随机显示
+                                //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
+
+                                // 定制显示（按顺序）
+                                color: function (params: any) {
+                                    if (params.value ==3.14159) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#ccc'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value >= 90) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#339966'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value >= 60 && params.value <= 90) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#FFCC33'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value <= 60 && params.value > 1) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#A52a2a'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    }
+                                }
+                            }
+                        },
+                        markLine: {
+                            silent: false,
+                            symbol: 'circle',
+                            data: [
+                                {
+                                    name: '',
+                                    yAxis: 100,
+                                    lineStyle: {
+                                        color: '#339966'
+                                    },
+                                    label: {
+                                        //position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#339966'
+                                        }
+                                    }
+                                },
+                                {
+                                    name: '',
+                                    yAxis: 90,
+                                    lineStyle: {
+                                        color: '#FFCC33'
+                                    },
+                                    label: {
+                                        // position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#FFCC33'
+                                        }
+                                    }
+                                },
+                                {
+                                    name: '',
+                                    yAxis: 60,
+                                    lineStyle: {
+                                        color: '#A52a2a'
+                                    },
+                                    label: {
+                                        //position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#A52a2a'
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                ]
+            }
+        }
+    }
+})
+
+tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'harmonicBoot'
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
index e619f584..7e1cb079 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
@@ -1,314 +1,314 @@
-<template>
-    <TableHeader area datePicker ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="筛选">
-                <el-input
-                    v-model="tableStore.table.params.filterName"
-                    @keyup="searchEvent"
-                    placeholder="输入关键字筛选"
-                />
-            </el-form-item>
-            <el-form-item label="统计类型:">
-                <el-select
-                    v-model="tableStore.table.params.statisticalType"
-                    value-key="id"
-                    placeholder="请选择统计类型"
-                >
-                    <el-option
-                        v-for="item in classificationData"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="电压等级:">
-                <el-select
-                    v-model="tableStore.table.params.scale"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择电压等级"
-                >
-                    <el-option
-                        v-for="item in voltageleveloption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="终端厂家:">
-                <el-select
-                    v-model="tableStore.table.params.manufacturer"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择终端厂家"
-                >
-                    <el-option
-                        v-for="item in terminaloption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="干扰源类型:">
-                <el-select
-                    v-model="tableStore.table.params.loadType"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择干扰源类型"
-                >
-                    <el-option
-                        v-for="item in interfereoption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
-            <el-button icon="el-icon-Download" :loading="loading" @click="exportEvent" type="primary">
-                下载报告
-            </el-button>
-        </template>
-    </TableHeader>
-    <Table
-        ref="tableRef"
-        :radio-config="{
-            labelField: 'name',
-            highlight: true,
-            visibleMethod: row => row.row.level == 6
-        }"
-        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
-        :scroll-y="{ enabled: true }"
-    />
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, reactive } from 'vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { exportModelJB } from '@/api/harmonic-boot/harmonic.ts'
-import { debounce } from 'lodash-es'
-import XEUtils from 'xe-utils'
-const dictData = useDictData()
-const tableRef = ref()
-const treeDataCopy: any = ref([])
-const treeData: any = ref([])
-const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
-const terminaloption = dictData.getBasicData('Dev_Manufacturers')
-const interfereoption = dictData.getBasicData('Interference_Source')
-
-const TableHeaderRef = ref()
-const tableStore = new TableStore({
-    url: '/device-boot/LineIntegrityData/getLineIntegrityData',
-    publicHeight: 65,
-    showPage: false,
-    method: 'POST',
-    column: [
-        // { width: '60', title: '111',  },
-        { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
-        {
-            field: 'ip',
-            title: '网络参数',
-            formatter: ({ row }: any) => {
-                return row.ip || '/'
-            }
-        },
-        {
-            field: 'deviceName',
-            title: '终端名称',
-            formatter: ({ row }: any) => {
-                return row.deviceName || '/'
-            }
-        },
-        {
-            field: 'manufacturer',
-            title: '厂家',
-            formatter: ({ row }: any) => {
-                return row.manufacturer || '/'
-            }
-        },
-        {
-            field: 'comFlag',
-            title: '通讯状态',
-            render: 'tag',
-            custom: {
-                0: 'danger',
-                1: 'success',
-                3: 'info'
-            },
-            replaceValue: {
-                0: '中断',
-                1: '正常',
-                3: '/'
-            }
-        },
-        {
-            field: 'updateTime',
-            title: '最新数据时间',
-            formatter: ({ row }: any) => {
-                return row.updateTime || '/'
-            }
-        },
-        {
-            field: 'integrityData',
-            title: '完整性(%)',
-            formatter: ({ row }: any) => {
-                return row.integrityData == 3.14159 ? '暂无数据' : row.integrityData.toFixed(2)
-            }
-        },
-        {
-            field: 'assess',
-            title: '评估',
-            render: 'tag',
-            custom: {
-                0: 'info',
-                1: 'danger',
-                2: 'warning',
-                3: 'success'
-            },
-            replaceValue: {
-                0: '暂无数据',
-                1: '不合格',
-                2: '合格',
-                3: '优秀'
-            }
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.options.column[0].title = tableStore.table.params.statisticalType.name
-    },
-    loadCallback: () => {
-        setTimeout(() => {
-            tableRef.value.getRef().setAllTreeExpand(true)
-        }, 1000)
-
-        treeData.value = tree2List(tableStore.table.data, Math.random() * 1000)
-        treeDataCopy.value = JSON.parse(JSON.stringify(treeData.value))
-        tableStore.table.data = treeData.value
-        tableStore.table.params.filterName = ''
-        searchEvent()
-    }
-})
-const loading = ref(false)
-
-tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0]
-tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = 2
-tableStore.table.params.serverName = 'harmonicBoot'
-
-provide('tableStore', tableStore)
-const tree2List = (list: any, id: any) => {
-    //存储结果的数组
-    let arr: any = []
-    // 遍历 tree 数组
-    list.forEach((item: any) => {
-        item.uPid = id
-        item.uId = Math.random() * 1000
-        item.comFlag = item.comFlag == null ? 3 : item.comFlag
-        item.assess = item.integrityData == 3.14159 ? 0 : item.integrityData < 60 ? 1 : item.integrityData < 90 ? 2 : 3
-        // 判断item是否存在children
-        if (!item.children) return arr.push(item)
-        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children, item.uId)
-        // 删除item的children属性
-        delete item.children
-        // 把item和children数组添加至结果数组
-        //..children: 意思是把children数组展开
-        arr.push(item, ...children)
-    })
-    // 返回结果数组
-    return arr
-}
-onMounted(() => {
-    tableStore.index()
-})
-const searchEvent = debounce(() => {
-    const filterVal = XEUtils.toValueString(tableStore.table.params.filterName).trim().toLowerCase()
-
-    if (filterVal) {
-        const options = { children: 'children' }
-        const searchProps = ['name']
-
-        const rest = XEUtils.searchTree(
-            treeDataCopy.value,
-            (item: any) => searchProps.some(key => String(item[key]).toLowerCase().indexOf(filterVal) > -1),
-            options
-        )
-        console.log('🚀 ~ searchEvent ~ rest:', rest)
-
-        tableStore.table.data = rest
-
-        // 搜索之后默认展开所有子节点
-    } else {
-        tableStore.table.data = treeDataCopy.value
-    }
-    nextTick(() => {
-        const $table = tableRef.value.getRef()
-        if ($table) {
-            $table.setAllTreeExpand(true)
-        }
-    })
-}, 500)
-const exportEvent = () => {
-    let line = tableRef.value.getRef().getRadioRecord()
-    if (!line) {
-        ElMessage({
-            type: 'warning',
-
-            message: '请选择要导出的数据'
-        })
-        return
-    }
-    loading.value = true
-    let form = new FormData()
-    form.append('isUrl', false)
-    form.append('lineIndex', line.id)
-    form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0])
-    form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1])
-    form.append('type', 0)
-    form.append('name', line.name)
-    ElMessage({
-        message: '下载报告中,请稍等.....',
-        duration: 1000
-    })
-    exportModelJB(form)
-        .then(async res => {
-            let blob = new Blob([res], {
-                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-            })
-
-            const url = window.URL.createObjectURL(blob)
-            const link = document.createElement('a') // 创建a标签
-            link.href = url
-            link.download =
-                line.name +
-                TableHeaderRef.value.datePickerRef.timeValue[0] +
-                '_' +
-                TableHeaderRef.value.datePickerRef.timeValue[1] // 设置下载的文件名
-            document.body.appendChild(link)
-            link.click() //执行下载
-            document.body.removeChild(link)
-            loading.value = false
-        })
-        .catch(() => {
-            loading.value = false
-        })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="筛选">
+                <el-input
+                    v-model="tableStore.table.params.filterName"
+                    @keyup="searchEvent"
+                    placeholder="输入关键字筛选"
+                />
+            </el-form-item>
+            <el-form-item label="统计类型:">
+                <el-select
+                    v-model="tableStore.table.params.statisticalType"
+                    value-key="id"
+                    placeholder="请选择统计类型"
+                >
+                    <el-option
+                        v-for="item in classificationData"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="电压等级:">
+                <el-select
+                    v-model="tableStore.table.params.scale"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择电压等级"
+                >
+                    <el-option
+                        v-for="item in voltageleveloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="终端厂家:">
+                <el-select
+                    v-model="tableStore.table.params.manufacturer"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择终端厂家"
+                >
+                    <el-option
+                        v-for="item in terminaloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select
+                    v-model="tableStore.table.params.loadType"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择干扰源类型"
+                >
+                    <el-option
+                        v-for="item in interfereoption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
+            <el-button icon="el-icon-Download" :loading="loading" @click="exportEvent" type="primary">
+                下载报告
+            </el-button>
+        </template>
+    </TableHeader>
+    <Table
+        ref="tableRef"
+        :radio-config="{
+            labelField: 'name',
+            highlight: true,
+            visibleMethod: row => row.row.level == 6
+        }"
+        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
+        :scroll-y="{ enabled: true }"
+    />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { exportModelJB } from '@/api/harmonic-boot/harmonic'
+import { debounce } from 'lodash-es'
+import XEUtils from 'xe-utils'
+const dictData = useDictData()
+const tableRef = ref()
+const treeDataCopy: any = ref([])
+const treeData: any = ref([])
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+const interfereoption = dictData.getBasicData('Interference_Source')
+
+const TableHeaderRef = ref()
+const tableStore = new TableStore({
+    url: '/device-boot/LineIntegrityData/getLineIntegrityData',
+    publicHeight: 65,
+    showPage: false,
+    method: 'POST',
+    column: [
+        // { width: '60', title: '111',  },
+        { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
+        {
+            field: 'ip',
+            title: '网络参数',
+            formatter: ({ row }: any) => {
+                return row.ip || '/'
+            }
+        },
+        {
+            field: 'deviceName',
+            title: '终端名称',
+            formatter: ({ row }: any) => {
+                return row.deviceName || '/'
+            }
+        },
+        {
+            field: 'manufacturer',
+            title: '厂家',
+            formatter: ({ row }: any) => {
+                return row.manufacturer || '/'
+            }
+        },
+        {
+            field: 'comFlag',
+            title: '通讯状态',
+            render: 'tag',
+            custom: {
+                0: 'danger',
+                1: 'success',
+                3: 'info'
+            },
+            replaceValue: {
+                0: '中断',
+                1: '正常',
+                3: '/'
+            }
+        },
+        {
+            field: 'updateTime',
+            title: '最新数据时间',
+            formatter: ({ row }: any) => {
+                return row.updateTime || '/'
+            }
+        },
+        {
+            field: 'integrityData',
+            title: '完整性(%)',
+            formatter: ({ row }: any) => {
+                return row.integrityData == 3.14159 ? '暂无数据' : row.integrityData.toFixed(2)
+            }
+        },
+        {
+            field: 'assess',
+            title: '评估',
+            render: 'tag',
+            custom: {
+                0: 'info',
+                1: 'danger',
+                2: 'warning',
+                3: 'success'
+            },
+            replaceValue: {
+                0: '暂无数据',
+                1: '不合格',
+                2: '合格',
+                3: '优秀'
+            }
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.options.column[0].title = tableStore.table.params.statisticalType.name
+    },
+    loadCallback: () => {
+        setTimeout(() => {
+            tableRef.value.getRef().setAllTreeExpand(true)
+        }, 1000)
+
+        treeData.value = tree2List(tableStore.table.data, Math.random() * 1000)
+        treeDataCopy.value = JSON.parse(JSON.stringify(treeData.value))
+        tableStore.table.data = treeData.value
+        tableStore.table.params.filterName = ''
+        searchEvent()
+    }
+})
+const loading = ref(false)
+
+tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'harmonicBoot'
+
+provide('tableStore', tableStore)
+const tree2List = (list: any, id: any) => {
+    //存储结果的数组
+    let arr: any = []
+    // 遍历 tree 数组
+    list.forEach((item: any) => {
+        item.uPid = id
+        item.uId = Math.random() * 1000
+        item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.assess = item.integrityData == 3.14159 ? 0 : item.integrityData < 60 ? 1 : item.integrityData < 90 ? 2 : 3
+        // 判断item是否存在children
+        if (!item.children) return arr.push(item)
+        // 函数递归，对children数组进行tree2List的转换
+        const children = tree2List(item.children, item.uId)
+        // 删除item的children属性
+        delete item.children
+        // 把item和children数组添加至结果数组
+        //..children: 意思是把children数组展开
+        arr.push(item, ...children)
+    })
+    // 返回结果数组
+    return arr
+}
+onMounted(() => {
+    tableStore.index()
+})
+const searchEvent = debounce(() => {
+    const filterVal = XEUtils.toValueString(tableStore.table.params.filterName).trim().toLowerCase()
+
+    if (filterVal) {
+        const options = { children: 'children' }
+        const searchProps = ['name']
+
+        const rest = XEUtils.searchTree(
+            treeDataCopy.value,
+            (item: any) => searchProps.some(key => String(item[key]).toLowerCase().indexOf(filterVal) > -1),
+            options
+        )
+        console.log('🚀 ~ searchEvent ~ rest:', rest)
+
+        tableStore.table.data = rest
+
+        // 搜索之后默认展开所有子节点
+    } else {
+        tableStore.table.data = treeDataCopy.value
+    }
+    nextTick(() => {
+        const $table = tableRef.value.getRef()
+        if ($table) {
+            $table.setAllTreeExpand(true)
+        }
+    })
+}, 500)
+const exportEvent = () => {
+    let line = tableRef.value.getRef().getRadioRecord()
+    if (!line) {
+        ElMessage({
+            type: 'warning',
+
+            message: '请选择要导出的数据'
+        })
+        return
+    }
+    loading.value = true
+    let form = new FormData()
+    form.append('isUrl', false)
+    form.append('lineIndex', line.id)
+    form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0])
+    form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1])
+    form.append('type', 0)
+    form.append('name', line.name)
+    ElMessage({
+        message: '下载报告中,请稍等.....',
+        duration: 1000
+    })
+    exportModelJB(form)
+        .then(async res => {
+            let blob = new Blob([res], {
+                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+            })
+
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download =
+                line.name +
+                TableHeaderRef.value.datePickerRef.timeValue[0] +
+                '_' +
+                TableHeaderRef.value.datePickerRef.timeValue[1] // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/echart.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/echart.vue
new file mode 100644
index 00000000..84f3d310
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/echart.vue
@@ -0,0 +1,291 @@
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="统计类型:">
+                <el-select
+                    v-model="tableStore.table.params.statisticalType"
+                    value-key="id"
+                    placeholder="请选择统计类型"
+                >
+                    <el-option
+                        v-for="item in classificationData"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="电压等级:">
+                <el-select
+                    v-model="tableStore.table.params.scale"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择电压等级"
+                >
+                    <el-option
+                        v-for="item in voltageleveloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="终端厂家:">
+                <el-select
+                    v-model="tableStore.table.params.manufacturer"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择终端厂家"
+                >
+                    <el-option
+                        v-for="item in terminaloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select
+                    v-model="tableStore.table.params.loadType"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择干扰源类型"
+                >
+                    <el-option
+                        v-for="item in interfereoption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+    </TableHeader>
+    <my-echart class="mt10" :style="`height: calc(${tableStore.table.height} - 75px)`" :options="options" />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } 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 { useDictData } from '@/stores/dictData'
+import * as echarts from 'echarts/core'
+const dictData = useDictData()
+const options = ref({})
+
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+const interfereoption = dictData.getBasicData('Interference_Source')
+
+const TableHeaderRef = ref()
+const tableStore = new TableStore({
+    url: '/device-boot/LineIntegrityData/getIntegrityIcon',
+
+    showPage: false,
+    method: 'POST',
+    column: [],
+
+    loadCallback: () => {
+        // tableStore.table.data.type
+        let code = tableStore.table.params.statisticalType.code
+        let title = '',
+            titleX = ''
+        if (code == 'Power_Network') {
+            title = '区域'
+            titleX = '区域'
+        } else if (code == 'Manufacturer') {
+            title = '终端厂家'
+            titleX = '终端\n厂家'
+        } else if (code == 'Voltage_Level') {
+            title = '电压等级'
+            titleX = '电压\n等级'
+        } else if (code == 'Load_Type') {
+            title = '干扰源类型'
+            titleX = '干扰\n源类型'
+        } else if (code == 'Report_Type') {
+            title = '上报类型'
+            titleX = '上报\n类型'
+        }
+        options.value = {
+            title: {
+                text: title
+            },
+            tooltip: {
+                formatter: function (params: any) {
+                    var tips = ''
+
+                    for (var i = 0; i < params.length; i++) {
+                        if (params[i].value == 3.14159) {
+                            tips += params[i].name + '</br>'
+                            tips += '完整性:暂无数据'
+                        } else {
+                            tips += params[i].name + '</br>'
+                            tips += '完整性:' + params[i].value.toFixed(2)
+                        }
+                    }
+                    return tips
+                }
+            },
+            grid: {
+                top: '50px',
+                right: '80px'
+            },
+            xAxis: {
+                name: titleX,
+                data: tableStore.table.data.map((item: any) => item.type)
+            },
+            yAxis: {
+                name: '%',
+                max: 100
+            },
+            options: {
+                series: [
+                    {
+                        name: '完整性',
+                        type: 'bar',
+                        data: tableStore.table.data.map((item: any) => item.single),
+                        itemStyle: {
+                            normal: {
+                                // 随机显示
+                                //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
+
+                                // 定制显示（按顺序）
+                                color: function (params: any) {
+                                    if (params.value ==3.14159) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#ccc'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value >= 90) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#339966'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value >= 60 && params.value <= 90) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#FFCC33'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value <= 60 && params.value > 1) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#A52a2a'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    }
+                                }
+                            }
+                        },
+                        markLine: {
+                            silent: false,
+                            symbol: 'circle',
+                            data: [
+                                {
+                                    name: '',
+                                    yAxis: 100,
+                                    lineStyle: {
+                                        color: '#339966'
+                                    },
+                                    label: {
+                                        //position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#339966'
+                                        }
+                                    }
+                                },
+                                {
+                                    name: '',
+                                    yAxis: 90,
+                                    lineStyle: {
+                                        color: '#FFCC33'
+                                    },
+                                    label: {
+                                        // position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#FFCC33'
+                                        }
+                                    }
+                                },
+                                {
+                                    name: '',
+                                    yAxis: 60,
+                                    lineStyle: {
+                                        color: '#A52a2a'
+                                    },
+                                    label: {
+                                        //position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#A52a2a'
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                ]
+            }
+        }
+    }
+})
+
+tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'harmonicBoot'
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue
new file mode 100644
index 00000000..0cfbea20
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue
@@ -0,0 +1,314 @@
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="筛选">
+                <el-input
+                    v-model="tableStore.table.params.filterName"
+                    @keyup="searchEvent"
+                    placeholder="输入关键字筛选"
+                />
+            </el-form-item>
+            <el-form-item label="统计类型:">
+                <el-select
+                    v-model="tableStore.table.params.statisticalType"
+                    value-key="id"
+                    placeholder="请选择统计类型"
+                >
+                    <el-option
+                        v-for="item in classificationData"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="电压等级:">
+                <el-select
+                    v-model="tableStore.table.params.scale"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择电压等级"
+                >
+                    <el-option
+                        v-for="item in voltageleveloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="终端厂家:">
+                <el-select
+                    v-model="tableStore.table.params.manufacturer"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择终端厂家"
+                >
+                    <el-option
+                        v-for="item in terminaloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select
+                    v-model="tableStore.table.params.loadType"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择干扰源类型"
+                >
+                    <el-option
+                        v-for="item in interfereoption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
+            <el-button icon="el-icon-Download" :loading="loading" @click="exportEvent" type="primary">
+                下载报告
+            </el-button>
+        </template>
+    </TableHeader>
+    <Table
+        ref="tableRef"
+        :radio-config="{
+            labelField: 'name',
+            highlight: true,
+            visibleMethod: row => row.row.level == 6
+        }"
+        :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }"
+        :scroll-y="{ enabled: true }"
+    />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { exportModelJB } from '@/api/harmonic-boot/harmonic.ts'
+import { debounce } from 'lodash-es'
+import XEUtils from 'xe-utils'
+const dictData = useDictData()
+const tableRef = ref()
+const treeDataCopy: any = ref([])
+const treeData: any = ref([])
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+const interfereoption = dictData.getBasicData('Interference_Source')
+
+const TableHeaderRef = ref()
+const tableStore = new TableStore({
+    url: '/device-boot/LineIntegrityData/getLineIntegrityData',
+    publicHeight: 65,
+    showPage: false,
+    method: 'POST',
+    column: [
+        // { width: '60', title: '111',  },
+        { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
+        {
+            field: 'ip',
+            title: '网络参数',
+            formatter: ({ row }: any) => {
+                return row.ip || '/'
+            }
+        },
+        {
+            field: 'deviceName',
+            title: '终端名称',
+            formatter: ({ row }: any) => {
+                return row.deviceName || '/'
+            }
+        },
+        {
+            field: 'manufacturer',
+            title: '厂家',
+            formatter: ({ row }: any) => {
+                return row.manufacturer || '/'
+            }
+        },
+        {
+            field: 'comFlag',
+            title: '通讯状态',
+            render: 'tag',
+            custom: {
+                0: 'danger',
+                1: 'success',
+                3: 'info'
+            },
+            replaceValue: {
+                0: '中断',
+                1: '正常',
+                3: '/'
+            }
+        },
+        {
+            field: 'updateTime',
+            title: '最新数据时间',
+            formatter: ({ row }: any) => {
+                return row.updateTime || '/'
+            }
+        },
+        {
+            field: 'integrityData',
+            title: '完整性(%)',
+            formatter: ({ row }: any) => {
+                return row.integrityData == 3.14159 ? '暂无数据' : row.integrityData.toFixed(2)
+            }
+        },
+        {
+            field: 'assess',
+            title: '评估',
+            render: 'tag',
+            custom: {
+                0: 'info',
+                1: 'danger',
+                2: 'warning',
+                3: 'success'
+            },
+            replaceValue: {
+                0: '暂无数据',
+                1: '不合格',
+                2: '合格',
+                3: '优秀'
+            }
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.options.column[0].title = tableStore.table.params.statisticalType.name
+    },
+    loadCallback: () => {
+        setTimeout(() => {
+            tableRef.value.getRef().setAllTreeExpand(true)
+        }, 1000)
+
+        treeData.value = tree2List(tableStore.table.data, Math.random() * 1000)
+        treeDataCopy.value = JSON.parse(JSON.stringify(treeData.value))
+        tableStore.table.data = treeData.value
+        tableStore.table.params.filterName = ''
+        searchEvent()
+    }
+})
+const loading = ref(false)
+
+tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'harmonicBoot'
+
+provide('tableStore', tableStore)
+const tree2List = (list: any, id: any) => {
+    //存储结果的数组
+    let arr: any = []
+    // 遍历 tree 数组
+    list.forEach((item: any) => {
+        item.uPid = id
+        item.uId = Math.random() * 1000
+        item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.assess = item.integrityData == 3.14159 ? 0 : item.integrityData < 60 ? 1 : item.integrityData < 90 ? 2 : 3
+        // 判断item是否存在children
+        if (!item.children) return arr.push(item)
+        // 函数递归，对children数组进行tree2List的转换
+        const children = tree2List(item.children, item.uId)
+        // 删除item的children属性
+        delete item.children
+        // 把item和children数组添加至结果数组
+        //..children: 意思是把children数组展开
+        arr.push(item, ...children)
+    })
+    // 返回结果数组
+    return arr
+}
+onMounted(() => {
+    tableStore.index()
+})
+const searchEvent = debounce(() => {
+    const filterVal = XEUtils.toValueString(tableStore.table.params.filterName).trim().toLowerCase()
+
+    if (filterVal) {
+        const options = { children: 'children' }
+        const searchProps = ['name']
+
+        const rest = XEUtils.searchTree(
+            treeDataCopy.value,
+            (item: any) => searchProps.some(key => String(item[key]).toLowerCase().indexOf(filterVal) > -1),
+            options
+        )
+        console.log('🚀 ~ searchEvent ~ rest:', rest)
+
+        tableStore.table.data = rest
+
+        // 搜索之后默认展开所有子节点
+    } else {
+        tableStore.table.data = treeDataCopy.value
+    }
+    nextTick(() => {
+        const $table = tableRef.value.getRef()
+        if ($table) {
+            $table.setAllTreeExpand(true)
+        }
+    })
+}, 500)
+const exportEvent = () => {
+    let line = tableRef.value.getRef().getRadioRecord()
+    if (!line) {
+        ElMessage({
+            type: 'warning',
+
+            message: '请选择要导出的数据'
+        })
+        return
+    }
+    loading.value = true
+    let form = new FormData()
+    form.append('isUrl', false)
+    form.append('lineIndex', line.id)
+    form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0])
+    form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1])
+    form.append('type', 0)
+    form.append('name', line.name)
+    ElMessage({
+        message: '下载报告中,请稍等.....',
+        duration: 1000
+    })
+    exportModelJB(form)
+        .then(async res => {
+            let blob = new Blob([res], {
+                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+            })
+
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download =
+                line.name +
+                TableHeaderRef.value.datePickerRef.timeValue[0] +
+                '_' +
+                TableHeaderRef.value.datePickerRef.timeValue[1] // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue
new file mode 100644
index 00000000..60b73b08
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue
@@ -0,0 +1,637 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker ref="TableHeaderRef" :dateLabel="`数据统计时间`">
+            <template v-slot:select>
+                <el-form-item label="运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="筛选">
+                    <el-input v-model="tableStore.table.params.filterName" placeholder="输入关键字筛选" />
+                </el-form-item>
+            </template>
+
+            <template v-slot:operation>
+                <el-button type="primary" icon="el-icon-Download" @click="onExport">导出</el-button>
+            </template>
+        </TableHeader>
+        <div class="card-list pt10" v-loading="tableStore.table.loading">
+            <div class="monitoringPoints">
+                <el-card style="height: 200px">
+                    <template #header>
+                        <div class="card-header">
+                            <span>监测点统计</span>
+                        </div>
+                    </template>
+                    <div>
+                        <div class="statistics">
+                            <div class="divBox">
+                                <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                                <span class="divBox_title">监测点总数</span>
+                                <span class="divBox_num text-style" style="color: #57bc6e" @click="totalTable(101, '')">
+                                    {{ monitoringPoints.runNum }}
+                                </span>
+                            </div>
+                            <div class="divBox" style="width: 200px">
+                                <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
+                                <span class="divBox_title">低于90%监测点数</span>
+                                <span
+                                    class="divBox_num text-style"
+                                    style="color: #ff6600"
+                                    @click="totalTable(90, '低于90%监测点_')"
+                                >
+                                    {{ monitoringPoints.abnormalNum }}
+                                </span>
+                            </div>
+                        </div>
+                        <div class="echartTitle">
+                            <div>总的数据完整性</div>
+                            <div>{{ monitoringPoints.totalOnlineRate }}%</div>
+                        </div>
+                        <div style="height: 30px">
+                            <MyEchart :options="percentage"></MyEchart>
+                        </div>
+                    </div>
+                </el-card>
+                <el-card class="mt10">
+                    <template #header>
+                        <div class="card-header">
+                            <span>完整性统计</span>
+                        </div>
+                    </template>
+                    <div class="mb5" style="height: 40px">
+                        <el-segmented
+                            style="height: 100%"
+                            v-model="segmented"
+                            :props="props"
+                            :options="segmentedList"
+                            block
+                            @change="tableStore.index()"
+                        >
+                            <template #default="scope">
+                                <div>
+                                    <div>{{ scope.item.name }}</div>
+                                </div>
+                            </template>
+                        </el-segmented>
+                    </div>
+                    <div class="header">
+                        <span style="width: 110px; text-align: left">
+                            {{
+                                segmented == 'Power_Network'
+                                    ? '区域'
+                                    : segmented == 'Manufacturer'
+                                    ? '终端厂家'
+                                    : '电网标志'
+                            }}
+                        </span>
+                        <span style="width: 90px">监测点总数</span>
+                        <span style="flex: 1">低于90%监测点数</span>
+                        <span style="width: 80px">完整性(%)</span>
+                    </div>
+                    <div :style="indicatorHeight" style="overflow-y: auto">
+                        <div v-for="o in abnormal" class="abnormal mb10">
+                            <span style="width: 110px; height: 24px" class="iconDiv">
+                                <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                                {{ o.citName }}
+                            </span>
+                            <!-- 监测点总数 -->
+                            <span
+                                style="width: 90px; color: #388e3c"
+                                class="text text-style"
+                                @click="renderTable(o.detailList, 101, o.citName + '_')"
+                            >
+                                {{ o.citTotalNum }}
+                            </span>
+                            <!-- 低于90%监测点数 -->
+                            <span
+                                style="flex: 1; color: #ff9100"
+                                class="text text-style"
+                                @click="renderTable(o.detailList, 90, o.citName + '_低于90%监测点_')"
+                            >
+                                {{ o.citBelowNum }}
+                            </span>
+                            <span
+                                style="width: 80px; color: #388e3c"
+                                :class="` ${o.citTotalOnlineRate < 90 ? 'text-red' : ''}`"
+                                class="text"
+                            >
+                                {{ o.citTotalOnlineRate }}
+                            </span>
+                        </div>
+                    </div>
+                </el-card>
+            </div>
+            <el-card class="detail ml10" :style="pageHeight">
+                <template #header>
+                    <div class="card-header">
+                        <span>{{ title }}完整性详情</span>
+                    </div>
+                </template>
+
+                <!--表格-->
+
+                <div :style="{ height: tableStore.table.height }" v-loading="loading">
+                    <vxe-table
+                        height="auto"
+                        :data="dataList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+                        v-bind="defaultAttribute"
+                        ref="tableRef"
+                        :scroll-y="{ enabled: true }"
+                    >
+                        <vxe-column type="seq" title="序号" width="80px">
+                            <template #default="{ rowIndex }">
+                                <span>
+                                    {{
+                                        (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize +
+                                        rowIndex +
+                                        1
+                                    }}
+                                </span>
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="cit" title="参数地市" width="110px"></vxe-column>
+                        <vxe-column field="company" title="供电公司"></vxe-column>
+                        <vxe-column field="subStation" title="变电站"></vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
+                        <vxe-column field="deviceName" title="终端名称"></vxe-column>
+                        <vxe-column field="ip" title="终端IP" :formatter="formatter" width="130px"></vxe-column>
+                        <vxe-column field="lineName" title="监测点名称" :formatter="formatter"></vxe-column>
+                        <vxe-column field="runFlag" title="运行状态" width="90px">
+                            <template #default="{ row }">
+                                <el-tag
+                                    :type="
+                                        row.runFlag == '运行'
+                                            ? 'success'
+                                            : row.runFlag == '停运'
+                                            ? 'danger'
+                                            : row.runFlag == '检修'
+                                            ? 'warning'
+                                            : row.runFlag == '调试'
+                                            ? 'warning'
+                                            : 'danger'
+                                    "
+                                >
+                                    {{ row.runFlag }}
+                                </el-tag>
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="latestTime" title="最新数据时间" width="150px"></vxe-column>
+                        <vxe-column field="integrity" title="完整性(%)" width="90px"></vxe-column>
+                    </vxe-table>
+                </div>
+                <div class="table-pagination">
+                    <el-pagination
+                        v-model:currentPage="pageNum"
+                        v-model:page-size="pageSize"
+                        :page-sizes="[10, 20, 50, 100, 200]"
+                        background
+                        layout="sizes,total, ->, prev, pager, next, jumper"
+                        :total="dataList.length"
+                    ></el-pagination>
+                </div>
+            </el-card>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify'
+defineOptions({
+    name: 'harmonic-boot/harmonic/getIntegrityData'
+})
+
+const dictData = useDictData()
+//字典获取监督对象类型
+const pageHeight = mainHeight(97)
+const indicatorHeight = mainHeight(447)
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const pageSize = ref(20)
+const pageNum = ref(1)
+const title = ref('')
+const loading = ref(false)
+const dataList = ref([])
+const tableRef = ref()
+const percentage = ref({})
+const TableHeaderRef = ref()
+const abnormal: any = ref([])
+const totalData: any = ref([])
+//定义监测点运行状态下拉框数据
+const runFlagList = [
+    { id: 0, name: '运行' },
+    { id: 1, name: '检修' },
+    { id: 2, name: '停运' },
+    { id: 3, name: '调试' },
+    { id: 4, name: '退运' }
+]
+// Statistical_Type
+
+const segmented = ref('Power_Network')
+
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const tableStore = new TableStore({
+    url: '/device-boot/LineIntegrityData/data',
+    method: 'POST',
+    showPage: false,
+    publicHeight: 145,
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+    loadCallback: () => {
+        // tableStore.table.data
+        monitoringPoints.value.runNum = tableStore.table.data.totalNum
+        monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
+        monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
+        abnormal.value = tableStore.table.data.citDetailList
+        // 合并子集数据 并去重
+        totalData.value = Array.from(
+            tableStore.table.data.citDetailList
+                .map((item: any) => item.detailList)
+                .flat()
+                .reduce((map: any, item: any) => {
+                    if (!map.has(item.deviceId)) {
+                        map.set(item.deviceId, item)
+                    }
+                    return map
+                }, new Map())
+                .values()
+        )
+        totalTable(101, '')
+        echart()
+    }
+})
+
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '异常总数',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '异常占比',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [monitoringPoints.value.totalOnlineRate - 0],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#FF9100' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.lineRunFlag = ''
+
+const formatter = (row: any) => {
+    return row.cellValue || '/'
+}
+// 渲染总表格
+const totalTable = (num: number, t: string) => {
+    title.value = t
+    loading.value = true
+    pageNum.value = 1
+    dataList.value = []
+    dataList.value = totalData.value.filter((item: any) => {
+        return item.integrity < num
+    })
+
+    loading.value = false
+}
+// 渲染表格
+const renderTable = (list: any, num: number, t: string) => {
+    title.value = t
+    loading.value = true
+    pageNum.value = 1
+    dataList.value = []
+    dataList.value = list.filter((item: any) => {
+        return item.integrity < num
+    })
+    loading.value = false
+}
+// 导出
+const onExport = () => {
+    tableRef.value?.exportData({
+        filename: title.value + '完整性详情', // 文件名字
+        sheetName: 'Sheet1',
+        type: 'xlsx', //导出文件类型 xlsx 和 csv
+        useStyle: true,
+        data: dataList.value, // 数据源 // 过滤那个字段导出
+        columnFilterMethod: function (column: any) {
+            return !(
+                column.column.title === undefined ||
+                column.column.title === '序号' ||
+                column.column.title === '操作'
+            )
+        }
+    })
+}
+onMounted(() => {
+    // TableHeaderRef.value.setDatePicker([
+    //     { label: '年份', value: 1 },
+    //     { label: '季度', value: 2 },
+    //     { label: '月份', value: 3 }
+    // ])
+
+    // 加载数据
+
+    tableStore.index()
+})
+
+tableStore.table.params.name = ''
+provide('tableStore', tableStore)
+</script>
+<style lang="scss" scoped>
+.card-list {
+    display: flex;
+    .monitoringPoints {
+        width: 440px;
+        position: relative;
+        .statistics {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            margin-bottom: 10px;
+            .divBox {
+                width: 200px;
+                height: 70px;
+                padding: 10px;
+                display: flex;
+
+                .iconfont {
+                    font-size: 40px;
+                    margin-right: 5px;
+                }
+                .divBox_title {
+                    font-weight: 550;
+                }
+                .divBox_num {
+                    font-size: 20px;
+                    font-weight: 550;
+                    margin-left: auto;
+                    font-family: AlimamaDongFangDaKai;
+                }
+                align-items: center;
+                // text-align: center;
+                border-radius: 5px;
+                &:nth-child(1) {
+                    background-color: #eef8f0;
+                }
+                &:nth-child(2) {
+                    background-color: #fff6ed;
+                }
+                &:nth-child(3) {
+                    background-color: #e5f8f6;
+                }
+            }
+        }
+    }
+    .detail {
+        flex: 1;
+    }
+    .abnormal {
+        width: 100%;
+        background-color: #f3f6f9;
+        border-radius: 5px;
+        display: flex;
+        // justify-content: space-between;
+        align-items: center;
+        padding: 5px 0px 5px 10px;
+        .iconDiv {
+            display: flex;
+            align-items: center;
+            div {
+                width: 4px;
+                height: 18px;
+                margin-right: 5px;
+                background-color: var(--el-color-primary);
+            }
+        }
+        .text {
+            font-weight: 700;
+            font-size: 16px;
+            font-family: 'Source Code Pro', monospace;
+            text-align: center;
+
+            // font-feature-settings: 'tnum';
+        }
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    font-weight: 600;
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+}
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+.table-pagination {
+    height: 58px;
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+    padding: 13px 15px;
+    border-left: 1px solid #e4e7e9;
+    border-right: 1px solid #e4e7e9;
+    border-bottom: 1px solid #e4e7e9;
+}
+</style>
diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue
index 54578bb3..7167c5ee 100644
--- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue
@@ -1,291 +1,291 @@
-<template>
-    <TableHeader area datePicker ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="统计类型:">
-                <el-select
-                    v-model="tableStore.table.params.statisticalType"
-                    value-key="id"
-                    placeholder="请选择统计类型"
-                >
-                    <el-option
-                        v-for="item in classificationData"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="电压等级:">
-                <el-select
-                    v-model="tableStore.table.params.scale"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择电压等级"
-                >
-                    <el-option
-                        v-for="item in voltageleveloption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="终端厂家:">
-                <el-select
-                    v-model="tableStore.table.params.manufacturer"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择终端厂家"
-                >
-                    <el-option
-                        v-for="item in terminaloption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="干扰源类型:">
-                <el-select
-                    v-model="tableStore.table.params.loadType"
-                    multiple
-                    collapse-tags
-                    clearable
-                    value-key="id"
-                    placeholder="请选择干扰源类型"
-                >
-                    <el-option
-                        v-for="item in interfereoption"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-    </TableHeader>
-    <my-echart class="mt10" :style="`height: calc(${tableStore.table.height} - 75px)`" :options="options" />
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, nextTick } 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 { useDictData } from '@/stores/dictData'
-import * as echarts from 'echarts/core'
-const dictData = useDictData()
-const options = ref({})
-
-const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
-const terminaloption = dictData.getBasicData('Dev_Manufacturers')
-const interfereoption = dictData.getBasicData('Interference_Source')
-
-const TableHeaderRef = ref()
-const tableStore = new TableStore({
-    url: '/device-boot/terminalOnlineRateData/getOnlineRateDataCensus',
-
-    showPage: false,
-    method: 'POST',
-    column: [],
-
-    loadCallback: () => {
-        // tableStore.table.data.type
-        let code = tableStore.table.params.statisticalType.code
-        let title = '',
-            titleX = ''
-        if (code == 'Power_Network') {
-            title = '区域'
-            titleX = '区域'
-        } else if (code == 'Manufacturer') {
-            title = '终端厂家'
-            titleX = '终端\n厂家'
-        } else if (code == 'Voltage_Level') {
-            title = '电压等级'
-            titleX = '电压\n等级'
-        } else if (code == 'Load_Type') {
-            title = '干扰源类型'
-            titleX = '干扰\n源类型'
-        } else if (code == 'Report_Type') {
-            title = '上报类型'
-            titleX = '上报\n类型'
-        }
-        options.value = {
-            title: {
-                text: title
-            },
-            tooltip: {
-                formatter: function (params: any) {
-                    var tips = ''
-
-                    for (var i = 0; i < params.length; i++) {
-                        if (params[i].value == 1) {
-                            tips += params[i].name + '</br>'
-                            tips += '在线率:暂无数据'
-                        } else {
-                            tips += params[i].name + '</br>'
-                            tips += '在线率:' + params[i].value.toFixed(2)
-                        }
-                    }
-                    return tips
-                }
-            },
-            grid: {
-                top: '50px',
-                right: '80px'
-            },
-            xAxis: {
-                name: titleX,
-                data: tableStore.table.data.type
-            },
-            yAxis: {
-                name: '%',
-                max: 100
-            },
-            options: {
-                series: [
-                    {
-                        name: '在线率',
-                        type: 'bar',
-                        data: tableStore.table.data.single,
-                        itemStyle: {
-                            normal: {
-                                // 随机显示
-                                //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
-
-                                // 定制显示（按顺序）
-                                color: function (params: any) {
-                                    if (params.value >= 90) {
-                                        return new echarts.graphic.LinearGradient(
-                                            0,
-                                            1,
-                                            0,
-                                            0,
-                                            [
-                                                {
-                                                    offset: 1,
-                                                    color: '#339966'
-                                                }
-                                            ],
-                                            false
-                                        )
-                                    } else if (params.value >= 60 && params.value <= 90) {
-                                        return new echarts.graphic.LinearGradient(
-                                            0,
-                                            1,
-                                            0,
-                                            0,
-                                            [
-                                                {
-                                                    offset: 1,
-                                                    color: '#FFCC33'
-                                                }
-                                            ],
-                                            false
-                                        )
-                                    } else if (params.value <= 60 && params.value > 1) {
-                                        return new echarts.graphic.LinearGradient(
-                                            0,
-                                            1,
-                                            0,
-                                            0,
-                                            [
-                                                {
-                                                    offset: 1,
-                                                    color: '#A52a2a'
-                                                }
-                                            ],
-                                            false
-                                        )
-                                    } else if (params.value > 0 && params.value <= 1) {
-                                        return new echarts.graphic.LinearGradient(
-                                            0,
-                                            1,
-                                            0,
-                                            0,
-                                            [
-                                                {
-                                                    offset: 1,
-                                                    color: '#ccc'
-                                                }
-                                            ],
-                                            false
-                                        )
-                                    }
-                                }
-                            }
-                        },
-                        markLine: {
-                            silent: false,
-                            symbol: 'circle',
-                            data: [
-                                {
-                                    name: '',
-                                    yAxis: 100,
-                                    lineStyle: {
-                                        color: '#339966'
-                                    },
-                                    label: {
-                                        //position: "middle",
-                                        formatter: '{b}',
-                                        textStyle: {
-                                            color: '#339966'
-                                        }
-                                    }
-                                },
-                                {
-                                    name: '',
-                                    yAxis: 90,
-                                    lineStyle: {
-                                        color: '#FFCC33'
-                                    },
-                                    label: {
-                                        // position: "middle",
-                                        formatter: '{b}',
-                                        textStyle: {
-                                            color: '#FFCC33'
-                                        }
-                                    }
-                                },
-                                {
-                                    name: '',
-                                    yAxis: 60,
-                                    lineStyle: {
-                                        color: '#A52a2a'
-                                    },
-                                    label: {
-                                        //position: "middle",
-                                        formatter: '{b}',
-                                        textStyle: {
-                                            color: '#A52a2a'
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        }
-    }
-})
-
-tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0]
-tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = 2
-tableStore.table.params.serverName = 'harmonicBoot'
-
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    tableStore.index()
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="统计类型:">
+                <el-select
+                    v-model="tableStore.table.params.statisticalType"
+                    value-key="id"
+                    placeholder="请选择统计类型"
+                >
+                    <el-option
+                        v-for="item in classificationData"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="电压等级:">
+                <el-select
+                    v-model="tableStore.table.params.scale"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择电压等级"
+                >
+                    <el-option
+                        v-for="item in voltageleveloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="终端厂家:">
+                <el-select
+                    v-model="tableStore.table.params.manufacturer"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择终端厂家"
+                >
+                    <el-option
+                        v-for="item in terminaloption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select
+                    v-model="tableStore.table.params.loadType"
+                    multiple
+                    collapse-tags
+                    clearable
+                    value-key="id"
+                    placeholder="请选择干扰源类型"
+                >
+                    <el-option
+                        v-for="item in interfereoption"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+    </TableHeader>
+    <my-echart class="mt10" :style="`height: calc(${tableStore.table.height} - 75px)`" :options="options" />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } 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 { useDictData } from '@/stores/dictData'
+import * as echarts from 'echarts/core'
+const dictData = useDictData()
+const options = ref({})
+
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+const interfereoption = dictData.getBasicData('Interference_Source')
+
+const TableHeaderRef = ref()
+const tableStore = new TableStore({
+    url: '/device-boot/terminalOnlineRateData/getOnlineRateDataCensus',
+
+    showPage: false,
+    method: 'POST',
+    column: [],
+
+    loadCallback: () => {
+        // tableStore.table.data.type
+        let code = tableStore.table.params.statisticalType.code
+        let title = '',
+            titleX = ''
+        if (code == 'Power_Network') {
+            title = '区域'
+            titleX = '区域'
+        } else if (code == 'Manufacturer') {
+            title = '终端厂家'
+            titleX = '终端\n厂家'
+        } else if (code == 'Voltage_Level') {
+            title = '电压等级'
+            titleX = '电压\n等级'
+        } else if (code == 'Load_Type') {
+            title = '干扰源类型'
+            titleX = '干扰\n源类型'
+        } else if (code == 'Report_Type') {
+            title = '上报类型'
+            titleX = '上报\n类型'
+        }
+        options.value = {
+            title: {
+                text: title
+            },
+            tooltip: {
+                formatter: function (params: any) {
+                    var tips = ''
+
+                    for (var i = 0; i < params.length; i++) {
+                        if (params[i].value == 3.14159) {
+                            tips += params[i].name + '</br>'
+                            tips += '在线率:暂无数据'
+                        } else {
+                            tips += params[i].name + '</br>'
+                            tips += '在线率:' + params[i].value.toFixed(2)
+                        }
+                    }
+                    return tips
+                }
+            },
+            grid: {
+                top: '50px',
+                right: '80px'
+            },
+            xAxis: {
+                name: titleX,
+                data: tableStore.table.data.type
+            },
+            yAxis: {
+                name: '%',
+                max: 100
+            },
+            options: {
+                series: [
+                    {
+                        name: '在线率',
+                        type: 'bar',
+                        data: tableStore.table.data.single,
+                        itemStyle: {
+                            normal: {
+                                // 随机显示
+                                //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
+
+                                // 定制显示（按顺序）
+                                color: function (params: any) {
+                                    if (params.value == 3.14159) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#ccc'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value >= 90) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#339966'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value >= 60 && params.value <= 90) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#FFCC33'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    } else if (params.value <= 60 && params.value > 1) {
+                                        return new echarts.graphic.LinearGradient(
+                                            0,
+                                            1,
+                                            0,
+                                            0,
+                                            [
+                                                {
+                                                    offset: 1,
+                                                    color: '#A52a2a'
+                                                }
+                                            ],
+                                            false
+                                        )
+                                    }
+                                }
+                            }
+                        },
+                        markLine: {
+                            silent: false,
+                            symbol: 'circle',
+                            data: [
+                                {
+                                    name: '',
+                                    yAxis: 100,
+                                    lineStyle: {
+                                        color: '#339966'
+                                    },
+                                    label: {
+                                        //position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#339966'
+                                        }
+                                    }
+                                },
+                                {
+                                    name: '',
+                                    yAxis: 90,
+                                    lineStyle: {
+                                        color: '#FFCC33'
+                                    },
+                                    label: {
+                                        // position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#FFCC33'
+                                        }
+                                    }
+                                },
+                                {
+                                    name: '',
+                                    yAxis: 60,
+                                    lineStyle: {
+                                        color: '#A52a2a'
+                                    },
+                                    label: {
+                                        //position: "middle",
+                                        formatter: '{b}',
+                                        textStyle: {
+                                            color: '#A52a2a'
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                ]
+            }
+        }
+    }
+})
+
+tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'harmonicBoot'
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue
new file mode 100644
index 00000000..4de29186
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue
@@ -0,0 +1,636 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker ref="TableHeaderRef" :dateLabel="`数据统计时间`">
+            <template v-slot:select>
+                <el-form-item label="运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="筛选">
+                    <el-input v-model="tableStore.table.params.filterName" placeholder="输入关键字筛选" />
+                </el-form-item>
+            </template>
+
+            <template v-slot:operation>
+                <el-button type="primary" icon="el-icon-Download" @click="onExport">导出</el-button>
+            </template>
+        </TableHeader>
+        <div class="card-list pt10" v-loading="tableStore.table.loading">
+            <div class="monitoringPoints">
+                <el-card style="height: 200px">
+                    <template #header>
+                        <div class="card-header">
+                            <span>终端统计</span>
+                        </div>
+                    </template>
+                    <div>
+                        <div class="statistics">
+                            <div class="divBox">
+                                <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                                <span class="divBox_title">终端总数</span>
+                                <span class="divBox_num text-style" style="color: #57bc6e" @click="totalTable(101, '')">
+                                    {{ monitoringPoints.runNum }}
+                                </span>
+                            </div>
+                            <div class="divBox" style="width: 200px">
+                                <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
+                                <span class="divBox_title">低于90%终端数</span>
+                                <span
+                                    class="divBox_num text-style"
+                                    style="color: #ff6600"
+                                    @click="totalTable(90, '低于90%终端_')"
+                                >
+                                    {{ monitoringPoints.abnormalNum }}
+                                </span>
+                            </div>
+                        </div>
+                        <div class="echartTitle">
+                            <div>总的数据在线率</div>
+                            <div>{{ monitoringPoints.totalOnlineRate }}%</div>
+                        </div>
+                        <div style="height: 30px">
+                            <MyEchart :options="percentage"></MyEchart>
+                        </div>
+                    </div>
+                </el-card>
+                <el-card class="mt10">
+                    <template #header>
+                        <div class="card-header">
+                            <span>在线率统计</span>
+                        </div>
+                    </template>
+                    <div class="mb5" style="height: 40px">
+                        <el-segmented
+                            style="height: 100%"
+                            v-model="segmented"
+                            :props="props"
+                            :options="segmentedList"
+                            block
+                            @change="tableStore.index()"
+                        >
+                            <template #default="scope">
+                                <div>
+                                    <div>{{ scope.item.name }}</div>
+                                </div>
+                            </template>
+                        </el-segmented>
+                    </div>
+                    <div class="header">
+                        <span style="width: 110px; text-align: left">
+                            {{
+                                segmented == 'Power_Network'
+                                    ? '区域'
+                                    : segmented == 'Manufacturer'
+                                    ? '终端厂家'
+                                    : '电网标志'
+                            }}
+                        </span>
+                        <span style="width: 90px">终端总数</span>
+                        <span style="flex: 1">低于90%终端数</span>
+                        <span style="width: 80px">在线率(%)</span>
+                    </div>
+                    <div :style="indicatorHeight" style="overflow-y: auto">
+                        <div v-for="o in abnormal" class="abnormal mb10">
+                            <span style="width: 110px; height: 24px" class="iconDiv">
+                                <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                                {{ o.citName }}
+                            </span>
+                            <!-- 终端总数 -->
+                            <span
+                                style="width: 90px; color: #388e3c"
+                                class="text text-style"
+                                @click="renderTable(o.detailList, 101, o.citName + '_')"
+                            >
+                                {{ o.citTotalNum }}
+                            </span>
+                            <!-- 低于90%终端数 -->
+                            <span
+                                style="flex: 1; color: #ff9100"
+                                class="text text-style"
+                                @click="renderTable(o.detailList, 90, o.citName + '_低于90%终端_')"
+                            >
+                                {{ o.citBelowNum }}
+                            </span>
+                            <span
+                                style="width: 80px; color: #388e3c"
+                                :class="` ${o.citTotalOnlineRate < 90 ? 'text-red' : ''}`"
+                                class="text"
+                            >
+                                {{ o.citTotalOnlineRate }}
+                            </span>
+                        </div>
+                    </div>
+                </el-card>
+            </div>
+            <el-card class="detail ml10" :style="pageHeight">
+                <template #header>
+                    <div class="card-header">
+                        <span>{{ title }}在线率详情</span>
+                    </div>
+                </template>
+
+                <!--表格-->
+
+                <div :style="{ height: tableStore.table.height }" v-loading="loading">
+                    <vxe-table
+                        height="auto"
+                        :data="dataList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+                        v-bind="defaultAttribute"
+                        ref="tableRef"
+                        :scroll-y="{ enabled: true }"
+                    >
+                        <vxe-column type="seq" title="序号" width="80px">
+                            <template #default="{ rowIndex }">
+                                <span>
+                                    {{
+                                        (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize +
+                                        rowIndex +
+                                        1
+                                    }}
+                                </span>
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="cit" title="参数地市" width="110px"></vxe-column>
+                        <vxe-column field="company" title="供电公司"></vxe-column>
+                        <vxe-column field="subStation" title="变电站"></vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
+                        <vxe-column field="deviceName" title="终端名称"></vxe-column>
+                        <vxe-column field="ip" title="终端IP" :formatter="formatter" width="130px"></vxe-column>
+                        <vxe-column field="runFlag" title="运行状态" width="90px">
+                            <template #default="{ row }">
+                                <el-tag
+                                    :type="
+                                        row.runFlag == '运行'
+                                            ? 'success'
+                                            : row.runFlag == '停运'
+                                            ? 'danger'
+                                            : row.runFlag == '检修'
+                                            ? 'warning'
+                                            : row.runFlag == '调试'
+                                            ? 'warning'
+                                            : 'danger'
+                                    "
+                                >
+                                    {{ row.runFlag }}
+                                </el-tag>
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="onlineRate" title="在线率(%)" width="90px"></vxe-column>
+                    </vxe-table>
+                </div>
+                <div class="table-pagination">
+                    <el-pagination
+                        v-model:currentPage="pageNum"
+                        v-model:page-size="pageSize"
+                        :page-sizes="[10, 20, 50, 100, 200]"
+                        background
+                        layout="sizes,total, ->, prev, pager, next, jumper"
+                        :total="dataList.length"
+                    ></el-pagination>
+                </div>
+            </el-card>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify'
+defineOptions({
+    name: 'harmonic-boot/harmonic/getIntegrityData'
+})
+
+const dictData = useDictData()
+//字典获取监督对象类型
+const pageHeight = mainHeight(97)
+const indicatorHeight = mainHeight(447)
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const pageSize = ref(20)
+const pageNum = ref(1)
+const title = ref('')
+const loading = ref(false)
+const dataList = ref([])
+const tableRef = ref()
+const percentage = ref({})
+const TableHeaderRef = ref()
+const abnormal: any = ref([])
+const totalData: any = ref([])
+//定义终端运行状态下拉框数据
+const runFlagList = [
+    { id: 0, name: '运行' },
+    { id: 1, name: '检修' },
+    { id: 2, name: '停运' },
+    { id: 3, name: '调试' },
+    { id: 4, name: '退运' }
+]
+// Statistical_Type
+
+const segmented = ref('Power_Network')
+
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const tableStore = new TableStore({
+    url: '/device-boot/onLineRate/deviceOnlineRateInfo',
+    method: 'POST',
+    showPage: false,
+    publicHeight: 145,
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+    loadCallback: () => {
+        // tableStore.table.data
+        monitoringPoints.value.runNum = tableStore.table.data.totalNum
+        monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
+        monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
+        abnormal.value = tableStore.table.data.citDetailList
+        // 合并子集数据 并去重
+        totalData.value = Array.from(
+            tableStore.table.data.citDetailList
+                .map((item: any) => item.detailList)
+                .flat()
+                .reduce((map: any, item: any) => {
+                    if (!map.has(item.deviceId)) {
+                        map.set(item.deviceId, item)
+                    }
+                    return map
+                }, new Map())
+                .values()
+        )
+
+        totalTable(101, '')
+        echart()
+    }
+})
+
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '异常总数',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '异常占比',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [monitoringPoints.value.totalOnlineRate - 0],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#FF9100' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.lineRunFlag = ''
+
+const formatter = (row: any) => {
+    return row.cellValue || '/'
+}
+// 渲染总表格
+const totalTable = (num: number, t: string) => {
+    title.value = t
+    loading.value = true
+    pageNum.value = 1
+    dataList.value = []
+    dataList.value = totalData.value.filter((item: any) => {
+        return item.onlineRate < num
+    })
+
+    loading.value = false
+}
+// 渲染表格
+const renderTable = (list: any, num: number, t: string) => {
+    title.value = t
+    loading.value = true
+    pageNum.value = 1
+    dataList.value = []
+    dataList.value = list.filter((item: any) => {
+        return item.onlineRate < num
+    })
+    loading.value = false
+}
+// 导出
+const onExport = () => {
+    tableRef.value?.exportData({
+        filename: title.value + '在线率详情', // 文件名字
+        sheetName: 'Sheet1',
+        type: 'xlsx', //导出文件类型 xlsx 和 csv
+        useStyle: true,
+        data: dataList.value, // 数据源 // 过滤那个字段导出
+        columnFilterMethod: function (column: any) {
+            return !(
+                column.column.title === undefined ||
+                column.column.title === '序号' ||
+                column.column.title === '操作'
+            )
+        }
+    })
+}
+onMounted(() => {
+    // TableHeaderRef.value.setDatePicker([
+    //     { label: '年份', value: 1 },
+    //     { label: '季度', value: 2 },
+    //     { label: '月份', value: 3 }
+    // ])
+
+    // 加载数据
+
+    tableStore.index()
+})
+
+tableStore.table.params.name = ''
+provide('tableStore', tableStore)
+</script>
+<style lang="scss" scoped>
+.card-list {
+    display: flex;
+    .monitoringPoints {
+        width: 440px;
+        position: relative;
+        .statistics {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            margin-bottom: 10px;
+            .divBox {
+                width: 200px;
+                height: 70px;
+                padding: 10px;
+                display: flex;
+
+                .iconfont {
+                    font-size: 40px;
+                    margin-right: 5px;
+                }
+                .divBox_title {
+                    font-weight: 550;
+                }
+                .divBox_num {
+                    font-size: 20px;
+                    font-weight: 550;
+                    margin-left: auto;
+                    font-family: AlimamaDongFangDaKai;
+                }
+                align-items: center;
+                // text-align: center;
+                border-radius: 5px;
+                &:nth-child(1) {
+                    background-color: #eef8f0;
+                }
+                &:nth-child(2) {
+                    background-color: #fff6ed;
+                }
+                &:nth-child(3) {
+                    background-color: #e5f8f6;
+                }
+            }
+        }
+    }
+    .detail {
+        flex: 1;
+    }
+    .abnormal {
+        width: 100%;
+        background-color: #f3f6f9;
+        border-radius: 5px;
+        display: flex;
+        // justify-content: space-between;
+        align-items: center;
+        padding: 5px 0px 5px 10px;
+        .iconDiv {
+            display: flex;
+            align-items: center;
+            div {
+                width: 4px;
+                height: 18px;
+                margin-right: 5px;
+                background-color: var(--el-color-primary);
+            }
+        }
+        .text {
+            font-weight: 700;
+            font-size: 16px;
+            font-family: 'Source Code Pro', monospace;
+            text-align: center;
+
+            // font-feature-settings: 'tnum';
+        }
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    font-weight: 600;
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+}
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+.table-pagination {
+    height: 58px;
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+    padding: 13px 15px;
+    border-left: 1px solid #e4e7e9;
+    border-right: 1px solid #e4e7e9;
+    border-bottom: 1px solid #e4e7e9;
+}
+</style>
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
index 6cf5145f..d5d84de0 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -41,6 +41,9 @@
                     </template>
                     <template #operation>
                         <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
+                        <el-button icon="el-icon-Download" :loading="loading" @click="exportReport" type="primary">
+                            下载报告
+                        </el-button>
                     </template>
                 </TableHeader>
                 <div class="box">
@@ -58,10 +61,11 @@ 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 { exportModelJB } from '@/api/harmonic-boot/harmonic'
 import { mainHeight } from '@/utils/layout'
 import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
 import { exportExcel } from '@/views/system/reportForms/export.js'
-
+import { ElMessage } from 'element-plus'
 defineOptions({
     name: 'harmonic-boot/xieboReport'
 })
@@ -113,12 +117,13 @@ const tableStore = new TableStore({
                 showtoolbar: false, // 是否显示工具栏
                 showinfobar: false, // 是否显示顶部信息栏
                 showsheetbar: true, // 是否显示底部sheet按钮
-                      allowEdit: false, // 禁止所有编辑操作（必填）
+                allowEdit: false, // 禁止所有编辑操作（必填）
                 data: tableStore.table.data
             })
         }, 10)
     }
 })
+const loading = ref(false)
 provide('tableStore', tableStore)
 
 onMounted(() => {
@@ -159,6 +164,50 @@ const handleNodeClick = (data: any, node: any) => {
 const exportEvent = () => {
     exportExcel(luckysheet.getAllSheets(), '统计报表下载')
 }
+const exportReport = () => {
+    if (!line) {
+        ElMessage({
+            type: 'warning',
+
+            message: '请选择要导出的数据'
+        })
+        return
+    }
+    loading.value = true
+    let form = new FormData()
+    form.append('isUrl', false)
+    form.append('lineIndex', dotList.value.id)
+    form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0])
+    form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1])
+    form.append('type', 0)
+    form.append('name', dotList.value.name)
+    ElMessage({
+        message: '下载报告中,请稍等.....',
+        duration: 1000
+    })
+    exportModelJB(form)
+        .then(async res => {
+            let blob = new Blob([res], {
+                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+            })
+
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download =
+                dotList.value.name +
+                TableHeaderRef.value.datePickerRef.timeValue[0] +
+                '_' +
+                TableHeaderRef.value.datePickerRef.timeValue[1] // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
 </script>
 <style lang="scss">
 .splitpanes.default-theme .splitpanes__pane {
@@ -167,6 +216,5 @@ const exportEvent = () => {
 
 .box {
     padding: 10px;
-    
 }
 </style>
diff --git a/src/views/pqs/runManage/runEvaluate/components/statistics.vue b/src/views/pqs/runManage/runEvaluate/components/statistics.vue
index 6d7542c3..fb1210c2 100644
--- a/src/views/pqs/runManage/runEvaluate/components/statistics.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/statistics.vue
@@ -1,125 +1,130 @@
-<template>
-    <div style="height: 145px" class="box1">
-        <div class="boxDiv hexagon">
-            <div style="color: #fff">{{ props.params.allNum }}</div>
-            <!-- <div class="hexagon"></div> -->
-            <div class="mt10 divBot">总数</div>
-        </div>
-        <div class="boxDiv hexagon hexagon1">
-            <div style="color: #fff">{{ props.params.runNum }}</div>
-            <!-- <div class="hexagon"></div> -->
-            <div class="mt10 divBot">在运</div>
-        </div>
-        <div class="boxDiv hexagon hexagon2">
-            <div style="color: #fff">{{ props.params.checkNum }}</div>
-            <!-- <div class="hexagon"></div> -->
-            <div class="mt10 divBot">检修</div>
-        </div>
-        <div class="boxDiv hexagon hexagon3">
-            <div style="color: #fff">{{ props.params.stopRunNum }}</div>
-            <!-- <div class="hexagon"></div> -->
-            <div class="mt10 divBot">停运</div>
-        </div>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
-import MyEChart from '@/components/echarts/MyEchart.vue'
-import { mainHeight } from '@/utils/layout'
-import { color } from '@/components/echarts/color'
-const height = mainHeight(330, 3)
-const props = defineProps({
-    params: {
-        type: Object,
-        default: () => {}
-    }
-})
-const info = () => {}
-onMounted(() => {
-    info()
-})
-</script>
-<style lang="scss" scoped>
-.box1 {
-    display: flex;
-    align-items: center;
-    .boxDiv {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        position: relative;
-        margin: 0 5px;
-
-        div:nth-child(1) {
-            position: absolute;
-            font-size: 30px;
-            top: -10px;
-            font-weight: 700;
-        }
-        .divBot {
-            font-size: 16px;
-            position: absolute;
-            top: 20px;
-        }
-        color: #fff;
-    }
-}
-.hexagon {
-    position: relative;
-    width: 100%;
-    height: 55px;
-    background-color: #19a094;
-    margin: 50px auto;
-    &::before {
-        border-bottom: 27.5px solid #19a094;
-    }
-    &::after {
-        border-top: 27.5px solid #19a094;
-    }
-}
-
-.hexagon::before,
-.hexagon::after {
-    content: '';
-    position: absolute;
-    width: 0;
-    border-left: 50px solid transparent;
-    border-right: 50px solid transparent;
-}
-
-.hexagon::before {
-    bottom: 100%;
-}
-
-.hexagon::after {
-    top: 100%;
-}
-.hexagon1 {
-    background-color: #2E8B57;
-    &::before {
-        border-bottom: 27.5px solid #2E8B57;
-    }
-    &::after {
-        border-top: 27.5px solid #2E8B57;
-    }
-}
-.hexagon2 {
-    background-color: #ffbf00;
-    &::before {
-        border-bottom: 27.5px solid #ffbf00;
-    }
-    &::after {
-        border-top: 27.5px solid #ffbf00;
-    }
-}
-.hexagon3 {
-    background-color: #A52a2a;
-    &::before {
-        border-bottom: 27.5px solid #A52a2a;
-    }
-    &::after {
-        border-top: 27.5px solid #A52a2a;
-    }
-}
-</style>
+<template>
+    <div style="height: 145px" class="box1">
+        <div class="boxDiv hexagon">
+            <div class="text-style">{{ props.params.allNum }}</div>
+            <!-- <div class="hexagon"></div> -->
+            <div class="mt10 divBot">总数</div>
+        </div>
+        <div class="boxDiv hexagon hexagon1">
+            <div class="text-style">{{ props.params.runNum }}</div>
+            <!-- <div class="hexagon"></div> -->
+            <div class="mt10 divBot">在运</div>
+        </div>
+        <div class="boxDiv hexagon hexagon2">
+            <div class="text-style">{{ props.params.checkNum }}</div>
+            <!-- <div class="hexagon"></div> -->
+            <div class="mt10 divBot">检修</div>
+        </div>
+        <div class="boxDiv hexagon hexagon3">
+            <div class="text-style">{{ props.params.stopRunNum }}</div>
+            <!-- <div class="hexagon"></div> -->
+            <div class="mt10 divBot">停运</div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import MyEChart from '@/components/echarts/MyEchart.vue'
+import { mainHeight } from '@/utils/layout'
+import { color } from '@/components/echarts/color'
+const height = mainHeight(330, 3)
+const props = defineProps({
+    params: {
+        type: Object,
+        default: () => {}
+    }
+})
+const info = () => {}
+onMounted(() => {
+    info()
+})
+</script>
+<style lang="scss" scoped>
+.box1 {
+    display: flex;
+    align-items: center;
+    .boxDiv {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+        margin: 0 5px;
+
+        div:nth-child(1) {
+            position: absolute;
+            font-size: 30px;
+            top: -10px;
+            font-weight: 700;
+        }
+        .divBot {
+            font-size: 16px;
+            position: absolute;
+            top: 20px;
+        }
+        color: #fff;
+    }
+}
+.hexagon {
+    position: relative;
+    width: 100%;
+    height: 55px;
+    background-color: #19a094;
+    margin: 50px auto;
+    &::before {
+        border-bottom: 27.5px solid #19a094;
+    }
+    &::after {
+        border-top: 27.5px solid #19a094;
+    }
+}
+
+.hexagon::before,
+.hexagon::after {
+    content: '';
+    position: absolute;
+    width: 0;
+    border-left: 50px solid transparent;
+    border-right: 50px solid transparent;
+}
+
+.hexagon::before {
+    bottom: 100%;
+}
+
+.hexagon::after {
+    top: 100%;
+}
+.hexagon1 {
+    background-color: #2e8b57;
+    &::before {
+        border-bottom: 27.5px solid #2e8b57;
+    }
+    &::after {
+        border-top: 27.5px solid #2e8b57;
+    }
+}
+.hexagon2 {
+    background-color: #ffbf00;
+    &::before {
+        border-bottom: 27.5px solid #ffbf00;
+    }
+    &::after {
+        border-top: 27.5px solid #ffbf00;
+    }
+}
+.hexagon3 {
+    background-color: #a52a2a;
+    &::before {
+        border-bottom: 27.5px solid #a52a2a;
+    }
+    &::after {
+        border-top: 27.5px solid #a52a2a;
+    }
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+    color: #fff;
+}
+</style>
diff --git a/src/views/pqs/runManage/runEvaluate/index.vue b/src/views/pqs/runManage/runEvaluate/index.vue
index a7f32ca3..3a91393c 100644
--- a/src/views/pqs/runManage/runEvaluate/index.vue
+++ b/src/views/pqs/runManage/runEvaluate/index.vue
@@ -1,501 +1,500 @@
-<template>
-    <div class="default-main" style="position: relative">
-        <TableHeader date-picker>
-            <template v-slot:select>
-                <el-form-item label="电网标识">
-                    <el-select
-                        v-model="tableStore.table.params.powerFlag"
-                        clearable
-                        style="width: 100%"
-                        placeholder="请选择电网标识"
-                    >
-                        <el-option
-                            v-for="item in powerFlagList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.algoDescribe"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-
-            <template v-slot:operation>
-                <el-button
-                    type="primary"
-                    class="ml10"
-                    @click="toggle"
-                    :icon="leftVisible ? 'el-icon-Hide' : 'el-icon-View'"
-                >
-                    {{ leftVisible ? '隐藏' : '显示' }}
-                </el-button>
-
-                <el-tooltip placement="left-start">
-                    <InfoFilled style="height: 20px" class="ml10" />
-                    <!-- <el-button circle icon="el-icon-InfoFilled" /> -->
-                    <template #content>
-                        <div style="font-size: 16px" class="mt10 mb10">
-                            <div>终端在线率</div>
-                            <div class="em1">定义：终端在指定时间段内处于在线状态的时间比例。</div>
-                            <div class="em1">计算方法：在线率=终端在线时间/总监测时间×100%</div>
-                            <div class="em1">评价标准：</div>
-                            <div class="em2">
-                                <span style="color: #00b07d">优秀</span>
-                                　在线率 ≥ 95%
-                            </div>
-                            <div class="em2">
-                                <span style="color: #2b7fd3">良好</span>
-                                　90% ≤ 在线率 < 95
-                            </div>
-                            <div class="em2">
-                                <span style="color: #ff8c00">一般</span>
-                                　80% ≤ 在线率 < 90%
-                            </div>
-                            <div class="em2">
-                                <span style="color: #c00">较差</span>
-                                　在线率 < 80%
-                            </div>
-
-                            <div class="mt10">数据完整性</div>
-                            <div class="em1">定义：终端上传数据的完整性和连续性</div>
-                            <div class="em1">计算方法：数据完整性=实际上传数据量/预期上传数据量×100%</div>
-                            <div class="em1">评价标准：</div>
-                            <div class="em2">
-                                <span style="color: #00b07d">优秀</span>
-                                　完整性 ≥ 98%
-                            </div>
-                            <div class="em2">
-                                <span style="color: #2b7fd3">良好</span>
-                                　95% ≤ 完整性 < 98%
-                            </div>
-                            <div class="em2">
-                                <span style="color: #ff8c00">一般</span>
-                                　90% ≤ 完整性 < 95%
-                            </div>
-                            <div class="em2">
-                                <span style="color: #c00">较差</span>
-                                　完整性 < 90%
-                            </div>
-
-                            <div class="mt10">数据合格率</div>
-                            <div class="em1">定义：终端上传数据的合格率(以谐波电压为代表)。</div>
-                            <div class="em1">计算方法：合格率=合格数据量/总数据量×100%</div>
-                            <div class="em1">评价标准：</div>
-                            <div class="em2">
-                                <span style="color: #00b07d">优秀</span>
-                                　合格率 ≥ 98%
-                            </div>
-                            <div class="em2">
-                                <span style="color: #2b7fd3">良好</span>
-                                　95% ≤ 合格率 < 98%
-                            </div>
-                            <div class="em2">
-                                <span style="color: #ff8c00">一般</span>
-                                　90% ≤ 合格率 < 95%
-                            </div>
-                            <div class="em2">
-                                <span style="color: #c00">较差</span>
-                                　合格率 < 90%
-                            </div>
-                            <div class="mt10">综合评价方法</div>
-                            <div class="em1">权重分配:根据各维度的重要性，分配不同的权重。例如:</div>
-                            <div class="em2">终端在线率:20%</div>
-                            <div class="em2">数据完整性:50%</div>
-                            <div class="em2">数据合格率:30%</div>
-                            <div class="em1">综合评分:综合评分=∑(单项评分x权重)</div>
-                            <div class="em1">评价等级:</div>
-                            <div class="em2">
-                                <span style="color: #00b07d">优秀</span>
-                                　综合评分 ≥ 90
-                            </div>
-                            <div class="em2">
-                                <span style="color: #2b7fd3">良好</span>
-                                　80 ≤ 综合评分 < 90
-                            </div>
-                            <div class="em2">
-                                <span style="color: #ff8c00">一般</span>
-                                　70 ≤ 综合评分 < 80
-                            </div>
-                            <div class="em2">
-                                <span style="color: #c00">较差</span>
-                                　综合评分 < 70
-                            </div>
-                        </div>
-                    </template>
-                </el-tooltip>
-            </template>
-        </TableHeader>
-
-        <div class="mapBox">
-            <el-form :inline="true" class="demo-form-inline">
-                <el-form-item>
-                    <Area
-                        ref="areaRef"
-                        @change-value="changeValue"
-                        :show-all-levels="false"
-                        v-model="tableStore.table.params.deptIndex"
-                        style="width: 100px"
-                    />
-                </el-form-item>
-            </el-form>
-        </div>
-
-        <Map ref="mapRef" :params="tableStore.table.params" />
-
-        <transition name="slide-left">
-            <div class="left" :style="height" v-if="leftVisible">
-                <BorderBox13
-                    style="height: 200px"
-                    :color="[color[0], color[0]]"
-                    class="box"
-                    :backgroundColor="`#f3f1ec90`"
-                    title="终端统计"
-                >
-                    <div class="title">
-                        <span class="iconfont icon-zhongduantongji-xian"></span>
-                        终端统计
-
-                        <!-- <el-button link class="view" icon="el-icon-View" @click="endpointStatistics">详情</el-button> -->
-                    </div>
-                    <statistics :params="tableStore.table.data" />
-                </BorderBox13>
-                <BorderBox13
-                    :color="[color[0], color[0]]"
-                    class="box"
-                    style="flex: 1"
-                    :backgroundColor="`#f3f1ec90`"
-                    title="终端运行评价"
-                >
-                    <div class="title">
-                        <span class="iconfont icon-daipingjia"></span>
-                        终端运行评价
-                        <!-- <el-button link class="view" icon="el-icon-View" @click="endpointStatistics">详情</el-button> -->
-                    </div>
-                    <run :params="tableStore.table.params" ref="runRef" @reviewDetails="reviewDetails" />
-                </BorderBox13>
-                <BorderBox13
-                    :style="height3"
-                    :color="[color[0], color[0]]"
-                    class="box"
-                    :backgroundColor="`#f3f1ec90`"
-                    title="终端运行评价详情"
-                >
-                    <div class="title">
-                        <span class="iconfont icon-a-qushi1"></span>
-                        终端运行评价详情
-                        <!-- <el-button link class="view" icon="el-icon-View">详情</el-button> -->
-                    </div>
-                    <terminalOperation :params="tableStore.table.params" ref="terminalOperationRef" />
-                </BorderBox13>
-            </div>
-        </transition>
-
-        <transition name="slide-right">
-            <div class="right" :style="height" v-if="rightVisible">
-                <BorderBox13
-                    :color="[color[0], color[0]]"
-                    class="box box-2"
-                    :backgroundColor="`#f3f1ec90`"
-                    title="区域终端运行评价"
-                >
-                    <div class="title">
-                        <span class="iconfont icon-a-ziyuan118"></span>
-                        区域终端运行评价
-                        <!-- <div class="view" @click="regionEvaluation">
-                            详情
-                            <ArrowRight style="width: 12px" />
-                        </div> -->
-                    </div>
-                    <region :params="tableStore.table.params" ref="regionRef" />
-                </BorderBox13>
-                <div :style="height3">
-                    <BorderBox13
-                        style="height: 100%"
-                        :color="[color[0], color[0]]"
-                        class="box"
-                        :backgroundColor="`#f3f1ec90`"
-                        title="最近一周终端评价趋势"
-                    >
-                        <div class="title">
-                            <span class="iconfont icon-yunhangxiangqing"></span>
-                            最近一周终端评价趋势
-                        </div>
-
-                        <week ref="weekRef" :params="tableStore.table.params" />
-                    </BorderBox13>
-                </div>
-            </div>
-        </transition>
-
-        <transition name="slide-bottom">
-            <div class="center" :style="height3" v-if="centerVisible">
-                <BorderBox13
-                    :color="[color[0], color[0]]"
-                    class="box"
-                    :backgroundColor="`#f3f1ec90`"
-                    title="异常终端详情"
-                >
-                    <div class="title">
-                        <span class="iconfont icon-yichangxiangqing-xian"></span>
-                        异常终端详情
-                    </div>
-                    <terminalDetails ref="terminalDetailsRef" :params="tableStore.table.params" />
-                    <!-- <table /> -->
-                </BorderBox13>
-            </div>
-        </transition>
-        <!-- 终端统计弹框 -->
-        <statisticsPopUpBox ref="statisticsPopUpBoxRef" />
-        <!-- 区域详情 -->
-        <regionDetails ref="regionDetailsRef" />
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, reactive, onMounted, provide } from 'vue'
-import TableHeader from '@/components/table/header/index.vue'
-import TableStore from '@/utils/tableStore'
-import { useDictData } from '@/stores/dictData'
-import { mainHeight } from '@/utils/layout'
-import Area from '@/components/form/area/index.vue'
-import { ArrowRight } from '@element-plus/icons-vue'
-import Map from './components/map.vue'
-import { BorderBox13 } from '@kjgl77/datav-vue3'
-import { useConfig } from '@/stores/config'
-import terminalOperation from './components/terminalOperation.vue'
-import region from './components/region.vue'
-import { InfoFilled } from '@element-plus/icons-vue'
-import week from './components/week.vue'
-import terminalDetails from './components/terminalDetails.vue'
-import statistics from './components/statistics.vue'
-import run from './components/run.vue'
-import statisticsPopUpBox from './components/statisticsPopUpBox.vue'
-import regionDetails from './components/regionDetails.vue'
-defineOptions({
-    name: 'runManage/runEvaluate'
-})
-const runRef = ref()
-const regionRef = ref()
-const weekRef = ref()
-const terminalDetailsRef = ref()
-const config = useConfig()
-const color = config.layout.elementUiPrimary
-const dictData = useDictData()
-const height = mainHeight(115)
-const height3 = mainHeight(115, 3)
-const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-//字典获取监督对象类型
-const powerFlagList = dictData.getBasicData('power_flag')
-const tableStore = new TableStore({
-    url: '/device-boot/dev/statisticDevNum',
-    method: 'POST',
-    column: [],
-    loadCallback: () => {
-        runRef.value.info()
-        weekRef.value.info()
-        regionRef.value.info()
-        mapRef.value.addMarkers()
-        mapRef.value.grids(tableStore.table.params)
-        terminalDetailsRef.value.info()
-    }
-})
-
-tableStore.table.params.deptIndex = dictData.state.area[0].id
-tableStore.table.params.loadType = dictData.getBasicData('Interference_Source')
-tableStore.table.params.terminaloption = dictData.getBasicData('Dev_Manufacturers')
-tableStore.table.params.scale = dictData.getBasicData('Dev_Voltage_Stand')
-tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0] //dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
-tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = 2
-tableStore.table.params.serverName = 'harmonicBoot'
-provide('tableStore', tableStore)
-const leftVisible = ref(true)
-const rightVisible = ref(true)
-const centerVisible = ref(true)
-const statisticsPopUpBoxRef = ref(true)
-const regionDetailsRef = ref(true)
-const mapRef = ref()
-const toggle = () => {
-    leftVisible.value = !leftVisible.value
-    rightVisible.value = !rightVisible.value
-    centerVisible.value = !centerVisible.value
-    if(leftVisible.value)//显示时刷新数据
-    {
-        tableStore.index()
-    }
- 
-}
-
-// 区域变化
-const changeValue = (val: any) => {
-    tableStore.index()
-}
-// 区域详情
-const regionEvaluation = () => {
-    regionDetailsRef.value.open()
-}
-const terminalOperationRef = ref()
-//渲染 在线率
-const reviewDetails = (item: any) => {
-    terminalOperationRef.value.info(item)
-}
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-</script>
-<style lang="scss" scoped>
-.left,
-.right {
-    display: flex;
-    position: absolute;
-    top: 80px;
-    width: 450px;
-    flex-direction: column;
-    z-index: 99;
-    transition: all 0.3s ease;
-}
-.left {
-    left: 15px;
-}
-.right {
-    right: 15px !important;
-    .box {
-        flex: 1; /* 占2份高度 */
-    }
-    .box-2 {
-        flex: 2; /* 占2份高度 */
-    }
-}
-.box {
-    padding: 20px 10px 10px;
-}
-.center {
-    position: absolute;
-    bottom: 16px;
-    left: 50%;
-    transform: translateX(-50%);
-    width: calc(100% - 950px);
-    min-width: 480px;
-    .box {
-        flex: 1; /* 占2份高度 */
-        padding: 20px 10px 10px;
-    }
-    transition: all 0.3s ease;
-}
-.title {
-    // padding: 5px 5px 5px 10px;
-    background: linear-gradient(to right, var(--el-color-primary), #ffffff00);
-    font-size: 16px;
-    // font-weight: bold;
-    height: 33px;
-    color: #fff;
-    display: flex;
-    align-items: center;
-    .iconfont {
-        font-size: 22px;
-        margin: 0 5px 0 10px;
-    }
-    button,
-    .view {
-        margin-left: auto;
-        margin-right: 10px;
-    }
-}
-.toggle-btn {
-    position: absolute;
-    z-index: 100;
-    padding: 5px 10px;
-    cursor: pointer;
-}
-.slide-left-enter-active,
-.slide-left-leave-active {
-    transition: all 0.3s ease;
-}
-.slide-left-enter-from,
-.slide-left-leave-to {
-    transform: translateX(-100%);
-    opacity: 0;
-}
-.slide-right-enter-active,
-.slide-right-leave-active {
-    transition: all 0.3s ease;
-}
-.slide-right-enter-from,
-.slide-right-leave-to {
-    transform: translateX(100%);
-    opacity: 0;
-}
-.slide-bottom-enter-active,
-.slide-bottom-leave-active {
-    transition: all 0.3s ease;
-}
-.slide-bottom-enter-from,
-.slide-bottom-leave-to {
-    transform: translateY(100%);
-    opacity: 0;
-}
-.em1 {
-    margin-top: 5px;
-    text-indent: 1em;
-}
-.em2 {
-    margin-top: 5px;
-    text-indent: 2em;
-}
-:deep(.title > .el-button.is-link) {
-    color: #fff;
-    &:hover {
-        color: #ccc;
-    }
-}
-:deep(.mapBox) {
-    position: absolute;
-    top: 80px;
-    left: calc(50% + 45px);
-
-    z-index: 10;
-
-    .el-select {
-        min-width: 100px;
-
-        .el-select__wrapper {
-            height: 46px !important;
-            border-radius: 8px;
-        }
-    }
-
-    .Icon {
-        height: 46px;
-        width: 46px;
-        background-color: #fff;
-        border-radius: 8px;
-        text-align: center;
-        line-height: 50px;
-        cursor: pointer;
-
-        .fa-refresh {
-            color: var(--el-color-primary) !important;
-        }
-    }
-
-    .el-input__wrapper {
-        height: 46px;
-        border-radius: 8px;
-    }
-
-    .el-form-item {
-        margin-right: 15px;
-    }
-}
-:deep(.view) {
-    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
-    width: 60px;
-    height: 28px;
-    display: flex;
-    font-size: 14px;
-    justify-content: center;
-    line-height: 28px;
-    cursor: pointer;
-    background-color: var(--el-color-primary);
-}
-</style>
+<template>
+    <div class="default-main" style="position: relative">
+        <TableHeader date-picker>
+            <template v-slot:select>
+                <el-form-item label="电网标识">
+                    <el-select
+                        v-model="tableStore.table.params.powerFlag"
+                        clearable
+                        style="width: 100%"
+                        placeholder="请选择电网标识"
+                    >
+                        <el-option
+                            v-for="item in powerFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.algoDescribe"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+
+            <template v-slot:operation>
+                <el-button
+                    type="primary"
+                    class="ml10"
+                    @click="toggle"
+                    :icon="leftVisible ? 'el-icon-Hide' : 'el-icon-View'"
+                >
+                    {{ leftVisible ? '隐藏' : '显示' }}
+                </el-button>
+
+                <el-tooltip placement="left-start">
+                    <InfoFilled style="height: 20px" class="ml10" />
+                    <!-- <el-button circle icon="el-icon-InfoFilled" /> -->
+                    <template #content>
+                        <div style="font-size: 16px" class="mt10 mb10">
+                            <div>终端在线率</div>
+                            <div class="em1">定义：终端在指定时间段内处于在线状态的时间比例。</div>
+                            <div class="em1">计算方法：在线率=终端在线时间/总监测时间×100%</div>
+                            <div class="em1">评价标准：</div>
+                            <div class="em2">
+                                <span style="color: #00b07d">优秀</span>
+                                　在线率 ≥ 95%
+                            </div>
+                            <div class="em2">
+                                <span style="color: #2b7fd3">良好</span>
+                                　90% ≤ 在线率 < 95
+                            </div>
+                            <div class="em2">
+                                <span style="color: #ff8c00">一般</span>
+                                　80% ≤ 在线率 < 90%
+                            </div>
+                            <div class="em2">
+                                <span style="color: #c00">较差</span>
+                                　在线率 < 80%
+                            </div>
+
+                            <div class="mt10">数据完整性</div>
+                            <div class="em1">定义：终端上传数据的完整性和连续性</div>
+                            <div class="em1">计算方法：数据完整性=实际上传数据量/预期上传数据量×100%</div>
+                            <div class="em1">评价标准：</div>
+                            <div class="em2">
+                                <span style="color: #00b07d">优秀</span>
+                                　完整性 ≥ 98%
+                            </div>
+                            <div class="em2">
+                                <span style="color: #2b7fd3">良好</span>
+                                　95% ≤ 完整性 < 98%
+                            </div>
+                            <div class="em2">
+                                <span style="color: #ff8c00">一般</span>
+                                　90% ≤ 完整性 < 95%
+                            </div>
+                            <div class="em2">
+                                <span style="color: #c00">较差</span>
+                                　完整性 < 90%
+                            </div>
+
+                            <div class="mt10">数据合格率</div>
+                            <div class="em1">定义：终端上传数据的合格率(以谐波电压为代表)。</div>
+                            <div class="em1">计算方法：合格率=合格数据量/总数据量×100%</div>
+                            <div class="em1">评价标准：</div>
+                            <div class="em2">
+                                <span style="color: #00b07d">优秀</span>
+                                　合格率 ≥ 98%
+                            </div>
+                            <div class="em2">
+                                <span style="color: #2b7fd3">良好</span>
+                                　95% ≤ 合格率 < 98%
+                            </div>
+                            <div class="em2">
+                                <span style="color: #ff8c00">一般</span>
+                                　90% ≤ 合格率 < 95%
+                            </div>
+                            <div class="em2">
+                                <span style="color: #c00">较差</span>
+                                　合格率 < 90%
+                            </div>
+                            <div class="mt10">综合评价方法</div>
+                            <div class="em1">权重分配:根据各维度的重要性，分配不同的权重。例如:</div>
+                            <div class="em2">终端在线率:20%</div>
+                            <div class="em2">数据完整性:50%</div>
+                            <div class="em2">数据合格率:30%</div>
+                            <div class="em1">综合评分:综合评分=∑(单项评分x权重)</div>
+                            <div class="em1">评价等级:</div>
+                            <div class="em2">
+                                <span style="color: #00b07d">优秀</span>
+                                　综合评分 ≥ 90
+                            </div>
+                            <div class="em2">
+                                <span style="color: #2b7fd3">良好</span>
+                                　80 ≤ 综合评分 < 90
+                            </div>
+                            <div class="em2">
+                                <span style="color: #ff8c00">一般</span>
+                                　70 ≤ 综合评分 < 80
+                            </div>
+                            <div class="em2">
+                                <span style="color: #c00">较差</span>
+                                　综合评分 < 70
+                            </div>
+                        </div>
+                    </template>
+                </el-tooltip>
+            </template>
+        </TableHeader>
+
+        <div class="mapBox">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item>
+                    <Area
+                        ref="areaRef"
+                        @change-value="changeValue"
+                        :show-all-levels="false"
+                        v-model="tableStore.table.params.deptIndex"
+                        style="width: 100px"
+                    />
+                </el-form-item>
+            </el-form>
+        </div>
+
+        <Map ref="mapRef" :params="tableStore.table.params" />
+
+        <transition name="slide-left">
+            <div class="left" :style="height" v-if="leftVisible">
+                <BorderBox13
+                    style="height: 200px"
+                    :color="[color[0], color[0]]"
+                    class="box"
+                    :backgroundColor="`#f3f1ec90`"
+                    title="终端统计"
+                >
+                    <div class="title">
+                        <span class="iconfont icon-zhongduantongji-xian"></span>
+                        终端统计
+
+                        <!-- <el-button link class="view" icon="el-icon-View" @click="endpointStatistics">详情</el-button> -->
+                    </div>
+                    <statistics :params="tableStore.table.data" />
+                </BorderBox13>
+                <BorderBox13
+                    :color="[color[0], color[0]]"
+                    class="box"
+                    style="flex: 1"
+                    :backgroundColor="`#f3f1ec90`"
+                    title="终端运行评价"
+                >
+                    <div class="title">
+                        <span class="iconfont icon-daipingjia"></span>
+                        终端运行评价
+                        <!-- <el-button link class="view" icon="el-icon-View" @click="endpointStatistics">详情</el-button> -->
+                    </div>
+                    <run :params="tableStore.table.params" ref="runRef" @reviewDetails="reviewDetails" />
+                </BorderBox13>
+                <BorderBox13
+                    :style="height3"
+                    :color="[color[0], color[0]]"
+                    class="box"
+                    :backgroundColor="`#f3f1ec90`"
+                    title="终端运行评价详情"
+                >
+                    <div class="title">
+                        <span class="iconfont icon-a-qushi1"></span>
+                        终端运行评价详情
+                        <!-- <el-button link class="view" icon="el-icon-View">详情</el-button> -->
+                    </div>
+                    <terminalOperation :params="tableStore.table.params" ref="terminalOperationRef" />
+                </BorderBox13>
+            </div>
+        </transition>
+
+        <transition name="slide-right">
+            <div class="right" :style="height" v-if="rightVisible">
+                <BorderBox13
+                    :color="[color[0], color[0]]"
+                    class="box box-2"
+                    :backgroundColor="`#f3f1ec90`"
+                    title="区域终端运行评价"
+                >
+                    <div class="title">
+                        <span class="iconfont icon-a-ziyuan118"></span>
+                        区域终端运行评价
+                        <!-- <div class="view" @click="regionEvaluation">
+                            详情
+                            <ArrowRight style="width: 12px" />
+                        </div> -->
+                    </div>
+                    <region :params="tableStore.table.params" ref="regionRef" />
+                </BorderBox13>
+                <div :style="height3">
+                    <BorderBox13
+                        style="height: 100%"
+                        :color="[color[0], color[0]]"
+                        class="box"
+                        :backgroundColor="`#f3f1ec90`"
+                        title="最近一周终端评价趋势"
+                    >
+                        <div class="title">
+                            <span class="iconfont icon-yunhangxiangqing"></span>
+                            最近一周终端评价趋势
+                        </div>
+
+                        <week ref="weekRef" :params="tableStore.table.params" />
+                    </BorderBox13>
+                </div>
+            </div>
+        </transition>
+
+        <transition name="slide-bottom">
+            <div class="center" :style="height3" v-if="centerVisible">
+                <BorderBox13
+                    :color="[color[0], color[0]]"
+                    class="box"
+                    :backgroundColor="`#f3f1ec90`"
+                    title="异常终端详情"
+                >
+                    <div class="title">
+                        <span class="iconfont icon-yichangxiangqing-xian"></span>
+                        异常终端详情
+                    </div>
+                    <terminalDetails ref="terminalDetailsRef" :params="tableStore.table.params" />
+                    <!-- <table /> -->
+                </BorderBox13>
+            </div>
+        </transition>
+        <!-- 终端统计弹框 -->
+        <statisticsPopUpBox ref="statisticsPopUpBoxRef" />
+        <!-- 区域详情 -->
+        <regionDetails ref="regionDetailsRef" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive, onMounted, provide } from 'vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import Area from '@/components/form/area/index.vue'
+import { ArrowRight } from '@element-plus/icons-vue'
+import Map from './components/map.vue'
+import { BorderBox13 } from '@kjgl77/datav-vue3'
+import { useConfig } from '@/stores/config'
+import terminalOperation from './components/terminalOperation.vue'
+import region from './components/region.vue'
+import { InfoFilled } from '@element-plus/icons-vue'
+import week from './components/week.vue'
+import terminalDetails from './components/terminalDetails.vue'
+import statistics from './components/statistics.vue'
+import run from './components/run.vue'
+import statisticsPopUpBox from './components/statisticsPopUpBox.vue'
+import regionDetails from './components/regionDetails.vue'
+defineOptions({
+    name: 'runManage/runEvaluate'
+})
+const runRef = ref()
+const regionRef = ref()
+const weekRef = ref()
+const terminalDetailsRef = ref()
+const config = useConfig()
+const color = config.layout.elementUiPrimary
+const dictData = useDictData()
+const height = mainHeight(115)
+const height3 = mainHeight(115, 3)
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+//字典获取监督对象类型
+const powerFlagList = dictData.getBasicData('power_flag')
+const tableStore = new TableStore({
+    url: '/device-boot/dev/statisticDevNum',
+    method: 'POST',
+    column: [],
+    loadCallback: () => {
+        runRef.value.info()
+        weekRef.value.info()
+        regionRef.value.info()
+        mapRef.value.addMarkers()
+        mapRef.value.grids(tableStore.table.params)
+        terminalDetailsRef.value.info()
+    }
+})
+
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.loadType = dictData.getBasicData('Interference_Source')
+tableStore.table.params.terminaloption = dictData.getBasicData('Dev_Manufacturers')
+tableStore.table.params.scale = dictData.getBasicData('Dev_Voltage_Stand')
+tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0] //dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'harmonicBoot'
+provide('tableStore', tableStore)
+const leftVisible = ref(true)
+const rightVisible = ref(true)
+const centerVisible = ref(true)
+const statisticsPopUpBoxRef = ref(true)
+const regionDetailsRef = ref(true)
+const mapRef = ref()
+const toggle = () => {
+    leftVisible.value = !leftVisible.value
+    rightVisible.value = !rightVisible.value
+    centerVisible.value = !centerVisible.value
+    if (leftVisible.value) {
+        //显示时刷新数据
+        tableStore.index()
+    }
+}
+
+// 区域变化
+const changeValue = (val: any) => {
+    tableStore.index()
+}
+// 区域详情
+const regionEvaluation = () => {
+    regionDetailsRef.value.open()
+}
+const terminalOperationRef = ref()
+//渲染 在线率
+const reviewDetails = (item: any) => {
+    terminalOperationRef.value.info(item)
+}
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+</script>
+<style lang="scss" scoped>
+.left,
+.right {
+    display: flex;
+    position: absolute;
+    top: 80px;
+    width: 450px;
+    flex-direction: column;
+    z-index: 99;
+    transition: all 0.3s ease;
+}
+.left {
+    left: 15px;
+}
+.right {
+    right: 15px !important;
+    .box {
+        flex: 1; /* 占2份高度 */
+    }
+    .box-2 {
+        flex: 2; /* 占2份高度 */
+    }
+}
+.box {
+    padding: 20px 10px 10px;
+}
+.center {
+    position: absolute;
+    bottom: 16px;
+    left: 50%;
+    transform: translateX(-50%);
+    width: calc(100% - 950px);
+    min-width: 480px;
+    .box {
+        flex: 1; /* 占2份高度 */
+        padding: 20px 10px 10px;
+    }
+    transition: all 0.3s ease;
+}
+.title {
+    // padding: 5px 5px 5px 10px;
+    background: linear-gradient(to right, var(--el-color-primary), #ffffff00);
+    font-size: 16px;
+    // font-weight: bold;
+    height: 33px;
+    color: #fff;
+    display: flex;
+    align-items: center;
+    .iconfont {
+        font-size: 22px;
+        margin: 0 5px 0 10px;
+    }
+    button,
+    .view {
+        margin-left: auto;
+        margin-right: 10px;
+    }
+}
+.toggle-btn {
+    position: absolute;
+    z-index: 100;
+    padding: 5px 10px;
+    cursor: pointer;
+}
+.slide-left-enter-active,
+.slide-left-leave-active {
+    transition: all 0.3s ease;
+}
+.slide-left-enter-from,
+.slide-left-leave-to {
+    transform: translateX(-100%);
+    opacity: 0;
+}
+.slide-right-enter-active,
+.slide-right-leave-active {
+    transition: all 0.3s ease;
+}
+.slide-right-enter-from,
+.slide-right-leave-to {
+    transform: translateX(100%);
+    opacity: 0;
+}
+.slide-bottom-enter-active,
+.slide-bottom-leave-active {
+    transition: all 0.3s ease;
+}
+.slide-bottom-enter-from,
+.slide-bottom-leave-to {
+    transform: translateY(100%);
+    opacity: 0;
+}
+.em1 {
+    margin-top: 5px;
+    text-indent: 1em;
+}
+.em2 {
+    margin-top: 5px;
+    text-indent: 2em;
+}
+:deep(.title > .el-button.is-link) {
+    color: #fff;
+    &:hover {
+        color: #ccc;
+    }
+}
+:deep(.mapBox) {
+    position: absolute;
+    top: 80px;
+    left: calc(50% + 45px);
+
+    z-index: 10;
+
+    .el-select {
+        min-width: 100px;
+
+        .el-select__wrapper {
+            height: 46px !important;
+            border-radius: 8px;
+        }
+    }
+
+    .Icon {
+        height: 46px;
+        width: 46px;
+        background-color: #fff;
+        border-radius: 8px;
+        text-align: center;
+        line-height: 50px;
+        cursor: pointer;
+
+        .fa-refresh {
+            color: var(--el-color-primary) !important;
+        }
+    }
+
+    .el-input__wrapper {
+        height: 46px;
+        border-radius: 8px;
+    }
+
+    .el-form-item {
+        margin-right: 15px;
+    }
+}
+:deep(.view) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    width: 60px;
+    height: 28px;
+    display: flex;
+    font-size: 14px;
+    justify-content: center;
+    line-height: 28px;
+    cursor: pointer;
+    background-color: var(--el-color-primary);
+}
+</style>
diff --git a/src/views/pqs/runManage/runEvaluate/index_JB.vue b/src/views/pqs/runManage/runEvaluate/index_JB.vue
new file mode 100644
index 00000000..8812285f
--- /dev/null
+++ b/src/views/pqs/runManage/runEvaluate/index_JB.vue
@@ -0,0 +1,630 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker ref="TableHeaderRef" :dateLabel="`数据统计时间`">
+            <template v-slot:select>
+                <el-form-item label="运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="筛选">
+                    <el-input v-model="tableStore.table.params.filterName" placeholder="输入关键字筛选" />
+                </el-form-item>
+            </template>
+
+            <template v-slot:operation>
+                <el-button type="primary" icon="el-icon-Download" @click="onExport">导出</el-button>
+            </template>
+        </TableHeader>
+        <div class="card-list pt10" v-loading="tableStore.table.loading">
+            <div class="monitoringPoints">
+                <el-card style="height: 200px">
+                    <template #header>
+                        <div class="card-header">
+                            <span>终端统计</span>
+                        </div>
+                    </template>
+                    <div>
+                        <statistics :params="statisticsList" />
+
+                      
+                    </div>
+                </el-card>
+                <el-card class="mt10">
+                    <template #header>
+                        <div class="card-header">
+                            <span>完整性统计</span>
+                        </div>
+                    </template>
+                    <div class="mb5" style="height: 40px">
+                        <el-segmented
+                            style="height: 100%"
+                            v-model="segmented"
+                            :props="props"
+                            :options="segmentedList"
+                            block
+                            @change="tableStore.index()"
+                        >
+                            <template #default="scope">
+                                <div>
+                                    <div>{{ scope.item.name }}</div>
+                                </div>
+                            </template>
+                        </el-segmented>
+                    </div>
+                    <div class="header">
+                        <span style="width: 110px; text-align: left">
+                            {{
+                                segmented == 'Power_Network'
+                                    ? '区域'
+                                    : segmented == 'Manufacturer'
+                                    ? '终端厂家'
+                                    : '电网标志'
+                            }}
+                        </span>
+                        <span style="width: 90px">终端总数</span>
+                        <span style="flex: 1">完整性(%)</span>
+                        <span style="width: 80px">在线率(%)</span>
+                        <span style="width: 80px">合格率(%)</span>
+                    </div>
+                    <div :style="indicatorHeight" style="overflow-y: auto">
+                        <div v-for="o in abnormal" class="abnormal mb10">
+                            <span style="width: 110px; height: 24px" class="iconDiv">
+                                <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                                {{ o.name }}
+                            </span>
+                            <!-- 终端总数 -->
+                            <span
+                                style="width: 90px; color: #388e3c"
+                                class="text text-style"
+                                @click="renderTable(o.list, o.name+'_')"
+                            >
+                                {{ o.count }}
+                            </span>
+                            <!--  -->
+                            <span
+                                style="flex: 1; color: #ff9100"
+                                class="text"
+                                :class="` ${o.integrity < 90 ? 'text-red' : ''}`"
+                            >
+                                {{ o.integrity }}
+                            </span>
+                            <span
+                                style="width: 80px; color: #388e3c"
+                                :class="` ${o.online < 90 ? 'text-red' : ''}`"
+                                class="text"
+                            >
+                                {{ o.online }}
+                            </span>
+                            <span
+                                style="width: 80px; color: #388e3c"
+                                :class="` ${o.qualified < 90 ? 'text-red' : ''}`"
+                                class="text"
+                            >
+                                {{ o.qualified }}
+                            </span>
+                        </div>
+                    </div>
+                </el-card>
+            </div>
+            <el-card class="detail ml10" :style="pageHeight">
+                <template #header>
+                    <div class="card-header">
+                        <span>{{ title }}终端详情</span>
+                    </div>
+                </template>
+
+                <!--表格-->
+
+                <div :style="{ height: tableStore.table.height }" v-loading="loading">
+                    <vxe-table
+                        height="auto"
+                        :data="dataList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+                        v-bind="defaultAttribute"
+                        ref="tableRef"
+                        :scroll-y="{ enabled: true }"
+                    >
+                        <vxe-column type="seq" title="序号" width="80px">
+                            <template #default="{ rowIndex }">
+                                <span>
+                                    {{
+                                        (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize +
+                                        rowIndex +
+                                        1
+                                    }}
+                                </span>
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="cit" title="参数地市" width="110px"></vxe-column>
+                        <vxe-column field="company" title="供电公司"></vxe-column>
+                        <vxe-column field="subName" title="变电站"></vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
+                        <vxe-column field="name" title="终端名称"></vxe-column>
+                        <vxe-column field="ip" title="终端IP" :formatter="formatter" width="130px"></vxe-column>
+                        <vxe-column field="runFlag" title="运行状态" width="100px">
+                            <template #default="{ row }">
+                                <el-tag
+                                    :type="
+                                        row.runFlag == '运行'
+                                            ? 'success'
+                                            : row.runFlag == '停运'
+                                            ? 'danger'
+                                            : row.runFlag == '检修'
+                                            ? 'warning'
+                                            : row.runFlag == '调试'
+                                            ? 'warning'
+                                            : 'danger'
+                                    "
+                                >
+                                    {{ row.runFlag }}
+                                </el-tag>
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="integrityRate" title="完整性(%)" width="100px"></vxe-column>
+                        <vxe-column field="onLineRate" title="在线率(%)" width="100px"></vxe-column>
+                        <vxe-column field="passRate" title="合格率(%)" width="100px"></vxe-column>
+                    </vxe-table>
+                </div>
+                <div class="table-pagination">
+                    <el-pagination
+                        v-model:currentPage="pageNum"
+                        v-model:page-size="pageSize"
+                        :page-sizes="[10, 20, 50, 100, 200]"
+                        background
+                        layout="sizes,total, ->, prev, pager, next, jumper"
+                        :total="dataList.length"
+                    ></el-pagination>
+                </div>
+            </el-card>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import statistics from './components/statistics.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify'
+defineOptions({
+    name: 'harmonic-boot/harmonic/getIntegrityData'
+})
+
+const dictData = useDictData()
+//字典获取监督对象类型
+const pageHeight = mainHeight(97)
+const indicatorHeight = mainHeight(447)
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const pageSize = ref(20)
+const pageNum = ref(1)
+const title = ref('')
+const statisticsList: any = ref({
+    allNum: 0,
+    runNum: 0,
+    checkNum: 0,
+    stopRunNum: 0
+})
+const loading = ref(false)
+const dataList = ref([])
+const tableRef = ref()
+const percentage = ref({})
+const TableHeaderRef = ref()
+const abnormal: any = ref([])
+const totalData: any = ref([])
+//定义终端运行状态下拉框数据
+const runFlagList = [
+    { id: 0, name: '运行' },
+    { id: 1, name: '检修' },
+    { id: 2, name: '停运' },
+    { id: 3, name: '调试' },
+    { id: 4, name: '退运' }
+]
+// Statistical_Type
+
+const segmented = ref('Power_Network')
+
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const tableStore = new TableStore({
+    url: '/device-boot/deviceRunEvaluate/getRunEvaluateInfo',
+    method: 'POST',
+    showPage: false,
+    publicHeight: 145,
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+    loadCallback: () => {
+        totalData.value = Array.from(
+            tableStore.table.data
+                .map((item: any) => item.list)
+                .flat()
+                .reduce((map: any, item: any) => {
+                    if (!map.has(item.id)) {
+                        map.set(item.id, item)
+                    }
+                    return map
+                }, new Map())
+                .values()
+        )
+
+        // tableStore.table.data
+        statisticsList.value.allNum = totalData.value.length
+        statisticsList.value.runNum = tableStore.table.data.allNum
+        statisticsList.value.checkNum = tableStore.table.data.allNum
+        statisticsList.value.stopRunNum = tableStore.table.data.allNum
+
+        abnormal.value = tableStore.table.data
+        // 合并子集数据 并去重
+
+        totalTable(101, '')
+        // echart()
+    }
+})
+
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '异常总数',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '异常占比',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [monitoringPoints.value.totalOnlineRate - 0],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#FF9100' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.lineRunFlag = ''
+
+const formatter = (row: any) => {
+    return row.cellValue || '/'
+}
+// 渲染总表格
+const totalTable = (num: number, t: string) => {
+    title.value = t
+    loading.value = true
+    pageNum.value = 1
+    dataList.value = []
+    dataList.value = totalData.value.filter((item: any) => {
+        return item
+    })
+
+    loading.value = false
+}
+// 渲染表格
+const renderTable = (list: any, t: string) => {
+    title.value = t
+    loading.value = true
+    pageNum.value = 1
+    dataList.value = []
+    dataList.value = list
+    loading.value = false
+}
+// 导出
+const onExport = () => {
+    tableRef.value?.exportData({
+        filename: title.value + '完整性详情', // 文件名字
+        sheetName: 'Sheet1',
+        type: 'xlsx', //导出文件类型 xlsx 和 csv
+        useStyle: true,
+        data: dataList.value, // 数据源 // 过滤那个字段导出
+        columnFilterMethod: function (column: any) {
+            return !(
+                column.column.title === undefined ||
+                column.column.title === '序号' ||
+                column.column.title === '操作'
+            )
+        }
+    })
+}
+onMounted(() => {
+    // TableHeaderRef.value.setDatePicker([
+    //     { label: '年份', value: 1 },
+    //     { label: '季度', value: 2 },
+    //     { label: '月份', value: 3 }
+    // ])
+
+    // 加载数据
+
+    tableStore.index()
+})
+
+tableStore.table.params.name = ''
+provide('tableStore', tableStore)
+</script>
+<style lang="scss" scoped>
+.card-list {
+    display: flex;
+    .monitoringPoints {
+        width: 460px;
+        position: relative;
+        .statistics {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            margin-bottom: 10px;
+            .divBox {
+                width: 200px;
+                height: 70px;
+                padding: 10px;
+                display: flex;
+
+                .iconfont {
+                    font-size: 40px;
+                    margin-right: 5px;
+                }
+                .divBox_title {
+                    font-weight: 550;
+                }
+                .divBox_num {
+                    font-size: 20px;
+                    font-weight: 550;
+                    margin-left: auto;
+                    font-family: AlimamaDongFangDaKai;
+                }
+                align-items: center;
+                // text-align: center;
+                border-radius: 5px;
+                &:nth-child(1) {
+                    background-color: #eef8f0;
+                }
+                &:nth-child(2) {
+                    background-color: #fff6ed;
+                }
+                &:nth-child(3) {
+                    background-color: #e5f8f6;
+                }
+            }
+        }
+    }
+    .detail {
+        flex: 1;
+    }
+    .abnormal {
+        width: 100%;
+        background-color: #f3f6f9;
+        border-radius: 5px;
+        display: flex;
+        // justify-content: space-between;
+        align-items: center;
+        padding: 5px 0px 5px 10px;
+        .iconDiv {
+            display: flex;
+            align-items: center;
+            div {
+                width: 4px;
+                height: 18px;
+                margin-right: 5px;
+                background-color: var(--el-color-primary);
+            }
+        }
+        .text {
+            font-weight: 700;
+            font-size: 16px;
+            font-family: 'Source Code Pro', monospace;
+            text-align: center;
+
+            // font-feature-settings: 'tnum';
+        }
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    font-weight: 600;
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+}
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+.table-pagination {
+    height: 58px;
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+    padding: 13px 15px;
+    border-left: 1px solid #e4e7e9;
+    border-right: 1px solid #e4e7e9;
+    border-bottom: 1px solid #e4e7e9;
+}
+</style>
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/index.vue
index 99107b92..948b46fb 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/index.vue
@@ -1,82 +1,82 @@
-<template>
-    <div class="default-main" style="position: relative">
-        <el-tabs v-model="activeName" type="border-card" class="demo-tabs">
-            <el-tab-pane label="导航" name="1" :style="height" lazy>
-                <Navigation @changeTab="changeTab" ref="navigationRef" />
-            </el-tab-pane>
-            <el-tab-pane label="事件统计" name="2" lazy v-if="!isReload">
-                <EventStatistics />
-            </el-tab-pane>
-            <el-tab-pane label="事件分析" name="3" lazy v-if="!isReload">
-                <EventStudy />
-            </el-tab-pane>
-            <el-tab-pane label="运行情况" name="4" lazy :style="height" v-if="!isReload">
-                <RunningCondition />
-            </el-tab-pane>
-            <!-- <el-tab-pane label="运行情况" name="5" lazy >
-                <aaa />
-            </el-tab-pane> -->
-        </el-tabs>
-        <div class="monitoring-point">当前位置：{{ monitoringPoint.state.lineName }}</div>
-    </div>
-</template>
-<script setup lang="ts">
-import { defineOptions, nextTick, ref, watch } from 'vue'
-import Navigation from './navigation/index.vue'
-import EventStatistics from './eventStatistics/index.vue'
-import EventStudy from './eventStudy/index.vue'
-import RunningCondition from './runningCondition/index.vue'
-
-import { mainHeight } from '@/utils/layout'
-import router from '@/router'
-import { useMonitoringPoint } from '@/stores/monitoringPoint'
-
-defineOptions({
-    name: 'Descentsystem/monitoringpoint'
-})
-const isReload = ref(false)
-const navigationRef = ref()
-const monitoringPoint = useMonitoringPoint()
-const height = mainHeight(82)
-const activeName = ref('1')
-watch(
-    () => router.currentRoute.value.query.lineId,
-    (newLineId, oldLineId) => {
-
-        if (!newLineId) return
-        // 在这里处理 lineId 的变化
-        monitoringPoint.setValue('lineId', router.currentRoute.value.query.lineId)
-        monitoringPoint.setValue('lineName', router.currentRoute.value.query.lineName)
-        setTimeout(() => {
-            navigationRef.value?.handleNodeClick({
-                level: 6,
-                id: router.currentRoute.value.query.lineId
-            })
-        }, 500)
-    },
-    { immediate: true }
-)
-watch(
-    () => monitoringPoint.state.lineId,
-    () => {
-        //  刷新页面
-        isReload.value = true
-        nextTick(() => {
-            isReload.value = false
-        })
-    }
-)
-const changeTab = (e: string) => {
-    activeName.value = e
-}
-</script>
-<style lang="scss">
-.monitoring-point {
-    position: absolute;
-    top: 12px;
-    right: 10px;
-    font-size: 12px;
-    font-weight: 700;
-    color: var(--el-color-primary);
-}
-</style>
+<template>
+    <div class="default-main" style="position: relative">
+        <el-tabs v-model="activeName" type="border-card" class="demo-tabs">
+            <el-tab-pane label="导航" name="1" :style="height" lazy>
+                <Navigation @changeTab="changeTab" ref="navigationRef" />
+            </el-tab-pane>
+            <el-tab-pane label="事件统计" name="2" lazy v-if="!isReload">
+                <EventStatistics />
+            </el-tab-pane>
+            <el-tab-pane label="事件分析" name="3" lazy v-if="!isReload">
+                <EventStudy />
+            </el-tab-pane>
+            <el-tab-pane label="运行情况" name="4" lazy :style="height" v-if="!isReload">
+                <RunningCondition />
+            </el-tab-pane>
+            <el-tab-pane label="暂态报告" name="5" lazy >
+                <TransientReport />
+            </el-tab-pane>
+        </el-tabs>
+        <div class="monitoring-point">当前位置：{{ monitoringPoint.state.lineName }}</div>
+    </div>
+</template>
+<script setup lang="ts">
+import { defineOptions, nextTick, ref, watch } from 'vue'
+import Navigation from './navigation/index.vue'
+import EventStatistics from './eventStatistics/index.vue'
+import EventStudy from './eventStudy/index.vue'
+import RunningCondition from './runningCondition/index.vue'
+import TransientReport from './transientReport/index.vue'
+
+import { mainHeight } from '@/utils/layout'
+import router from '@/router'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+
+defineOptions({
+    name: 'Descentsystem/monitoringpoint'
+})
+const isReload = ref(false)
+const navigationRef = ref()
+const monitoringPoint = useMonitoringPoint()
+const height = mainHeight(82)
+const activeName = ref('1')
+watch(
+    () => router.currentRoute.value.query.lineId,
+    (newLineId, oldLineId) => {
+        if (!newLineId) return
+        // 在这里处理 lineId 的变化
+        monitoringPoint.setValue('lineId', router.currentRoute.value.query.lineId)
+        monitoringPoint.setValue('lineName', router.currentRoute.value.query.lineName)
+        setTimeout(() => {
+            navigationRef.value?.handleNodeClick({
+                level: 6,
+                id: router.currentRoute.value.query.lineId
+            })
+        }, 500)
+    },
+    { immediate: true }
+)
+watch(
+    () => monitoringPoint.state.lineId,
+    () => {
+        //  刷新页面
+        isReload.value = true
+        nextTick(() => {
+            isReload.value = false
+        })
+    }
+)
+const changeTab = (e: string) => {
+    activeName.value = e
+}
+</script>
+<style lang="scss">
+.monitoring-point {
+    position: absolute;
+    top: 12px;
+    right: 10px;
+    font-size: 12px;
+    font-weight: 700;
+    color: var(--el-color-primary);
+}
+</style>
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue
index bd805a35..0815922f 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue
@@ -1,86 +1,87 @@
-<template>
-    <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
-        <pane :size="size">
-            <PointTree :default-expand-all="false" v-if="showTree"
-                :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
-                :current-node-key="monitoringPoint.state.lineId" @node-click="handleNodeClick" @init="handleNodeClick">
-            </PointTree>
-        </pane>
-        <pane>
-            <div style='display: none'>
-                <DatePicker ref='datePickerRef'></DatePicker>
-            </div>
-            <Map v-bind="$attrs" v-if="flag" :mapList="mapList"></Map>
-        </pane>
-    </splitpanes>
-</template>
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import 'splitpanes/dist/splitpanes.css'
-import { Splitpanes, Pane } from 'splitpanes'
-import PointTree from '@/components/tree/pqs/pointTree.vue'
-import Map from './map.vue'
-import Tree from '@/components/tree/index.vue'
-import { getAreaLineInfo } from '@/api/event-boot/areaInfo'
-import { useMonitoringPoint } from '@/stores/monitoringPoint'
-import { useAdminInfo } from '@/stores/adminInfo'
-import DatePicker from '@/components/form/datePicker/index.vue'
-import router from '@/router'
-const adminInfo = useAdminInfo()
-const monitoringPoint = useMonitoringPoint()
-const size = ref(0)
-const params = ref({
-    deptIndex: '',
-    monitorFlag: 2,
-    powerFlag: 2,
-    searchBeginTime: '',
-    searchEndTime: '',
-    serverName: 'event-boot',
-    statisticalType: {}
-})
-const datePickerRef = ref()
-const mapList: any = ref([])
-const flag = ref(true)
-const showTree = ref(false)
-onMounted(() => {
-    const dom = document.getElementById('navigation-splitpanes')
-    if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
-    }
-    params.value.deptIndex = adminInfo.$state.deptId
-    params.value.searchBeginTime = datePickerRef.value.timeValue[0]
-    params.value.searchEndTime = datePickerRef.value.timeValue[1]
-    getAreaLineInfo(params.value).then(res => {
-        mapList.value = res.data
-        showTree.value = true
-    }).catch(err => {
-        showTree.value = true
-    })
-})
-
-const handleNodeClick = (data: any, node: any) => {
-
-
-    if (data.level === 6) {
-        console.log("🚀 ~ handleNodeClick ~ window.localStorage.getItem('BMAP_SECKEY'):", window.localStorage.getItem('BMAP_SECKEY')==null)
-
-        if(window.localStorage.getItem('BMAP_SECKEY')==null){
-            flag.value = false
-        }
-
-        monitoringPoint.setValue('lineId', data.id)
-
-    }
-    setTimeout(() => {
-        flag.value = true
-    }, 0)
-}
-defineExpose({
-    handleNodeClick
-})
-</script>
-<style lang="scss">
-.splitpanes.default-theme .splitpanes__pane {
-    background: #eaeef1;
-}
-</style>
+<template>
+    <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+        <pane :size="size">
+            <PointTree
+                :default-expand-all="false"
+                v-if="showTree"
+                :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
+                :current-node-key="monitoringPoint.state.lineId"
+                @node-click="handleNodeClick"
+                @init="handleNodeClick"
+            ></PointTree>
+        </pane>
+        <pane>
+            <div style="display: none">
+                <DatePicker ref="datePickerRef"></DatePicker>
+            </div>
+            <Map v-bind="$attrs" v-if="flag" :mapList="mapList"></Map>
+        </pane>
+    </splitpanes>
+</template>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
+import Map from './map.vue'
+import Tree from '@/components/tree/index.vue'
+import { getAreaLineInfo } from '@/api/event-boot/areaInfo'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+import { useAdminInfo } from '@/stores/adminInfo'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import router from '@/router'
+const adminInfo = useAdminInfo()
+const monitoringPoint = useMonitoringPoint()
+const size = ref(17)
+const params = ref({
+    deptIndex: '',
+    monitorFlag: 2,
+    powerFlag: 2,
+    searchBeginTime: '',
+    searchEndTime: '',
+    serverName: 'event-boot',
+    statisticalType: {}
+})
+const datePickerRef = ref()
+const mapList: any = ref([])
+const flag = ref(true)
+const showTree = ref(false)
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 100)
+    }
+    params.value.deptIndex = adminInfo.$state.deptId
+    params.value.searchBeginTime = datePickerRef.value.timeValue[0]
+    params.value.searchEndTime = datePickerRef.value.timeValue[1]
+    getAreaLineInfo(params.value)
+        .then(res => {
+            mapList.value = res.data
+            showTree.value = true
+        })
+        .catch(err => {
+            showTree.value = true
+        })
+})
+
+const handleNodeClick = (data: any, node: any) => {
+    if (data.level === 6) {
+        if (window.localStorage.getItem('BMAP_SECKEY') == null) {
+            flag.value = false
+        }
+
+        monitoringPoint.setValue('lineId', data.id)
+    }
+    setTimeout(() => {
+        flag.value = true
+    }, 0)
+}
+defineExpose({
+    handleNodeClick
+})
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+</style>
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue
new file mode 100644
index 00000000..c627fe29
--- /dev/null
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue
@@ -0,0 +1,300 @@
+<template>
+    <div :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <PointTree
+                    :default-expand-all="false"
+                    :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
+                    :current-node-key="monitoringPoint.state.lineId"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></PointTree>
+            </pane>
+            <pane style="background: #fff" :style="height">
+                <!-- <div :style="height"></div> -->
+                <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} + 45px)`">
+                    <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 { mainHeight } from '@/utils/layout'
+import { getLineExport, getList, selectReleation } from '@/api/event-boot/report'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+import { ElMessage } from 'element-plus'
+defineOptions({
+    name: 'TransientReport/monitoringpointReport'
+})
+const monitoringPoint = useMonitoringPoint()
+const height = mainHeight(82)
+const size = ref(17)
+const value = ref('')
+const TableHeaderRef = ref()
+const dotList: any = ref({
+    name: monitoringPoint.state.lineName.split('>')[3],
+    id: monitoringPoint.state.lineId,
+    level: 6
+})
+
+const formd: any = ref({
+    xq: false,
+    lb: false,
+    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 templatePolicy: any = ref([])
+const tableStore = new TableStore({
+    url: '',
+    method: 'post',
+    column: []
+})
+provide('tableStore', tableStore)
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 100)
+    }
+})
+// getList({
+//     pageNum: 1,
+//     pageSize: 100,
+//     type: 0
+// }).then(res => {
+//     templatePolicy.value = res.data.records
+//        // 默认选中第一个
+//     if (res.data.records && res.data.records.length > 0) {
+//         value.value = res.data.records[0].id
+//         // 触发 change 事件，加载对应的配置
+//         changeFn(res.data.records[0].id)
+//     }
+// })
+const handleNodeClick = (data: any, node: any) => {
+    if (data.level === 6) {
+        dotList.value = data
+        monitoringPoint.setValue('lineId', data.id)
+    }
+}
+const changeFn = (val: any) => {
+    formd.value = {
+        xq: false,
+        lb: false,
+        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
+    }
+    let data = {
+        id: val
+    }
+
+    selectReleation(data).then(res => {
+        res.data.forEach((item: any) => {
+            for (let k in formd.value) {
+                if (item.name == k) {
+                    formd.value[k] = true
+                    return
+                }
+            }
+        })
+    })
+}
+const exportEvent = () => {
+    if (dotList.value.level != 6) {
+        return ElMessage({
+            message: '请选择监测点进行报告生成!',
+            type: 'warning'
+        })
+    }
+    let a = ''
+
+    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>