diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue index db042e2..f178ac7 100644 --- a/src/layout/components/Header/UserSettings.vue +++ b/src/layout/components/Header/UserSettings.vue @@ -134,10 +134,10 @@ const options = computed(() => { .container { .header{ .user-name{ - font-size: 21px; + font-size: 16px; } .depart-name{ - font-size: 16px; + font-size: 12px; } } } diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue index 04536db..5728f0e 100644 --- a/src/views/final/comp/CustomFilterModalVue.vue +++ b/src/views/final/comp/CustomFilterModalVue.vue @@ -25,7 +25,7 @@ const offList = ref([]); const onList = ref([]); const allCount = computed(() => { - return `全部筛选(共${offList.value.length - 1}个)`; + return `全部筛选(共${offList.value.length}个)`; }); const selectCount = computed(() => { @@ -389,6 +389,7 @@ const rightInputHandler = debounce((keyword) => { &-info { font-weight: bold; position: relative; + font-size: 14px; &:before { background-color: #1980ff; @@ -446,9 +447,13 @@ const rightInputHandler = debounce((keyword) => { --n-padding-bottom: 12px; } ::v-deep(.n-card > .n-card-header .n-card-header__main){ - font-weight: bolder !important; + font-weight: lighter !important; + font-size: 14px; } ::v-deep(.n-scrollbar){ border-top: none !important; } +::v-deep(.n-button--info-type){ + background: #507AFD !important; +} diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue index 670b393..830dd49 100644 --- a/src/views/final/comp/CustomTabelModal.vue +++ b/src/views/final/comp/CustomTabelModal.vue @@ -52,7 +52,7 @@ onMounted(async () => { }; if (item.fix) { mustList.push(item); - if (!userFieldFixed?.length && !userFieldUnFixed?.length) { + if (!userFieldFixed?.length && !userFieldUnFixed?.length) { fixLeftList.value.push(item); } } @@ -64,7 +64,6 @@ onMounted(async () => { } offList.value.push(item); }); - }); const allCount = computed(() => { @@ -344,7 +343,7 @@ function removeHandler(id: string, type: "fix" | "unfix") { -
+
+ {{ item.name }} @@ -430,15 +426,12 @@ function removeHandler(id: string, type: "fix" | "unfix") { :class="{ fix: item.fix }" class="cursor-move draggable-item" > + {{ item.name }} @@ -467,6 +460,8 @@ function removeHandler(id: string, type: "fix" | "unfix") { .wrapper { display: flex; flex-direction: column; + border-bottom: 1px solid #e8e8e8; + padding-bottom: 32px; &-title { font-weight: bold; @@ -474,7 +469,6 @@ function removeHandler(id: string, type: "fix" | "unfix") { } &-bar { - background-color: #e8e8e8; width: 100%; margin-top: 20px; } @@ -487,6 +481,8 @@ function removeHandler(id: string, type: "fix" | "unfix") { &-info { font-weight: bold; position: relative; + color: #333333; + font-size: 14px; &:before { background-color: #1980ff; @@ -507,8 +503,11 @@ function removeHandler(id: string, type: "fix" | "unfix") { .cardstyle { width: 820px; - --n-padding-bottom: 20px; + // --n-padding-bottom: 20px; --n-padding-left: 24px; + --n-padding-right: 24px; + --n-padding-top: 20px; + // padding: 20px 24px 0 24px !important } .textbtnStyle { @@ -540,10 +539,11 @@ function removeHandler(id: string, type: "fix" | "unfix") { } .draggable-item { - padding: 10px 16px; + padding: 11px 16px; color: #333; display: flex; align-items: center; + border-bottom: 1px solid #e8e8e8; } .disable-check { @@ -551,9 +551,7 @@ function removeHandler(id: string, type: "fix" | "unfix") { } } -::v-deep( - .n-card.n-card--content-segmented > .n-card__content:not(:first-child) - ) { +::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) { border: 0px; } @@ -561,10 +559,20 @@ function removeHandler(id: string, type: "fix" | "unfix") { --n-padding-top: 0px; --n-padding-bottom: 12px; } -::v-deep(.n-card > .n-card-header .n-card-header__main){ - font-weight: bolder !important; +::v-deep(.n-card > .n-card-header .n-card-header__main) { + font-weight: lighter !important; + font-size: 14px; } -::v-deep(.n-scrollbar){ +::v-deep(.n-scrollbar) { border-top: none !important; } +::v-deep(.n-button--info-type) { + background: #507afd !important; +} +.left-wrap{ + border: 1px solid #cbd3de; +} +// ::v-deep(.n-card__content){ +// padding: 20px 24px 0 24px !important; +// } diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue index df8672b..b27a3a4 100644 --- a/src/views/final/comp/FilterModal.vue +++ b/src/views/final/comp/FilterModal.vue @@ -88,7 +88,7 @@ const pagination = reactive({ page: 1, pageCount: 1, pageSize: 10, - showSizePicker:true, + showSizePicker: true, pageSizes: [ { label: "10 每页", @@ -108,6 +108,7 @@ const pagination = reactive({ }, ], showQuickJumper: true, + itemCount:100 }); const tableData = ref>([]); const keyword = ref(""); @@ -204,7 +205,6 @@ async function handlePageSizeChange(currentPageSize) { await query(page, currentPageSize); } - function handleClick() { emit("showNewFilter"); show.value = false; @@ -333,9 +333,8 @@ const inputHandler = debounce((word) => { :pagination="pagination" :row-key="rowKey" @update:page="handlePageChange" -@update-page-size="handlePageSizeChange" + @update-page-size="handlePageSizeChange" @update:checked-row-keys="handleCheck" - />
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue index 459d666..4f1bdf1 100644 --- a/src/views/final/comp/RepeatTaskTableModal.vue +++ b/src/views/final/comp/RepeatTaskTableModal.vue @@ -1,108 +1,105 @@