From 028fd44490f98c10f723708ce93e0fe6c234e1cf Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Thu, 20 Nov 2025 15:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                            |  Bin 21351 -> 6791 bytes
 public/favicon1.ico                           |  Bin 6791 -> 0 bytes
 public/favicon3.ico                           |  Bin 0 -> 21351 bytes
 .../baInput/components/remoteSelect.vue       |  620 +--
 src/components/echarts/waveForm.vue           |  380 +-
 src/components/table/index.vue                |   62 +-
 src/components/tree/pqs/Terminal.vue          |  394 +-
 src/layouts/admin/container/classic.vue       |   66 +-
 src/utils/auth.ts                             |  141 +-
 src/utils/echartMethod.ts                     |  461 +-
 src/utils/router.ts                           |  590 +--
 src/views/cockpit/TerminalLog.vue             |    2 +-
 .../pollutionReport/SubstationTab.vue         |    2 +-
 .../online/shishishuju/index.vue              |   22 +-
 .../online/wentaishujufenxi/index.vue         | 3913 +++++++++--------
 .../reportForms/statistics/index.vue          |  342 +-
 src/views/user/login.vue                      |  676 +--
 17 files changed, 3910 insertions(+), 3761 deletions(-)
 delete mode 100644 public/favicon1.ico
 create mode 100644 public/favicon3.ico

diff --git a/public/favicon.ico b/public/favicon.ico
index 029a1f39ec9ebba2997c214deff5fb5c644eefa1..fe16b5adb805be552e37da2e99cd37b95b7dd0e3 100644
GIT binary patch
literal 6791
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
SMv?!oB5QM7VxFmY<o^KUNl;P%

literal 21351
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
O>e8`ihjZ;lefxilbd_rW

diff --git a/public/favicon1.ico b/public/favicon1.ico
deleted file mode 100644
index fe16b5adb805be552e37da2e99cd37b95b7dd0e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6791
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
SMv?!oB5QM7VxFmY<o^KUNl;P%

diff --git a/public/favicon3.ico b/public/favicon3.ico
new file mode 100644
index 0000000000000000000000000000000000000000..029a1f39ec9ebba2997c214deff5fb5c644eefa1
GIT binary patch
literal 21351
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
O>e8`ihjZ;lefxilbd_rW

literal 0
HcmV?d00001

diff --git a/src/components/baInput/components/remoteSelect.vue b/src/components/baInput/components/remoteSelect.vue
index 6c71a374..a101f604 100644
--- a/src/components/baInput/components/remoteSelect.vue
+++ b/src/components/baInput/components/remoteSelect.vue
@@ -1,310 +1,310 @@
-<template>
-    <div class="w100">
-        <!-- el-select 的远程下拉只在有搜索词时，才会加载数据（显示出 option 列表） -->
-        <!-- 使用 el-popover 在无数据/无搜索词时，显示一个无数据的提醒 -->
-        <el-popover
-            width="100%"
-            placement="bottom"
-            popper-class="remote-select-popper"
-            :visible="state.focusStatus && !state.loading && !state.keyword && !state.options.length"
-            :teleported="false"
-            :content="$t('utils.No data')"
-        >
-            <template #reference>
-                <el-select
-                    ref="selectRef"
-                    class="w100"
-                    @focus="onFocus"
-                    @blur="onBlur"
-                    :loading="state.loading || state.accidentBlur"
-                    :filterable="true"
-                    :remote="true"
-                    clearable
-                    remote-show-suffix
-                    :remote-method="onLogKeyword"
-                    v-model="state.value"
-                    @change="onChangeSelect"
-                    :multiple="multiple"
-                    :key="state.selectKey"
-                    @clear="onClear"
-                    @visible-change="onVisibleChange"
-                    v-bind="$attrs"
-                >
-                    <el-option
-                        class="remote-select-option"
-                        v-for="item in state.options"
-                        :label="item[field]"
-                        :value="item[state.primaryKey].toString()"
-                        :key="item[state.primaryKey]"
-                    >
-                        <el-tooltip placement="right" effect="light" v-if="!isEmpty(tooltipParams)">
-                            <template #content>
-                                <p v-for="(tooltipParam, key) in tooltipParams" :key="key">{{ key }}: {{ item[tooltipParam] }}</p>
-                            </template>
-                            <div>{{ item[field] }}</div>
-                        </el-tooltip>
-                    </el-option>
-                    <el-pagination
-                        v-if="state.total"
-                        :currentPage="state.currentPage"
-                        :page-size="state.pageSize"
-                        class="select-pagination"
-                        layout="->, prev, next"
-                        :total="state.total"
-                        @current-change="onSelectCurrentPageChange"
-                    />
-                </el-select>
-            </template>
-        </el-popover>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { reactive, watch, onMounted, onUnmounted, ref, nextTick, getCurrentInstance, toRaw } from 'vue'
-import { getSelectData } from '@/api/common'
-import { uuid } from '@/utils/random'
-import type { ElSelect } from 'element-plus'
-import { isEmpty } from 'lodash-es'
-import { getArrayKey } from '@/utils/common'
-
-const selectRef = ref<InstanceType<typeof ElSelect> | undefined>()
-type ElSelectProps = Partial<InstanceType<typeof ElSelect>['$props']>
-type valType = string | number | string[] | number[]
-
-interface Props extends /* @vue-ignore */ ElSelectProps {
-    pk?: string
-    field?: string
-    params?: anyObj
-    multiple?: boolean
-    remoteUrl: string
-    modelValue: valType
-    labelFormatter?: (optionData: anyObj, optionKey: string) => string
-    tooltipParams?: anyObj
-}
-const props = withDefaults(defineProps<Props>(), {
-    pk: 'id',
-    field: 'name',
-    params: () => {
-        return {}
-    },
-    remoteUrl: '',
-    modelValue: '',
-    multiple: false,
-    tooltipParams: () => {
-        return {}
-    },
-})
-
-const state: {
-    // 主表字段名(不带表别名)
-    primaryKey: string
-    options: anyObj[]
-    loading: boolean
-    total: number
-    currentPage: number
-    pageSize: number
-    params: anyObj
-    keyword: string
-    value: valType
-    selectKey: string
-    initializeData: boolean
-    accidentBlur: boolean
-    focusStatus: boolean
-} = reactive({
-    primaryKey: props.pk,
-    options: [],
-    loading: false,
-    total: 0,
-    currentPage: 1,
-    pageSize: 10,
-    params: props.params,
-    keyword: '',
-    value: props.modelValue ? props.modelValue : '',
-    selectKey: uuid(),
-    initializeData: false,
-    accidentBlur: false,
-    focusStatus: false,
-})
-
-let io: null | IntersectionObserver = null
-const instance = getCurrentInstance()
-
-const emits = defineEmits<{
-    (e: 'update:modelValue', value: valType): void
-    (e: 'row', value: any): void
-}>()
-
-const onChangeSelect = (val: valType) => {
-    emits('update:modelValue', val)
-    if (typeof instance?.vnode.props?.onRow == 'function') {
-        let pkArr = props.pk.split('.')
-        let pk = pkArr[pkArr.length - 1]
-        if (typeof val == 'number' || typeof val == 'string') {
-            const dataKey = getArrayKey(state.options, pk, val.toString())
-            emits('row', dataKey ? toRaw(state.options[dataKey]) : {})
-        } else {
-            const valueArr = []
-            for (const key in val) {
-                let dataKey = getArrayKey(state.options, pk, val[key].toString())
-                if (dataKey) valueArr.push(toRaw(state.options[dataKey]))
-            }
-            emits('row', valueArr)
-        }
-    }
-}
-
-const onVisibleChange = (val: boolean) => {
-    // 保持面板状态和焦点状态一致
-    if (!val) {
-        nextTick(() => {
-            selectRef.value?.blur()
-        })
-    }
-}
-
-const onFocus = () => {
-    state.focusStatus = true
-    if (selectRef.value?.query != state.keyword) {
-        state.keyword = ''
-        state.initializeData = false
-        // el-select 自动清理搜索词会产生意外的脱焦
-        state.accidentBlur = true
-    }
-    if (!state.initializeData) {
-        getData()
-    }
-}
-
-const onBlur = () => {
-    state.focusStatus = false
-}
-
-const onClear = () => {
-    state.keyword = ''
-    state.initializeData = false
-}
-
-const onLogKeyword = (q: string) => {
-    if (state.keyword != q) {
-        state.keyword = q
-        getData()
-    }
-}
-
-const getData = (initValue: valType = '') => {
-    state.loading = true
-    state.params.page = state.currentPage
-    state.params.initKey = props.pk
-    state.params.initValue = initValue
-    getSelectData(props.remoteUrl, state.keyword, state.params)
-        .then((res) => {
-            let initializeData = true
-            let opts = res.data.options ? res.data.options : res.data.list
-            if (typeof props.labelFormatter == 'function') {
-                for (const key in opts) {
-                    opts[key][props.field] = props.labelFormatter(opts[key], key)
-                }
-            }
-            state.options = opts
-            state.total = res.data.total ?? 0
-            if (initValue) {
-                // 重新渲染组件,确保在赋值前,opts已加载到-兼容 modelValue 更新
-                state.selectKey = uuid()
-                initializeData = false
-            }
-            state.loading = false
-            state.initializeData = initializeData
-            if (state.accidentBlur) {
-                nextTick(() => {
-                    const inputEl = selectRef.value?.$el.querySelector('.el-select__tags .el-select__input')
-                    inputEl && inputEl.focus()
-                    state.accidentBlur = false
-                })
-            }
-        })
-        .catch(() => {
-            state.loading = false
-        })
-}
-
-const onSelectCurrentPageChange = (val: number) => {
-    state.currentPage = val
-    getData()
-}
-
-const initDefaultValue = () => {
-    if (state.value) {
-        // number[]转string[]确保默认值能够选中
-        if (typeof state.value === 'object') {
-            for (const key in state.value as string[]) {
-                state.value[key] = state.value[key].toString()
-            }
-        } else if (typeof state.value === 'number') {
-            state.value = state.value.toString()
-        }
-        getData(state.value)
-    }
-}
-
-onMounted(() => {
-    if (props.pk.indexOf('.') > 0) {
-        let pk = props.pk.split('.')
-        state.primaryKey = pk[1] ? pk[1] : pk[0]
-    }
-    initDefaultValue()
-
-    setTimeout(() => {
-        if (window?.IntersectionObserver) {
-            io = new IntersectionObserver((entries) => {
-                for (const key in entries) {
-                    if (!entries[key].isIntersecting) selectRef.value?.blur()
-                }
-            })
-            if (selectRef.value?.$el instanceof Element) {
-                io.observe(selectRef.value.$el)
-            }
-        }
-    }, 500)
-})
-
-onUnmounted(() => {
-    io?.disconnect()
-})
-
-watch(
-    () => props.modelValue,
-    (newVal) => {
-        if (String(state.value) != String(newVal)) {
-            state.value = newVal ? newVal : ''
-            initDefaultValue()
-        }
-    }
-)
-
-const getSelectRef = () => {
-    return selectRef.value
-}
-
-const focus = () => {
-    selectRef.value?.focus()
-}
-
-const blur = () => {
-    selectRef.value?.blur()
-}
-
-defineExpose({
-    blur,
-    focus,
-    getSelectRef,
-})
-</script>
-
-<style scoped lang="scss">
-:deep(.remote-select-popper) {
-    text-align: center;
-}
-.remote-select-option {
-    white-space: pre;
-}
-</style>
+<template>
+    <div class="w100">
+        <!-- el-select 的远程下拉只在有搜索词时，才会加载数据（显示出 option 列表） -->
+        <!-- 使用 el-popover 在无数据/无搜索词时，显示一个无数据的提醒 -->
+        <el-popover
+            width="100%"
+            placement="bottom"
+            popper-class="remote-select-popper"
+            :visible="state.focusStatus && !state.loading && !state.keyword && !state.options.length"
+            :teleported="false"
+            :content="$t('utils.No data')"
+        >
+            <template #reference>
+                <el-select
+                    ref="selectRef"
+                    class="w100"
+                    @focus="onFocus"
+                    @blur="onBlur"
+                    :loading="state.loading || state.accidentBlur"
+                    :filterable="true"
+                    :remote="true"
+                    clearable
+                    remote-show-suffix
+                    :remote-method="onLogKeyword"
+                    v-model="state.value"
+                    @change="onChangeSelect"
+                    :multiple="multiple"
+                    :key="state.selectKey"
+                    @clear="onClear"
+                    @visible-change="onVisibleChange"
+                    v-bind="$attrs"
+                >
+                    <el-option
+                        class="remote-select-option"
+                        v-for="item in state.options"
+                        :label="item[field]"
+                        :value="item[state.primaryKey].toString()"
+                        :key="item[state.primaryKey]"
+                    >
+                        <el-tooltip placement="right" effect="light" v-if="!isEmpty(tooltipParams)">
+                            <template #content>
+                                <p v-for="(tooltipParam, key) in tooltipParams" :key="key">{{ key }}: {{ item[tooltipParam] }}</p>
+                            </template>
+                            <div>{{ item[field] }}</div>
+                        </el-tooltip>
+                    </el-option>
+                    <el-pagination
+                        v-if="state.total"
+                        :currentPage="state.currentPage"
+                        :page-size="state.pageSize"
+                        class="select-pagination"
+                        layout="->, prev, next"
+                        :total="state.total"
+                        @current-change="onSelectCurrentPageChange"
+                    />
+                </el-select>
+            </template>
+        </el-popover>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, watch, onMounted, onUnmounted, ref, nextTick, getCurrentInstance, toRaw } from 'vue'
+// import { getSelectData } from '@/api/common'
+import { uuid } from '@/utils/random'
+import type { ElSelect } from 'element-plus'
+import { isEmpty } from 'lodash-es'
+// import { getArrayKey } from '@/utils/common'
+
+const selectRef = ref<InstanceType<typeof ElSelect> | undefined>()
+type ElSelectProps = Partial<InstanceType<typeof ElSelect>['$props']>
+type valType = string | number | string[] | number[]
+
+interface Props extends /* @vue-ignore */ ElSelectProps {
+    pk?: string
+    field?: string
+    params?: anyObj
+    multiple?: boolean
+    remoteUrl: string
+    modelValue: valType
+    labelFormatter?: (optionData: anyObj, optionKey: string) => string
+    tooltipParams?: anyObj
+}
+const props = withDefaults(defineProps<Props>(), {
+    pk: 'id',
+    field: 'name',
+    params: () => {
+        return {}
+    },
+    remoteUrl: '',
+    modelValue: '',
+    multiple: false,
+    tooltipParams: () => {
+        return {}
+    },
+})
+
+const state: {
+    // 主表字段名(不带表别名)
+    primaryKey: string
+    options: anyObj[]
+    loading: boolean
+    total: number
+    currentPage: number
+    pageSize: number
+    params: anyObj
+    keyword: string
+    value: valType
+    selectKey: string
+    initializeData: boolean
+    accidentBlur: boolean
+    focusStatus: boolean
+} = reactive({
+    primaryKey: props.pk,
+    options: [],
+    loading: false,
+    total: 0,
+    currentPage: 1,
+    pageSize: 10,
+    params: props.params,
+    keyword: '',
+    value: props.modelValue ? props.modelValue : '',
+    selectKey: uuid(),
+    initializeData: false,
+    accidentBlur: false,
+    focusStatus: false,
+})
+
+let io: null | IntersectionObserver = null
+const instance = getCurrentInstance()
+
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: valType): void
+    (e: 'row', value: any): void
+}>()
+
+const onChangeSelect = (val: valType) => {
+    emits('update:modelValue', val)
+    if (typeof instance?.vnode.props?.onRow == 'function') {
+        let pkArr = props.pk.split('.')
+        let pk = pkArr[pkArr.length - 1]
+        if (typeof val == 'number' || typeof val == 'string') {
+            // const dataKey = getArrayKey(state.options, pk, val.toString())
+            // emits('row', dataKey ? toRaw(state.options[dataKey]) : {})
+        } else {
+            // const valueArr = []
+            // for (const key in val) {
+                // let dataKey = getArrayKey(state.options, pk, val[key].toString())
+                // if (dataKey) valueArr.push(toRaw(state.options[dataKey]))
+            // }
+            // emits('row', valueArr)
+        }
+    }
+}
+
+const onVisibleChange = (val: boolean) => {
+    // 保持面板状态和焦点状态一致
+    if (!val) {
+        nextTick(() => {
+            selectRef.value?.blur()
+        })
+    }
+}
+
+const onFocus = () => {
+    state.focusStatus = true
+    if (selectRef.value?.query != state.keyword) {
+        state.keyword = ''
+        state.initializeData = false
+        // el-select 自动清理搜索词会产生意外的脱焦
+        state.accidentBlur = true
+    }
+    if (!state.initializeData) {
+        getData()
+    }
+}
+
+const onBlur = () => {
+    state.focusStatus = false
+}
+
+const onClear = () => {
+    state.keyword = ''
+    state.initializeData = false
+}
+
+const onLogKeyword = (q: string) => {
+    if (state.keyword != q) {
+        state.keyword = q
+        getData()
+    }
+}
+
+const getData = (initValue: valType = '') => {
+    state.loading = true
+    state.params.page = state.currentPage
+    state.params.initKey = props.pk
+    state.params.initValue = initValue
+    // getSelectData(props.remoteUrl, state.keyword, state.params)
+    //     .then((res) => {
+    //         let initializeData = true
+    //         let opts = res.data.options ? res.data.options : res.data.list
+    //         if (typeof props.labelFormatter == 'function') {
+    //             for (const key in opts) {
+    //                 opts[key][props.field] = props.labelFormatter(opts[key], key)
+    //             }
+    //         }
+    //         state.options = opts
+    //         state.total = res.data.total ?? 0
+    //         if (initValue) {
+    //             // 重新渲染组件,确保在赋值前,opts已加载到-兼容 modelValue 更新
+    //             state.selectKey = uuid()
+    //             initializeData = false
+    //         }
+    //         state.loading = false
+    //         state.initializeData = initializeData
+    //         if (state.accidentBlur) {
+    //             nextTick(() => {
+    //                 const inputEl = selectRef.value?.$el.querySelector('.el-select__tags .el-select__input')
+    //                 inputEl && inputEl.focus()
+    //                 state.accidentBlur = false
+    //             })
+    //         }
+    //     })
+    //     .catch(() => {
+    //         state.loading = false
+    //     })
+}
+
+const onSelectCurrentPageChange = (val: number) => {
+    state.currentPage = val
+    getData()
+}
+
+const initDefaultValue = () => {
+    if (state.value) {
+        // number[]转string[]确保默认值能够选中
+        if (typeof state.value === 'object') {
+            for (const key in state.value as string[]) {
+                state.value[key] = state.value[key].toString()
+            }
+        } else if (typeof state.value === 'number') {
+            state.value = state.value.toString()
+        }
+        getData(state.value)
+    }
+}
+
+onMounted(() => {
+    if (props.pk.indexOf('.') > 0) {
+        let pk = props.pk.split('.')
+        state.primaryKey = pk[1] ? pk[1] : pk[0]
+    }
+    initDefaultValue()
+
+    setTimeout(() => {
+        if (window?.IntersectionObserver) {
+            io = new IntersectionObserver((entries) => {
+                for (const key in entries) {
+                    if (!entries[key].isIntersecting) selectRef.value?.blur()
+                }
+            })
+            if (selectRef.value?.$el instanceof Element) {
+                io.observe(selectRef.value.$el)
+            }
+        }
+    }, 500)
+})
+
+onUnmounted(() => {
+    io?.disconnect()
+})
+
+watch(
+    () => props.modelValue,
+    (newVal) => {
+        if (String(state.value) != String(newVal)) {
+            state.value = newVal ? newVal : ''
+            initDefaultValue()
+        }
+    }
+)
+
+const getSelectRef = () => {
+    return selectRef.value
+}
+
+const focus = () => {
+    selectRef.value?.focus()
+}
+
+const blur = () => {
+    selectRef.value?.blur()
+}
+
+defineExpose({
+    blur,
+    focus,
+    getSelectRef,
+})
+</script>
+
+<style scoped lang="scss">
+:deep(.remote-select-popper) {
+    text-align: center;
+}
+.remote-select-option {
+    white-space: pre;
+}
+</style>
diff --git a/src/components/echarts/waveForm.vue b/src/components/echarts/waveForm.vue
index 84727ef4..acd047d5 100644
--- a/src/components/echarts/waveForm.vue
+++ b/src/components/echarts/waveForm.vue
@@ -1,190 +1,190 @@
-<template>
-    <div v-if="view2">
-        <el-row>
-            <el-col :span="12">
-                <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
-                <el-select
-                    style="min-width: 200px; width: 200px"
-                    @change="changeView"
-                    v-model="value"
-                    placeholder="请选择值类型"
-                >
-                    <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-                <!-- <el-button v-if="view2 && senior" class="ml10" type="primary"
-                    @click="AdvancedAnalytics">高级分析</el-button> -->
-            </el-col>
-            <el-col :span="12">
-                <el-button
-                    @click="backbxlb"
-                    class="el-icon-refresh-right"
-                    icon="el-icon-CloseBold"
-                    style="float: right"
-                >
-                    返回
-                </el-button>
-            </el-col>
-        </el-row>
-        <div v-loading="loading" style="height: calc(100vh - 190px)">
-            <el-tabs v-if="view4" class="default-main" v-model="bxactiveName" @tab-click="bxhandleClick">
-                <el-tab-pane
-                    label="瞬时波形"
-                    name="ssbx"
-                    class="boxbx pt10 pb10"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <shushiboxi
-                        ref="shushiboxiRef"
-                        v-if="bxactiveName == 'ssbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></shushiboxi>
-                </el-tab-pane>
-                <el-tab-pane
-                    label="RMS波形"
-                    class="boxbx pt10 pb10"
-                    name="rmsbx"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <rmsboxi
-                        ref="rmsboxiRef"
-                        v-if="bxactiveName == 'rmsbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></rmsboxi>
-                </el-tab-pane>
-            </el-tabs>
-            <el-empty v-else description="暂无数据" style="height: calc(100vh - 190px)" />
-        </div>
-    </div>
-    <div v-if="view3" class="pd10">
-        <span style="font-weight: 500; font-size: 22px">高级分析</span>
-        <el-button icon="el-icon-Back" @click="gaoBack" style="float: right">返回</el-button>
-        <analytics :flag="true" :GJList="GJList" :boxoList="boxoList"></analytics>
-    </div>
-</template>
-<script setup lang="ts">
-import shushiboxi from '@/components/echarts/shushiboxi.vue'
-import rmsboxi from '@/components/echarts/rmsboxi.vue'
-import analytics from '@/components/echarts/analytics.vue'
-import { ref, reactive } from 'vue'
-import { analysis } from '@/api/advance-boot/analyse'
-import { mainHeight } from '@/utils/layout'
-import { getMonitorEventAnalyseWave, downloadWaveFile } from '@/api/event-boot/transient'
-const emit = defineEmits(['backbxlb'])
-interface Props {
-    // boxoList: any
-    // wp: any,
-    senior?: boolean
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    senior: false
-})
-const parentHeight = ref(0)
-const loading = ref(true)
-const bxactiveName = ref('ssbx')
-const rmsboxiRef = ref()
-const value = ref(1)
-const options = ref([
-    {
-        value: 1,
-        label: '一次值'
-    },
-    {
-        value: 2,
-        label: '二次值'
-    }
-])
-const shushiboxiRef = ref()
-const bxecharts = ref(mainHeight(95).height as any)
-const view2 = ref(true)
-const boxoList = ref(null)
-const wp = ref(null)
-const showBoxi = ref(true)
-const view3 = ref(false)
-const view4 = ref(false)
-const GJList = ref([])
-
-const open = async (row: any) => {
-    loading.value = true
-    await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
-        .then(res => {
-            row.loading = false
-            if (res != undefined) {
-                boxoList.value = row
-                wp.value = res.data
-                loading.value = false
-                view4.value = true
-            }
-        })
-        .catch(() => {
-            loading.value = false
-        })
-}
-const bxhandleClick = (tab: any) => {
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-
-    loading.value = true
-    if (tab.name == 'ssbx') {
-        bxactiveName.value = 'ssbx'
-    } else if (tab.name == 'rmsbx') {
-        bxactiveName.value = 'rmsbx'
-    }
-    setTimeout(() => {
-        loading.value = false
-    }, 0)
-    //  console.log(tab, event);
-}
-const backbxlb = () => {
-    boxoList.value = null
-    wp.value = null
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-
-    emit('backbxlb')
-}
-const setHeight = (h: any, vh: any) => {
-    if (h != false) {
-        parentHeight.value = h
-    }
-
-    setTimeout(() => {
-        bxecharts.value = mainHeight(vh).height
-    }, 100)
-}
-// 高级分析
-const AdvancedAnalytics = () => {
-    analysis({
-        eventIndex: boxoList.value.eventId
-    }).then(res => {
-        GJList.value = res.data
-        view3.value = true
-        view2.value = false
-    })
-}
-const changeView = () => {
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-    showBoxi.value = false
-    setTimeout(() => {
-        showBoxi.value = true
-    }, 0)
-}
-const gaoBack = () => {
-    view2.value = true
-    view3.value = false
-}
-defineExpose({ open, setHeight })
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <div v-if="view2">
+        <el-row>
+            <el-col :span="12">
+                <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
+                <el-select
+                    style="min-width: 200px; width: 200px"
+                    @change="changeView"
+                    v-model="value"
+                    placeholder="请选择值类型"
+                >
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+                <!-- <el-button v-if="view2 && senior" class="ml10" type="primary"
+                    @click="AdvancedAnalytics">高级分析</el-button> -->
+            </el-col>
+            <el-col :span="12">
+                <el-button
+                    @click="backbxlb"
+                    class="el-icon-refresh-right"
+                    icon="el-icon-Back"
+                    style="float: right"
+                >
+                    返回
+                </el-button>
+            </el-col>
+        </el-row>
+        <div v-loading="loading" style="height: calc(100vh - 190px)">
+            <el-tabs v-if="view4" class="default-main" v-model="bxactiveName" @tab-click="bxhandleClick">
+                <el-tab-pane
+                    label="瞬时波形"
+                    name="ssbx"
+                    class="boxbx pt10 pb10"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
+                >
+                    <shushiboxi
+                        ref="shushiboxiRef"
+                        v-if="bxactiveName == 'ssbx' && showBoxi"
+                        :value="value"
+                        :parentHeight="parentHeight"
+                        :boxoList="boxoList"
+                        :wp="wp"
+                    ></shushiboxi>
+                </el-tab-pane>
+                <el-tab-pane
+                    label="RMS波形"
+                    class="boxbx pt10 pb10"
+                    name="rmsbx"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
+                >
+                    <rmsboxi
+                        ref="rmsboxiRef"
+                        v-if="bxactiveName == 'rmsbx' && showBoxi"
+                        :value="value"
+                        :parentHeight="parentHeight"
+                        :boxoList="boxoList"
+                        :wp="wp"
+                    ></rmsboxi>
+                </el-tab-pane>
+            </el-tabs>
+            <el-empty v-else description="暂无数据" style="height: calc(100vh - 190px)" />
+        </div>
+    </div>
+    <div v-if="view3" class="pd10">
+        <span style="font-weight: 500; font-size: 22px">高级分析</span>
+        <el-button icon="el-icon-Back" @click="gaoBack" style="float: right">返回</el-button>
+        <analytics :flag="true" :GJList="GJList" :boxoList="boxoList"></analytics>
+    </div>
+</template>
+<script setup lang="ts">
+import shushiboxi from '@/components/echarts/shushiboxi.vue'
+import rmsboxi from '@/components/echarts/rmsboxi.vue'
+import analytics from '@/components/echarts/analytics.vue'
+import { ref, reactive } from 'vue'
+import { analysis } from '@/api/advance-boot/analyse'
+import { mainHeight } from '@/utils/layout'
+import { getMonitorEventAnalyseWave, downloadWaveFile } from '@/api/event-boot/transient'
+const emit = defineEmits(['backbxlb'])
+interface Props {
+    // boxoList: any
+    // wp: any,
+    senior?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    senior: false
+})
+const parentHeight = ref(0)
+const loading = ref(true)
+const bxactiveName = ref('ssbx')
+const rmsboxiRef = ref()
+const value = ref(1)
+const options = ref([
+    {
+        value: 1,
+        label: '一次值'
+    },
+    {
+        value: 2,
+        label: '二次值'
+    }
+])
+const shushiboxiRef = ref()
+const bxecharts = ref(mainHeight(95).height as any)
+const view2 = ref(true)
+const boxoList = ref(null)
+const wp = ref(null)
+const showBoxi = ref(true)
+const view3 = ref(false)
+const view4 = ref(false)
+const GJList = ref([])
+
+const open = async (row: any) => {
+    loading.value = true
+    await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
+        .then(res => {
+            row.loading = false
+            if (res != undefined) {
+                boxoList.value = row
+                wp.value = res.data
+                loading.value = false
+                view4.value = true
+            }
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+const bxhandleClick = (tab: any) => {
+    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
+    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
+
+    loading.value = true
+    if (tab.name == 'ssbx') {
+        bxactiveName.value = 'ssbx'
+    } else if (tab.name == 'rmsbx') {
+        bxactiveName.value = 'rmsbx'
+    }
+    setTimeout(() => {
+        loading.value = false
+    }, 0)
+    //  console.log(tab, event);
+}
+const backbxlb = () => {
+    boxoList.value = null
+    wp.value = null
+    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
+    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
+
+    emit('backbxlb')
+}
+const setHeight = (h: any, vh: any) => {
+    if (h != false) {
+        parentHeight.value = h
+    }
+
+    setTimeout(() => {
+        bxecharts.value = mainHeight(vh).height
+    }, 100)
+}
+// 高级分析
+const AdvancedAnalytics = () => {
+    analysis({
+        eventIndex: boxoList.value.eventId
+    }).then(res => {
+        GJList.value = res.data
+        view3.value = true
+        view2.value = false
+    })
+}
+const changeView = () => {
+    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
+    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
+    showBoxi.value = false
+    setTimeout(() => {
+        showBoxi.value = true
+    }, 0)
+}
+const gaoBack = () => {
+    view2.value = true
+    view3.value = false
+}
+defineExpose({ open, setHeight })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 54817a52..18b96052 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -1,43 +1,24 @@
 <template>
-    <div :style="{ height:props.height?props.height: tableStore.table.height }">
-        <vxe-table
-            ref="tableRef"
-            height="auto"
-            :key="key"
-            :data="tableStore.table.data"
-            v-loading="tableStore.table.loading"
-            v-bind="Object.assign({}, defaultAttribute, $attrs)"
-            @checkbox-all="selectChangeEvent"
-            @checkbox-change="selectChangeEvent"
-            :showOverflow="showOverflow"
-            @sort-change="handleSortChange"
-        >
+    <div :style="{ height: typeof props.height === 'string' ? props.height : tableStore.table.height }">
+        <vxe-table ref="tableRef" height="auto" :key="key" :data="tableStore.table.data"
+            v-loading="tableStore.table.loading" v-bind="Object.assign({}, defaultAttribute, $attrs)"
+            @checkbox-all="selectChangeEvent" @checkbox-change="selectChangeEvent" :showOverflow="showOverflow"
+            @sort-change="handleSortChange">
             <!-- Column 组件内部是 el-table-column -->
             <template v-if="isGroup">
                 <GroupColumn :column="tableStore.table.column" />
             </template>
             <template v-else>
-                <Column
-                    :attr="item"
-                    :key="key + '-column'"
-                    v-for="(item, key) in tableStore.table.column"
-                    :tree-node="item.treeNode"
-                >
+                <Column :attr="item" :key="key + '-column'" v-for="(item, key) in tableStore.table.column"
+                    :tree-node="item.treeNode">
                     <!-- tableStore 预设的列 render 方案 -->
                     <template v-if="item.render" #default="scope">
-                        <FieldRender
-                            :field="item"
-                            :row="scope.row"
-                            :column="scope.column"
-                            :index="scope.rowIndex"
-                            :key="
-                                key +
-                                '-' +
-                                item.render +
-                                '-' +
-                                (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                            "
-                        />
+                        <FieldRender :field="item" :row="scope.row" :column="scope.column" :index="scope.rowIndex" :key="key +
+                            '-' +
+                            item.render +
+                            '-' +
+                            (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
+                            " />
                     </template>
                 </Column>
             </template>
@@ -46,16 +27,11 @@
     </div>
 
     <div v-if="tableStore.showPage" class="table-pagination">
-        <el-pagination
-            :currentPage="tableStore.table.params!.pageNum"
-            :page-size="tableStore.table.params!.pageSize"
-            :page-sizes="pageSizes"
-            background
+        <el-pagination :currentPage="tableStore.table.params!.pageNum" :page-size="tableStore.table.params!.pageSize"
+            :page-sizes="pageSizes" background
             :layout="config.layout.shrink ? 'prev, next, jumper' : 'sizes,total, ->, prev, pager, next, jumper'"
-            :total="tableStore.table.total"
-            @size-change="onTableSizeChange"
-            @current-change="onTableCurrentChange"
-        ></el-pagination>
+            :total="tableStore.table.total" @size-change="onTableSizeChange"
+            @current-change="onTableCurrentChange"></el-pagination>
     </div>
     <slot name="footer"></slot>
 </template>
@@ -80,13 +56,13 @@ const key = ref(0)
 interface Props extends /* @vue-ignore */ Partial<InstanceType<typeof ElTable>> {
     isGroup?: boolean
     showOverflow?: boolean
-    height?: string | boolean
+    height?: string | number
 }
 
 const props = withDefaults(defineProps<Props>(), {
     isGroup: false,
     showOverflow: true,
-    height: false
+    height: undefined
 })
 onMounted(() => {
     tableStore.table.ref = tableRef.value as VxeTableInstance
diff --git a/src/components/tree/pqs/Terminal.vue b/src/components/tree/pqs/Terminal.vue
index dab14c13..3a797509 100644
--- a/src/components/tree/pqs/Terminal.vue
+++ b/src/components/tree/pqs/Terminal.vue
@@ -1,197 +1,197 @@
-<template>
-
-    <Tree ref="treRef" :data="tree" style="height: 100%" :width="'100%'" :expanded="expanded" />
-</template>
-    <!-- <div class="mb10">
-        <el-button type="primary" icon="el-icon-Download" size="small" @click="exportExcelTemplate"   :loading="loading">模版下载</el-button>
-        <el-button type="primary" icon="el-icon-Upload" size="small">导入</el-button>
-        <el-button type="primary" icon="el-icon-Download" size="small" @click="ledgerEverywhere"  :loading="loading1">导出</el-button>
-    </div> -->
-<script lang="ts" setup>
-import { ref, nextTick } from 'vue'
-import Tree from './index.vue'
-
-import { getTerminalTree,downTerminalTemplate,exportTerminalBase } from '@/api/device-boot/Business'
-import { useConfig } from '@/stores/config'
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
-defineOptions({
-    name: 'govern/deviceTree'
-})
-const loading = ref(false)
-const loading1 = ref(false)
-const emit = defineEmits(['init'])
-const config = useConfig()
-const expanded: any = ref([])
-const tree = ref()
-const treRef = ref()
-const info = (id: any) => {
-    expanded.value = [id]
-    getTerminalTree().then(res => {
-        // let arr: any[] = []
-        if (VITE_FLAG) {
-            res.data.forEach((item: any) => {
-                item.icon = 'el-icon-Menu'
-                item.plevel = item.level
-                item.level = 0
-                item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-HomeFilled'
-
-                    item2.plevel = item2.level
-                    item2.level = 100
-                    expanded.value.push(item2.id)
-                    item2.children.forEach((item3: any) => {
-                        item3.icon = 'el-icon-CollectionTag'
-                        item3.plevel = item3.level
-                        item3.level = 200
-                        item3.children.forEach((item4: any) => {
-                            item4.icon = 'el-icon-Flag'
-                            item4.plevel = item4.level
-                            item4.level = 300
-                            // arr.push(item4)
-                            item4.children.forEach((item5: any) => {
-                                item5.icon = 'el-icon-OfficeBuilding'
-                                item5.plevel = item5.level
-                                item5.level = 300
-                                // item5.id = item4.id
-                                item5.children.forEach((item6: any) => {
-                                    item6.icon = 'el-icon-HelpFilled'
-                                    item6.plevel = 4
-                                    if (item6.name == '电网侧' && item6.children.length == 0) {
-                                        item6.level = 400
-                                    } else {
-                                        item6.level = 400
-                                    }
-                                    item6.children.forEach((item7: any) => {
-                                        item7.icon = 'el-icon-Film'
-                                        item7.plevel = item7.level
-                                        item7.level = 400
-                                        item7.children.forEach((item8: any) => {
-                                            item8.icon = 'el-icon-Collection'
-                                            item8.plevel = item8.level
-                                            item8.level = 500
-                                            item8.children.forEach((item9: any) => {
-                                                item9.icon = 'el-icon-Share'
-                                                item9.plevel = item9.level
-                                                item9.level = 600
-                                                item9.children.forEach((item10: any) => {
-                                                    item10.icon = 'el-icon-Location'
-                                                    item10.plevel = item10.level
-                                                    item10.level = 700
-                                                })
-                                            })
-                                        })
-                                    })
-                                })
-                            })
-                        })
-                    })
-                })
-            })
-        } else {
-            res.data.forEach((item: any) => {
-                item.icon = 'el-icon-Menu'
-                item.plevel = item.level
-                item.level = (item.level + 1) * 100
-                item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-HomeFilled'
-                    item2.plevel = item2.level
-                    item2.level = (item2.level + 1) * 100
-                    expanded.value.push(item2.id)
-                    item2.children.forEach((item3: any) => {
-                        item3.icon = 'el-icon-CollectionTag'
-                        item3.plevel = item3.level
-                        item3.level = (item3.level + 1) * 100
-                        item3.children.forEach((item4: any) => {
-                            item4.icon = 'el-icon-Flag'
-                            item4.plevel = item4.level
-                            item4.level = (item4.level + 1) * 100
-                            item4.children.forEach((item5: any) => {
-                                item5.icon = 'el-icon-OfficeBuilding'
-                                item5.plevel = item5.level
-                                item5.level = (item5.level == 7 ? 4 : item5.level + 1) * 100
-                                item5.children.forEach((item6: any) => {
-                                    item6.icon = 'el-icon-Film'
-                                    item6.plevel = item6.level
-                                    item6.level = (item6.level + 1) * 100
-                                    item6.children.forEach((item7: any) => {
-                                        item7.icon = 'el-icon-Share'
-                                        item7.plevel = item7.level
-                                        item7.level = (item7.level + 1) * 100
-                                        item7.children.forEach((item8: any) => {
-                                            item8.icon = 'el-icon-Location'
-                                            item8.plevel = item8.level
-                                            item8.level = (item8.level + 1) * 100
-                                        })
-                                    })
-                                })
-                            })
-                        })
-                    })
-                })
-            })
-        }
-
-        tree.value = res.data
-
-        nextTick(() => {
-            treRef.value.setCurrentKey(id)
-            // if (arr.length) {
-            //     treRef.value.treeRef.setCurrentKey(arr[0].id)
-            //     // 注册父组件事件
-            //     emit('init', {
-            //         level: 2,
-            //         ...arr[0]
-            //     })
-            // } else {
-            //     emit('init')
-            // }
-        })
-    })
-}
-// 下载模版
-const exportExcelTemplate = async() => {
-    loading.value = true
-    downTerminalTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '终端台账模版'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-// 导出台账
-const ledgerEverywhere = async() => {
-    loading1.value = true
-    exportTerminalBase().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '终端台账'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading1.value = false
-    }, 0)
-}
-info('')
-
-defineExpose({ info })
-</script>
-<style lang="scss" scoped>
-.el-tree {
-    background: #efeff0;
-}
-</style>
+<template>
+
+    <Tree ref="treRef" :data="tree" style="height: 100%" :width="'100%'" :expanded="expanded" />
+</template>
+    <!-- <div class="mb10">
+        <el-button type="primary" icon="el-icon-Download" size="small" @click="exportExcelTemplate"   :loading="loading">模版下载</el-button>
+        <el-button type="primary" icon="el-icon-Upload" size="small">导入</el-button>
+        <el-button type="primary" icon="el-icon-Download" size="small" @click="ledgerEverywhere"  :loading="loading1">导出</el-button>
+    </div> -->
+<script lang="ts" setup>
+import { ref, nextTick } from 'vue'
+import Tree from './index.vue'
+
+import { getTerminalTree,downTerminalTemplate,exportTerminalBase } from '@/api/device-boot/Business'
+import { useConfig } from '@/stores/config'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+defineOptions({
+    name: 'govern/deviceTree'
+})
+const loading = ref(false)
+const loading1 = ref(false)
+const emit = defineEmits(['init'])
+const config = useConfig()
+const expanded: any = ref([])
+const tree = ref()
+const treRef = ref()
+const info = (id: any) => {
+    expanded.value = [id]
+    getTerminalTree().then(res => {
+        // let arr: any[] = []
+        if (VITE_FLAG) {
+            res.data.forEach((item: any) => {
+                item.icon = 'el-icon-Menu'
+                item.plevel = item.level
+                item.level = 0
+                item.children.forEach((item2: any) => {
+                    item2.icon = 'el-icon-HomeFilled'
+
+                    item2.plevel = item2.level
+                    item2.level = 100
+                    expanded.value.push(item2.id)
+                    item2.children.forEach((item3: any) => {
+                        item3.icon = 'el-icon-CollectionTag'
+                        item3.plevel = item3.level
+                        item3.level = 200
+                        item3.children.forEach((item4: any) => {
+                            item4.icon = 'el-icon-Flag'
+                            item4.plevel = item4.level
+                            item4.level = 300
+                            // arr.push(item4)
+                            item4.children.forEach((item5: any) => {
+                                item5.icon = 'el-icon-OfficeBuilding'
+                                item5.plevel = item5.level
+                                item5.level = 300
+                                // item5.id = item4.id
+                                item5.children.forEach((item6: any) => {
+                                    item6.icon = 'el-icon-HelpFilled'
+                                    item6.plevel = 4
+                                    if (item6.name == '电网侧' && item6.children.length == 0) {
+                                        item6.level = 400
+                                    } else {
+                                        item6.level = 400
+                                    }
+                                    item6.children.forEach((item7: any) => {
+                                        item7.icon = 'el-icon-Film'
+                                        item7.plevel = item7.level
+                                        item7.level = 400
+                                        item7.children.forEach((item8: any) => {
+                                            item8.icon = 'el-icon-Collection'
+                                            item8.plevel = item8.level
+                                            item8.level = 500
+                                            item8.children.forEach((item9: any) => {
+                                                item9.icon = 'el-icon-Share'
+                                                item9.plevel = item9.level
+                                                item9.level = 600
+                                                item9.children.forEach((item10: any) => {
+                                                    item10.icon = 'el-icon-Location'
+                                                    item10.plevel = item10.level
+                                                    item10.level = 700
+                                                })
+                                            })
+                                        })
+                                    })
+                                })
+                            })
+                        })
+                    })
+                })
+            })
+        } else {
+            res.data.forEach((item: any) => {
+                item.icon = 'el-icon-Menu'
+                item.plevel = item.level
+                item.level = (item.level + 1) * 100
+                item.children.forEach((item2: any) => {
+                    item2.icon = 'el-icon-HomeFilled'
+                    item2.plevel = item2.level
+                    item2.level = (item2.level + 1) * 100
+                    expanded.value.push(item2.id)
+                    item2.children.forEach((item3: any) => {
+                        item3.icon = 'el-icon-CollectionTag'
+                        item3.plevel = item3.level
+                        item3.level = (item3.level + 1) * 100
+                        item3.children.forEach((item4: any) => {
+                            item4.icon = 'el-icon-Flag'
+                            item4.plevel = item4.level
+                            item4.level = (item4.level + 1) * 100
+                            item4.children.forEach((item5: any) => {
+                                item5.icon = 'el-icon-OfficeBuilding'
+                                item5.plevel = item5.level
+                                item5.level = (item5.level == 7 ? 4 : item5.level + 1) * 100
+                                item5.children.forEach((item6: any) => {
+                                    item6.icon = 'el-icon-Film'
+                                    item6.plevel = item6.level
+                                    item6.level = (item6.level + 1) * 100
+                                    item6.children.forEach((item7: any) => {
+                                        item7.icon = 'el-icon-Share'
+                                        item7.plevel = item7.level
+                                        item7.level = (item7.level + 1) * 100
+                                        item7.children.forEach((item8: any) => {
+                                            item8.icon = 'el-icon-Location'
+                                            item8.plevel = item8.level
+                                            item8.level = (item8.level + 1) * 100
+                                        })
+                                    })
+                                })
+                            })
+                        })
+                    })
+                })
+            })
+        }
+
+        tree.value = res.data
+
+        nextTick(() => {
+            treRef.value.setCurrentKey(id)
+            // if (arr.length) {
+            //     treRef.value.treeRef.setCurrentKey(arr[0].id)
+            //     // 注册父组件事件
+            //     emit('init', {
+            //         level: 2,
+            //         ...arr[0]
+            //     })
+            // } else {
+            //     emit('init')
+            // }
+        })
+    })
+}
+// 下载模版
+const exportExcelTemplate = async() => {
+    loading.value = true
+    downTerminalTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '终端台账模版'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+// 导出台账
+const ledgerEverywhere = async() => {
+    loading1.value = true
+    exportTerminalBase().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '终端台账'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading1.value = false
+    }, 0)
+}
+info('')
+
+defineExpose({ info })
+</script>
+<style lang="scss" scoped>
+.el-tree {
+    background: #efeff0;
+}
+</style>
diff --git a/src/layouts/admin/container/classic.vue b/src/layouts/admin/container/classic.vue
index 8cffe645..a0afa101 100644
--- a/src/layouts/admin/container/classic.vue
+++ b/src/layouts/admin/container/classic.vue
@@ -1,33 +1,33 @@
-<template>
-    <el-container class="layout-container">
-        <Aside />
-        <el-container class="content-wrapper">
-            <Header />
-            <Nav />
-            <Main />
-        </el-container>
-    </el-container>
-    <CloseFullScreen v-if="navTabs.state.tabFullScreen" />
-</template>
-
-<script setup lang="ts">
-import Aside from '@/layouts/admin/components/aside.vue'
-import Header from '@/layouts/admin/components/header.vue'
-import Main from '@/layouts/admin/router-view/main.vue'
-import CloseFullScreen from '@/layouts/admin/components/closeFullScreen.vue'
-import { useNavTabs } from '@/stores/navTabs'
-import Nav from '@/layouts/admin/components/nav.vue'
-const navTabs = useNavTabs()
-</script>
-
-<style scoped>
-.layout-container {
-    height: 100%;
-    width: 100%;
-}
-.content-wrapper {
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-}
-</style>
+<template>
+    <el-container class="layout-container">
+        <Aside />
+        <el-container class="content-wrapper">
+            <Header />
+            <Nav />
+            <Main />
+        </el-container>
+    </el-container>
+    <CloseFullScreen v-if="navTabs.state.tabFullScreen" />
+</template>
+
+<script setup lang="ts">
+import Aside from '@/layouts/admin/components/aside.vue'
+import Header from '@/layouts/admin/components/header.vue'
+import Main from '@/layouts/admin/router-view/main.vue'
+import CloseFullScreen from '@/layouts/admin/components/closeFullScreen.vue'
+import { useNavTabs } from '@/stores/navTabs'
+import Nav from '@/layouts/admin/components/nav.vue'
+const navTabs = useNavTabs()
+</script>
+
+<style scoped>
+.layout-container {
+    height: 100%;
+    width: 100%;
+}
+.content-wrapper {
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+}
+</style>
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index c68a67a9..237ea3d1 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,71 +1,70 @@
-import { useCache, CACHE_KEY } from '@/hooks/web/useCache'
-import { TokenType } from '@/api/login/types'
-import { decrypt, encrypt } from '@/utils/jsencrypt'
-
-const { wsCache } = useCache()
-
-const AccessTokenKey = 'ACCESS_TOKEN'
-const RefreshTokenKey = 'REFRESH_TOKEN'
-
-// 获取token
-export const getAccessToken = () => {
-  // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
-  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
-}
-
-// 刷新token
-export const getRefreshToken = () => {
-  return wsCache.get(RefreshTokenKey)
-}
-
-// 设置token
-export const setToken = (token: TokenType) => {
-  wsCache.set(RefreshTokenKey, token.refreshToken)
-  wsCache.set(AccessTokenKey, token.accessToken)
-}
-
-// 删除token
-export const removeToken = () => {
-  wsCache.delete(AccessTokenKey)
-  wsCache.delete(RefreshTokenKey)
-}
-
-/** 格式化token（jwt格式） */
-export const formatToken = (token: string): string => {
-  return 'Bearer ' + token
-}
-// ========== 账号相关 ==========
-
-export type LoginFormType = {
-  tenantName: string
-  username: string
-  password: string
-  rememberMe: boolean
-}
-
-export const getLoginForm = () => {
-  const loginForm: LoginFormType = wsCache.get(CACHE_KEY.LoginForm)
-  if (loginForm) {
-    loginForm.password = decrypt(loginForm.password) as string
-  }
-  return loginForm
-}
-
-export const setLoginForm = (loginForm: LoginFormType) => {
-  loginForm.password = encrypt(loginForm.password) as string
-  wsCache.set(CACHE_KEY.LoginForm, loginForm, { exp: 30 * 24 * 60 * 60 })
-}
-
-export const removeLoginForm = () => {
-  wsCache.delete(CACHE_KEY.LoginForm)
-}
-
-// ========== 租户相关 ==========
-
-export const getTenantId = () => {
-  return wsCache.get(CACHE_KEY.TenantId)
-}
-
-export const setTenantId = (username: string) => {
-  wsCache.set(CACHE_KEY.TenantId, username)
-}
+import { useCache, CACHE_KEY } from '@/hooks/web/useCache'
+import { decrypt, encrypt } from '@/utils/jsencrypt'
+
+const { wsCache } = useCache()
+
+const AccessTokenKey = 'ACCESS_TOKEN'
+const RefreshTokenKey = 'REFRESH_TOKEN'
+
+// 获取token
+export const getAccessToken = () => {
+  // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
+  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
+}
+
+// 刷新token
+export const getRefreshToken = () => {
+  return wsCache.get(RefreshTokenKey)
+}
+
+// 设置token
+export const setToken = (token: any) => {
+  wsCache.set(RefreshTokenKey, token.refreshToken)
+  wsCache.set(AccessTokenKey, token.accessToken)
+}
+
+// 删除token
+export const removeToken = () => {
+  wsCache.delete(AccessTokenKey)
+  wsCache.delete(RefreshTokenKey)
+}
+
+/** 格式化token（jwt格式） */
+export const formatToken = (token: string): string => {
+  return 'Bearer ' + token
+}
+// ========== 账号相关 ==========
+
+export type LoginFormType = {
+  tenantName: string
+  username: string
+  password: string
+  rememberMe: boolean
+}
+
+export const getLoginForm = () => {
+  const loginForm: LoginFormType = wsCache.get(CACHE_KEY.LoginForm)
+  if (loginForm) {
+    loginForm.password = decrypt(loginForm.password) as string
+  }
+  return loginForm
+}
+
+export const setLoginForm = (loginForm: LoginFormType) => {
+  loginForm.password = encrypt(loginForm.password) as string
+  wsCache.set(CACHE_KEY.LoginForm, loginForm, { exp: 30 * 24 * 60 * 60 })
+}
+
+export const removeLoginForm = () => {
+  wsCache.delete(CACHE_KEY.LoginForm)
+}
+
+// ========== 租户相关 ==========
+
+export const getTenantId = () => {
+  return wsCache.get(CACHE_KEY.TenantId)
+}
+
+export const setTenantId = (username: string) => {
+  wsCache.set(CACHE_KEY.TenantId, username)
+}
diff --git a/src/utils/echartMethod.ts b/src/utils/echartMethod.ts
index 8af8e287..408d7ddf 100644
--- a/src/utils/echartMethod.ts
+++ b/src/utils/echartMethod.ts
@@ -1,159 +1,302 @@
-const dataProcessing = (arr: any[]) => {
-    return arr
-        .filter(item => typeof item === 'number' || (typeof item === 'string' && !isNaN(parseFloat(item))))
-        .map(item => (typeof item === 'number' ? item : parseFloat(item)))
-}
-const calculateValue = (o: number, value: number, num: number, isMin: boolean) => {
-    if (value === 0) {
-        return 0
-    } else if (value > 0 && Math.abs(value) < 1 && isMin == true) {
-        return 0
-    } else if (value > -1 && value < 0 && isMin == false) {
-        return 0
-    }
-    let base
-    if (Math.abs(o) >= 100) {
-        base = 100
-    } else if (Math.abs(o) >= 10) {
-        base = 10
-    } else if (Math.abs(o) >= 1) {
-        base = 1
-    } else {
-        base = 0.1
-    }
-    let calculatedValue
-    if (isMin) {
-        if (value < 0) {
-            calculatedValue = value + num * value
-        } else {
-            calculatedValue = value - num * value
-        }
-    } else {
-        if (value < 0) {
-            calculatedValue = value - num * value
-        } else {
-            calculatedValue = value + num * value
-        }
-    }
-    if (base === 0.1) {
-        return parseFloat(calculatedValue.toFixed(1))
-    } else if (isMin) {
-        return Math.floor(calculatedValue / base) * base
-    } else {
-        return Math.ceil(calculatedValue / base) * base
-    }
-}
-
-// 处理y轴最大最小值
-export const yMethod = (arr: any) => {
-    let num = 0.1
-    let numList = dataProcessing(arr)
-    let maxValue = 0
-    let minValue = 0
-    let max = 0
-    let min = 0
-    maxValue = Math.max(...numList)
-    minValue = Math.min(...numList)
-    const o = maxValue - minValue
-    if (Math.abs(o) >= 300) {
-        num = 0.02
-    }
-
-    min = calculateValue(o, minValue, num, true)
-    max = calculateValue(o, maxValue, num, false)
-    // if (-100 >= minValue) {
-    //     min = Math.floor((minValue + num * minValue) / 100) * 100
-    // } else if (-10 >= minValue && minValue > -100) {
-    //     min = Math.floor((minValue + num * minValue) / 10) * 10
-    // } else if (-1 >= minValue && minValue > -10) {
-    //     min = Math.floor(minValue + num * minValue)
-    // } else if (0 > minValue && minValue > -1) {
-    //     min = parseFloat((minValue + num * minValue).toFixed(1))
-    // } else if (minValue == 0) {
-    //     min = 0
-    // } else if (0 < minValue && minValue < 1) {
-    //     min = parseFloat((minValue - num * minValue).toFixed(1))
-    // } else if (1 <= minValue && minValue < 10) {
-    //     min = Math.floor(minValue - num * minValue)
-    // } else if (10 <= minValue && minValue < 100) {
-    //     min = Math.floor((minValue - num * minValue) / 10) * 10
-    // } else if (100 <= minValue) {
-    //     min = Math.floor((minValue - num * minValue) / 100) * 100
-    // }
-
-    // if (-100 >= maxValue) {
-    //     max = Math.ceil((maxValue - num * maxValue) / 100) * 100
-    // } else if (-10 >= maxValue && maxValue > -100) {
-    //     max = Math.ceil((maxValue - num * maxValue) / 10) * 10
-    // } else if (-1 >= maxValue && maxValue > -10) {
-    //     max = Math.ceil(maxValue - num * maxValue)
-    // } else if (0 > maxValue && maxValue > -1) {
-    //     max = parseFloat((maxValue - num * maxValue).toFixed(1))
-    // } else if (maxValue == 0) {
-    //     max = 0
-    // } else if (0 < maxValue && maxValue < 1) {
-    //     max = parseFloat((maxValue + num * maxValue).toFixed(1))
-    // } else if (1 <= maxValue && maxValue < 10) {
-    //     max = Math.ceil(maxValue + num * maxValue)
-    // } else if (10 <= maxValue && maxValue < 100) {
-    //     max = Math.ceil((maxValue + num * maxValue) / 10) * 10
-    // } else if (100 <= maxValue) {
-    //     max = Math.ceil((maxValue + num * maxValue) / 100) * 100
-    // }
-
-    // if (maxValue > 1000 || minValue < -1000) {
-    //     max = Math.ceil(maxValue / 100) * 100
-    //     if (minValue == 0) {
-    //         min = 0
-    //     } else {
-    //         min = Math.floor(minValue / 100) * 100
-    //     }
-    // } else if (maxValue < 60 && minValue > 40) {
-    //     max = 60
-    //     min = 40
-    // } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
-    //     max = Math.ceil(maxValue / 10) * 10
-    //     min = Math.floor(minValue / 10) * 10
-    // } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
-    //     max = Math.ceil(maxValue / 10 + 1) * 10
-    //     min = Math.floor(minValue / 10 - 1) * 10
-    // } else {
-    //     max = Math.ceil(maxValue / 10) * 10
-    //     min = Math.floor(minValue / 10) * 10
-    // }
-
-    // if (maxValue > 0 && maxValue < 1) {
-    //     max = 1
-    // } else if (max == 0 && minValue > -1 && minValue < 0) {
-    //     min = -1
-    // }
-
-    return [min, max]
-}
-
-/**
- * title['A相','B相',]
- * data[[1,2],[3,4]]
- */
-// 导出csv文件
-const convertToCSV = (title: object, data: any) => {
-    console.log('🚀 ~ convertToCSV ~ data:', data)
-    let csv = ''
-    // 添加列头
-    csv += ',' + title.join(',') + '\n'
-    // 遍历数据并添加到CSV字符串中
-    data?.map(item => {
-        csv += item.join(',') + '\n'
-    })
-    return csv
-}
-export const exportCSV = (title: object, data: any, filename: string) => {
-    const csv = convertToCSV(title, data)
-    const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' })
-    const link = document.createElement('a')
-    link.href = URL.createObjectURL(blob)
-    link.download = filename
-    link.click()
-    // 释放URL对象
-    URL.revokeObjectURL(link.href)
-}
+const dataProcessing = (arr: any[]) => {
+    return arr
+        .filter(item => typeof item === 'number' || (typeof item === 'string' && !isNaN(parseFloat(item))))
+        .map(item => (typeof item === 'number' ? item : parseFloat(item)))
+}
+const calculateValue = (o: number, value: number, num: number, isMin: boolean) => {
+    if (value === 0) {
+        return 0
+    } else if (value > 0 && Math.abs(value) < 1 && isMin == true) {
+        return 0
+    } else if (value > -1 && value < 0 && isMin == false) {
+        return 0
+    }
+    let base
+    if (Math.abs(o) >= 100) {
+        base = 100
+    } else if (Math.abs(o) >= 10) {
+        base = 10
+    } else if (Math.abs(o) >= 1) {
+        base = 1
+    } else {
+        base = 0.1
+    }
+    let calculatedValue
+    if (isMin) {
+        if (value < 0) {
+            calculatedValue = value + num * value
+        } else {
+            calculatedValue = value - num * value
+        }
+    } else {
+        if (value < 0) {
+            calculatedValue = value - num * value
+        } else {
+            calculatedValue = value + num * value
+        }
+    }
+    if (base === 0.1) {
+        return parseFloat(calculatedValue.toFixed(1))
+    } else if (isMin) {
+        return Math.floor(calculatedValue / base) * base
+    } else {
+        return Math.ceil(calculatedValue / base) * base
+    }
+}
+
+// 处理y轴最大最小值
+export const yMethod = (arr: any) => {
+    let num = 0.1
+    let numList = dataProcessing(arr)
+    let maxValue = 0
+    let minValue = 0
+    let max = 0
+    let min = 0
+    maxValue = Math.max(...numList)
+    minValue = Math.min(...numList)
+    const o = maxValue - minValue
+    if (Math.abs(o) >= 300) {
+        num = 0.02
+    }
+
+    min = calculateValue(o, minValue, num, true)
+    max = calculateValue(o, maxValue, num, false)
+    // if (-100 >= minValue) {
+    //     min = Math.floor((minValue + num * minValue) / 100) * 100
+    // } else if (-10 >= minValue && minValue > -100) {
+    //     min = Math.floor((minValue + num * minValue) / 10) * 10
+    // } else if (-1 >= minValue && minValue > -10) {
+    //     min = Math.floor(minValue + num * minValue)
+    // } else if (0 > minValue && minValue > -1) {
+    //     min = parseFloat((minValue + num * minValue).toFixed(1))
+    // } else if (minValue == 0) {
+    //     min = 0
+    // } else if (0 < minValue && minValue < 1) {
+    //     min = parseFloat((minValue - num * minValue).toFixed(1))
+    // } else if (1 <= minValue && minValue < 10) {
+    //     min = Math.floor(minValue - num * minValue)
+    // } else if (10 <= minValue && minValue < 100) {
+    //     min = Math.floor((minValue - num * minValue) / 10) * 10
+    // } else if (100 <= minValue) {
+    //     min = Math.floor((minValue - num * minValue) / 100) * 100
+    // }
+
+    // if (-100 >= maxValue) {
+    //     max = Math.ceil((maxValue - num * maxValue) / 100) * 100
+    // } else if (-10 >= maxValue && maxValue > -100) {
+    //     max = Math.ceil((maxValue - num * maxValue) / 10) * 10
+    // } else if (-1 >= maxValue && maxValue > -10) {
+    //     max = Math.ceil(maxValue - num * maxValue)
+    // } else if (0 > maxValue && maxValue > -1) {
+    //     max = parseFloat((maxValue - num * maxValue).toFixed(1))
+    // } else if (maxValue == 0) {
+    //     max = 0
+    // } else if (0 < maxValue && maxValue < 1) {
+    //     max = parseFloat((maxValue + num * maxValue).toFixed(1))
+    // } else if (1 <= maxValue && maxValue < 10) {
+    //     max = Math.ceil(maxValue + num * maxValue)
+    // } else if (10 <= maxValue && maxValue < 100) {
+    //     max = Math.ceil((maxValue + num * maxValue) / 10) * 10
+    // } else if (100 <= maxValue) {
+    //     max = Math.ceil((maxValue + num * maxValue) / 100) * 100
+    // }
+
+    // if (maxValue > 1000 || minValue < -1000) {
+    //     max = Math.ceil(maxValue / 100) * 100
+    //     if (minValue == 0) {
+    //         min = 0
+    //     } else {
+    //         min = Math.floor(minValue / 100) * 100
+    //     }
+    // } else if (maxValue < 60 && minValue > 40) {
+    //     max = 60
+    //     min = 40
+    // } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
+    //     max = Math.ceil(maxValue / 10) * 10
+    //     min = Math.floor(minValue / 10) * 10
+    // } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
+    //     max = Math.ceil(maxValue / 10 + 1) * 10
+    //     min = Math.floor(minValue / 10 - 1) * 10
+    // } else {
+    //     max = Math.ceil(maxValue / 10) * 10
+    //     min = Math.floor(minValue / 10) * 10
+    // }
+
+    // if (maxValue > 0 && maxValue < 1) {
+    //     max = 1
+    // } else if (max == 0 && minValue > -1 && minValue < 0) {
+    //     min = -1
+    // }
+
+    return [min, max]
+}
+
+/**
+ * title['A相','B相',]
+ * data[[1,2],[3,4]]
+ */
+// 导出csv文件
+const convertToCSV = (title: object, data: any) => {
+    console.log('🚀 ~ convertToCSV ~ data:', data)
+    let csv = ''
+    // 添加列头
+    csv += ',' + title.join(',') + '\n'
+    // 遍历数据并添加到CSV字符串中
+    data?.map(item => {
+        csv += item.join(',') + '\n'
+    })
+    return csv
+}
+export const exportCSV = (title: object, data: any, filename: string) => {
+    const csv = convertToCSV(title, data)
+    const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' })
+    const link = document.createElement('a')
+    link.href = URL.createObjectURL(blob)
+    link.download = filename
+    link.click()
+    // 释放URL对象
+    URL.revokeObjectURL(link.href)
+}
+
+
+
+/**
+ * 补全时间序列数据中缺失的条目
+ * @param rawData 原始数据，格式为 [["时间字符串", "数值", "单位", "类型"], ...]
+ * @returns 补全后的数据，缺失条目数值为 null
+ */
+export const completeTimeSeries = (rawData: string[][]): (string | null)[][] => {
+    // 步骤1：校验原始数据并解析时间
+    if (rawData.length < 2) {
+        console.warn('数据量不足2条，无法计算时间间隔，直接返回原始数据')
+        return rawData.map(item => [...item])
+    }
+
+    // 解析所有时间为Date对象，过滤无效时间并按时间排序
+    const validData = rawData
+        .map(item => {
+            // 确保至少有时间和数值字段
+            if (!item[0]) {
+                return { time: new Date(0), item, isValid: false }
+            }
+            const time = new Date(item[0])
+            return { time, item, isValid: !isNaN(time.getTime()) }
+        })
+        .filter(data => data.isValid)
+        .sort((a, b) => a.time.getTime() - b.time.getTime()) // 确保数据按时间排序
+        .map(data => data.item)
+
+    if (validData.length < 2) {
+        throw new Error('有效时间数据不足2条，无法继续处理')
+    }
+
+    // 步骤2：计算时间间隔（分析前几条数据确定最可能的间隔）
+    const intervals: number[] = []
+    // 分析前10条数据来确定间隔，避免单一间隔出错
+    const analyzeCount = Math.min(10, validData.length - 1)
+    for (let i = 0; i < analyzeCount; i++) {
+        const currentTime = new Date(validData[i][0]!).getTime()
+        const nextTime = new Date(validData[i + 1][0]!).getTime()
+        const interval = nextTime - currentTime
+        if (interval > 0) {
+            intervals.push(interval)
+        }
+    }
+
+    // 取最常见的间隔作为标准间隔
+    const timeInterval = getMostFrequentValue(intervals)
+    if (timeInterval <= 0) {
+        throw new Error('无法确定有效的时间间隔')
+    }
+
+    // 步骤3：生成完整的时间序列范围（从第一条到最后一条）
+    const startTime = new Date(validData[0][0]!).getTime()
+    const endTime = new Date(validData[validData.length - 1][0]!).getTime()
+    const completeTimes: Date[] = []
+
+    // 生成从 startTime 到 endTime 的所有间隔时间点
+    for (let time = startTime; time <= endTime; time += timeInterval) {
+        completeTimes.push(new Date(time))
+    }
+
+    // 步骤4：将原始数据转为时间映射表，使用精确的时间字符串匹配
+    const timeDataMap = new Map<string, (string | undefined)[]>()
+    validData.forEach(item => {
+        // 使用原始时间字符串作为键，避免格式转换导致的匹配问题
+        if (item[0]) {
+            timeDataMap.set(item[0], item)
+        }
+    })
+
+    // 提取模板数据（从第一条有效数据中提取单位和类型，处理可能的缺失）
+    const template = validData[0]
+
+    // 步骤5：对比补全数据，缺失条目数值为 null
+    const completedData = completeTimes.map(time => {
+        // 保持与原始数据相同的时间格式
+        const timeStr = formatTime(time)
+        const existingItem = timeDataMap.get(timeStr)
+
+        if (existingItem) {
+            // 存在该时间，返回原始数据
+            return [...existingItem]
+        } else {
+            // 缺失该时间，数值设为 null，其他字段沿用第一个有效数据的格式
+            // 处理可能缺失的单位和类型字段
+            const result: (string | null | undefined)[] = [timeStr, '/']
+            // 仅在原始数据有单位字段时才添加
+            if (template.length > 2) {
+                result.push(template[2])
+            }
+            // 仅在原始数据有类型字段时才添加
+            if (template.length > 3) {
+                result.push(template[3])
+            }
+            return result
+        }
+    })
+
+    return completedData
+}
+
+/**
+ * 格式化时间为 "YYYY-MM-DD HH:mm:ss" 格式
+ * @param date 日期对象
+ * @returns 格式化后的时间字符串
+ */
+function formatTime(date: Date): string {
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hours = String(date.getHours()).padStart(2, '0')
+    const minutes = String(date.getMinutes()).padStart(2, '0')
+    const seconds = String(date.getSeconds()).padStart(2, '0')
+
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+}
+
+/**
+ * 获取数组中出现频率最高的值
+ * @param arr 数字数组
+ * @returns 出现频率最高的值
+ */
+function getMostFrequentValue(arr: number[]): number {
+    if (arr.length === 0) return 0
+
+    const frequencyMap = new Map<number, number>()
+    arr.forEach(num => {
+        frequencyMap.set(num, (frequencyMap.get(num) || 0) + 1)
+    })
+
+    let maxFrequency = 0
+    let mostFrequent = arr[0]
+
+    frequencyMap.forEach((frequency, num) => {
+        if (frequency > maxFrequency) {
+            maxFrequency = frequency
+            mostFrequent = num
+        }
+    })
+
+    return mostFrequent
+}
diff --git a/src/utils/router.ts b/src/utils/router.ts
index a9ea05ff..65610d61 100644
--- a/src/utils/router.ts
+++ b/src/utils/router.ts
@@ -1,295 +1,295 @@
-import router from '@/router/index'
-import { isNavigationFailure, NavigationFailureType } from 'vue-router'
-import type { RouteRecordRaw, RouteLocationRaw } from 'vue-router'
-import { ElNotification } from 'element-plus'
-import { useConfig } from '@/stores/config'
-import { useNavTabs } from '@/stores/navTabs'
-import { closeShade } from '@/utils/pageShade'
-import { adminBaseRoute } from '@/router/static'
-import { compact, isEmpty, reverse } from 'lodash-es'
-import { isAdminApp } from '@/utils/common'
-
-/**
- * 导航失败有错误消息的路由push
- * @param to — 导航位置，同 router.push
- */
-export const routePush = async (to: RouteLocationRaw) => {
-    try {
-        const failure = await router.push(to)
-        if (isNavigationFailure(failure, NavigationFailureType.aborted)) {
-            ElNotification({
-                message: 'utils.Navigation failed, navigation guard intercepted!',
-                type: 'error'
-            })
-        } else if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-            // ElNotification({
-            //     message: '已在目标页',
-            //     type: 'warning'
-            // })
-        }
-    } catch (error) {
-        ElNotification({
-            message: '导航失败，路由无效',
-            type: 'error'
-        })
-        console.error(error)
-    }
-}
-
-/**
- * 获取第一个菜单
- */
-export const getFirstRoute = (routes: RouteRecordRaw[], menuType = 'tab'): false | RouteRecordRaw => {
-    const routerPaths: string[] = []
-    const routers = router.getRoutes()
-    routers.forEach(item => {
-        if (item.path) routerPaths.push(item.path)
-    })
-    let find: boolean | RouteRecordRaw = false
-    for (const key in routes) {
-        if (
-            routes[key].meta?.type == 'menu' &&
-            routes[key].meta?.menu_type == menuType &&
-            routerPaths.indexOf(routes[key].path) !== -1
-        ) {
-            return routes[key]
-        } else if (routes[key].children && routes[key].children?.length) {
-            find = getFirstRoute(routes[key].children!)
-            if (find) return find
-        }
-    }
-    return find
-}
-
-/**
- * 打开侧边菜单
- * @param menu 菜单数据
- */
-export const onClickMenu = (menu: RouteRecordRaw) => {
-    switch (menu.meta?.menu_type) {
-        case 'iframe':
-        case 'tab':
-            routePush({ path: menu.path })
-            break
-        case 'link':
-            window.open(menu.path, '_blank')
-            break
-
-        default:
-            ElNotification({
-                message: 'utils.Navigation failed, the menu type is unrecognized!',
-                type: 'error'
-            })
-            break
-    }
-
-    const config = useConfig()
-    if (config.layout.shrink) {
-        closeShade(() => {
-            config.setLayout('menuCollapse', true)
-        })
-    }
-}
-
-/**
- * 处理后台的路由
- */
-export const handleAdminRoute = (routes: any) => {
-    const viewsComponent = import.meta.glob('/src/views/**/*.vue')
-    addRouteAll(viewsComponent, routes, adminBaseRoute.name as string)
-    const menuAdminBaseRoute = (adminBaseRoute.path as string) + '/'
-    // 更新stores中的路由菜单数据
-    const navTabs = useNavTabs()
-    navTabs.setTabsViewRoutes(handleMenuRule(routes, menuAdminBaseRoute))
-    navTabs.fillAuthNode(handleAuthNode(routes, menuAdminBaseRoute))
-}
-
-/**
- * 获取菜单的paths
- */
-export const getMenuPaths = (menus: RouteRecordRaw[]): string[] => {
-    let menuPaths: string[] = []
-    menus.forEach(item => {
-        menuPaths.push(item.path)
-        if (item.children && item.children.length > 0) {
-            menuPaths = menuPaths.concat(getMenuPaths(item.children))
-        }
-    })
-    return menuPaths
-}
-
-/**
- * 后台的菜单处理
- */
-const handleMenuRule = (routes: any, pathPrefix = '/', type = ['menu', 'menu_dir']) => {
-    const menuRule: RouteRecordRaw[] = []
-    for (const key in routes) {
-        if (routes[key].extend == 'add_rules_only') {
-            continue
-        }
-        if (!type.includes(routes[key].type)) {
-            continue
-        }
-        if (routes[key].type == 'menu_dir' && routes[key].children && !routes[key].children.length) {
-            continue
-        }
-        if (
-            ['route', 'menu', 'nav_user_menu', 'nav'].includes(routes[key].type) &&
-            ((routes[key].menu_type == 'tab' && !routes[key].component) ||
-                (['link', 'iframe'].includes(routes[key].menu_type) && !routes[key].url))
-        ) {
-            continue
-        }
-        const currentPath = ['link', 'iframe'].includes(routes[key].menu_type)
-            ? routes[key].url
-            : pathPrefix + routes[key].path
-        let children: RouteRecordRaw[] = []
-        if (routes[key].children && routes[key].children.length > 0) {
-            children = handleMenuRule(routes[key].children, pathPrefix, type)
-        }
-        menuRule.push({
-            path: currentPath,
-            name: routes[key].name,
-            component: routes[key].component,
-            meta: {
-                id: routes[key].id,
-                title: routes[key].title,
-                icon: routes[key].icon,
-                keepalive: routes[key].keepalive,
-                menu_type: routes[key].menu_type,
-                type: routes[key].type
-            },
-            children: children
-        })
-    }
-    return menuRule
-}
-
-/**
- * 处理权限节点
- * @param routes 路由数据
- * @param prefix 节点前缀
- * @returns 组装好的权限节点
- */
-const handleAuthNode = (routes: any, prefix = '/') => {
-    const authNode: Map<string, string[]> = new Map([])
-    assembleAuthNode(routes, authNode, prefix, prefix)
-    return authNode
-}
-const assembleAuthNode = (routes: any, authNode: Map<string, string[]>, prefix = '/', parent = '/') => {
-    const authNodeTemp = []
-    for (const key in routes) {
-        if (routes[key].type == 'button') authNodeTemp.push(prefix + routes[key].name)
-        if (routes[key].children && routes[key].children.length > 0) {
-            assembleAuthNode(routes[key].children, authNode, prefix, prefix + routes[key].name)
-        }
-    }
-    if (authNodeTemp && authNodeTemp.length > 0) {
-        authNode.set(parent, authNodeTemp)
-    }
-}
-
-/**
- * 动态添加路由-带子路由
- * @param viewsComponent
- * @param routes
- * @param parentName
- * @param analyticRelation 根据 name 从已注册路由分析父级路由
- */
-export const addRouteAll = (
-    viewsComponent: Record<string, any>,
-    routes: any,
-    parentName: string,
-    analyticRelation = false
-) => {
-    for (const idx in routes) {
-        if (routes[idx].extend == 'add_menu_only') {
-            continue
-        }
-        if (
-            (routes[idx].menu_type == 'tab' && viewsComponent[routes[idx].component]) ||
-            routes[idx].menu_type == 'iframe'
-        ) {
-            addRouteItem(viewsComponent, routes[idx], parentName, analyticRelation)
-        }
-
-        if (routes[idx].children && routes[idx].children.length > 0) {
-            addRouteAll(viewsComponent, routes[idx].children, parentName, analyticRelation)
-        }
-    }
-}
-
-/**
- * 动态添加路由
- * @param viewsComponent
- * @param route
- * @param parentName
- * @param analyticRelation 根据 name 从已注册路由分析父级路由
- */
-export const addRouteItem = (
-    viewsComponent: Record<string, any>,
-    route: any,
-    parentName: string,
-    analyticRelation: boolean
-) => {
-    let path = '',
-        component
-    if (route.menu_type == 'iframe') {
-        path = (isAdminApp() ? adminBaseRoute.path : '') + '/iframe/' + encodeURIComponent(route.url)
-        component = () => import('@/layouts/common/router-view/iframe.vue')
-    } else {
-        path = parentName ? route.path : '/' + route.path
-        component = viewsComponent[route.component]
-    }
-
-    if (route.menu_type == 'tab' && analyticRelation) {
-        const parentNames = getParentNames(route.name)
-        if (parentNames.length) {
-            for (const key in parentNames) {
-                if (router.hasRoute(parentNames[key])) {
-                    parentName = parentNames[key]
-                    break
-                }
-            }
-        }
-    }
-
-    const routeBaseInfo: RouteRecordRaw = {
-        path: path,
-        name: route.name,
-        component: component,
-        meta: {
-            ...route,
-            title: route.title,
-            extend: route.extend,
-            icon: route.icon,
-            keepalive: route.keepalive,
-            menu_type: route.menu_type,
-            type: route.type,
-            url: route.url,
-            addtab: true
-        }
-    }
-    if (parentName) {
-        router.addRoute(parentName, routeBaseInfo)
-    } else {
-        router.addRoute(routeBaseInfo)
-    }
-}
-
-/**
- * 根据name字符串，获取父级name组合的数组
- * @param name
- */
-const getParentNames = (name: string) => {
-    const names = compact(name.split('/'))
-    const tempNames = []
-    const parentNames = []
-    for (const key in names) {
-        tempNames.push(names[key])
-        if (parseInt(key) != names.length - 1) {
-            parentNames.push(tempNames.join('/'))
-        }
-    }
-    return reverse(parentNames)
-}
+import router from '@/router/index'
+import { isNavigationFailure, NavigationFailureType } from 'vue-router'
+import type { RouteRecordRaw, RouteLocationRaw } from 'vue-router'
+import { ElNotification } from 'element-plus'
+import { useConfig } from '@/stores/config'
+import { useNavTabs } from '@/stores/navTabs'
+import { closeShade } from '@/utils/pageShade'
+import { adminBaseRoute } from '@/router/static'
+import { compact, isEmpty, reverse } from 'lodash-es'
+import { isAdminApp } from '@/utils/common'
+
+/**
+ * 导航失败有错误消息的路由push
+ * @param to — 导航位置，同 router.push
+ */
+export const routePush = async (to: RouteLocationRaw) => {
+    try {
+        const failure = await router.push(to)
+        if (isNavigationFailure(failure, NavigationFailureType.aborted)) {
+            ElNotification({
+                message: 'utils.Navigation failed, navigation guard intercepted!',
+                type: 'error'
+            })
+        } else if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+            // ElNotification({
+            //     message: '已在目标页',
+            //     type: 'warning'
+            // })
+        }
+    } catch (error) {
+        ElNotification({
+            message: '导航失败，路由无效',
+            type: 'error'
+        })
+        console.error(error)
+    }
+}
+
+/**
+ * 获取第一个菜单
+ */
+export const getFirstRoute = (routes: RouteRecordRaw[], menuType = 'tab'): false | RouteRecordRaw => {
+    const routerPaths: string[] = []
+    const routers = router.getRoutes()
+    routers.forEach(item => {
+        if (item.path) routerPaths.push(item.path)
+    })
+    let find: boolean | RouteRecordRaw = false
+    for (const key in routes) {
+        if (
+            routes[key].meta?.type == 'menu' &&
+            routes[key].meta?.menu_type == menuType &&
+            routerPaths.indexOf(routes[key].path) !== -1
+        ) {
+            return routes[key]
+        } else if (routes[key].children && routes[key].children?.length) {
+            find = getFirstRoute(routes[key].children!)
+            if (find) return find
+        }
+    }
+    return find
+}
+
+/**
+ * 打开侧边菜单
+ * @param menu 菜单数据
+ */
+export const onClickMenu = (menu: RouteRecordRaw) => {
+    switch (menu.meta?.menu_type) {
+        case 'iframe':
+        case 'tab':
+            routePush({ path: menu.path })
+            break
+        case 'link':
+            window.open(menu.path, '_blank')
+            break
+
+        default:
+            ElNotification({
+                message: 'utils.Navigation failed, the menu type is unrecognized!',
+                type: 'error'
+            })
+            break
+    }
+
+    const config = useConfig()
+    if (config.layout.shrink) {
+        closeShade(() => {
+            config.setLayout('menuCollapse', true)
+        })
+    }
+}
+
+/**
+ * 处理后台的路由
+ */
+export const handleAdminRoute = (routes: any) => {
+    const viewsComponent = import.meta.glob('/src/views/**/*.vue')
+    addRouteAll(viewsComponent, routes, adminBaseRoute.name as string)
+    const menuAdminBaseRoute = (adminBaseRoute.path as string) + '/'
+    // 更新stores中的路由菜单数据
+    const navTabs = useNavTabs()
+    navTabs.setTabsViewRoutes(handleMenuRule(routes, menuAdminBaseRoute))
+    navTabs.fillAuthNode(handleAuthNode(routes, menuAdminBaseRoute))
+}
+
+/**
+ * 获取菜单的paths
+ */
+export const getMenuPaths = (menus: RouteRecordRaw[]): string[] => {
+    let menuPaths: string[] = []
+    menus.forEach(item => {
+        menuPaths.push(item.path)
+        if (item.children && item.children.length > 0) {
+            menuPaths = menuPaths.concat(getMenuPaths(item.children))
+        }
+    })
+    return menuPaths
+}
+
+/**
+ * 后台的菜单处理
+ */
+const handleMenuRule = (routes: any, pathPrefix = '/', type = ['menu', 'menu_dir']) => {
+    const menuRule: RouteRecordRaw[] = []
+    for (const key in routes) {
+        if (routes[key].extend == 'add_rules_only') {
+            continue
+        }
+        if (!type.includes(routes[key].type)) {
+            continue
+        }
+        if (routes[key].type == 'menu_dir' && routes[key].children && !routes[key].children.length) {
+            continue
+        }
+        if (
+            ['route', 'menu', 'nav_user_menu', 'nav'].includes(routes[key].type) &&
+            ((routes[key].menu_type == 'tab' && !routes[key].component) ||
+                (['link', 'iframe'].includes(routes[key].menu_type) && !routes[key].url))
+        ) {
+            continue
+        }
+        const currentPath = ['link', 'iframe'].includes(routes[key].menu_type)
+            ? routes[key].url
+            : pathPrefix + routes[key].path
+        let children: RouteRecordRaw[] = []
+        if (routes[key].children && routes[key].children.length > 0) {
+            children = handleMenuRule(routes[key].children, pathPrefix, type)
+        }
+        menuRule.push({
+            path: currentPath,
+            name: routes[key].name,
+            component: routes[key].component,
+            meta: {
+                id: routes[key].id,
+                title: routes[key].title,
+                icon: routes[key].icon,
+                keepalive: routes[key].keepalive,
+                menu_type: routes[key].menu_type,
+                type: routes[key].type
+            },
+            children: children
+        })
+    }
+    return menuRule
+}
+
+/**
+ * 处理权限节点
+ * @param routes 路由数据
+ * @param prefix 节点前缀
+ * @returns 组装好的权限节点
+ */
+const handleAuthNode = (routes: any, prefix = '/') => {
+    const authNode: Map<string, string[]> = new Map([])
+    assembleAuthNode(routes, authNode, prefix, prefix)
+    return authNode
+}
+const assembleAuthNode = (routes: any, authNode: Map<string, string[]>, prefix = '/', parent = '/') => {
+    const authNodeTemp = []
+    for (const key in routes) {
+        if (routes[key].type == 'button') authNodeTemp.push(prefix + routes[key].name)
+        if (routes[key].children && routes[key].children.length > 0) {
+            assembleAuthNode(routes[key].children, authNode, prefix, prefix + routes[key].name)
+        }
+    }
+    if (authNodeTemp && authNodeTemp.length > 0) {
+        authNode.set(parent, authNodeTemp)
+    }
+}
+
+/**
+ * 动态添加路由-带子路由
+ * @param viewsComponent
+ * @param routes
+ * @param parentName
+ * @param analyticRelation 根据 name 从已注册路由分析父级路由
+ */
+export const addRouteAll = (
+    viewsComponent: Record<string, any>,
+    routes: any,
+    parentName: string,
+    analyticRelation = false
+) => {
+    for (const idx in routes) {
+        if (routes[idx].extend == 'add_menu_only') {
+            continue
+        }
+        if (
+            (routes[idx].menu_type == 'tab' && viewsComponent[routes[idx].component]) ||
+            routes[idx].menu_type == 'iframe'
+        ) {
+            addRouteItem(viewsComponent, routes[idx], parentName, analyticRelation)
+        }
+
+        if (routes[idx].children && routes[idx].children.length > 0) {
+            addRouteAll(viewsComponent, routes[idx].children, parentName, analyticRelation)
+        }
+    }
+}
+
+/**
+ * 动态添加路由
+ * @param viewsComponent
+ * @param route
+ * @param parentName
+ * @param analyticRelation 根据 name 从已注册路由分析父级路由
+ */
+export const addRouteItem = (
+    viewsComponent: Record<string, any>,
+    route: any,
+    parentName: string,
+    analyticRelation: boolean
+) => {
+    let path = '',
+        component
+    if (route.menu_type == 'iframe') {
+        path = (isAdminApp() ? adminBaseRoute.path : '') + '/iframe/' + encodeURIComponent(route.url)
+        component = () => import('@/layouts/common/router-view/iframe.vue')
+    } else {
+        path = parentName ? route.path : '/' + route.path
+        component = viewsComponent[route.component]
+    }
+
+    if (route.menu_type == 'tab' && analyticRelation) {
+        const parentNames = getParentNames(route.name)
+        if (parentNames.length) {
+            for (const key in parentNames) {
+                if (router.hasRoute(parentNames[key])) {
+                    parentName = parentNames[key]
+                    break
+                }
+            }
+        }
+    }
+
+    const routeBaseInfo: RouteRecordRaw = {
+        path: path,
+        name: route.name,
+        component: component,
+        meta: {
+            ...route,
+            title: route.title,
+            extend: route.extend,
+            icon: route.icon,
+            keepalive: route.keepalive,
+            menu_type: route.menu_type,
+            type: route.type,
+            url: route.url,
+            addtab: true
+        }
+    }
+    if (parentName) {
+        router.addRoute(parentName, routeBaseInfo)
+    } else {
+        router.addRoute(routeBaseInfo)
+    }
+}
+
+/**
+ * 根据name字符串，获取父级name组合的数组
+ * @param name
+ */
+const getParentNames = (name: string) => {
+    const names = compact(name.split('/'))
+    const tempNames = []
+    const parentNames = []
+    for (const key in names) {
+        tempNames.push(names[key])
+        if (parseInt(key) != names.length - 1) {
+            parentNames.push(tempNames.join('/'))
+        }
+    }
+    return reverse(parentNames)
+}
diff --git a/src/views/cockpit/TerminalLog.vue b/src/views/cockpit/TerminalLog.vue
index 0754c047..ff05fda3 100644
--- a/src/views/cockpit/TerminalLog.vue
+++ b/src/views/cockpit/TerminalLog.vue
@@ -23,7 +23,7 @@ const prop = defineProps({
 const dictData = useDictData()
 const fontdveoption = dictData.getBasicData('Dev_Ops')
 
-const tableStore = new TableStore({
+const tableStore:any = new TableStore({
     url: '/device-boot/pqsTerminalLogs/getList',
     method: 'POST',
     column: [
diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/SubstationTab.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/SubstationTab.vue
index 81af3a2c..d0c8cb81 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/SubstationTab.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/SubstationTab.vue
@@ -399,7 +399,7 @@ const handleCurrentChange = (val: number) => {
 const exportEvent = () => {
   const allFilteredData = filteredData.value
   tableRef.value.exportData({
-    filename: '场战级评估-污染值报告',
+    filename: '场站级评估-污染值报告',
     sheetName: 'Sheet1',
     type: 'xlsx',
     useStyle: true,
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue
index cdd3b83e..66352189 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue
@@ -652,7 +652,7 @@ const initRadioCharts = () => {
         echartsData1.value.options.series[i].center = ['50%', '50%']
     }
 }
-const initEcharts = (color: string, key: number) => {
+const initEcharts = (color: string, key: number, name: string) => {
     return {
         options: {
             tooltip: {},
@@ -731,7 +731,7 @@ const initEcharts = (color: string, key: number) => {
                     data: [
                         {
                             value: 0,
-                            name: 'A相',
+                            name: name,
                             itemStyle: {
                                 color: color
                             }
@@ -744,14 +744,14 @@ const initEcharts = (color: string, key: number) => {
 }
 //渲染echarts
 const init = () => {
-const url = (localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.68:10407/api/pushMessage/') 
-    echartsDataV1.value = initEcharts('#DAA520', 0)
-    echartsDataV2.value = initEcharts('#2E8B57', 0)
-    echartsDataV3.value = initEcharts('#A52a2a', 0)
+    const url = localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.68:10407/api/pushMessage/'
+    echartsDataV1.value = initEcharts('#DAA520', 0, 'A相')
+    echartsDataV2.value = initEcharts('#2E8B57', 0, 'B相')
+    echartsDataV3.value = initEcharts('#A52a2a', 0, 'C相')
 
-    echartsDataA1.value = initEcharts('#DAA520', 1)
-    echartsDataA2.value = initEcharts('#2E8B57', 1)
-    echartsDataA3.value = initEcharts('#A52a2a', 1)
+    echartsDataA1.value = initEcharts('#DAA520', 1, 'A相')
+    echartsDataA2.value = initEcharts('#2E8B57', 1, 'B相')
+    echartsDataA3.value = initEcharts('#A52a2a', 1, 'C相')
 
     if (!dataSocket.socketServe) {
         console.error('WebSocket 客户端实例不存在')
@@ -764,9 +764,7 @@ const url = (localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.68:10407/ap
         })
     }
     let pids = monitoringPoint.state.pid.split(',')
-    dataSocket.socketServe.connect(
-        `${url}${adminInfo.id},${monitoringPoint.state.lineId},${pids[pids.length - 2]}`
-    )
+    dataSocket.socketServe.connect(`${url}${adminInfo.id},${monitoringPoint.state.lineId},${pids[pids.length - 2]}`)
     dataSocket.socketServe.registerCallBack('message', (res: any) => {
         txtContent.value = res.value
         let data = JSON.parse(res.value)
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
index 1e521b49..8153283d 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
@@ -1,1941 +1,1972 @@
-<template>
-    <div>
-        <div v-show="view">
-            <TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
-                <template v-slot:select>
-                    <el-form-item label="多监测点">
-                        <el-checkbox v-model="checked" @change="checkChange" />
-                    </el-form-item>
-                    <el-form-item label="日期">
-                        <DatePicker ref="datePickerRef" :theCurrentTime="true"></DatePicker>
-                    </el-form-item>
-                    <el-form-item label="指标类型:">
-                        <el-select
-                            v-model="formData.condition"
-                            multiple
-                            collapse-tags
-                            :multiple-limit="checked ? 1 : 3"
-                            filterable
-                            placeholder="请选择指标"
-                            @change="conditionChange"
-                        >
-                            <el-option-group v-for="group in indexOptions" :key="group.label" :label="group.label">
-                                <el-option
-                                    v-for="item in group.options"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-option-group>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="数值类型:">
-                        <el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型">
-                            <el-option
-                                v-for="item in typeOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="谐波次数:" v-show="showXieBoCiShu">
-                        <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波">
-                            <el-option
-                                v-for="item in harmonicOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item v-show="showJianXieBoCiShu" label="间谐波次数:">
-                        <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波">
-                            <el-option
-                                v-for="item in inharmonicOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </template>
-                <template v-slot:operation>
-                    <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
-                </template>
-            </TableHeader>
-            <!-- <el-form :inline="true">
-           
-        </el-form> -->
-            <div id="canvas" class="mt10" :style="height1" style="overflow-y: auto;overflow-x: hidden" v-loading="loading">
-                <my-echart
-                    :options="item.option"
-                    v-for="item in list"
-                    style="min-height: 190px"
-                    :style="height"
-                    @triggerPoint="triggerPoint"
-                    @group="group"
-                />
-            </div>
-        </div>
-        <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
-            <waveForm ref="waveFormRef" senior @backbxlb="backbxlb" />
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { nextTick, onMounted, reactive, ref, onBeforeUnmount } from 'vue'
-import DatePicker from '@/components/form/datePicker/index.vue'
-import MyEchart from '@/components/echarts/MyEchart.vue'
-import { useMonitoringPoint } from '@/stores/monitoringPoint'
-import { indexOptions, harmonicOptions, inharmonicOptions } from '@/utils/dictionary'
-import { getHistoryResult } from '@/api/harmonic-boot/harmonic'
-import { mainHeight } from '@/utils/layout'
-import TableHeader from '@/components/table/header/index.vue'
-import { queryEventDetailByEventId } from '@/api/event-boot/highAndLowPressure'
-import TableStore from '@/utils/tableStore'
-import waveForm from '@/components/echarts/waveForm.vue'
-import html2canvas from 'html2canvas'
-import { ElMessage } from 'element-plus'
-import { yMethod } from '@/utils/echartMethod'
-import * as echarts from 'echarts' // 全引入
-import { min } from 'xe-utils'
-const datePickerRef = ref()
-const monitoringPoint = useMonitoringPoint()
-const checked = ref(monitoringPoint.state.showCheckBox)
-const loading = ref(true)
-const formData = reactive<{
-    lineId: string[]
-    searchBeginTime: string
-    searchEndTime: string
-    condition: string[]
-    valueType: number
-    harmonic: number
-    inHarmonic: number
-    ptType: number
-}>({
-    lineId: [],
-    searchBeginTime: '',
-    searchEndTime: '',
-    condition: ['10', '11', '12'],
-    valueType: 1,
-    harmonic: 1,
-    inHarmonic: 1,
-    ptType: 0
-})
-const wp = ref({})
-const pageHeight = mainHeight(20)
-const view = ref(true)
-const waveFormRef = ref()
-const tableStore = new TableStore({
-    url: '',
-    method: 'POST',
-    column: []
-})
-const tableData = ref([])
-const tableHeaderRef = ref()
-const options = ref({})
-const traceability = ref<any>([])
-const list = ref<any>([])
-const showXieBoCiShu = ref(false)
-const showJianXieBoCiShu = ref(false)
-const typeOptions = ref([
-    { label: '平均值', value: 1 },
-    { label: '最小值', value: 2 },
-    { label: '最大值', value: 3 },
-    { label: 'cp95值', value: 4 }
-])
-onMounted(() => {
-    datePickerRef.value.setTheDate(5)
-    init()
-})
-const height: any = ref(mainHeight(200, 1))
-const height1: any = ref(mainHeight(160))
-const checkChange = () => {
-    if (checked.value) {
-        monitoringPoint.setShowCheckBox(true)
-        if (formData.condition.length > 0) {
-            formData.condition = formData.condition.slice(0, 1)
-        }
-    } else {
-        monitoringPoint.setShowCheckBox(false)
-        init()
-    }
-}
-const group = (e: any) => {
-    e.group = 'group'
-}
-const init = () => {
-    if (formData.condition.length == 0) {
-        return ElMessage.warning('请选择指标类型')
-    }
-
-    formData.lineId = checked.value ? monitoringPoint.state.lineIds : [monitoringPoint.state.lineId]
-    formData.searchBeginTime = datePickerRef.value.timeValue[0]
-    formData.searchEndTime = datePickerRef.value.timeValue[1]
-    if (formData.lineId.length > 3) {
-        return ElMessage.warning('最多只能选择3个监测点')
-    }
-    loading.value = true
-    let directionValue = formData.condition.findIndex(item => {
-        if (item === '39') {
-            item = '50'
-            return true
-        } else {
-            return false
-        }
-    })
-
-    getHistoryResult(formData)
-        .then(async (res: any) => {
-            if (directionValue >= 0) {
-                res.data[directionValue].targetName = '谐波电流方向'
-                traceability.value = [(res.data as [])[directionValue]]
-            }
-            list.value = []
-            await shujuchuli(res)
-            await selectChange(tableHeaderRef.value.showSelect)
-            loading.value = false
-        })
-        .catch(() => {
-            loading.value = false
-        })
-}
-const shujuchuli = (res: any) => {
-    let shujuData = res.data
-    tableData.value = res.data
-    shujuData.forEach((item: any, i: number) => {
-        //判断是否存在暂降点
-
-        if (item.eventDetail !== null || item.eventDetail.length === 0) {
-            //向项别中添加暂降点
-            let chufa = []
-            item.phaiscType.push('暂态触发点')
-            //判断是否有限值(有上下限)
-            if (item.topLimit !== 0 && item.lowerLimit !== 0) {
-                item.phaiscType.push('上限')
-                item.phaiscType.push('下限')
-                if (item.minValue !== null && item.maxValue !== null) {
-                    //最小值等于下限值
-
-                    //图列为A,B,C,暂降,上限,下限
-                    if (item.phaiscType.length == 6) {
-                        let avalue = []
-                        let bvalue = []
-                        let cvalue = []
-                        let topLimit = []
-                        let lowerLimit = []
-                        item.maxValue = item.topLimit
-                        item.minValue = item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    avalue.push([])
-                                }
-                                //判断存在缺失值b
-                                if (item.value[j][2] != undefined) {
-                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
-                                } else {
-                                    bvalue.push([])
-                                }
-                                //判断存在缺失值c
-                                if (item.value[j][3] != undefined) {
-                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
-                                } else {
-                                    cvalue.push([])
-                                }
-                                //上下限值
-                                topLimit.push([item.value[j][0], item.topLimit])
-                                lowerLimit.push([item.value[j][0], item.lowerLimit])
-                            }
-                            //数据为空
-                        } else {
-                            avalue = []
-                            bvalue = []
-                            cvalue = []
-                        }
-                        //不存在一个暂降点或1个 //处理暂降点
-                        if (item.eventDetail.length > 0) {
-                            for (let k = 0; k < item.eventDetail.length; k++) {
-                                chufa.push([
-                                    item.eventDetail[k].time,
-                                    item.minValue.toFixed(3),
-                                    item.eventDetail[k].id,
-                                    99
-                                ])
-                            }
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            avalue: avalue,
-                            bvalue: bvalue,
-                            cvalue: cvalue,
-                            topLimit: topLimit,
-                            lowerLimit: lowerLimit,
-                            chufa: chufa
-                        }
-                        list.value.push(shuju)
-                    }
-                    //图列为频率等,暂降,上限,下限
-                    if (item.phaiscType.length == 4) {
-                        let gvalue = []
-                        let topLimit = []
-                        let lowerLimit = []
-                        item.maxValue = item.topLimit
-                        item.minValue = item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    gvalue.push([])
-                                }
-                                //上下限值
-                                topLimit.push([item.value[j][0], item.topLimit])
-                                lowerLimit.push([item.value[j][0], item.lowerLimit])
-                            }
-                            //数据为空
-                        } else {
-                            gvalue = []
-                        }
-                        //不存在一个暂降点或1个 //处理暂降点
-                        if (item.eventDetail.length > 0) {
-                            for (let k = 0; k < item.eventDetail.length; k++) {
-                                chufa.push([
-                                    item.eventDetail[k].time,
-                                    item.minValue.toFixed(3),
-                                    item.eventDetail[k].id,
-                                    99
-                                ])
-                            }
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            gvalue: gvalue,
-                            topLimit: topLimit,
-                            lowerLimit: lowerLimit,
-                            chufa: chufa
-                        }
-                        list.value.push(shuju)
-                    }
-                } else {
-                    let shuju = {
-                        id: 'qushifenx' + i,
-                        title: item.lineName + '--' + item.targetName,
-                        wiringMethod: item.wiringMethod || '0',
-                        targetName: item.targetName,
-                        value: item.value,
-                        legend: item.phaiscType,
-                        valueName: item.unit[0],
-                        minValue: null,
-                        avalue: [],
-                        bvalue: [],
-                        cvalue: [],
-                        topLimit: [],
-                        lowerLimit: [],
-                        chufa: []
-                    }
-                    list.value.push(shuju)
-                }
-            }
-            //有上限值
-            if (item.topLimit !== 0 && item.lowerLimit == 0) {
-                item.phaiscType.push('上限')
-                if (item.minValue !== null && item.maxValue !== null) {
-                    //最小值等于下限值
-                    //图列为A,B,C,暂降,上限
-                    if (item.phaiscType.length == 5) {
-                        let avalue = []
-                        let bvalue = []
-                        let cvalue = []
-                        let topLimit = []
-                        item.maxValue = item.topLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    avalue.push([])
-                                }
-                                //判断存在缺失值b
-                                if (item.value[j][2] != undefined) {
-                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
-                                } else {
-                                    bvalue.push([])
-                                }
-                                //判断存在缺失值c
-                                if (item.value[j][3] != undefined) {
-                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
-                                } else {
-                                    cvalue.push([])
-                                }
-                                //上限值
-                                topLimit.push([item.value[j][0], item.topLimit])
-                            }
-                            //数据为空
-                        } else {
-                            avalue = []
-                            bvalue = []
-                            cvalue = []
-                        }
-                        //不存在一个暂降点或1个 //处理暂降点
-                        if (item.eventDetail.length > 0) {
-                            for (let k = 0; k < item.eventDetail.length; k++) {
-                                chufa.push([
-                                    item.eventDetail[k].time,
-                                    item.minValue.toFixed(3),
-                                    item.eventDetail[k].id,
-                                    99
-                                ])
-                            }
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            avalue: avalue,
-                            bvalue: bvalue,
-                            cvalue: cvalue,
-                            topLimit: topLimit,
-                            chufa: chufa
-                        }
-                        list.value.push(shuju)
-                    }
-                    //图列为频率等,暂降,上限
-                    if (item.phaiscType.length == 3) {
-                        let gvalue = []
-                        let topLimit = []
-                        item.maxValue = item.topLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    gvalue.push([])
-                                }
-                                //上限值
-                                topLimit.push([item.value[j][0], item.topLimit])
-                            }
-                            //数据为空
-                        } else {
-                            gvalue = []
-                        }
-                        //不存在一个暂降点或1个 //处理暂降点
-                        if (item.eventDetail.length > 0) {
-                            for (let k = 0; k < item.eventDetail.length; k++) {
-                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
-                            }
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            gvalue: gvalue,
-                            topLimit: topLimit,
-                            chufa: chufa
-                        }
-                        list.value.push(shuju)
-                    }
-                } else {
-                    let shuju = {
-                        id: 'qushifenx' + i,
-                        title: item.lineName + '--' + item.targetName,
-                        wiringMethod: item.wiringMethod || '0',
-                        targetName: item.targetName,
-                        value: item.value,
-                        legend: item.phaiscType,
-                        valueName: item.unit[0],
-                        minValue: null,
-                        avalue: [],
-                        bvalue: [],
-                        cvalue: [],
-                        topLimit: [],
-                        lowerLimit: [],
-                        chufa: []
-                    }
-                    list.value.push(shuju)
-                }
-            }
-            //有下限值
-            if (item.topLimit == 0 && item.lowerLimit !== 0) {
-                item.phaiscType.push('下限')
-                if (item.minValue !== null && item.maxValue !== null) {
-                    //最小值等于下限值
-                    //图列为A,B,C,暂降,下限
-                    if (item.phaiscType.length == 5) {
-                        let avalue = []
-                        let bvalue = []
-                        let cvalue = []
-                        let lowerLimit = []
-                        item.minValue = item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    avalue.push([])
-                                }
-                                //判断存在缺失值b
-                                if (item.value[j][2] != undefined) {
-                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
-                                } else {
-                                    bvalue.push([])
-                                }
-                                //判断存在缺失值c
-                                if (item.value[j][3] != undefined) {
-                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
-                                } else {
-                                    cvalue.push([])
-                                }
-                                //下限值
-                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
-                            }
-                            //数据为空
-                        } else {
-                            avalue = []
-                            bvalue = []
-                            cvalue = []
-                        }
-                        //不存在一个暂降点或1个 //处理暂降点
-                        if (item.eventDetail.length > 0) {
-                            for (let k = 0; k < item.eventDetail.length; k++) {
-                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
-                            }
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            avalue: avalue,
-                            bvalue: bvalue,
-                            cvalue: cvalue,
-                            lowerLimit: lowerLimit,
-                            chufa: chufa
-                        }
-                        list.value.push(shuju)
-                    }
-                    //图列为频率等,暂降,下限
-                    if (item.phaiscType.length == 3) {
-                        let gvalue = []
-                        let lowerLimit = []
-                        item.minValue = item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    gvalue.push([])
-                                }
-                                //下限值
-                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
-                            }
-                            //数据为空
-                        } else {
-                            gvalue = []
-                        }
-                        //不存在一个暂降点或1个 //处理暂降点
-                        if (item.eventDetail.length > 0) {
-                            for (let k = 0; k < item.eventDetail.length; k++) {
-                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
-                            }
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            gvalue: gvalue,
-                            lowerLimit: lowerLimit,
-                            chufa: chufa
-                        }
-                        list.value.push(shuju)
-                    }
-                } else {
-                    let shuju = {
-                        id: 'qushifenx' + i,
-                        title: item.lineName + '--' + item.targetName,
-                        wiringMethod: item.wiringMethod || '0',
-                        targetName: item.targetName,
-                        value: item.value,
-                        legend: item.phaiscType,
-                        valueName: item.unit[0],
-                        minValue: null,
-                        avalue: [],
-                        bvalue: [],
-                        cvalue: [],
-                        topLimit: [],
-                        lowerLimit: [],
-                        chufa: []
-                    }
-                    list.value.push(shuju)
-                }
-            }
-            //无限值
-            if (item.topLimit == 0 && item.lowerLimit == 0) {
-                if (item.minValue !== null && item.maxValue !== null) {
-                    //最小值等于下限值
-                    //图列为A,B,C,暂降
-                    if (item.phaiscType.length == 4) {
-                        let avalue = []
-                        let bvalue = []
-                        let cvalue = []
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    avalue.push([])
-                                }
-                                //判断存在缺失值b
-                                if (item.value[j][2] != undefined) {
-                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
-                                } else {
-                                    bvalue.push([])
-                                }
-                                //判断存在缺失值c
-                                if (item.value[j][3] != undefined) {
-                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
-                                } else {
-                                    cvalue.push([])
-                                }
-                            }
-                            //数据为空
-                        } else {
-                            avalue = []
-                            bvalue = []
-                            cvalue = []
-                        }
-                        //不存在一个暂降点或1个 //处理暂降点
-                        if (item.eventDetail.length > 0) {
-                            for (let k = 0; k < item.eventDetail.length; k++) {
-                                chufa.push([
-                                    item.eventDetail[k].time,
-                                    item.minValue.toFixed(3),
-                                    item.eventDetail[k].id,
-                                    99
-                                ])
-                            }
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            minValue: item.minValue > 1 ? (item.minValue - 0.5).toFixed(3) : item.minValue.toFixed(3),
-                            maxValue: item.maxValue.toFixed(3),
-                            avalue: avalue,
-                            bvalue: bvalue,
-                            cvalue: cvalue,
-                            chufa: chufa
-                        }
-                        list.value.push(shuju)
-                    }
-                    //图列为频率等,暂降
-                    if (item.phaiscType.length == 2) {
-                        let gvalue = []
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    gvalue.push([])
-                                }
-                            }
-                            //数据为空
-                        } else {
-                            gvalue = []
-                        }
-                        //不存在一个暂降点或1个 //处理暂降点
-                        if (item.eventDetail.length > 0) {
-                            for (let k = 0; k < item.eventDetail.length; k++) {
-                                chufa.push([
-                                    item.eventDetail[k].time,
-                                    item.minValue.toFixed(3),
-                                    item.eventDetail[k].id,
-                                    99
-                                ])
-                            }
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            minValue: item.minValue.toFixed(3),
-                            maxValue: item.maxValue.toFixed(3),
-                            gvalue: gvalue,
-                            chufa: chufa
-                        }
-                        list.value.push(shuju)
-                    }
-                } else {
-                    let shuju = {
-                        id: 'qushifenx' + i,
-                        title: item.lineName + '--' + item.targetName,
-                        wiringMethod: item.wiringMethod || '0',
-                        targetName: item.targetName,
-                        value: item.value,
-                        legend: item.phaiscType,
-                        valueName: item.unit[0],
-                        minValue: null,
-                        avalue: [],
-                        bvalue: [],
-                        cvalue: [],
-                        topLimit: [],
-                        lowerLimit: [],
-                        chufa: []
-                    }
-                    list.value.push(shuju)
-                }
-            }
-        } else if (item.eventDetail == null) {
-            //判断是否有限值(有上下限)
-            if (item.topLimit !== 0 && item.lowerLimit !== 0) {
-                item.phaiscType.push('上限')
-                item.phaiscType.push('下限')
-                if (item.minValue !== null && item.maxValue !== null) {
-                    //最小值等于下限值
-                    //图列为A,B,C,上限,下限
-                    if (item.phaiscType.length == 5) {
-                        let avalue = []
-                        let bvalue = []
-                        let cvalue = []
-                        let topLimit = []
-                        let lowerLimit = []
-                        item.maxValue = item.topLimit
-                        item.minValue = item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    avalue.push([])
-                                }
-                                //判断存在缺失值b
-                                if (item.value[j][2] != undefined) {
-                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
-                                } else {
-                                    bvalue.push([])
-                                }
-                                //判断存在缺失值c
-                                if (item.value[j][3] != undefined) {
-                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
-                                } else {
-                                    cvalue.push([])
-                                }
-                                //上下限值
-                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
-                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
-                            }
-                            //数据为空
-                        } else {
-                            avalue = []
-                            bvalue = []
-                            cvalue = []
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            avalue: avalue,
-                            bvalue: bvalue,
-                            cvalue: cvalue,
-                            topLimit: topLimit,
-                            lowerLimit: lowerLimit
-                        }
-                        list.value.push(shuju)
-                    }
-                    //图列为频率等,上限,下限
-                    if (item.phaiscType.length == 3) {
-                        let gvalue = []
-                        let topLimit = []
-                        let lowerLimit = []
-                        item.maxValue = item.topLimit
-                        item.minValue = item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    gvalue.push([])
-                                }
-                                //上下限值
-                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
-                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
-                            }
-                            //数据为空
-                        } else {
-                            gvalue = []
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            gvalue: gvalue,
-                            topLimit: topLimit,
-                            lowerLimit: lowerLimit,
-                            chufa: []
-                        }
-                        list.value.push(shuju)
-                    }
-                } else {
-                    let shuju = {
-                        id: 'qushifenx' + i,
-                        title: item.lineName + '--' + item.targetName,
-                        wiringMethod: item.wiringMethod || '0',
-                        targetName: item.targetName,
-                        value: item.value,
-                        legend: item.phaiscType,
-                        valueName: item.unit[0],
-                        minValue: null,
-                        avalue: [],
-                        bvalue: [],
-                        cvalue: [],
-                        topLimit: [],
-                        lowerLimit: [],
-                        chufa: []
-                    }
-                    list.value.push(shuju)
-                }
-            }
-            //有上限值
-            if (item.topLimit !== 0 && item.lowerLimit == 0) {
-                item.phaiscType.push('上限')
-                if (item.minValue !== null) {
-                    //最小值等于下限值
-                    //图列为A,B,C,上限
-                    if (item.phaiscType.length == 4) {
-                        let avalue = []
-                        let bvalue = []
-                        let cvalue = []
-                        let topLimit = []
-                        item.maxValue = item.topLimit
-                        // item.minValue=item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    avalue.push([])
-                                }
-                                //判断存在缺失值b
-                                if (item.value[j][2] != undefined) {
-                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
-                                } else {
-                                    bvalue.push([])
-                                }
-                                //判断存在缺失值c
-                                if (item.value[j][3] != undefined) {
-                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
-                                } else {
-                                    cvalue.push([])
-                                }
-                                //上限值
-                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
-                            }
-                            //数据为空
-                        } else {
-                            avalue = []
-                            bvalue = []
-                            cvalue = []
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            maxValue: item.maxValue.toFixed(3),
-                            minValue: item.minValue.toFixed(3),
-                            avalue: avalue,
-                            bvalue: bvalue,
-                            cvalue: cvalue,
-                            topLimit: topLimit
-                        }
-                        list.value.push(shuju)
-                    }
-                    //图列为频率等,上限
-                    if (item.phaiscType.length == 2) {
-                        let gvalue = []
-                        let topLimit = []
-                        item.maxValue = item.topLimit
-                        // item.minValue=item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    gvalue.push([])
-                                }
-                                //上限值
-                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
-                            }
-                            //数据为空
-                        } else {
-                            gvalue = []
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            minValue: item.minValue.toFixed(3),
-                            maxValue: item.maxValue.toFixed(3),
-                            gvalue: gvalue,
-                            topLimit: topLimit
-                        }
-                        list.value.push(shuju)
-                    }
-                } else {
-                    let shuju = {
-                        id: 'qushifenx' + i,
-                        title: item.lineName + '--' + item.targetName,
-                        wiringMethod: item.wiringMethod || '0',
-                        targetName: item.targetName,
-                        value: item.value,
-                        legend: item.phaiscType,
-                        valueName: item.unit[0],
-                        minValue: null,
-                        avalue: [],
-                        bvalue: [],
-                        cvalue: [],
-                        topLimit: [],
-                        lowerLimit: [],
-                        chufa: []
-                    }
-                    list.value.push(shuju)
-                }
-            }
-            //有下限值
-            if (item.topLimit == 0 && item.lowerLimit !== 0) {
-                item.phaiscType.push('下限')
-                if (item.minValue !== null) {
-                    //最小值等于下限值
-                    //图列为A,B,C,下限
-                    if (item.phaiscType.length == 4) {
-                        let avalue = []
-                        let bvalue = []
-                        let cvalue = []
-                        let lowerLimit = []
-                        // item.maxValue=item.topLimit
-                        item.minValue = item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    avalue.push([])
-                                }
-                                //判断存在缺失值b
-                                if (item.value[j][2] != undefined) {
-                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
-                                } else {
-                                    bvalue.push([])
-                                }
-                                //判断存在缺失值c
-                                if (item.value[j][3] != undefined) {
-                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
-                                } else {
-                                    cvalue.push([])
-                                }
-                                //下限值
-                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
-                            }
-                            //数据为空
-                        } else {
-                            avalue = []
-                            bvalue = []
-                            cvalue = []
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            minValue: item.minValue.toFixed(3),
-                            maxValue: item.maxValue.toFixed(3),
-                            avalue: avalue,
-                            bvalue: bvalue,
-                            cvalue: cvalue,
-                            lowerLimit: lowerLimit
-                        }
-                        list.value.push(shuju)
-                    }
-                    //图列为频率等,下限
-                    if (item.phaiscType.length == 2) {
-                        let gvalue = []
-                        let lowerLimit = []
-                        // item.maxValue=item.topLimit
-                        item.minValue = item.lowerLimit
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    gvalue.push([])
-                                }
-                                //下限值
-                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
-                            }
-                            //数据为空
-                        } else {
-                            gvalue = []
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            minValue: item.minValue.toFixed(3),
-                            maxValue: item.maxValue.toFixed(3),
-                            gvalue: gvalue,
-                            lowerLimit: lowerLimit
-                        }
-                        list.value.push(shuju)
-                    }
-                } else {
-                    let shuju = {
-                        id: 'qushifenx' + i,
-                        title: item.lineName + '--' + item.targetName,
-                        wiringMethod: item.wiringMethod || '0',
-                        targetName: item.targetName,
-                        value: item.value,
-                        legend: item.phaiscType,
-                        valueName: item.unit[0],
-                        minValue: null,
-                        avalue: [],
-                        bvalue: [],
-                        cvalue: [],
-                        topLimit: [],
-                        lowerLimit: [],
-                        chufa: []
-                    }
-                    list.value.push(shuju)
-                }
-            }
-            //无限值
-            if (item.topLimit == 0 && item.lowerLimit == 0) {
-                if (item.minValue !== null) {
-                    //最小值等于下限值
-                    //图列为A,B,C
-                    if (item.phaiscType.length == 3) {
-                        let avalue = []
-                        let bvalue = []
-                        let cvalue = []
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    avalue.push([])
-                                }
-                                //判断存在缺失值b
-                                if (item.value[j][2] != undefined) {
-                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
-                                } else {
-                                    bvalue.push([])
-                                }
-                                //判断存在缺失值c
-                                if (item.value[j][3] != undefined) {
-                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
-                                } else {
-                                    cvalue.push([])
-                                }
-                            }
-                            //数据为空
-                        } else {
-                            avalue = []
-                            bvalue = []
-                            cvalue = []
-                        }
-
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            minValue: item.minValue.toFixed(3),
-                            maxValue: item.maxValue.toFixed(3),
-                            avalue: avalue,
-                            bvalue: bvalue,
-                            cvalue: cvalue
-                        }
-                        list.value.push(shuju)
-                    }
-                    //图列为频率等
-                    if (item.phaiscType.length == 1) {
-                        let gvalue = []
-                        //判断数据是否存在
-                        if (item.value !== null) {
-                            for (let j = 0; j < item.value.length; j++) {
-                                //判断存在缺失值a
-                                if (item.value[j][1] != undefined) {
-                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
-                                } else {
-                                    gvalue.push([])
-                                }
-                            }
-                            //数据为空
-                        } else {
-                            gvalue = []
-                        }
-                        let shuju = {
-                            id: 'qushifenx' + i,
-                            title: item.lineName + '--' + item.targetName,
-                            wiringMethod: item.wiringMethod || '0',
-                            targetName: item.targetName,
-                            value: item.value,
-                            legend: item.phaiscType,
-                            valueName: item.unit[0],
-                            minValue: item.minValue.toFixed(3),
-                            maxValue: item.maxValue.toFixed(3),
-                            gvalue: gvalue
-                        }
-                        list.value.push(shuju)
-                    }
-                } else {
-                    let shuju = {
-                        id: 'qushifenx' + i,
-                        title: item.lineName + '--' + item.targetName,
-                        wiringMethod: item.wiringMethod || '0',
-                        targetName: item.targetName,
-                        value: item.value,
-                        legend: item.phaiscType,
-                        valueName: item.unit[0],
-                        minValue: null,
-                        avalue: [],
-                        bvalue: [],
-                        cvalue: [],
-                        topLimit: [],
-                        lowerLimit: [],
-                        chufa: []
-                    }
-                    list.value.push(shuju)
-                }
-            }
-        }
-    })
-    rendering()
-}
-const rendering = () => {
-    height.value = mainHeight(160, list.value.length > 3 ? 3 : list.value.length)
-
-    list.value.forEach((item: any) => {
-        if (item.targetName == '电压不平衡') {
-            item.valueName = ''
-            item.legend = item.legend.map((item2: any) => {
-                if (item2 == '零序电压') {
-                    item2 = item2 + '(V)'
-                } else if (item2 == '正序电压') {
-                    item2 = item2 + '(kV)'
-                } else if (item2 == '负序电压') {
-                    item2 = item2 + '(V)'
-                }
-                return item2
-            })
-        }
-
-        let opitonserise: any[] = []
-        item.legend.forEach((item2: any) => {
-            if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压(V)')) {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    smooth: true,
-                    itemStyle: {
-                        normal: {
-                            color: '#DAA520'
-                        }
-                    },
-
-                    data: item.avalue
-                }
-                opitonserise.push(data)
-            } else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压(kV)')) {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    smooth: true,
-                    itemStyle: {
-                        normal: {
-                            color: '#2E8B57'
-                        }
-                    },
-
-                    data: item.bvalue
-                }
-                opitonserise.push(data)
-            } else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压(V)')) {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    smooth: true,
-                    barWidth: 22,
-                    itemStyle: {
-                        normal: {
-                            color: '#A52a2a'
-                        }
-                    },
-                    data: item.cvalue
-                }
-                opitonserise.push(data)
-            } else if (item.topLimit !== undefined && item2 == '上限') {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    smooth: true,
-                    itemStyle: {
-                        normal: {
-                            color: '#FF33FF',
-                            lineStyle: {
-                                width: 2,
-                                color: '#FF33FF',
-                                type: 'dotted' //'dotted'虚线 'solid'实线
-                            }
-                        }
-                    },
-                    data: item.topLimit
-                }
-                opitonserise.push(data)
-            } else if (item.lowerLimit !== undefined && item2 == '下限') {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    smooth: true,
-                    barWidth: 22,
-                    itemStyle: {
-                        normal: {
-                            color: '#3399FF',
-                            lineStyle: {
-                                width: 2,
-                                color: '#3399FF',
-                                type: 'dotted' //'dotted'虚线 'solid'实线
-                            }
-                        }
-                    },
-                    data: item.lowerLimit
-                }
-                opitonserise.push(data)
-            } else if (item.chufa !== undefined && item2 == '暂态触发点') {
-                let data = {
-                    name: item2,
-                    type: 'scatter',
-                    symbol: `image://` + new URL('@/assets/point.png', import.meta.url).href,
-                    symbolSize: 16,
-                    itemStyle: {
-                        width: '22px',
-                        height: '22px'
-                    },
-                    data: item.chufa
-                }
-                opitonserise.push(data)
-            } else if (item.gvalue !== undefined && item2 == '频率') {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    smooth: true,
-                    itemStyle: {
-                        normal: {
-                            color: '#990099',
-                            lineStyle: {
-                                width: 2,
-                                color: '#990099',
-                                type: 'solid' //'dotted'虚线 'solid'实线
-                            }
-                        }
-                    },
-                    data: item.gvalue
-                }
-                opitonserise.push(data)
-            } else if (item.gvalue !== undefined && item2 == '负序电流') {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    barWidth: 22,
-                    itemStyle: {
-                        normal: {
-                            color: '#999933'
-                        }
-                    },
-                    data: item.gvalue
-                }
-                opitonserise.push(data)
-            } else if (item.gvalue !== undefined && item2 == '三相电压不平衡度') {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    barWidth: 22,
-                    itemStyle: {
-                        normal: {
-                            color: '#FF6600'
-                        }
-                    },
-                    data: item.gvalue
-                }
-                opitonserise.push(data)
-            } else if (
-                item.gvalue !== undefined &&
-                (item2 == '三相总有功功率' || item2 == '三相总无功功率' || item2 == '三相总视在功率')
-            ) {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    barWidth: 22,
-                    itemStyle: {
-                        normal: {
-                            color: '#0033ff'
-                        }
-                    },
-                    data: item.gvalue
-                }
-                opitonserise.push(data)
-            } else if (item.gvalue !== undefined && (item2 == '总视在功率因数' || item2 == '总位移功率因数')) {
-                let data = {
-                    name: item2,
-                    symbol: 'none',
-                    symbolSize: 5,
-                    type: 'line',
-                    barWidth: 22,
-                    itemStyle: {
-                        normal: {
-                            color: '#00FF00'
-                        }
-                    },
-
-                    data: item.gvalue
-                }
-                opitonserise.push(data)
-            }
-            // else {
-            //     opitonserise.push([])
-            // }
-        })
-        if (item.valueName == undefined) {
-            item.valueName = '无'
-        }
-        //console.log('渲染数据体',opitonserise)
-        item.serise = opitonserise
-    })
-    getEcharts()
-}
-const getEcharts = () => {
-    list.value.forEach((item: any, i: number) => {
-        console.log('🚀 ~ getEcharts ~ item:', item)
-
-        const values = item.value && item.value.length > 0 ? item.value.map(k => k[1]) : [0]
-        let [min, max] = yMethod([item.maxValue, item.minValue, ...values])
-        item.option = {
-            backgroundColor: '#fff',
-            title: {
-                left: 'center',
-                text: item.title,
-                subtext:
-                    item.wiringMethod == '1'
-                        ? item.targetName == '相电压有效值'
-                            ? '该监测点为三角型接线，相电压有效值没有数据'
-                            : ''
-                        : '', // 副标题
-                subtextStyle: {
-                    fontSize: 14,
-                    color: '#ff0000'
-                }
-            },
-            tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                    //type: "shadow",
-                    type: 'cross', // 默认为直线，可选为：'line' | 'shadow'
-                    label: {
-                        color: '#fff',
-                        fontSize: 16
-                    }
-                },
-                textStyle: {
-                    color: '#fff',
-                    fontStyle: 'normal',
-                    opacity: 0.35,
-                    fontSize: 14
-                },
-                backgroundColor: 'rgba(0,0,0,0.55)',
-
-                formatter: function (params: any) {
-                    let tips = ''
-                    tips += '时刻:' + params[0].data[0] + '</br/>'
-                    for (let i = 0; i < params.length; i++) {
-                        if (params[i].seriesName == '暂态触发点') {
-                            tips += ''
-                            return tips
-                        }
-                        if (params[i].seriesName == 'A相谐波电流方向') {
-                            tips +=
-                                params[i].marker + params[i].value[1] > 0
-                                    ? 'A相谐波电流方向:流入<br/>'
-                                    : params[i].value[1] == 0
-                                    ? 'A相谐波电流方向:无<br/>'
-                                    : 'A相谐波电流方向:流出<br/>'
-                        } else if (params[i].seriesName == 'B相谐波电流方向') {
-                            tips +=
-                                params[i].marker + params[i].value[1] > 0
-                                    ? 'B相谐波电流方向:流入<br/>'
-                                    : params[i].value[1] == 0
-                                    ? 'B相谐波电流方向:无<br/>'
-                                    : 'B相谐波电流方向:流出<br/>'
-                        } else if (params[i].seriesName == 'C相谐波电流方向') {
-                            tips +=
-                                params[i].marker + params[i].value[1] > 0
-                                    ? 'C相谐波电流方向:流入<br/>'
-                                    : params[i].value[1] == 0
-                                    ? 'C相谐波电流方向:无<br/>'
-                                    : 'C相谐波电流方向:流出<br/>'
-                        } else if (params[i].seriesName == '总谐波电流方向') {
-                            tips +=
-                                params[i].marker + params[i].value[1] > 0
-                                    ? '总谐波电流方向:流入<br/>'
-                                    : params[i].value[1] == 0
-                                    ? '总谐波电流方向:无<br/>'
-                                    : '总谐波电流方向:流出<br/>'
-                        } else if (params[i].seriesName == '正序电压(kV)') {
-                            let str = (params[i].value[1] * 1).toString()
-                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
-                            let str1 = str.replace(reg, '$1,')
-                            tips += params[i].marker + params[i].seriesName.replace('(kV)', '') + ':' + str1 + 'kV<br/>'
-                        } else if (params[i].seriesName == '零序电压(V)' || params[i].seriesName == '负序电压(V)') {
-                            let str = (params[i].value[1] * 1).toString()
-                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
-                            let str1 = str.replace(reg, '$1,')
-                            tips += params[i].marker + params[i].seriesName.replace('(V)', '') + ':' + str1 + 'V<br/>'
-                        } else if (params[i].seriesName !== '正序电压(kV)') {
-                            let str = (params[i].value[1] * 1).toString()
-                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
-                            let str1 = str.replace(reg, '$1,')
-                            tips += params[i].marker + params[i].seriesName + ':' + str1 + '<br/>'
-                        } else {
-                            let str = (params[i].value[2] * 1).toString()
-                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
-                            let str1 = str.replace(reg, '$1,')
-                            tips += params[i].marker + params[i].seriesName + ':' + str1 + '<br/>'
-
-                            let str2 = (params[i].value[3] * 1).toString()
-                            let reg2 = str2.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
-                            let str12 = str.replace(reg2, '$1,')
-                            // if(params[i].seriesName){
-
-                            // }
-                            tips += params[i].marker + params[i].seriesName + ':' + str12 + '<br/>'
-                        }
-                    }
-
-                    return tips
-                }
-            },
-            toolbox: {
-                right: 20,
-                top: 15,
-                show: i == 0 ? true : false,
-                feature: {
-                    // 移除默认的 saveAsImage
-                    // saveAsImage: { title: '保存图片' }
-                    myCustomDownload: {
-                        title: '', // 按钮标题
-                        icon: 'path://M892.342857 463.238095l-73.142857-68.266666-258.438095 258.438095V29.257143h-97.52381v624.152381L204.8 394.971429 131.657143 463.238095l380.342857 380.342857zM107.27619 897.219048h804.571429v97.523809H107.27619z', // 自定义图标路径
-
-                        onclick: function () {
-                            html2canvas(document.getElementById('canvas'), {
-                                scale: 1
-                            }).then(function (canvas) {
-                                // 创建a标签，实现下载
-                                let creatIMg = document.createElement('a')
-                                creatIMg.download = '稳态数据分析.png' // 设置下载的文件名，
-                                creatIMg.href = canvas.toDataURL() // 下载url
-                                creatIMg.click()
-                                creatIMg.remove() // 下载之后把创建的元素删除
-                            })
-                        }
-                    }
-                }
-            },
-            legend: {
-                right: 50,
-                top: 25,
-                verticalAlign: 'top',
-                enabled: true,
-                itemDistance: 5,
-                textStyle: {
-                    rich: {
-                        a: {
-                            verticalAlign: 'middle'
-                        }
-                    },
-
-                    padding: [0, 0, 0, 0] //[上、右、下、左]
-                }
-            },
-            grid: {
-                top: '70px'
-            },
-            xAxis: [
-                {
-                    name: '时间',
-                    type: 'time',
-                    axisLine: {
-                        show: true,
-                        onZero: false
-                    },
-                    axisLabel: {
-                        textStyle: {
-                            fontFamily: 'dinproRegular'
-                        }
-                    }
-                }
-            ],
-            // toolbox: {
-            //     show: true,
-            //     feature: {
-            //         dataZoom: {
-            //             // bottom: '10px',
-            //             yAxisIndex: 'none'
-            //         }
-            //     }
-            // },
-            yAxis: [
-                {
-                    type: 'value',
-
-                    min: min,
-                    max: max,
-                    name: item.valueName,
-                    minInterval: 1,
-                    // max:10,
-                    // min:0,
-                    // axisLabel: {
-                    //     interval: 0,
-                    //     // formatter: function (value: any) {
-                    //     //     return value.toFixed(0)
-                    //     // },
-                    //     left: '20px'
-                    // },
-
-                    axisLine: {
-                        show: true,
-                        onZero: false, //-----------重点
-                        lineStyle: {}
-                    }
-                    // splitLine: {
-                    //     lineStyle: {
-                    //         // 使用深浅的间隔色
-                    //         type: 'dashed',
-                    //         opacity: 0.5
-                    //     }
-                    // }
-                }
-            ],
-            series: item.serise
-        }
-        let aValues = []
-        let bValues = []
-        let CValues = []
-        let ZValues = []
-
-        if (
-            traceability.value.length > 0 &&
-            traceability.value[0].value != null &&
-            traceability.value[0].value.length > 0
-        ) {
-            for (let i = 0; i < traceability.value[0].value.length; i++) {
-                let T = traceability.value[0].value[i][0]
-                let A = traceability.value[0].value[i][1]
-                let B = traceability.value[0].value[i][2]
-                let C = traceability.value[0].value[i][3]
-                let Z = A + B + C
-                aValues.push([T, A > 0 ? 1 : A == 0 ? 0 : -1])
-                bValues.push([T, B > 0 ? 1 : B == 0 ? 0 : -1])
-                CValues.push([T, C > 0 ? 1 : C == 0 ? 0 : -1])
-                ZValues.push([T, Z > 0 ? 1 : Z == 0 ? 0 : -1])
-            }
-        }
-
-        if (item.targetName == '谐波电流方向') {
-            item.option.tooltip.axisPointer = null
-            item.option.yAxis[0] = {
-                type: 'value',
-                interval: 1,
-                min: -2, //最小值
-                max: 2,
-                axisLine: {
-                    show: true,
-                    onZero: false //-----------重点
-                },
-                splitLine: {
-                    lineStyle: {
-                        // 使用深浅的间隔色
-                        type: 'dashed',
-                        opacity: 0.5
-                    }
-                },
-                axisLabel: {
-                    formatter: function (value: any) {
-                        if (value == 0) {
-                            return '无'
-                        } else if (value == -1) {
-                            return '流出'
-                        } else if (value == 1) {
-                            return '流入'
-                        }
-                    }
-                }
-            }
-            item.option.series = [
-                {
-                    name: 'A相谐波电流方向',
-                    type: 'line',
-
-                    data: aValues,
-                    symbol: 'none',
-                    symbolSize: 0,
-                    itemStyle: {
-                        normal: {
-                            color: '#DAA520'
-                        }
-                    }
-                },
-                {
-                    name: 'B相谐波电流方向',
-                    type: 'line',
-
-                    data: bValues,
-                    symbol: 'none',
-                    symbolSize: 0,
-                    itemStyle: {
-                        normal: {
-                            color: '#2E8B57'
-                        }
-                    }
-                },
-                {
-                    name: 'C相谐波电流方向',
-                    type: 'line',
-
-                    data: CValues,
-                    symbol: 'none',
-                    symbolSize: 0,
-                    itemStyle: {
-                        normal: {
-                            color: '#A52a2a'
-                        }
-                    }
-                },
-                {
-                    name: '总谐波电流方向',
-                    type: 'line',
-
-                    data: ZValues,
-                    symbol: 'none',
-                    symbolSize: 0,
-                    itemStyle: {
-                        normal: {
-                            color: '#0033ff'
-                        }
-                    }
-                }
-            ]
-        }
-    })
-    echarts.connect('group')
-}
-const conditionChange = () => {
-    console.log(123)
-
-    //判断一个指标时
-    if (formData.condition.length == 1) {
-        if (
-            formData.condition.includes('40') ||
-            formData.condition.includes('43') ||
-            formData.condition.includes('44') ||
-            formData.condition.includes('50') ||
-            formData.condition.includes('39') ||
-            formData.condition.includes('51') ||
-            formData.condition.includes('52') ||
-            formData.condition.includes('45')
-        ) {
-            showXieBoCiShu.value = true
-        } else {
-            showXieBoCiShu.value = false
-        }
-        if (
-            formData.condition.includes('46') ||
-            //formData.condition.includes('47') ||
-            // formData.condition.includes('48') ||
-            formData.condition.includes('49')
-        ) {
-            showJianXieBoCiShu.value = true
-        } else {
-            showJianXieBoCiShu.value = false
-        }
-    }
-    //判断2个指标时
-    if (formData.condition.length == 2) {
-        if (
-            formData.condition.includes('40') ||
-            formData.condition.includes('43') ||
-            formData.condition.includes('44') ||
-            (formData.condition.includes('45') && formData.condition.includes('46')) ||
-            //formData.condition.includes('47') ||
-            // formData.condition.includes('48') ||
-            formData.condition.includes('49') ||
-            formData.condition.includes('50') ||
-            formData.condition.includes('39') ||
-            formData.condition.includes('51') ||
-            formData.condition.includes('52')
-        ) {
-            showXieBoCiShu.value = true
-            showJianXieBoCiShu.value = true
-        }
-        if (
-            formData.condition.includes('40') ||
-            formData.condition.includes('43') ||
-            formData.condition.includes('44') ||
-            formData.condition.includes('45') ||
-            formData.condition.includes('50') ||
-            formData.condition.includes('39') ||
-            formData.condition.includes('51') ||
-            formData.condition.includes('52')
-        ) {
-            showXieBoCiShu.value = true
-        } else {
-            showXieBoCiShu.value = false
-        }
-        if (
-            formData.condition.includes('46') ||
-            //formData.condition.includes('47') ||
-            // formData.condition.includes('48') ||
-            formData.condition.includes('49')
-        ) {
-            showJianXieBoCiShu.value = true
-        } else {
-            showJianXieBoCiShu.value = false
-        }
-    }
-    //判断3个指标时
-    if (formData.condition.length == 3) {
-        if (
-            (formData.condition.includes('40') ||
-                formData.condition.includes('43') ||
-                formData.condition.includes('44') ||
-                formData.condition.includes('50') ||
-                formData.condition.includes('39') ||
-                formData.condition.includes('51') ||
-                formData.condition.includes('52') ||
-                formData.condition.includes('45')) &&
-            (formData.condition.includes('46') ||
-                //formData.condition.includes('47') ||
-                // formData.condition.includes('48') ||
-                formData.condition.includes('49'))
-        ) {
-            showXieBoCiShu.value = true
-            showJianXieBoCiShu.value = true
-        } else {
-            showXieBoCiShu.value = false
-            showJianXieBoCiShu.value = false
-        }
-        if (
-            formData.condition.includes('46') ||
-            //formData.condition.includes('47') ||
-            // formData.condition.includes('48') ||
-            formData.condition.includes('49')
-        ) {
-            showJianXieBoCiShu.value = true
-        } else {
-            showJianXieBoCiShu.value = false
-        }
-        if (
-            formData.condition.includes('40') ||
-            formData.condition.includes('43') ||
-            formData.condition.includes('44') ||
-            formData.condition.includes('45') ||
-            formData.condition.includes('50') ||
-            formData.condition.includes('39') ||
-            formData.condition.includes('51') ||
-            formData.condition.includes('52')
-        ) {
-            showXieBoCiShu.value = true
-        } else {
-            showXieBoCiShu.value = false
-        }
-    }
-    //判断无指标时
-    if (formData.condition.length == 0) {
-        showJianXieBoCiShu.value = false
-        showXieBoCiShu.value = false
-    }
-    //根据指标判断值类型
-    if (formData.condition.includes('60') || formData.condition.includes('61') || formData.condition.includes('62')) {
-        typeOptions.value = [{ label: '平均值', value: 1 }]
-        formData.valueType = 1
-    } else {
-        typeOptions.value = [
-            { label: '平均值', value: 1 },
-            { label: '最小值', value: 2 },
-            { label: '最大值', value: 3 },
-            { label: 'cp95值', value: 4 }
-        ]
-    }
-    setTimeout(() => {
-        // console.log('🚀 ~ setTimeout ~  tableHeaderRef.value:', tableHeaderRef.value)
-
-        tableHeaderRef.value && tableHeaderRef.value?.computedSearchRow()
-    }, 100)
-}
-
-// 点击暂降触发点
-const triggerPoint = (data: any) => {
-    let nameList = monitoringPoint.state.lineName.split('>')
-
-    view.value = false
-    setTimeout(() => {
-        queryEventDetailByEventId({ eventId: data[2] }).then(res => {
-            waveFormRef.value.open({
-                ...res.data,
-                subName: nameList[nameList.length - 2].split('（')[0] || nameList[nameList.length - 2],
-                lineName: nameList[nameList.length - 1].split('_')[1] || nameList[nameList.length - 1]
-            })
-            waveFormRef.value.setHeight(220, 180)
-        })
-    }, 100)
-}
-// 计算高度
-const selectChange = (flag: boolean) => {
-    // const height1: any = ref(mainHeight(160))
-    height1.value = mainHeight(flag ? 220 : 160)
-    height.value = mainHeight(flag ? 220 : 160, list.value.length > 3 ? 3 : list.value.length)
-}
-const backbxlb = () => {
-    view.value = true
-}
-provide('tableStore', tableStore)
-onBeforeUnmount(() => {
-    echarts.disconnect('group')
-})
-</script>
-<style></style>
+<template>
+    <div>
+        <div v-show="view">
+            <TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
+                <template v-slot:select>
+                    <el-form-item label="多监测点">
+                        <el-checkbox v-model="checked" @change="checkChange" />
+                    </el-form-item>
+                    <el-form-item label="日期">
+                        <DatePicker ref="datePickerRef" :theCurrentTime="true"></DatePicker>
+                    </el-form-item>
+                    <el-form-item label="指标类型:">
+                        <el-select
+                            v-model="formData.condition"
+                            multiple
+                            collapse-tags
+                            :multiple-limit="checked ? 1 : 3"
+                            filterable
+                            placeholder="请选择指标"
+                            @change="conditionChange"
+                        >
+                            <el-option-group v-for="group in indexOptions" :key="group.label" :label="group.label">
+                                <el-option
+                                    v-for="item in group.options"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-option>
+                            </el-option-group>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="数值类型:">
+                        <el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型">
+                            <el-option
+                                v-for="item in typeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="谐波次数:" v-show="showXieBoCiShu">
+                        <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波">
+                            <el-option
+                                v-for="item in harmonicOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item v-show="showJianXieBoCiShu" label="间谐波次数:">
+                        <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波">
+                            <el-option
+                                v-for="item in inharmonicOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <template v-slot:operation>
+                    <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
+                </template>
+            </TableHeader>
+            <!-- <el-form :inline="true">
+           
+        </el-form> -->
+            <div
+                id="canvas"
+                class="mt10"
+                :style="height1"
+                style="overflow-y: auto; overflow-x: hidden"
+                v-loading="loading"
+            >
+                <my-echart
+                    :options="item.option"
+                    v-for="item in list"
+                    style="min-height: 190px"
+                    :style="height"
+                    @triggerPoint="triggerPoint"
+                    @group="group"
+                />
+            </div>
+        </div>
+        <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
+            <waveForm ref="waveFormRef" senior @backbxlb="backbxlb" />
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { nextTick, onMounted, reactive, ref, onBeforeUnmount } from 'vue'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+import { indexOptions, harmonicOptions, inharmonicOptions } from '@/utils/dictionary'
+import { getHistoryResult } from '@/api/harmonic-boot/harmonic'
+import { mainHeight } from '@/utils/layout'
+import TableHeader from '@/components/table/header/index.vue'
+import { queryEventDetailByEventId } from '@/api/event-boot/highAndLowPressure'
+import TableStore from '@/utils/tableStore'
+import waveForm from '@/components/echarts/waveForm.vue'
+import html2canvas from 'html2canvas'
+import { ElMessage } from 'element-plus'
+import { yMethod, completeTimeSeries } from '@/utils/echartMethod'
+import * as echarts from 'echarts' // 全引入
+import { min } from 'xe-utils'
+const datePickerRef = ref()
+const monitoringPoint = useMonitoringPoint()
+const checked = ref(monitoringPoint.state.showCheckBox)
+const loading = ref(true)
+const formData = reactive<{
+    lineId: string[]
+    searchBeginTime: string
+    searchEndTime: string
+    condition: string[]
+    valueType: number
+    harmonic: number
+    inHarmonic: number
+    ptType: number
+}>({
+    lineId: [],
+    searchBeginTime: '',
+    searchEndTime: '',
+    condition: ['10', '11', '12'],
+    valueType: 1,
+    harmonic: 1,
+    inHarmonic: 1,
+    ptType: 0
+})
+const wp = ref({})
+const pageHeight = mainHeight(20)
+const view = ref(true)
+const waveFormRef = ref()
+const tableStore = new TableStore({
+    url: '',
+    method: 'POST',
+    column: []
+})
+const tableData = ref([])
+const tableHeaderRef = ref()
+const options = ref({})
+const traceability = ref<any>([])
+const list = ref<any>([])
+const showXieBoCiShu = ref(false)
+const showJianXieBoCiShu = ref(false)
+const typeOptions = ref([
+    { label: '平均值', value: 1 },
+    { label: '最小值', value: 2 },
+    { label: '最大值', value: 3 },
+    { label: 'cp95值', value: 4 }
+])
+onMounted(() => {
+    datePickerRef.value.setTheDate(5)
+    init()
+})
+const height: any = ref(mainHeight(200, 1))
+const height1: any = ref(mainHeight(160))
+const checkChange = () => {
+    if (checked.value) {
+        monitoringPoint.setShowCheckBox(true)
+        if (formData.condition.length > 0) {
+            formData.condition = formData.condition.slice(0, 1)
+        }
+    } else {
+        monitoringPoint.setShowCheckBox(false)
+        init()
+    }
+}
+const group = (e: any) => {
+    e.group = 'group'
+}
+const init = () => {
+    if (formData.condition.length == 0) {
+        return ElMessage.warning('请选择指标类型')
+    }
+
+    formData.lineId = checked.value ? monitoringPoint.state.lineIds : [monitoringPoint.state.lineId]
+    formData.searchBeginTime = datePickerRef.value.timeValue[0]
+    formData.searchEndTime = datePickerRef.value.timeValue[1]
+    if (formData.lineId.length > 3) {
+        return ElMessage.warning('最多只能选择3个监测点')
+    }
+    loading.value = true
+    let directionValue = formData.condition.findIndex(item => {
+        if (item === '39') {
+            item = '50'
+            return true
+        } else {
+            return false
+        }
+    })
+
+    getHistoryResult(formData)
+        .then(async (res: any) => {
+            if (directionValue >= 0) {
+                res.data[directionValue].targetName = '谐波电流方向'
+                traceability.value = [(res.data as [])[directionValue]]
+            }
+            list.value = []
+            await shujuchuli(res)
+            await selectChange(tableHeaderRef.value.showSelect)
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+const shujuchuli = (res: any) => {
+    let shujuData = res.data
+    tableData.value = res.data
+    shujuData.forEach((item: any, i: number) => {
+        //判断是否存在暂降点
+
+        if (item.eventDetail !== null || item.eventDetail.length === 0) {
+            //向项别中添加暂降点
+            let chufa = []
+            item.phaiscType.push('暂态触发点')
+            //判断是否有限值(有上下限)
+            if (item.topLimit !== 0 && item.lowerLimit !== 0) {
+                item.phaiscType.push('上限')
+                item.phaiscType.push('下限')
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+
+                    //图列为A,B,C,暂降,上限,下限
+                    if (item.phaiscType.length == 6) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let topLimit = []
+                        let lowerLimit = []
+                        item.maxValue = item.topLimit
+                        item.minValue = item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //上下限值
+                                topLimit.push([item.value[j][0], item.topLimit])
+                                lowerLimit.push([item.value[j][0], item.lowerLimit])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            topLimit: topLimit,
+                            lowerLimit: lowerLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,暂降,上限,下限
+                    if (item.phaiscType.length == 4) {
+                        let gvalue = []
+                        let topLimit = []
+                        let lowerLimit = []
+                        item.maxValue = item.topLimit
+                        item.minValue = item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //上下限值
+                                topLimit.push([item.value[j][0], item.topLimit])
+                                lowerLimit.push([item.value[j][0], item.lowerLimit])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            gvalue: gvalue,
+                            topLimit: topLimit,
+                            lowerLimit: lowerLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        wiringMethod: item.wiringMethod || '0',
+                        targetName: item.targetName,
+                        value: item.value,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //有上限值
+            if (item.topLimit !== 0 && item.lowerLimit == 0) {
+                item.phaiscType.push('上限')
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,暂降,上限
+                    if (item.phaiscType.length == 5) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let topLimit = []
+                        item.maxValue = item.topLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //上限值
+                                topLimit.push([item.value[j][0], item.topLimit])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            topLimit: topLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,暂降,上限
+                    if (item.phaiscType.length == 3) {
+                        let gvalue = []
+                        let topLimit = []
+                        item.maxValue = item.topLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //上限值
+                                topLimit.push([item.value[j][0], item.topLimit])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            gvalue: gvalue,
+                            topLimit: topLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        wiringMethod: item.wiringMethod || '0',
+                        targetName: item.targetName,
+                        value: item.value,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //有下限值
+            if (item.topLimit == 0 && item.lowerLimit !== 0) {
+                item.phaiscType.push('下限')
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,暂降,下限
+                    if (item.phaiscType.length == 5) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let lowerLimit = []
+                        item.minValue = item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //下限值
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            lowerLimit: lowerLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,暂降,下限
+                    if (item.phaiscType.length == 3) {
+                        let gvalue = []
+                        let lowerLimit = []
+                        item.minValue = item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //下限值
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            gvalue: gvalue,
+                            lowerLimit: lowerLimit,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        wiringMethod: item.wiringMethod || '0',
+                        targetName: item.targetName,
+                        value: item.value,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //无限值
+            if (item.topLimit == 0 && item.lowerLimit == 0) {
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,暂降
+                    if (item.phaiscType.length == 4) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue > 1 ? (item.minValue - 0.5).toFixed(3) : item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,暂降
+                    if (item.phaiscType.length == 2) {
+                        let gvalue = []
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        //不存在一个暂降点或1个 //处理暂降点
+                        if (item.eventDetail.length > 0) {
+                            for (let k = 0; k < item.eventDetail.length; k++) {
+                                chufa.push([
+                                    item.eventDetail[k].time,
+                                    item.minValue.toFixed(3),
+                                    item.eventDetail[k].id,
+                                    99
+                                ])
+                            }
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            gvalue: gvalue,
+                            chufa: chufa
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        wiringMethod: item.wiringMethod || '0',
+                        targetName: item.targetName,
+                        value: item.value,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+        } else if (item.eventDetail == null) {
+            //判断是否有限值(有上下限)
+            if (item.topLimit !== 0 && item.lowerLimit !== 0) {
+                item.phaiscType.push('上限')
+                item.phaiscType.push('下限')
+                if (item.minValue !== null && item.maxValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,上限,下限
+                    if (item.phaiscType.length == 5) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let topLimit = []
+                        let lowerLimit = []
+                        item.maxValue = item.topLimit
+                        item.minValue = item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //上下限值
+                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            topLimit: topLimit,
+                            lowerLimit: lowerLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,上限,下限
+                    if (item.phaiscType.length == 3) {
+                        let gvalue = []
+                        let topLimit = []
+                        let lowerLimit = []
+                        item.maxValue = item.topLimit
+                        item.minValue = item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //上下限值
+                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            gvalue: gvalue,
+                            topLimit: topLimit,
+                            lowerLimit: lowerLimit,
+                            chufa: []
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        wiringMethod: item.wiringMethod || '0',
+                        targetName: item.targetName,
+                        value: item.value,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //有上限值
+            if (item.topLimit !== 0 && item.lowerLimit == 0) {
+                item.phaiscType.push('上限')
+                if (item.minValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,上限
+                    if (item.phaiscType.length == 4) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let topLimit = []
+                        item.maxValue = item.topLimit
+                        // item.minValue=item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //上限值
+                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            maxValue: item.maxValue.toFixed(3),
+                            minValue: item.minValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            topLimit: topLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,上限
+                    if (item.phaiscType.length == 2) {
+                        let gvalue = []
+                        let topLimit = []
+                        item.maxValue = item.topLimit
+                        // item.minValue=item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //上限值
+                                topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            gvalue: gvalue,
+                            topLimit: topLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        wiringMethod: item.wiringMethod || '0',
+                        targetName: item.targetName,
+                        value: item.value,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //有下限值
+            if (item.topLimit == 0 && item.lowerLimit !== 0) {
+                item.phaiscType.push('下限')
+                if (item.minValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C,下限
+                    if (item.phaiscType.length == 4) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        let lowerLimit = []
+                        // item.maxValue=item.topLimit
+                        item.minValue = item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                                //下限值
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue,
+                            lowerLimit: lowerLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等,下限
+                    if (item.phaiscType.length == 2) {
+                        let gvalue = []
+                        let lowerLimit = []
+                        // item.maxValue=item.topLimit
+                        item.minValue = item.lowerLimit
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                                //下限值
+                                lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            gvalue: gvalue,
+                            lowerLimit: lowerLimit
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        wiringMethod: item.wiringMethod || '0',
+                        targetName: item.targetName,
+                        value: item.value,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+            //无限值
+            if (item.topLimit == 0 && item.lowerLimit == 0) {
+                if (item.minValue !== null) {
+                    //最小值等于下限值
+                    //图列为A,B,C
+                    if (item.phaiscType.length == 3) {
+                        let avalue = []
+                        let bvalue = []
+                        let cvalue = []
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    avalue.push([])
+                                }
+                                //判断存在缺失值b
+                                if (item.value[j][2] != undefined) {
+                                    bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
+                                } else {
+                                    bvalue.push([])
+                                }
+                                //判断存在缺失值c
+                                if (item.value[j][3] != undefined) {
+                                    cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
+                                } else {
+                                    cvalue.push([])
+                                }
+                            }
+                            //数据为空
+                        } else {
+                            avalue = []
+                            bvalue = []
+                            cvalue = []
+                        }
+
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            avalue: avalue,
+                            bvalue: bvalue,
+                            cvalue: cvalue
+                        }
+                        list.value.push(shuju)
+                    }
+                    //图列为频率等
+                    if (item.phaiscType.length == 1) {
+                        let gvalue = []
+                        //判断数据是否存在
+                        if (item.value !== null) {
+                            for (let j = 0; j < item.value.length; j++) {
+                                //判断存在缺失值a
+                                if (item.value[j][1] != undefined) {
+                                    gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
+                                } else {
+                                    gvalue.push([])
+                                }
+                            }
+                            //数据为空
+                        } else {
+                            gvalue = []
+                        }
+                        let shuju = {
+                            id: 'qushifenx' + i,
+                            title: item.lineName + '--' + item.targetName,
+                            wiringMethod: item.wiringMethod || '0',
+                            targetName: item.targetName,
+                            value: item.value,
+                            legend: item.phaiscType,
+                            valueName: item.unit[0],
+                            minValue: item.minValue.toFixed(3),
+                            maxValue: item.maxValue.toFixed(3),
+                            gvalue: gvalue
+                        }
+                        list.value.push(shuju)
+                    }
+                } else {
+                    let shuju = {
+                        id: 'qushifenx' + i,
+                        title: item.lineName + '--' + item.targetName,
+                        wiringMethod: item.wiringMethod || '0',
+                        targetName: item.targetName,
+                        value: item.value,
+                        legend: item.phaiscType,
+                        valueName: item.unit[0],
+                        minValue: null,
+                        avalue: [],
+                        bvalue: [],
+                        cvalue: [],
+                        topLimit: [],
+                        lowerLimit: [],
+                        chufa: []
+                    }
+                    list.value.push(shuju)
+                }
+            }
+        }
+    })
+    rendering()
+}
+const rendering = () => {
+    height.value = mainHeight(160, list.value.length > 3 ? 3 : list.value.length)
+
+    list.value.forEach((item: any) => {
+        if (item.targetName == '电压不平衡') {
+            item.valueName = ''
+            item.legend = item.legend.map((item2: any) => {
+                if (item2 == '零序电压') {
+                    item2 = item2 + '(V)'
+                } else if (item2 == '正序电压') {
+                    item2 = item2 + '(kV)'
+                } else if (item2 == '负序电压') {
+                    item2 = item2 + '(V)'
+                }
+                return item2
+            })
+        }
+
+        let opitonserise: any[] = []
+        item.legend.forEach((item2: any) => {
+            if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压(V)')) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    itemStyle: {
+                        normal: {
+                            color: '#DAA520'
+                        }
+                    },
+
+                    data: item.avalue
+                }
+                opitonserise.push(data)
+            } else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压(kV)')) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    itemStyle: {
+                        normal: {
+                            color: '#2E8B57'
+                        }
+                    },
+
+                    data: item.bvalue
+                }
+                opitonserise.push(data)
+            } else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压(V)')) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#A52a2a'
+                        }
+                    },
+                    data: item.cvalue
+                }
+                opitonserise.push(data)
+            } else if (item.topLimit !== undefined && item2 == '上限') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    itemStyle: {
+                        normal: {
+                            color: '#FF33FF',
+                            lineStyle: {
+                                width: 2,
+                                color: '#FF33FF',
+                                type: 'dotted' //'dotted'虚线 'solid'实线
+                            }
+                        }
+                    },
+                    data: item.topLimit
+                }
+                opitonserise.push(data)
+            } else if (item.lowerLimit !== undefined && item2 == '下限') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#3399FF',
+                            lineStyle: {
+                                width: 2,
+                                color: '#3399FF',
+                                type: 'dotted' //'dotted'虚线 'solid'实线
+                            }
+                        }
+                    },
+                    data: item.lowerLimit
+                }
+                opitonserise.push(data)
+            } else if (item.chufa !== undefined && item2 == '暂态触发点') {
+                let data = {
+                    name: item2,
+                    type: 'scatter',
+                    symbol: `image://` + new URL('@/assets/point.png', import.meta.url).href,
+                    symbolSize: 16,
+                    itemStyle: {
+                        width: '22px',
+                        height: '22px'
+                    },
+                    data: item.chufa
+                }
+                opitonserise.push(data)
+            } else if (item.gvalue !== undefined && item2 == '频率') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    smooth: true,
+                    itemStyle: {
+                        normal: {
+                            color: '#990099',
+                            lineStyle: {
+                                width: 2,
+                                color: '#990099',
+                                type: 'solid' //'dotted'虚线 'solid'实线
+                            }
+                        }
+                    },
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            } else if (item.gvalue !== undefined && item2 == '负序电流') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#999933'
+                        }
+                    },
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            } else if (item.gvalue !== undefined && item2 == '三相电压不平衡度') {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#FF6600'
+                        }
+                    },
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            } else if (
+                item.gvalue !== undefined &&
+                (item2 == '三相总有功功率' || item2 == '三相总无功功率' || item2 == '三相总视在功率')
+            ) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#0033ff'
+                        }
+                    },
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            } else if (item.gvalue !== undefined && (item2 == '总视在功率因数' || item2 == '总位移功率因数')) {
+                let data = {
+                    name: item2,
+                    symbol: 'none',
+                    symbolSize: 5,
+                    type: 'line',
+                    barWidth: 22,
+                    itemStyle: {
+                        normal: {
+                            color: '#00FF00'
+                        }
+                    },
+
+                    data: item.gvalue
+                }
+                opitonserise.push(data)
+            }
+            // else {
+            //     opitonserise.push([])
+            // }
+        })
+        if (item.valueName == undefined) {
+            item.valueName = '无'
+        }
+        //console.log('渲染数据体',opitonserise)
+        item.serise = opitonserise
+    })
+    getEcharts()
+}
+const getEcharts = () => {
+    list.value.forEach((item: any, i: number) => {
+        console.log('🚀 ~ getEcharts ~ item:', item)
+
+        const values = item.value && item.value.length > 0 ? item.value.map(k => k[1]) : [0]
+        let [min, max] = yMethod([item.maxValue, item.minValue, ...values])
+        item.option = {
+            backgroundColor: '#fff',
+            title: {
+                left: 'center',
+                text: item.title,
+                subtext:
+                    item.wiringMethod == '1'
+                        ? item.targetName == '相电压有效值'
+                            ? '该监测点为三角型接线，相电压有效值没有数据'
+                            : ''
+                        : '', // 副标题
+                subtextStyle: {
+                    fontSize: 14,
+                    color: '#ff0000'
+                }
+            },
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    //type: "shadow",
+                    type: 'cross', // 默认为直线，可选为：'line' | 'shadow'
+                    label: {
+                        color: '#fff',
+                        fontSize: 16
+                    }
+                },
+                textStyle: {
+                    color: '#fff',
+                    fontStyle: 'normal',
+                    opacity: 0.35,
+                    fontSize: 14
+                },
+                backgroundColor: 'rgba(0,0,0,0.55)',
+
+                formatter: function (params: any) {
+                    let tips = ''
+                    tips += '时刻:' + params[0].data[0] + '</br/>'
+                    for (let i = 0; i < params.length; i++) {
+                        if (params[i].seriesName == '暂态触发点') {
+                            tips += ''
+                            return tips
+                        }
+                        if (params[i].seriesName == 'A相谐波电流方向') {
+                            tips +=
+                                params[i].marker + params[i].value[1] > 0
+                                    ? 'A相谐波电流方向:流入<br/>'
+                                    : params[i].value[1] == 0
+                                    ? 'A相谐波电流方向:无<br/>'
+                                    : 'A相谐波电流方向:流出<br/>'
+                        } else if (params[i].seriesName == 'B相谐波电流方向') {
+                            tips +=
+                                params[i].marker + params[i].value[1] > 0
+                                    ? 'B相谐波电流方向:流入<br/>'
+                                    : params[i].value[1] == 0
+                                    ? 'B相谐波电流方向:无<br/>'
+                                    : 'B相谐波电流方向:流出<br/>'
+                        } else if (params[i].seriesName == 'C相谐波电流方向') {
+                            tips +=
+                                params[i].marker + params[i].value[1] > 0
+                                    ? 'C相谐波电流方向:流入<br/>'
+                                    : params[i].value[1] == 0
+                                    ? 'C相谐波电流方向:无<br/>'
+                                    : 'C相谐波电流方向:流出<br/>'
+                        } else if (params[i].seriesName == '总谐波电流方向') {
+                            tips +=
+                                params[i].marker + params[i].value[1] > 0
+                                    ? '总谐波电流方向:流入<br/>'
+                                    : params[i].value[1] == 0
+                                    ? '总谐波电流方向:无<br/>'
+                                    : '总谐波电流方向:流出<br/>'
+                        } else if (params[i].seriesName == '正序电压(kV)') {
+                            let str = (params[i].value[1] * 1).toString()
+                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str1 = str.replace(reg, '$1,')
+                            tips +=
+                                params[i].marker +
+                                params[i].seriesName.replace('(kV)', '') +
+                                ':' +
+                                (Number.isNaN(Number(str1)) ? '/' : str1) +
+                                'kV<br/>'
+                        } else if (params[i].seriesName == '零序电压(V)' || params[i].seriesName == '负序电压(V)') {
+                            let str = (params[i].value[1] * 1).toString()
+                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str1 = str.replace(reg, '$1,')
+                            tips +=
+                                params[i].marker +
+                                params[i].seriesName.replace('(V)', '') +
+                                ':' +
+                                (Number.isNaN(Number(str1)) ? '/' : str1) +
+                                'V<br/>'
+                        } else if (params[i].seriesName !== '正序电压(kV)') {
+                            let str = (params[i].value[1] * 1).toString()
+                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str1 = str.replace(reg, '$1,')
+                            tips +=
+                                params[i].marker +
+                                params[i].seriesName +
+                                ':' +
+                                (Number.isNaN(Number(str1)) ? '/' : str1) +
+                                '<br/>'
+                        } else {
+                            let str = (params[i].value[2] * 1).toString()
+                            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str1 = str.replace(reg, '$1,')
+                            tips +=
+                                params[i].marker +
+                                params[i].seriesName +
+                                ':' +
+                                (Number.isNaN(Number(str1)) ? '/' : str1) +
+                                '<br/>'
+
+                            let str2 = (params[i].value[3] * 1).toString()
+                            let reg2 = str2.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
+                            let str12 = str.replace(reg2, '$1,')
+                            // if(params[i].seriesName){
+
+                            // }
+                            tips +=
+                                params[i].marker +
+                                params[i].seriesName +
+                                ':' +
+                                (Number.isNaN(Number(str2)) ? '/' : str2) +
+                                '<br/>'
+                        }
+                    }
+
+                    return tips
+                }
+            },
+            toolbox: {
+                right: 20,
+                top: 15,
+                show: i == 0 ? true : false,
+                feature: {
+                    // 移除默认的 saveAsImage
+                    // saveAsImage: { title: '保存图片' }
+                    myCustomDownload: {
+                        title: '', // 按钮标题
+                        icon: 'path://M892.342857 463.238095l-73.142857-68.266666-258.438095 258.438095V29.257143h-97.52381v624.152381L204.8 394.971429 131.657143 463.238095l380.342857 380.342857zM107.27619 897.219048h804.571429v97.523809H107.27619z', // 自定义图标路径
+
+                        onclick: function () {
+                            html2canvas(document.getElementById('canvas'), {
+                                scale: 1
+                            }).then(function (canvas) {
+                                // 创建a标签，实现下载
+                                let creatIMg = document.createElement('a')
+                                creatIMg.download = '稳态数据分析.png' // 设置下载的文件名，
+                                creatIMg.href = canvas.toDataURL() // 下载url
+                                creatIMg.click()
+                                creatIMg.remove() // 下载之后把创建的元素删除
+                            })
+                        }
+                    }
+                }
+            },
+            legend: {
+                right: 50,
+                top: 25,
+                verticalAlign: 'top',
+                enabled: true,
+                itemDistance: 5,
+                textStyle: {
+                    rich: {
+                        a: {
+                            verticalAlign: 'middle'
+                        }
+                    },
+
+                    padding: [0, 0, 0, 0] //[上、右、下、左]
+                }
+            },
+            grid: {
+                top: '70px'
+            },
+            xAxis: [
+                {
+                    name: '时间',
+                    type: 'time',
+                    axisLine: {
+                        show: true,
+                        onZero: false
+                    },
+                    axisLabel: {
+                        textStyle: {
+                            fontFamily: 'dinproRegular'
+                        }
+                    }
+                }
+            ],
+            // toolbox: {
+            //     show: true,
+            //     feature: {
+            //         dataZoom: {
+            //             // bottom: '10px',
+            //             yAxisIndex: 'none'
+            //         }
+            //     }
+            // },
+            yAxis: [
+                {
+                    type: 'value',
+
+                    min: min,
+                    max: max,
+                    name: item.valueName,
+                    minInterval: 1,
+                    // max:10,
+                    // min:0,
+                    // axisLabel: {
+                    //     interval: 0,
+                    //     // formatter: function (value: any) {
+                    //     //     return value.toFixed(0)
+                    //     // },
+                    //     left: '20px'
+                    // },
+
+                    axisLine: {
+                        show: true,
+                        onZero: false, //-----------重点
+                        lineStyle: {}
+                    }
+                    // splitLine: {
+                    //     lineStyle: {
+                    //         // 使用深浅的间隔色
+                    //         type: 'dashed',
+                    //         opacity: 0.5
+                    //     }
+                    // }
+                }
+            ],
+            series: item.serise
+        }
+        let aValues = []
+        let bValues = []
+        let CValues = []
+        let ZValues = []
+
+        if (
+            traceability.value.length > 0 &&
+            traceability.value[0].value != null &&
+            traceability.value[0].value.length > 0
+        ) {
+            for (let i = 0; i < traceability.value[0].value.length; i++) {
+                let T = traceability.value[0].value[i][0]
+                let A = traceability.value[0].value[i][1]
+                let B = traceability.value[0].value[i][2]
+                let C = traceability.value[0].value[i][3]
+                let Z = A + B + C
+                aValues.push([T, A > 0 ? 1 : A == 0 ? 0 : -1])
+                bValues.push([T, B > 0 ? 1 : B == 0 ? 0 : -1])
+                CValues.push([T, C > 0 ? 1 : C == 0 ? 0 : -1])
+                ZValues.push([T, Z > 0 ? 1 : Z == 0 ? 0 : -1])
+            }
+        }
+
+        if (item.targetName == '谐波电流方向') {
+            item.option.tooltip.axisPointer = null
+            item.option.yAxis[0] = {
+                type: 'value',
+                interval: 1,
+                min: -2, //最小值
+                max: 2,
+                axisLine: {
+                    show: true,
+                    onZero: false //-----------重点
+                },
+                splitLine: {
+                    lineStyle: {
+                        // 使用深浅的间隔色
+                        type: 'dashed',
+                        opacity: 0.5
+                    }
+                },
+                axisLabel: {
+                    formatter: function (value: any) {
+                        if (value == 0) {
+                            return '无'
+                        } else if (value == -1) {
+                            return '流出'
+                        } else if (value == 1) {
+                            return '流入'
+                        }
+                    }
+                }
+            }
+            item.option.series = [
+                {
+                    name: 'A相谐波电流方向',
+                    type: 'line',
+
+                    data: aValues,
+                    symbol: 'none',
+                    symbolSize: 0,
+                    itemStyle: {
+                        normal: {
+                            color: '#DAA520'
+                        }
+                    }
+                },
+                {
+                    name: 'B相谐波电流方向',
+                    type: 'line',
+
+                    data: bValues,
+                    symbol: 'none',
+                    symbolSize: 0,
+                    itemStyle: {
+                        normal: {
+                            color: '#2E8B57'
+                        }
+                    }
+                },
+                {
+                    name: 'C相谐波电流方向',
+                    type: 'line',
+
+                    data: CValues,
+                    symbol: 'none',
+                    symbolSize: 0,
+                    itemStyle: {
+                        normal: {
+                            color: '#A52a2a'
+                        }
+                    }
+                },
+                {
+                    name: '总谐波电流方向',
+                    type: 'line',
+
+                    data: ZValues,
+                    symbol: 'none',
+                    symbolSize: 0,
+                    itemStyle: {
+                        normal: {
+                            color: '#0033ff'
+                        }
+                    }
+                }
+            ]
+        }
+    })
+    echarts.connect('group')
+}
+const conditionChange = () => {
+    console.log(123)
+
+    //判断一个指标时
+    if (formData.condition.length == 1) {
+        if (
+            formData.condition.includes('40') ||
+            formData.condition.includes('43') ||
+            formData.condition.includes('44') ||
+            formData.condition.includes('50') ||
+            formData.condition.includes('39') ||
+            formData.condition.includes('51') ||
+            formData.condition.includes('52') ||
+            formData.condition.includes('45')
+        ) {
+            showXieBoCiShu.value = true
+        } else {
+            showXieBoCiShu.value = false
+        }
+        if (
+            formData.condition.includes('46') ||
+            //formData.condition.includes('47') ||
+            // formData.condition.includes('48') ||
+            formData.condition.includes('49')
+        ) {
+            showJianXieBoCiShu.value = true
+        } else {
+            showJianXieBoCiShu.value = false
+        }
+    }
+    //判断2个指标时
+    if (formData.condition.length == 2) {
+        if (
+            formData.condition.includes('40') ||
+            formData.condition.includes('43') ||
+            formData.condition.includes('44') ||
+            (formData.condition.includes('45') && formData.condition.includes('46')) ||
+            //formData.condition.includes('47') ||
+            // formData.condition.includes('48') ||
+            formData.condition.includes('49') ||
+            formData.condition.includes('50') ||
+            formData.condition.includes('39') ||
+            formData.condition.includes('51') ||
+            formData.condition.includes('52')
+        ) {
+            showXieBoCiShu.value = true
+            showJianXieBoCiShu.value = true
+        }
+        if (
+            formData.condition.includes('40') ||
+            formData.condition.includes('43') ||
+            formData.condition.includes('44') ||
+            formData.condition.includes('45') ||
+            formData.condition.includes('50') ||
+            formData.condition.includes('39') ||
+            formData.condition.includes('51') ||
+            formData.condition.includes('52')
+        ) {
+            showXieBoCiShu.value = true
+        } else {
+            showXieBoCiShu.value = false
+        }
+        if (
+            formData.condition.includes('46') ||
+            //formData.condition.includes('47') ||
+            // formData.condition.includes('48') ||
+            formData.condition.includes('49')
+        ) {
+            showJianXieBoCiShu.value = true
+        } else {
+            showJianXieBoCiShu.value = false
+        }
+    }
+    //判断3个指标时
+    if (formData.condition.length == 3) {
+        if (
+            (formData.condition.includes('40') ||
+                formData.condition.includes('43') ||
+                formData.condition.includes('44') ||
+                formData.condition.includes('50') ||
+                formData.condition.includes('39') ||
+                formData.condition.includes('51') ||
+                formData.condition.includes('52') ||
+                formData.condition.includes('45')) &&
+            (formData.condition.includes('46') ||
+                //formData.condition.includes('47') ||
+                // formData.condition.includes('48') ||
+                formData.condition.includes('49'))
+        ) {
+            showXieBoCiShu.value = true
+            showJianXieBoCiShu.value = true
+        } else {
+            showXieBoCiShu.value = false
+            showJianXieBoCiShu.value = false
+        }
+        if (
+            formData.condition.includes('46') ||
+            //formData.condition.includes('47') ||
+            // formData.condition.includes('48') ||
+            formData.condition.includes('49')
+        ) {
+            showJianXieBoCiShu.value = true
+        } else {
+            showJianXieBoCiShu.value = false
+        }
+        if (
+            formData.condition.includes('40') ||
+            formData.condition.includes('43') ||
+            formData.condition.includes('44') ||
+            formData.condition.includes('45') ||
+            formData.condition.includes('50') ||
+            formData.condition.includes('39') ||
+            formData.condition.includes('51') ||
+            formData.condition.includes('52')
+        ) {
+            showXieBoCiShu.value = true
+        } else {
+            showXieBoCiShu.value = false
+        }
+    }
+    //判断无指标时
+    if (formData.condition.length == 0) {
+        showJianXieBoCiShu.value = false
+        showXieBoCiShu.value = false
+    }
+    //根据指标判断值类型
+    if (formData.condition.includes('60') || formData.condition.includes('61') || formData.condition.includes('62')) {
+        typeOptions.value = [{ label: '平均值', value: 1 }]
+        formData.valueType = 1
+    } else {
+        typeOptions.value = [
+            { label: '平均值', value: 1 },
+            { label: '最小值', value: 2 },
+            { label: '最大值', value: 3 },
+            { label: 'cp95值', value: 4 }
+        ]
+    }
+    setTimeout(() => {
+        // console.log('🚀 ~ setTimeout ~  tableHeaderRef.value:', tableHeaderRef.value)
+
+        tableHeaderRef.value && tableHeaderRef.value?.computedSearchRow()
+    }, 100)
+}
+
+// 点击暂降触发点
+const triggerPoint = (data: any) => {
+    let nameList = monitoringPoint.state.lineName.split('>')
+
+    view.value = false
+    setTimeout(() => {
+        queryEventDetailByEventId({ eventId: data[2] }).then(res => {
+            waveFormRef.value.open({
+                ...res.data,
+                subName: nameList[nameList.length - 2].split('（')[0] || nameList[nameList.length - 2],
+                lineName: nameList[nameList.length - 1].split('_')[1] || nameList[nameList.length - 1]
+            })
+            waveFormRef.value.setHeight(220, 180)
+        })
+    }, 100)
+}
+// 计算高度
+const selectChange = (flag: boolean) => {
+    // const height1: any = ref(mainHeight(160))
+    height1.value = mainHeight(flag ? 220 : 160)
+    height.value = mainHeight(flag ? 220 : 160, list.value.length > 3 ? 3 : list.value.length)
+}
+const backbxlb = () => {
+    view.value = true
+}
+provide('tableStore', tableStore)
+onBeforeUnmount(() => {
+    echarts.disconnect('group')
+})
+</script>
+<style></style>
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
index a1aee4db..6cf5145f 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -1,170 +1,172 @@
-<template>
-    <div class="default-main" :style="height">
-        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
-            <pane :size="size">
-                <PointTree
-                    v-if="showTree"
-                    :default-expand-all="false"
-                    @node-click="handleNodeClick"
-                    @init="handleNodeClick"
-                ></PointTree>
-            </pane>
-            <pane style="background: #fff" :style="height">
-                <TableHeader ref="TableHeaderRef" datePicker @selectChange="selectChange">
-                    <template v-slot:select>
-                        <el-form-item label="模板策略">
-                            <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
-                                <el-option
-                                    v-for="item in templatePolicy"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="报表类型">
-                            <el-input readonly type="text" value="分析报表"></el-input>
-                            <!--                            <el-select-->
-                            <!--                                :disabled="true"-->
-                            <!--                                v-model="reportForm"-->
-                            <!--                                :popper-append-to-body="false"-->
-                            <!--                                placeholder="请选择报表类型"-->
-                            <!--                            >-->
-                            <!--                                <el-option-->
-                            <!--                                    v-for="item in reportFormList"-->
-                            <!--                                    :key="item.value"-->
-                            <!--                                    :label="item.label"-->
-                            <!--                                    :value="item.value"-->
-                            <!--                                ></el-option>-->
-                            <!--                            </el-select>-->
-                        </el-form-item>
-                    </template>
-                    <template #operation>
-                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
-                    </template>
-                </TableHeader>
-                <div class="box">
-                    <div id="luckysheet" :style="`height: calc(${tableStore.table.height} + 45px)`"></div>
-                </div>
-            </pane>
-        </splitpanes>
-    </div>
-</template>
-<script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
-import 'splitpanes/dist/splitpanes.css'
-import { Splitpanes, Pane } from 'splitpanes'
-import TableStore from '@/utils/tableStore'
-import PointTree from '@/components/tree/pqs/pointTree.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { mainHeight } from '@/utils/layout'
-import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
-import { exportExcel } from '@/views/system/reportForms/export.js'
-
-defineOptions({
-    name: 'harmonic-boot/xieboReport'
-})
-const showTree = ref(false)
-const height = mainHeight(20)
-const size = ref(0)
-const dictData = useDictData()
-const TableHeaderRef = ref()
-const dotList: any = ref({})
-const Template: any = ref({})
-const reportForm: any = ref('')
-
-const templatePolicy: any = ref([])
-const reportFormList: any = ref([
-    {
-        value: '1',
-        label: '分析报表'
-    },
-    {
-        value: '2',
-        label: '统计报表'
-    },
-    {
-        value: '3',
-        label: '自定义报表'
-    }
-])
-const tableStore = new TableStore({
-    url: '/harmonic-boot/customReport/getCustomReport',
-    method: 'POST',
-    column: [],
-    beforeSearchFun: () => {
-        tableStore.table.params.tempId = Template.value.id
-        tableStore.table.params.lineId = dotList.value.id
-    },
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
-            item.celldata.forEach((k: any) => {
-                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
-            })
-        })
-        console.log(tableStore.table.data)
-        setTimeout(() => {
-            luckysheet.create({
-                container: 'luckysheet',
-                title: '', // 表 头名
-                lang: 'zh', // 中文
-                showtoolbar: false, // 是否显示工具栏
-                showinfobar: false, // 是否显示顶部信息栏
-                showsheetbar: true, // 是否显示底部sheet按钮
-                data: tableStore.table.data
-            })
-        }, 10)
-    }
-})
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    const dom = document.getElementById('navigation-splitpanes')
-    if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
-    }
-})
-getTemplateByDept({ id: dictData.state.area[0].id })
-    .then((res: any) => {
-        templatePolicy.value = res.data
-        Template.value = res.data[0]
-        reportForm.value = res.data[0]?.reportForm
-        showTree.value = true
-    })
-    .catch((err: any) => {
-        showTree.value = true
-    })
-const changetype = (val: any) => {
-    reportForm.value = val.reportForm
-}
-const selectChange = () => {
-    console.log('🚀 ~ selectChange ~ tableStore.table.data.lnegth :', tableStore.table.data.length)
-    if (tableStore.table.data.length != 0) {
-        setTimeout(() => {
-            luckysheet && luckysheet?.resize()
-        }, 10)
-    }
-}
-
-const handleNodeClick = (data: any, node: any) => {
-    if (data.level == 6) {
-        dotList.value = data
-        tableStore.index()
-    }
-}
-
-const exportEvent = () => {
-    exportExcel(luckysheet.getAllSheets(), '统计报表下载')
-}
-</script>
-<style lang="scss">
-.splitpanes.default-theme .splitpanes__pane {
-    background: #eaeef1;
-}
-
-.box {
-    padding: 10px;
-}
-</style>
+<template>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <PointTree
+                    v-if="showTree"
+                    :default-expand-all="false"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></PointTree>
+            </pane>
+            <pane style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" datePicker @selectChange="selectChange">
+                    <template v-slot:select>
+                        <el-form-item label="模板策略">
+                            <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
+                                <el-option
+                                    v-for="item in templatePolicy"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="报表类型">
+                            <el-input readonly type="text" value="分析报表"></el-input>
+                            <!--                            <el-select-->
+                            <!--                                :disabled="true"-->
+                            <!--                                v-model="reportForm"-->
+                            <!--                                :popper-append-to-body="false"-->
+                            <!--                                placeholder="请选择报表类型"-->
+                            <!--                            >-->
+                            <!--                                <el-option-->
+                            <!--                                    v-for="item in reportFormList"-->
+                            <!--                                    :key="item.value"-->
+                            <!--                                    :label="item.label"-->
+                            <!--                                    :value="item.value"-->
+                            <!--                                ></el-option>-->
+                            <!--                            </el-select>-->
+                        </el-form-item>
+                    </template>
+                    <template #operation>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box">
+                    <div id="luckysheet" :style="`height: calc(${tableStore.table.height} + 45px)`"></div>
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import TableStore from '@/utils/tableStore'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+import { getTemplateByDept } from '@/api/harmonic-boot/luckyexcel'
+import { exportExcel } from '@/views/system/reportForms/export.js'
+
+defineOptions({
+    name: 'harmonic-boot/xieboReport'
+})
+const showTree = ref(false)
+const height = mainHeight(20)
+const size = ref(0)
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const dotList: any = ref({})
+const Template: any = ref({})
+const reportForm: any = ref('')
+
+const templatePolicy: any = ref([])
+const reportFormList: any = ref([
+    {
+        value: '1',
+        label: '分析报表'
+    },
+    {
+        value: '2',
+        label: '统计报表'
+    },
+    {
+        value: '3',
+        label: '自定义报表'
+    }
+])
+const tableStore = new TableStore({
+    url: '/harmonic-boot/customReport/getCustomReport',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.tempId = Template.value.id
+        tableStore.table.params.lineId = dotList.value.id
+    },
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
+            item.celldata.forEach((k: any) => {
+                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
+            })
+        })
+        console.log(tableStore.table.data)
+        setTimeout(() => {
+            luckysheet.create({
+                container: 'luckysheet',
+                title: '', // 表 头名
+                lang: 'zh', // 中文
+                showtoolbar: false, // 是否显示工具栏
+                showinfobar: false, // 是否显示顶部信息栏
+                showsheetbar: true, // 是否显示底部sheet按钮
+                      allowEdit: false, // 禁止所有编辑操作（必填）
+                data: tableStore.table.data
+            })
+        }, 10)
+    }
+})
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 100)
+    }
+})
+getTemplateByDept({ id: dictData.state.area[0].id })
+    .then((res: any) => {
+        templatePolicy.value = res.data
+        Template.value = res.data[0]
+        reportForm.value = res.data[0]?.reportForm
+        showTree.value = true
+    })
+    .catch((err: any) => {
+        showTree.value = true
+    })
+const changetype = (val: any) => {
+    reportForm.value = val.reportForm
+}
+const selectChange = () => {
+    console.log('🚀 ~ selectChange ~ tableStore.table.data.lnegth :', tableStore.table.data.length)
+    if (tableStore.table.data.length != 0) {
+        setTimeout(() => {
+            luckysheet && luckysheet?.resize()
+        }, 10)
+    }
+}
+
+const handleNodeClick = (data: any, node: any) => {
+    if (data.level == 6) {
+        dotList.value = data
+        tableStore.index()
+    }
+}
+
+const exportEvent = () => {
+    exportExcel(luckysheet.getAllSheets(), '统计报表下载')
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+
+.box {
+    padding: 10px;
+    
+}
+</style>
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index 9bfe9635..5c14d803 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -1,338 +1,338 @@
-<template>
-    <div @keyup.enter="onSubmit(formRef)">
-        <div @contextmenu.stop="" id="bubble" class="bubble">
-            <canvas id="bubble-canvas" class="bubble-canvas"></canvas>
-        </div>
-        <div class="login-image"></div>
-        <div class="login-container-form">
-            <div class="title-container">
-                <div class="title">
-                    <span style="font-size: 28px">{{ getThemeList.name || '电能质量监测系统' }}</span>
-                </div>
-            </div>
-            <el-form :rules="rules" ref="formRef" size="large" class="login-form" :model="form">
-                <el-form-item prop="username">
-                    <el-input
-                        ref="usernameRef"
-                        v-model="form.username"
-                        type="text"
-                        clearable
-                        placeholder="用户名"
-                        autocomplete="off"
-                    >
-                        <template #prefix>
-                            <!-- <span class="iconfont icon-yonghu" style="color: var(--el-color-primary)"></span> -->
-                            <Icon name="fa fa-user" style="color: var(--el-color-primary); font-size: 16px" />
-                        </template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item prop="password">
-                    <el-input
-                        ref="passwordRef"
-                        v-model="form.password"
-                        type="password"
-                        placeholder="密码"
-                        autocomplete="off"
-                    >
-                        <template #prefix>
-                            <Icon name="local-password" style="color: var(--el-color-primary); font-size: 16px" />
-                            <!-- <span class="iconfont icon-mima" style="color: var(--el-color-primary)"></span> -->
-                        </template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button
-                        :loading="state.submitLoading"
-                        class="submit-btn"
-                        round
-                        type="info"
-                        @click="onSubmit(formRef)"
-                    >
-                        登录
-                    </el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <!-- <div class="copy-right">
-            <span>版权所有 @ 南京灿能电力自动化股份有限公司</span>
-            <br />
-            <img style="width: 20px; height: 20px; position: absolute" src="@/assets/login/jhui.png" />
-
-            <span>　　苏公网安备 32011502011902号</span>
-        </div> -->
-        <PopupUpdatePwd ref="popupUpdatePwdRef"></PopupUpdatePwd>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, onBeforeUnmount, reactive, ref, nextTick } from 'vue'
-import * as pageBubble from '@/utils/pageBubble'
-import { ElMessage } from 'element-plus'
-import { gongkey, login,getSysConfig } from '@/api/user-boot/user'
-import { useAdminInfo } from '@/stores/adminInfo'
-import type { FormInstance, InputInstance, FormRules } from 'element-plus'
-import { useRouter } from 'vue-router'
-import { ADMIN_INFO } from '@/stores/constant/cacheKey'
-import { Local } from '@/utils/storage'
-import { getTheme } from '@/api/systerm'
-import { useConfig } from '@/stores/config'
-import PopupUpdatePwd from './popupUpdatePwd.vue'
-
-const router = useRouter()
-let timer: number
-const configStore = useConfig()
-const popupUpdatePwdRef = ref()
-const formRef = ref<FormInstance>()
-const usernameRef = ref<InputInstance>()
-const passwordRef = ref<InputInstance>()
-const userInfo = useAdminInfo()
-Local.remove(ADMIN_INFO)
-userInfo.removeToken()
-const getThemeList: any = ref([])
-interface RuleForm {
-    username: string
-    password: string
-}
-
-const state = reactive({
-    showCaptcha: false,
-    submitLoading: false
-})
-const form = reactive({
-    username: '',
-    password: ''
-})
-
-const rules = reactive<FormRules<RuleForm>>({
-    username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
-    password: [{ required: true, trigger: 'blur', message: '请输入密码' }]
-})
-
-const focusInput = () => {
-    if (form.username === '') {
-        usernameRef.value!.focus()
-    } else if (form.password === '') {
-        passwordRef.value!.focus()
-    }
-}
-
-onMounted(() => {
-    timer = window.setTimeout(() => {
-        pageBubble.init()
-    }, 0)
-})
-
-onBeforeUnmount(() => {
-    clearTimeout(timer)
-    pageBubble.removeListeners()
-})
-getTheme().then(res => {
-    document.title = res.data.name || '电能质量在线监测系统'
-
-    let list: any = [
-        'elementUiPrimary',
-        'tableHeaderBackground',
-        'tableHeaderColor',
-        'tableCurrent',
-        'menuBackground',
-        'menuColor',
-        'menuTopBarBackground',
-        'menuActiveBackground',
-        'menuActiveColor',
-        'headerBarTabColor',
-        'headerBarBackground'
-    ]
-    getThemeList.value = res.data
-    window.localStorage.setItem('getTheme', JSON.stringify(res.data))
-    for (let i = 0; i < list.length; i++) {
-        configStore.setLayout(list[i], JSON.parse(res.data[list[i]]))
-    }
-    configStore.setLayout('elementUiPrimary', JSON.parse(res.data['elementUiPrimary']))
-})
-const onSubmit = async (formEl: FormInstance | undefined) => {
-    if (!formEl) return
-    await formEl.validate((valid, fields) => {
-        if (valid) {
-            state.submitLoading = true
-            login({
-                username: form.username,
-                password: form.password,
-                grant_type: 'captcha',
-                imageCode: '',
-                verifyCode: 0
-            })
-                .then(res => {
-                    userInfo.dataFill(res.data)
-                    state.submitLoading = false
-                    getSysConfig().then(res => {
-                        window.localStorage.setItem('sysdata', JSON.stringify(res.data))
-                    })
-                    router.push({
-                        path: '/'
-                    })
-                })
-                .catch(err => {
-                    if (err.code === 'A0101' && err.message === '登录认证,密码失效，请重置') {
-                        popupUpdatePwdRef.value.open(form.username)
-                    }
-                })
-            setTimeout(() => {
-                state.submitLoading = false
-            }, 500)
-        }
-    })
-}
-</script>
-
-<style scoped lang="scss">
-.bubble {
-    position: relative;
-    width: 100%;
-    min-height: 100%;
-    overflow: hidden;
-    background-color: var(--el-color-primary) !important;
-    background-position: center 110px;
-    background-repeat: repeat;
-    background-size: 100%;
-    background-image: url(https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg);
-}
-
-.login-image {
-    position: absolute;
-    top: 50%;
-    left: 20%;
-    min-width: 45%;
-    min-height: 80%;
-
-    background: url('../../assets/login/login2.png') no-repeat center center;
-    background-size: contain;
-    transform: translate(-15%, -50%);
-    // box-shadow: 0 0 0 #011b2bab;
-}
-
-.form-item-icon {
-    height: auto;
-}
-
-.login-container-form {
-    position: absolute;
-    top: 50%;
-    left: 85%;
-    width: 500px;
-    height: auto;
-    border-radius: 30px;
-    transform: translate(-85%, -50%);
-    box-shadow: 3px 3px 2px 2px #011b2bab;
-
-    .title-container {
-        position: relative;
-        width: 398px;
-        max-width: 100%;
-        padding: 20px 0 0;
-        margin: 0 auto;
-
-        .title {
-            margin-bottom: 20px;
-            font-size: 33px;
-            font-weight: 600;
-            color: rgba(255, 255, 255, 0.85);
-            text-align: center;
-
-            & :v-deep .svg-icon {
-                // color: $;
-            }
-
-            .logo {
-                width: 46px;
-                height: 46px;
-                margin-right: 10px;
-                vertical-align: middle;
-            }
-        }
-    }
-}
-
-.login-form {
-    position: relative;
-    width: 368px;
-    max-width: 100%;
-    //padding: 20px 0 0;
-    margin: 0 auto;
-    margin-bottom: 20px;
-    overflow: hidden;
-
-    &.el-input {
-        input {
-            height: 40px;
-            padding-right: 40px;
-            padding-left: 40px;
-            line-height: 40px;
-            border-radius: 5px;
-        }
-
-        .el-input__prefix,
-        .el-input__suffix {
-            width: 40px;
-            line-height: 40px;
-
-            .svg-icon {
-                font-size: 16px;
-                vertical-align: -0.25em;
-            }
-        }
-
-        .el-input__prefix {
-            left: 0;
-        }
-
-        .el-input__suffix {
-            right: 0;
-        }
-    }
-}
-
-.copy-right {
-    position: absolute;
-    bottom: 10px;
-    width: 100%;
-    font-size: 14px;
-    color: rgb(233, 229, 229);
-    text-align: center;
-}
-
-:v-deep.el-form-item--large {
-    margin-bottom: 15px;
-}
-
-.submit-btn {
-    width: 100%;
-    margin-top: 0px;
-    margin-bottom: 20px;
-    background: var(--el-color-primary-light-3);
-    // background: #009688;
-    //background: #4d6ea1;
-    border-radius: 0;
-    &:hover {
-        background: var(--el-color-primary-light-5);
-    }
-}
-
-@media screen and (max-width: 720px) {
-    .login {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .login-box {
-            width: 340px;
-            margin-top: 0;
-        }
-    }
-}
-
-@media screen and (max-height: 800px) {
-    .login .login-box {
-        margin-bottom: 0;
-    }
-}
-</style>
+<template>
+    <div @keyup.enter="onSubmit(formRef)">
+        <div @contextmenu.stop="" id="bubble" class="bubble">
+            <canvas id="bubble-canvas" class="bubble-canvas"></canvas>
+        </div>
+        <div class="login-image"></div>
+        <div class="login-container-form">
+            <div class="title-container">
+                <div class="title">
+                    <span style="font-size: 28px">{{ getThemeList.name || '电能质量监测系统' }}</span>
+                </div>
+            </div>
+            <el-form :rules="rules" ref="formRef" size="large" class="login-form" :model="form">
+                <el-form-item prop="username">
+                    <el-input
+                        ref="usernameRef"
+                        v-model="form.username"
+                        type="text"
+                        clearable
+                        placeholder="用户名"
+                        autocomplete="off"
+                    >
+                        <template #prefix>
+                            <!-- <span class="iconfont icon-yonghu" style="color: var(--el-color-primary)"></span> -->
+                            <Icon name="fa fa-user" style="color: var(--el-color-primary); font-size: 16px" />
+                        </template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item prop="password">
+                    <el-input
+                        ref="passwordRef"
+                        v-model="form.password"
+                        type="password"
+                        placeholder="密码"
+                        autocomplete="off"
+                    >
+                        <template #prefix>
+                            <Icon name="local-password" style="color: var(--el-color-primary); font-size: 16px" />
+                            <!-- <span class="iconfont icon-mima" style="color: var(--el-color-primary)"></span> -->
+                        </template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button
+                        :loading="state.submitLoading"
+                        class="submit-btn"
+                        round
+                        type="info"
+                        @click="onSubmit(formRef)"
+                    >
+                        登录
+                    </el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+        <!-- <div class="copy-right">
+            <span>版权所有 @ 南京灿能电力自动化股份有限公司</span>
+            <br />
+            <img style="width: 20px; height: 20px; position: absolute" src="@/assets/login/jhui.png" />
+
+            <span>　　苏公网安备 32011502011902号</span>
+        </div> -->
+        <PopupUpdatePwd ref="popupUpdatePwdRef"></PopupUpdatePwd>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, onBeforeUnmount, reactive, ref, nextTick } from 'vue'
+import * as pageBubble from '@/utils/pageBubble'
+import { ElMessage } from 'element-plus'
+import { gongkey, login,getSysConfig } from '@/api/user-boot/user'
+import { useAdminInfo } from '@/stores/adminInfo'
+import type { FormInstance, InputInstance, FormRules } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { ADMIN_INFO } from '@/stores/constant/cacheKey'
+import { Local } from '@/utils/storage'
+import { getTheme } from '@/api/systerm'
+import { useConfig } from '@/stores/config'
+import PopupUpdatePwd from './popupUpdatePwd.vue'
+
+const router = useRouter()
+let timer: number
+const configStore = useConfig()
+const popupUpdatePwdRef = ref()
+const formRef = ref<FormInstance>()
+const usernameRef = ref<InputInstance>()
+const passwordRef = ref<InputInstance>()
+const userInfo = useAdminInfo()
+Local.remove(ADMIN_INFO)
+userInfo.removeToken()
+const getThemeList: any = ref([])
+interface RuleForm {
+    username: string
+    password: string
+}
+
+const state = reactive({
+    showCaptcha: false,
+    submitLoading: false
+})
+const form = reactive({
+    username: '',
+    password: ''
+})
+
+const rules = reactive<FormRules<RuleForm>>({
+    username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+    password: [{ required: true, trigger: 'blur', message: '请输入密码' }]
+})
+
+const focusInput = () => {
+    if (form.username === '') {
+        usernameRef.value!.focus()
+    } else if (form.password === '') {
+        passwordRef.value!.focus()
+    }
+}
+
+onMounted(() => {
+    timer = window.setTimeout(() => {
+        pageBubble.init()
+    }, 0)
+})
+
+onBeforeUnmount(() => {
+    clearTimeout(timer)
+    pageBubble.removeListeners()
+})
+getTheme().then(res => {
+    document.title = res.data.name || '电能质量在线监测系统'
+
+    let list: any = [
+        'elementUiPrimary',
+        'tableHeaderBackground',
+        'tableHeaderColor',
+        'tableCurrent',
+        'menuBackground',
+        'menuColor',
+        'menuTopBarBackground',
+        'menuActiveBackground',
+        'menuActiveColor',
+        'headerBarTabColor',
+        'headerBarBackground'
+    ]
+    getThemeList.value = res.data
+    window.localStorage.setItem('getTheme', JSON.stringify(res.data))
+    for (let i = 0; i < list.length; i++) {
+        configStore.setLayout(list[i], JSON.parse(res.data[list[i]]))
+    }
+    configStore.setLayout('elementUiPrimary', JSON.parse(res.data['elementUiPrimary']))
+})
+const onSubmit = async (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    await formEl.validate((valid, fields) => {
+        if (valid) {
+            state.submitLoading = true
+            login({
+                username: form.username,
+                password: form.password,
+                grant_type: 'captcha',
+                imageCode: '',
+                verifyCode: 0
+            })
+                .then(res => {
+                    userInfo.dataFill(res.data)
+                    state.submitLoading = false
+                    getSysConfig().then(res => {
+                        window.localStorage.setItem('sysdata', JSON.stringify(res.data))
+                    })
+                    router.push({
+                        path: '/'
+                    })
+                })
+                .catch(err => {
+                    if (err.code === 'A0101' && err.message === '登录认证,密码失效，请重置') {
+                        popupUpdatePwdRef.value.open(form.username)
+                    }
+                })
+            setTimeout(() => {
+                state.submitLoading = false
+            }, 500)
+        }
+    })
+}
+</script>
+
+<style scoped lang="scss">
+.bubble {
+    position: relative;
+    width: 100%;
+    min-height: 100%;
+    overflow: hidden;
+    background-color: var(--el-color-primary) !important;
+    background-position: center 110px;
+    background-repeat: repeat;
+    background-size: 100%;
+    background-image: url(https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg);
+}
+
+.login-image {
+    position: absolute;
+    top: 50%;
+    left: 20%;
+    min-width: 45%;
+    min-height: 80%;
+
+    background: url('../../assets/login/login2.png') no-repeat center center;
+    background-size: contain;
+    transform: translate(-15%, -50%);
+    // box-shadow: 0 0 0 #011b2bab;
+}
+
+.form-item-icon {
+    height: auto;
+}
+
+.login-container-form {
+    position: absolute;
+    top: 50%;
+    left: 85%;
+    width: 500px;
+    height: auto;
+    border-radius: 30px;
+    transform: translate(-85%, -50%);
+    box-shadow: 3px 3px 2px 2px #011b2bab;
+
+    .title-container {
+        position: relative;
+        width: 398px;
+        max-width: 100%;
+        padding: 20px 0 0;
+        margin: 0 auto;
+
+        .title {
+            margin-bottom: 20px;
+            font-size: 33px;
+            font-weight: 600;
+            color: rgba(255, 255, 255, 0.85);
+            text-align: center;
+
+            & :v-deep .svg-icon {
+                // color: $;
+            }
+
+            .logo {
+                width: 46px;
+                height: 46px;
+                margin-right: 10px;
+                vertical-align: middle;
+            }
+        }
+    }
+}
+
+.login-form {
+    position: relative;
+    width: 368px;
+    max-width: 100%;
+    //padding: 20px 0 0;
+    margin: 0 auto;
+    margin-bottom: 20px;
+    overflow: hidden;
+
+    &.el-input {
+        input {
+            height: 40px;
+            padding-right: 40px;
+            padding-left: 40px;
+            line-height: 40px;
+            border-radius: 5px;
+        }
+
+        .el-input__prefix,
+        .el-input__suffix {
+            width: 40px;
+            line-height: 40px;
+
+            .svg-icon {
+                font-size: 16px;
+                vertical-align: -0.25em;
+            }
+        }
+
+        .el-input__prefix {
+            left: 0;
+        }
+
+        .el-input__suffix {
+            right: 0;
+        }
+    }
+}
+
+.copy-right {
+    position: absolute;
+    bottom: 10px;
+    width: 100%;
+    font-size: 14px;
+    color: rgb(233, 229, 229);
+    text-align: center;
+}
+
+:v-deep.el-form-item--large {
+    margin-bottom: 15px;
+}
+
+.submit-btn {
+    width: 100%;
+    margin-top: 0px;
+    margin-bottom: 20px;
+    background: var(--el-color-primary-light-3);
+    // background: #009688;
+    //background: #4d6ea1;
+    border-radius: 0;
+    &:hover {
+        background: var(--el-color-primary-light-5);
+    }
+}
+
+@media screen and (max-width: 720px) {
+    .login {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .login-box {
+            width: 340px;
+            margin-top: 0;
+        }
+    }
+}
+
+@media screen and (max-height: 800px) {
+    .login .login-box {
+        margin-bottom: 0;
+    }
+}
+</style>