From e6f69aebf03a0399d6f66219531265a94e0a9b51 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Tue, 26 Jan 2021 16:59:49 +0800 Subject: [PATCH] [Improvement][ui] Front-end interface optimization --- .../home/pages/dag/_source/formModel/log.vue | 2 +- .../pages/dag/_source/plugIn/jsPlumbHandle.js | 2 +- .../pages/servers/_source/zookeeperList.vue | 2 +- .../definition/pages/list/_source/list.vue | 4 ++-- .../pages/index/_source/taskStatusCount.vue | 6 ------ .../pages/instance/pages/list/_source/list.vue | 18 +++--------------- .../pages/instance/pages/list/index.vue | 7 ++++++- .../components/secondaryMenu/_source/menu.js | 4 ++-- dolphinscheduler-ui/src/sass/common/index.scss | 3 +++ 9 files changed, 19 insertions(+), 29 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue index 502adc767f..5eb0a109a2 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue @@ -38,7 +38,7 @@ - + diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js index 1977a92409..226324d256 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js @@ -573,7 +573,7 @@ JSP.prototype.copyNodes = function ($id) { JSP.prototype.handleEventScreen = function ({ item, is }) { let screenOpen = true if (is) { - item.icon = 'el-icon-minus' + item.icon = 'el-icon-aim' screenOpen = true } else { item.icon = 'el-icon-full-screen' diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue index df987908f9..46cde99551 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue @@ -24,7 +24,7 @@ - + diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue index b49fea2c2f..64c3f880b5 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue @@ -25,8 +25,8 @@ {{ scope.row.name }} - - {{scope.row.name}} + + {{scope.row.name}} diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue index 9fd45418f9..9ebfcc6288 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue @@ -139,9 +139,3 @@ components: { mNoData } } - - diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue index 30309415b2..01b7574689 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue @@ -25,7 +25,7 @@ {{ scope.row.name }} - {{scope.row.name}} + {{ scope.row.name }} @@ -78,10 +78,10 @@ - + - + { - // if (item.isCheck) { - // arr.push(item.id) - // } - // }) - // this.strDelete = _.join(arr, ',') - // if (v === false) { - // this.checkAll = false - // } - // }, _arrDelChange (v) { let arr = [] arr = _.map(v, 'id') diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue index 05b905ac8b..c07eacbae9 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue @@ -18,7 +18,7 @@ - + @@ -223,4 +223,9 @@ } } } + @media screen and (max-width: 1246px) { + .searchNav { + margin-bottom: 30px; + } + } diff --git a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js index daaf918665..249bf2e3e2 100644 --- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js +++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js @@ -115,7 +115,7 @@ const menu = { path: 'warning-instance-manage', isOpen: true, enabled: true, - icon: 'ri-spam-fill', + icon: 'el-icon-warning-outline', children: [] }, { @@ -133,7 +133,7 @@ const menu = { path: 'queue-manage', isOpen: true, enabled: true, - icon: 'ri-group-line', + icon: 'el-icon-s-grid', children: [] }, { diff --git a/dolphinscheduler-ui/src/sass/common/index.scss b/dolphinscheduler-ui/src/sass/common/index.scss index 647be6121c..a80ae2c765 100644 --- a/dolphinscheduler-ui/src/sass/common/index.scss +++ b/dolphinscheduler-ui/src/sass/common/index.scss @@ -102,6 +102,9 @@ body{ } .main-layout-model { &.dag-screen { + .m-top { + position: unset; + } .m-bottom { z-index: 2; }
{{ scope.row.name }}