This commit is contained in:
LittleBoy 2025-01-09 18:31:44 +08:00
parent 41e9face3e
commit 6e8aa5b7e9
2 changed files with 11 additions and 13 deletions

View File

@ -29,8 +29,7 @@ defineComponent({
name: 'ResultModal' name: 'ResultModal'
}) })
watch(() => result.value, () => { watch(() => result.value, () => {
console.log('re', result.value) visible.value = result.value && result.value.length > 0 || false
visible.value = result.value && result.value.length > 0
}) })
const percentKeys = ['danbai_rekabi', 'danbai_rekabi_baidanbai', 'tang_rekabi', 'zhifang_rekabi', 'changneibi', 'changwaibi']; const percentKeys = ['danbai_rekabi', 'danbai_rekabi_baidanbai', 'tang_rekabi', 'zhifang_rekabi', 'changneibi', 'changwaibi'];
function toFixed(num, fix = 3) { function toFixed(num, fix = 3) {
@ -39,7 +38,7 @@ function toFixed(num, fix = 3) {
// for (var i = 0; i < val; i++) { // for (var i = 0; i < val; i++) {
// numbers += '0'; // numbers += '0';
// } // }
const s = 1 + numbers; const s = Number(1 + numbers);
// 0 // 0
const spot = "." + numbers; const spot = "." + numbers;
// Math.round // Math.round
@ -48,13 +47,12 @@ function toFixed(num, fix = 3) {
// //
const d = value.toString().split("."); const d = value.toString().split(".");
if (d.length == 1) { if (d.length == 1) {
value = value.toString() + spot; return value.toString() + spot;
return value;
} }
if (d.length > 1) { if (d.length > 1) {
value = value.toString() + Array(fix - d[1].length).fill('0').join(''); return value.toString() + Array(fix - d[1].length).fill('0').join('');
return value;
} }
return num;
} }
function getValue(item:ResultItem){ function getValue(item:ResultItem){
if(item.key == 'total'){ if(item.key == 'total'){
@ -64,13 +62,11 @@ function getValue(item:ResultItem){
return toFixed(item.value, 3) return toFixed(item.value, 3)
} }
let v = item.value * 100; const v = item.value * 100;
if (v == 0 || v == 100) { if (v == 0 || v == 100) {
v = v + '%'; return v + '%'
} else {
v = toFixed(v, 2) + '%';
} }
return v; return toFixed(v, 2) + '%';;
} }
</script> </script>

View File

@ -113,7 +113,9 @@ function getResultValues(){
input: inputValues.value, input: inputValues.value,
}) })
result[it.key] = value; result[it.key] = value;
}catch (e) {} }catch (e) {
console.error('getResultValues',e,expression)
}
}) })
return result; return result;
} }