From e53a3dd8dd0a832bb3a509d7f20ef316bcb6e8f3 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 13 Nov 2024 16:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/harmonic-boot/monitoring.ts           |  16 +
 src/api/user-boot/user.ts                     |   7 +-
 .../area/powerAssessment/index.vue            | 462 +++++++++++
 .../area/qualifiedRate/components/charts.vue  | 300 +++++++
 .../area/qualifiedRate/index.vue              | 180 +++++
 .../terminalonlinerate/components/charts.vue  |   4 +-
 .../detailed/harmonicStatistics/index.vue     |   2 +-
 .../reportForms/statistics/index.vue          |   2 +-
 .../pqs/harmonicMonitoring/views/index.vue    | 748 ++++++++++++++++++
 src/views/system/reportForms/look.vue         |   2 +-
 src/views/user/login.vue                      |   5 +-
 11 files changed, 1721 insertions(+), 7 deletions(-)
 create mode 100644 src/api/harmonic-boot/monitoring.ts
 create mode 100644 src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
 create mode 100644 src/views/pqs/harmonicMonitoring/area/qualifiedRate/components/charts.vue
 create mode 100644 src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
 create mode 100644 src/views/pqs/harmonicMonitoring/views/index.vue

diff --git a/src/api/harmonic-boot/monitoring.ts b/src/api/harmonic-boot/monitoring.ts
new file mode 100644
index 00000000..a4de96b7
--- /dev/null
+++ b/src/api/harmonic-boot/monitoring.ts
@@ -0,0 +1,16 @@
+import createAxios from '@/utils/request'
+
+export function getEnterpriseSteadyQualify(data:any) {
+    return createAxios({
+        url: "/harmonic-boot/steadyQualify/getEnterpriseSteadyQualify",
+        method: "post",
+        data: data,
+      });
+}
+export function  getSteadyQualifyCensus(data:any) {
+    return createAxios({
+      url: "/harmonic-boot/steadyQualify/getSteadyQualifyCensus",
+      method: "post",
+      data: data,
+    });
+  }
\ No newline at end of file
diff --git a/src/api/user-boot/user.ts b/src/api/user-boot/user.ts
index 1c41230e..ba86a190 100644
--- a/src/api/user-boot/user.ts
+++ b/src/api/user-boot/user.ts
@@ -193,6 +193,11 @@ export const getAllUserSimpleList = () => {
 
 
 
-
+export const getSysConfig =()=> {
+    return request({
+        url: "/system-boot/config/getSysConfig",
+        method: "get",
+    });
+}
 
 
diff --git a/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
new file mode 100644
index 00000000..7950290a
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
@@ -0,0 +1,462 @@
+<template>
+    <div class="default-main">
+        <TableHeader datePicker ref="header">
+            <template v-slot:select>
+
+
+            </template>
+        </TableHeader>
+        <div v-loading="tableStore.table.loading" class="pr10">
+            <el-row>
+                <el-col :span="12" class="pd10">
+                    <el-tag style="background: #339966;" class="tag" size="small">5级</el-tag>
+                    <span style="color: #339966;" class="text">::优秀--(4.5,5]</span>
+                    <el-tag style="background: #3399ff;" class="tag" size="small">4级</el-tag>
+                    <span style="color: #3399ff;" class="text">:良好--(4,4.5]</span>
+                    <el-tag style="background: #ffcc33;" class="tag" size="small">3级</el-tag>
+                    <span style="color: #ffcc33;" class="text">:合格--(3,4]</span>
+                    <el-tag style="background: #ff9900;" class="tag" size="small">2级</el-tag>
+                    <span style="color: #ff9900;" class="text">:较差--(2,3]</span>
+                    <el-tag style="background: #cc0000;" class="tag" size="small">1级</el-tag>
+                    <span style="color: #cc0000;" class="text">:极差--[1,2]</span>
+                    <div :style="{ height: layout.height }" style="overflow-y: auto" class="mt10">
+                        <div class=" cardBox">
+                            <el-card v-for="(item, index) in tableStore.table.data" :key="index">
+                                <template #header>
+                                    <div style="cursor: pointer;">
+                                        <el-tag v-if="item.data == 3.14159 || item.data == 0"
+                                            style="background: #ccc; color: #fff" size="small">
+                                            无
+                                        </el-tag>
+                                        <el-tag v-if="4.5 < item.data && item.data <= 5 && item.data !== 3.14159"
+                                            style="background: #339966; color: #fff" size="small">
+                                            5级
+                                        </el-tag>
+                                        <el-tag v-if="4 < item.data && item.data <= 4.5 && item.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff" size="small">
+                                            4级
+                                        </el-tag>
+                                        <el-tag v-if="3 < item.data && item.data <= 4 && item.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff" size="small">
+                                            3级
+                                        </el-tag>
+                                        <el-tag v-if="2 < item.data && item.data <= 3 && item.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff" size="small">
+                                            4级
+                                        </el-tag>
+                                        <el-tag v-if="1 <= item.data && item.data <= 2 && item.data !== 3.14159"
+                                            style="background: #cc0000; color: #fff" size="small">
+                                            1级
+                                        </el-tag>
+                                        <span>{{ item.name }}</span>
+                                    </div>
+
+
+
+                                </template>
+                                <div class="card-content">
+                                    <div class="card-item" v-for="(item1, index1) in item.children" :key="index1">
+                                        <el-tag v-if="item1.data == 3.14159 || item1.data == 0"
+                                            style="background: #ccc; color: #fff" size="small">
+                                            无
+                                        </el-tag>
+                                        <el-tag v-if="4.5 < item1.data && item1.data <= 5 && item1.data !== 3.14159"
+                                            style="background: #339966; color: #fff" size="small">
+                                            5级
+                                        </el-tag>
+                                        <el-tag v-if="4 < item1.data && item1.data <= 4.5 && item1.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff" size="small">
+                                            4级
+                                        </el-tag>
+                                        <el-tag v-if="3 < item1.data && item1.data <= 4 && item1.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff" size="small">
+                                            3级
+                                        </el-tag>
+                                        <el-tag v-if="2 < item1.data && item1.data <= 3 && item1.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff" size="small">
+                                            2级
+                                        </el-tag>
+                                        <el-tag v-if="1 <= item1.data && item1.data <= 2 && item1.data !== 3.14159"
+                                            style="background: #cc0000; color: #fff" size="small">
+                                            1级
+                                        </el-tag>
+                                        <span class="xdf">
+                                            <el-tooltip :show-arrow="false" :offset="-0" :content="item1.name"
+                                                popper-class="atooltip" placement="bottom-start">
+
+                                                <div class="tooltipText">
+                                                    {{ item1.name }}
+                                                </div>
+                                            </el-tooltip>
+                                        </span>
+                                    </div>
+                                </div>
+                            </el-card>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :span="12">
+                    <my-echart class="tall" :options="echartList" />
+                    <div class="tall">
+                        <vxe-table height="auto" auto-resize :data="tableStore.table.data" v-bind="defaultAttribute">
+
+                            <vxe-column field="name" title="名称"></vxe-column>
+                            <vxe-column field="zc" title="综合评估值">
+                                <template #default="scope">
+                                    <span v-if="scope.row.data == 3.14159" style="color: #000;">
+                                        暂无数据
+                                    </span>
+                                    <span v-if="scope.row.data !== 3.14159" style="color: #000;">
+                                        {{ scope.row.data }}
+                                    </span>
+                                </template>
+                            </vxe-column>
+                            <vxe-column field="monitors" title="监测点个数(个)"></vxe-column>
+                            <vxe-column field="level" title="评估等级">
+
+                            </vxe-column>
+                        </vxe-table>
+                    </div>
+
+                </el-col>
+            </el-row>
+        </div>
+
+
+    </div>
+</template>
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableStore from '@/utils/tableStore'
+import { ref, onMounted, provide } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import * as echarts from 'echarts/core'
+defineOptions({
+    name: 'harmonic-boot/qydetailedAnalysis/pollutionqy'
+})
+const dictData = useDictData()
+const echartList = ref({})
+
+const header = ref()
+const options = dictData.getBasicData('Pollution_Statis', ['I_Neg', 'V_Inharm', 'V_Dev', 'V_Unbalance', 'Plt', 'Freq_Dev'])
+const tableStore = new TableStore({
+    url: '/harmonic-boot/comAccess/getComAccessData',
+    method: 'POST',
+    column: [],
+    loadCallback: () => {
+        histogram(tableStore.table.data)
+        header.value.areaRef.change()
+
+
+
+
+    }
+})
+provide('tableStore', tableStore)
+
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.statisticalType = {}
+
+
+// 柱状图数据处理
+const histogram = (res: any) => {
+    console.log(123);
+
+    echartList.value = {
+        title: {
+            text: '区域'
+        },
+      
+        legend: {
+                show: false
+            },
+
+        xAxis: {
+            name: '区域',
+            data: res.map((item: any) => item.name)
+        },
+        yAxis: {
+            name: '等级',// 给X轴加单位
+            min: 0,
+            max: 5,
+            splitLine: {
+                show: false
+            },
+            axisLabel: {
+                show: true,
+
+                // 这里重新定义就可以
+                formatter: function (value, index) {
+                    var texts = []
+                    if (value == 1) {
+                        texts.push('1级')
+                    } else if (value == 2) {
+                        texts.push('2级')
+                    } else if (value == 3) {
+                        texts.push('3级')
+                    } else if (value == 4) {
+                        texts.push('4级')
+                    } else if (value == 5) {
+                        texts.push('5级')
+
+                    }
+                    return texts
+                }
+            },
+        },
+
+        options: {
+            dataZoom: null,
+            series: [
+                {
+                    name: '评估值',
+                    type: 'bar',
+                    data: res.map((item: any) => {
+                        return item.data == 3.14159 ? 0.14159 : item.data
+                    }),
+                    barMaxWidth: 30,
+
+                    itemStyle: {
+                        normal: {
+                            // 随机显示
+                            //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
+
+                            // 定制显示（按顺序）
+                            color: function (params) {
+                                if (4.5 < params.value && params.value <= 5 && params.value !== 0.2) {
+                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                        {
+                                            offset: 1,
+                                            color: '#339966',
+                                        }], false)
+                                } else if (4 < params.value && params.value <= 4.5 && params.value !== 0.2) {
+                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                        {
+                                            offset: 1,
+                                            color: '#3399FF'
+                                        }], false)
+                                } else if (3 < params.value && params.value <= 4 && params.value !== 0.2) {
+                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                        {
+                                            offset: 1,
+                                            color: '#FFCC33'
+                                        }], false)
+                                } else if (2 < params.value && params.value <= 3 && params.value !== 0.2) {
+                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                        {
+                                            offset: 1,
+                                            color: '#FF9900'
+                                        }], false)
+                                } else if (params.value >= 1 && params.value <= 2 && params.value !== 0.2) {
+                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                        {
+                                            offset: 1,
+                                            color: '#CC0000'
+                                        }], false)
+                                } else if (params.value == 0.2) {
+                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                        {
+                                            offset: 1,
+                                            color: "#999999"
+                                        }], false)
+                                }
+                            }
+                        },
+                    },
+                    markLine: {
+                        silent: false,
+                        symbol: 'circle',
+                        lineStyle: {
+                            color: 'red',
+                            width: 1
+                        },
+                        emphasis: {
+                            lineStyle: {
+                                width: 1
+                            },
+                        },
+                        data: [
+
+                            {
+                                name: "",
+                                yAxis: 1,
+                                lineStyle: {
+                                    color: '#CC0000',
+                                },
+                                label: {
+                                    // position:"middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#CC0000',
+
+
+                                    }
+                                }
+                            },
+                            {
+                                name: "",
+                                yAxis: 2,
+                                lineStyle: {
+                                    color: '#FF9900',
+
+                                },
+                                label: {
+                                    // position:"middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#FF9900',
+
+                                    }
+                                }
+                            },
+                            {
+                                name: "",
+                                yAxis: 3,
+                                lineStyle: {
+                                    color: '#FFCC33',
+                                },
+                                label: {
+                                    // position:"middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#FFCC33',
+
+                                    }
+                                }
+                            },
+                            {
+                                name: "",
+                                yAxis: 4,
+                                lineStyle: {
+                                    color: '#3399FF',
+                                },
+                                label: {
+                                    // position:"middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#3399FF',
+
+                                    }
+                                }
+                            },
+                            {
+                                name: "",
+                                yAxis: 5,
+                                lineStyle: {
+                                    color: '#339966',
+                                },
+                                label: {
+                                    // position:"middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#339966',
+
+                                    }
+                                }
+                            },
+                        ]
+                    },
+
+                }
+            ]
+        }
+    }
+}
+
+onMounted(() => {
+    tableStore.index()
+})
+const layout = mainHeight(133) as any
+const layout1 = mainHeight(93) as any
+</script>
+<style lang="scss" scoped>
+.tall {
+    height: calc(v-bind('layout1.height') / 2);
+}
+
+.tag {
+    color: #fff;
+    border: #fff;
+    margin-left: 5px;
+    width: 28px;
+}
+
+.text {
+    font-weight: bold;
+    font-size: 12px;
+}
+
+:deep(.cardBox) {
+
+    box-sizing: border-box;
+    overflow: auto;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+    grid-template-rows: max-content;
+    grid-gap: 10px;
+    justify-content: center;
+
+    .el-card {
+        background-image: linear-gradient(var(--el-color-primary), var(--el-color-primary-light-3));
+        font-weight: bold;
+
+
+
+        .el-card__header {
+            padding: 10px !important;
+            color: #fff;
+
+            div {
+                display: flex;
+                justify-content: space-between;
+            }
+
+        }
+
+        .el-card__body {
+            padding: 10px !important;
+        }
+
+        .card-content {
+            height: 200px;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            overflow-y: auto;
+            color: #000;
+
+            .card-item {
+                margin-bottom: 20px;
+                width: 50%;
+                display: flex;
+                cursor: pointer;
+
+            }
+
+            .xdf {
+                width: 70%;
+            }
+
+            .tooltipText {
+                font-weight: 500;
+                font-size: 12px;
+                color: #fff;
+                // width: 50%;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                margin-left: 5px;
+
+            }
+
+        }
+    }
+
+}
+</style>
diff --git a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/components/charts.vue b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/components/charts.vue
new file mode 100644
index 00000000..1aaf9875
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/components/charts.vue
@@ -0,0 +1,300 @@
+<template>
+    <div class="charts" style="position: relative; width: 100%">
+        <div style="position: absolute; right: 60px; top: 5px; font-weight: bold">
+            <el-tag style="
+                    background: #cc0000;
+                    width: 30px;
+                    height: 15px;
+                    border: 1px solid #cc0000;
+                    float: left;
+                    margin-top: 2px;
+                "></el-tag>
+            <span style="color: #cc0000; font-weight: 400; float: left">&nbsp&nbsp在线率<60% &nbsp&nbsp</span>
+                    <el-tag size="small" style="
+                    background: #ffcc33;
+                    width: 30px;
+                    height: 15px;
+                    border: 1px solid #ffcc33;
+                    float: left;
+                    margin-top: 2px;
+                "></el-tag>
+                    <span style="color: #ffcc33; font-weight: 400; float: left">&nbsp&nbsp60%≤在线率<90% &nbsp&nbsp</span>
+                            <el-tag style="
+                    background: #339966;
+                    width: 30px;
+                    height: 15px;
+                    border: 1px solid #339966;
+                    float: left;
+                    margin-top: 2px;
+                "></el-tag>
+                            <span style="color: #339966; font-weight: 400; float: left">&nbsp&nbsp在线率≥90%</span>
+        </div>
+        <my-echart v-loading="loading" class="mt10" :style="`height: calc(${tableStore.table.height} - 135px)`"
+            :options="options" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import * as echarts from 'echarts/core'
+const dictData = useDictData()
+const options = ref({})
+
+
+
+const TableHeaderRef = ref()
+const tableStoreParams: any = ref({})
+const loading = ref(false)
+const getTableStoreParams = async (val: any) => {
+    tableStoreParams.value = val
+    loading.value = true
+    setTimeout(() => {
+        tableStore.index()
+    }, 1500)
+}
+const itemStyle = {
+    normal: {
+        // 随机显示
+        //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
+
+        // 定制显示（按顺序）
+        color: function (params) {
+            if (params.value >= 90) {
+                return new echarts.graphic.LinearGradient(
+                    0,
+                    1,
+                    0,
+                    0,
+                    [
+                        {
+                            offset: 1,
+                            color: '#339966',
+                        },
+                    ],
+                    false
+                );
+            } else if (params.value >= 60 && params.value <= 90) {
+                return new echarts.graphic.LinearGradient(
+                    0,
+                    1,
+                    0,
+                    0,
+                    [
+                        {
+                            offset: 1,
+                            color: '#FFCC33',
+                        },
+                    ],
+                    false
+                );
+            } else if (params.value <= 60 && params.value !== 3.14159) {
+                return new echarts.graphic.LinearGradient(
+                    0,
+                    1,
+                    0,
+                    0,
+                    [
+                        {
+                            offset: 1,
+                            color: '#CC0000',
+                        },
+                    ],
+                    false
+                );
+            } else if (params.value == 3.14159) {
+                return new echarts.graphic.LinearGradient(
+                    0,
+                    1,
+                    0,
+                    0,
+                    [
+                        {
+                            offset: 1,
+                            color: "#cccccc",
+                        },
+                    ],
+                    false
+                );
+            }
+        },
+    },
+}
+
+
+const tableStore = new TableStore({
+    url: '/harmonic-boot/steadyQualify/getSteadyQualifyCensus',
+    showPage: false,
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params = tableStoreParams.value
+    },
+    loadCallback: () => {
+
+        let code = tableStore.table.params.statisticalType.code
+        let title = '',
+            titleX = ''
+        if (code == 'Power_Network') {
+            title = '区域'
+            titleX = '区域'
+        } else if (code == 'Manufacturer') {
+            title = '终端厂家'
+            titleX = '终端\n厂家'
+        } else if (code == 'Voltage_Level') {
+            title = '电压等级'
+            titleX = '电压\n等级'
+        } else if (code == 'Load_Type') {
+            title = '干扰源类型'
+            titleX = '干扰\n源类型'
+        } else if (code == 'Report_Type') {
+            title = '上报类型'
+            titleX = '上报\n类型'
+        }
+        options.value = {
+            title: {
+                text: title
+            },
+            legend: {
+                show: false
+            },
+
+            // tooltip: {
+            //     formatter: function (params: any) {
+            //         var tips = ''
+
+            //         for (var i = 0; i < params.length; i++) {
+            //             if (params[i].value == 1) {
+            //                 tips += params[i].name + '</br>'
+            //                 tips += '总畸变率:暂无数据'
+            //             } else {
+            //                 tips += params[i].name + '</br>'
+            //                 tips += '总畸变率:' + params[i].value.toFixed(2)
+            //             }
+            //         }
+            //         return tips
+            //     }
+            // },
+
+            xAxis: {
+                name: titleX,
+                data: tableStore.table.data.type
+            },
+            yAxis: {
+                name: '%',
+                max: 100
+            },
+            series: [
+                {
+                    name: "频率偏差",
+                    type: "bar",
+                    itemStyle: itemStyle,
+                    data: tableStore.table.data.freqOffset,
+                    markLine: {
+                        silent: false,
+                        symbol: "circle",
+                        data: [
+                            {
+                                name: "",
+                                yAxis: 100,
+                                lineStyle: {
+                                    color: '#339966',
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: "{b}",
+                                    textStyle: {
+                                        color: '#339966',
+                                    },
+                                },
+                            },
+                            {
+                                name: "",
+                                yAxis: 90,
+                                lineStyle: {
+                                    color: '#FFCC33',
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: "{b}",
+                                    textStyle: {
+                                        color: '#FFCC33',
+                                    },
+                                },
+                            },
+                            {
+                                name: "",
+                                yAxis: 60,
+                                lineStyle: {
+                                    color: '#CC0000',
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: "{b}",
+                                    textStyle: {
+                                        color: '#CC0000',
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                },
+                {
+                    name: "闪变",
+                    type: "bar",
+                    itemStyle: itemStyle,
+                    data: tableStore.table.data.flicker,
+                },
+                {
+                    name: "三相电压不平衡",
+                    type: "bar",
+                    itemStyle: itemStyle,
+                    data: tableStore.table.data.voltageUnbalance,
+                },
+                {
+                    name: "谐波电压",
+                    type: "bar",
+                    itemStyle: itemStyle,
+                    data: tableStore.table.data.harmonicVoltage,
+                },
+                {
+                    name: "电压偏差",
+                    type: "bar",
+                    itemStyle: itemStyle,
+                    data: tableStore.table.data.voltageOffset,
+                },
+                {
+                    name: "谐波电流",
+                    type: "bar",
+                    itemStyle: itemStyle,
+                    data: tableStore.table.data.harmonicCurrent,
+                },
+                {
+                    name: "负序电流",
+                    type: "bar",
+                    itemStyle: itemStyle,
+                    data: tableStore.table.data.negativeCurrent,
+                },
+                {
+                    name: "间谐波电压含有率",
+                    type: "bar",
+                    itemStyle: itemStyle,
+                    data: tableStore.table.data.interHarmonic,
+                },
+
+            ]
+        }
+        loading.value = false
+    }
+})
+
+
+provide('tableStore', tableStore)
+
+onMounted(() => { })
+defineExpose({ getTableStoreParams })
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
new file mode 100644
index 00000000..7b335b41
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
@@ -0,0 +1,180 @@
+<template>
+    <div class="default-main online">
+        <div class="online_header">
+            <TableHeader date-picker area ref="tableHeaderRef">
+                <template #select>
+                    <el-form-item label="统计类型:">
+                        <el-select v-model="tableStore.table.params.statisticalType" placeholder="请选择统计类型"
+                            value-key="id" style="width: 100%">
+                            <el-option v-for="item in classificationData" :key="item.id" :label="item.name"
+                                :value="item"></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="电压等级:">
+                        <el-select v-model="tableStore.table.params.scale" multiple collapse-tags clearable
+                            placeholder="请选择电压等级" style="width: 100%" value-key="id">
+                            <el-option v-for="item in voltageleveloption" :key="item.id" :label="item.name"
+                                :value="item"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="终端厂家:">
+                        <el-select v-model="tableStore.table.params.manufacturer" multiple collapse-tags clearable
+                            placeholder="请选择终端厂家" style="width: 100%" value-key="id">
+                            <el-option v-for="(item, index) in terminaloption" :key="index" :label="item.name"
+                                :value="item"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="干扰源类型:">
+                        <el-select v-model="tableStore.table.params.loadType" multiple collapse-tags clearable
+                            placeholder="请选择干扰源类型" style="width: 100%" value-key="id">
+                            <el-option v-for="(item, index) in interfereoption" :key="index" :label="item.name"
+                                :value="item"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+        </div>
+        <div class="online_main">
+            <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+                <el-tab-pane :name="0" :lazy="true" label="谐波畸变率统计表">
+                    <Table ref="tableRef" :tree-config="{ transform: true, parentField: 'pid' }"
+                        :scroll-y="{ enabled: true }" v-if="activeName == 0" />
+                </el-tab-pane>
+                <el-tab-pane :name="1" :lazy="true" label="谐波畸变率统计图">
+                    <charts v-if="activeName == 1" ref="chartsRef" />
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, watch } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import { getAreaDept } from '@/api/harmonic-boot/area'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import charts from './components/charts.vue'
+defineOptions({
+    name: 'harmonic-boot/area/qualifiedRate'
+})
+const tableRef = ref()
+const onlineChartsRef = ref()
+const dictData = useDictData()
+//字典获取电压等级
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+//字典获取终端厂家
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+//字典获取干扰源类型
+const interfereoption = dictData.getBasicData('Interference_Source')
+//字典获取统计类型
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+//调用区域接口获取区域
+const treeData = ref([])
+const idArr = ref([])
+const activeName = ref(0)
+const getTreeData = async () => {
+    await getAreaDept().then(res => {
+        var data = res.data
+        data.forEach(element => {
+            idArr.value.push(element.id)
+        })
+        treeData.value = JSON.parse(JSON.stringify(res.data))
+    })
+}
+getTreeData()
+
+
+
+const chartsRef = ref()
+const handleClick = (tab: any, e: any) => {
+    // console.log(tab,e,"??????????");
+    // if(activeName.value===1){
+    tableStore.index()
+    // }
+}
+
+// const datePickerRef = ref()
+const tableHeaderRef = ref()
+const tableStore = new TableStore({
+    publicHeight: 60,
+    showPage: false,
+    url: '/harmonic-boot/steadyQualify/getSteadyQualifyData',
+    method: 'POST',
+    column: [
+        { title: '', field: 'name', align: 'left', treeNode: true,width: 200, },
+        { title: '电压等级', field: 'voltageLevel', align: 'center', formatter: function (row) { return row.cellValue ? row.cellValue : '/' } },
+        { title: '网络参数', field: 'networkParam', align: 'center', formatter: function (row) { return row.cellValue ? row.cellValue : '/' } },
+        { title: '监测点名称', field: 'lineName', align: 'center', formatter: function (row) { return row.cellValue ? row.cellValue : '/' } },
+        { title: '厂家', field: 'factoryName', align: 'center', formatter: function (row) { return row.cellValue ? row.cellValue : '/' } },
+        { title: '谐波电压(%)', field: 'harmonicVoltage', align: 'center', formatter: function (row) { return row.cellValue !=3.14159 ? row.cellValue : '/' } },
+        { title: '电压偏差(%)', field: 'voltageOffset', align: 'center', formatter: function (row) { return row.cellValue !=3.14159 ? row.cellValue : '/' } },
+        { title: '三相电压不平衡度(%)', field: 'voltageUnbalance', align: 'center', formatter: function (row) { return row.cellValue !=3.14159 ? row.cellValue : '/' } },
+        { title: '间谐波电压含有率(%)', field: 'interHarmonic', align: 'center', formatter: function (row) { return row.cellValue !=3.14159 ? row.cellValue : '/' } },
+        { title: '谐波电流(%)', field: 'harmonicCurrent', align: 'center', formatter: function (row) { return row.cellValue !=3.14159 ? row.cellValue : '/' } },
+        { title: '负序电流(%)', field: 'negativeCurrent', align: 'center', formatter: function (row) { return row.cellValue !=3.14159 ? row.cellValue : '/' } },
+        { title: '频率偏差(%)', field: 'freqOffset', align: 'center', formatter: function (row) { return row.cellValue !=3.14159 ? row.cellValue : '/' } },
+        { title: '闪变(%)', field: 'flicker', align: 'center', formatter: function (row) { return row.cellValue !=3.14159 ? row.cellValue : '/' } },
+
+    ],
+
+    loadCallback: () => {
+        let treeData = []
+        treeData = tree2List(tableStore.table.data)
+        tableStore.table.column[0].title = tableStore.table.params.statisticalType.name
+        tableStore.table.data = JSON.parse(JSON.stringify(treeData))
+        chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
+        setTimeout(() => {
+            activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
+        }, 0)
+    }
+})
+
+
+tableStore.table.params.statisticalType = classificationData[0]
+tableStore.table.params.scale = []
+tableStore.table.params.manufacturer = []
+tableStore.table.params.loadType = []
+tableStore.table.params.serverName = 'harmonicBoot'
+provide('tableStore', tableStore)
+const tree2List = (list: any, pid?: string) => {
+    //存储结果的数组
+    let arr: any = []
+    // 遍历 tree 数组
+    list.forEach((item: any) => {
+        // item.comFlag = item.comFlag == null ? 3 : item.comFlag
+        item.valueOver == 3.14159 ? 0 : item.valueOver >= 90 ? 1 : item.valueOver && item.valueOver < 90 ? 2 : 3
+        item.pid = pid
+        // 判断item是否存在children
+        if (!item.children) return arr.push(item)
+        // 函数递归，对children数组进行tree2List的转换
+        const children = tree2List(item.children, item.id)
+        // 删除item的children属性
+        delete item.children
+        // 把item和children数组添加至结果数组
+        //..children: 意思是把children数组展开
+        arr.push(item, ...children)
+    })
+    // 返回结果数组
+    return arr
+}
+onMounted(() => { tableStore.index() })
+
+
+</script>
+<style lang="scss" scoped>
+// .online {
+//     width: 100%;
+//     height: 100%;
+//     .online_header {
+//         width: 100%;
+//         max-height: 140px;
+//         padding: 10px;
+//         box-sizing: border-box;
+//     }
+//     .online_main {
+//         padding: 0 10px;
+//     }
+// }</style>
diff --git a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/components/charts.vue b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/components/charts.vue
index b8b9317d..1adac154 100644
--- a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/components/charts.vue
+++ b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/components/charts.vue
@@ -12,7 +12,7 @@
                     margin-top: 2px;
                 "></el-tag>
             <span style="color: #cc0000; font-weight: 400; float: left">&nbsp&nbsp在线率<60% &nbsp&nbsp</span>
-                    <el-tag size="mini" style="
+                    <el-tag size="small" style="
                     background: #ffcc33;
                     width: 30px;
                     height: 15px;
@@ -29,7 +29,7 @@
                     float: left;
                     margin-top: 2px;
                 "></el-tag>
-                            <span style="color: #339966; font-weight: 400; float: left">&nbsp&nbsp在线率>90%</span>
+                            <span style="color: #339966; font-weight: 400; float: left">&nbsp&nbsp在线率≥90%</span>
         </div>
         <my-echart v-loading="loading" :style="`height: calc(${tableStore.table.height} - 125px)`" :options="options" />
     </div>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
index 7e46397b..38f1e055 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
@@ -146,7 +146,7 @@ import { mainHeight } from '@/utils/layout'
 import { deptInfo } from '@/api/harmonic-boot/area'
 import * as echarts from 'echarts/core'
 defineOptions({
-    name: 'harmonic-boot/detailedAnalysis/station'
+    name: 'harmonic-boot/detailedAnalysis/harmonictj'
 })
 const dictData = useDictData()
 const echartList = ref({})
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
index eb7b6559..12b3d356 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -98,7 +98,7 @@ const tableStore = new TableStore({
         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].v = k.v) : ''
+              item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v ) : ''
             })
         })
         console.log(tableStore.table.data)
diff --git a/src/views/pqs/harmonicMonitoring/views/index.vue b/src/views/pqs/harmonicMonitoring/views/index.vue
new file mode 100644
index 00000000..4cc658a7
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/views/index.vue
@@ -0,0 +1,748 @@
+<template>
+    <div class="default-main">
+        <TableHeader area date-picker ref="header">
+
+        </TableHeader>
+        <div v-loading="tableStore.table.loading" class="pr10">
+            <el-row>
+                <el-col :span="12">
+                    <MyEchartMap ref="EchartMap" :options="echartMapList" class="map"
+                        @getRegionByRegion="getRegionByRegion" />
+                </el-col>
+                <el-col :span="12">
+                    <my-echart class="tall" :options="echartList" />
+
+                </el-col>
+            </el-row>
+        </div>
+        <el-carousel :interval="6000" :autoplay="action" type="card" class="boxDiv"
+            style="width: 700px; font-size: 12px; left: 50px; margin-bottom: 10px" height="40px">
+            <el-button type="primary" @click="stopFucarous" class="primary" :icon="icon" circle style="z-index: 9999;    height: 40px;
+    width: 40px; position: relative;"></el-button>
+            <el-carousel-item v-for="item in XList" :key="item">
+                <h3 class="medium">{{ item }}</h3>
+            </el-carousel-item>
+        </el-carousel>
+
+
+    </div>
+</template>
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableStore from '@/utils/tableStore'
+import { ref, onMounted, provide } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import * as echarts from 'echarts/core'
+import { getEnterpriseSteadyQualify,getSteadyQualifyCensus } from '@/api/harmonic-boot/monitoring';
+defineOptions({
+    name: 'harmonic-boot/detailedAnalysis/pollution'
+})
+const EchartMap = ref()
+const dictData = useDictData()
+const echartMapList: any = ref({})
+const echartList = ref({})
+const header = ref()
+const action: any = ref(true)
+const mapList: any = ref([[], [], [], [], [], [], [], [], []])
+const listcard: any = ref([[], [], [], [], [], [], [], [], []])
+const type = JSON.parse(window.localStorage.getItem('sysdata') as string).type
+const icon: any = ref('el-icon-VideoPause')
+const XList = ['合格率', '完整性', '畸变率', '在线率', '暂降', '综合评估', '污区图', '谐波统计']
+const tableStore = new TableStore({
+    url: '/harmonic-boot/PollutionSubstation/deptSubstationRelations',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => { },
+    loadCallback: () => {
+        console.log("🚀 ~ type:", type)
+
+        if (type == 1) {
+            tableStore.table.params.statisticalType = {}
+            getEnterpriseSteadyQualify(tableStore.table.params).then((res: any) => {
+                res.data.forEach(item => {
+                        item.data =
+                            (item.flicker +
+                                item.freqOffset +
+                                item.harmonicCurrent +
+                                item.harmonicVoltage +
+                                item.interHarmonic +
+                                item.negativeCurrent +
+                                item.voltageOffset +
+                                item.voltageUnbalance) /
+                            8
+                        item.children.forEach(val => {
+                            val.data =
+                                (val.flicker +
+                                    val.freqOffset +
+                                    val.harmonicCurrent +
+                                    val.harmonicVoltage +
+                                    val.interHarmonic +
+                                    val.negativeCurrent +
+                                    val.voltageOffset +
+                                    val.voltageUnbalance) /
+                                8
+                        })
+                    })
+                    listcard.value[0] = res.data
+            })
+            
+            getSteadyQualifyCensus(tableStore.table.params).then(res => {
+                    // this.ydata1 = res.data.freqOffset
+                    // this.ydata2 = res.data.flicker
+                    // this.ydata3 = res.data.voltageUnbalance
+                    // this.ydata4 = res.data.harmonicVoltage
+                    // this.ydata5 = res.data.voltageOffset
+                    // this.ydata6 = res.data.harmonicCurrent
+                    // this.ydata7 = res.data.negativeCurrent
+                    // this.ydata8 = res.data.interHarmonic
+                    // for (let i = 0; i < res.data.type.length; i++) {
+                    //     this.mapList[0].push({
+                    //         name: res.data.type[i].split('\n')[0],
+                    //         value: res.data.harmonicVoltage[i]
+                    //     })
+                    // }
+                    // this.showCarousel = true
+                 
+                    // this.evaluation(this.mapList[0], '合格率')
+                    // this.loading = false
+                })
+            //     // 完整性
+            //     getEnterpriseIntegrityData(data1).then(res => {
+            //         res.data.forEach(item => {
+            //             item.data = item.integrityData
+
+            //             item.children.forEach(val => {
+            //                 val.data = val.integrityData
+            //             })
+            //         })
+            //         this.listcard[1] = res.data
+            //     })
+            //     IntegrityIcon(data).then(res => {
+            //         res.data.forEach(item => {
+            //             this.mapList[1].push({
+            //                 name: item.type.split('\n')[0],
+            //                 value: item.single
+            //             })
+            //         })
+            //     })
+            //     // 畸变率
+            //     getNodeTHDistortionData(data1).then(res => {
+            //         res.data.forEach(item => {
+            //             item.data = item.distortion
+            //             item.children.forEach(val => {
+            //                 val.data = val.distortion
+            //             })
+            //         })
+            //         this.listcard[2] = res.data
+            //     })
+            //     getTHDistortionCensus(data).then(res => {
+            //         for (let i = 0; i < res.data.type.length; i++) {
+            //             this.mapList[2].push({
+            //                 name: res.data.type[i].split('\n')[0],
+            //                 value: res.data.single[i]
+            //             })
+            //         }
+            //     })
+            //     // 在线率
+            //                         .getNodeOnlineRateData({
+            //             deptIndex: this.formData.deptIndex,
+            //             loadType: dicData('Interference_Source', []),
+            //             monitorFlag: 2,
+            //             manufacturer: dicData('Dev_Manufacturers', []),
+            //             searchBeginTime: this.$refs.interval.timeValue[0],
+            //             searchEndTime: this.$refs.interval.timeValue[1],
+            //             statisticalType: dicData('Statistical_Type', ['Report_Type'])[0], //dicData("Statistical_Type", ["Report_Type"]),
+            //             powerFlag: 2,
+            //             serverName: 'harmonicBoot',
+            //             scale: dicData('Dev_Voltage_Stand', [])
+            //         })
+            //         .then(res => {
+            //             res.data.forEach(item => {
+            //                 item.data = item.onlineRate
+            //                 item.children.forEach(val => {
+            //                     val.data = val.onlineRate
+            //                 })
+            //             })
+            //             this.listcard[3] = res.data
+            //         })
+            //     getOnlineRateDataCensus(data).then(res => {
+            //         for (let i = 0; i < res.data.type.length; i++) {
+            //             this.mapList[3].push({
+            //                 name: res.data.type[i].split('\n')[0],
+            //                 value: res.data.single[i]
+            //             })
+            //         }
+            //     })
+            //     // 暂降
+            //     lculation(data).then(res => {
+            //         this.listcard[4] = res.data
+            //     })
+            //     eaData(data).then(res => {
+            //         res.data.areaStatistics.areaCalculation.forEach(item => {
+            //             this.mapList[4].push({
+            //                 name: item.areaName.split('\n')[0],
+            //                 value: item.frequency
+            //             })
+            //         })
+            //     })
+            //     getComAccessData(data).then(res => {
+            //         this.listcard[5] = res.data
+            //         res.data.forEach(item => {
+            //             this.mapList[5].push({
+            //                 name: item.name,
+            //                 value: item.data
+            //             })
+            //         })
+            //     })
+            //                         .deptSubstationRelations({
+            //             deptIndex: this.formData.deptIndex,
+            //             id: '',
+            //             monitorFlag: 2,
+            //             powerFlag: 2,
+            //             reportFlag: this.$refs.interval.interval,
+            //             searchBeginTime: this.$refs.interval.timeValue[0],
+            //             searchEndTime: this.$refs.interval.timeValue[1],
+            //             statisticalType: dicData('Pollution_Statis', [
+            //                 'I_Neg',
+            //                 'V_Inharm',
+            //                 'V_Dev',
+            //                 'V_Unbalance',
+            //                 'Plt',
+            //                 'Freq_Dev'
+            //             ])[0]
+            //         })
+            //         .then(res => {
+            //             this.listcard[6] = res.data
+            //             res.data.forEach(item => {
+            //                 this.mapList[6].push({
+            //                     name: item.name.split('\n')[0],
+            //                     value: item.data == -1 ? 0 : item.data
+            //                 })
+            //             })
+            //         })
+            //     // 谐波统计
+            //                         .deptInfolins({
+            //             deptIndex: this.formData.deptIndex,
+            //             id: '',
+            //             monitorFlag: 2,
+            //             powerFlag: 2,
+            //             searchBeginTime: this.$refs.interval.timeValue[0],
+            //             searchEndTime: this.$refs.interval.timeValue[1],
+            //             statisticalType: dicData('Indicator_Type', [
+            //                 'PLPC',
+            //                 'DYPC',
+            //                 'SXDYBPHD',
+            //                 'CSSB',
+            //                 'FXDL',
+            //                 'JXBDY'
+            //             ])[0]
+            //         })
+            //         .then(res => {
+            //             res.data.forEach(item => {
+            //                 this.mapList[7].push({ name: item.name, value: item.ratio })
+            //             })
+            //         })
+            //                         .deptSubstationRelations({
+            //             deptIndex: this.formData.deptIndex,
+            //             id: '',
+            //             monitorFlag: 2,
+            //             powerFlag: 2,
+            //             searchBeginTime: this.$refs.interval.timeValue[0],
+            //             searchEndTime: this.$refs.interval.timeValue[1],
+            //             statisticalType: dicData('Indicator_Type', [
+            //                 'PLPC',
+            //                 'DYPC',
+            //                 'SXDYBPHD',
+            //                 'CSSB',
+            //                 'FXDL',
+            //                 'JXBDY'
+            //             ])[0]
+            //         })
+            //         .then(res => {
+            //             this.listcard[7] = res.data
+            //         })
+
+
+        } else {
+            tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
+
+        }
+
+
+        map(tableStore.table.data)
+        histogram(tableStore.table.data)
+        EchartMap.value.GetEchar(header.value.areaRef.areaName)
+
+
+    }
+})
+
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.loadType = dictData.getBasicData('Interference_Source',)
+tableStore.table.params.manufacturer = dictData.getBasicData('Dev_Manufacturers',)
+tableStore.table.params.scale = dictData.getBasicData('Dev_Voltage_Stand',)
+tableStore.table.params.statisticalType = {}
+provide('tableStore', tableStore)
+
+// 地图点击事件
+const getRegionByRegion = (list: any) => {
+    tableStore.table.params.deptIndex = list.id
+    tableStore.onTableAction('search', {})
+}
+
+
+
+
+// 地图数处理
+const map = (res: any) => {
+    let areaData: any = []
+    let xarr = []
+    let yarr = []
+    let arr = []
+    let arr1: any = []
+    res.forEach(element => {
+        xarr.push(element.name)
+        if (element.data == 0) {
+            element.data = 0.1
+            yarr.push(element.data)
+        }
+        yarr.push(element.data)
+        let p = {
+            name: element.name,
+            value: element.data
+        }
+        arr.push(p)
+        let d = element.name.split('\n')
+        let p1 = {
+            name: d[0],
+            value: element.data
+        }
+
+        arr1.push(p1)
+    })
+
+
+    echartMapList.value = {
+        name: '',
+        title: {
+            text: '电能质量污区图分布'
+        },
+        tooltip: {
+            formatter: function (params) {
+                var tips = ''
+
+                if (params.value === -1 || window.isNaN(params.value)) {
+                    tips =
+                        "<font style='color:#fff'>" +
+                        params.name +
+                        '</font><br/>区域污染评估:' +
+                        "<font style='color:#fff'><font style='color:#fff'>暂无数据</font><br/>"
+                } else if (params.value === 0.1 || window.isNaN(params.value)) {
+                    tips =
+                        "<font style='color:#fff'>" +
+                        params.name +
+                        '</font><br/>区域污染评估:' +
+                        "<font style='color:#fff'><font style='color:#fff'>暂无数据</font><br/>"
+                } else {
+                    tips +=
+                        "<font style='color:#fff'>" +
+                        params.name +
+                        '</font><br/>区域污染评估' +
+                        "<font style='color:#fff'>：" +
+                        params.value +
+                        '</font><br/>'
+                }
+                return tips
+            }
+        },
+
+
+        visualMap: {
+            min: 0,
+            max: 2,
+            left: 25,
+            bottom: 40,
+            pieces: [
+                {
+                    gt: 2,
+                    lt: 10000,
+                    label: '重度污染',
+                    color: '#CC0000',
+                },
+                {
+                    gte: 1.2,
+                    lt: 1.6,
+                    label: '轻度污染',
+                    color: '#FFCC33'
+                },
+                {
+                    gt: 1.6,
+                    lt: 2,
+                    label: '中度污染',
+                    color: '#FF9900'
+                },
+                {
+                    gte: 1,
+                    lte: 1.2,
+                    label: '轻微污染',
+                    color: '#3399FF'
+                },
+                {
+                    gte: 0.1,
+                    lte: 1,
+                    label: '无污染',
+                    color: '#339966'
+                },
+                {
+                    gte: -1,
+                    lte: 0.05,
+                    label: '无数据',
+                    color: '#ccc'
+                }
+            ],
+        },
+
+        options: {
+            series: [
+                {
+
+                    type: "map",
+                    geoIndex: 0,
+                    data: arr1,
+
+                }
+            ]
+        }
+
+
+    }
+}
+
+// 柱状图数据处理
+const histogram = (res: any) => {
+    echartList.value = {
+        title: {
+            text: '区域'
+        },
+        tooltip: {
+            formatter: function (params: any) {
+                // console.log(params);
+                var tips = ''
+                for (var i = 0; i < params.length; i++) {
+                    tips += params[i].name + '</br/>'
+                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + (params[i].value == 0.14159 ? '暂无数据' : params[i].value) + '</br/>'
+                }
+                return tips
+            }
+        },
+
+        xAxis: {
+            name: '区域',
+            data: res.map((item: any) => item.name)
+        },
+        yAxis: {
+            name: '等级',// 给X轴加单位
+            min: 0,
+            max: 2,
+            interval: 0.2,
+            splitLine: {
+                show: false
+            },
+            axisLabel: {
+                show: true,
+
+                // 这里重新定义就可以
+                formatter: function (value, index) {
+                    var texts = []
+                    if (value === 1) {
+                        texts.push('1级')
+                    } else if (value === 1.2) {
+                        texts.push('2级')
+                    } else if (value === 1.4) {
+                        texts.push('3级')
+                    } else if (value === 1.6) {
+                        texts.push('4级')
+                    } else if (value === 2) {
+                        texts.push('5级')
+                    }
+                    return texts
+                }
+            },
+        },
+
+        options: {
+            dataZoom: null,
+            series: [
+                {
+
+                    type: 'bar',
+                    data: res.map((item: any) => {
+                        return item.data == 3.14159 ? 0.14159 : item.data
+                    }),
+                    barMaxWidth: 30,
+
+                    itemStyle: {
+                        normal: {
+                            // 随机显示
+                            //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
+
+                            // 定制显示（按顺序）
+                            color: function (params) {
+                                if (params.value == 0 || params.value == 0.14159) {
+                                    return '#ccc'
+                                } else if (params.value > 2) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#CC0000'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (1.6 < params.value && params.value <= 2) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#FF9900'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (1.2 < params.value && params.value <= 1.6) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#FFCC33'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (1 < params.value && params.value <= 1.2) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#3399FF'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (
+                                    0 < params.value &&
+                                    params.value <= 1 &&
+                                    params.value >= 0 &&
+                                    params.value !== 0.05
+                                ) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#339966'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (params.value == 0.05) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#999999'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                }
+                            }
+                        }
+                    },
+                    markLine: {
+                        silent: false,
+                        symbol: 'circle',
+                        lineStyle: {
+                            color: 'red',
+                            width: 1
+                        },
+                        emphasis: {
+                            lineStyle: {
+                                width: 1
+                            }
+                        },
+                        data: [
+                            {
+                                name: '',
+                                yAxis: 1,
+                                lineStyle: {
+                                    color: '#339966'
+                                },
+                                label: {
+                                    //position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#339966'
+                                    }
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 1.2,
+                                lineStyle: {
+                                    color: '#3399FF'
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#3399FF'
+                                    }
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 1.4,
+                                lineStyle: {
+                                    color: '#FFCC33'
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#FFCC33'
+                                    }
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 1.6,
+                                lineStyle: {
+                                    color: '#FF9900'
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#FF9900'
+                                    }
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 2,
+                                lineStyle: {
+                                    color: '#CC0000'
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#CC0000'
+                                    }
+                                }
+                            }
+                        ]
+                    },
+
+                }
+            ]
+        }
+    }
+}
+const stopFucarous = () => {
+    if (action.value) {
+        action.value = false
+        icon.value = 'el-icon-VideoPlay'
+    } else {
+        action.value = true
+        icon.value = 'el-icon-VideoPause'
+    }
+}
+
+onMounted(() => {
+    setTimeout(() => {
+        tableStore.index()
+    }, 10)
+})
+const layout = mainHeight(83) as any
+const layout1 = mainHeight(93) as any
+</script>
+<style lang="scss" scoped>
+.map {
+    height: v-bind('layout.height');
+}
+
+:deep(.el-carousel__container) {
+    position: relative;
+    // height: 300px ;
+    border-radius: 20px;
+    background: #466e831e !important;
+    font-weight: bold !important;
+    font-size: 16px !important;
+}
+
+:deep(.el-carousel__mask) {
+    width: 100%;
+    background-color: #4f5c6141 !important;
+    border-radius: 20px;
+    opacity: 0.24;
+    -webkit-transition: 0.2s;
+    transition: 0.2s;
+}
+
+:deep(.el-carousel__arrow--left) {
+    left: 40px !important;
+}
+
+:deep(.el-carousel__indicators) {
+    display: none;
+}
+
+.tall {
+    height: calc(v-bind('layout1.height') - 50px);
+}
+
+.boxDiv {
+    position: absolute;
+    top: calc(100vh - 175px) !important;
+    left: calc(50% - 350px) !important;
+    z-index: 10;
+    border-radius: 20px !important;
+    background: #fff;
+}
+
+.medium {
+    margin-top: 6px;
+    text-align: center;
+    align-items: center;
+}
+</style>
diff --git a/src/views/system/reportForms/look.vue b/src/views/system/reportForms/look.vue
index ba06ec9b..86d47089 100644
--- a/src/views/system/reportForms/look.vue
+++ b/src/views/system/reportForms/look.vue
@@ -87,7 +87,7 @@ const open = async (row: any) => {
     await viewCustomReportTemplateById({ id: row.id }).then((Response:any) => {
         Response.forEach((item: any) => {
         item.celldata.forEach((k: any) => {
-            item.data[k.r][k.c].v = k.v
+          item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v ) : ''
         })
     })
         options.value.data = Response
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index 36fc8be9..9bfe9635 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -68,7 +68,7 @@
 import { onMounted, onBeforeUnmount, reactive, ref, nextTick } from 'vue'
 import * as pageBubble from '@/utils/pageBubble'
 import { ElMessage } from 'element-plus'
-import { gongkey, login } from '@/api/user-boot/user'
+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'
@@ -164,6 +164,9 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
                 .then(res => {
                     userInfo.dataFill(res.data)
                     state.submitLoading = false
+                    getSysConfig().then(res => {
+                        window.localStorage.setItem('sysdata', JSON.stringify(res.data))
+                    })
                     router.push({
                         path: '/'
                     })