diff --git a/src/assets/css/components/components/rightBox/report/builtinReportBox.scss b/src/assets/css/components/components/rightBox/report/reportBox.scss similarity index 100% rename from src/assets/css/components/components/rightBox/report/builtinReportBox.scss rename to src/assets/css/components/components/rightBox/report/reportBox.scss diff --git a/src/assets/css/components/index.scss b/src/assets/css/components/index.scss index 1c39c85c..503cef6f 100644 --- a/src/assets/css/components/index.scss +++ b/src/assets/css/components/index.scss @@ -42,8 +42,8 @@ @import './views/chartHeader'; @import './views/charts/chartMap'; @import 'views/charts/chartRelationShipList'; -@import './views/report/builtinReport'; -@import './components/rightBox/report/builtinReportBox'; +@import 'views/report/report'; +@import 'components/rightBox/report/reportBox'; @import './views/charts2/panel'; @import './views/charts2/networkOverviewLine'; diff --git a/src/assets/css/components/views/report/builtinReport.scss b/src/assets/css/components/views/report/report.scss similarity index 97% rename from src/assets/css/components/views/report/builtinReport.scss rename to src/assets/css/components/views/report/report.scss index 23fde829..20db63d4 100644 --- a/src/assets/css/components/views/report/builtinReport.scss +++ b/src/assets/css/components/views/report/report.scss @@ -1,21 +1,22 @@ -.cn-builtin { +.cn-report { background: #fff; margin: 10px; height: calc(100% - 20px) !important; display: flex; flex-direction: row; - .cn-builtin-left { + .cn-report-left { width: 288px; height: 100%; border-right: 1px solid #E7EAED; position: relative; - .cn-builtin-left-title { + overflow: auto; + .cn-report-left-title { padding: 28px 0 26px 13px; font-size: 16px; color: #333333; letter-spacing: 0; } - .cn-builtin-left-menu { + .cn-report-left-menu { width: 250px; word-break: normal; margin: auto; @@ -25,13 +26,13 @@ padding: 14px; cursor: pointer; } - .cn-builtin-left-menu.cn-active { + .cn-report-left-menu.cn-active { background: #F4FAFF; border-radius: 2px; color: #0091FF; } } - .cn-builtin-right { + .cn-report-right { flex: 1; .list-page .main-container { padding: 0; diff --git a/src/components/table/report/reportTestTable.vue b/src/components/table/report/ReportTable.vue similarity index 100% rename from src/components/table/report/reportTestTable.vue rename to src/components/table/report/ReportTable.vue diff --git a/src/router/index.js b/src/router/index.js index be12c8b2..d98cc24a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -21,7 +21,7 @@ const routes = [ }, { path: '/report/builtIn', - component: () => import('@/views/report/reportTest') + component: () => import('@/views/report/Report') }, { path: '/entityExplorer', diff --git a/src/views/report/reportTest.vue b/src/views/report/Report.vue similarity index 93% rename from src/views/report/reportTest.vue rename to src/views/report/Report.vue index 0f4e65c1..5312551f 100644 --- a/src/views/report/reportTest.vue +++ b/src/views/report/Report.vue @@ -1,18 +1,18 @@