diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 6fac42a..a6f42c2 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -105,7 +105,7 @@ export default defineComponent({ .replace({ name: 'Login', query: { - redirect: route.fullPath, + // redirect: route.fullPath, }, }) .finally(() => location.reload()) diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue index a52c9f9..bd752d9 100644 --- a/src/views/final/comp/CustomTabelModal.vue +++ b/src/views/final/comp/CustomTabelModal.vue @@ -590,6 +590,9 @@ const indeterminate = computed(() => { --n-padding-top: 0px; --n-padding-bottom: 12px; } +.left-wrap { + border: 1px solid #cbd3de; +} ::v-deep(.n-card > .n-card-header .n-card-header__main) { font-weight: lighter !important; font-size: 14px; @@ -601,8 +604,8 @@ const indeterminate = computed(() => { ::v-deep(.n-button--info-type) { background: #507afd !important; } -.left-wrap { - border: 1px solid #cbd3de; +::v-deep(.n-button--default-type){ + border: 1px solid #cad2dd !important; } // ::v-deep(.n-card__content){ // padding: 20px 24px 0 24px !important; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 9bae19d..08a9cf7 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -90,12 +90,12 @@ function close() {
探索更多功能
- + @@ -105,6 +105,8 @@ function close() { background-repeat: no-repeat; background-size: cover; height: 56.25rem; + position: absolute; + width: 100%; .f-c-c { display: flex; diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue index da71cb7..5a06d03 100644 --- a/src/views/task/modal/CustomFieldModal.vue +++ b/src/views/task/modal/CustomFieldModal.vue @@ -128,15 +128,23 @@ const selectIds = ref([]); function onCheckAllChange(value) { const ids: string[] = []; - for (const item of offList.value) { if (!item.fix) { item.checked = value; ids.push(item.id); } } - selectIds.value = value ? ids : []; + console.log(offList.value,'offList') + if (value) { + offList.value.map((v) => { + if (!v.checked) { + onList.value.push(v); + } + }); + } else { + onList.value = []; + } } function onCheckChange(checked: any, item: any) { @@ -277,6 +285,16 @@ onMounted(async () => { console.log(offList.value, "offList.value"); console.log(useList, "useList"); }); + +const indeterminate = computed(() => { + let baseNum = 0; + offList.value.map((v) => { + if (v.fix) { + baseNum += 1; + } + }); + return onList.value.length > 0 && offList.value.length - baseNum > onList.value.length; +});
-
+
@@ -347,7 +366,7 @@ onMounted(async () => { :bordered="false" >
@@ -377,11 +396,11 @@ onMounted(async () => { :class="{ fix: item.fix }" class="cursor-move draggable-item" > - + {{ item.name }} {