增加微观选址分析，各出力部件温度分析

.env.development

@@ -1,8 +1,8 @@
 
-VUE_APP_API=http://123.60.219.66:48080
-VUE_APP_TEST=http://123.60.219.66:48080
-VUE_APP_WS='ws://123.60.219.66:48080'
-VUE_APP_ADAPTERURL=http://123.60.219.66:48080
+# VUE_APP_API=http://123.60.219.66:48080
+# VUE_APP_TEST=http://123.60.219.66:48080
+# VUE_APP_WS='ws://123.60.219.66:48080'
+# VUE_APP_ADAPTERURL=http://123.60.219.66:48080
 
 
 # 趋势对比数据条数
@@ -13,13 +13,13 @@ VUE_APP_DIALOG_POINT = contextmenu
 # 智慧检修
 # VUE_APP_NEW_WISDOM=http://10.81.3.162:8170
 # VUE_APP_NEW_WISDOM=http://123.60.219.66:48080
-VUE_APP_NEW_WISDOM=http://10.220.1.245:48080
+# VUE_APP_NEW_WISDOM=http://10.220.1.11:48080
 # 综合报警
 # VUE_APP_ALARM=http://123.60.219.66:48080
-VUE_APP_ALARM=http://10.220.1.245:48080
+VUE_APP_ALARM=http://10.220.1.11:6015
 # 登录
 # VUE_APP_VUE_LOGIN_URL=http://123.60.219.66:48080
-VUE_APP_VUE_LOGIN_URL=http://10.220.1.245:48080
+# VUE_APP_VUE_LOGIN_URL=http://10.220.1.245:48080
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS=ws://10.81.3.155:9002
 # # VUE_APP_TEST=http://192.168.1.101:9002
@@ -28,6 +28,7 @@ VUE_APP_VUE_LOGIN_URL=http://10.220.1.245:48080
 # # VUE_APP_API=http://192.168.1.116:6060
 # VUE_APP_API=http://120.46.128.147:6060
 VUE_APP_API=http://10.220.1.245:6060
+# VUE_APP_API=http://127.0.0.1:6060
 # # VUE_APP_API=http://192.168.1.109:6060
 
 

.env.production

@@ -3,10 +3,10 @@
 # VUE_APP_WS='ws://123.60.219.66:48080'
 # VUE_APP_ADAPTERURL=http://123.60.219.66:48080
 
-VUE_APP_API=http://10.220.1.8:48080
-VUE_APP_TEST=http://10.220.1.8:48080
-VUE_APP_WS='ws://10.220.1.8:48080'
-VUE_APP_ADAPTERURL=http://10.220.1.8:48080
+# VUE_APP_API=http://10.220.1.8:48080
+# VUE_APP_TEST=http://10.220.1.8:48080
+# VUE_APP_WS='ws://10.220.1.8:48080'
+# VUE_APP_ADAPTERURL=http://10.220.1.8:48080
 
 
 # 趋势对比数据条数
@@ -16,18 +16,18 @@ VUE_APP_DIALOG_NUM = 8
 VUE_APP_DIALOG_POINT = contextmenu
 # 智慧检修
 # VUE_APP_NEW_WISDOM=http://10.81.3.162:8170
-VUE_APP_NEW_WISDOM=http://10.220.1.8:48080
+# VUE_APP_NEW_WISDOM=http://10.220.1.8:48080
 # VUE_APP_NEW_WISDOM=http://123.60.219.66:48080
 # 综合报警
-VUE_APP_ALARM=http://10.220.1.8:48080
+VUE_APP_ALARM=http://10.220.1.11:6015
 # VUE_APP_ALARM=http://123.60.219.66:48080
 # 登录
-VUE_APP_VUE_LOGIN_URL=http://10.220.1.8:48080
+# VUE_APP_VUE_LOGIN_URL=http://10.220.1.8:48080
 # VUE_APP_VUE_LOGIN_URL=http://123.60.219.66:48080
 
 
 # VUE_APP_API=http://123.60.219.66:6060
-VUE_APP_API=http://10.220.1.8:6060
+VUE_APP_API=http://10.220.1.8:6070
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS='ws://10.81.3.155:9002'
 # VUE_APP_ADAPTERURL=http://10.81.3.155:8011

src/api/economic/index.js

@@ -857,6 +857,44 @@ const getStation = (data) => {
   });
 };
 
+//温度矩阵
+const temperatureInfo = (data) => {
+    return request({
+        baseURL:process.env.VUE_APP_API,
+        url: `/api/windturbine/temperature-info?id=${data.id}&status=${data.status}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
+        method: "get",
+    });
+};
+
+//风机控制
+const windturbControl = (pairs) => {
+    return request({
+        baseURL:process.env.VUE_APP_API,
+        url: `/api/control/`,
+        method: "post",
+        data:pairs
+    });
+};
+
+//风机控制
+const windturbControlLock = (pairs) => {
+    return request({
+        baseURL:process.env.VUE_APP_API,
+        url: `/api/control/lock`,
+        method: "post",
+        data:pairs
+    });
+};
+
+//获取风机详情页面数据
+const nitWinturbineBaseData = (data) => {
+    return request({
+        baseURL:process.env.VUE_APP_ADAPTERURL,
+        url: `/ts/latest?thingType=${data.thingType}&thingId=${data.thingId}&uniformCodes=${data.uniformCodes}`,
+        method: "get",
+    });
+};
+
 // --EBA能效分析
 
 // http://10.81.3.155:8170/ebapersis/getebapersislist?year=2022&month=8&regionid=SX&companyid=QJNY&station=BHB3_FDC
@@ -1050,5 +1088,14 @@ export default {
 
   getRegion,
 
-  getStation,
+    getStation,
+
+    temperatureInfo,
+    
+    windturbControl,
+    
+    windturbControlLock,
+
+    nitWinturbineBaseData
+  
 };

src/api/economicIndex.js

@@ -0,0 +1,28 @@
+import request from "@/tools/request";
+
+//获取发电量 主要经济指标同期对比数据
+export function generatingcapacity() {
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/economy/generating-capacity?companyId=NX_FGS_HA_FDC_STA`,
+    method: "get",
+  });
+}
+
+//获取风能利用率  设备可利用率  两个细则考核数据
+export function homeright() {
+    return request({
+      baseURL: process.env.VUE_APP_API,
+      url: `/economy/home-right?companyId=NX_FGS_HA_FDC_STA`,
+      method: "get",
+    });
+}
+
+//获取风能利用率  设备可利用率  两个细则考核数据
+export function homemiddle() {
+    return request({
+      baseURL: process.env.VUE_APP_API,
+      url: `/economy/home-middle?companyId=NX_FGS_HA_FDC_STA`,
+      method: "get",
+    });
+}

src/api/monthlyPerformanceAnalysis.js

@@ -48,6 +48,13 @@ export function getApiequipmentListByWp(params) {
     method: "GET",
   });
 }
+export function getApiequipmentListByWp2(params) {
+    return request({
+      baseURL: process.env.VUE_APP_API,
+      url: `/pro-basic-equipment/equipmentsByWpid2?wpid=${params.wpid}`,
+      method: "GET",
+    });
+  }
 // 通过升压站获取风机列表
 export function getApiWeatherstation() {
   return request({

src/router/index.js

@@ -434,17 +434,17 @@ export const asyncRoutes = [
                             permissions: ["jn_ztfx_dlfx"],
                         },
                     },
-                    {
-                        path: "windAnalysis",
-                        component: () =>
-                          import("@/views/economicsOperation/thematicAnalysis/windAnalysis"),
-                        name: "windAnalysis",
-                        meta: {
-                            title: "损失电量分析",
-                            icon: "",
-                            permissions: ["jn_ztfx_dlfx"],
-                        },
-                    },
+                    // {
+                    //     path: "windAnalysis",
+                    //     component: () =>
+                    //       import("@/views/economicsOperation/thematicAnalysis/windAnalysis"),
+                    //     name: "windAnalysis",
+                    //     meta: {
+                    //         title: "损失电量分析",
+                    //         icon: "",
+                    //         permissions: ["jn_ztfx_dlfx"],
+                    //     },
+                    // },
                 ],
             },
             //整站分析
@@ -492,7 +492,7 @@ export const asyncRoutes = [
                         ),
                         name: "WindAndPhotovoltaic",
                         meta: {
-                            title: "风光资源分析",
+                            title: "风资源分析",
                             icon: "",
                             permissions: ["jn_czfx_fgzyfx"],
                         },
@@ -651,7 +651,7 @@ export const asyncRoutes = [
                         path: "partsTemperatureAnalyse", // 各出力部件温度分析
                         name: "partsTemperatureAnalyse",
                         component: () =>
-                        import("@/views/IntegratedAlarm/reliability/partsTemperatureAnalyse"),
+                        import("@/views/IntegratedAlarm/reliability/partsTemperatureAnalyse/index2.vue"),
                         meta: {
                             title: "各出力部件温度分析",
                             icon: "",

src/utills/BackgroundData.js

@@ -0,0 +1,406 @@
+import api from "@/api/economic";
+export default class BackgroundData {
+    /* 当前登录用户 */
+    LoginUser;
+    /* 标题栏数据 */
+    // TopPoint = [
+    //     {
+    //         pointName: "TotalPower",// 实时总功率
+    //         pointTag: "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0135",
+    //         value: 0
+    //     }, {
+    //         pointName: "DailyPowerGeneration",// 日发电量
+    //         pointTag: "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0088",
+    //         value: 0
+    //     }, {
+    //         pointName: "GridPower",// 上网电量
+    //         pointTag: "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0136",
+    //         value: 0
+    //     }, {
+    //         pointName: "MonthlyPowerGeneration",// 月发电量
+    //         pointTag: "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0146",
+    //         value: 0
+    //     }, {
+    //         pointName: "AnnualPowerGeneration",// 年发电量
+    //         pointTag: "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0037",
+    //         value: 0
+    //     },
+    // ];
+    /* 推荐区数据 */
+    // Recommends = {
+    //     "DWK": {
+    //         stationName: "大武口光伏电站",
+    //         content: "通讯中断",
+    //         createTime: this.formatDate(new Date("2021-04-15 8:17:59"), 'YY-MM-DD hh:mm'),
+    //         isActive: false,
+    //         stationID: 'DWK_AGC',
+    //         values:'DWK'
+    //     },
+    //     "NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0263": {
+    //         stationName: "牛首山风电场",
+    //         id: 'NSS_BT',
+    //         content: "限电",
+    //         createTime: new Date(),
+    //         isActive: false,
+    //         stationID: 'NSS_AGC',
+    //         values:'NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0263'
+    //     },
+    //     "QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0263": {
+    //         stationName: "青山风电场",
+    //         content: "限电",
+    //         createTime: new Date(),
+    //         isActive: false,
+    //         stationID: 'QS_AGC',
+    //         id: 'QS_BT',
+    //         values:'QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0263'
+    //     },
+
+    //     "SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0263": {
+    //         stationName: "星能第六风电场",
+    //         content: "限电",
+    //         createTime: new Date(),
+    //         isActive: false,
+    //         stationID: 'XNL_AGC',
+    //         id: 'XN6_BT',
+    //         values:'SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0263'
+    //     },
+    //     "MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0263": {
+    //         stationName: "麻黄山风电场",
+    //         id: 'MHS_BT',
+    //         content: "限电",
+    //         createTime: new Date(),
+    //         isActive: false,
+    //         stationID: 'MHS_AGC',
+    //         values:'MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0263'
+    //     },
+    //     "XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0263": {
+    //         stationName: "香山风电场",
+    //         content: "限电",
+    //         createTime: new Date(),
+    //         isActive: false,
+    //         stationID: 'XS_AGC',
+    //         id: 'XS_BT',
+    //         values:'XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0263'
+    //     },
+    //     "SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI026X": {
+    //         stationName: "牛首山第五风电场",
+    //         content: "限电",
+    //         createTime: new Date(),
+    //         isActive: false,
+    //         stationID: 'NW_AGC',
+    //         id: 'N5_BT',
+    //         values:'SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI026X'
+    //     },
+    //     "SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0165": {
+    //         stationName: "宋堡第六风电场",
+    //         content: "限电",
+    //         createTime: new Date(),
+    //         isActive: false,
+    //         stationID: 'QS3_AGC',
+    //         id: 'SL_BT',
+    //         values:'SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0165'
+    //     },
+    // };
+    /* 隐患数据 */
+    HiddenProblems = new Array();
+    /* 缺陷数据 */
+    Defects = new Array();
+    /* 故障数据 */
+    Failure = new Array();
+    /* 事故数据 */
+    Accidents = new Array();
+
+    /* 标记数据 */
+    Marks = [];
+    /* 校验区数据 */
+    checkouts = [];
+    MarkIndex = 0;
+
+    constructor() {
+        // this.refreshTPData = this.refreshTPData.bind(this);
+        // this.onTPMessage = this.onTPMessage.bind(this);
+        // this.refreshAlarmData = this.refreshAlarmData.bind(this);
+        this.onHiddenProblemsMessage = this.onHiddenProblemsMessage.bind(this);
+        this.formatDate = this.formatDate.bind(this);
+        this.onDefectsMessage = this.onDefectsMessage.bind(this);
+        this.onAccidentsMessage = this.onAccidentsMessage.bind(this);
+        this.isContains = this.isContains.bind(this);
+        this.refreshRecommendData = this.refreshRecommendData.bind(this);
+        this.onRDMessage = this.onRDMessage.bind(this);
+        this.windturbineControl = this.windturbineControl.bind(this);
+        this.marking = this.marking.bind(this);
+        this.removeMarked = this.removeMarked.bind(this);
+        // this.initWinturbineBaseData = this.initWinturbineBaseData.bind(this);
+        // this.refreshTPData();
+        // this.refreshAlarmData();
+        this.refreshRecommendData();
+        // this.refreshTPTimer = setInterval(this.refreshTPData, 3000);// 标题栏数据
+        // this.refreshAlarmTimer = setInterval(this.refreshAlarmData, 10000);// 报警数据
+        this.refreshRecommendTimer = setInterval(this.refreshRecommendData, 3000);// 推荐数据
+    }
+
+    /* 数据刷新 */
+    // refreshTPData() {
+    //     let val = '';
+    //     for (let v in this.TopPoint) {
+    //         val += this.TopPoint[v].pointTag + ',';
+    //     }
+    //     api.refreshData(val).then(this.onTPMessage)
+    // }
+
+    /* 刷新推荐信息 */
+    refreshRecommendData() {
+        let val = '';
+        for (let v in this.Recommends) {
+            val += v + ',';
+        }
+        // api.refreshData(val).then(this.onRDMessage)
+    }
+
+    /* 刷新报警信息 */
+    refreshAlarmData() {
+        // http://192.168.10.18:8075/alarm
+        // 1、读取一天内的所有open的4级custom报警，作为隐患数据ar
+        let enddt = new Date();
+        let tm = enddt.getTime();
+        enddt = new Date(tm + 900000);
+        let startdt = new Date(tm - 86400000);
+        // api.getSnap({
+        //     pagenum:'1',
+        //     pagesize:'500',
+        //     category1:'custom',
+        //     isopened:'1',
+        //     starttime:this.formatDate(startdt),
+        //     endtime:this.formatDate(enddt),
+        // }).then(this.onHiddenProblemsMessage)
+        // api.getSnap({
+        //     pagenum:'1',
+        //     pagesize:'500',
+        //     category1:'windturbine',
+        //     isopened:'1',
+        //     starttime:this.formatDate(startdt),
+        //     endtime:this.formatDate(enddt),
+        // }).then(this.onHiddenProblemsMessage)
+        // api.getSnap({
+        //     pagenum:'1',
+        //     pagesize:'500',
+        //     category1:'SYZ',
+        //     isopened:'1',
+        //     starttime:this.formatDate(startdt),
+        //     endtime:this.formatDate(enddt),
+        // }).then(this.onHiddenProblemsMessage)
+    }
+
+    /* 获得故障数据 */
+    onAccidentsMessage(msg) {
+        if (!msg.data) return;
+        this.Accidents = new Array();
+        for (let v in msg.data.records) {
+            let val = msg.data.records[v];
+            if (this.isContains(val.alertText, ["跳闸", "开关", "刀闸", "断路器", "合位", "分位"])) {
+                // todo 暂时隐藏事故报警
+                //this.Accidents.push(val);
+            } else {
+                if (val.rank == "5") {
+                    this.Failure.push(val);
+                } else {
+                    this.Defects.push(val);
+                }
+            }
+        }
+    }
+
+    /* 获得缺陷数据 */
+    onDefectsMessage(msg) {
+        if (!msg.data) return;
+        this.Defects = new Array();
+        this.Failure = new Array();
+        for (let v in msg.data.records) {
+            let val = msg.data.records[v];
+            if (val.alertText.indexOf("故障") > 0) {
+                this.Failure.push(val);
+            } else {
+                this.Defects.push(val);
+            }
+        }
+    }
+
+    /* 获得隐患数据 */
+    onHiddenProblemsMessage(msg) {
+        if (!msg.data) return;
+        this.HiddenProblems = msg.data.records;
+    }
+
+    /* 获得标题栏数据 */
+    // onTPMessage(msg) {
+    //     if (!msg.data) return;
+    //     for (let v in this.TopPoint) {
+    //         let val = this.TopPoint[v];
+    //         val.value = msg.data[val.pointTag].doubleValue;
+    //     }
+    // }
+
+    /* 获得推荐信息数据 */
+    onRDMessage(msg) {
+        if (!msg.data) return;
+        // for (let v in msg.data) {
+        //     let isact = false;
+        //     if (!msg.data[v].doubleValue) {
+        //         isact = msg.data[v].booleanValue
+        //     } else {
+        //         isact = msg.data[v].doubleValue != 0;
+        //     }
+        //     if (isact && !this.Recommends[v].isActive) {
+        //         this.Recommends[v].createTime = this.formatDate(new Date(), 'YY-MM-DD hh:mm');
+        //     }
+        //     this.Recommends[v].isActive = isact;
+        // }
+    }
+
+    /* 格式化时间 */
+    formatDate(time, format = 'YY-MM-DD HH:mm:ss') {
+        let date = new Date(time);
+
+        let year = date.getFullYear(),
+            month = date.getMonth() + 1,//月份是从0开始的
+            day = date.getDate(),
+            hour = date.getHours(),
+            min = date.getMinutes(),
+            sec = date.getSeconds();
+        let preArr = Array.apply(null, Array(10)).map(function (elem, index) {
+            return '0' + index;
+        });
+
+        let newTime = format.replace(/YY/g, year)
+            .replace(/MM/g, preArr[month] || month)
+            .replace(/DD/g, preArr[day] || day)
+            .replace(/hh/g, preArr[hour] || hour)
+            .replace(/mm/g, preArr[min] || min)
+            .replace(/ss/g, preArr[sec] || sec);
+        return newTime;
+    }
+
+    /* 判断一个字符串中是否包含第二个字符串列表中的字符 */
+    isContains(str, strs) {
+        for (let v in strs) {
+            if (str.indexOf(strs[v]) > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /* 风机控制 */
+    windturbineControl(windturbines, isLockOrUnlock, automatic, test ,success, error) {
+        let pairs = {};
+        for (let ind in windturbines) {
+            let wb = windturbines[ind];
+            let ct = {
+                windturbineId: wb.windturbineId,
+                stationId: wb.stationId,
+                projectId: wb.projectId,
+                modelId: wb.modelId,
+                controlType: wb.controlType,
+                lockType: wb.lockType,
+                userName: automatic?'system_'+this.LoginUser.name:this.LoginUser.name,
+                userId: this.LoginUser.id,
+            };
+            pairs[ct.windturbineId] = ct;
+        }
+        api.windturbControl(pairs).then(res =>{
+            success(res);
+        })
+    }
+
+    /* 系统控制风机，自动下发命令 */
+    windturbineControlSystem(windturbines) {
+        let pairs = {};
+        for (let ind in windturbines) {
+            let wb = windturbines[ind];
+            let ct = {
+                windturbineId: wb.windturbineId,
+                stationId: wb.stationId,
+                projectId: wb.projectId,
+                modelId: wb.modelId,
+                controlType: wb.controlType,
+                lockType: wb.lockType,
+                userName: 'system',
+                userId: 0,
+            };
+            pairs[ct.windturbineId] = ct;
+        }
+        let isLockOrUnlock = false
+        api.windturbControl(pairs).then(res =>{
+            success(res);
+        })
+    }
+
+    /* 标记 */
+    marking(windturbines) {
+        for (let v in windturbines) {
+            ++this.MarkIndex;
+            this.Marks.push({ title: windturbines[v].windturbineId, id: this.MarkIndex });
+        }
+    }
+    updateMarks(windturbine, value) {
+        this.Marks.forEach(item => {
+            if (windturbine.windturbineId === item.title) {
+                item.value = value
+            }
+        })
+    }
+    /* 校验区数据 */
+    checkout(windturbines) {
+        windturbines.forEach(item => {
+            item.checkTime = (new Date()).getTime()
+            if (!this.checkouts.filter(items => items.windturbineId === item.windturbineId)[0]) {
+                this.checkouts.push(item)
+            }
+        })
+    }
+    removeCheckouts(mk) {
+        let indx = -1;
+        for (let id in this.checkouts) {
+            if (this.checkouts[id].windturbineId == mk.windturbineId) {
+                indx = id;
+                break;
+            }
+        }
+        if (indx < 0) return;
+        this.checkouts.splice(indx, 1);
+    }
+
+    /* 移除标记 */
+    removeMarked(mk) {
+        let indx = -1;
+        for (let id in this.Marks) {
+            if (this.Marks[id].id == mk.id) {
+                indx = id;
+                break;
+            }
+        }
+        if (indx < 0) return;
+        this.Marks.splice(indx, 1);
+    }
+
+    /* 获取风机详情页面数据 */
+    initWinturbineBaseData(info, action) {
+        api.nitWinturbineBaseData({
+            thingType: 'windturbine',
+            thingId: info.windturbineId,
+            uniformCodes: info.codes,
+        }).then(res =>{
+            action(res.data);
+        }).catch(err => {
+            console.log(err);
+        });
+    }
+
+    /* 单例 */
+    static getInstance() {
+        if (!BackgroundData.instance) {
+            BackgroundData.instance = new BackgroundData();
+        }
+        return BackgroundData.instance;
+    }
+}

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -670,8 +670,7 @@
                 api
                     .matrixDetailPush({
                         company: this.enterpriseIndex == "all" ?
-                            "0" :
-                            this.enterpriseIndex.toString(),
+                            "0" : this.enterpriseIndex.toString(),
                         type: this.tabIndex.toString(),
                     })
                     .then((res) => {

src/views/IntegratedAlarm/reliability/partsTemperatureAnalyse/dataJson.json

@@ -0,0 +1,165 @@
+{
+    "code": 200,
+    "data": [
+        {
+            "name": "主轴",
+            "children": [
+                {
+                    "name": "叶轮侧温度",
+                    "keyname": "ylcwd"
+                },
+                {
+                    "name": "齿轮箱侧温度",
+                    "keyname": "clxcwd"
+                }
+            ]
+        },
+        {
+            "name": "发电机",
+            "children": [
+                {
+                    "name": "U1绕组温度",
+                    "keyname": "U1rzwd"
+                },
+                {
+                    "name": "U2绕组温度",
+                    "keyname": "U2rzwd"
+                },
+                {
+                    "name": "V1绕组温度",
+                    "keyname": "V1rzwd"
+                },
+                {
+                    "name": "V2绕组温度",
+                    "keyname": "V2rzwd"
+                },
+                {
+                    "name": "W1绕组温度",
+                    "keyname": "W1rzwd"
+                },
+                {
+                    "name": "W2绕组温度",
+                    "keyname": "W2rzwd"
+                },
+                {
+                    "name": "轴a温度",
+                    "keyname": "zawd"
+                },
+                {
+                    "name": "轴b温度",
+                    "keyname": "zbwd"
+                }
+            ]
+        },
+        {
+            "name": "齿轮箱",
+            "children": [
+                {
+                    "name": "入口油温",
+                    "keyname": "rkyw"
+                },
+                {
+                    "name": "油温",
+                    "keyname": "clxyw"
+                },
+                {
+                    "name": "轴1温度",
+                    "keyname": "clxz1wd"
+                },
+                {
+                    "name": "轴2温度",
+                    "keyname": "clxz1wd"
+                }
+            ]
+        },
+        {
+            "name": "变桨",
+            "children": [
+                {
+                    "name": "电池柜1温度",
+                    "keyname": "dcg1wd"
+                },
+                {
+                    "name": "电池柜2温度",
+                    "keyname": "dcg2wd"
+                },
+                {
+                    "name": "电池柜3温度",
+                    "keyname": "dcg3wd"
+                }
+            ]
+        },
+        {
+            "name": "液压",
+            "children": [
+                {
+                    "name": "压力",
+                    "keyname": "yl"
+                },
+                {
+                    "name": "油温",
+                    "keyname": "yw"
+                }
+            ]
+        },
+        
+        {
+            "name": "其他",
+            "children": [
+                {
+                    "name": "塔底柜温度",
+                    "keyname": "tdgwd"
+                },
+                {
+                    "name": "机舱柜温度",
+                    "keyname": "jcgwd"
+                },
+                {
+                    "name": "机舱温度",
+                    "keyname": "jcwd"
+                },
+                {
+                    "name": "滑环温度",
+                    "keyname": "hhwd"
+                },
+                {
+                    "name": "环境温度",
+                    "keyname": "hjwd"
+                }
+            ]
+        }
+    ],
+    "tableData": [
+        {
+            "code": "HA01-01",
+            "status": 1,
+            "windSpeed": 2.5,
+            "power": 448.0,
+            "rollSpeed": 1478.0,
+            "ylcwd": 35.0,
+            "clxcwd": 36.0,
+            "tdgwd": 36.0,
+            "jcgwd": 36.0,
+            "jcwd": 36.0,
+            "hhwd": 36.0,
+            "hjwd": 36.0,
+            "U1rzwd": 36.0,
+            "U2rzwd": 36.0,
+            "V1rzwd": 36.0,
+            "V2rzwd": 36.0,
+            "W1rzwd": 36.0,
+            "W2rzwd": 36.0,
+            "zawd": 36.0,
+            "zbwd": 36.0,
+            "dcg1wd": 36.0,
+            "dcg2wd": 36.0,
+            "dcg3wd": 36.0,
+            "yl": 36.0,
+            "yw": 36.0,
+            "rkyw": 36.0,
+            "clxyw": 36.0,
+            "clxz1wd": 36.0,
+            "clxz2wd": 36.0
+        }
+    ]
+}

src/views/IntegratedAlarm/reliability/partsTemperatureAnalyse/index2.vue

@@ -0,0 +1,742 @@
+<template>
+    <!-- <el-dialog width="70%" @open="opened" @closed="closed" :fullscreen="true" :show-close="true" class="dialogs"> -->
+    <div class="outputComponents">
+        <div class="leftContent">
+            <span>{{ pageTitle }}</span>
+        </div>
+        <div class="body" @contextmenu="contextmenu">
+            <div class="title">
+                <div :class="current === item.id ? 'title-onItem' : 'title-item'" v-for="(item, index) in stationList"
+                    :key="index" @click="handleChange(item.id)">
+                    {{ item.name }}
+                </div>
+                <div class="select">
+                    <el-checkbox style="margin-right: 20px" :indeterminate="isIndeterminate" v-model="checkAll"
+                        @change="handleCheckChange">全选</el-checkbox>
+                    <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+                        <el-checkbox v-for="item in checkboxs" :label="item" :key="item">{{
+                item
+            }}</el-checkbox>
+                    </el-checkbox-group>
+                </div>
+            </div>
+            <div class="tables">
+                <el-table id="tableId" ref="multipleTable" :data="tableData" class="table" style="width: 100%"
+                    height="94vh" stripe :header-cell-style="{
+            padding: '4px',
+            fontSize: '14px',
+            border: '0.5px solid #000000 !important',
+          }" :cell-style="{
+  height: '40px',
+  padding: '3px',
+  fontSize: '12px',
+  'border-top': '0px solid #000000',
+  'border-bottom': '1px solid #000000',
+  'border-right': '1px solid #000000',
+}" @cell-click="handleCellClick" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="40"> </el-table-column>
+                    <el-table-column prop="code" label="风机" width="90" align="center">
+                    </el-table-column>
+                    <el-table-column label="状态" width="60" align="center">
+                        <template #default="scope">
+                            <span>
+                                {{ windturbineStatus[scope.row?.status]?.name }}
+                            </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="windSpeed" width="50" label="风速" align="center">
+                    </el-table-column>
+                    <el-table-column prop="power" width="60" label="功率" align="center">
+                    </el-table-column>
+                    <el-table-column prop="rollSpeed" width="70" label="发电机转速" align="center">
+                    </el-table-column>
+                    <el-table-column v-for="(item, index) in contentList" :key="index" :label="item.name"
+                        align="center">
+                        <el-table-column v-for="(res, index) in item.children" :key="index" :label="res.name" width="61"
+                            align="center">
+                            <template #default="scope">
+                                <span :id="scope.row.id === tableData.length - 3 ? 'lastTable' : ''" :class="
+                  scope.row[`${res.keyname}Status`] === 'OverLimit'
+                    ? 'overModle'
+                    : scope.row[`${res.keyname}Status`] === 'CrossingLimit'
+                      ? 'crossModle'
+                      : scope.row[`${res.keyname}Status`] === 'BadPoint'
+                        ? 'badModle'
+                        : ''
+                ">
+                                    {{ scope.row[res.keyname] ? scope.row[res.keyname] : '' }}
+                                </span>
+                            </template>
+                        </el-table-column>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </div>
+    </div>
+    <!-- </el-dialog> -->
+</template>
+
+<script>
+    import api from "@/api/economic";
+    import {
+        getStation
+    } from "@/api/performance";
+    import BackgroundData from "@/utills/BackgroundData";
+    import dataJson from "./dataJson";
+    const cityOptions = ["越限", "超限", "坏点"];
+    export default {
+        data() {
+            return {
+                pageTitle: "各出力部件温度分析",
+                windturbineStatus: [{
+                        type: 0,
+                        name: "停机",
+                    },
+                    {
+                        type: 1,
+                        name: "上电",
+                    },
+                    {
+                        type: 2,
+                        name: "待机",
+                    },
+                    {
+                        type: 3,
+                        name: "启动",
+                    },
+                    {
+                        type: 4,
+                        name: "并网",
+                    },
+                    {
+                        type: 5,
+                        name: "故障",
+                    },
+                    {
+                        type: 6,
+                        name: "维护",
+                    },
+                    {
+                        type: 7,
+                        name: "离线",
+                    },
+                ],
+                contentList: [],
+                tableData: [],
+                stationList: [],
+                current: "",
+                intervals: null,
+                multipleSelection: [],
+                chooseList: [],
+                refreshFlag: false,
+                statusList: [{
+                        name: "正常",
+                        lable: "Normal",
+                    },
+                    {
+                        name: "越限",
+                        lable: "CrossingLimit",
+                    },
+                    {
+                        name: "超限",
+                        lable: "OverLimit",
+                    },
+                    {
+                        name: "坏点",
+                        lable: "BadPoint",
+                    },
+                ],
+                checkboxs: cityOptions,
+                checkedCities: ["越限", "超限", "坏点"],
+                checkAll: true,
+                isIndeterminate: true,
+                controlErorCodes: [
+                    "控制成功",
+                    "控制命令发送失败",
+                    "无效的控制地址",
+                    "被控设备异常",
+                    "无效的控制功能",
+                    "网络连接错误,检查场站通信",
+                    "控制结果读取超时",
+                    "未知错误",
+                    "控制命令错误",
+                    "收到无法识别数据",
+                    "未读取到数据包",
+                    "未知错误",
+                    "风机操作过频繁",
+                    "风机被挂牌",
+                    "风机操作与风机状态不符",
+                    "需要登录",
+                ],
+                pagenum: 1,
+            };
+        },
+        mounted() {
+            this.init()
+        },
+        methods: {
+            cheshi() {
+                const lastTable = document.getElementById('lastTable').getClientRects()
+                const tableId = document.getElementById('tableId').getClientRects()
+                if (lastTable[0].top < tableId[0].bottom) {
+                    this.pagenum = this.pagenum + 1
+                    this.getData();
+                }
+            },
+            handleCheckChange(val) {
+                this.tableData = []
+                this.pagenum = 1
+                this.checkedCities = val ? cityOptions : [];
+                this.isIndeterminate = false;
+                this.multipleSelection = [];
+                this.getData();
+            },
+            handleCheckedCitiesChange(value) {
+                let checkedCount = value.length;
+                this.checkAll = checkedCount === this.checkboxs.length;
+                this.isIndeterminate =
+                    checkedCount > 0 && checkedCount < this.checkboxs.length;
+                this.multipleSelection = [];
+                this.tableData = []
+                this.pagenum = 1
+                this.getData();
+            },
+            init() {
+                this.$nextTick(() => {
+                    let tableDom = this.$refs.multipleTable.$refs.bodyWrapper
+                    let time = null
+                    tableDom.addEventListener('scroll', () => {
+
+                        if (time !== null) {
+                            clearTimeout(time);
+                        }
+                        time = setTimeout(() => {
+                            this.cheshi()
+                        }, 100)
+
+                    })
+                });
+                this.getStationFn()
+                // this.getData();
+                // this.intervals = setInterval(this.handleData, 60000);
+            },
+            //获取风场数据
+            getStationFn() {
+                getStation({
+                    companyids: "NX_FGS",
+                    type: -1,
+                }).then(res => {
+                    if (res.data.data.length) {
+                        res.data.data.forEach((item) => {
+                            if (item.id.indexOf("FDC") != -1) {
+                                this.stationList.push(item);
+                            }
+                        });
+                        this.current = this.stationList[0].id;
+                        this.contentList = dataJson.data
+                        this.tableData = new Array(25).fill({
+                            "code": "HA01-01",
+                            "status": 2,
+                            "windSpeed": 2.5,
+                            "power": 448.0,
+                            "rollSpeed": 1478.0,
+                            "ylcwd": 35.0,
+                            "clxcwd": 36.0,
+                            "tdgwd": 36.0,
+                            "jcgwd": 38.0,
+                            "jcwd": 36.0,
+                            "hhwd": 36.0,
+                            "hjwd": 36.0,
+                            "U1rzwd": 36.0,
+                            "U2rzwd": 50.0,
+                            "V1rzwd": 36.0,
+                            "V2rzwd": 69.0,
+                            "W1rzwd": 36.0,
+                            "W2rzwd": 36.0,
+                            "zawd": 36.0,
+                            "zbwd": 58.0,
+                            "dcg1wd": 36.0,
+                            "dcg2wd": 39.0,
+                            "dcg3wd": 36.0,
+                            "yl": 28.0,
+                            "yw": 96.0,
+                            "rkyw": 36.0,
+                            "clxyw": 78.0,
+                            "clxz1wd": 36.0,
+                            "clxz2wd": 34.0
+                        })
+                    }
+                });
+            },
+            closed() {
+                clearInterval(this.intervals);
+                this.intervals = null;
+            },
+            handleChange(val) {
+                this.current = val;
+                this.tableData = []
+                this.pagenum = 1
+                this.getData();
+            },
+            handleCellClick(val) {
+                this.$refs.multipleTable.toggleRowSelection(val);
+            },
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+            handleData() {
+                this.tableData = []
+                this.pagenum = 1
+                this.getData()
+            },
+            getData() {
+                let selectStatus = "";
+                let statusArr = [];
+                if (this.checkedCities.length < 3) {
+                    this.checkedCities.forEach((item) => {
+                        let status = this.statusList.filter((val) => val.name === item)[0];
+                        if (status.lable) {
+                            statusArr.push(status.lable);
+                        }
+                    });
+                }
+                selectStatus = statusArr.join(",");
+                api
+                    .temperatureInfo({
+                        id: this.current === 'all' ? '' : this.stationList.filter(item => item.id === this.current)[
+                            0].id,
+                        status: selectStatus,
+                        pagenum: this.pagenum,
+                        pagesize: 30,
+                    })
+                    .then((res) => {
+                        if (res.data.length) {
+                            let contentList = [];
+                            let tableDatas = [];
+                            res.data.forEach((item, index) => {
+                                let tableData = {};
+                                tableData.code = item.code;
+                                tableData.windSpeed = item.windSpeed.toFixed(1);
+                                tableData.status = Number(item.status)
+                                tableData.stationId = item.stationId;
+                                tableData.rollSpeed = item.rollSpeed.toFixed(1);
+                                tableData.power = item.power.toFixed(1);
+                                item.temperatureComponentInfos.forEach((val) => {
+                                    if (index === 0) {
+                                        let obj = {
+                                            children: [],
+                                        };
+                                        obj.name = val.name;
+                                        val.temperatureItemInfos.forEach((temp) => {
+                                            if (index === 0) {
+                                                let str = {};
+                                                str.name = temp.name;
+                                                str.keyname = `${val.name}${temp.name}`;
+                                                obj.children.push(str);
+                                            }
+                                            tableData[`${val.name}${temp.name}`] = temp
+                                                .value.toFixed(1);
+                                            tableData[`${val.name}${temp.name}Status`] =
+                                                temp.status;
+                                        });
+                                        contentList.push(obj);
+                                    } else {
+                                        val.temperatureItemInfos.forEach((temp) => {
+                                            tableData[`${val.name}${temp.name}`] = temp
+                                                .value.toFixed(1);
+                                            tableData[`${val.name}${temp.name}Status`] =
+                                                temp.status;
+                                        });
+                                    }
+                                });
+                                tableDatas.push(tableData);
+                            });
+                            this.contentList = contentList;
+                            let arr = [];
+                            this.contentList.forEach((item) => {
+                                item.children.forEach((val) => {
+                                    arr.push(val.name);
+                                });
+                            });
+                            if (tableDatas.length) {
+                                this.tableData = [...this.tableData, ...tableDatas];
+
+                                this.tableData.forEach((item, index) => {
+                                    item.id = index
+                                })
+                            }
+
+                            this.multipleSelection.forEach((item) => {
+                                if (item) {
+                                    let tables = this.tableData.filter(
+                                        (val) => val.code === item.code
+                                    )[0];
+                                    this.$nextTick(() => {
+                                        this.$refs.multipleTable.toggleRowSelection(tables, true);
+                                    });
+                                }
+                            });
+                        }
+
+                    });
+            },
+
+            /* 右键菜单 */
+            contextmenu() {
+                // const remote = require("electron").remote;
+                let that = this;
+                let menuTemplate = [];
+                menuTemplate = [{
+                        label: "启动",
+                        click() {
+                            that.sendCommand({
+                                controlType: "1",
+                                deviceType: "Manual"
+                            });
+                        },
+                    },
+                    {
+                        label: "停机",
+                        click() {
+                            that.sendCommand({
+                                controlType: "2",
+                                deviceType: "Manual"
+                            });
+                        },
+                    },
+                    {
+                        label: "复位",
+                        click() {
+                            that.sendCommand({
+                                controlType: "5",
+                                deviceType: "Manual"
+                            });
+                        },
+                    },
+                    {
+                        label: "维护",
+                        click() {
+                            that.sendCommand({
+                                controlType: "6",
+                                deviceType: "Manual"
+                            });
+                        },
+                    },
+                    {
+                        label: "取消维护",
+                        click() {
+                            that.sendCommand({
+                                controlType: "8",
+                                deviceType: "Manual"
+                            });
+                        },
+                    },
+                    {
+                        label: "挂牌",
+                        submenu: [{
+                                label: "检修",
+                                click() {
+                                    that.sendLock({
+                                        value: "CheckLock"
+                                    });
+                                },
+                            },
+                            {
+                                label: "故障维修",
+                                click() {
+                                    that.sendLock({
+                                        value: "FaultLock"
+                                    });
+                                },
+                            },
+                            {
+                                label: "场内受累检修",
+                                click() {
+                                    that.sendLock({
+                                        value: "StationCheckLock"
+                                    });
+                                },
+                            },
+                            {
+                                label: "场内受累故障",
+                                click() {
+                                    that.sendLock({
+                                        value: "StationFaulLock"
+                                    });
+                                },
+                            },
+                            {
+                                label: "场外受累电网",
+                                click() {
+                                    that.sendLock({
+                                        value: "StationPowerLineLock"
+                                    });
+                                },
+                            },
+                            {
+                                label: "场外受累天气",
+                                click() {
+                                    that.sendLock({
+                                        value: "StationWeatherLock"
+                                    });
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        label: "取消挂牌",
+                        click() {
+                            that.sendLock({
+                                value: "UnLock"
+                            });
+                        },
+                    },
+                ];
+                // const menu = remote.Menu.buildFromTemplate(menuTemplate);
+
+                // menu.popup(remote.getCurrentWindow());
+            },
+
+            sendCommand(msg) {
+                let sendList = [];
+                let bd = BackgroundData.getInstance();
+                if (!bd.LoginUser) {
+                    this.$notify({
+                        title: "请登录",
+                        message: "控制风机需要先登录！",
+                        type: "warning",
+                        position: "bottom-right",
+                        offset: 60,
+                        duration: 3000,
+                    });
+                    return;
+                }
+                this.multipleSelection.forEach((item) => {
+                    sendList.push(
+                        this.$store.state.windturbinelist[item.code.replace("-", "_")]
+                    );
+                });
+
+                if (sendList.length > 0) {
+                    let pairs = {};
+                    sendList.forEach((item) => {
+                        let ct = {
+                            windturbineId: item.windturbineId,
+                            stationId: item.stationId,
+                            projectId: item.projectId,
+                            modelId: item.modelId,
+                            controlType: Number(msg.controlType),
+                            lockType: item.lockType,
+                            userName: `system_${bd.LoginUser.name}`,
+                            userId: 0,
+                            auto: false,
+                            deviceType: msg.deviceType,
+                        };
+                        pairs[ct.windturbineId] = ct;
+                    });
+                    api.windturbControl(pairs).then((res) => {
+                        if (res) {
+                            this.controlSuccess(res);
+                        }
+                    });
+                }
+            },
+            sendLock(msg) {
+                let bd = BackgroundData.getInstance();
+                if (!bd.LoginUser) {
+                    this.$notify({
+                        title: "请登录",
+                        message: "控制风机需要先登录！",
+                        type: "warning",
+                        position: "bottom-right",
+                        offset: 60,
+                        duration: 3000,
+                    });
+                    return;
+                }
+                let sendList = [];
+                this.multipleSelection.forEach((item) => {
+                    sendList.push(
+                        this.$store.state.windturbinelist[item.code.replace("-", "_")]
+                    );
+                });
+                if (sendList.length > 0) {
+                    let pairs = {};
+                    sendList.forEach((item) => {
+                        let ct = {
+                            windturbineId: item.windturbineId,
+                            stationId: item.stationId,
+                            projectId: item.projectId,
+                            modelId: item.modelId,
+                            lockType: msg.value,
+                            userName: `system_${bd.LoginUser.name}`,
+                            userId: 0,
+                        };
+                        pairs[ct.windturbineId] = ct;
+                    });
+                    api.windturbControlLock(pairs).then((res) => {
+                        if (res) {
+                            this.controlSuccess(res);
+                        }
+                    });
+                }
+            },
+
+            /* 控制成功 */
+            controlSuccess(msg) {
+                let bd = BackgroundData.getInstance();
+                for (let id in msg.data) {
+                    let val = msg.data[id];
+                    if (val.errorCode !== "0") {
+                        bd.removeCheckouts(val);
+                    }
+                }
+                let mss = ""; // 信息
+                let iserror = false; // 是否有控制错误的风机
+                for (let v in msg.data) {
+                    let val = msg.data[v];
+                    if (val.errorCode > 0) {
+                        iserror = true;
+                        mss += `${val.windturbineId}  ${this.controlErorCodes[val.errorCode]
+            }\n`;
+                    }
+                }
+                let tp = iserror ? "warning" : "success";
+                // if (!iserror) {
+                //   mss = "控制成功";
+                // }
+
+                this.$notify({
+                    title: "控制",
+                    message: mss,
+                    type: tp,
+                    position: "bottom-right",
+                    offset: 60,
+                    duration: 3000,
+                });
+            },
+
+            /* 控制失败 */
+            controlError(err) {
+                this.$notify({
+                    title: "控制出现错误",
+                    message: err.message,
+                    type: "warning",
+                    position: "bottom-right",
+                    offset: 60,
+                    duration: 3000,
+                });
+            },
+        },
+    };
+</script>
+<style lang="less">
+    .outputComponents {
+        width: 100%;
+        // padding: 0 20px 0 20px;
+
+        .leftContent {
+            width: 242px;
+            height: 41px;
+            display: flex;
+            align-items: center;
+            background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
+
+            span {
+                font-size: 16px;
+                font-family: Microsoft YaHei;
+                font-weight: 400;
+                color: #05bb4c;
+                margin-left: 25px;
+            }
+        }
+
+        .title {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            padding-top: 8px;
+            position: absolute;
+            width: 100%;
+            background-color: #000000;
+            padding-bottom: 10px;
+
+            .title-item {
+                background-color: #242424;
+                border-radius: 4px;
+                padding: 8px 27px 7px 25px;
+                font-size: 14px;
+                color: #b4bdc0;
+                margin-right: 10px;
+            }
+
+            .title-onItem {
+                background-color: rgba(37, 116, 219, 1);
+                border-radius: 4px;
+                padding: 8px 27px 7px 25px;
+                font-size: 14px;
+                color: #b4bdc0;
+                margin-right: 10px;
+            }
+        }
+
+        .tables {
+            padding-top: 50px;
+        }
+
+        .el-table {
+            position: static;
+            background-color: #141414;
+            border: 1px solid #000000;
+        }
+
+        .select {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-left: 30px;
+
+            .date {
+                margin-right: 10px;
+                font-size: 16px;
+                color: #ffffff;
+            }
+        }
+
+        .overModle {
+            background-color: rgba(186, 50, 55, 1);
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .crossModle {
+            background-color: #e0861a;
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .badModle {
+            background-color: #999999;
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+</style>

src/views/economicsOperation/benchmarkingManagement/loseRate/index.vue

@@ -433,7 +433,11 @@ export default {
       }).then(({ data: res }) => {
         if (res.data.length) {
           this.stationList = res.data;
-          this.getProject(res.data[0].id);
+          this.stationObj = res.data.map(e => {
+            return e.id
+          })
+          let stationObj = this.stationObj.join()
+          this.getProject(stationObj);
         }
       });
     },
@@ -443,7 +447,11 @@ export default {
       }).then(({ data: res }) => {
         if (res.data.length) {
           this.projectList = res.data;
-          this.getLine(res.data[0].id);
+          this.projectObj = res.data.map(e => {
+            return e.id
+          })
+          let projectObj = this.projectObj.join()
+          this.getLine(projectObj);
         } else {
           this.projectList = [];
           this.getLine("");
@@ -456,6 +464,9 @@ export default {
       }).then(({ data: res }) => {
         if (res.data.length) {
           this.lineList = res.data;
+          this.lineObj = res.data.map(e => {
+            return e.id
+          })
           this.gerWxssl();
         } else {
           this.lineList = [];

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -119,9 +119,10 @@
         <!-- <el-button round size="mini" class="buttons">导出</el-button> -->
       </div>
     </div>
-    <div class="tabCut1">
+    <div class="tabCut1" >
       <div
         class="tabCut-item"
+         v-show="!stationObj"
         @click="typeClick(val.id)"
         :class="typeIndex == val.id ? 'active' : ''"
         v-for="val in typeOptions"
@@ -383,7 +384,8 @@ export default {
       }).then(({ data: res }) => {
         if (res.data.length) {
           this.stationList = res.data;
-          this.getProject(res.data[0].id);
+          this.stationObj = res.data[0].id
+          this.getProject(this.stationObj);
         } else {
           (this.stationObj = ""),
             (this.stationList = []),
@@ -736,6 +738,7 @@ export default {
   flex-direction: row;
   align-items: center;
   margin: 10px 0px 0px 20px;
+  height: 20px;
 
   .tabCut-item {
     width: 93px;

src/views/economicsOperation/nxfHomePage/component/percent-card-2.vue

@@ -11,11 +11,12 @@
             </div>
             <div class="card-value">
                 <span class="value-text newBlue">{{ ActualText }}</span>
-                <span class="newwhite">{{ ActualValue * 10 }}</span>
+                <!-- <span class="newwhite">{{ ActualValue * 10 }}</span> -->
+                <span class="newwhite">{{ ActualValue }}</span>
             </div>
             <div class="card-value">
                 <span class="value-text newBlue">{{ PercentText }}</span>
-                <span class="newwhite">{{ PercentValue }}</span>
+                <span class="newwhite">{{ PercentValue ? PercentValue.toFixed(2) : 0 }}</span>
             </div>
         </div>
     </div>

src/views/economicsOperation/nxfHomePage/index.vue

@@ -80,6 +80,11 @@
 </template>
 
 <script>
+    import {
+        generatingcapacity,
+        homeright,
+        homemiddle
+    } from "@/api/economicIndex";
     import Row from "@com/coms/grid/row.vue";
     import Col from "@com/coms/grid/col.vue";
     import ComPanel from "@com/coms/panel/panel";
@@ -118,20 +123,8 @@
                     id: "week",
                     text: "周",
                 }, ],
-                rightTableData: [{
-                        name: '风能利用率年排名',
-                        data: dataJson.data.fnlyl
-                    },
-                    {
-                        name: '设备可利用率年排名',
-                        data: dataJson.data.sbklyl
-                    },
-                    {
-                        name: '两个细则考核',
-                        data: dataJson.data.lgxzkh
-                    },
-                ],
-                ForecastPower: dataJson.data.fdl,
+                rightTableData: [],
+                ForecastPower: [],
                 fnlyl: dataJson.data.fnlyl,
                 zbtqdb: dataJson.data.zbtqdb,
                 sbklyl: {},
@@ -173,11 +166,59 @@
                 Powersend: dataJson.data.Powersend,
             }
         },
-        mounted() {},
+        mounted() {
+            this.getGeneratingcapacity()
+        },
         methods: {
             selectTab(index, item) {
                 this.activeIndex = index;
             },
+            //获取发电量和主要经济指标同期对比
+            getGeneratingcapacity() {
+                let that = this
+                generatingcapacity().then(res => {
+                    if (res.data) {
+                        if (res.data.fdl?.length>0) {
+                            res.data.fdl.forEach(it => {
+                                dataJson.data.fdl.forEach(iv =>{
+                                    if (it.name === iv.name) {
+                                        iv.bfb = it.bfb === 0 ? 1 : it.bfb
+                                        iv.total = it.total === 0 ? 1 : it.total
+                                        iv.value = it.value === 0 ? 0 : it.value
+                                    }
+                                })
+                            })
+                            that.ForecastPower = dataJson.data.fdl
+                        }
+                        that.zbtqdb = res.data.zbtqdb
+                    }
+                })
+                homeright().then(res =>{
+                    if (res.data) {
+                        that.rightTableData = [{
+                                name: '风能利用率年排名',
+                                data: res.data.fnlyl
+                            },
+                            {
+                                name: '设备可利用率年排名',
+                                data: res.data.sbklyl
+                            },
+                            {
+                                name: '两个细则考核',
+                                data: res.data.lgxzkh
+                            },
+                        ]
+                    }
+                })
+                homemiddle().then(res =>{
+                    if (res.data) {
+                        that.planData = res.data.planData
+                        that.Powertrend = res.data.Powertrend
+                        that.Powersend = res.data.Powersend
+                        that.Powerloss = res.data.Powerloss
+                    }
+                })
+            },
         }
     };
 </script>

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

@@ -4,7 +4,7 @@
     </div>
 </template>
 <script>
-    // import httpRequest from "@/utils/request.js";
+    import httpRequest from "@/tools/request.js";
     import {
         CanvasLabel
     } from "@panzhiyue/leaflet-canvaslabel";
@@ -33,11 +33,14 @@
                 rightObj: {},
                 areaLayer: null,
                 tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.jpg",
-                ciLayer: null,
+                canvasLabel: null,
+                markers: null
             };
         },
         watch: {
             ids(val) {
+                this.layers = [];
+
                 this.funStationPos(val);
                 // this.funStationPosLabel(val)
             },
@@ -48,17 +51,17 @@
         methods: {
             initMap() {
                 //矢量文本标签渲染器
-                let canvasLabel = new L.CanvasLabel({
+                this.canvasLabel = new L.CanvasLabel({
                     collisionFlg: true,
                     scale: 2,
                 });
                 this.map = L.map("map", {
-                    renderer: canvasLabel,
+                    renderer: this.canvasLabel,
                     // center: [40.02404009136253, 116.50641060224784], // 地图中心--北京
                     // center: [38.44673272215545, 106.27624511718751], // 地图中心--银川
                     // center: [108.953939, 34.266611], // 地图中心--陕西
                     // center: [109.470962, 34.520632], // 地图中心--渭南
-                    zoom: 16, //缩放比列
+                    zoom: 12, //缩放比列
                     zoomControl: false, //禁用 + - 按钮
                     doubleClickZoom: true, // 禁用双击放大
                     attributionControl: false, // 移除右下角leaflet标识
@@ -91,6 +94,8 @@
                         },
                     ],
                 });
+
+
                 let name = L.tileLayer(
                     "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}",
                 ).addTo(this.map)
@@ -107,88 +112,76 @@
 
             async funStationPos(ids) {
                 let res = null;
-                // if (ids.length > 0) {
-                //     res = await httpRequest.get("/base/location", {
-                //         params: {
-                //             ids: this.ids.join(","),
-                //         },
-                //     });
-                // } else {
-                //     res = await httpRequest.get("/base/station", {
-                //         params: {},
-                //     });
-                // }
+                let tabStr = ""
+
+                // 移除所有 Marker
+                if (this.markers) {
+                    this.markers.clearLayers();
+                }
+                if (ids.length > 0) {
+                    tabStr = "winds"
+                    res = await httpRequest.get("/base/windturbine", {
+                        params: {
+                            wpids: this.ids.join(","),
+                        },
+                    });
+                } else {
+                    tabStr = "station"
+                    let datas = await httpRequest.get("/benchmarking/wpByCplist?companyids=NX_FGS&type=-1");
+                    res = datas.data
+                }
                 if (res.code === 200) {
-                    if (res.data && res.data.length) {
-                        this.layers = [];
-                        if (this.ciLayer !== null) {
-                            this.ciLayer.clearLayers();
-                            this.ciLayer = L.canvasIconLayer({}).addTo(this.map);
-                        } else {
-                            this.ciLayer = L.canvasIconLayer({}).addTo(this.map);
-                        }
+                    let resdatas = null
+                    resdatas = tabStr === "station" ? res.data : res.data.data
+                    if (resdatas && resdatas.length) {
+                        // 创建一个 LayerGroup 来管理所有的 Marker
+                        this.markers = L.layerGroup().addTo(this.map);
 
                         let iconUrl = require(`@/assets/images/indexCom/fengji.png`);
 
-                        for (let i = 0; i < res.data.length; i++) {
-                            let item = res.data[i];
+                        for (let i = 0; i < resdatas.length; i++) {
+                            let item = resdatas[i];
 
-                            let marker = L.marker(
-                                    [Number(item.latitude), Number(item.longitude)], {
-                                        // title: item.name,
-                                        icon: L.divIcon({
-                                            // html: `<div style="position:relative;top:40px;left:5px">${item.aname}</div>`,
-                                            className: "iconSty",
-                                            iconUrl: iconUrl,
-                                            iconSize: [30, 39],
-                                            iconAnchor: [15, 12.5],
-                                        }),
-                                        data: item,
-                                    }
-                                )
+                            let latlng = L.latLng(
+                                Number(item.latitude),
+                                Number(item.longitude)
+                            );
+
+                            let marker = L.marker(latlng, {
+                                    // title: item.name,
+                                    icon: L.divIcon({
+                                        html: `<div class="custom-icon"><img src="${iconUrl}" alt="Icon"/><span style="color:#000;margin-left:10px">${item.aname}</span></div>`,
+                                        className: "iconSty",
+                                        iconSize: [30, 39],
+                                        iconAnchor: [15, 12.5],
+                                    }),
+                                    // data: item,
+                                })
                                 .bindTooltip(
                                     `
                                 <div class="tip-box-top">
-                                    <div class="item">${item.aname}</div>
+                                    <div class="item">${item.aname}风机</div>
                                     <div class="item">经度：${item.latitude}°</div>
                                     <div class="item">纬度：${item.longitude}°</div>
-                                    <div class="item">海拔高度:${item.altitude}m</div>
+                                    <div class="item">海拔高度:${item.spare3}m</div>
                                 </div>`
                                 )
                                 .addTo(this.map);
-
-                            let latlng = L.latLng(
-                                Number(item.latitude),
-                                Number(item.longitude)
-                            );
-                            let c = L.circleMarker(latlng, {
-                                radius: 5,
-                                color: "transparent",
-                                labelStyle: {
-                                    text: item.aname,
-                                    scale: 1,
-                                    rotation: 0,
-                                    offsetY: 35,
-                                    fillStyle: "#000",
-                                    zIndex: i,
-                                },
-                                data: item,
-                            }).addTo(this.map);
-                            this.layers.push(c);
-
-                            this.ciLayer.addLayer(marker);
                             this.layers.push(marker);
+                            // 添加 Marker 到 LayerGroup
+                            this.markers.addLayer(marker);
 
                             let that = this;
                             marker.on("mouseover", function onmouseover(e) {
                                 that.rightObj = item;
                             });
                         }
+
                         let center = this.map.getCenter();
                         this.map.panTo([center.lat, center.lng], {
                             animate: true,
                         });
-                        this.map.setView(this.layers[0].getLatLng(), 13);
+                        this.map.setView(this.layers[0].getLatLng(), 14);
                     }
                 }
             },
@@ -494,7 +487,27 @@
 
     #map {
         width: 100%;
-        height: 100%;
+        height: 100vh;
+    }
+
+    .custom-icon {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: white;
+        border: 1px solid #ccc;
+        padding: 5px;
+        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+    }
+
+    .custom-icon img {
+        width: 32px;
+        height: 32px;
+        margin-right: 5px;
+    }
+
+    .custom-icon span {
+        font-size: 14px;
     }
 
     .lmap-image {

src/views/economicsOperation/stationAnalyse/posAnalysis/index.vue

@@ -1,32 +1,71 @@
 <template>
     <div class="dataAnalysisPosAnal" :class="!theme ? 'themeDark' : 'themeLight'">
         <div class="dataAnalysisPosAnalMain">
-            <!-- <div class="main_top">
-                <p class="topPsty">微观选址分析</p>
+            <div class="station">
+                场站：
+                <el-select size="mini" v-model="state.stationObj" multiple collapse-tags placeholder="请选择"
+                    @change="handleStationChange(state.stationObj)" clearable>
+                    <el-option v-for="item in stationList" :key="item.id" :label="item.aname" :value="item.id">
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="station">
+                风机：
+                <el-select v-model="state.windSObj" clearable @clear="checkAllWind = false" collapse-tags multiple>
+                    <el-option label="全选" :class="{ selected: checkAllWind }" @click="funCheckwindsAll"></el-option>
+                    <el-option v-for="item in windSList" :key="item.id" :label="item.aname" :value="item.id">
+                    </el-option>
+                </el-select>
+            </div>
+            <!-- <div class="station">
+        线路：
+        <el-select
+          size="mini"
+          :disabled="displayDetail"
+          v-model="lineObj"
+          multiple
+          collapse-tags
+          placeholder="请选择"
+          clearable
+        >
+          <el-option
+            v-for="item in lineList"
+            :key="item.id"
+            :label="item.aname"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </div> -->
+            <div class="but">
+                <el-button round size="mini" class="buttons" @click="gerWxssl">搜 索</el-button>
+            </div>
+        </div>
+        <div class="main">
+            <div class="leftContent">
+                <span>{{ selectValue }}</span>
+            </div>
+            <!-- <div class="treeDataMain">
+                <tree-cop ref="treeCopRef" :data="treeData" @checkChange="funTreeCheckChange" :show-checkbox="true"
+                    :height="treeHeight" @currentChange="funCurrentChange" @refresh="funGetTree"></tree-cop>
+            </div>
+            <div class="excelDataMain">
+                <excel-cop :checkIds="excelCheckIds" :showCheckbox="excelCheckboxShow" :data="excelList"
+                    :theme="theme" :height="excelHeight" @excelChange="funExcelChange"
+                    @checkChange="funExcelCheckChange">
+                </excel-cop>
             </div> -->
-            <div class="main">
-                <div class="treeDataMain">
-                    <tree-cop ref="treeCopRef" :data="treeData" @checkChange="funTreeCheckChange" :show-checkbox="true"
-                        :height="treeHeight" @currentChange="funCurrentChange" @refresh="funGetTree"></tree-cop>
-                </div>
-                <div class="excelDataMain">
-                    <excel-cop :checkIds="excelCheckIds" :showCheckbox="excelCheckboxShow" :data="excelList"
-                        :theme="theme" :height="excelHeight" @excelChange="funExcelChange"
-                        @checkChange="funExcelCheckChange">
-                    </excel-cop>
-                </div>
-                <div class="tableDataMain">
-                    <div class="shadow rounded-[6px] shadow-blue-500 overflow-hidden">
-                        <div :style="{
-                height:
-                  typeof tableHeight === 'string'
-                    ? tableHeight
-                    : tableHeight + 'px',
-                overflow: 'hidden',
-              }">
-                            <leafletMap :windList="windList" :ids="excelCheckIds" @mapDone="funMapDone"
-                                @rightClick="funRightClick" />
-                        </div>
+            <div class="tableDataMain">
+                <div class="shadow rounded-[6px] shadow-blue-500 overflow-hidden">
+                    <div :style="{
+            height:
+                typeof tableHeight === 'string'
+                ? tableHeight
+                : tableHeight + 'px',
+            overflow: 'hidden',
+            }">
+                        <leafletMap :windList="windList" :ids="state.windSObj" @mapDone="funMapDone"
+                            @rightClick="funRightClick" />
                     </div>
                 </div>
             </div>
@@ -227,6 +266,7 @@
     } from "element-plus";
     import tools from "@tools/htmlToPdf.js";
     import leafletMap from "./components/leafletMap.vue";
+
     /**combine */
     // import combineChart from "./components/combineCom/current-scatter-chart.vue";
     /**rateAnalysis */
@@ -235,20 +275,21 @@
     // import chartCop from "./components/rateCom/chart.vue";
     // import lineChartCop from "./components/rateCom/lineChart.vue";
     // import scatterSingleChartCop from "./components/rateCom/scatterSingleChart.vue";
-    // import httpRequest from "@/utils/request.js";
+    import httpRequest from "@/tools/request.js";
 
     import jsonData from "./components/data.json";
     const router = useRouter();
     /**配置参数 */
     const treeHeight = ref(window.innerHeight - 0 + "px"); //tree高度
     const excelHeight = ref(window.innerHeight - 0 + "px"); //excel高度
-    const tableHeight = ref(window.innerHeight - 0 + "px");
+    const tableHeight = ref(window.innerHeight - 40 + "px");
     /**excel 开始 */
     const excelCheckboxShow = ref(false);
     const excelCheckIds = ref([]);
     const excelList = ref([]);
     const store = useStore();
 
+
     const showOnlineMap = ref(false);
 
     watch(
@@ -265,6 +306,50 @@
         }
     );
 
+    const state = reactive({
+        stationObj: [],
+        windSObj: []
+    })
+
+    const stationList = ref([])
+    const windSList = ref([])
+    const windsIdList = ref([])
+
+    const gerWxssl = () => {
+        windsIdList.value = state.windSObj
+    }
+    const getStation = async () => {
+        await httpRequest.get("/benchmarking/wpByCplist?companyids=NX_FGS&type=-1").then(res => {
+            if (res.data.data.length) {
+                stationList.value = res.data.data;
+                state.stationObj = res.data.data.map(e => {
+                    return e.id
+                })
+                let stationObj = state.stationObj.join()
+                getWinds(stationObj);
+            }
+        });
+    }
+    const handleStationChange = (val) => {
+        getWinds(val);
+    }
+    const getWinds = async (wpids) => {
+        httpRequest.get("/pro-basic-equipment/equipmentsByWpid2", {
+            wpid: wpids,
+        }).then(res => {
+            if (res.data.data.length) {
+                windSList.value = res.data.data;
+                state.windSObj = res.data.data.map(e => {
+                    return e.id
+                })
+                // let windsObj = state.windSObj.join()
+                // this.getLine(windsObj);
+            } else {
+                this.windSList = [];
+            }
+        });
+    }
+
     const funExcelChange = async (obj) => {
         //点击excel项时
         return false;
@@ -1314,9 +1399,18 @@
     // 作为actCopList的备份 在actCopList赋值多个时 同时赋值, 在dialog弹出时清空. 作用: 在actCopList变化时, 重新赋值原始数据
     const actCopListBak = ref([]);
     const checkAll = ref(true);
+    const checkAllWind = ref(true);
     const queryForm = reactive({
         checkIds: [],
     });
+    const funCheckwindsAll = () => {
+        checkAllWind.value = !checkAllWind.value;
+        if (checkAllWind.value) {
+            state.windSObj = windSList.value.map((o) => o.processId);
+        } else {
+            state.windSObj = [];
+        }
+    };
     const funCheckAll = () => {
         checkAll.value = !checkAll.value;
         if (checkAll.value) {
@@ -1624,7 +1718,8 @@
         (newVal, oldVal) => {
             theme.value = newVal;
             echartsTheme.value = !newVal ? "dark" : "";
-            funGetTree();
+            // funGetTree();
+            getStation()
         }, {
             deep: true,
         }
@@ -1686,16 +1781,17 @@
     /**mounted */
     onMounted(() => {
 
-        initPageData();
+        // initPageData();
         // funGetTree();
+        getStation()
 
         theme.value = store.state.theme;
         echartsTheme.value = !theme.value ? "dark" : "";
-        tableHeight.value = window.innerHeight - 0 + "px";
+        tableHeight.value = window.innerHeight - 40 + "px";
         excelHeight.value = window.innerHeight - 0 + "px";
         treeHeight.value = window.innerHeight - 0 + "px";
         window.addEventListener("resize", () => {
-            tableHeight.value = window.innerHeight - 0 + "px";
+            tableHeight.value = window.innerHeight - 40 + "px";
             excelHeight.value = window.innerHeight - 0 + "px";
             treeHeight.value = window.innerHeight - 0 + "px";
         });
@@ -1713,7 +1809,46 @@
         height: 100%;
 
         .dataAnalysisPosAnalMain {
-            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-top: 10px;
+            margin-bottom: 10px;
+
+            .station {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                white-space: nowrap;
+                font-size: 14px;
+                font-family: Microsoft YaHei;
+                font-weight: 400;
+                color: #b3b3b3;
+                margin-right: 10px;
+            }
+
+            .search-input {
+                margin-left: 10px;
+            }
+
+            .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;
+                }
+            }
 
             .main_top {
                 height: 40px;
@@ -1731,47 +1866,48 @@
                 }
             }
 
-            .main {
-                display: flex;
-                width: 100%;
+        }
 
-                .treeDataMain,
-                .excelDataMain,
-                .tableDataMain {
-                    border-radius: 10px;
-                }
+        .main {
+            display: flex;
+            width: 100%;
 
-                .treeDataMain {
-                    margin-right: 10px;
-                    padding: 10px 0 10px 10px;
-                    width: calc(19% - 20px);
-                }
+            .treeDataMain,
+            .excelDataMain,
+            .tableDataMain {
+                border-radius: 10px;
+            }
 
-                .excelDataMain {
-                    margin-right: 10px;
-                    padding: 10px 0 10px 10px;
-                    width: calc(15% - 20px);
+            .treeDataMain {
+                margin-right: 10px;
+                padding: 10px 0 10px 10px;
+                width: calc(19% - 20px);
+            }
 
-                    .excelDataMain_top {
-                        height: 49%;
-                        padding: 5px 0;
-                    }
+            .excelDataMain {
+                margin-right: 10px;
+                padding: 10px 0 10px 10px;
+                width: calc(15% - 20px);
 
-                    .excelDataMain_bot {
-                        padding: 5px 0;
-                    }
+                .excelDataMain_top {
+                    height: 49%;
+                    padding: 5px 0;
                 }
 
-                .tableDataMain {
-                    padding: 10px;
-                    width: calc(66% - 20px);
-                    position: relative;
+                .excelDataMain_bot {
+                    padding: 5px 0;
+                }
+            }
 
-                    .butten_com {
-                        position: absolute;
-                        right: 20px;
-                        z-index: 111111;
-                    }
+            .tableDataMain {
+                padding: 10px;
+                width: calc(100% - 20px);
+                position: relative;
+
+                .butten_com {
+                    position: absolute;
+                    right: 20px;
+                    z-index: 111111;
                 }
             }
         }
@@ -1792,21 +1928,22 @@
                 }
             }
 
-            .main {
-                background: #13171e;
+        }
 
-                .treeDataMain {
-                    background: transparent;
-                }
+        .main {
+            background: #13171e;
 
-                .excelDataMain {
-                    background: #313233;
-                }
+            .treeDataMain {
+                background: transparent;
+            }
 
-                .tableDataMain {
-                    margin-top: 5px;
-                    background: #212223;
-                }
+            .excelDataMain {
+                background: #313233;
+            }
+
+            .tableDataMain {
+                margin-top: 5px;
+                background: #212223;
             }
         }
     }
@@ -1822,21 +1959,22 @@
                 }
             }
 
-            .main {
-                background: #e6e8f2;
+        }
 
-                .treeDataMain {
-                    background: transparent;
-                }
+        .main {
+            background: #e6e8f2;
 
-                .excelDataMain {
-                    background: #f4f6fb;
-                }
+            .treeDataMain {
+                background: transparent;
+            }
 
-                .tableDataMain {
-                    background: #fff;
-                    margin-top: 5px;
-                }
+            .excelDataMain {
+                background: #f4f6fb;
+            }
+
+            .tableDataMain {
+                background: #fff;
+                margin-top: 5px;
             }
         }
     }

src/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/wind.vue

@@ -1,190 +1,194 @@
 <template>
-  <div class="wind-body">
-    <div class="table-wrapper">
-      <el-table :data="tableData" size="mini" stripe width="100%" height="100%">
-        <el-table-column
-          v-for="(item, index) in tableHead"
-          :label="item.label"
-          :prop="item.prop"
-          :key="index"
-          header-align="center"
-          :align="index == 0 ? 'center' : 'right'"
-          show-overflow-tooltip
-        >
-          <template #default="{ row }">
-            <span
-              style="cursor: pointer"
-              v-if="item.prop == 'name'"
-              @click.stop="rowClick(row, false)"
-              >{{ row[item.prop] }}
-            </span>
-            <span v-else>{{ row[item.prop] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
+    <div class="wind-body">
+        <div class="table-wrapper">
+            <el-table :data="tableData" size="mini" stripe width="100%" height="100%">
+                <el-table-column v-for="(item, index) in tableHead" :label="item.label" :prop="item.prop" :key="index"
+                    header-align="center" :align="index == 0 ? 'center' : 'right'" show-overflow-tooltip>
+                    <template #default="{ row }">
+                        <span style="cursor: pointer" v-if="item.prop == 'name'"
+                            @click.stop="rowClick(row, false)">{{ row[item.prop] }}
+                        </span>
+                        <span v-else>{{ row[item.prop] }}</span>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class="chart-wrapper" v-loading="chartLoading" element-loading-text="加载中..."
+            element-loading-background="rgba(4, 12, 11, 0.8)">
+            <div class="left-chart">
+                <lineCharts :unit="'m/s'" :windCurveValues="lineChart" :CurveTitle="chartName + '实时风速'" width="100%"
+                    :color="'#05bb4c'" height="100%" chartId="wind-fs" />
+            </div>
+            <div class="right-chart">
+                <radarChart width="100%" height="100%" :list="radarChart" />
+            </div>
+        </div>
     </div>
-    <div
-      class="chart-wrapper"
-      v-loading="chartLoading"
-      element-loading-text="加载中..."
-      element-loading-background="rgba(4, 12, 11, 0.8)"
-    >
-      <div class="left-chart">
-        <lineCharts
-          :unit="'m/s'"
-          :windCurveValues="lineChart"
-          :CurveTitle="chartName + '实时风速'"
-          width="100%"
-          :color="'#05bb4c'"
-          height="100%"
-          chartId="wind-fs"
-        />
-      </div>
-      <div class="right-chart">
-        <radarChart width="100%" height="100%" :list="radarChart" />
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
-import lineCharts from "@/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/lineCharts.vue";
-import radarChart from "@/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/radar-chart.vue";
-import dayjs from "dayjs";
-import dataJson from "./dataJson.json"
-import {
-  getWindAnalysis,
-  getWindAnalysisChart,
-  getWindAnalysisRadarChart,
-} from "@/api/monthlyPerformanceAnalysis.js";
-export default {
-  name: "Wind", //风资源分析
-  components: { lineCharts, radarChart },
-  props: {
-    date: {
-      type: String,
-    },
-  },
-  data() {
-    return {
-      chartLoading: false,
-      tableData: [],
-      tableHead: [
-        { prop: "name", label: "场站名称" },
-        { prop: "pjfs", label: "平均风速(m/s)" },
-        { prop: "zdfs", label: "最大风速(m/s)" },
-        { prop: "zxfs", label: "最小风速(m/s)" },
-        { prop: "pjfx", label: "平均风向" },
-      ],
-      chartName: "",
-      lineChart: [],
-      radarChart: [],
+    import lineCharts from "@/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/lineCharts.vue";
+    import radarChart from "@/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/radar-chart.vue";
+    import dayjs from "dayjs";
+    import dataJson from "./dataJson.json"
+    import {
+        getWindAnalysis,
+        getWindAnalysisChart,
+        getWindAnalysisRadarChart,
+    } from "@/api/monthlyPerformanceAnalysis.js";
+    export default {
+        name: "Wind", //风资源分析
+        components: {
+            lineCharts,
+            radarChart
+        },
+        props: {
+            date: {
+                type: String,
+            },
+        },
+        data() {
+            return {
+                chartLoading: false,
+                tableData: [],
+                tableHead: [{
+                        prop: "name",
+                        label: "场站名称"
+                    },
+                    {
+                        prop: "pjfs",
+                        label: "平均风速(m/s)"
+                    },
+                    {
+                        prop: "zdfs",
+                        label: "最大风速(m/s)"
+                    },
+                    {
+                        prop: "zxfs",
+                        label: "最小风速(m/s)"
+                    },
+                    {
+                        prop: "pjfx",
+                        label: "平均风向"
+                    },
+                ],
+                chartName: "",
+                lineChart: [],
+                radarChart: [],
+            };
+        },
+        created() {
+            this.getData(true);
+        },
+        methods: {
+            rowClick(row, flag) {
+                console.log(row, flag);
+                if (flag) {
+                    this.chartLoading = false;
+                } else {
+                    this.chartLoading = true;
+                }
+                if (Object.keys(row).length) {
+                    this.chartName = row.name;
+                    this.getLineChart(row.wpid);
+                    this.getRadarChart(row.wpid);
+                }
+            },
+            getData(val) {
+                this.BASE.showLoading();
+                //   this.tabledataChange(dataJson, val)
+                getWindAnalysis(this.date).then((res) => {
+                    this.tabledataChange(res, val)
+                });
+            },
+            tabledataChange(res, val) {
+                if (res.code == 200) {
+                    this.tableData = res.data ? res.data : [];
+                    this.rowClick(this.tableData[0] || {}, val);
+                } else {
+                    this.tableData = res.tabledata ? res.tabledata : [];
+                    this.rowClick(this.tableData[0] || {}, val);
+                }
+            },
+            getLineChart(wpid) {
+                // this.linedataChange(dataJson)
+                getWindAnalysisChart({
+                    Data: this.date,
+                    wpid
+                }).then((res) => {
+                    this.linedataChange(res)
+                });
+            },
+            linedataChange(res) {
+                if (res.code == 200) {
+                    this.lineChart = res.data ?
+                        res.data.map((item) => {
+                            return {
+                                dateTime: dayjs(item.time).format("MM-DD HH:mm"),
+                                value: item.value6,
+                            };
+                        }) : [];
+                } else {
+                    this.lineChart = res.linedata ?
+                        res.linedata.map((item) => {
+                            return {
+                                dateTime: item.time,
+                                value: item.value6,
+                            };
+                        }) : [];
+                }
+                this.chartLoading = false;
+                this.BASE.closeLoading();
+            },
+            getRadarChart(wpid) {
+                // this.rosedataChange(dataJson)
+                getWindAnalysisRadarChart({
+                    Data: this.date,
+                    wpid
+                }).then((res) => {
+                    this.rosedataChange(res)
+                });
+            },
+            rosedataChange(res) {
+                if (res.code == 200) {
+                    this.radarChart =
+                        res.data && res.data[0].count ? res.data[0].count : [];
+                } else {
+                    this.radarChart =
+                        res.resesdata && res.resesdata[0].count ? res.resesdata[0].count : [];
+                }
+            }
+        },
     };
-  },
-  created() {
-    this.getData(true);
-  },
-  methods: {
-    rowClick(row, flag) {
-      console.log(row, flag);
-      if (flag) {
-        this.chartLoading = false;
-      } else {
-        this.chartLoading = true;
-      }
-      if (Object.keys(row).length) {
-        this.chartName = row.name;
-        this.getLineChart(row.wpid);
-        this.getRadarChart(row.wpid);
-      }
-    },
-    getData(val) {
-      this.BASE.showLoading();
-      this.tabledataChange(dataJson, val)
-    //   getWindAnalysis(this.date).then((res) => {
-    //     this.tabledataChange(res, val)
-    //   });
-    },
-    tabledataChange(res, val) {
-        if (res.code == 200) {
-          this.tableData = res.data ? res.data : [];
-          this.rowClick(this.tableData[0] || {}, val);
-        } else {
-            this.tableData = res.tabledata ? res.tabledata : [];
-            this.rowClick(this.tableData[0] || {}, val);
-        }
-    },
-    getLineChart(wpid) {
-        this.linedataChange(dataJson)
-    //   getWindAnalysisChart({ Data: this.date, wpid }).then((res) => {
-    //     this.linedataChange(res)
-    //   });
-    },
-    linedataChange(res) {
-        if (res.code == 200) {
-          this.lineChart = res.data
-            ? res.data.map((item) => {
-                return {
-                  dateTime: dayjs(item.time).format("MM-DD HH:mm"),
-                  value: item.value6,
-                };
-              })
-            : [];
-        } else {
-            this.lineChart = res.linedata
-            ? res.linedata.map((item) => {
-                return {
-                  dateTime: item.time,
-                  value: item.value6,
-                };
-              })
-            : [];
-        }
-        this.chartLoading = false;
-        this.BASE.closeLoading();
-    },
-    getRadarChart(wpid) {
-        this.rosedataChange(dataJson)
-    //   getWindAnalysisRadarChart({ Data: this.date, wpid }).then((res) => {
-    //     this.rosedataChange(res)
-    //   });
-    },
-    rosedataChange(res) {
-        if (res.code == 200) {
-          this.radarChart =
-            res.data && res.data[0].count ? res.data[0].count : [];
-        } else {
-            this.radarChart =
-            res.resesdata && res.resesdata[0].count ? res.resesdata[0].count : [];
-        }
-    }
-  },
-};
 </script>
 
 <style lang="less" scoped>
-.wind-body {
-  height: 100%;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  .table-wrapper {
-    height: calc(100% - 390px - 20px);
-    width: 100%;
-    margin-bottom: 20px;
-  }
-  .chart-wrapper {
-    height: 390px;
-    display: flex;
-    width: 100%;
-    .left-chart {
-      width: 65%;
-      height: 100%;
-    }
-    .right-chart {
-      width: 34%;
-      height: 100%;
+    .wind-body {
+        height: 100%;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+
+        .table-wrapper {
+            height: calc(100% - 390px - 20px);
+            width: 100%;
+            margin-bottom: 20px;
+        }
+
+        .chart-wrapper {
+            height: 390px;
+            display: flex;
+            width: 100%;
+
+            .left-chart {
+                width: 65%;
+                height: 100%;
+            }
+
+            .right-chart {
+                width: 34%;
+                height: 100%;
+            }
+        }
     }
-  }
-}
-</style>
+</style>

src/views/economicsOperation/windAnalyse/powerCurve/index.vue

@@ -50,7 +50,7 @@
                   v-for="item in wtArray"
                   :key="item.id"
                   :value="item.id"
-                  :label="item.nemCode"
+                  :label="item.name"
                 />
               </el-select>
             </div>
@@ -327,6 +327,9 @@ import {
   getPowerFittingTable,
   getPowerFittingSelectedChart,
 } from "@/api/powerAnalyse.js";
+import {
+  getApiequipmentListByWp2
+} from "@/api/monthlyPerformanceAnalysis";
 import dataJson from "./dataJson.json"
 export default {
   // 名称
@@ -510,14 +513,13 @@ export default {
     // 获取风机
     getWt(wpid, reGetWp) {
       if (wpid) {
-        api1
-          .getWtList({
-            wpId: wpid,
+        getApiequipmentListByWp2({
+            wpid: wpid,
           })
           .then((res) => {
-            if (res.code === 200) {
-              this.wtArray = res.data;
-              this.wtIds = this.isMultiple ? [res.data[0].id] : res.data[0].id;
+            if (res.data.code === 200) {
+              this.wtArray = res.data.data;
+              this.wtIds = this.isMultiple ? [res.data.data[0].id] : res.data.data[0].id;
               if (!reGetWp) {
                 this.search();
               }
@@ -699,13 +701,13 @@ export default {
     },
     // 获取表格数据
     getTableData() {
-    //   this.tableLoading = true;
-    this.tabledataChange(dataJson.tableData)
-    //   getPowerFittingTable({
-    //     id: this.fittingId,
-    //   }).then((res) => {
-    //     this.tabledataChange(res)
-    //   });
+        // this.tabledataChange(dataJson.tableData)
+      this.tableLoading = true;
+      getPowerFittingTable({
+        id: this.fittingId,
+      }).then((res) => {
+        this.tabledataChange(res)
+      });
     },
     tabledataChange(res) {
         if (res.code == 200) {

src/views/economicsOperation/windAnalyse/powerSearch/index.vue

@@ -141,6 +141,10 @@ import {
   getApiequipmentList,
   getApiPerformancecurvefitting,
 } from "@/api/monthlyPerformanceAnalysis";
+
+import {
+  getApiequipmentListByWp2
+} from "@/api/monthlyPerformanceAnalysis";
 import * as echarts from "echarts";
 import partten from "@/helper/partten.js";
 import util from "@/helper/util.js";
@@ -181,7 +185,7 @@ export default {
     //过滤数据
     dataFilter(num) {
       this.toFixed = num;
-      // this.powerLinefittingData = this.filterList(this.toFixed);
+      this.powerLinefittingData = this.filterList(this.toFixed);
     },
     filterList(num) {
       let data = JSON.parse(JSON.stringify(this.originData));
@@ -269,14 +273,17 @@ export default {
     // 获取风机
     async getWindData() {
       this.windsOptions = [];
-      let params = {
-        companyId: this.companyVal,
-        wpIds: this.stationVal,
-        projectIds: "",
-        lineIds: "",
-        type: 0,
-      };
-      const { data: datas } = await getApiequipmentList(params);
+    //   let params = {
+    //     companyId: this.companyVal,
+    //     wpIds: this.stationVal,
+    //     projectIds: "",
+    //     lineIds: "",
+    //     type: 0,
+    //   };
+    let params = {
+        wpid: this.stationVal
+    }
+      const { data: datas } = await getApiequipmentListByWp2(params);
       if (datas.data.length) {
         this.windsOptions = datas.data;
         this.windVal = datas.data[0].id;

src/views/economicsOperation/windAnalyse/qxpclfx/index.vue

@@ -119,9 +119,9 @@ export default {
         param.month = parseInt(this.date?.split("-")[1]);
       }
       
-    //   api[url](param).then((res) => {
-    //     this.dataChange(res)
-    //   });
+      api[url](param).then((res) => {
+        this.dataChange(res)
+      });
     },
     dataChange(res) {
         this.tableLoading = false;
@@ -149,7 +149,7 @@ export default {
     // 场站
     ChangZhanVal() {
         this.tableData = dataJson.data
-        this.dataChange(dataJson.data)
+        // this.dataChange(dataJson.data)
       api1
         .getWpList({
           type: "-1",

src/views/economicsOperation/windAnalyse/qxqjpcl/index.vue

@@ -1,233 +1,212 @@
 <template>
-  <div style="height: 100%; padding: 10px 20px">
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select
-              size="mini"
-              v-model="value1"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in ChangZhan"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              >
-              </el-option>
-            </el-select>
-          </div>
+    <div style="height: 100%; padding: 10px 20px">
+        <div class="query mg-b-8">
+            <div class="query-items">
+                <div class="query-item">
+                    <div class="lable">场站：</div>
+                    <div class="search-input">
+                        <el-select size="mini" v-model="value1" clearable placeholder="请选择" popper-class="select">
+                            <el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
+                            </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="query-item">
+                    <div class="lable">日期：</div>
+                    <div class="search-input">
+                        <el-date-picker size="mini" v-model="date" type="date" placeholder="选择日期"
+                            popper-class="date-select" value-format="YYYY-MM-DD">
+                        </el-date-picker>
+                    </div>
+                </div>
+                <div class="query-actions">
+                    <el-button size="mini" round class="searchColor" @click="getTable">查 询</el-button>
+                </div>
+            </div>
         </div>
-        <div class="query-item">
-          <div class="lable">日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              size="mini"
-              v-model="date"
-              type="date"
-              placeholder="选择日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD"
-            >
-            </el-date-picker>
-          </div>
+        <div class="table-box">
+            <div class="leftContent">
+                <span>{{ showTitle }}</span>
+            </div>
+            <el-table :data="tableData" stripe height="calc(100% - 40px)" size="mini">
+                <el-table-column :sortable="item.field != 'nemCode' && item.field != 'recordDate'" header-align="center"
+                    :align="index < 2 ? 'center' : 'right'" v-for="(item, index) in tableDataColumn" :key="index"
+                    :prop="item.field" :label="item.name">
+                </el-table-column>
+            </el-table>
         </div>
-        <div class="query-actions">
-          <el-button size="mini" round class="searchColor" @click="getTable"
-            >查 询</el-button
-          >
-        </div>
-      </div>
-    </div>
-    <div class="table-box">
-      <div class="leftContent">
-        <span>{{ showTitle }}</span>
-      </div>
-      <el-table
-        :data="tableData.data"
-        stripe
-        height="calc(100% - 40px)"
-        size="mini"
-      >
-        <el-table-column
-          :sortable="item.field != 'nemCode' && item.field != 'recordDate'"
-          header-align="center"
-          :align="index < 2 ? 'center' : 'right'"
-          v-for="(item, index) in tableData.column"
-          :key="index"
-          :prop="item.field"
-          :label="item.name"
-        >
-        </el-table-column>
-      </el-table>
     </div>
-  </div>
 </template>
 <script>
-import api1 from "@api/economic/index.js";
-import { getCurveIntervalfittingmainList } from "@api/wisdomOverhaul/energy/index.js";
-import dataJson from "./dataJson.json"
-export default {
-  name: "Qxqjpcl",
-
-  data() {
-    return {
-      ChangZhan: [],
-      value1: "",
-      date: "",
-      showTitle: "曲线区间偏差率",
-      tableLoading: true,
-      tableData: {},
+    import api1 from "@api/economic/index.js";
+    import {
+        getCurveIntervalfittingmainList
+    } from "@api/wisdomOverhaul/energy/index.js";
+    import dataJson from "./dataJson.json"
+    export default {
+        name: "Qxqjpcl",
+
+        data() {
+            return {
+                ChangZhan: [],
+                value1: "",
+                date: "",
+                showTitle: "曲线区间偏差率",
+                tableLoading: true,
+                tableData: [],
+                tableDataColumn: []
+            };
+        },
+        created() {
+            this.ChangZhanVal();
+            this.date = new Date().formatDate("yyyy-MM-dd");
+        },
+        methods: {
+            // 获取表格数据
+            getTable() {
+                this.tableLoading = true;
+
+                const param = {
+                    wpId: this.value1,
+                    recorddate: this.date,
+                };
+
+
+                getCurveIntervalfittingmainList(param).then(({
+                    data: res
+                }) => {
+                    this.tableLoading = false;
+                    if (res.code === 200) {
+                        res.data.forEach((ele) => {
+                            ele.recordDate = this.date;
+                        });
+                        this.tableDataColumn = dataJson.data.column
+                        this.tableData = res.data || [];
+                    }
+                });
+            },
+            // tab
+            handleOpen(vl, index) {
+                this.cur = index;
+                this.showTitle = vl;
+                this.date = new Date().formatDate(`yyyy-MM${index ? "-dd" : ""}`);
+                this.getTable();
+            },
+            // 场站
+            ChangZhanVal() {
+                //   this.tableData = dataJson.data || [];
+
+                api1
+                    .getWpList({
+                        type: "-1",
+                    })
+                    .then((res) => {
+                        if (res.data.code === 200) {
+                            this.ChangZhan = res.data.data;
+                            this.value1 = res.data.data[0].id;
+                            this.getTable();
+                        }
+                    });
+            },
+        },
     };
-  },
-  created() {
-    this.ChangZhanVal();
-    this.date = new Date().formatDate("yyyy-MM-dd");
-  },
-  methods: {
-    // 获取表格数据
-    getTable() {
-      this.tableLoading = true;
-
-      const param = {
-        wpId: this.value1,
-        recorddate: this.date,
-      };
-
-
-      getCurveIntervalfittingmainList(param).then(({ data: res }) => {
-        this.tableLoading = false;
-        console.log(res.code);
-        if (res.code === 200) {
-          res.data.forEach((ele) => {
-            ele.recordDate = this.date;
-          });
-          // this.tableData.data = res.data || [];
-        }
-      });
-    },
-    // tab
-    handleOpen(vl, index) {
-      this.cur = index;
-      this.showTitle = vl;
-      this.date = new Date().formatDate(`yyyy-MM${index ? "-dd" : ""}`);
-      this.getTable();
-    },
-    // 场站
-    ChangZhanVal() {
-      this.tableData = dataJson.data || [];
-
-      api1
-        .getWpList({
-          type: "-1",
-        })
-        .then((res) => {
-          if (res.data.code === 200) {
-            this.ChangZhan = res.data.data;
-            this.value1 = res.data.data[0].id;
-            this.getTable();
-          }
-        });
-    },
-  },
-};
 </script>
 <style scoped lang="less">
-.table-box {
-  height: calc(100% - 80px);
-  .leftContent {
-    width: 242px;
-    height: 45px;
-    line-height: 45px;
-    background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-    span {
-      font-size: 16px;
-      font-family: Microsoft YaHei;
-      font-weight: 400;
-      color: #05bb4c;
-      margin-left: 25px;
+    .table-box {
+        height: calc(100% - 80px);
+
+        .leftContent {
+            width: 242px;
+            height: 45px;
+            line-height: 45px;
+            background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
+
+            span {
+                font-size: 16px;
+                font-family: Microsoft YaHei;
+                font-weight: 400;
+                color: #05bb4c;
+                margin-left: 25px;
+            }
+        }
+    }
+
+    .query-actions {
+        margin-left: 0 !important;
+    }
+
+    button {
+        margin-left: 10px;
+        background: rgba(67, 81, 107, 0.3);
+        border: 1px solid #274934;
+        color: #b3b3b3;
+    }
+
+    .searchColor {
+        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;
+        }
+    }
+
+    .newspan {
+        line-height: 30px;
+        cursor: pointer;
+        padding: 0 1vw;
+        margin: 0 2px;
+        color: #9ca5a8;
+        transition: color 0.2s ease-in-out;
+        position: relative;
+    }
+
+    .newspan:hover {
+        background: linear-gradient(to top,
+                rgba(5, 187, 76, 0.5),
+                rgba(5, 187, 76, 0));
+        color: white;
+        position: relative;
+    }
+
+    .newspan:hover::after {
+        content: "";
+        position: absolute;
+        width: 100%;
+        height: 0.463vh;
+        border: 0.093vh solid #05bb4c;
+        border-top: 0;
+        left: 0;
+        bottom: 0;
+        box-sizing: border-box;
+    }
+
+    .active {
+        background: linear-gradient(to top,
+                rgba(5, 187, 76, 0.5),
+                rgba(5, 187, 76, 0));
+        color: white;
+        position: relative;
+    }
+
+    .active::after {
+        content: "";
+        position: absolute;
+        width: 100%;
+        height: 4px;
+        border: 1px solid #05bb4c;
+        border-top: 0;
+        left: 0;
+        bottom: 0;
+        box-sizing: border-box;
+    }
+
+    .title {
+        background: rgba(255, 255, 255, 0.1);
+        margin-bottom: 8px;
+        padding: 8px;
     }
-  }
-}
-.query-actions {
-  margin-left: 0 !important;
-}
-button {
-  margin-left: 10px;
-  background: rgba(67, 81, 107, 0.3);
-  border: 1px solid #274934;
-  color: #b3b3b3;
-}
-
-.searchColor {
-  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;
-  }
-}
-
-.newspan {
-  line-height: 30px;
-  cursor: pointer;
-  padding: 0 1vw;
-  margin: 0 2px;
-  color: #9ca5a8;
-  transition: color 0.2s ease-in-out;
-  position: relative;
-}
-.newspan:hover {
-  background: linear-gradient(
-    to top,
-    rgba(5, 187, 76, 0.5),
-    rgba(5, 187, 76, 0)
-  );
-  color: white;
-  position: relative;
-}
-.newspan:hover::after {
-  content: "";
-  position: absolute;
-  width: 100%;
-  height: 0.463vh;
-  border: 0.093vh solid #05bb4c;
-  border-top: 0;
-  left: 0;
-  bottom: 0;
-  box-sizing: border-box;
-}
-.active {
-  background: linear-gradient(
-    to top,
-    rgba(5, 187, 76, 0.5),
-    rgba(5, 187, 76, 0)
-  );
-  color: white;
-  position: relative;
-}
-.active::after {
-  content: "";
-  position: absolute;
-  width: 100%;
-  height: 4px;
-  border: 1px solid #05bb4c;
-  border-top: 0;
-  left: 0;
-  bottom: 0;
-  box-sizing: border-box;
-}
-.title {
-  background: rgba(255, 255, 255, 0.1);
-  margin-bottom: 8px;
-  padding: 8px;
-}
-</style>
+</style>

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

@@ -263,8 +263,8 @@ export default {
   created() {
     this.pickerTimer = dayjs().add(-1, "day").format("YYYY-MM-DD");
     
-      this.singleMachineData = dataJson.data.data.records;
-      this.page.total = dataJson.data.data.total;
+    //   this.singleMachineData = dataJson.data.data.records;
+    //   this.page.total = dataJson.data.data.total;
     this.getCompanyData();
   },
   mounted() {},
@@ -341,8 +341,8 @@ export default {
         // this.page.total = datas.data.data.length;
       } else {
         datas = await getApiwindturbinegoodnesslist(params);
-        // this.singleMachineData = datas.data.data.records;
-        // this.page.total = datas.data.data.total;
+        this.singleMachineData = datas.data.data.records;
+        this.page.total = datas.data.data.total;
       }
     },
     handleSizeChange(val) {