经济运行报告联调

src/api/zhbj/index.js

@@ -905,6 +905,15 @@ export const getWpList = (types = "") => {
     url: `alertrule/querywpllist?types=${types}`,
   });
 };
+
+export const getWtList = (params) => {
+    return request({
+      method: "get",
+      baseURL: process.env.VUE_APP_API,
+      url: `/benchmarking/wtByWplist?wpId=${params.wpId}`,
+    });
+  };
+
 export const getBpList = () => {
   return request({
     baseURL: process.env.VUE_APP_ALARM,
@@ -1024,8 +1033,16 @@ export function apiGetbaseStation() {
 // 风电数据准备页面
 export function apiGeWarningReport(params) {
     return request({
-        baseURL: process.env.VUE_APP_REPORT,
+        baseURL: process.env.VUE_APP_API,
         url: `WarningReport/report?time=${params.reportParamDate}&wpid=${params.reportStation}`,
         method: 'get'
     })
+}
+
+export function apiGeWarningeconreportReport(params) {
+    return request({
+        baseURL: process.env.VUE_APP_API,
+        url: `WarningReport/econreport?time=${params.reportParamDate}&wpid=${params.windStation}`,
+        method: 'get'
+    })
 }

src/router/index.js

@@ -843,16 +843,26 @@ export const asyncRoutes = [
                 },
                 ],
             },
+            // {
+            //     path: "healthReport",
+            //     component: () => import("@/views/economicsOperation/healthReport"),
+            //     name: "healthReport",
+            //     meta: {
+            //         title: "健康评价报告",
+            //         icon: "svg-zhgk",
+            //         permissions: ["jn_slgl"],
+            //     },
+            // },
             {
-                path: "healthReport",
-                component: () => import("@/views/economicsOperation/healthReport"),
-                name: "healthReport",
+                path: "economicsReport", // 经济运行分析报告
+                name: "economicsReport",
+                component: () => import("@/views/economicsOperation/jjyxReport"),
                 meta: {
-                    title: "健康评价报告",
-                    icon: "svg-zhgk",
-                    permissions: ["jn_slgl"],
+                    title: "经济运行分析报告",
+                    icon: "svg-报告",
+                    permissions: ["jn_alarmConfig"],
                 },
-            }
+            },
             //综合管控KPI
             // {
             //   path: "comprehensiveControl",

src/views/IntegratedAlarm/yhjyReport/index.vue

@@ -1,27 +1,26 @@
 <template>
     <div class="optimizationSuggestions">
         <div class="main_top">
-            <p class="topPsty">优化建议报告</p>
-            <div class="seach">
-                <el-form class="generat-seach" :inline="true">
-                    <el-form-item label="场站">
-                        <el-select v-model="reportStation" placeholder="选择场站">
-                            <el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="报告月份" class="!mb-0">
-                        <el-date-picker style="width: 120px" v-model="reportParamDate" type="month"
+            <div class="form-wrapper">
+                <div class="station">
+                    场站：
+                    <el-select v-model="reportStation" placeholder="选择场站">
+                        <el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="station">
+                    报告月份
+                    <div class="search-input">
+                    <el-date-picker style="width: 120px" v-model="reportParamDate" type="month"
                             value-format="YYYY-MM" placeholder="请选择" />
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" @click="handleReportOp">查询</el-button>
-                        <el-button style="width: 100px" type="danger" @click="exportPDFop" :loading="loading">导出 PDF
-                        </el-button>
-                        <!-- <el-button style="width: 100px" type="primary" @click="exportWORD" :loading="loading">导出 WORD
-                        </el-button> -->
-                    </el-form-item>
-                </el-form>
+                    </div>
+                </div>
+                <div class="but">
+                    <el-button type="primary" @click="handleReportOp">查询</el-button>
+                    <el-button style="width: 100px" type="danger" @click="exportPDFop" :loading="loading">导出 PDF
+                    </el-button>
+                </div>
             </div>
         </div>
         <div class="infoBox">
@@ -746,26 +745,43 @@
             display: flex;
             align-items: center;
 
-            .topPsty {
-                position: relative;
-                top: 5px;
-                padding: 7px 20px;
-                font-size: 12px;
-                font-weight: 600;
-                margin-left: 10px;
-                border-radius: 3px;
-            }
+            .form-wrapper {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                margin: 10px 0 10px 20px;
+
+                .station {
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    font-size: 14px;
+                    font-family: Microsoft YaHei;
+                    font-weight: 400;
+                    color: #b3b3b3;
+                    margin-right: 10px;
+                }
 
-            .seach {
-                padding: 20px 0 0 20px;
+                .search-input {
+                    margin-left: 10px;
+                }
 
-                .generat-seach {
-                    .el-form-item {
-                        .el-form-item__content {
-                            .el-select {
-                                width: 130px !important;
-                            }
-                        }
+                .but {
+                    display: flex;
+                    flex-direction: row;
+                    align-content: center;
+                    margin-left: 20px;
+                }
+
+                .buttons {
+                    background-color: rgba(5, 187, 76, 0.2);
+                    border: 1px solid #3b6c53;
+                    color: #b3b3b3;
+                    font-size: 14px;
+
+                    &:hover {
+                    background-color: rgba(5, 187, 76, 0.5);
+                    color: #ffffff;
                     }
                 }
             }