diff --git a/src/pages/Plan/Report/components/Devices/index.tsx b/src/pages/Plan/Report/components/Devices/index.tsx
index 79eda3a06820ea31b8b0a6bbcda33fd1d09aa06e..c7ab15b94ed3a4fee5e5f7fef0d33944c99ff0d5 100644
--- a/src/pages/Plan/Report/components/Devices/index.tsx
+++ b/src/pages/Plan/Report/components/Devices/index.tsx
@@ -1,5 +1,6 @@
 import React from "react"
-import { Table, TableColumnProps, Typography, Tag } from "antd"
+import { Table, Typography, Tag } from "antd"
+import type { TableColumnProps } from "antd"
 import { WhiteContent, FullSpace } from "../../styled"
 import OverflowList from "@/components/OverflowList"
 
@@ -30,7 +31,7 @@ const Devices: React.FC<IProps> = ({ dataSource = [] }) => {
             title: "标签",
             ellipsis: true,
             render(row) {
-                return <OverflowList list={row.map((i: any) => <Tag color={i.color}>{i.name}</Tag>)} />
+                return <OverflowList list={row.map((i: any) => <Tag key={i.name} color={i.color}>{i.name}</Tag>)} />
             }
         },
         {
@@ -48,14 +49,15 @@ const Devices: React.FC<IProps> = ({ dataSource = [] }) => {
                     rowKey={"id"}
                     columns={columns}
                     dataSource={dataSource}
-                    pagination={{
-                        hideOnSinglePage: true,
-                        showSizeChanger: true,
-                        showQuickJumper: true,
-                        showTotal(total, range) {
-                            return `共 ${total} 条 `
-                        },
-                    }}
+                    pagination={false}
+                /* pagination={{
+                    hideOnSinglePage: true,
+                    showSizeChanger: true,
+                    showQuickJumper: true,
+                    showTotal(total) {
+                        return `共 ${total} 条 `
+                    },
+                }} */
                 />
             </FullSpace>
         </WhiteContent>
diff --git a/src/pages/Plan/Report/components/TestResult/FuncPassRate.chart.tsx b/src/pages/Plan/Report/components/TestResult/FuncPassRate.chart.tsx
index cbc076f299f4343e8162312f3218ea4d02705202..7734bb9d88a135e3e8f2127debffb8c50496b255 100644
--- a/src/pages/Plan/Report/components/TestResult/FuncPassRate.chart.tsx
+++ b/src/pages/Plan/Report/components/TestResult/FuncPassRate.chart.tsx
@@ -16,7 +16,7 @@ const stateColorMap = (i: string) => new Map([
     ["invalid", "rgba(108,117,127,1)"],
 ]).get(i) || ""
 
-const FuncPassRate: React.FC<{ [k: string]: any }> = ({ dataSource }) => {
+const FuncPassRate: React.FC<Record<string, any>> = ({ dataSource }) => {
     const chart = React.useRef(null) as any
 
     React.useEffect(() => {
@@ -24,6 +24,7 @@ const FuncPassRate: React.FC<{ [k: string]: any }> = ({ dataSource }) => {
         const nameList = Object.keys(dataSource)
 
         const count = nameList.reduce((pre, cur) => {
+            // eslint-disable-next-line no-param-reassign
             return pre += dataSource[cur]
         }, 0)
 
@@ -40,7 +41,7 @@ const FuncPassRate: React.FC<{ [k: string]: any }> = ({ dataSource }) => {
                     textAlign: "center"
                 },
                 left: "center",
-                top: "30%",
+                top: "36%",
             },
             legend: {
                 icon: "circle",
@@ -71,8 +72,9 @@ const FuncPassRate: React.FC<{ [k: string]: any }> = ({ dataSource }) => {
                 labelLine: {
                     show: true,
                 },
+                top: 20,
                 hoverOffset: 1,
-                height: '80%',
+                height: '75%',
                 label: {
                     position: 'outside',
                     formatter: "{d}%"
diff --git a/src/pages/Plan/Report/components/TestResult/FuncResult.table.tsx b/src/pages/Plan/Report/components/TestResult/FuncResult.table.tsx
index 367a8294d61f0291fbfdec42868d52ddc0a21edf..853ae33db56f4a24d5b43cb82f51add5135667e2 100644
--- a/src/pages/Plan/Report/components/TestResult/FuncResult.table.tsx
+++ b/src/pages/Plan/Report/components/TestResult/FuncResult.table.tsx
@@ -1,11 +1,12 @@
 import { runMethodMap } from "@/pages/Suite/utils";
-import { Table, TableColumnProps, Typography } from "antd";
+import { Table, Typography } from "antd";
+import type { TableColumnProps } from "antd"
 import React from "react";
 import { FullSpace } from "../../styled";
 import { StateIcon } from "../utils"
 import { PriorityTag } from "@/components/Public/PriorityTag"
 
-const FuncPassRate: React.FC<{ [k: string]: any }> = ({ dataSource }) => {
+const FuncPassRate: React.FC<Record<string, any>> = ({ dataSource }) => {
     const columns: TableColumnProps<any>[] = [{
         width: 40,
         align: "center",
@@ -45,14 +46,15 @@ const FuncPassRate: React.FC<{ [k: string]: any }> = ({ dataSource }) => {
                 dataSource={dataSource}
                 size="small"
                 rowKey={"id"}
-                pagination={{
+                pagination={false}
+                /* pagination={{
                     hideOnSinglePage: true,
                     showSizeChanger: true,
                     showQuickJumper: true,
-                    showTotal(total, range) {
+                    showTotal(total) {
                         return `共 ${total} 条 `
                     },
-                }}
+                }} */
             />
         </FullSpace>
     )
diff --git a/src/pages/Plan/Report/components/TestResult/PerfExpandedTable.tsx b/src/pages/Plan/Report/components/TestResult/PerfExpandedTable.tsx
index 2c7494f44e66439914b3a319d644df168f311207..78452968b9beb0044eea0cbc4a9a7eea391b8af1 100644
--- a/src/pages/Plan/Report/components/TestResult/PerfExpandedTable.tsx
+++ b/src/pages/Plan/Report/components/TestResult/PerfExpandedTable.tsx
@@ -1,10 +1,9 @@
 import React from "react"
-import { Table, Space, Row, Divider, TableColumnProps } from "antd"
+import { Table, Space, Row, Divider } from "antd"
+import type { TableColumnProps } from "antd"
 import styled from "styled-components"
 
-type IProps = {
-    [k: string]: any
-}
+type IProps = Record<string, any>
 
 const ExpandedLine = styled.div`
     padding: 8px 0;
@@ -23,7 +22,7 @@ const CustomTable = styled(Table)`
     }
 `
 
-const ExpandedCaseTable: React.FC<IProps> = ({ dataSource = [], id }) => {
+const ExpandedCaseTable: React.FC<IProps> = ({ dataSource = [] }) => {
     const columns: TableColumnProps<any>[] = [{
         title: "指标名称",
         dataIndex: "metric",
@@ -66,7 +65,7 @@ const ExpandedCaseTable: React.FC<IProps> = ({ dataSource = [], id }) => {
                 </ExpandedLine>
 
                 {
-                    dataSource.map((i: any, idx: number) => (
+                    dataSource.map((i: any) => (
                         <ExpandedLine
                             key={i.id}
                         >
diff --git a/src/pages/Plan/Report/components/TestResult/PerfTable.tsx b/src/pages/Plan/Report/components/TestResult/PerfTable.tsx
index fc9ae1a624384f132a26037ca17c22b99aff24fe..e869a9a92eb7fadda22c157256031c31f2884e0d 100644
--- a/src/pages/Plan/Report/components/TestResult/PerfTable.tsx
+++ b/src/pages/Plan/Report/components/TestResult/PerfTable.tsx
@@ -1,6 +1,6 @@
 import React from "react"
-import { Table, Space, Typography, Row, TableColumnProps, Tooltip } from "antd"
-import moment from "moment"
+import { Table, Space, Typography, Row } from "antd"
+import type { TableColumnProps } from "antd"
 import ExpandedCaseTable from "./PerfExpandedTable"
 import styled from "styled-components"
 import { runMethodMap } from "@/pages/Suite/utils"
@@ -25,8 +25,12 @@ type IProps = {
     dataSource?: any[]
 }
 
-const PerfTable: React.FC<IProps> = ({ dataSource }) => {
-    const [expanedKeys, setExpandedKeys] = React.useState([])
+const PerfTable: React.FC<IProps> = ({ dataSource = [] }) => {
+    const [expanedKeys, setExpandedKeys] = React.useState<any[]>([])
+
+    React.useEffect(() => {
+        setExpandedKeys(dataSource?.map((i: any) => i.id))
+    }, [dataSource])
 
     const columns: TableColumnProps<any>[] = [{
         title: "测试用例",
@@ -78,19 +82,18 @@ const PerfTable: React.FC<IProps> = ({ dataSource }) => {
                     },
                     columnWidth: 32,
                     onExpand(expaded: boolean, record: any) {
-                        expaded ?
-                            setExpandedKeys(l => l.concat(record.id)) :
-                            setExpandedKeys(l => l.filter((i: any) => i !== record.id))
+                        setExpandedKeys(l => expaded ? l.concat(record.id) : l.filter((i: any) => i !== record.id))
                     }
                 }}
-                pagination={{
+                pagination={false}
+                /* pagination={{
                     showSizeChanger: true,
                     showQuickJumper: true,
                     hideOnSinglePage: true,
-                    showTotal(total, range) {
+                    showTotal(total) {
                         return `共 ${total} 条 `
                     },
-                }}
+                }} */
             />
         </Space>
     )
diff --git a/src/pages/Plan/Report/components/TestResult/index.tsx b/src/pages/Plan/Report/components/TestResult/index.tsx
index b6f9d808f871747fe4d183c41631a2a21644884f..9624b9179bec781cd6b229107a5101a860e22b88 100644
--- a/src/pages/Plan/Report/components/TestResult/index.tsx
+++ b/src/pages/Plan/Report/components/TestResult/index.tsx
@@ -6,8 +6,9 @@ import FuncPassRate from "./FuncPassRate.chart"
 import FuncResultTable from "./FuncResult.table"
 import PerfTable from "./PerfTable"
 
-const TestResult: React.FC<{ [k: string]: any }> = ({ dataSource }) => {
+const TestResult: React.FC<Record<string, any>> = ({ dataSource }) => {
     const { func_test, perf_test } = dataSource
+
     return (
         <WhiteContent>
             <FullSpace direction="vertical">
diff --git a/src/pages/Plan/Report/components/TestTask/Task.table.tsx b/src/pages/Plan/Report/components/TestTask/Task.table.tsx
index f9a5fe1caa550a8de6b3b1dfa7b0a81d20dc750e..ad46d8e3f3e1df75cd582936037139bebb0d8bb1 100644
--- a/src/pages/Plan/Report/components/TestTask/Task.table.tsx
+++ b/src/pages/Plan/Report/components/TestTask/Task.table.tsx
@@ -1,9 +1,10 @@
-import { Table, TableColumnProps, Typography } from "antd";
+import { Table, Typography } from "antd";
+import type { TableColumnProps } from "antd"
 import React from "react";
 import { FullSpace } from "../../styled";
 import { StateIcon } from "../utils"
 
-const FuncPassRate: React.FC<{ [k: string]: any }> = ({ dataSource, title }) => {
+const FuncPassRate: React.FC<Record<string, any>> = ({ dataSource, title }) => {
     const columns: TableColumnProps<any>[] = [{
         width: 40,
         align: "center",
diff --git a/src/pages/Plan/Report/components/TestTask/index.tsx b/src/pages/Plan/Report/components/TestTask/index.tsx
index c5c24f0a7426e3ee9c4a20ec7a3e3d725c809e3a..2054d5f965da028b3bf341e69def678d28ec589f 100644
--- a/src/pages/Plan/Report/components/TestTask/index.tsx
+++ b/src/pages/Plan/Report/components/TestTask/index.tsx
@@ -5,7 +5,7 @@ import { Typography } from "antd"
 
 import TaskTable from "./Task.table"
 
-const TestResult: React.FC<{ [k: string]: any }> = ({ dataSource }) => {
+const TestResult: React.FC<Record<string, any>> = ({ dataSource }) => {
     const { auto_task, manual_task } = dataSource
     return (
         <WhiteContent>