Merge remote-tracking branch 'origin/develop' into develop

ruoyi-ui/src/common/menuData.js

@@ -307,7 +307,7 @@ export default [
       },
     ],
   },
-  {
+  /*{
     title: "安全生产",
     name: "safe",
     position: "right",
@@ -320,6 +320,13 @@ export default [
         component: "safe/files/index.vue",
       },
     ]
+  },*/
+  {
+    title: "零碳能源",
+    name: "carbon",
+    position: "right",
+    path: "/carbon",
+    component: "developing.vue",
   },
   {
     title: "系统管理",

ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue

@@ -105,6 +105,12 @@ export default {
           window.open(response.msg===''?'https://10.0.86.63:9000/s?loadType=auto&group=15ai1k13748d&runType=box':response.msg);
         })
       }
+      else if(node.title==='零碳能源'){
+        this.activeIndex = key
+        getConfigKey("carbon").then((response) => {
+          window.open(response.msg===''?'https://10.0.111.11:100/single?key=jhszyy&route=home':response.msg);
+        })
+      }
       else if (this.$route.path != node.path){
           this.$router.push(node.path);
       }