fix message

Chuiantw1212 · May 13, 2024 · 10938bd · 10938bd
1 parent 6f6d3dc
commit 10938bd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 46 deletions.
diff --git a/components/calculator/estate.vue b/components/calculator/estate.vue
@@ -444,9 +444,9 @@ function calculateDownpayYear() {
 }
 
 import { ElMessage, } from 'element-plus'
-import { throttle, debounce } from './lodash.js'
+import { throttle } from './lodash.js'
 const errorMssage = throttle(() => {
-    // ElMessage.error('房屋：家徒四壁！')
+    ElMessage.error('房屋：家徒四壁！')
 }, 4000)
 
 defineExpose({

diff --git a/components/calculator/estateDialog.vue b/components/calculator/estateDialog.vue
@@ -13,15 +13,16 @@
             <el-col :span="20">
                 <el-form-item label="房屋總價">
                     <el-text>= 單價({{ estatePrice.unitPrice }}萬/坪) x 權狀({{
-                        estateSize.floorSize }}坪) = {{
-                            Number(Math.floor(tempTotalPrice / 10000)).toLocaleString() }} 萬</el-text>
+            estateSize.floorSize }}坪) = {{
+            Number(Math.floor(tempTotalPrice / 10000)).toLocaleString() }} 萬</el-text>
                 </el-form-item>
             </el-col>
             <!-- <el-col :span="3">
                 <el-button @click="emits('close')">取消</el-button>
             </el-col> -->
             <el-col :span="4">
-                <el-button v-loading="confirmLoader" @click="confirmUpdate()">確認帶回</el-button>
+                <el-button v-loading="confirmLoader" :disabled="!estatePrice.unitPrice"
+                    @click="confirmUpdate()">確認帶回</el-button>
             </el-col>
         </el-row>
         <!-- </el-card> -->

diff --git a/components/calculator/report/freedomRate.vue b/components/calculator/report/freedomRate.vue
@@ -159,7 +159,7 @@ function calculateFreedomRate(payload) {
         fill: true,
         tension,
     })
-    // security sum 
+    // security sum
     const finalAsset = securityData.pop()
     const finalDebt = estateDebtData.pop()
     const finalEstate = estateAsset.pop()

diff --git a/components/calculator/retirement.vue b/components/calculator/retirement.vue
@@ -23,15 +23,15 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row>
+            <!-- <el-row>
                 <el-col :span="12">
                 </el-col>
                 <el-col :span="12">
                     <el-form-item label="退休後餘命">
                         <el-text>{{ retirement.lifeExpectancy }} 年</el-text>
                     </el-form-item>
                 </el-col>
-            </el-row>
+            </el-row> -->
             <el-collapse>
                 <el-collapse-item :title="detailTitle[profile.careerInsuranceType]" :disabled="isFormDisabled">
                     <el-row>
@@ -58,15 +58,6 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="餘命 x 年金現值">
-                                <el-text>{{ Number(retirement.annuitySum).toLocaleString() }}</el-text>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="雇主提繳累計">
@@ -641,11 +632,6 @@ async function drawRetirementAssetChart() {
         labels.push(calculatedYear)
         pv = fv
     }
-    if (fv <= 0) {
-        if (!errorMssage.pending()) {
-            errorMssage()
-        }
-    }
     // 繪圖
     const tension = 0.5
     const datasets = [
@@ -681,31 +667,37 @@ async function drawRetirementAssetChart() {
         datasets,
         labels
     }
-    // 繪圖
-    if (pensionChartInstance.value) {
-        clearTimeout(debounceId.value)
-        debounceId.value = setTimeout(() => {
+    clearTimeout(debounceId.value)
+    debounceId.value = setTimeout(() => {
+        // 錯誤訊息
+        if (fv <= 0) {
+            if (!errorMssage.pending()) {
+                errorMssage()
+            }
+        }
+        // 繪圖
+        if (pensionChartInstance.value) {
             pensionChartInstance.value.data = chartData
             pensionChartInstance.value.update()
-        }, 250)
-    } else {
-        const ctx: any = document.getElementById('pensionChart')
-        const chartInstance = new Chart(ctx, {
-            type: 'bar',
-            data: chartData,
-            options: {
-                scales: {
-                    x: {
-                        stacked: true,
-                    },
-                    y: { // 要部份stacked，部分overlap
-                        stacked: true,
-                    },
+        } else {
+            const ctx: any = document.getElementById('pensionChart')
+            const chartInstance = new Chart(ctx, {
+                type: 'bar',
+                data: chartData,
+                options: {
+                    scales: {
+                        x: {
+                            stacked: true,
+                        },
+                        y: { // 要部份stacked，部分overlap
+                            stacked: true,
+                        },
+                    }
                 }
-            }
-        })
-        pensionChartInstance = shallowRef(chartInstance)
-    }
+            })
+            pensionChartInstance = shallowRef(chartInstance)
+        }
+    }, 250)
     return {
         pensionLumpSumData: JSON.parse(JSON.stringify(pensionLumpSumData))
     }
@@ -725,9 +717,9 @@ function calculatePensionLumpsumTax(fv = 0) {
 }
 
 import { ElMessage, } from 'element-plus'
-import { throttle, debounce } from './lodash.js'
+import { throttle, } from './lodash.js'
 const errorMssage = throttle(() => {
-    // ElMessage.error('退休：晚節不保！')
+    ElMessage.error('退休：晚節不保！')
 }, 4000)
 
 defineExpose({