From f05969f614290cde2243d2b3e58fe875e4725ee1 Mon Sep 17 00:00:00 2001 From: lihui_ocr Date: Wed, 15 May 2024 23:28:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/excelicon.svg | 37 +++++++ src/assets/icons/warn.svg | 12 ++ .../components/Header/ShortcutModal.vue | 17 ++- src/views/final/comp/ImportExcelModal.vue | 59 ++++++++-- src/views/final/content/ListContent.vue | 2 +- src/views/home/aside/comp/AdvanceFilter.vue | 9 +- src/views/home/aside/comp/modals/TiShi.vue | 104 ++++++++++++++++++ src/views/task/aside/Aside.vue | 11 +- src/views/task/index.vue | 3 +- src/views/worksheet/aside/Aside.vue | 8 ++ src/views/worksheet/index.vue | 9 +- 11 files changed, 245 insertions(+), 26 deletions(-) create mode 100644 src/assets/icons/excelicon.svg create mode 100644 src/assets/icons/warn.svg create mode 100644 src/views/home/aside/comp/modals/TiShi.vue diff --git a/src/assets/icons/excelicon.svg b/src/assets/icons/excelicon.svg new file mode 100644 index 0000000..a93ad98 --- /dev/null +++ b/src/assets/icons/excelicon.svg @@ -0,0 +1,37 @@ + + + excel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/warn.svg b/src/assets/icons/warn.svg new file mode 100644 index 0000000..5e0963c --- /dev/null +++ b/src/assets/icons/warn.svg @@ -0,0 +1,12 @@ + + + Icon/Warning + + + + + + + + + \ No newline at end of file diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue index 6aaf89f..af841fc 100644 --- a/src/layout/components/Header/ShortcutModal.vue +++ b/src/layout/components/Header/ShortcutModal.vue @@ -124,18 +124,16 @@ defineExpose({ 任务审批/任务终审/AI工单明细动作
- +
关闭（关闭当前场景弹窗）
@@ -143,14 +141,14 @@ defineExpose({
-
+
/ -
+
打开上一条/下一条信息切换
- +
@@ -166,7 +164,7 @@ defineExpose({
- +
@@ -318,6 +316,7 @@ defineExpose({ } .key { + float: right; border-radius: 8px; display: inline-block; box-sizing: content-box; diff --git a/src/views/final/comp/ImportExcelModal.vue b/src/views/final/comp/ImportExcelModal.vue index f8009e6..813227b 100644 --- a/src/views/final/comp/ImportExcelModal.vue +++ b/src/views/final/comp/ImportExcelModal.vue @@ -21,7 +21,8 @@ interface ParseResults { } const cardStyle = { - width: "620px", + "margin-bottom":"364px", + width: "484px", "--n-padding-bottom": "10px", "--n-padding-left": "0px", }; @@ -204,6 +205,7 @@ function afterLeave() {
+
-
{{ item.fileName }}
+
{{ item.fileName }}
+ +
@@ -262,7 +273,7 @@ function afterLeave() { display: flex; justify-content: space-between; align-items: center; - padding: 6px 0 0 24px; + padding: 0px 0px 0 24px; // padding: 10px; } @@ -285,9 +296,9 @@ function afterLeave() { } &-icon { - background: #000; + background: #999999; display: inline-block; - width: 12px; + width: 16px; height: 1px; transform: rotate(45deg); -webkit-transform: rotate(45deg); @@ -296,9 +307,9 @@ function afterLeave() { &:after { content: ""; display: block; - width: 12px; + width: 16px; height: 1px; - background: #000; + background: #999999; transform: rotate(-90deg); -webkit-transform: rotate(-90deg); } @@ -306,8 +317,9 @@ function afterLeave() { } &-content { - margin: 33px 24px 0 25px; + margin: 55px 24px 0 25px; &-dragger { + height: 150px; display: flex; flex-direction: column; align-items: center; @@ -317,12 +329,11 @@ function afterLeave() { font-weight: bold; border-radius: 2px; text-align: center; - background: rgba(202, 210, 221, 0.1); + background: rgba(202,210,221,0.10); } &-files { - margin-top: 10px; - padding: 0px 10px; + margin-top: 17px; font-size: 14px; display: flex; justify-content: space-between; @@ -354,6 +365,15 @@ function afterLeave() { margin-top: 0px; margin-bottom: 0px; } +::v-deep(.n-divider:not(.n-divider--dashed) .n-divider__line){ + background: none; +} +::v-deep(.n-button){ + width: 60px !important; +height: 36px !important; +background: #507afd !important; +border-radius: 3px; +} .wrapper-tip1 { font-size: 14px; font-family: PingFang SC, PingFang SC-Regular; @@ -369,4 +389,19 @@ function afterLeave() { color: #999999; line-height: 22px; } +.topline{ + background: rgba(0,0,0,0.09); + height: 1px; + width: 100%; + position: absolute; + top:56px +} +.bottomline{ + background: rgba(0,0,0,0.09); + height: 1px; + width: 100%; + margin-top: 33px; +// position: absolute; + // bottom:68px +} diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue index 74e3963..e21cc2a 100644 --- a/src/views/final/content/ListContent.vue +++ b/src/views/final/content/ListContent.vue @@ -1061,7 +1061,7 @@ defineExpose({ overflow: hidden; /* 默认隐藏滚动条 */ } .cotnet_wrapeertwo { width: 100%; - height: 67vh; + //padding-right: 10px; /* 右侧内边距 */ overflow: hidden; /* 默认隐藏滚动条 */ } diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index 27c0b31..d9f093b 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -310,8 +310,15 @@ defineExpose({ >{{ currentlySelectedAdvanced }} {{ currentlySelectedAdvanced }} + - + diff --git a/src/views/home/aside/comp/modals/TiShi.vue b/src/views/home/aside/comp/modals/TiShi.vue new file mode 100644 index 0000000..e5e954e --- /dev/null +++ b/src/views/home/aside/comp/modals/TiShi.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue index b7bdb20..a639114 100644 --- a/src/views/task/aside/Aside.vue +++ b/src/views/task/aside/Aside.vue @@ -400,5 +400,14 @@ function handleOk(item: any) { z-index: 10; } } + ::v-deep(.list){ + height: calc(100vh - 218px); + background: #fff + } + @media (max-height: 900px) { + ::v-deep(.list){ + height: calc(100vh - 220px); + background: #fff + }} -../types + diff --git a/src/views/task/index.vue b/src/views/task/index.vue index 709bf4d..7243838 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -50,6 +50,7 @@ function setAsideItemName(text) { flex-direction: row; box-sizing: border-box; width: 100%; - + height: calc(100vh - 192px); } + diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue index 0167956..6e30043 100644 --- a/src/views/worksheet/aside/Aside.vue +++ b/src/views/worksheet/aside/Aside.vue @@ -319,6 +319,14 @@ if (searchContent) { right: -20px; z-index: 10; } + ::v-deep(.list){ + height: calc(100vh - 250px); + } + @media (max-height: 900px) { + ::v-deep(.list){ + height: calc(100vh - 234px); + } +} .topline{ border-top: 1px solid #e8e8e8; width: 100%; diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue index 3a4b793..c48fa0d 100644 --- a/src/views/worksheet/index.vue +++ b/src/views/worksheet/index.vue @@ -42,10 +42,17 @@ function ApprovalOver(packageId) { flex-direction: row; box-sizing: border-box; width: 100%; - height: 100vh; + height: calc(100vh - 176px); padding-bottom: 16px; //height: calc(100% - 170px); } +@media (max-height: 900px) { + .main { + + height: calc(100vh - 150px); + +} +} :deep(.ip_box){ z-index: 10; bottom: 120px;