diff --git a/src/api/tenant/init.js b/src/api/tenant/init.js index 2b11b5e..66a212e 100644 --- a/src/api/tenant/init.js +++ b/src/api/tenant/init.js @@ -20,6 +20,6 @@ export const initData = (tenantId) => { return request({ url: `/tenant/init/initData/${tenantId}`, method: "POST", - timeout: 1000 * 60, + timeout: 0, }); } \ No newline at end of file diff --git a/src/views/tenant/initialize.vue b/src/views/tenant/initialize.vue index b5dad07..7a185b2 100644 --- a/src/views/tenant/initialize.vue +++ b/src/views/tenant/initialize.vue @@ -262,11 +262,11 @@ const importData = () => { onMounted(() => { watchEffect(() => { - const progressLineWidth = - (activeStep.value - 1) * 100 + - Math.abs(currentStepStatus.value - 1) * 50 + - 50; - + let progressLineWidth = + ((activeStep.value - 1) * 100 + + Math.abs(currentStepStatus.value - 1) * 30 + + 70) + progressLineWidth = progressLineWidth < 100 ? 0 : progressLineWidth let progressLineColor; if (currentStepStatus.value === 0) { const percent = ((activeStep.value - 1) / activeStep.value) * 100; @@ -305,6 +305,7 @@ onMounted(() => { width: var(--progress-line-width); z-index: 99; background: var(--progress-line-color); + transition: all 1s linear; } .el-step__line::after { @@ -315,6 +316,7 @@ onMounted(() => { top: -6px; width: 14px; height: 14px; + transition: all 1s linear; border-radius: 50%; z-index: 99; background: var(--progress-line-color);