问题修改，路由修改

.env.production

@@ -42,4 +42,6 @@ VUE_APP_WS_URL=ws://10.112.33.5:6014
 VUE_APP_GENERAT_URL=http://10.112.33.5:6060
 
 VUE_APP_HEADER_URL=http://10.112.32.31:10200
+VUE_APP_HEADER2_URL=http://10.112.32.31:10201
+VUE_APP_HEADER3_URL=http://10.112.32.31:10202
 

src/App.vue

@@ -212,10 +212,10 @@ export default {
               name: "预警查询",
               index: "/integratedAlarm/safe/customWarning",
             },
-            {
-              name: "报警查询",
-              index: "/integratedAlarm/safe/historyWarning",
-            },
+            // {
+            //   name: "报警查询",
+            //   index: "/integratedAlarm/safe/historyWarning",
+            // },
           ],
         },
         {
@@ -616,17 +616,8 @@ export default {
     //   });
   },
   mounted() {
-    let str = window.location.href;
-    if (str.indexOf("integratedAlarm") > -1) {
-      this.showMenuData = this.warnDatas;
-    } else if (str.indexOf("economicsOperation") > -1) {
-      this.showMenuData = this.economyDatas;
-    } else if (str.indexOf("nxreport") > -1) {
-      this.showMenuData = this.reportDatas;
-    } else {
-      this.showMenuData = this.warnDatas;
-    }
-
+    
+    this.initMenu()
     let that = this;
     that.setScale();
     /*窗口改变事件*/
@@ -638,6 +629,18 @@ export default {
     console.log("离开标记", this.socketLeaveFlag);
   },
   methods: {
+    initMenu() {
+        let str = window.location.href;
+        if (str.indexOf("integratedAlarm") > -1) {
+        this.showMenuData = this.warnDatas;
+        } else if (str.indexOf("economicsOperation") > -1) {
+        this.showMenuData = this.economyDatas;
+        } else if (str.indexOf("nxreport") > -1) {
+        this.showMenuData = this.reportDatas;
+        } else {
+        this.showMenuData = this.warnDatas;
+        }
+    },
     pagestyFn(path) {
       let str = "";
       if (this.isFixed && this.menuLength > 0) {
@@ -1034,6 +1037,7 @@ export default {
     $route(to, from) {
       // 当路由发生变化时，更新 currentPath
       this.routepath = to.path;
+      this.initMenu()
     },
   },
 };

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -2587,7 +2587,7 @@ export default {
   flex-wrap: wrap;
 
   .jzItem {
-    width: 12%;
+    width: 11%;
     height: 100px;
     background: #506382;
     display: flex;

src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -338,7 +338,7 @@ const windName = ref([]);
 
 const query = reactive({
   page: 1,
-  limit: 10,
+  limit: 6,
   pageTotal: null,
 });
 const state = reactive({
@@ -366,7 +366,7 @@ const state = reactive({
   tableData: [],
   tHeard: [],
   changZhan: "",
-  components: ["FDJ", "CLX"], //部件
+  components: ["CLX"], //部件
   modelId: "", //型号
   alarmIds: "",
   alarmIdList: [],
@@ -635,7 +635,7 @@ watch(
             return ele.nemCode === "FDJ";
           })?.nemCode || "";
         componenDefaultSelect
-          ? (state.components = ["FDJ", "CLX"])
+          ? (state.components = ["CLX"])
           : arr[1]?.[0]?.nemCode
           ? (state.components = [arr[1]?.[0]?.nemCode])
           : (state.components = []);
@@ -701,7 +701,7 @@ function getTableList() {
       begin: state.dateTime[0],
       end: state.dateTime[1],
       timeType: "m",
-      components: state.typeVal === "booststation" ? "" : state.components,
+      components: state.components,
       modelId: state.modelId,
       alarmIds: state.alarmIds,
       alarmType: state.typeVal,

src/views/economicsOperation/nxfHomePage/component/dataJJJson.json

@@ -12,7 +12,7 @@
             "top": "5px",
             "top1": "5px",
             "top2": "24px",
-            "top3": "37px"
+            "top3": "0px"
         },
         {
             "name": "月发电量",
@@ -22,7 +22,7 @@
             "top": "53px",
             "top1": "53px",
             "top2": "74px",
-            "top3": "85px"
+            "top3": "48px"
         },
         {
             "name": "年发电量",
@@ -32,7 +32,7 @@
             "top": "100px",
             "top1": "100px",
             "top2": "125px",
-            "top3": "132px"
+            "top3": "96px"
         }
     ],
     "zbtqdb": {

src/views/economicsOperation/nxfHomePage/component/power-plan.vue

@@ -2,17 +2,17 @@
     <div class="power-plan">
         <row style="margin-top: 30px">
             <Col :span="8">
-            <percent-card-2 :title="''" TotalText="周实际" ActualText="周计划" PercentText="超日历进度" PercentName="周完成"
+            <percent-card-2 :title="''" TotalText="周实际" ActualText="周计划" PercentText="日历进度" PercentName="周完成"
                 :TotalValue="planData.zfdlsj" :ActualValue="planData.zfdljh" :PercentValue="planData.zjd"
                 :percent="planData.zwcl" :Datasv="planData" />
             </Col>
             <Col :span="8">
-            <percent-card-2 :title="''" TotalText="月实际" ActualText="月计划" PercentText="超日历进度" PercentName="月完成"
+            <percent-card-2 :title="''" TotalText="月实际" ActualText="月计划" PercentText="日历进度" PercentName="月完成"
                 :TotalValue="planData.yfdlsj" :ActualValue="planData.yfdljh" :PercentValue="planData.yjd"
                 :percent="planData.ywcl" />
             </Col>
             <Col :span="8">
-            <percent-card-2 :title="''" TotalText="年实际" ActualText="年计划" PercentText="超日历进度" PercentName="年完成"
+            <percent-card-2 :title="''" TotalText="年实际" ActualText="年计划" PercentText="日历进度" PercentName="年完成"
                 :TotalValue="planData.nfdlsj" :ActualValue="planData.nfdljh" :PercentValue="planData.njd"
                 :percent="planData.nwcl" />
             </Col>

src/views/economicsOperation/nxfHomePage/index.vue

@@ -147,7 +147,7 @@
       </el-tab-pane>
       <el-tab-pane label="运行指标" name="yxzb">
         <iframe
-          src="https://cn.element-plus.org/zh-CN/component/tabs.html"
+          :src="process.env.VUE_APP_URL+'/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/862c8272-8cf8-435c-b3fc-b28936b4bfe0?instanceId=c5bf624f-051d-4252-5d08-bd69a82f1f1a'"
           class="yxzb"
         ></iframe>
       </el-tab-pane>

src/views/layout/nxfHeader.vue

@@ -34,76 +34,77 @@ export default {
           text: "全场监控",
           path:
             process.env.VUE_APP_URL +
-            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/9d23c8a1-444d-a21b-17a0-bb618059f8c0?instanceId=a760dcd2-413b-a488-bcd7-942cd5f8fff3",
+            // "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/9d23c8a1-444d-a21b-17a0-bb618059f8c0?instanceId=a760dcd2-413b-a488-bcd7-942cd5f8fff3",
+            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/9d23c8a1-444d-a21b-17a0-bb618059f8c0?instanceId=1631c892-a9a5-e93f-7619-5ea2ccb102f6",
           isActive: true,
         },
         {
           id: "2",
-          text: "矩阵图",
+          text: "告警中心",
           path:
             process.env.VUE_APP_URL +
-            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/060b34d5-26cc-f172-632a-e80ca3b7be04?instanceId=12b577b4-ea67-c8b6-7b13-1cb066aaf814",
+            // "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/060b34d5-26cc-f172-632a-e80ca3b7be04?instanceId=12b577b4-ea67-c8b6-7b13-1cb066aaf814",
+            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/3ab0f63d-669b-a119-1eb7-b85fbb6b07bc?instanceId=d2a31e58-1240-3be4-0945-01859895df4e",
           isActive: true,
         },
         {
           id: "3",
-          text: "告警中心",
+          text: "预警系统",
           path:
             process.env.VUE_APP_URL +
-            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/3ab0f63d-669b-a119-1eb7-b85fbb6b07bc?instanceId=465034a6-24c1-c0aa-a480-16c7ea65e216",
+            // "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/3ab0f63d-669b-a119-1eb7-b85fbb6b07bc?instanceId=465034a6-24c1-c0aa-a480-16c7ea65e216",
+            "/integratedAlarm",
           isActive: true,
         },
         {
           id: "4",
-          text: "智能报表",
+          text: "智能巡检",
           path:
-            process.env.VUE_APP_URL +
-            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/d267bff2-2047-53e6-d464-258184eb6da5?instanceId=9246cfa3-701a-5958-1e9c-cfd38a773813",
+            process.env.VUE_APP_HEADER2_URL +
+            // "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/d267bff2-2047-53e6-d464-258184eb6da5?instanceId=9246cfa3-701a-5958-1e9c-cfd38a773813",
+            "?SSOToken0zfOqp3vhlQHvLXUFLO7iI2M8a%2BCWAHmd7KxVY1wf956KroCTxef0S3q8Ui6a%2FFyvmKXpvQ8mYeWKWXrX%2B3%2BSRvMR0fr6EwZvM04PNE1LJbI5TtJSEXTs3BsuNzkDrIPQOfs0WmLizGoHNXjWG2x%2FQ%3D%3D",
           isActive: false,
         },
         {
           id: "5",
-          text: "电气系统",
+          text: "智能监测",
           path:
-            process.env.VUE_APP_URL +
-            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/31b8da0c-1c7e-599c-041b-ea51ed62b4b6?instanceId=2d6a7f5b-c49c-259a-67c4-43579e74ebd7",
+            process.env.VUE_APP_HEADER3_URL +
+            // "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/31b8da0c-1c7e-599c-041b-ea51ed62b4b6?instanceId=2d6a7f5b-c49c-259a-67c4-43579e74ebd7",
+            "?SSOToken0zfOqp3vhlQHvLXUFLO7iI2M8a%2BCWAHmd7KxVY1wf956KroCTxef0S3q8Ui6a%2FFyvmKXpvQ8mYeWKWXrX%2B3%2BSRvMR0fr6EwZvM04PNE1LJbI5TtJSEXTs3BsuNzkDrIPQOfs0WmLizGoHNXjWG2x%2FQ%3D%3D",
           isActive: false,
         },
         {
           id: "6",
-          text: "电网协同",
+          text: "功率预测",
           path:
             process.env.VUE_APP_URL +
-            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/4c074039-5151-45b5-f061-23b64e63c711?instanceId=1ccd5b1c-9861-b617-a3d5-387f2d596924",
+            // "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/4c074039-5151-45b5-f061-23b64e63c711?instanceId=1ccd5b1c-9861-b617-a3d5-387f2d596924",
+            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/b26fc778-e388-c9b6-9ee3-505a7b96dbfc?instanceId=2b99f3e4-d813-5701-1ce4-f555ccd3bec6",
           isActive: false,
         },
         {
           id: "7",
-          text: "风功率预测",
+          text: "经济运行",
           path:
             process.env.VUE_APP_URL +
-            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/b26fc778-e388-c9b6-9ee3-505a7b96dbfc?instanceId=8015e62d-b833-966a-220f-900ad1eb53ad",
+            // "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/b26fc778-e388-c9b6-9ee3-505a7b96dbfc?instanceId=8015e62d-b833-966a-220f-900ad1eb53ad",
+            "/economicsOperation",
           isActive: false,
         },
         {
           id: "8",
-          text: "运行指标",
+          text: "智能报表",
           path:
             process.env.VUE_APP_URL +
-            "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/862c8272-8cf8-435c-b3fc-b28936b4bfe0?instanceId=387b6bac-1dcc-fda6-b31e-c56518fc08ee",
+            // "/index.html/#/runtime/b0d3f1f4-3e5d-429b-af81-2661e7099caa/862c8272-8cf8-435c-b3fc-b28936b4bfe0?instanceId=387b6bac-1dcc-fda6-b31e-c56518fc08ee",
+            "/nxreport/scrb/fdcscrb",
           isActive: false,
         },
         {
           id: "9",
-          text: "预警系统",
-          path: "",
-          isActive: false,
-        },
-        {
-          id: "10",
-          text: "多维感知",
+          text: "安全监督",
           path:
-            // process.env.VUE_APP_HEADER_URL + "/sec/glasses-videos/?APP_ID=0",
             process.env.VUE_APP_HEADER_URL +
             "?SSOToken0zfOqp3vhlQHvLXUFLO7iI2M8a%2BCWAHmd7KxVY1wf956KroCTxef0S3q8Ui6a%2FFyvmKXpvQ8mYeWKWXrX%2B3%2BSRvMR0fr6EwZvM04PNE1LJbI5TtJSEXTs3BsuNzkDrIPQOfs0WmLizGoHNXjWG2x%2FQ%3D%3D",
           isActive: false,