diff --git a/frontend/src/assets/logo-light-MeterSphere.svg b/frontend/src/assets/logo-light-MeterSphere.svg index 1fb78563d5..5b8f2cb7ce 100755 --- a/frontend/src/assets/logo-light-MeterSphere.svg +++ b/frontend/src/assets/logo-light-MeterSphere.svg @@ -1,80 +1,33 @@ - + + viewBox="0 0 201.33 232.66" style="enable-background:new 0 0 201.33 232.66;" xml:space="preserve"> - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + diff --git a/frontend/src/assets/module/api.svg b/frontend/src/assets/module/api.svg new file mode 100644 index 0000000000..7dd71a75dc --- /dev/null +++ b/frontend/src/assets/module/api.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + diff --git a/frontend/src/assets/module/logo.svg b/frontend/src/assets/module/logo.svg new file mode 100644 index 0000000000..33f6f4432f --- /dev/null +++ b/frontend/src/assets/module/logo.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/module/performance.svg b/frontend/src/assets/module/performance.svg new file mode 100644 index 0000000000..fb33d04c82 --- /dev/null +++ b/frontend/src/assets/module/performance.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/frontend/src/assets/module/project.svg b/frontend/src/assets/module/project.svg new file mode 100644 index 0000000000..1f45cb510e --- /dev/null +++ b/frontend/src/assets/module/project.svg @@ -0,0 +1,32 @@ + + + + + + + + + + diff --git a/frontend/src/assets/module/pushpin.svg b/frontend/src/assets/module/pushpin.svg new file mode 100644 index 0000000000..774cf0fbb6 --- /dev/null +++ b/frontend/src/assets/module/pushpin.svg @@ -0,0 +1,7 @@ + + + + diff --git a/frontend/src/assets/module/report.svg b/frontend/src/assets/module/report.svg new file mode 100644 index 0000000000..aace84d0de --- /dev/null +++ b/frontend/src/assets/module/report.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/frontend/src/assets/module/system.svg b/frontend/src/assets/module/system.svg new file mode 100644 index 0000000000..d26315d3a1 --- /dev/null +++ b/frontend/src/assets/module/system.svg @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/frontend/src/assets/module/track.svg b/frontend/src/assets/module/track.svg new file mode 100644 index 0000000000..bf4721b45f --- /dev/null +++ b/frontend/src/assets/module/track.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/module/ui.svg b/frontend/src/assets/module/ui.svg new file mode 100644 index 0000000000..4151aa1b2a --- /dev/null +++ b/frontend/src/assets/module/ui.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/frontend/src/assets/module/unpin.svg b/frontend/src/assets/module/unpin.svg new file mode 100644 index 0000000000..5ec7d3eadf --- /dev/null +++ b/frontend/src/assets/module/unpin.svg @@ -0,0 +1,7 @@ + + + + diff --git a/frontend/src/assets/module/workstation.svg b/frontend/src/assets/module/workstation.svg new file mode 100644 index 0000000000..f2bc222024 --- /dev/null +++ b/frontend/src/assets/module/workstation.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue index 1011eb7887..cca352b9cf 100644 --- a/frontend/src/business/App.vue +++ b/frontend/src/business/App.vue @@ -1,50 +1,55 @@ + diff --git a/frontend/src/business/components/layout/AsideHeader.vue b/frontend/src/business/components/layout/AsideHeader.vue new file mode 100644 index 0000000000..6e426302d1 --- /dev/null +++ b/frontend/src/business/components/layout/AsideHeader.vue @@ -0,0 +1,92 @@ + + + + diff --git a/frontend/src/business/components/layout/AsideMenus.vue b/frontend/src/business/components/layout/AsideMenus.vue new file mode 100644 index 0000000000..c38b31ef88 --- /dev/null +++ b/frontend/src/business/components/layout/AsideMenus.vue @@ -0,0 +1,215 @@ + + + + diff --git a/frontend/src/business/components/layout/HeaderRightMenus.vue b/frontend/src/business/components/layout/HeaderRightMenus.vue new file mode 100644 index 0000000000..ff623f80ad --- /dev/null +++ b/frontend/src/business/components/layout/HeaderRightMenus.vue @@ -0,0 +1,40 @@ + + + + + + diff --git a/frontend/src/business/components/notice/Notification.vue b/frontend/src/business/components/notice/Notification.vue index b8caf7b4aa..d533eb7d92 100644 --- a/frontend/src/business/components/notice/Notification.vue +++ b/frontend/src/business/components/notice/Notification.vue @@ -2,7 +2,6 @@
@@ -79,9 +78,6 @@ export default { noticeShow: false, }; }, - props: { - color: String - }, created() { this.getNotifications(); this.getUserList(); @@ -223,7 +219,7 @@ export default { } .global { - color: #fff; + color: var(--color); } .header-top-menu { diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue index 98f0f0464a..7e6966c94e 100644 --- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue +++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue @@ -2,7 +2,7 @@ @@ -26,6 +28,7 @@ import MsRecentList from "../../common/head/RecentList"; import MsCreateButton from "../../common/head/CreateButton"; import MsShowAll from "../../common/head/ShowAll"; import ProjectChange from "@/business/components/common/head/ProjectSwitch"; +import MsHeaderRightMenus from "@/business/components/layout/HeaderRightMenus"; export default { name: "PerformanceHeaderMenus", @@ -34,6 +37,7 @@ export default { MsCreateButton, MsShowAll, MsRecentList, + MsHeaderRightMenus }, data() { return { diff --git a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue index 71416d2481..1e037ad406 100644 --- a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue +++ b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue @@ -217,7 +217,7 @@ export default { total: 0, loading: false, testId: null, - screenHeight: 'calc(100vh - 200px)', + screenHeight: 'calc(100vh - 160px)', statusFilters: [ {text: 'Starting', value: 'Starting'}, {text: 'Running', value: 'Running'}, diff --git a/frontend/src/business/components/performance/test/PerformanceTestList.vue b/frontend/src/business/components/performance/test/PerformanceTestList.vue index 5fdc58d205..ec8121e2dc 100644 --- a/frontend/src/business/components/performance/test/PerformanceTestList.vue +++ b/frontend/src/business/components/performance/test/PerformanceTestList.vue @@ -193,7 +193,7 @@ export default { {text: 'Error', value: 'Error'} ], userFilters: [], - screenHeight: 'calc(100vh - 200px)', + screenHeight: 'calc(100vh - 160px)', versionOptions: [], currentVersion: '', versionEnable: false, diff --git a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue index ffe27d47c3..7b1020b710 100644 --- a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue +++ b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue @@ -2,7 +2,7 @@ @@ -60,10 +66,11 @@ import MsRecentList from "@/business/components/common/head/RecentList"; import MsCreateButton from "@/business/components/common/head/CreateButton"; import ProjectChange from "@/business/components/common/head/ProjectSwitch"; import {hasLicense} from "@/common/js/utils"; +import MsHeaderRightMenus from "@/business/components/layout/HeaderRightMenus"; export default { name: "ProjectHeaderMenus", - components: {ProjectChange, MsShowAll, MsRecentList, MsCreateButton}, + components: {ProjectChange, MsShowAll, MsRecentList, MsCreateButton, MsHeaderRightMenus}, data() { return { currentProject: '', @@ -99,6 +106,7 @@ export default { border-bottom: 1px solid #E6E6E6; background-color: #FFF; } + .el-menu-item { padding: 0 10px; } diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue index b64d5ea883..a35c89f24e 100644 --- a/frontend/src/business/components/project/menu/EditProject.vue +++ b/frontend/src/business/components/project/menu/EditProject.vue @@ -152,7 +152,7 @@ export default { // caseTemplateId: [{required: true}], // issueTemplateId: [{required: true}], }, - screenHeight: 'calc(100vh - 195px)', + screenHeight: 'calc(100vh - 155px)', labelWidth: '150px', platformOptions: [], issueOptions: [], diff --git a/frontend/src/business/components/project/menu/EnvironmentList.vue b/frontend/src/business/components/project/menu/EnvironmentList.vue index 83924cc86a..fecf1f5571 100644 --- a/frontend/src/business/components/project/menu/EnvironmentList.vue +++ b/frontend/src/business/components/project/menu/EnvironmentList.vue @@ -168,7 +168,7 @@ export default { total: 0, projectIds: [], //当前工作空间所拥有的所有项目id projectFilters: [], - screenHeight: 'calc(100vh - 195px)', + screenHeight: 'calc(100vh - 155px)', ifCreate: false, //是否是创建环境 } }, diff --git a/frontend/src/business/components/project/menu/Log.vue b/frontend/src/business/components/project/menu/Log.vue index aa86fe5bba..19ac298a26 100644 --- a/frontend/src/business/components/project/menu/Log.vue +++ b/frontend/src/business/components/project/menu/Log.vue @@ -172,7 +172,7 @@ export default { }, tableData: [], userList: [], - screenHeight: 'calc(100vh - 215px)', + screenHeight: 'calc(100vh - 175px)', LOG_TYPE: new LOG_TYPE(this), LOG_TYPE_MAP: new LOG_TYPE_MAP(this), LOG_MODULE_MAP: new LOG_MODULE_MAP(this), diff --git a/frontend/src/business/components/project/menu/Member.vue b/frontend/src/business/components/project/menu/Member.vue index 3df41eff82..74b1293b5f 100644 --- a/frontend/src/business/components/project/menu/Member.vue +++ b/frontend/src/business/components/project/menu/Member.vue @@ -115,7 +115,7 @@ export default { result: {}, dialogResult: {}, tableData: [], - screenHeight: 'calc(100vh - 195px)', + screenHeight: 'calc(100vh - 155px)', currentPage: 1, pageSize: 10, total: 0, diff --git a/frontend/src/business/components/project/menu/UserGroup.vue b/frontend/src/business/components/project/menu/UserGroup.vue index 4ebcf9023f..743c365e0b 100644 --- a/frontend/src/business/components/project/menu/UserGroup.vue +++ b/frontend/src/business/components/project/menu/UserGroup.vue @@ -113,7 +113,7 @@ export default { currentPage: 1, pageSize: 10, total: 0, - screenHeight: 'calc(100vh - 200px)', + screenHeight: 'calc(100vh - 160px)', groups: [], currentGroup: {}, flag: false diff --git a/frontend/src/business/components/project/menu/file/FileManage.vue b/frontend/src/business/components/project/menu/file/FileManage.vue index 2ff455becd..23e909e231 100644 --- a/frontend/src/business/components/project/menu/file/FileManage.vue +++ b/frontend/src/business/components/project/menu/file/FileManage.vue @@ -41,6 +41,6 @@ export default { } .file-manage-resource { - height: calc(50vh - 44px); + height: calc(50vh - 4px); } diff --git a/frontend/src/business/components/project/menu/file/ResourceManage.vue b/frontend/src/business/components/project/menu/file/ResourceManage.vue index a693dbbb08..e22ab55f80 100644 --- a/frontend/src/business/components/project/menu/file/ResourceManage.vue +++ b/frontend/src/business/components/project/menu/file/ResourceManage.vue @@ -116,7 +116,7 @@ export default { condition: {}, projectId: getCurrentProjectID(), currentRow: null, - height: 'calc(50vh - 160px)' + height: 'calc(50vh - 110px)' }; }, created() { diff --git a/frontend/src/business/components/project/menu/function/CustomFunction.vue b/frontend/src/business/components/project/menu/function/CustomFunction.vue index 97f437af33..5805362556 100644 --- a/frontend/src/business/components/project/menu/function/CustomFunction.vue +++ b/frontend/src/business/components/project/menu/function/CustomFunction.vue @@ -99,7 +99,7 @@ export default { currentPage: 1, pageSize: 10, total: 0, - screenHeight: 'calc(100vh - 195px)', + screenHeight: 'calc(100vh - 155px)', languages: [ {text: 'beanshell', value: 'beanshell'}, {text: 'python', value: 'python'}, diff --git a/frontend/src/business/components/project/menu/function/CustomFunctionRelate.vue b/frontend/src/business/components/project/menu/function/CustomFunctionRelate.vue index 991c15eab8..473131b9ad 100644 --- a/frontend/src/business/components/project/menu/function/CustomFunctionRelate.vue +++ b/frontend/src/business/components/project/menu/function/CustomFunctionRelate.vue @@ -72,7 +72,7 @@ export default { currentPage: 1, pageSize: 10, total: 0, - screenHeight: 'calc(100vh - 195px)', + screenHeight: 'calc(100vh - 155px)', currentRow: {} } }, diff --git a/frontend/src/business/components/project/notification/TaskNotification.vue b/frontend/src/business/components/project/notification/TaskNotification.vue index fe89c0507c..347d37b6fb 100644 --- a/frontend/src/business/components/project/notification/TaskNotification.vue +++ b/frontend/src/business/components/project/notification/TaskNotification.vue @@ -201,7 +201,7 @@ export default {