合并最新代码解决冲突

2025-06-30 17:38:22 +08:00
parent e42f1204ee 5f4fcdf754
commit f64b5d30cb
8 changed files with 356 additions and 137 deletions
--- a/src/views/ems/dzjk/sbjk/RealTimeBaseInfo.vue
+++ b/src/views/ems/dzjk/sbjk/RealTimeBaseInfo.vue
@ -35,7 +35,7 @@ export default {
        bgColor:'#CBD6FF',
        attr:'totalReactivePower'
      },{
-        title:'电池催SOC',
+        title:'电池堆SOC',
        value:'',
        bgColor:'#DCCBFF',
        attr:'soc'