fix age bug

Chuiantw1212 · May 13, 2024 · 02be6d6 · 02be6d6
1 parent 838cabf
commit 02be6d6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 27 deletions.
diff --git a/components/calculator/profile.vue b/components/calculator/profile.vue
@@ -49,11 +49,6 @@
                         </el-radio-group>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
-                    <el-form-item label="預估餘命">
-                        <el-text>{{ profile.lifeExpectancy }} 年</el-text>
-                    </el-form-item>
-                </el-col>
             </el-row>
             <el-row>
                 <el-col :span="12">
@@ -81,6 +76,9 @@
                             通貨膨脹(消費者物價指數年增率)：<a href="https://www.stat.gov.tw/Point.aspx?sid=t.2&n=3581&sms=11480"
                                 target="_blank">中華民國統計資訊網</a>
                         </li>
+                        <li>
+                            公教人員年金改革到一半，目前沒人知道公保會怎麼調整。
+                        </li>
                     </ul>
                 </el-collapse-item>
             </el-collapse>
@@ -256,19 +254,19 @@ async function drawProfileChart(propagate = false) {
     if (yearOfBirth && gender) {
         const ceYear = new Date().getFullYear()
         const calculateAge = ceYear - Number(yearOfBirth)
-        const res = await fetch(`${VITE_BASE_URL}/calculate/lifeExpectancy`, {
-            method: 'post',
-            body: JSON.stringify({
-                ceYear,
-                age: calculateAge,
-                gender,
-            }),
-            headers: { 'Content-Type': 'application/json' }
-        })
-        const lifeExpectancy = await res.json()
+        // const res = await fetch(`${VITE_BASE_URL}/calculate/lifeExpectancy`, {
+        //     method: 'post',
+        //     body: JSON.stringify({
+        //         ceYear,
+        //         age: calculateAge,
+        //         gender,
+        //     }),
+        //     headers: { 'Content-Type': 'application/json' }
+        // })
+        // const lifeExpectancy = await res.json()
         profile.value.age = calculateAge
-        profile.value.lifeExpectancy = Number(lifeExpectancy)
-        profile.value.longevity = calculateAge + lifeExpectancy
+        // profile.value.lifeExpectancy = Number(lifeExpectancy)
+        // profile.value.longevity = calculateAge + lifeExpectancy
         if (propagate) {
             emits('update:modelValue', profile.value)
         }

diff --git a/components/calculator/report/lifeAsset.vue b/components/calculator/report/lifeAsset.vue
@@ -98,8 +98,7 @@ function drawLifeAsset(payload) {
     const { currentYear, inflationRate } = props.config
     const { downpayTotalPrice, downpayYear } = props.estate
     const { irrOverDecade } = props.retirement.pension
-    const { yearsToRetirement, yearOfRetire } = props.retirement
-    const { lifeExpectancy } = profile.value
+    const { yearsToRetirement, yearOfRetire, lifeExpectancy } = props.retirement
 
 
     const datasets = []
@@ -110,7 +109,7 @@ function drawLifeAsset(payload) {
     const inflationModifier = 1 + inflationRate / 100
     let inflatedEstateAsset = downpayTotalPrice
 
-    for (let i = 0; i < lifeExpectancy; i++) {
+    for (let i = 0; i < yearsToRetirement + lifeExpectancy; i++) {
         const year = currentYear + 1 + i
         labels.push(year)
         // data

diff --git a/components/calculator/report/story.vue b/components/calculator/report/story.vue
@@ -122,9 +122,9 @@ async function generatStory() {
 function getHumanStory() {
     const { spouse, parenting, estate, estatePrice, career, retirement } = props
     const { counties = [], insuranceTypes = [], townMap = {} } = props.config
-    const { longevity, yearOfBirth, careerInsuranceType, finalAsset } = profile.value
+    const { yearOfBirth, careerInsuranceType, finalAsset } = profile.value
     const { careerHeadCount, } = career
-    const { age: retireAge, qualityLevel, insurance } = retirement
+    const { age: retireAge, qualityLevel, insurance, longevity } = retirement
     const { yearOfMarriage } = spouse
     const { headCount, independantAge } = parenting
     const { downpayYear } = estate

diff --git a/components/calculator/retirement.vue b/components/calculator/retirement.vue
@@ -498,6 +498,7 @@ async function calculateRetireLife() {
     })
     const lifeExpectancy = await res.json()
     retirement.value.lifeExpectancy = lifeExpectancy
+    retirement.value.longevity = currentAge + yearsToRetirement + lifeExpectancy
 }
 function calculateFutureSeniority() { // 退休時年資
     const { presentSeniority } = retirement.value.insurance
@@ -548,7 +549,7 @@ function calculateRetirementExpense() {
     const selectedItem: IOptionItem = props.config.retirementQuartile[qualityLevel - 1]
     retirement.value.annualExpense = Number(selectedItem.value)
 }
-async function drawRetirementAssetChart(propagate = false) {
+async function drawRetirementAssetChart() {
     if (unableToDraw.value) {
         return
     }

diff --git a/components/calculator/security.vue b/components/calculator/security.vue
@@ -222,12 +222,11 @@ function drawLifeAssetChart() {
     if (unableToDraw.value) {
         return
     }
-    const { lifeExpectancy } = props.profile
-    const { presentAsset, irr, yearsToRetirement } = security.value
+    const { presentAsset, irr } = security.value
     const { downpayYear, downpay, monthlyRepay, loanTerm, downpayGoal, totalPrice } = props.estate
     const { currentYear, inflationRate } = props.config
     const { monthlyContribution } = props.spouse
-    const { yearOfRetire } = props.retirement
+    const { yearsToRetirement, yearOfRetire, lifeExpectancy } = props.retirement
     const spouseAnnualContribution = monthlyContribution * 12
     const inflatoinRatio = 1 + inflationRate / 100
     let valueModifier = 1
@@ -245,7 +244,7 @@ function drawLifeAssetChart() {
     const spouseContribution: number[] = []
     const childExpenseData: number[] = []
 
-    for (let i = 1; i <= lifeExpectancy + 1; i++) {
+    for (let i = 1; i <= yearsToRetirement + lifeExpectancy + 1; i++) {
         const simYear = currentYear + i
         valueModifier *= inflatoinRatio
         /**