From 6e8aa5b7e938850dbe9d5e6cb607ace0062fb530 Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Thu, 9 Jan 2025 18:31:44 +0800
Subject: [PATCH] update

---
 src/pages/result/components/result-modal.vue | 20 ++++++++------------
 src/pages/result/index.vue                   |  4 +++-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/pages/result/components/result-modal.vue b/src/pages/result/components/result-modal.vue
index e02b2d6..994983e 100644
--- a/src/pages/result/components/result-modal.vue
+++ b/src/pages/result/components/result-modal.vue
@@ -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>
 
diff --git a/src/pages/result/index.vue b/src/pages/result/index.vue
index a3c2b08..80c3a14 100644
--- a/src/pages/result/index.vue
+++ b/src/pages/result/index.vue
@@ -113,7 +113,9 @@ function getResultValues(){
                 input: inputValues.value,
             })
             result[it.key] = value;
-        }catch (e) {}
+        }catch (e) {
+            console.error('getResultValues',e,expression)
+        }
     })
     return result;
 }