问题修改

src/components/alarm-badge/index.vue

@@ -394,7 +394,8 @@ export default {
         end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
       };
       if (params.alarmType == "windturbine") {
-        params.stationid = "SXJ_KGDL_DJY_FDC_STA";
+        // params.stationid = "SXJ_KGDL_DJY_FDC_STA";
+        params.stationid = ""
       } else if (params.alarmType == "inverter") {
         params.stationid = "SXJ_KGDL_JR_GDC_STA";
       }

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

@@ -310,7 +310,7 @@ const state = reactive({
   tableData: [],
   tHeard: [],
   changZhan: "",
-  components: ["FDJ", "CLX"], //部件
+  components: ["LG"], //部件
   modelId: "", //型号
   alarmIds: "",
   alarmIdList: [],
@@ -568,7 +568,7 @@ watch(
             return ele.nemCode === "FDJ";
           })?.nemCode || "";
         componenDefaultSelect
-          ? (state.components = ["FDJ", "CLX"])
+          ? (state.components = ["LG"])
           : arr[1]?.[0]?.nemCode
           ? (state.components = [arr[1]?.[0]?.nemCode])
           : (state.components = []);
@@ -630,7 +630,12 @@ function getTableList() {
       alarmIds: state.alarmIds,
       alarmType: state.typeVal,
     }).then((res) => {
-      changeTableData(res)
+        if (res && res.length>0) {
+            changeTableData(res)
+        } else {
+            state.tHeard = [];
+            state.tableData = [];
+        }
     }).catch(() =>{
       changeTableData(dataJson.data.data.dataList)
     });

src/views/IntegratedAlarm/yhjyReport/dataJson.json

@@ -506,7 +506,8 @@
                 },
                 {
                     "name": "齿轮箱类",
-                    "code": "gearboxType"
+                    "code": "gearboxType",
+                    "width": 90
                 },
                 {
                     "name": "频次/时长(小时)",
@@ -514,7 +515,8 @@
                 },
                 {
                     "name": "变桨类",
-                    "code": "pitchSystemType"
+                    "code": "pitchSystemType",
+                    "width": 90
                 },
                 {
                     "name": "频次/时长(小时)",

src/views/IntegratedAlarm/yhjyReport/index.vue

@@ -163,12 +163,12 @@
               'border-bottom': '1px solid rgba(0,0,0,.5)',
               'border-right': '1px solid rgba(0,0,0,.5)',
             }">
-                        <el-table-column prop="turbineId" align="center" label="风机编号" />
-                        <el-table-column prop="downtimeCount" align="center" label="故障停机次数" />
+                        <el-table-column prop="turbineId" align="center" label="风机编号" width="60" />
+                        <el-table-column prop="downtimeCount" align="center" label="故障停机次数" width="60" />
                         <el-table-column v-for="(item, index) in orderTableColumn2" :key="index" :label="item.name"
                             :width="item.width" align="center">
                             <el-table-column v-for="(res, index) in item.children" :key="index" :label="res.name"
-                                align="center" width="71">
+                                align="center" :width="res.width ? res.width : 73">
                                 <template #default="scope">
                                     <span>
                                         {{ scope.row[res.code] ? scope.row[res.code] : "-" }}
@@ -176,7 +176,7 @@
                                 </template>
                             </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="reliabilityIssue" align="center" label="可靠性问题" width="92" />
+                        <el-table-column prop="reliabilityIssue" align="center" label="可靠性问题" width="60" />
                     </el-table>
                 </div>
 
@@ -680,7 +680,7 @@
                     date[1] +
                     "月" +
                     res.data.stationid.aname +
-                    "性能及可靠性优化建议报告";
+                    "性能优化建议报告";
                 this.OperationGs = `本报告旨在对${res.data.stationid.aname}内的风机进行综合分析，以筛选出同时存在性能问题和可靠性隐患的风机，为后续的检修与优化提供依据。`;
 
                 this.basrMsgArr.forEach((it) => {

src/views/economicsOperation/jjyxReport/index.vue

@@ -12,7 +12,7 @@
                 <div class="station">
                     机组：
                     <el-select v-model="windStation" placeholder="选择机组" @change="changeWt">
-                        <el-option v-for="item in windList" :key="item.id" :label="item.name" :value="item.id">
+                        <el-option v-for="item in windList" :key="item.id" :label="item.aname" :value="item.id">
                         </el-option>
                     </el-select>
                 </div>

src/views/economicsOperation/nxfHomePage/index.vue

@@ -2,16 +2,9 @@
     <div style="width: 100%;height:100%;padding: 10px;">
         <div class="operationHome" v-if="$route.path === '/economicsOperation'">
             <!-- <tab @select="selectionItemClick" /> -->
-            <div class="tabs">
-                 <!-- @click="selectTab(index, item)" -->
-                <div class="tab-item" v-for="(item, index) of tabData" :key="item"
-                    :class="{ active: activeIndex == index }">
-                    {{ item.text }}
-                </div>
-            </div>
             <div class="homeMain">
                 <div class="homeLeaf">
-                    <Row type="flex" class="plan" style="height:20%">
+                    <Row type="flex" class="plan" style="height:21%">
                         <Col :span="24">
                         <com-panel title="发电量" sub-title="（单位：万kWh）" bodyPadd="50px"
                             style="position: relative;height: 100%">
@@ -25,7 +18,7 @@
                         </com-panel>
                         </Col>
                     </Row>
-                    <Row type="flex" class="plan" style="height:78%">
+                    <Row type="flex" class="plan" style="height:79%">
                         <Col :span="24">
                         <com-panel title="主要经济指标同期对比" sub-title="（电量单位：万kWh）" style="position: relative;height: 100%">
                             <operationTable :data="zbtqdb" height="100%"></operationTable>
@@ -34,7 +27,7 @@
                     </Row>
                 </div>
                 <div class="homeCenter">
-                    <Row type="flex" style="height:20%;">
+                    <Row type="flex" style="height:23%;">
                         <Col :span="24" style="background: #142446 !important;">
                         <power-plan :data="planData" :title="planBtnName" />
                         </Col>
@@ -66,6 +59,13 @@
                     </Row>
                 </div>
                 <div class="homeRight">
+                    <div class="tabs">
+                        <!-- @click="selectTab(index, item)" -->
+                        <div class="tab-item" v-for="(item, index) of tabData" :key="item"
+                            :class="{ active: activeIndex == index }">
+                            {{ item.text }}
+                        </div>
+                    </div>
                     <Row type="flex" class="rightplan" v-for="it in rightTableData" :key="it.name" style="height:48.5%">
                         <Col :span="24">
                         <com-panel :title="it.name" sub-title="（电量单位：万kWh）" style="position: relative;height: 100%">

src/views/economicsOperation/stationAnalyse/posAnalysis/components/leafletMap.vue

@@ -33,7 +33,7 @@
                 layers: [],
                 rightObj: {},
                 areaLayer: null,
-                tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.png",
+                tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.jpg",
                 ciLayer: null,
                 viewCenterMap: {
                     GJNY_SXGS_ZZ_FDC_STA: {
@@ -93,7 +93,7 @@
                     // center: [38.44673272215545, 106.27624511718751], // 地图中心--银川
                     // center: [108.953939, 34.266611], // 地图中心--陕西
                     // center: [109.470962, 34.520632], // 地图中心--渭南
-                    zoom: 16, //缩放比列
+                    zoom: 19, //缩放比列
                     zoomControl: false, //禁用 + - 按钮
                     doubleClickZoom: true, // 禁用双击放大
                     attributionControl: false, // 移除右下角leaflet标识
@@ -131,12 +131,13 @@
                 // ).addTo(this.map);
 
                 let name = L.tileLayer(this.tilsUrl, {
-                    minZoom: 1,
-                    maxZoom: 16,
+                    minZoom: 10,
+                    maxZoom: 19,
                 }).addTo(this.map);
 
-                this.setAreaLayer("db", true);
-                this.setAreaLayer("jb", true);
+                // this.setAreaLayer("db", true);
+                // this.setAreaLayer("jb", true);
+                this.setAreaLayer("nx", true);
             },
 
             async funStationPos(ids) {

src/views/economicsOperation/stationAnalyse/posAnalysis/components/leafletMap1.vue

@@ -101,7 +101,7 @@
                 // ).addTo(this.map)
 
                 let name = L.tileLayer(this.tilsUrl, {
-                    minZoom: 1,
+                    minZoom: 10,
                     maxZoom: 18,
                 }).addTo(this.map);