玫瑰图问题修改，风机报警确认接口修改

src/api/economicIndex.js

@@ -10,10 +10,10 @@ export function generatingcapacity() {
 }
 
 //获取风能利用率  设备可利用率  两个细则考核数据
-export function homeright() {
+export function homeright(params) {
     return request({
       baseURL: process.env.VUE_APP_API,
-      url: `/economy/home-right?companyId=NX_FGS_HA_FDC_STA`,
+      url: `/economy/home-right?companyId=NX_FGS_HA_FDC_STA&periodType=${params.periodType}`,
       method: "get",
     });
 }

src/api/powerAnalyse.js

@@ -5,8 +5,8 @@ export function getPowerFittingId(data) {
   return request({
     baseURL: process.env.VUE_APP_TEST,
     url: "new/power/fitting/data",
-    method: "post",
-    data,
+    method: "get",
+    params: data,
   });
 }
 

src/components/deligoAlarmList/index.vue

@@ -223,9 +223,10 @@ export default {
       }).then(() => {
         let arr = [];
 
-        arr = this.checkedRow.map((item) => {
-          return { alarmType: item.alarmType, id: item.id };
-        });
+        // arr = this.checkedRow.map((item) => {
+        //   return { alarmType: item.alarmType, id: item.id };
+        // });
+        arr = this.checkedRow
 
         confirmAlart(arr).then((res) => {
           if (res.code === 200) {
@@ -247,6 +248,7 @@ export default {
               }
             });
             this.$store.commit("setWarning", this.warnList);
+            this.$store.commit("removeWarningList", arr);
             this.$emit("confirmed");
           }
         });
@@ -260,15 +262,16 @@ export default {
       }).then(() => {
         let arr = [];
         let oldList = this.warnList;
-        arr = oldList.map((item) => {
-          return { alarmType: item.alarmType, id: item.id };
-        });
-        confirmAlart(arr).then((res) => {
+        // arr = oldList.map((item) => {
+        //   return { alarmType: item.alarmType, id: item.id };
+        // });
+        confirmAlart(this.warnList).then((res) => {
           if (res.code === 200) {
             this.BASE.showMsg({
               type: "success",
               msg: "确认成功",
             });
+            this.$store.commit("removeWarningList", this.warnList);
             this.warnList = [];
             this.$emit("confirmed", true);
           }

src/views/SandTable/SandTable.vue

@@ -246,6 +246,7 @@
     import RadarLineChartCom from "./component/radar-line-chart.vue";
     import dataJson from "./component/dataBJJson.json"
     import dayjs from "dayjs";
+    import {onBeforeRouteLeave} from "vue-router"
     import {
         alarm_history,
     } from "@/api/zhbj/index.js";
@@ -568,7 +569,8 @@
                         message: "电气故障，机械故障",
                         status: "正常"
                     }
-                ]
+                ],
+                timmer: null, // 定时器开关
             };
         },
 
@@ -619,8 +621,8 @@
                     dayjs().startOf('month').format("YYYY-MM-DD HH:mm:ss"),
                     dayjs().format("YYYY-MM-DD HH:mm:ss")
                 ]
-                that.getShutDownevenList("gz", "WT2000D121H85", 5)
-                that.getShutDownevenList("gz", "UP2000-130", 5)
+                that.getShutDownevenList(!this.bjSwitch ? "gz" : "wh", "WT2000D121H85", 5)
+                that.getShutDownevenList(!this.bjSwitch2 ? "gz" : "wh", "UP2000-130", 5)
                 that.getFindCtFeature("WT2000D121H85", this.warnSwitch)
                 that.getFindCtFeature("UP2000-130", this.warnSwitch2)
                 that.getShutDownEvent("WT2000D121H85", this.probSwitch)
@@ -1501,7 +1503,6 @@
             // 创建前
         },
         created() {
-            this.getDataInfo();
             // this.getWpHealthInfo();
             // this.getTop4Info();
             // this.getWarnMGT();
@@ -1517,15 +1518,30 @@
         mounted() {
             // 渲染后
             this.$nextTick(() =>{
-                this.init(jsonData)
+            //     this.init(jsonData)
+                this.getDataInfo();
+                this.timmer = setInterval(() => {
+                    this.getDataInfo();
+                }, 10000);
             })
+            
 
         },
+        unmounted() {
+            clearInterval(this.timmer);
+            this.timmer = null;
+            clearInterval(this.timmer1);
+            this.timmer1 = null;
+        },
         watch: {
             $route: {
                 handler(val) {
+                    if (val.path !== "/integratedAlarm") {
+                        clearInterval(this.timmer);
+                        this.timmer = null;
+                    }
                     this.$nextTick(() =>{
-                        this.init(jsonData)
+                        // this.init(jsonData)
                     })
                 },
             },
@@ -1537,11 +1553,6 @@
         updated() {
             // 数据更新后
         },
-
-        unmounted() {
-            clearInterval(this.timmer1);
-            this.timmer1 = null;
-        },
     };
 </script>
 

src/views/economicsOperation/nxfHomePage/index.vue

@@ -167,38 +167,27 @@
                     },
                 ],
                 Powersend: [],
+                timmer: null, // 定时器开关
             }
         },
         mounted() {
             this.getGeneratingcapacity()
+             this.timmer = setInterval(() => {
+                this.getGeneratingcapacity();
+            }, 10000);
+        },
+        unmounted() {
+            clearInterval(this.timmer);
+            this.timmer = null;
         },
         methods: {
             selectTab(index, item) {
                 console.log("ind===>>>", index)
                 this.activeIndex = index;
+                this.changeRightData()
             },
-            //获取发电量和主要经济指标同期对比
-            getGeneratingcapacity() {
+            changeRightData() {
                 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
-                    }
-                }).catch(e => {
-                    that.zbtqdb = dataJson.data.zbtqdb
-                })
                 homeright({
                     periodType: this.activeIndex === 0 ? "year" : this.activeIndex === 1 ? "month" : "week"
                 }).then(res =>{
@@ -228,6 +217,29 @@
                         },
                     ]
                 })
+            },
+            //获取发电量和主要经济指标同期对比
+            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
+                    }
+                }).catch(e => {
+                    that.zbtqdb = dataJson.data.zbtqdb
+                })
                 homemiddle().then(res =>{
                     if (res.data) {
                         that.planData = res.data.planData
@@ -241,6 +253,7 @@
                     that.Powersend = dataJson.data.Powersend
                     that.Powerloss = dataJson.data.Powerloss
                 })
+                this.changeRightData()
             },
         }
     };

src/views/economicsOperation/windAnalyse/cutInAndOutAnalysis/historyDetail.vue

@@ -48,7 +48,7 @@
         <el-date-picker
           v-model="pickerTimer"
           type="daterange"
-          range-separator="To"
+          range-separator="至"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
           size="mini"