agc问题修改，增加风机功率风速分析页面，单机性能分析修改

src/components/chart/combination/multiple-bar-line-chart.vue

@@ -82,7 +82,8 @@ export default {
         ...this.newbarData.map((t) => {
           return t.title;
         }),
-        this.newlineData.name,
+        // this.newlineData.name,
+        "风速"
       ];
     },
     xdata() {

src/nxfStyle.less

@@ -798,30 +798,32 @@
         }
     }
 
-    .warnTable{
-        .el-table{
-            .el-table__header-wrapper{
-                .el-table__header{
-                    thead{
-                        tr{
-                            th{
+    .warnTable {
+        .el-table {
+            .el-table__header-wrapper {
+                .el-table__header {
+                    thead {
+                        tr {
+                            th {
                                 background: #242833;
                             }
                         }
                     }
                 }
             }
-            .el-table__body-wrapper{
-                .el-table__body{
-                    tbody{
-                        .el-table__row{
-                            .el-table__cell{
+
+            .el-table__body-wrapper {
+                .el-table__body {
+                    tbody {
+                        .el-table__row {
+                            .el-table__cell {
                                 background: #16181e;
                                 color: #989898;
                             }
                         }
-                        .el-table__row--striped{
-                            .el-table__cell{
+
+                        .el-table__row--striped {
+                            .el-table__cell {
                                 background: #202329;
                             }
                         }
@@ -874,4 +876,34 @@
         }
 
     }
+
+    .el-picker__popper.b {
+        .el-date-picker__time-header {
+            .el-input__inner {
+                color: #606266;
+                background: #fff;
+            }
+        }
+
+        .el-time-panel {
+            background: #fff;
+
+            .el-time-spinner__item {
+                color: #606266;
+
+                &:hover {
+                    background: #1890ff;
+                    color: #fff;
+                }
+            }
+
+            .el-time-panel__footer {
+                background: #fff;
+
+                .cancel {
+                    color: #606769
+                }
+            }
+        }
+    }
 }

src/router/index.js

@@ -5,30 +5,30 @@ export const constantRoutes = [
         path: "/login",
         name: "Login",
         component: () =>
-        import(/* webpackChunkName: "Login" */ "../views/layout/login-page.vue"),
+            import(/* webpackChunkName: "Login" */ "../views/layout/login-page.vue"),
     },
 ];
 export const asyncRoutes = [
-//   {
-//     path: "/",
-//     redirect: "/home",
-//     meta: {
-//       title: "首页",
-//       icon: "",
-//       permissions: ["jn_sy"],
-//     },
-//   },
-//   {
-//     path: "/home", // 驾驶舱
-//     name: "home",
-//     component: () => import("@/views/Home"),
-//     meta: {
-//       title: "首页",
-//       icon: "",
-//       permissions: ["jn_sy"],
-//     },
-//   },
-  //综合报警
+    //   {
+    //     path: "/",
+    //     redirect: "/home",
+    //     meta: {
+    //       title: "首页",
+    //       icon: "",
+    //       permissions: ["jn_sy"],
+    //     },
+    //   },
+    //   {
+    //     path: "/home", // 驾驶舱
+    //     name: "home",
+    //     component: () => import("@/views/Home"),
+    //     meta: {
+    //       title: "首页",
+    //       icon: "",
+    //       permissions: ["jn_sy"],
+    //     },
+    //   },
+    //综合报警
     {
         path: "/integratedAlarm",
         //   redirect:
@@ -47,9 +47,9 @@ export const asyncRoutes = [
                 name: "DetailMatrix",
                 component: () => import("@/views/IntegratedAlarm/DetailMatrix"),
                 meta: {
-                  title: "矩阵提醒",
-                  icon: "svg-mx-matrix",
-                  permissions: ["jn_mxjz"],
+                    title: "矩阵提醒",
+                    icon: "svg-mx-matrix",
+                    permissions: ["jn_mxjz"],
                 },
             },
             {
@@ -76,7 +76,7 @@ export const asyncRoutes = [
                         path: "customWarning", // 预警查询
                         name: "customWarning",
                         component: () =>
-                        import("@/views/IntegratedAlarm/safe/customWarning"),
+                            import("@/views/IntegratedAlarm/safe/customWarning"),
                         meta: {
                             title: "预警查询",
                             icon: "",
@@ -87,7 +87,7 @@ export const asyncRoutes = [
                         path: "historyWarning", // 报警查询
                         name: "historyWarning",
                         component: () =>
-                        import("@/views/IntegratedAlarm/safe/historyWarning"),
+                            import("@/views/IntegratedAlarm/safe/historyWarning"),
                         meta: {
                             title: "报警查询",
                             icon: "",
@@ -130,7 +130,7 @@ export const asyncRoutes = [
                         path: "customAnalyse", // 预警分析
                         name: "customAnalyse",
                         component: () =>
-                        import("@/views/IntegratedAlarm/reliability/customAnalyse"),
+                            import("@/views/IntegratedAlarm/reliability/customAnalyse"),
                         meta: {
                             title: "预警分析",
                             icon: "",
@@ -141,7 +141,7 @@ export const asyncRoutes = [
                         path: "historyAnalyse", // 报警分析
                         name: "historyAnalyse",
                         component: () =>
-                        import("@/views/IntegratedAlarm/reliability/historyAnalyse"),
+                            import("@/views/IntegratedAlarm/reliability/historyAnalyse"),
                         meta: {
                             title: "报警分析",
                             icon: "",
@@ -164,7 +164,7 @@ export const asyncRoutes = [
                         path: "customConfig", // 预警配置
                         name: "customConfig",
                         component: () =>
-                        import("@/views/IntegratedAlarm/alarmConfig/customConfig"),
+                            import("@/views/IntegratedAlarm/alarmConfig/customConfig"),
                         meta: {
                             title: "预警配置",
                             icon: "",
@@ -175,7 +175,7 @@ export const asyncRoutes = [
                         path: "historyConfig", // 报警配置
                         name: "historyConfig",
                         component: () =>
-                        import("@/views/IntegratedAlarm/alarmConfig/historyConfig"),
+                            import("@/views/IntegratedAlarm/alarmConfig/historyConfig"),
                         meta: {
                             title: "报警配置",
                             icon: "",
@@ -225,7 +225,7 @@ export const asyncRoutes = [
             },
         ]
     },
-  //经济运行
+    //经济运行
     {
         path: "/economicsOperation",
         // redirect:
@@ -240,12 +240,12 @@ export const asyncRoutes = [
             permissions: ["jn_economicsOperation"],
         },
         children: [
-        //对标分析
+            //对标分析
             {
                 path: "benchmarkingManagement",
                 redirect: "benchmarkingManagement/performanceRankingList",
                 component: () =>
-                import("@/views/economicsOperation/benchmarkingManagement"),
+                    import("@/views/economicsOperation/benchmarkingManagement"),
                 name: "benchmarkingManagement",
                 meta: {
                     title: "对标分析",
@@ -256,9 +256,9 @@ export const asyncRoutes = [
                     {
                         path: "performanceRankingList",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue"
+                            ),
                         name: "performanceRankingList",
                         meta: {
                             title: "绩效榜",
@@ -270,9 +270,9 @@ export const asyncRoutes = [
                         path: "decision1Mx", //风机绩效榜明细
                         name: "decision1Mx",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/benchmarkingManagement/performanceRankingList/decision1Mx.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/benchmarkingManagement/performanceRankingList/decision1Mx.vue"
+                            ),
                         meta: {
                             title: "风机绩效榜明细",
                             icon: "",
@@ -282,9 +282,9 @@ export const asyncRoutes = [
                     {
                         path: "loseRate",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/benchmarkingManagement/loseRate/index.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/benchmarkingManagement/loseRate/index.vue"
+                            ),
                         name: "loseRate",
                         meta: {
                             title: "五项对标损失",
@@ -292,25 +292,25 @@ export const asyncRoutes = [
                             permissions: ["jn_dbgl_wxssl"],
                         },
                     },
-                //   {
-                //     path: "companyBenchmarking",
-                //     component: () =>
-                //       import(
-                //         "@/views/economicsOperation/benchmarkingManagement/companyBenchmarking"
-                //       ),
-                //     name: "companyBenchmarking",
-                //     meta: {
-                //       title: "公司对标",
-                //       icon: "",
-                //       permissions: ["jn_dbgl_gsdb"],
-                //     },
-                //   },
+                    //   {
+                    //     path: "companyBenchmarking",
+                    //     component: () =>
+                    //       import(
+                    //         "@/views/economicsOperation/benchmarkingManagement/companyBenchmarking"
+                    //       ),
+                    //     name: "companyBenchmarking",
+                    //     meta: {
+                    //       title: "公司对标",
+                    //       icon: "",
+                    //       permissions: ["jn_dbgl_gsdb"],
+                    //     },
+                    //   },
                     {
                         path: "siteBenchmarking",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/benchmarkingManagement/siteBenchmarking"
-                        ),
+                            import(
+                                "@/views/economicsOperation/benchmarkingManagement/siteBenchmarking"
+                            ),
                         name: "siteBenchmarking",
                         meta: {
                             title: "场内对标",
@@ -321,9 +321,9 @@ export const asyncRoutes = [
                     {
                         path: "intervalBenchmarking",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/benchmarkingManagement/intervalBenchmarking"
-                        ),
+                            import(
+                                "@/views/economicsOperation/benchmarkingManagement/intervalBenchmarking"
+                            ),
                         name: "intervalBenchmarking",
                         meta: {
                             title: "场际对标",
@@ -331,24 +331,24 @@ export const asyncRoutes = [
                             permissions: ["jn_dbgl_cjdb"],
                         },
                     },
-                //   {
-                //     path: "valueBenchmarking",
-                //     component: () =>
-                //       import(
-                //         "@/views/economicsOperation/benchmarkingManagement/valueBenchmarking"
-                //       ),
-                //     name: "valueBenchmarking",
-                //     meta: {
-                //       title: "值际对标",
-                //       icon: "",
-                //     },
-                //   },
+                    //   {
+                    //     path: "valueBenchmarking",
+                    //     component: () =>
+                    //       import(
+                    //         "@/views/economicsOperation/benchmarkingManagement/valueBenchmarking"
+                    //       ),
+                    //     name: "valueBenchmarking",
+                    //     meta: {
+                    //       title: "值际对标",
+                    //       icon: "",
+                    //     },
+                    //   },
                     {
                         path: "projectBenchmarking",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/benchmarkingManagement/projectBenchmarking"
-                        ),
+                            import(
+                                "@/views/economicsOperation/benchmarkingManagement/projectBenchmarking"
+                            ),
                         name: "projectBenchmarking",
                         meta: {
                             title: "项目对标",
@@ -359,9 +359,9 @@ export const asyncRoutes = [
                     {
                         path: "wiringBenchmarking",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/benchmarkingManagement/wiringBenchmarking"
-                        ),
+                            import(
+                                "@/views/economicsOperation/benchmarkingManagement/wiringBenchmarking"
+                            ),
                         name: "wiringBenchmarking",
                         meta: {
                             title: "线路对标",
@@ -369,18 +369,18 @@ export const asyncRoutes = [
                             permissions: ["jn_dbgl_xldb"],
                         },
                     },
-                //   {
-                //     path: "singleMachineBenchmarking",
-                //     component: () =>
-                //       import(
-                //         "@/views/economicsOperation/benchmarkingManagement/singleMachineBenchmarking"
-                //       ),
-                //     name: "singleMachineBenchmarking",
-                //     meta: {
-                //       title: "单机对标",
-                //       icon: "",
-                //     },
-                //   },
+                    //   {
+                    //     path: "singleMachineBenchmarking",
+                    //     component: () =>
+                    //       import(
+                    //         "@/views/economicsOperation/benchmarkingManagement/singleMachineBenchmarking"
+                    //       ),
+                    //     name: "singleMachineBenchmarking",
+                    //     meta: {
+                    //       title: "单机对标",
+                    //       icon: "",
+                    //     },
+                    //   },
                 ],
             },
             //电量损失分解
@@ -398,9 +398,9 @@ export const asyncRoutes = [
                     {
                         path: "comprehensiveAnalysis",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/thematicAnalysis/comprehensiveAnalysis"
-                        ),
+                            import(
+                                "@/views/economicsOperation/thematicAnalysis/comprehensiveAnalysis"
+                            ),
                         name: "comprehensiveAnalysis",
                         meta: {
                             title: "综合分析",
@@ -411,7 +411,7 @@ export const asyncRoutes = [
                     {
                         path: "windEnergy",
                         component: () =>
-                        import("@/views/economicsOperation/thematicAnalysis/windEnergy"),
+                            import("@/views/economicsOperation/thematicAnalysis/windEnergy"),
                         name: "windEnergy",
                         meta: {
                             title: "风能利用率",
@@ -422,7 +422,7 @@ export const asyncRoutes = [
                     {
                         path: "failure",
                         component: () =>
-                        import("@/views/economicsOperation/thematicAnalysis/failure"),
+                            import("@/views/economicsOperation/thematicAnalysis/failure"),
                         name: "failure",
                         meta: {
                             title: "五项损失率",
@@ -434,7 +434,7 @@ export const asyncRoutes = [
                     {
                         path: "MTBF",
                         component: () =>
-                        import("@/views/economicsOperation/thematicAnalysis/MTBF"),
+                            import("@/views/economicsOperation/thematicAnalysis/MTBF"),
                         name: "MTBF",
                         meta: {
                             title: "可靠性分析",
@@ -445,7 +445,7 @@ export const asyncRoutes = [
                     {
                         path: "generation",
                         component: () =>
-                        import("@/views/economicsOperation/thematicAnalysis/generation"),
+                            import("@/views/economicsOperation/thematicAnalysis/generation"),
                         name: "generation",
                         meta: {
                             title: "发电量分析",
@@ -493,9 +493,9 @@ export const asyncRoutes = [
                     {
                         path: "stationElectricAnalyse",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/stationAnalyse/stationElectricAnalyse"
-                        ),
+                            import(
+                                "@/views/economicsOperation/stationAnalyse/stationElectricAnalyse"
+                            ),
                         name: "StationElectricAnalyse",
                         meta: {
                             title: "综合场用电量分析",
@@ -506,9 +506,9 @@ export const asyncRoutes = [
                     {
                         path: "WindAndPhotovoltaic",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/stationAnalyse/windAndPhotovoltaic"
-                        ),
+                            import(
+                                "@/views/economicsOperation/stationAnalyse/windAndPhotovoltaic"
+                            ),
                         name: "WindAndPhotovoltaic",
                         meta: {
                             title: "风资源分析",
@@ -519,36 +519,36 @@ export const asyncRoutes = [
                     {
                         path: "posAnalysis",
                         component: () =>
-                          import("@/views/economicsOperation/stationAnalyse/posAnalysis/index.vue"),
+                            import("@/views/economicsOperation/stationAnalyse/posAnalysis/index.vue"),
                         name: "posAnalysis",
                         meta: {
                             title: "微观选址分析",
                             icon: "",
                             permissions: ["jn_czfx_fgzyfx"],
                         },
-                      },
-                      {
+                    },
+                    {
                         path: "agcAnalysis",
                         component: () =>
-                          import("@/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue"),
+                            import("@/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue"),
                         name: "dataAnalysisAgcAnalysis",
                         meta: {
                             title: "AGC曲线偏差分析",
                             icon: "",
                             permissions: ["jn_czfx_fgzyfx"],
                         },
-                      },
-                      {
-                        path: "agcAnalysis",
+                    },
+                    {
+                        path: "fjglfsAnalysis",
                         component: () =>
-                          import("@/views/economicsOperation/stationAnalyse/fjglfsAnalysis/index.vue"),
-                        name: "dataAnalysisAgcAnalysis",
+                            import("@/views/economicsOperation/stationAnalyse/fjglfsAnalysis/index.vue"),
+                        name: "dataAnalysisFjglfsAnalysis",
                         meta: {
                             title: "风机功率风速分析",
                             icon: "",
                             permissions: ["jn_czfx_fgzyfx"],
                         },
-                      },
+                    },
                 ]
             },
             //机组分析
@@ -562,36 +562,36 @@ export const asyncRoutes = [
                     permissions: ["jn_fdfx"],
                 },
                 children: [
-                // {
-                //   path: "stateTransition",
-                //   component: () =>
-                //     import(
-                //       "@/views/economicsOperation/windAnalyse/stateTransition/index.vue"
-                //     ),
-                //   name: "stateTransition",
-                //   meta: {
-                //     title: "状态时间分析",
-                //     icon: "",
-                //     permissions: ["jn_fdfx_ztzhfx"],
-                //   },
-                // },
-                // {
-                //   path: "timeTransition",
-                //   component: () =>
-                //     import(
-                //       "@/views/economicsOperation/windAnalyse/timeTransition/index.vue"
-                //     ),
-                //   name: "timeTransition",
-                //   meta: {
-                //     title: "状态转换分析",
-                //     icon: "",
-                //     permissions: ["jn_fdfx_ztsjfx"],
-                //   },
-                // },
+                    // {
+                    //   path: "stateTransition",
+                    //   component: () =>
+                    //     import(
+                    //       "@/views/economicsOperation/windAnalyse/stateTransition/index.vue"
+                    //     ),
+                    //   name: "stateTransition",
+                    //   meta: {
+                    //     title: "状态时间分析",
+                    //     icon: "",
+                    //     permissions: ["jn_fdfx_ztzhfx"],
+                    //   },
+                    // },
+                    // {
+                    //   path: "timeTransition",
+                    //   component: () =>
+                    //     import(
+                    //       "@/views/economicsOperation/windAnalyse/timeTransition/index.vue"
+                    //     ),
+                    //   name: "timeTransition",
+                    //   meta: {
+                    //     title: "状态转换分析",
+                    //     icon: "",
+                    //     permissions: ["jn_fdfx_ztsjfx"],
+                    //   },
+                    // },
                     {
                         path: "powerAnalyse",
                         component: () =>
-                        import("@/views/economicsOperation/windAnalyse/powerCurve"),
+                            import("@/views/economicsOperation/windAnalyse/powerCurve"),
                         name: "PowerCurve",
                         meta: {
                             title: "功率曲线拟合",
@@ -602,7 +602,7 @@ export const asyncRoutes = [
                     {
                         path: "powerSearch",
                         component: () =>
-                        import("@/views/economicsOperation/windAnalyse/powerSearch"),
+                            import("@/views/economicsOperation/windAnalyse/powerSearch"),
                         name: "PowerSearch",
                         meta: {
                             title: "功率曲线查询",
@@ -613,9 +613,9 @@ export const asyncRoutes = [
                     {
                         path: "qxpclfx",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/windAnalyse/qxpclfx/index.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/windAnalyse/qxpclfx/index.vue"
+                            ),
                         name: "Qxpclfx",
                         meta: {
                             title: "曲线偏差率分析",
@@ -626,9 +626,9 @@ export const asyncRoutes = [
                     {
                         path: "qxqjpcl",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/windAnalyse/qxqjpcl/index.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/windAnalyse/qxqjpcl/index.vue"
+                            ),
                         name: "Qxqjpcl",
                         meta: {
                             title: "曲线区间偏差率分析",
@@ -639,9 +639,9 @@ export const asyncRoutes = [
                     {
                         path: "cutInAndOutAnalysis",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/windAnalyse/cutInAndOutAnalysis/index.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/windAnalyse/cutInAndOutAnalysis/index.vue"
+                            ),
                         name: "CutInAndOutAnalysis",
                         meta: {
                             title: "切入切出分析",
@@ -652,9 +652,9 @@ export const asyncRoutes = [
                     {
                         path: "singleWindAnasyle",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/windAnalyse/singleWindAnasyle/index.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/windAnalyse/singleWindAnasyle/index.vue"
+                            ),
                         name: "SingleWindAnasyle",
                         meta: {
                             title: "单机性能分析",
@@ -665,9 +665,9 @@ export const asyncRoutes = [
                     {
                         path: "monthlyAnalysis",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/windAnalyse/monthlyAnalysis/index.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/windAnalyse/monthlyAnalysis/index.vue"
+                            ),
                         name: "MonthlyAnalysis",
                         meta: {
                             title: "单机月度分析",
@@ -678,9 +678,9 @@ export const asyncRoutes = [
                     {
                         path: "performanceAssess",
                         component: () =>
-                        import(
-                            "@/views/economicsOperation/windAnalyse/performanceAssess/index.vue"
-                        ),
+                            import(
+                                "@/views/economicsOperation/windAnalyse/performanceAssess/index.vue"
+                            ),
                         name: "PerformanceAssess",
                         meta: {
                             title: "性能等级评估",
@@ -692,7 +692,7 @@ export const asyncRoutes = [
                         path: "partsTemperatureAnalyse", // 各出力部件温度分析
                         name: "partsTemperatureAnalyse",
                         component: () =>
-                        import("@/views/IntegratedAlarm/reliability/partsTemperatureAnalyse/index2.vue"),
+                            import("@/views/IntegratedAlarm/reliability/partsTemperatureAnalyse/index2.vue"),
                         meta: {
                             title: "各出力部件温度分析",
                             icon: "",
@@ -813,46 +813,46 @@ export const asyncRoutes = [
                 component: () => import("@/views/economicsOperation/efficiency"),
                 name: "efficiency",
                 meta: {
-                title: "运维三率",
-                icon: "svg-dimension-new",
-                permissions: ["jn_slgl"],
+                    title: "运维三率",
+                    icon: "svg-dimension-new",
+                    permissions: ["jn_slgl"],
                 },
                 children: [
-                {
-                    path: "restorationEfficiency",
-                    component: () =>
-                    import(
-                        "@/views/economicsOperation/efficiency/restorationEfficiency"
-                    ),
-                    name: "restorationEfficiency",
-                    meta: {
-                    title: "复位及时率",
-                    icon: "",
-                    permissions: ["jn_slgl_fwjsl"],
+                    {
+                        path: "restorationEfficiency",
+                        component: () =>
+                            import(
+                                "@/views/economicsOperation/efficiency/restorationEfficiency"
+                            ),
+                        name: "restorationEfficiency",
+                        meta: {
+                            title: "复位及时率",
+                            icon: "",
+                            permissions: ["jn_slgl_fwjsl"],
+                        },
                     },
-                },
-                {
-                    path: "consumeEfficiency",
-                    component: () =>
-                    import("@/views/economicsOperation/efficiency/consumeEfficiency"),
-                    name: "consumeEfficiency",
-                    meta: {
-                    title: "消缺及时率",
-                    icon: "",
-                    permissions: ["jn_slgl_xqjsl"],
+                    {
+                        path: "consumeEfficiency",
+                        component: () =>
+                            import("@/views/economicsOperation/efficiency/consumeEfficiency"),
+                        name: "consumeEfficiency",
+                        meta: {
+                            title: "消缺及时率",
+                            icon: "",
+                            permissions: ["jn_slgl_xqjsl"],
+                        },
                     },
-                },
-                {
-                    path: "stateEfficiency",
-                    component: () =>
-                    import("@/views/economicsOperation/efficiency/stateEfficiency"),
-                    name: "stateEfficiency",
-                    meta: {
-                    title: "状态转换率",
-                    icon: "",
-                    permissions: ["jn_slgl_ztzhl"],
+                    {
+                        path: "stateEfficiency",
+                        component: () =>
+                            import("@/views/economicsOperation/efficiency/stateEfficiency"),
+                        name: "stateEfficiency",
+                        meta: {
+                            title: "状态转换率",
+                            icon: "",
+                            permissions: ["jn_slgl_ztzhl"],
+                        },
                     },
-                },
                 ],
             },
             // {
@@ -865,7 +865,7 @@ export const asyncRoutes = [
             //         permissions: ["jn_slgl"],
             //     },
             // },
-            
+
             {
                 path: "rateAnalysis", // 对风偏差分析
                 name: "rateAnalysis",
@@ -962,7 +962,7 @@ export const asyncRoutes = [
             // },
         ],
     },
-  // 智能报表
+    // 智能报表
     {
         path: "/nxreport",
         meta: {
@@ -1139,9 +1139,9 @@ export const asyncRoutes = [
     },
 ];
 const router = createRouter({
-  history: createWebHashHistory(),
-  base: "/nem/",
-  routes: [...constantRoutes, ...asyncRoutes],
+    history: createWebHashHistory(),
+    base: "/nem/",
+    routes: [...constantRoutes, ...asyncRoutes],
 });
 
 // router.beforeEach((to, from, next) => {

src/views/SandTable/SandTable.vue

@@ -1539,10 +1539,11 @@
                     if (val.path !== "/integratedAlarm") {
                         clearInterval(this.timmer);
                         this.timmer = null;
+                    }else {
+                        this.timmer = setInterval(() => {
+                            this.getDataInfo();
+                        }, 10000);
                     }
-                    this.$nextTick(() =>{
-                        // this.init(jsonData)
-                    })
                 },
             },
         },

src/views/economicsOperation/nxfHomePage/index.vue

@@ -259,9 +259,14 @@
         watch: {
             $route: {
                 handler(val) {
+                    debugger
                     if (val.path !== "/economicsOperation") {
                         clearInterval(this.timmer);
                         this.timmer = null;
+                    } else {
+                        this.timmer = setInterval(() => {
+                            this.getGeneratingcapacity();
+                        }, 10000);
                     }
                 },
             },

src/views/economicsOperation/stationAnalyse/angleAnalysis/components/current-scatter-chart.vue

@@ -211,18 +211,21 @@ export default {
               type: "cross",
             },
             formatter(data) {
-              let label = ``;
+              const dataIndex = data[0].dataIndex;
+              let label = `<p><span style="display:inline-block;width:100%">${that.xAxisData[dataIndex]}</span>`;
               data.forEach((ele, index) => {
                 label += `<p>
-                              <span style="background:${
-                                that.color[index]
-                              };margin-right:5px;display:inline-block;width:10px;height:10px;border-radius:50%;over-flow:hidden;"></span>
-                              <span>${
-                                ele.seriesName
-                              }:<span style="font-weight: 700;margin-left:10px">${
+                            <span style="background:${
+                              that.color[index]
+                            };margin-right:5px;display:inline-block;width:10px;height:10px;border-radius:50%;over-flow:hidden;"></span>
+                                <span>${
+                                  ele.seriesName
+                                }:<span style="font-weight: 700;margin-left:10px">${
                   ele.value || 0
-                }</span></span>
-                            </p>`;
+                }</span>
+                            </span>
+                           </p>
+                          </p>`;
               });
               return label;
             },
@@ -331,6 +334,35 @@ export default {
                 color: theme ? "#000" : "#fff",
               },
             },
+            {
+              splitLine: {
+                show: false,
+              },
+              position: "left",
+              min: 0,
+              name: "m/s",
+              nameTextStyle: {
+                color: theme ? "#000" : "#fff",
+              },
+              axisLabel: {
+                color: theme ? "#000" : "#fff",
+              },
+              position: "right",
+            },
+            {
+              splitLine: {
+                show: false,
+              },
+              position: "left",
+              min: 0,
+              name: "", // 另一条 MW 单位的Y轴，因为数值太大了所以单独用一条Y轴
+              nameTextStyle: {
+                color: theme ? "#000" : "#fff",
+              },
+              axisLabel: {
+                color: theme ? "#000" : "#fff",
+              },
+            },
           ],
           animation: true,
           dataset: that.dataSet.length ? JSON.parse(that.dataSet) : [],
@@ -366,6 +398,8 @@ export default {
           "#f56c6c",
           "rgb(135, 0, 157)",
           "rgb(116, 21, 219)",
+          "#205081", // 添加的深蓝色
+          "rgb(169, 89, 43)", // 添加的棕色
         ];
 
         this.linearGradientColor = [
@@ -407,6 +441,8 @@ export default {
           "#f56c6c",
           "rgb(77, 119, 255)",
           "rgb(1, 191, 236)",
+          "#f2c94c", // 添加的黄色
+          "rgb(153, 102, 255)", // 添加的紫色
         ];
         this.linearGradientColor = [
           {

src/views/economicsOperation/stationAnalyse/angleAnalysis/components/search.vue

@@ -2,11 +2,7 @@
   <div class="seach">
     <el-form class="generat-seach" :inline="true" :model="queryForm">
       <el-form-item label="场站" class="!mb-0">
-        <el-select
-          style="width: 120px"
-          v-model="queryForm.station"
-          class="w-[150px]"
-        >
+        <el-select style="width: 140px" v-model="queryForm.station">
           <el-option
             v-for="item in stationList"
             :key="item.id"

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/components/current-scatter-chart.vue

@@ -211,18 +211,21 @@ export default {
               type: "cross",
             },
             formatter(data) {
-              let label = ``;
+              const dataIndex = data[0].dataIndex;
+              let label = `<p><span style="display:inline-block;width:100%">${that.xAxisData[dataIndex]}</span>`;
               data.forEach((ele, index) => {
                 label += `<p>
-                              <span style="background:${
-                                that.color[index]
-                              };margin-right:5px;display:inline-block;width:10px;height:10px;border-radius:50%;over-flow:hidden;"></span>
-                              <span>${
-                                ele.seriesName
-                              }:<span style="font-weight: 700;margin-left:10px">${
+                            <span style="background:${
+                              that.color[index]
+                            };margin-right:5px;display:inline-block;width:10px;height:10px;border-radius:50%;over-flow:hidden;"></span>
+                                <span>${
+                                  ele.seriesName
+                                }:<span style="font-weight: 700;margin-left:10px">${
                   ele.value || 0
-                }</span></span>
-                            </p>`;
+                }</span>
+                            </span>
+                           </p>
+                          </p>`;
               });
               return label;
             },
@@ -331,6 +334,21 @@ export default {
                 color: theme ? "#000" : "#fff",
               },
             },
+            {
+              splitLine: {
+                show: false,
+              },
+              position: "left",
+              min: 0,
+              name: "m/s",
+              nameTextStyle: {
+                color: theme ? "#000" : "#fff",
+              },
+              axisLabel: {
+                color: theme ? "#000" : "#fff",
+              },
+              position: "right",
+            },
           ],
           animation: true,
           dataset: that.dataSet.length ? JSON.parse(that.dataSet) : [],

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/components/search.vue

@@ -3,26 +3,25 @@
     <el-form class="generat-seach" :inline="true" :model="queryForm">
       <el-form-item label="场站" class="!mb-0">
         <el-select
-          style="width: 120px"
+          style="width: 140px"
           v-model="queryForm.station"
-          class="w-[150px]"
           @change="getWtList"
         >
           <el-option
             v-for="item in stationList"
-            :key="item.id"
-            :label="item.title"
-            :value="item.id"
+            :key="item.nemCode"
+            :label="item.aname"
+            :value="item.nemCode"
           >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="风机" class="!mb-0">
         <el-select
-          style="width: 120px"
+          style="width: 150px"
           v-model="queryForm.wt"
-          class="w-[150px]"
           multiple
+          collapse-tags
         >
           <el-option
             v-for="item in wtList"
@@ -35,24 +34,23 @@
       </el-form-item>
       <el-form-item label="开始时间" class="!mb-0">
         <el-date-picker
-          type="date"
-          class="!w-[150px]"
+          type="datetime"
+          popper-class="b"
           v-model="queryForm.st"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="结束时间" class="!mb-0">
         <el-date-picker
-          type="date"
-          class="!w-[150px]"
+          type="datetime"
+          popper-class="b"
           v-model="queryForm.et"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="等间隔" class="!mb-0">
         <el-radio-group v-model="queryForm.interval">
-          <el-radio :label="1">一秒钟</el-radio>
-          <el-radio :label="2">一分钟</el-radio>
-          <el-radio :label="3">十分钟</el-radio>
-          <el-radio :label="4">十五分钟</el-radio>
+          <el-radio :label="1">十分钟</el-radio>
+          <el-radio :label="2">十五分钟</el-radio>
+          <el-radio :label="3">三十分钟</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item class="!mb-0">
@@ -70,7 +68,7 @@ import SubmitBtn from "@/components/generatingCapacityComponent/SubmitBtn.vue";
 const queryForm = reactive({
   station: "",
   wt: [],
-  st: Date.now() - 10 * 24 * 60 * 60 * 1000,
+  st: Date.now() - 1 * 24 * 60 * 60 * 1000,
   et: Date.now(),
   interval: 3,
 });
@@ -78,25 +76,25 @@ const queryForm = reactive({
 const stationList = ref([]);
 const wtList = ref([]);
 const funGetStation = async () => {
-  const res = await httpRequest.get("/agc/config");
+  const res = await httpRequest.get("/electricity/czlist");
   // stationList.value = Object.values(configStationJson) // configStationJson
-  stationList.value = Object.values(res);
+  stationList.value = Object.values(res?.data || []);
   if (stationList.value.length) {
-    queryForm.station = stationList.value[0].id;
+    queryForm.station = stationList.value[0].nemCode;
   }
 
   getWtList();
 };
 const getWtList = async () => {
-  const res = await httpRequest.get("/base/windturbine", {
-    wpids: queryForm.station,
-  });
-  wtList.value = Object.values(res);
+  const res = await httpRequest.get(
+    `/pro-basic-equipment/equipmentsByWpid2?wpid=${queryForm.station}`
+  );
+  wtList.value = Object.values(res?.data?.data || []);
   if (wtList.value.length) {
-    let wt = [];
-    wtList.value.forEach((item) => {
-      wt.push(item.id);
-    });
+    let wt = [wtList.value[0].id];
+    // wtList.value.forEach((item) => {
+    //   wt.push(item.id);
+    // });
     queryForm.wt = wt;
   }
 
@@ -108,21 +106,21 @@ const funSubmit = async () => {
   const startDate = new Date(queryForm.st).setHours(0, 0, 0, 0);
   const endDate = new Date(queryForm.et).setHours(0, 0, 0, 0);
   const query = {
-    id: queryForm.station,
-    startTs: new Date(startDate).getTime(),
-    endTs: new Date(endDate).getTime(),
+    windturbineId: queryForm.wt.toString() || "",
+    startTs: new Date(startDate).getTime() / 1000,
+    endTs: new Date(endDate).getTime() / 1000,
     interval: queryForm.interval,
   };
   switch (queryForm.interval) {
-    case 2:
-      query.interval = 60;
-      break;
-    case 3:
+    case 1:
       query.interval = 600;
       break;
-    case 4:
+    case 2:
       query.interval = 900;
       break;
+    case 3:
+      query.interval = 1800;
+      break;
   }
   emits("submit", query);
 };

src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -1683,7 +1683,6 @@ export default {
             }
           });
           for (let i = 0; i < lengedSer.length; i++) {
-            // debugger
             let ia = lengedSer[i];
             let objsxArr = [];
             let objsxArrObj = {