update
This commit is contained in:
parent
41e9face3e
commit
6e8aa5b7e9
@ -29,8 +29,7 @@ defineComponent({
|
||||
name: 'ResultModal'
|
||||
})
|
||||
watch(() => result.value, () => {
|
||||
console.log('re', result.value)
|
||||
visible.value = result.value && result.value.length > 0
|
||||
visible.value = result.value && result.value.length > 0 || false
|
||||
})
|
||||
const percentKeys = ['danbai_rekabi', 'danbai_rekabi_baidanbai', 'tang_rekabi', 'zhifang_rekabi', 'changneibi', 'changwaibi'];
|
||||
function toFixed(num, fix = 3) {
|
||||
@ -39,7 +38,7 @@ function toFixed(num, fix = 3) {
|
||||
// for (var i = 0; i < val; i++) {
|
||||
// numbers += '0';
|
||||
// }
|
||||
const s = 1 + numbers;
|
||||
const s = Number(1 + numbers);
|
||||
// 如果是整数需要添加后面的0
|
||||
const spot = "." + numbers;
|
||||
// Math.round四舍五入
|
||||
@ -48,13 +47,12 @@ function toFixed(num, fix = 3) {
|
||||
// 从小数点后面进行分割
|
||||
const d = value.toString().split(".");
|
||||
if (d.length == 1) {
|
||||
value = value.toString() + spot;
|
||||
return value;
|
||||
return value.toString() + spot;
|
||||
}
|
||||
if (d.length > 1) {
|
||||
value = value.toString() + Array(fix - d[1].length).fill('0').join('');
|
||||
return value;
|
||||
return value.toString() + Array(fix - d[1].length).fill('0').join('');
|
||||
}
|
||||
return num;
|
||||
}
|
||||
function getValue(item:ResultItem){
|
||||
if(item.key == 'total'){
|
||||
@ -64,13 +62,11 @@ function getValue(item:ResultItem){
|
||||
return toFixed(item.value, 3)
|
||||
}
|
||||
|
||||
let v = item.value * 100;
|
||||
const v = item.value * 100;
|
||||
if (v == 0 || v == 100) {
|
||||
v = v + '%';
|
||||
} else {
|
||||
v = toFixed(v, 2) + '%';
|
||||
return v + '%'
|
||||
}
|
||||
return v;
|
||||
return toFixed(v, 2) + '%';;
|
||||
}
|
||||
</script>
|
||||
|
||||
|
@ -113,7 +113,9 @@ function getResultValues(){
|
||||
input: inputValues.value,
|
||||
})
|
||||
result[it.key] = value;
|
||||
}catch (e) {}
|
||||
}catch (e) {
|
||||
console.error('getResultValues',e,expression)
|
||||
}
|
||||
})
|
||||
return result;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user