diff --git a/src/api/index.ts b/src/api/index.ts
deleted file mode 100644
index cc33416..0000000
--- a/src/api/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import request from '@/utils/request'
-
-//get有值
-export function getTest(params: any) {
-    return request.request({
-      url: '/test',
-      method: 'get',
-      params
-    })
-  }
- 
diff --git a/src/api/test.ts b/src/api/test.ts
new file mode 100644
index 0000000..6116b1c
--- /dev/null
+++ b/src/api/test.ts
@@ -0,0 +1,11 @@
+import createAxios from '@/utils/request'
+
+//测试页面
+export function getAreaCalculation(data: anyObj) {
+  return createAxios({
+      url: '/event-boot/areaStatistics/getAreaCalculation',
+      method: 'post',
+      data
+  })
+}
+ 
diff --git a/src/components/echarts/MyEchart.vue b/src/components/echarts/MyEchart.vue
index 22c6ccc..530486b 100644
--- a/src/components/echarts/MyEchart.vue
+++ b/src/components/echarts/MyEchart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeUnmount, onMounted, ref } from 'vue'
+import { onBeforeUnmount, onMounted, ref, defineExpose, watch } from 'vue'
 import echarts from './echarts'
 import 'echarts/lib/component/dataZoom'
 
@@ -11,32 +11,116 @@ const props = defineProps(['options'])
 const chartRef = ref<HTMLDivElement>()
 let chart: echarts.ECharts | null = null
 const resizeHandler = () => {
-    chart?.resize()
+    setTimeout(() => {
+        chart?.resize()
+    }, 100)
 }
 const initChart = () => {
+    chart?.dispose()
+
     chart = echarts.init(chartRef.value as HTMLDivElement)
     chart.setOption({
-        tooltip: {
-            showContent: true,
-            trigger: 'axis',
-            backgroundColor: 'rgba(8,36,68,.7)',
-            axisPointer: {
-                // 坐标轴指示器，坐标轴触发有效
-                type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-            },
-            color: '#ffff',
+        title: {
+            ...props.options.title,
+            left: 'center',
             textStyle: {
-                color: '#ffff'
+                color: '#000',
+                fontSize: 18
             }
         },
+        tooltip: {
+            ...(props.options.tooltip || null),
+            trigger: 'axis',
+
+            axisPointer: {
+                type: 'shadow',
+                label: {
+                    color: '#fff',
+                    fontSize: 16
+                }
+            },
+            textStyle: {
+                color: '#fff',
+                fontStyle: 'normal',
+                opacity: 0.35,
+                fontSize: 14
+            },
+            backgroundColor: 'rgba(0,0,0,0.35)',
+            borderWidth: 0
+        },
+        legend: {
+            ...(props.options.xAxis.legend || null),
+            right: 80,
+            top: 0,
+            itemGap: 28,
+            itemStyle: {},
+            textStyle: {
+                rich: {
+                    a: {
+                        verticalAlign: 'middle'
+                    }
+                },
+
+                padding: [2, 0, 0, 0] //[上、右、下、左]
+            }
+        },
+
         grid: {
-            top: '30px',
-            left: '40px',
+            top: '50px',
+            left: '10px',
             right: '40px',
             bottom: '40px',
 
             containLabel: true
         },
+        xAxis: [
+            {
+                ...(props.options.xAxis || null),
+                type: 'category',
+                axisTick: { show: false },
+                axisLine: {
+                    lineStyle: {
+                        color: '#000'
+                    }
+                },
+                axisLabel: {
+                    textStyle: {
+                        fontFamily: 'dinproRegular',
+                        color: '#000',
+                        fontSize: '12'
+                    }
+                }
+            }
+        ],
+        yAxis: [
+            {
+                ...(props.options.yAxis || null),
+                type: 'value',
+
+                nameTextStyle: {
+                    color: '#000'
+                },
+                minInterval: 1,
+                axisLine: {
+                    show: true,
+                    lineStyle: {
+                        color: '#000'
+                    }
+                },
+                axisLabel: {
+                    color: '#000',
+                    fontSize: 14
+                },
+                splitLine: {
+                    lineStyle: {
+                        // 使用深浅的间隔色
+                        color: ['#000'],
+                        type: 'dashed',
+                        opacity: 0.5
+                    }
+                }
+            }
+        ],
         dataZoom: [
             {
                 type: 'inside',
@@ -53,6 +137,7 @@ const initChart = () => {
             }
         ],
         color: [
+            ...(props.options.color || ''),
             '#07CCCA ',
             '#00BFF5',
             '#FFBF00',
@@ -64,20 +149,26 @@ const initChart = () => {
             '#66FFCC',
             '#B3B3B3'
         ],
-        ...props.options
+        ...props.options.options
     })
 }
 onMounted(() => {
     setTimeout(() => {
-        initChart()
+        // initChart()
     }, 20)
     window.addEventListener('resize', resizeHandler)
 })
-
+defineExpose({ initChart })
 onBeforeUnmount(() => {
     window.removeEventListener('resize', resizeHandler)
     chart?.dispose()
 })
+watch(
+    () => props.options,
+    (newVal, oldVal) => {
+        initChart()
+    }
+)
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/main.ts b/src/main.ts
index 765da6c..9600db2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -11,11 +11,12 @@ import 'element-plus/theme-chalk/display.css'
 import '@/styles/index.scss'
 import '@/assets/font/iconfont.css'
 
+import locale from 'element-plus/es/locale/lang/zh-cn';
 const app = createApp(App)
 
 app.use(router)
 app.use(pinia)
-app.use(ElementPlus)
+app.use(ElementPlus,{locale})
 registerIcons(app) // icons
 
 app.mount('#app')
diff --git a/src/views/dashboard/components/echart.vue b/src/views/dashboard/components/echart.vue
index fadd6c5..8b16207 100644
--- a/src/views/dashboard/components/echart.vue
+++ b/src/views/dashboard/components/echart.vue
@@ -1,115 +1,297 @@
 <template>
     <div>
-        <my-echart class="bars_w" :options="scatterOptions" />
-        <div class="">
-            <my-echart class="bars_w" :options="scatterOptions" />
-            <my-echart class="bars_w" :options="scatterOptions" />
+        <my-echart class="bars_w" :options="areaStatistics" />
+        <div class="separate">
+            <my-echart class="bars_w" :options="voltageStatistics" />
+            <my-echart class="bars_w" :options="monthlyStatistics" />
         </div>
     </div>
 </template>
 
 <script setup lang="ts">
 import MyEchart from '@/components/echarts/MyEchart.vue'
-import { reactive, ref } from 'vue'
+import { reactive, ref, defineExpose } from 'vue'
 
-const scatterOptions = reactive({
-    title: {
-        text: '散点图',
-        // top: 'center',
-        left: 'center'    
-    },
+let areaStatistics = ref({})
+let voltageStatistics = ref({})
+let monthlyStatistics = ref({})
 
-    toolbox: {
-        feature: {
-            dataView: {
-                title: '数据视图',
-                readOnly: false
-            },
-            saveAsImage: {
-                title: '保存为图片',
-                name: '散点图'
-            } //图片下载功能
+const Processing = (list: any) => {
+    // 区域
+    let echartsndArr: string[] = []
+    let echartsArr: string[] = []
+    list.areaCalculation.forEach((item: any) => {
+        echartsndArr.push(item.areaName)
+        if (item.frequency == 0) {
+            item.frequency = 1.1
+        } else if (item.frequency == 1) {
+            item.frequency = 1.3
         }
-    },
-    xAxis: {
-        scale: true
-    },
-    yAxis: {
-        scale: true
-    },
-    series: [
-        {
-            type: 'effectScatter',
-            symbolSize: 20,
-            data: [
-                [172.7, 105.2],
-                [153.4, 42]
-            ]
+        echartsArr.push(item.frequency)
+    })
+    areaStatistics.value = {
+        title: {
+            text: '区域'
         },
-        {
-            type: 'scatter',
-            // prettier-ignore
-            data: [[161.2, 51.6], [167.5, 59.0], [159.5, 49.2], [157.0, 63.0], [155.8, 53.6],
-          [170.0, 59.0], [159.1, 47.6], [166.0, 69.8], [176.2, 66.8], [160.2, 75.2],
-          [172.5, 55.2], [170.9, 54.2], [172.9, 62.5], [153.4, 42.0], [160.0, 50.0],
-          [147.2, 49.8], [168.2, 49.2], [175.0, 73.2], [157.0, 47.8], [167.6, 68.8],
-          [159.5, 50.6], [175.0, 82.5], [166.8, 57.2], [176.5, 87.8], [170.2, 72.8],
-          [174.0, 54.5], [173.0, 59.8], [179.9, 67.3], [170.5, 67.8], [160.0, 47.0],
-          [154.4, 46.2], [162.0, 55.0], [176.5, 83.0], [160.0, 54.4], [152.0, 45.8],
-          [162.1, 53.6], [170.0, 73.2], [160.2, 52.1], [161.3, 67.9], [166.4, 56.6],
-          [168.9, 62.3], [163.8, 58.5], [167.6, 54.5], [160.0, 50.2], [161.3, 60.3],
-          [167.6, 58.3], [165.1, 56.2], [160.0, 50.2], [170.0, 72.9], [157.5, 59.8],
-          [167.6, 61.0], [160.7, 69.1], [163.2, 55.9], [152.4, 46.5], [157.5, 54.3],
-          [168.3, 54.8], [180.3, 60.7], [165.5, 60.0], [165.0, 62.0], [164.5, 60.3],
-          [156.0, 52.7], [160.0, 74.3], [163.0, 62.0], [165.7, 73.1], [161.0, 80.0],
-          [162.0, 54.7], [166.0, 53.2], [174.0, 75.7], [172.7, 61.1], [167.6, 55.7],
-          [151.1, 48.7], [164.5, 52.3], [163.5, 50.0], [152.0, 59.3], [169.0, 62.5],
-          [164.0, 55.7], [161.2, 54.8], [155.0, 45.9], [170.0, 70.6], [176.2, 67.2],
-          [170.0, 69.4], [162.5, 58.2], [170.3, 64.8], [164.1, 71.6], [169.5, 52.8],
-          [163.2, 59.8], [154.5, 49.0], [159.8, 50.0], [173.2, 69.2], [170.0, 55.9],
-          [161.4, 63.4], [169.0, 58.2], [166.2, 58.6], [159.4, 45.7], [162.5, 52.2],
-          [159.0, 48.6], [162.8, 57.8], [159.0, 55.6], [179.8, 66.8], [162.9, 59.4],
-          [161.0, 53.6], [151.1, 73.2], [168.2, 53.4], [168.9, 69.0], [173.2, 58.4],
-          [171.8, 56.2], [178.0, 70.6], [164.3, 59.8], [163.0, 72.0], [168.5, 65.2],
-          [166.8, 56.6], [172.7, 105.2], [163.5, 51.8], [169.4, 63.4], [167.8, 59.0],
-          [159.5, 47.6], [167.6, 63.0], [161.2, 55.2], [160.0, 45.0], [163.2, 54.0],
-          [162.2, 50.2], [161.3, 60.2], [149.5, 44.8], [157.5, 58.8], [163.2, 56.4],
-          [172.7, 62.0], [155.0, 49.2], [156.5, 67.2], [164.0, 53.8], [160.9, 54.4],
-          [162.8, 58.0], [167.0, 59.8], [160.0, 54.8], [160.0, 43.2], [168.9, 60.5],
-          [158.2, 46.4], [156.0, 64.4], [160.0, 48.8], [167.1, 62.2], [158.0, 55.5],
-          [167.6, 57.8], [156.0, 54.6], [162.1, 59.2], [173.4, 52.7], [159.8, 53.2],
-          [170.5, 64.5], [159.2, 51.8], [157.5, 56.0], [161.3, 63.6], [162.6, 63.2],
-          [160.0, 59.5], [168.9, 56.8], [165.1, 64.1], [162.6, 50.0], [165.1, 72.3],
-          [166.4, 55.0], [160.0, 55.9], [152.4, 60.4], [170.2, 69.1], [162.6, 84.5],
-          [170.2, 55.9], [158.8, 55.5], [172.7, 69.5], [167.6, 76.4], [162.6, 61.4],
-          [167.6, 65.9], [156.2, 58.6], [175.2, 66.8], [172.1, 56.6], [162.6, 58.6],
-          [160.0, 55.9], [165.1, 59.1], [182.9, 81.8], [166.4, 70.7], [165.1, 56.8],
-          [177.8, 60.0], [165.1, 58.2], [175.3, 72.7], [154.9, 54.1], [158.8, 49.1],
-          [172.7, 75.9], [168.9, 55.0], [161.3, 57.3], [167.6, 55.0], [165.1, 65.5],
-          [175.3, 65.5], [157.5, 48.6], [163.8, 58.6], [167.6, 63.6], [165.1, 55.2],
-          [165.1, 62.7], [168.9, 56.6], [162.6, 53.9], [164.5, 63.2], [176.5, 73.6],
-          [168.9, 62.0], [175.3, 63.6], [159.4, 53.2], [160.0, 53.4], [170.2, 55.0],
-          [162.6, 70.5], [167.6, 54.5], [162.6, 54.5], [160.7, 55.9], [160.0, 59.0],
-          [157.5, 63.6], [162.6, 54.5], [152.4, 47.3], [170.2, 67.7], [165.1, 80.9],
-          [172.7, 70.5], [165.1, 60.9], [170.2, 63.6], [170.2, 54.5], [170.2, 59.1],
-          [161.3, 70.5], [167.6, 52.7], [167.6, 62.7], [165.1, 86.3], [162.6, 66.4],
-          [152.4, 67.3], [168.9, 63.0], [170.2, 73.6], [175.2, 62.3], [175.2, 57.7],
-          [160.0, 55.4], [165.1, 104.1], [174.0, 55.5], [170.2, 77.3], [160.0, 80.5],
-          [167.6, 64.5], [167.6, 72.3], [167.6, 61.4], [154.9, 58.2], [162.6, 81.8],
-          [175.3, 63.6], [171.4, 53.4], [157.5, 54.5], [165.1, 53.6], [160.0, 60.0],
-          [174.0, 73.6], [162.6, 61.4], [174.0, 55.5], [162.6, 63.6], [161.3, 60.9],
-          [156.2, 60.0], [149.9, 46.8], [169.5, 57.3], [160.0, 64.1], [175.3, 63.6],
-          [169.5, 67.3], [160.0, 75.5], [172.7, 68.2], [162.6, 61.4], [157.5, 76.8],
-          [176.5, 71.8], [164.4, 55.5], [160.7, 48.6], [174.0, 66.4], [163.8, 67.3]
-        ]
+        tooltip: {
+            formatter: function (params: any) {
+                // console.log(params);
+                let html = '区域：' + params[0].name
+                params.forEach((item: any) => {
+                    if (item.value == 1.1) {
+                        html += `<br/>${item.seriesName}: ${0}次`
+                    } else if (item.value == 1.3) {
+                        html += `<br/>${item.seriesName}: ${1}次`
+                    } else {
+                        html += `<br/>${item.seriesName}: ${item.value}次`
+                    }
+                })
+                return html
+            }
+        },
+
+        legend: {
+            data: ['暂降次数']
+        },
+        xAxis: {
+            name: '区域', // 给X轴加单位
+            data: echartsndArr
+        },
+        yAxis: {
+            name: '次数' // 给X轴加单位
+        },
+        options: {
+            series: [
+                {
+                    barMinHeight: 5,
+                    barMaxWidth: 30,
+                    itemStyle: {
+                        normal: {
+                            //这里是颜色
+                            color: function (params: any) {
+                                if (params.data == 1.1) {
+                                    return '#B3B3B3'
+                                } else {
+                                    return '#07CCCA '
+                                }
+                            }
+                        }
+                    },
+                    name: '暂降次数',
+                    type: 'bar',
+                    data: echartsArr
+                }
+            ]
         }
-    ]
-})
+    }
+}
+// 电压等级
+const Grade = (list: any) => {
+    let echartsndArr: string[] = []
+    let echartsArr: string[] = []
+    list.voltageLevelCalculation.forEach((item: any) => {
+        echartsndArr.push(item.voltageLevel)
+        if (item.frequency == 0) {
+            item.frequency = 1.1
+        } else if (item.frequency == 1) {
+            item.frequency = 1.3
+        }
+        echartsArr.push(item.frequency)
+    })
+    voltageStatistics.value = {
+        title: {
+            text: '电压等级'
+        },
+        tooltip: {
+            formatter: function (params: any) {
+                // console.log(params);
+                let html = '电压等级：' + params[0].name
+                params.forEach((item: any) => {
+                    if (item.value == 1.1) {
+                        html += `<br/>${item.seriesName}: ${0}次`
+                    } else if (item.value == 1.3) {
+                        html += `<br/>${item.seriesName}: ${1}次`
+                    } else {
+                        html += `<br/>${item.seriesName}: ${item.value}次`
+                    }
+                })
+                return html
+            }
+        },
+
+        legend: {
+            data: ['暂降次数']
+        },
+        xAxis: [
+            {
+                name: '电压等级', // 给X轴加单位
+                data: echartsndArr
+            }
+        ],
+        yAxis: [
+            {
+                type: 'value'
+            }
+        ],
+        options: {
+            series: [
+                {
+                    barMaxWidth: 30,
+                    barMinHeight: 5,
+                    itemStyle: {
+                        normal: {
+                            //这里是颜色
+                            color: function (params: any) {
+                                // console.log(params,'1111111111111111111111');
+                                if (params.data == 1.1) {
+                                    return '#B3B3B3'
+                                } else {
+                                    return '#07CCCA '
+                                }
+                            }
+                        }
+                        // color: echartsColor.FigureColor[0],
+                    },
+                    name: '暂降次数',
+                    type: 'bar',
+                    data: echartsArr
+                }
+            ]
+        }
+    }
+}
+//时间
+const Relation = (list: any) => {
+    let echartsndArr: string[] = []
+    let echartsArr: string[] = []
+    let echartswArr: string[] = []
+    list.monthCalculation.forEach((item: any, i: number) => {
+        if (i != 0) {
+            item.month = item.month.slice(5)
+        } else if (i == 0) {
+            let date = item.month.slice(5)
+            // let t = item.month.slice(0, 4);
+            // item.month = date + "\n" + "(" + t + ")";
+            item.month = date
+        }
+
+        echartsndArr.push(item.month)
+        // if (item.linked == 0 || item.notAssociated == 0) {
+        //   item.linked = 3.14159;
+        //   item.notAssociated = 3.14159;
+        // }
+        if (item.linked == 0) {
+            item.linked = 1.1
+        } else if (item.linked == 1) {
+            item.linked = 1.3
+        }
+        echartsArr.push(item.linked)
+        if (item.notAssociated == 0) {
+            item.notAssociated = 1.1
+        } else if (item.notAssociated == 1) {
+            item.notAssociated = 1.3
+        }
+        echartswArr.push(item.notAssociated)
+    })
+    monthlyStatistics.value = {
+        title: {
+            text: '月份'
+        },
+        tooltip: {
+            formatter: function (params: any) {
+                let html = '时间：' + params[0].name
+                params.forEach((item: any) => {
+                    if (item.value == 1.1) {
+                        html += `<br/>${item.seriesName}: ${0}次`
+                    } else if (item.value == 1.3) {
+                        html += `<br/>${item.seriesName}: ${1}次`
+                    } else {
+                        html += `<br/>${item.seriesName}: ${item.value}次`
+                    }
+                })
+                return html
+            }
+        },
+
+        legend: {
+            data: ['未关联暂降次数', '已关联处理事件']
+        },
+        color: ['#07CCCA', '#Ff6600'],
+        xAxis: {
+            name: '月份', // 给X轴加单位
+            data: echartsndArr
+        },
+
+        options: {
+            series: [
+                {
+                    name: '未关联暂降次数',
+                    type: 'bar',
+                    barMaxWidth: 30,
+                    barMinHeight: 5,
+                    data: echartswArr,
+                    itemStyle: {
+                        normal: {
+                            label: {
+                                // show: true, //数字开启显示
+                                textStyle: {
+                                    //数值样式
+                                    color: '#fff',
+                                    fontSize: 14,
+                                    fontWeight: 600
+                                }
+                            },
+                            color: function (params: any) {
+                                // console.log(params,'1111111111111111111111');
+                                if (params.data == 1.1) {
+                                    return '#B3B3B3'
+                                } else {
+                                    return '#07CCCA '
+                                }
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '已关联处理事件',
+                    type: 'bar',
+                    barMaxWidth: 30,
+                    data: echartsArr,
+                    itemStyle: {
+                        normal: {
+                            label: {
+                                // show: true, //数字开启显示
+                                textStyle: {
+                                    //数值样式
+                                    color: '#fff',
+                                    fontSize: 14,
+                                    fontWeight: 600
+                                }
+                            },
+                            color: function (params: any) {
+                                if (params.data == 1.1) {
+                                    return '#B3B3B3'
+                                } else {
+                                    return '#Ff6600'
+                                }
+                            }
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}
+// Processing()
+defineExpose({ Processing, Grade, Relation })
 </script>
 
 <style lang="scss" scoped>
 .bars_w {
     width: 100%;
-    height: 500px;
+    height: calc((100vh - 195px) / 2);
+}
+.separate {
+    display: flex;
 }
 </style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 9743b6d..799c482 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,16 +1,63 @@
 <template>
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+        <el-form-item label="区域">
+            <el-input v-model="formInline.deptInd" placeholder="请选择区域" clearable />
+        </el-form-item>
+        <el-form-item label="时间">
+            <el-date-picker v-model="formInline.searchBeginTime" type="date" placeholder="请选择时间" />
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="onSubmit">查询</el-button>
+        </el-form-item>
+    </el-form>
     <el-tabs v-model="activeName" type="border-card">
         <el-tab-pane label="图形" name="1">
-            <Echart />
+            <Echart :list="list" ref="echarts" />
         </el-tab-pane>
         <el-tab-pane label="表格" name="2">Config</el-tab-pane>
     </el-tabs>
 </template>
 
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref, onBeforeMount } from 'vue'
 const activeName = ref('1')
 import Echart from '@/views/dashboard/components/echart.vue'
+
+import { getAreaCalculation } from '@/api/test'
+const list = ref([])
+const echarts = ref()
+const formInline = reactive({
+    deptInd: '',
+    deptIndex: '5699e5916a18a6381e1ac92da5bd2628',
+    monitorFlag: 2,
+    powerFlag: 2,
+    serverName: 'event-boot',
+    searchBeginTime: '2023-12-01',
+    searchEndTime: '2023-12-26',
+    statisticalType: {
+        name: '电网拓扑',
+        id: 'cc28974d259ad22642f6a1bff708f967',
+        code: 'Power_Network',
+        value: 'cc28974d259ad22642f6a1bff708f967',
+        gvalue: null,
+        label: '电网拓扑',
+        sort: 0
+    },
+    timeFlag: 1
+})
+// const locale=zhCn
+const onSubmit = async () => {
+    await getAreaCalculation(formInline).then(res => {
+        list.value = res.data
+        echarts.value.Processing(res.data.areaStatistics)
+        echarts.value.Grade(res.data.voltageStatistics)
+        echarts.value.Relation(res.data.monthlyStatistics)
+    })
+}
+
+onMounted(() => {
+    onSubmit()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -19,8 +66,7 @@ import Echart from '@/views/dashboard/components/echart.vue'
     height: 500px;
 }
 ::v-deep(.el-tabs__content) {
-    height: calc(100vh - 111px);
+    height: calc(100vh - 161px);
     overflow-y: auto;
 }
-
 </style>
diff --git a/src/views/dashboard/test.vue b/src/views/dashboard/test.vue
index ad32134..e19f59b 100644
--- a/src/views/dashboard/test.vue
+++ b/src/views/dashboard/test.vue
@@ -3,9 +3,10 @@
 </template>
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
-import { getTest } from '@/api/index'
+// import { getTest } from '@/api/index'
 const click = () => {
-    getTest({ name: '111', paw: 'asd' })
+    // getTest({ name: '111', paw: 'asd' })
 }
 </script>
 <style lang="scss" scoped></style>
+@/api/text
\ No newline at end of file
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index f1c265f..86a482d 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div @keyup.enter="onSubmit(formRef)">
         <div @contextmenu.stop="" id="bubble" class="bubble">
             <canvas id="bubble-canvas" class="bubble-canvas"></canvas>
         </div>
@@ -46,6 +46,7 @@
                         round
                         type="info"
                         @click="onSubmit(formRef)"
+                        
                     >
                         登录
                     </el-button>
@@ -130,24 +131,23 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
                     grant_type: 'captcha',
                     imageCode: '',
                     verifyCode: 0
-                })
-                    .then(res => {
-                        console.log('🚀 ~ file: login.vue:134 ~ gongkey ~ res:', res)
+                }).then(res => {
+                    console.log('🚀 ~ file: login.vue:134 ~ gongkey ~ res:', res)
 
-                        useInfo.setToken(res.data.token_type + ' ' + res.data.access_token, 'auth')
-                        // state.submitLoading = false
-                        router.push({
-                            path: 'admin/dashboard'
-                        })
+                    useInfo.setToken(res.data.token_type + ' ' + res.data.access_token, 'auth')
+                    state.submitLoading = false
+                    router.push({
+                        path: 'admin/dashboard'
                     })
-                    // .catch(res => {
-                    //     ElMessage({
-                    //         message: res.message,
-                    //         type: 'warning'
-                    //     })
-                    // })
+                })
+                //     .catch(err => {
+                //         state.submitLoading = false
+                //     })
                 // state.submitLoading = false
             })
+            setTimeout(() => {
+                state.submitLoading = false
+            }, 500)
         }
     })
 }