Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

ems-ui-cloud/src/assets/icons/svg/chargingpile.svg

@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><defs><style/></defs><path d="M 991.776 127.744 L 878.639 15.3754 a 52.3724 52.3724 0 0 0 -74.0581 74.0581 l 73.3534 73.5455 l -54.1341 56.5045 a 47.039 47.039 0 0 0 0 65.4735 a 43.0831 43.0831 0 0 0 32.1602 13.7738 l 61.2452 -0.128128 v 480.032 a 32.032 32.032 0 0 1 -64.0641 0 V 479.968 a 138.651 138.651 0 0 0 -138.571 -138.635 h -32.032 V 85.3333 A 85.3013 85.3013 0 0 0 597.205 0 H 149.333 a 85.3013 85.3013 0 0 0 -85.3333 85.3333 V 917.397 h -10.6346 a 53.3013 53.3013 0 0 0 0 106.603 h 640 a 53.3013 53.3013 0 0 0 0 -106.603 h -10.8268 v -469.269 h 32.032 a 32.032 32.032 0 0 1 32.032 32.032 v 298.539 a 138.635 138.635 0 1 0 277.269 0 V 204.364 a 107.307 107.307 0 0 0 -32.0961 -76.6206 Z M 500.629 675.107 l -159.391 225.826 a 8.00801 8.00801 0 0 1 -5.81381 2.48248 a 3.3954 3.3954 0 0 1 -2.48248 -0.832832 c -3.87588 -1.12112 -5.25325 -3.31532 -4.14815 -6.63063 l 25.7377 -151.976 h -112.112 a 5.95796 5.95796 0 0 1 -5.81381 -3.33133 q -2.46647 -3.28328 0.832832 -7.46346 l 172.669 -225.826 c 2.22623 -3.31532 4.70871 -3.85986 7.47948 -1.6016 c 2.77077 0.560561 4.14815 2.78679 4.14815 6.64665 l -25.7377 151.928 h 98.7868 a 5.97397 5.97397 0 0 1 5.81381 3.31532 a 16.7207 16.7207 0 0 1 0.032032 7.46346 Z m 75.2753 -295.271 a 46.7508 46.7508 0 0 1 -46.8949 46.8949 h -311.512 a 46.7508 46.7508 0 0 1 -46.8949 -46.959 V 153.626 a 46.7508 46.7508 0 0 1 46.8949 -46.8949 h 311.479 a 46.7508 46.7508 0 0 1 46.8949 46.8949 Z"  ></path></svg>

ems-ui-cloud/src/views/devmgr/attr/index.vue

@@ -699,6 +699,9 @@ export default {
     },
     // 根据区域代码获取区域名称
     buildRefAreaName(curRow) {
+      if (!this.treeAreaOptions) {
+        return '未知区域'; // 或者返回一个默认值
+      }
       const area = this.treeAreaOptions.find(a => a.id === curRow.areaCode);
       const areaName = area ? area.label : '未知区域';