Skip to content

Commit

Permalink
update wording
Browse files Browse the repository at this point in the history
  • Loading branch information
Chuiantw1212 committed May 10, 2024
1 parent 6f4be53 commit 74282aa
Showing 1 changed file with 7 additions and 56 deletions.
63 changes: 7 additions & 56 deletions components/calculator/asset.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<el-form label-width="auto">
<el-row>
<el-col :span="24">
<el-form-item label="資產配置">
<el-form-item label="ETF配置">
<el-radio-group v-model="asset.allocationETF" @change="calculateAsset()">
<el-radio v-for="(label, key) in config.porfolioLabels" :value="key">{{ label
}}</el-radio>
Expand All @@ -14,17 +14,16 @@
<el-row>
<el-col :span="23">
<el-form-item label="投資報酬率">
<el-slider v-model="asset.stockPercentage" :marks="allocationQuartileMarks"
:disabled="true" />
<el-slider v-model="asset.stockPercentage" :marks="allocationQuartileMarks" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<br />
<el-row>
<el-col :span="12">
<el-form-item label="已備資產">
<el-input-number v-model="asset.presentAsset" :min="0" :step="100000"
:disabled="isFormDisabled" @change="calculateAsset()" />
<el-input-number v-model="asset.presentAsset" :min="0" :step="100000" :disabled="isFormDisabled"
@change="calculateAsset()" />
</el-form-item>
</el-col>
<el-col :span="12">
Expand All @@ -42,55 +41,6 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-collapse>
<el-collapse-item title="點此快速調整目標(日期&支出)" :border="true" :disabled="isFormDisabled">
<el-row>
<el-col :span="12">
<el-form-item label="購屋西元年">
<el-input-number v-model="mortgage.downpayYear" @change="calculateAsset()" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="房貸利息">
<el-text>{{ Number(mortgage.monthlyRepay).toLocaleString() }} NTD / 月</el-text>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="第一隻西元年">
<el-input-number v-model="parenting.firstBornYear" :min="0"
@change="calculateAsset($event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="月開支(隻/每年)">
<el-input-number v-model="parenting.childAnnualExpense" :min="0"
@change="calculateAsset($event)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="第二隻西元年">
<el-input-number v-model="parenting.secondBornYear" :min="0"
:disabled="!parenting.firstBornYear" @change="calculateAsset($event)" />
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
</el-collapse-item>
</el-collapse> -->
<!-- <el-row>
<el-col :span="12">
</el-col>
<el-col :span="12">
<el-form-item label="房貸利息" @change="calculateAsset()">
<el-text>{{ Number(mortgage.monthlyRepay).toLocaleString() }} NTD / 月</el-text>
</el-form-item>
</el-col>
</el-row> -->
<canvas v-show="!unableToDraw" id="assetChart"></canvas>
</el-form>
<template #footer>
Expand Down Expand Up @@ -201,6 +151,7 @@ const props = defineProps({
}
})
const allocationQuartileMarks = reactive({})
const legalInterestRate = 16
// hooks
const asset = computed(() => {
return props.modelValue
Expand Down Expand Up @@ -357,7 +308,7 @@ function drawLifeAssetChart(propagate = true) {
}
const datasets = [
{
label: '資產增值',
label: 'ETF增值',
data: datasetData,
},
]
Expand All @@ -383,7 +334,7 @@ function drawLifeAssetChart(propagate = true) {
data: downpayData,
})
datasets.push({
label: '房地增值',
label: '房地產',
data: estateData,
})
}
Expand Down

0 comments on commit 74282aa

Please sign in to comment.