diff --git a/src/assets/icons/addicon.svg b/src/assets/icons/addicon.svg new file mode 100644 index 0000000..36cabdf --- /dev/null +++ b/src/assets/icons/addicon.svg @@ -0,0 +1,18 @@ + + + 添加 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/approval_modal_bgtwo.png b/src/assets/images/approval_modal_bgtwo.png new file mode 100644 index 0000000..689cc8d Binary files /dev/null and b/src/assets/images/approval_modal_bgtwo.png differ diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index bb949f4..506995d 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -285,7 +285,7 @@ onUnmounted(() => { -
+
+ - +
- + + 添加筛选条件
@@ -384,7 +438,7 @@ defineExpose({ 保存 - + 取消 @@ -405,7 +459,7 @@ defineExpose({ } &-bar { - background-color: #e8e8e8; + background-color: #F8F8F8; width: 100%; margin-top: 27px; font-size: 16px; diff --git a/src/views/final/comp/RepeatModal.vue b/src/views/final/comp/RepeatModal.vue index ea74e05..114b0d0 100644 --- a/src/views/final/comp/RepeatModal.vue +++ b/src/views/final/comp/RepeatModal.vue @@ -130,7 +130,7 @@ defineExpose({ diff --git a/src/views/task/index.vue b/src/views/task/index.vue index d034d2b..fe659ff 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -52,9 +52,12 @@ function setAsideItemName(text) { width: 100%; height: calc(100vh - 192px); } + + @media (max-height: 900px) { .main{ height: calc(100vh - 175px); }} + diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue index 640c3c2..1f9a38b 100644 --- a/src/views/task/modal/NewFilterModal.vue +++ b/src/views/task/modal/NewFilterModal.vue @@ -311,6 +311,12 @@ defineExpose({ maxlength="15" @keydown.enter.prevent /> + - +
- + + 添加筛选条件
@@ -383,7 +437,7 @@ defineExpose({ "> 保存
- + 取消 @@ -404,7 +458,7 @@ defineExpose({ } &-bar { - background-color: #e8e8e8; + background-color: #F8F8F8; width: 100%; margin-top: 27px; font-size: 16px; diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue index 6e30043..e974633 100644 --- a/src/views/worksheet/aside/Aside.vue +++ b/src/views/worksheet/aside/Aside.vue @@ -331,7 +331,8 @@ if (searchContent) { border-top: 1px solid #e8e8e8; width: 100%; height: 1px; - padding-bottom: 16px; + } } + diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue index 488310b..85a3f91 100644 --- a/src/views/worksheet/aside/ListItem.vue +++ b/src/views/worksheet/aside/ListItem.vue @@ -174,8 +174,8 @@ onMounted(async () => {})