From 52428b77c029708b4cee7b9f5f0bf5f08c7a9d25 Mon Sep 17 00:00:00 2001 From: kim131 <1035828775@qq.com> Date: Tue, 5 Jan 2021 17:09:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=AF=BC=E8=88=AA=E6=A0=8F?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/css/main.css | 7 +- public/static/img/窗口关闭.svg | 1 + public/static/img/窗口缩小.svg | 1 + public/static/img/缩放窗口.svg | 1 + src/App.vue | 18 ++- src/components/app-header/app-header.vue | 126 +++++++++++++++--- .../app-header/components/app-header-copy.vue | 87 ++---------- src/services/system.js | 17 +++ src/views/main_web/index/index.vue | 5 +- .../workspace/components/workLine.vue | 12 +- .../main_web/workspace/workspace.new.vue | 39 +++--- src/views/platform_center/index.vue | 2 +- 12 files changed, 198 insertions(+), 118 deletions(-) create mode 100644 public/static/img/窗口关闭.svg create mode 100644 public/static/img/窗口缩小.svg create mode 100644 public/static/img/缩放窗口.svg diff --git a/public/static/css/main.css b/public/static/css/main.css index 38b41cf8..84b6cd7b 100644 --- a/public/static/css/main.css +++ b/public/static/css/main.css @@ -4775,7 +4775,6 @@ button:focus { margin-top: 54px; } .listfilewarp{ - min-height: calc(100vh - 48px); overflow: hidden; /* overflow-y: auto; */ background-color: #f0f0f0; @@ -7806,7 +7805,7 @@ li.secondMenu ul li:hover { justify-content: start; } .worklinkBtngroup{ - height: 54px; + /* height: 54px; */ overflow: hidden; float: left; /* max-width: 368px; */ @@ -8980,7 +8979,8 @@ h5.dulilabel{ .proj-detail .proj-desc-wrap::-webkit-scrollbar-thumb:window-inactive, .proj-detail .summary-wrap::-webkit-scrollbar-thumb:window-inactive, .new-proj .template_select_content::-webkit-scrollbar-thumb:window-inactive { - background-color: #adadad; + /* background-color: #adadad; */ + background-color: transparent; } /* 当前选中的工作负责人的框 */ @@ -9062,7 +9062,6 @@ h5.dulilabel{ /* 搜索功能 搜索入口 */ .search-entry { position: relative; - top: 12px; width: 26px; height: 26px; background: url('/static/img/搜索.svg') center/100%; diff --git a/public/static/img/窗口关闭.svg b/public/static/img/窗口关闭.svg new file mode 100644 index 00000000..4138efb2 --- /dev/null +++ b/public/static/img/窗口关闭.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/static/img/窗口缩小.svg b/public/static/img/窗口缩小.svg new file mode 100644 index 00000000..c42cc2cf --- /dev/null +++ b/public/static/img/窗口缩小.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/static/img/缩放窗口.svg b/public/static/img/缩放窗口.svg new file mode 100644 index 00000000..8b010bd3 --- /dev/null +++ b/public/static/img/缩放窗口.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 57ed4f62..51777be6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -30,7 +30,7 @@ --> @@ -38,6 +38,7 @@