diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index cbf724b5..d40abab6 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -1,213 +1,7 @@
 <template>
     <div class="default-main" ref="HomeHight">
-        <el-row :gutter="20" style="margin: 0px">
-            <el-col :md="24" :lg="6" style="padding: 0px">
-                <div class="grid-content ep-bg-purple">
-                    <!--风场概览-->
-                    <div class="overview panelBg">
-                        <el-text class="mx-1 homelabel">风场概览</el-text>
-                        <el-row :gutter="10">
-                            <el-col :sm="24" :md="12">
-                                <div :xs="24" :sm="6" class="small-panel" style="margin-bottom: 10px">
-                                    <img class="small-panel-pic" src="~assets/dashboard/viewP.png" alt="" />
-                                    <div class="small-base">
-                                        <div>
-                                            <span class="content-number">{{ realData.attributeMap.windfarmactivepower }}</span> <span>MW</span>
-                                        </div>
-                                        <div>功率</div>
-                                    </div>
-                                </div>
-                                <div :sm="24" :md="6" class="small-panel">
-                                    <img class="small-panel-pic" src="~assets/dashboard/viewW.png" alt="" />
-                                    <div class="small-base">
-                                        <div>
-                                            <span class="content-number">{{ realData.attributeMap.windfarmavgwindspeed }}</span> <span>m/s</span>
-                                        </div>
-                                        <div>风速</div>
-                                    </div>
-                                </div>
-                            </el-col>
-                            <el-col :sm="24" :md="12">
-                                <div :xs="24" :sm="6" class="small-panel" style="margin-bottom: 10px">
-                                    <img class="small-panel-pic" src="~assets/dashboard/viewR.png" alt="" />
-                                    <div class="small-base">
-                                        <div>
-                                            <span class="content-number">{{ realData.attributeMap.windfarmdayoperationhours }}</span> <span>H</span>
-                                        </div>
-                                        <div>日利用小时</div>
-                                    </div>
-                                </div>
-                                <div :xs="24" :sm="6" class="small-panel">
-                                    <img class="small-panel-pic" src="~assets/dashboard/viewY.png" alt="" />
-                                    <div class="small-base">
-                                        <div>
-                                            <span class="content-number">{{ realData.attributeMap.windfarmmonthoperationhours }}</span> <span>H</span>
-                                        </div>
-                                        <div>月利用小时</div>
-                                    </div>
-                                </div>
-                            </el-col>
-                        </el-row>
-                    </div>
-
-                    <!--今日运行状态-->
-                    <div class="status panelBg">
-                        <el-text class="mx-1 homelabel" style="margin-bottom: 0">今日运行状态</el-text>
-                        <el-row :gutter="10" class="statusrow" style="margin-bottom: 0">
-                            <el-col :span="12">
-                                <div class="status-panel toal-panel">
-                                    <img class="status-panel-pic" src="~assets/dashboard/status1.png" alt="" />
-                                    <div class="status-base-main">
-                                        <div>
-                                            <span class="content-number">{{ currentDayStatus.windTurbineNum }}</span> <span>台</span>
-                                        </div>
-                                        <div>风机台数</div>
-                                    </div>
-                                </div>
-                            </el-col>
-                            <el-col :span="12">
-                                <div class="status-panel toal-panel">
-                                    <img class="status-panel-pic" src="~assets/dashboard/status2.png" alt="" />
-                                    <div class="status-base-main">
-                                        <div>
-                                            <span class="content-number">{{ currentDayStatus.installedCapacity }}</span> <span>MW</span>
-                                        </div>
-                                        <div>装机容量</div>
-                                    </div>
-                                </div>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="10" class="statusrow">
-                            <el-col :span="12">
-                                <div class="status-panel status-con">
-                                    <div>
-                                        <img class="status-panel-piczt" src="~assets/dashboard/status04.png" alt="" />
-                                        <p>运行</p>
-                                    </div>
-                                    <div class="status-base">
-                                        <div class="capacity">
-                                            <p class="content-number">{{ currentDayStatus.runCapacityTotal }}</p>
-                                            <p>MW</p>
-                                        </div>
-                                        <div class="units">
-                                            <p class="content-number">{{ currentDayStatus.runNum }}</p>
-                                            <p>台</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </el-col>
-                            <el-col :span="12">
-                                <div class="status-panel status-con">
-                                    <div>
-                                        <img class="status-panel-piczt" src="~assets/dashboard/status03.png" alt="" />
-                                        <p>启动</p>
-                                    </div>
-                                    <div class="status-base">
-                                        <div class="capacity">
-                                            <p class="content-number">{{ currentDayStatus.StartCapacityTotal }}</p>
-                                            <p>MW</p>
-                                        </div>
-                                        <div class="units">
-                                            <p class="content-number">{{ currentDayStatus.StarteNum }}</p>
-                                            <p>台</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="10" class="statusrow">
-                            <el-col :span="12">
-                                <div class="status-panel status-con">
-                                    <div>
-                                        <img class="status-panel-piczt" src="~assets/dashboard/status01.png" alt="" />
-                                        <p>待机</p>
-                                    </div>
-
-                                    <div class="status-base">
-                                        <div class="capacity">
-                                            <p class="content-number">{{ currentDayStatus.faultCapacityTotal }}</p>
-                                            <p>MW</p>
-                                        </div>
-                                        <div class="units">
-                                            <p class="content-number">{{ currentDayStatus.faultNum }}</p>
-                                            <p>台</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </el-col>
-                            <el-col :span="12">
-                                <div class="status-panel status-con">
-                                    <div>
-                                        <img class="status-panel-piczt" src="~assets/dashboard/status06.png" alt="" />
-                                        <p>停机</p>
-                                    </div>
-
-                                    <div class="status-base">
-                                        <div class="capacity">
-                                            <p class="content-number">{{ currentDayStatus.standbyCapacityTotal }}</p>
-                                            <p>MW</p>
-                                        </div>
-                                        <div class="units">
-                                            <p class="content-number">{{ currentDayStatus.standbyNum }}</p>
-                                            <p>台</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="10">
-                            <el-col :span="12">
-                                <div class="status-panel status-con">
-                                    <div>
-                                        <img class="status-panel-piczt" src="~assets/dashboard/status02.png" alt="" />
-                                        <p>离线</p>
-                                    </div>
-
-                                    <div class="status-base">
-                                        <div class="capacity">
-                                            <p class="content-number">{{ currentDayStatus.offlineCapacityTotal }}</p>
-                                            <p>MW</p>
-                                        </div>
-                                        <div class="units">
-                                            <p class="content-number">{{ currentDayStatus.offlineNum }}</p>
-                                            <p>台</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </el-col>
-                            <el-col :span="12">
-                                <div class="status-panel status-con">
-                                    <div>
-                                        <img class="status-panel-piczt" src="~assets/dashboard/status05.png" alt="" />
-                                        <p>维修</p>
-                                    </div>
-
-                                    <div class="status-base">
-                                        <div class="capacity">
-                                            <p class="content-number">{{ currentDayStatus.StandCapacityTotal }}</p>
-                                            <p>MW</p>
-                                        </div>
-                                        <div class="units">
-                                            <p class="content-number">{{ currentDayStatus.StandNum }}</p>
-                                            <p>台</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </el-col>
-                        </el-row>
-                    </div>
-
-                    <!--功率趋势-->
-                    <div class="power panelBg" style="margin-bottom: 0; padding-bottom: 10px">
-                        <div class="cardLabel">功率趋势</div>
-                        <div class="chartBox">
-                            <div class="power-chart" ref="powerChartRef"></div>
-                        </div>
-                    </div>
-                </div>
-            </el-col>
-
-            <el-col :md="24" :lg="12" class="col-center">
+        <el-row style="margin: 0px;">
+            <el-col :md="24" :lg="16" class="col-center" style="padding-right: 10px;">
                 <div class="grid-content ep-bg-purple-light">
                     <!--风机矩阵-->
                     <div class="matrix panelBg">
@@ -218,104 +12,26 @@
                     </div>
                 </div>
             </el-col>
-            <el-col :md="24" :lg="6" style="padding: 0px">
+            <el-col :md="24" :lg="8" style="padding: 0px">
                 <div class="grid-content ep-bg-purple cardContentRight">
-                    <!--发电量概况-->
-                    <div class="summarize">
-                        <div class="cardLabel">发电量概况</div>
-                        <div class="summarize-panel-list">
-                            <div class="summarize-panel">
-                                <div class="summarize-panel-pic">
-                                    <img src="~assets/dashboard/fdl1.png" alt="" />
-                                </div>
-                                <div class="summarize-panel-base">
-                                    <div>
-                                        <span class="content-number">{{ realData.attributeMap.windfarmdayprodenergy }}</span>
-                                    </div>
-                                    <div>kWh</div>
-                                    <div>日发电量</div>
-                                </div>
-                            </div>
-                            <div class="summarize-panel">
-                                <div class="summarize-panel-pic">
-                                    <img src="~assets/dashboard/fdl2.png" alt="" />
-                                </div>
-                                <div class="summarize-panel-base">
-                                    <div>
-                                        <span class="content-number">{{ realData.attributeMap.windfarmmonthprodenergy }}</span>
-                                    </div>
-                                    <div>kWh</div>
-                                    <div>月发电量</div>
-                                </div>
-                            </div>
-                            <div class="summarize-panel">
-                                <div class="summarize-panel-pic">
-                                    <img src="~assets/dashboard/fdl3.png" alt="" />
-                                </div>
-                                <div class="summarize-panel-base">
-                                    <div>
-                                        <span class="content-number">{{ realData.attributeMap.windfarmyearprodenergy }}</span>
-                                    </div>
-                                    <div>kWh</div>
-                                    <div>年发电量</div>
-                                </div>
-                            </div>
-                            <div class="summarize-panel">
-                                <div class="summarize-panel-pic">
-                                    <img src="~assets/dashboard/fdl4.png" alt="" />
-                                </div>
-                                <div class="summarize-panel-base">
-                                    <div>
-                                        <span class="content-number">{{ realData.attributeMap.windfarmtotalprodenergy }}</span>
-                                    </div>
-                                    <div>kWh</div>
-                                    <div>总发电量</div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!--发电量趋势-->
-                    <div class="trend panelBg">
-                        <el-text class="mx-1 homelabel">发电量趋势</el-text>
-                        <el-row :gutter="10">
-                            <el-col :span="24">
-                                <el-tabs v-model="trendChartType" class="demo-tabs trend-tabs" @tab-click="tabhandleClick" ref="userTab">
-                                    <el-tab-pane label="日" name="day"> </el-tab-pane>
-                                    <el-tab-pane label="月" name="month"> </el-tab-pane>
-                                </el-tabs>
-                                <div class="trend-chart" ref="trendChartRef"></div>
-                            </el-col>
-                        </el-row>
-                    </div>
-
                     <!--实时告警-->
                     <div class="realPart panelBg" style="margin-bottom: 0">
                         <el-text class="mx-1 homelabel">实时告警</el-text>
-                        <el-row :gutter="10">
-                            <el-col :span="24">
-                                <el-table
-                                    :data="tableData"
-                                    class="tablePart"
-                                    height="250"
-                                    ref="myTable"
-                                    @mouseover.native="clearScroll"
-                                    @mouseleave.native="createScroll"
+                        <div class="realAlert"
+                             ref="scrollRef"
+                             @mouseover.native="clearScroll"
+                             @mouseleave.native="createScroll">
+                            <ul>
+                                <li v-for="(item,index) in tableData"
+                                    :key="index"
+                                    @click="open(item)"
                                 >
-                                    <el-table-column fixed prop="eventTimeFormate" label="时间" width="80" />
-                                    <el-table-column prop="deviceCode" label="风机" width="70" />
-                                    <el-table-column prop="eventText" label="告警内容" />
-                                    <el-table-column label="操作" width="70">
-                                        <template #default="scope">
-                                            <div class="tableOperate comfirmed" style="color: #333333" v-if="scope.row.confirmed">已确认</div>
-                                            <div class="tableOperate" v-else>
-                                                <a style="color: #0277b3; cursor: pointer" @click="open(scope.row)">确认</a>
-                                            </div>
-                                        </template>
-                                    </el-table-column>
-                                </el-table>
-                            </el-col>
-                        </el-row>
+                                    <span>{{item.deviceCode}}、</span>
+                                    <span>{{item.eventText}}、</span>
+                                    <span>{{item.eventTimeFormate}}</span>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                 </div>
             </el-col>
@@ -518,333 +234,9 @@ const StatusListData = () => {
     })
 }
 
-const state: {
-    charts: { powerChart: any; trendChart: any }
-    remark: string
-    workingTimeFormat: string
-    pauseWork: boolean
-} = reactive({
-    charts: { powerChart: null, trendChart: null },
-    remark: 'dashboard.Loading',
-    workingTimeFormat: '',
-    pauseWork: false,
-})
-const powerChartRef = ref()
-const powerChartData: { time: any; values: any } = {
-    time: {},
-    values: {},
-}
-const initpowerChart = () => {
-    const powerChart = state.charts.powerChart ?? echarts.init(powerChartRef.value as unknown as HTMLElement)
-    const option = {
-        grid: {
-            top: 50,
-            right: 25,
-            bottom: 10,
-            left: 25,
-            containLabel: true,
-        },
-        tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-                type: 'shadow',
-            },
-        },
-        xAxis: {
-            type: 'category',
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#dadada',
-                    width: 1,
-                    type: 'solid',
-                },
-            },
-            axisLabel: {
-                //x轴文字的配置
-                show: true,
-                textStyle: {
-                    color: '#4E5969',
-                },
-                interval: 'auto',
-                //rotate: 45
-            },
-            splitLine: {
-                //分割线配置
-                show: false,
-                lineStyle: {
-                    color: '#999999',
-                },
-            },
-            data: powerChartData.time.WindFarmAvgWindSpee ?? powerChartData.time.WindFarmActivePower,
-        },
-        yAxis: [
-            {
-                type: 'value',
-                name: '功率MW',
-                nameTextStyle: {
-                    color: '#4E5969',
-                },
-                axisLine: {
-                    show: false,
-                    lineStyle: {
-                        color: '#dadada',
-                        width: 0,
-                        type: 'solid',
-                    },
-                },
-                axisLabel: {
-                    //x轴文字的配置
-                    show: true,
-                    textStyle: {
-                        color: '#4E5969',
-                    },
-                },
-                axisTick: { show: false },
-                splitLine: {
-                    interval: 50,
-                    lineStyle: {
-                        type: 'dashed',
-                        color: '#dadada',
-                    },
-                },
-            },
-            {
-                type: 'value',
-                name: '风速m/s',
-                nameTextStyle: {
-                    color: '#4E5969',
-                    padding: [0, 50, 0, 0],
-                },
-                axisLine: {
-                    show: false,
-                    lineStyle: {
-                        color: '#dadada',
-                        width: 0,
-                        type: 'solid',
-                    },
-                },
-                axisLabel: {
-                    //x轴文字的配置
-                    show: true,
-                    textStyle: {
-                        color: '#4E5969',
-                    },
-                },
-                axisTick: { show: false },
-                splitLine: {
-                    interval: 50,
-                    lineStyle: {
-                        type: 'dashed',
-                        color: '#dadada',
-                    },
-                },
-            },
-        ],
-        legend: {
-            data: ['全场总有功功率', '全场平均风速'],
-            textStyle: {
-                color: '#73767a',
-            },
-        },
-        series: [
-            {
-                name: '全场总有功功率',
-                type: 'bar',
-                //barWidth: 10,
-                itemStyle: {
-                    color: '#00A7EB',
-                    barBorderRadius: 2,
-                },
-                data: powerChartData.values?.WindFarmActivePower ?? [],
-            },
-            {
-                name: '全场平均风速',
-                type: 'line',
-                yAxisIndex: 1,
-                itemStyle: {
-                    color: '#FF7E00',
-                    barBorderRadius: 2,
-                },
-                smooth: 0.6,
-                symbol: 'none',
-                areaStyle: {
-                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                        {
-                            offset: 0,
-                            color: 'rgba(255,126,0,0.8)',
-                        },
-                    ]),
-                },
-                data: powerChartData.values?.WindFarmAvgWindSpeed ?? [],
-            },
-        ],
-    }
-    powerChart.setOption(option)
-    state.charts.powerChart = powerChart
-}
 
-const trendChartRef = ref<VNodeRef>()
-const TrendDataForDay: {
-    currentPeriod: {
-        time: string[]
-        value: number[]
-    }
-    samePeriod: {
-        time: string[]
-        value: number[]
-    }
-} = {
-    currentPeriod: {
-        time: [],
-        value: [],
-    },
-    samePeriod: {
-        time: [],
-        value: [],
-    },
-}
 
-const TrendDataForMonth: {
-    currentPeriod: {
-        time: string[]
-        value: number[]
-    }
-    samePeriod: {
-        time: string[]
-        value: number[]
-    }
-} = {
-    currentPeriod: {
-        time: [],
-        value: [],
-    },
-    samePeriod: {
-        time: [],
-        value: [],
-    },
-}
 
-const inittrendChart = (type: 'day' | 'month') => {
-    const currentPeriod: number[] = type === 'day' ? TrendDataForDay.currentPeriod.value : TrendDataForMonth.currentPeriod.value
-    const samePeriod: number[] = type === 'day' ? TrendDataForDay.samePeriod.value : TrendDataForMonth.samePeriod.value
-    const xAxisdata: string[] = type === 'day' ? TrendDataForDay.currentPeriod.time : TrendDataForMonth.currentPeriod.time
-    const trendChart = state.charts?.trendChart ?? echarts.init(trendChartRef.value as unknown as HTMLElement)
-
-    const option = {
-        grid: {
-            top: 30,
-            right: 10,
-            bottom: 30,
-            left: 25,
-            borderColor: '#dadada',
-        },
-        tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-                type: 'shadow',
-            },
-        },
-        xAxis: {
-            type: 'category',
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#dadada',
-                    width: 1,
-                    type: 'solid',
-                },
-            },
-            axisLabel: {
-                //x轴文字的配置
-                show: true,
-                textStyle: {
-                    color: '#4E5969',
-                },
-            },
-            splitLine: {
-                //分割线配置
-                show: false,
-                lineStyle: {
-                    color: '#999999',
-                },
-            },
-            data: xAxisdata,
-        },
-        yAxis: [
-            {
-                type: 'value',
-                name: 'kWh',
-                nameTextStyle: {
-                    color: '#4E5969',
-                },
-                axisLine: {
-                    show: false,
-                    lineStyle: {
-                        color: '#dadada',
-                        width: 0,
-                        type: 'solid',
-                    },
-                },
-                axisLabel: {
-                    //x轴文字的配置
-                    show: true,
-                    textStyle: {
-                        color: '#4E5969',
-                    },
-                },
-                axisTick: { show: false },
-                splitLine: {
-                    interval: 50,
-                    lineStyle: {
-                        type: 'dashed',
-                        color: '#dadada',
-                    },
-                },
-            },
-        ],
-        legend: {
-            data: ['本期', '同期'],
-            textStyle: {
-                color: '#73767a',
-            },
-        },
-        series: [
-            {
-                name: '本期',
-                data: currentPeriod,
-                type: 'bar',
-                smooth: true,
-                itemStyle: {
-                    color: '#0277B3',
-                },
-            },
-            {
-                name: '同期',
-                data: samePeriod,
-                type: 'bar',
-                smooth: true,
-                itemStyle: {
-                    color: '#00A096',
-                },
-            },
-        ],
-    }
-    trendChart.setOption(option)
-    state.charts.trendChart = trendChart
-}
-
-const echartsResize = () => {
-    nextTick(() => {
-        const chartKeys = Object.keys(state.charts) as Array<keyof typeof state.charts>
-        chartKeys.forEach((key) => {
-            state.charts[key].resize()
-        })
-    })
-}
-onActivated(() => {
-    echartsResize()
-})
 const timestampToTime = (timestamp: any) => {
     timestamp = timestamp ? timestamp : null
     let date = new Date(timestamp)
@@ -923,207 +315,22 @@ const okSubmit = (val: any) => {
         })
 }
 
+const scrollRef=ref()
 const clearScroll = () => {
     clearInterval(timer)
-    timer = null
 }
 const createScroll = () => {
     clearScroll()
-    const table = myTable.value.layout.table.refs
-    const tableWrapper = table.bodyWrapper.firstElementChild.firstElementChild
-
-    timer = setInterval(() => {
-        tableWrapper.scrollTop += 1
-        if (tableWrapper.clientHeight + tableWrapper.scrollTop == tableWrapper.scrollHeight) {
-            tableWrapper.scrollTop = 0
+    timer =setInterval(() => {
+        scrollRef.value.scrollTop += 1
+        if (scrollRef.value.clientHeight + scrollRef.value.scrollTop == scrollRef.value.scrollHeight) {
+            scrollRef.value.scrollTop = 0
         }
-    }, 30)
+    }, 30);
 }
 
-const getChartData = <T extends string = any>(params: {
-    startTime: number
-    endTime: number
-    attr: T[]
-    interval: string
-}): Promise<{ times: { [K in T]: string[] }; val: { [K in T]: number[] } }> => {
-    return new Promise((resolve) => {
-        const data = {
-            startTime: params.startTime,
-            endTime: params.endTime,
-            devices: [
-                {
-                    deviceId: '',
-                    attributes: params.attr,
-                },
-            ],
-            interval: params.interval,
-        }
-        /* console.log(JSON.stringify(data))*/
-        getHistoryData(data).then((res) => {
-            if (res.success) {
-                if (typeof res.data === 'object' && res.data !== null && Object.keys(res.data).length === 0) {
-                    const times: any = {}
-                    const val: any = {}
-                    resolve({ times, val })
-                } else {
-                    const data = res.data['1848624295633317890']
-                    const rangeKeys = Object.keys(data)
-                    const times: any = {}
-                    const val: any = {}
-                    rangeKeys.forEach((key) => {
-                        times[key] = []
-                        val[key] = []
-                        data[key].times.forEach((item: number) => {
-                            if (params.interval == '5m') {
-                                times[key].push(dayjs(item).format('HH:mm'))
-                            } else if (params.interval == '1d') {
-                                times[key].push(dayjs(item).format('DD'))
-                            } else if (params.interval == '1n') {
-                                times[key].push(dayjs(item).format('MM'))
-                            }
-                        })
-                        data[key].values.forEach((item: number) => {
-                            val[key].push(item)
-                        })
-                    })
-                    resolve({ times, val })
-                }
-            }
-        })
-    })
-}
-const getThisDayChartData = () => {
-    return new Promise((resolve) => {
-        getChartData<'WindFarmActivePower' | 'WindFarmAvgWindSpeed '>({
-            startTime: new Date(new Date().toLocaleDateString()).getTime(),
-            endTime: Date.now(),
-            attr: ['WindFarmActivePower', 'WindFarmAvgWindSpeed '],
-            interval: '5m',
-        }).then(({ times, val }) => {
-            powerChartData.time = { WindFarmActivePower: times.WindFarmActivePower, WindFarmAvgWindSpeed: times.WindFarmAvgWindSpeed }
-            powerChartData.values = { WindFarmActivePower: val.WindFarmActivePower, WindFarmAvgWindSpeed: val.WindFarmAvgWindSpeed }
-            resolve(true)
-        })
-    })
-}
-const getLastYearTodayTimestamp = () => {
-    const now = new Date()
-    const lastYear = now.getFullYear() - 1
-    const lastYearToday = new Date(lastYear, now.getMonth(), now.getDate())
-    return lastYearToday.getTime()
-}
-const getLastYearChartData = () => {
-    return new Promise((resolve) => {
-        const start = getLastYearTodayTimestamp()
-        const end = new Date()
-        end.setFullYear(end.getFullYear() - 1)
-        end.setMonth(end.getMonth() + 1, 0) // 设置为下个月的第一天，然后减去一天
 
-        getChartData<'WindFarmDayProdEnergy'>({
-            startTime: start,
-            endTime: end.getTime(),
-            attr: ['WindFarmDayProdEnergy'],
-            interval: '1d',
-        }).then(({ times, val }) => {
-            TrendDataForDay.samePeriod.time = times.WindFarmDayProdEnergy
-            TrendDataForDay.samePeriod.value = val.WindFarmDayProdEnergy
-            resolve(true)
-        })
-    })
-}
 
-const getThisDayChartForHourData = () => {
-    return new Promise((resolve) => {
-        getChartData<'WindFarmDayProdEnergy'>({
-            startTime: new Date(new Date().toLocaleDateString()).getTime(),
-            endTime: Date.now(),
-            attr: ['WindFarmDayProdEnergy'],
-            interval: '1d',
-        }).then(({ times, val }) => {
-            TrendDataForDay.currentPeriod.time = times.WindFarmDayProdEnergy
-            TrendDataForDay.currentPeriod.value = val.WindFarmDayProdEnergy
-            resolve(true)
-        })
-    })
-}
-//发电连月
-const getLastMonthTodayTimestamp = () => {
-    const now = new Date() // 当前日期
-    const thisYear = now.getFullYear() // 获取当前年份
-    const lastYear = thisYear - 1 // 计算去年年份
-    const firstDayOfLastYear = new Date(lastYear, 0, 1) // 设置为去年的一月一日
-    return firstDayOfLastYear.getTime()
-}
-const getThisMonthTodayTimestamp = () => {
-    const now = new Date() // 当前日期
-    const thisYear = now.getFullYear() // 获取当前年份
-    const firstDayOfYear = new Date(thisYear, 0, 1) // 设置为今年的一月一日
-    return firstDayOfYear.getTime()
-}
-const getLastYear = () => {
-    const now = new Date() // 当前日期
-    const thisYear = now.getFullYear() // 获取当前年份
-    const lastYear = thisYear - 1 // 计算去年年份
-    const lastDayOfLastYear = new Date(lastYear, 11, 0) // 设置为去年12月的最后一天
-    return lastDayOfLastYear.getTime()
-}
-const getLastMonthChartData = () => {
-    return new Promise((resolve) => {
-        const start = getLastMonthTodayTimestamp()
-        const end = getLastYear()
-        getChartData<'WIndFarmMonthProdEnergy'>({
-            startTime: start,
-            endTime: end,
-            attr: ['WIndFarmMonthProdEnergy'],
-            interval: '1n',
-        }).then(({ times, val }) => {
-            TrendDataForMonth.samePeriod.time = times.WIndFarmMonthProdEnergy
-            TrendDataForMonth.samePeriod.value = val.WIndFarmMonthProdEnergy
-            resolve(true)
-        })
-    })
-}
-
-const getThisMonthChartForHourData = () => {
-    return new Promise((resolve) => {
-        const start = getThisMonthTodayTimestamp()
-        getChartData<'WIndFarmMonthProdEnergy'>({
-            startTime: start,
-            endTime: Date.now(),
-            attr: ['WIndFarmMonthProdEnergy'],
-            interval: '1n',
-        }).then(({ times, val }) => {
-            TrendDataForMonth.currentPeriod.time = times.WIndFarmMonthProdEnergy
-            TrendDataForMonth.currentPeriod.value = val.WIndFarmMonthProdEnergy
-            resolve(true)
-        })
-    })
-}
-
-const getAllChartData = (type: ('power' | 'trend')[] = ['power', 'trend']) => {
-    if (type.includes('power')) {
-        getThisDayChartData().then(() => {
-            initpowerChart()
-        })
-    }
-    if (type.includes('trend')) {
-        const trendDataForLastYear = getLastYearChartData()
-        const trendDataForThisDay = getThisDayChartForHourData()
-        const trendDataForLastMonth = getLastMonthChartData()
-        const trendDataForThisMonth = getThisMonthChartForHourData()
-        Promise.all([trendDataForLastYear, trendDataForThisDay, trendDataForLastMonth, trendDataForThisMonth]).then(() => {
-            inittrendChart(trendChartType.value)
-        })
-    }
-}
-
-const trendChartType = ref<'day' | 'month'>('day')
-const tabhandleClick = () => {
-    state.charts.trendChart.clear()
-    nextTick(() => {
-        inittrendChart(trendChartType.value)
-    })
-}
 const activeName = ref('first')
 //let autoUpdateTimer: any = null
 let autoUpdateForSecondTimer: any = null
@@ -1136,18 +343,7 @@ const autoUpdate = () => {
             overviewList()
         }, 2000)
     }
-    if (!autoUpdateTimerForMinuteTimer) {
-        autoUpdateTimerForMinuteTimer = setInterval(() => {
-            getAllChartData(['power'])
-            //initpowerChart()
-        }, 60000)
-    }
-    if (!autoUpdateTimerForHourTimer) {
-        autoUpdateTimerForHourTimer = setInterval(() => {
-            getAllChartData(['trend'])
-            //inittrendChart(trendChartType.value)
-        }, 60000 * 30)
-    }
+
 }
 const HomeHight = ref()
 const computedHeight = reactive({
@@ -1159,10 +355,10 @@ const sizeChange = () => {
     const rect = HomeHight.value?.getBoundingClientRect()
     if (!rect) return
     computedHeight.powerHeight = rect.height - 630 + 'px'
-    computedHeight.alarmHeight = rect.height - 578 + 'px'
-    computedHeight.centerHeight = rect.height - 0 + 'px'
+    computedHeight.alarmHeight = rect.height - 5 + 'px'
+    computedHeight.centerHeight = rect.height - 5 + 'px'
     if (window.screen.width < 1360) {
-        computedHeight.alarmHeight = '200px'
+        computedHeight.alarmHeight = '300px'
         computedHeight.powerHeight = '200px'
     }
 }
@@ -1170,9 +366,9 @@ const sizeChange = () => {
 onMounted(() => {
     window.addEventListener('resize', sizeChange)
     sizeChange()
-    getAllChartData()
+    //getAllChartData()
     createScroll()
-    overviewList()
+   // overviewList()
     StatusListData()
     autoUpdate()
 
@@ -1183,17 +379,16 @@ onMounted(() => {
 
         getTableData(deviceCode.value)
     })
-    useEventListener(window, 'resize', echartsResize)
 })
 
 onUnmounted(() => {
     window.removeEventListener('resize', sizeChange)
     clearInterval(timer)
     autoUpdateForSecondTimer && clearInterval(autoUpdateForSecondTimer)
-    const chartKeys = Object.keys(state.charts) as Array<keyof typeof state.charts>
+    /*const chartKeys = Object.keys(state.charts) as Array<keyof typeof state.charts>
     chartKeys.forEach((key) => {
         state.charts[key].dispose()
-    })
+    })*/
 })
 </script>
 
@@ -1221,7 +416,7 @@ $labelHeight: 38px;
 .default-main {
     width: 100%;
     height: 100%;
-    min-height: 920px;
+   /* min-height: 920px;*/
     padding: 0;
     margin: 0;
     color: #4e5969;
@@ -1333,7 +528,7 @@ $labelHeight: 38px;
         .matrix {
             background: url('/@/assets/dashboard/bg1.png') no-repeat #ffffff;
             background-size: 100% 100%;
-            min-height: 900px;
+           /* min-height: 900px;*/
             width: 100%;
             height: v-bind('computedHeight.centerHeight');
             margin-bottom: 0;
@@ -1424,11 +619,17 @@ $labelHeight: 38px;
             }
         }
         .realPart {
-            /* @include cardDefaultStyle;
-            @include cardlabel;*/
-            /*height: 370px;*/
-            min-height: 340px;
             height: v-bind('computedHeight.alarmHeight');
+            .realAlert{
+                height: calc(100% - 20px);
+                overflow: hidden;
+                ul li{
+                    list-style: none;
+                    line-height: 30px;
+                    border-bottom: 1px #dddddd dashed;
+                    cursor: pointer;
+                }
+            }
         }
     }
 }
@@ -1443,10 +644,6 @@ $labelHeight: 38px;
 @media screen and (max-width: 1280px) {
     .default-main {
         /*height: auto !important;*/
-        overflow: none;
-        .col-center {
-            padding: 0px !important;
-        }
         .windtitle {
             margin-bottom: 10px;
         }
@@ -1463,14 +660,9 @@ $labelHeight: 38px;
 @media screen and (max-width: 1360px) {
     .default-main {
         font-size: 11px !important;
-        height: auto !important;
-
         .summarize {
             word-break: break-all !important;
         }
-        .matrix {
-            height: auto !important;
-        }
         .overview {
             .small-panel {
                 .small-base {