From 32aa9fc039cfd0065ec7c3726960e200dab3e92a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 13 十月 2026 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_山西长治' into dev_pro_山西长治
---
multiple/assets/logo/XHKSLogo.png | 0
src/views/reportAnalysis/projectProfit/index.vue | 7 +++++++
multiple/config.json | 18 ++++++++++++++++++
multiple/assets/favicon/QFSWfavicon.ico | 0
multiple/assets/logo/QFSWLogo.png | 0
multiple/assets/favicon/XHKSfavicon.ico | 0
6 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/multiple/assets/favicon/QFSWfavicon.ico b/multiple/assets/favicon/QFSWfavicon.ico
new file mode 100644
index 0000000..79ac2a8
--- /dev/null
+++ b/multiple/assets/favicon/QFSWfavicon.ico
Binary files differ
diff --git a/multiple/assets/favicon/XHKSfavicon.ico b/multiple/assets/favicon/XHKSfavicon.ico
new file mode 100644
index 0000000..01a1259
--- /dev/null
+++ b/multiple/assets/favicon/XHKSfavicon.ico
Binary files differ
diff --git a/multiple/assets/logo/QFSWLogo.png b/multiple/assets/logo/QFSWLogo.png
new file mode 100644
index 0000000..e1db2cc
--- /dev/null
+++ b/multiple/assets/logo/QFSWLogo.png
Binary files differ
diff --git a/multiple/assets/logo/XHKSLogo.png b/multiple/assets/logo/XHKSLogo.png
new file mode 100644
index 0000000..c09746f
--- /dev/null
+++ b/multiple/assets/logo/XHKSLogo.png
Binary files differ
diff --git a/multiple/config.json b/multiple/config.json
index 6a7f127..1bc2681 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -24,6 +24,24 @@
"logo": "logo/DCHXLogo.png",
"favicon": "favicon/DCHXfavicon.ico"
},
+ "XHKS": {
+ "env": {
+ "VITE_APP_TITLE": "閼摟鐭垮北绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://36.133.45.183:9078",
+ "VITE_JAVA_API": "http://36.133.45.183:9077"
+ },
+ "logo": "logo/XHKSLogo.png",
+ "favicon": "favicon/XHKSfavicon.ico"
+ },
+ "QFSW": {
+ "env": {
+ "VITE_APP_TITLE": "涔句赴鐢熺墿绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://36.133.45.183:9080",
+ "VITE_JAVA_API": "http://36.133.45.183:9079"
+ },
+ "logo": "logo/QFSWLogo.png",
+ "favicon": "favicon/QFSWfavicon.ico"
+ },
"logo": "/src/assets/logo/logo.png",
"favicon": "/public/favicon.ico"
}
diff --git a/src/views/reportAnalysis/projectProfit/index.vue b/src/views/reportAnalysis/projectProfit/index.vue
index f61cbe5..e2674da 100644
--- a/src/views/reportAnalysis/projectProfit/index.vue
+++ b/src/views/reportAnalysis/projectProfit/index.vue
@@ -85,6 +85,13 @@
label: "鍒╂鼎鐜�",
align: "center",
prop: "balanceRatio",
+ // 鍚庣杩斿洖鐨勬槸灏忔暟锛�0.14 = 14%锛夛紝杩欓噷鎸夌櫨鍒嗘瘮灞曠ず
+ formatData: (val) => {
+ if (val === null || val === undefined || val === "") return "";
+ const num = Number(val);
+ if (Number.isNaN(num)) return val;
+ return `${(num * 100).toFixed(2)}%`;
+ },
},
]
);
--
Gitblit v1.9.3