AGC页面BUG修复

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

@@ -438,13 +438,13 @@ export default {
         ];
       } else {
         this.color = [
-          "#67c23a",
-          "rgb(242.5, 208.5, 157.5)",
-          "#f56c6c",
+          "#205081",
+          "#e96767", //
+          "#41a273", // 
           "rgb(77, 119, 255)",
           "rgb(1, 191, 236)",
-          "#f2c94c", // 添加的黄色
-          "rgb(153, 102, 255)", // 添加的紫色
+          "#f2c94c",
+          "#7bbfdd", //
         ];
         this.linearGradientColor = [
           {

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

@@ -16,10 +16,10 @@
         <el-date-picker
           v-model="queryForm.dateTime"
           size="mini"
-          type="daterange"
+          type="datetimerange"
           range-separator="-"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="开始"
           end-placeholder="结束"
           popper-class="date-select"
@@ -50,10 +50,11 @@ import dayjs from "dayjs";
 const queryForm = reactive({
   station: "NX_FGS_HA_FDC_STA",
   dateTime: [
-    dayjs().subtract(10, "day").format("YYYY-MM-DD"),
-    dayjs().format("YYYY-MM-DD"),
+    // dayjs().subtract(1, "day").format("YYYY-MM-DD"),
+    `${dayjs().format("YYYY-MM-DD")} 00:00:00`,
+    `${dayjs().format("YYYY-MM-DD")} 23:59:59`,
   ],
-  interval: 3,
+  interval: 2,
 });
 /**场站 */
 const stationList = ref([]);

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

@@ -312,8 +312,6 @@ const getXdLossData = (params) => {
       xdLossTableData.value = res.records;
       lossDataParams.value.pageNum = 1;
       lossDataParams.value.total = res.total;
-
-      console.log(1122, lossDataParams.value);
     });
 };
 
@@ -390,60 +388,37 @@ const funSubmit = (params) => {
       const bzgl = [];
       const pjfs = [];
       res["有功设定限值"].values.map((o, index) => {
+        let ygsdxzValue = o?.value;
+        let sfygValue = res?.["实发有功"]?.values?.[index]?.value;
+        let llglValue = res?.["理论功率"]?.values?.[index]?.value;
+        let pcsxValue = res?.["偏差下限"]?.values?.[index]?.value;
+        let pcxxValue = res?.["偏差上限"]?.values?.[index]?.value;
+        let bzglValue = res?.["保证功率"]?.values?.[index]?.value;
+        let pjfsValue = res?.["平均风速"]?.values?.[index]?.value;
+
         tsArr.push(dayjs(o.ts).format("YYYY-MM-DD HH:mm:ss"));
-        ygsdxz.push(Number(o.value).toFixed(2));
-        if (res["实发有功"].values.length > 0) {
-          sfyg.push(Number(res["实发有功"].values[index].value).toFixed(2));
-        }
-        if (res["理论功率"].values.length > 0) {
-          llgl.push(Number(res["理论功率"].values[index].value).toFixed(2));
-        }
-        if (res["偏差上限"].values.length > 0) {
-          pcsx.push(Number(res["偏差上限"].values[index].value).toFixed(2));
-        }
-        if (res["偏差下限"].values.length > 0) {
-          pcxx.push(Number(res["偏差下限"].values[index].value).toFixed(2));
-        }
-        if (res["保证功率"].values.length > 0) {
-          bzgl.push(Number(res["保证功率"].values[index].value).toFixed(2));
-        }
-        if (res["平均风速"].values.length > 0) {
-          pjfs.push(Number(res["平均风速"].values[index].value).toFixed(2));
-        }
+
+        ygsdxz.push(ygsdxzValue > 0 ? Number(o.value).toFixed(2) : null);
+        sfyg.push(sfygValue > 0 ? Number(sfygValue).toFixed(2) : null);
+        llgl.push(llglValue > 0 ? Number(llglValue).toFixed(2) : null);
+        pcsx.push(pcsxValue > 0 ? Number(pcsxValue).toFixed(2) : null);
+        pcxx.push(pcxxValue > 0 ? Number(pcxxValue).toFixed(2) : null);
+        bzgl.push(bzglValue > 0 ? Number(bzglValue).toFixed(2) : null);
+        pjfs.push(pjfsValue > 0 ? Number(pjfsValue).toFixed(2) : null);
+
         tableArr.push({
           ts: dayjs(o.ts).format("YYYY-MM-DD HH:mm:ss"),
-          ygsdxz: Number(o.value).toFixed(2),
-          sfyg:
-            res["实发有功"].values.length > 0
-              ? Number(res["实发有功"].values[index].value).toFixed(2)
-              : "-",
-          llgl:
-            res["理论功率"].values.length > 0
-              ? Number(res["理论功率"].values[index].value).toFixed(2)
-              : "-",
-          pcsx:
-            res["偏差上限"].values.length > 0
-              ? Number(res["偏差上限"].values[index].value).toFixed(2)
-              : "-",
-          pcxx:
-            res["偏差下限"].values.length > 0
-              ? Number(res["偏差下限"].values[index].value).toFixed(2)
-              : "-",
-          bzgl:
-            res["保证功率"].values.length > 0
-              ? Number(res["保证功率"].values[index].value).toFixed(2)
-              : "-",
-          pjfs:
-            res["平均风速"].values.length > 0
-              ? Number(res["平均风速"].values[index].value).toFixed(2)
-              : "-",
+          ygsdxz: ygsdxzValue > 0 ? Number(o.value).toFixed(2) : "",
+          sfyg: sfygValue > 0 ? Number(sfygValue).toFixed(2) : "",
+          llgl: llglValue > 0 ? Number(llglValue).toFixed(2) : "",
+          pcsx: pcsxValue > 0 ? Number(pcsxValue).toFixed(2) : "",
+          pcxx: pcxxValue > 0 ? Number(pcxxValue).toFixed(2) : "",
+          bzgl: bzglValue > 0 ? Number(bzglValue).toFixed(2) : "",
+          pjfs: pjfsValue > 0 ? Number(pjfsValue).toFixed(2) : "",
           cz:
-            res["有功设定限值"].values.length && res["实发有功"].values.length
-              ? (
-                  Number(res["有功设定限值"].values[index].value) -
-                  Number(res["实发有功"].values[index].value)
-                ).toFixed(2)
-              : "-",
+            ygsdxzValue > 0 && sfygValue > 0
+              ? (ygsdxzValue - sfygValue).toFixed(2)
+              : "",
         });
       });
       xAxisData.value = tableArr.map((o) => o.ts);
@@ -601,7 +576,7 @@ const funSubmit = (params) => {
       abnormalPoint.value = abnormalPointTemp;
     })
     .catch(() => {
-      initPageData();
+      // initPageData();
     });
 
   // if (res.code === 200) {