Merge remote-tracking branch 'origin/dev_pro_山西长治' into dev_pro_山西长治

yuan

2 天以前 32aa9fc039cfd0065ec7c3726960e200dab3e92a

Merge remote-tracking branch 'origin/dev_pro_山西长治' into dev_pro_山西长治

 multiple/assets/favicon/QFSWfavicon.ico

 multiple/assets/favicon/XHKSfavicon.ico

 multiple/assets/logo/QFSWLogo.png

 multiple/assets/logo/XHKSLogo.png

 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"
}

 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)}%`;
            },
        },
    ]
);