diff --git a/report-ui/src/assets/styles/index.scss b/report-ui/src/assets/styles/index.scss index 526a10b9..9fa399b3 100644 --- a/report-ui/src/assets/styles/index.scss +++ b/report-ui/src/assets/styles/index.scss @@ -280,4 +280,4 @@ a:hover { color: #bfcbd9!important; font-weight: normal !important; } -} +} \ No newline at end of file diff --git a/report-ui/src/assets/styles/sidebar.scss b/report-ui/src/assets/styles/sidebar.scss index d94399d1..9649af9c 100644 --- a/report-ui/src/assets/styles/sidebar.scss +++ b/report-ui/src/assets/styles/sidebar.scss @@ -55,10 +55,14 @@ } .hideSidebar { .sidebar-container { - width: 36px !important; + width: 56px !important; + .iconfont { + font-size: 24px; + margin-left: 5px; + } } .main-container { - margin-left: 36px; + margin-left:56px; } .submenu-title-noDropdown { padding-left: 10px !important; diff --git a/report-ui/src/views/layout/components/AppMain.vue b/report-ui/src/views/layout/components/AppMain.vue index 747bea23..c026476f 100644 --- a/report-ui/src/views/layout/components/AppMain.vue +++ b/report-ui/src/views/layout/components/AppMain.vue @@ -29,5 +29,6 @@ export default { height: calc(100vh - 50px); position: relative; overflow: auto; + background: #f5f8fa; } diff --git a/report-ui/src/views/layout/components/Sidebar/index.vue b/report-ui/src/views/layout/components/Sidebar/index.vue index f3980554..cb569253 100644 --- a/report-ui/src/views/layout/components/Sidebar/index.vue +++ b/report-ui/src/views/layout/components/Sidebar/index.vue @@ -2,7 +2,9 @@
- 在线大屏 +
- 查看 + diff --git a/report-ui/src/views/report/datasource/index.vue b/report-ui/src/views/report/datasource/index.vue index b393f5b3..15395aef 100644 --- a/report-ui/src/views/report/datasource/index.vue +++ b/report-ui/src/views/report/datasource/index.vue @@ -77,7 +77,7 @@ { if (data.code == '200') { - this.testReplyCode = data.code + this.testReplyCode = data.code; + this.$message({ + message: '测试成功!', + type: 'success' + }); + } else { this.testReplyCode = null } diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue index ef8d5105..af1c5907 100644 --- a/report-ui/src/views/report/resultset/index.vue +++ b/report-ui/src/views/report/resultset/index.vue @@ -260,7 +260,7 @@ + style="height:190px" />
@@ -889,12 +889,6 @@ export default { height: 400px !important; } } -.codemirror { - width: 100%; - height: 200px; - margin: 0; - overflow: auto; -} .title { width: 100%; display: inline-block; diff --git a/report-ui/static/logo-dp.png b/report-ui/static/logo-dp.png index 90788c4b..5ecbca8f 100644 Binary files a/report-ui/static/logo-dp.png and b/report-ui/static/logo-dp.png differ