Merge branch 'mw2' of http://61.161.152.110:10101/r/electronic-map into sl3

src/views/WindSite/pages/Tower.vue

@@ -43,7 +43,7 @@
         </div>
       </div>
     </Panel>
-    <toolbar-panel class="rose-chart" title="功率曲线">
+    <toolbar-panel class="rose-chart" title="72小时功率曲线图">
       <!-- <template v-slot:tools>
       </template> -->
       <!-- <template v-slot:default> -->
@@ -98,20 +98,20 @@ export default {
       cftmap: {},
       glvos: [],
       rmgtmap: {
-        indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
+        indicator: ["N0", "N1"],
         data: [
           {
-            value: [44200, 14200, 20000, 35000, 50000, 38000],
+            value: [44200, 14200],
             name: "",
           },
         ],
       },
       rmgtTitle: "",
       ymgtmap: {
-        indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
+        indicator: ["N0", "N1"],
         data: [
           {
-            value: [44200, 14200, 20000, 35000, 50000, 38000],
+            value: [0, 14200],
             name: "",
           },
         ],
@@ -141,127 +141,84 @@ export default {
   // 函数
   methods: {
     requestLine() {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "genreset/findPowerInfo",
-        timeout: 60000,
-        data: {
-          id: that.wpId,
-        },
-        success(res) {
-
-          let rdlKey = ["value1", "value2", "value3", "speed"];
-          let DayPower = {
-            // 图表所用单位
-            units: ["(万kWh)", "(m/s)"],
-            value: [
-              {
-                title: "发电量",
-                yAxisIndex: 0,
-                value: [],
-              },
-              {
-                title: "上网电量",
-                yAxisIndex: 0,
-                value: [],
-              },
-              {
-                title: "购网电量",
-                yAxisIndex: 0,
-                value: [],
-              },
-              {
-                title: "实时风速",
-                yAxisIndex: 1,
-                value: [],
-              },
-            ],
-          };
-
-          let glKey = [
-            "value1",
-            "value2",
-            "value3",
-            "value4",
-            "value5",
-            "value6",
-            "value7",
-          ];
-          let Powertrend = [
-            {
-              title: "应发功率",
-              smooth: true,
-              value: [],
-            },
-            {
-              title: "实发功率",
-              smooth: true,
-              value: [],
-            },
-            {
-              title: "理论功率",
-              smooth: true,
-              value: [],
-            },
-            {
-              title: "4小时预测功率",
-              smooth: true,
-              value: [],
-            },
-            {
-              title: "保证功率",
-              smooth: true,
-              value: [],
-            },
-            {
-              title: "平均风速",
-              smooth: true,
-              value: [],
-            },
-            {
-              title: "24小时预测功率",
-              smooth: true,
-              value: [],
-            },
-          ];
-
-          rdlKey.forEach((keyEle, keyIndex) => {
-            res.data.rdlvos.forEach((cEle) => {
-              DayPower.value[keyIndex].value.push({
-                text: cEle.timestr,
-                value: cEle[keyEle],
-              });
-            });
-          });
-
-          glKey.forEach((keyEle, keyIndex) => {
-            res.data.glvos.forEach((cEle) => {
-              Powertrend[keyIndex].value.push({
-                text: new Date(cEle.time).formatDate("hh:mm"),
-                value: cEle[keyEle],
-              });
-            });
-          });
-
-          that.DayPower = DayPower;
-          that.Powertrend = Powertrend;
-        },
-      });
-    },
-    requestData(showLoading) {
-      let that = this;
-      that.API.requestData({
-        showLoading,
-        method: "POST",
-        subUrl: "monitor/findCftInfo",
-        data: {
-          wpId: that.wpId,
-        },
-        success(res) {
-          that.cftmap = res.data.cftmap;
-        },
-      });
+		 let that = this;
+		that.API.requestData({
+		  method: "POST",
+		  subUrl: "/monitor/findCftInfo",
+		  timeout: 60000,
+		  data: {
+		    wpId: that.wpId,
+		  },
+		success(res) {
+			var data = res.data;
+			that.cftmap = data.cftmap;
+			// 日资源玫瑰图
+			var rmgtmapIndicator = [],
+				rmgtmapData = [];
+			data.rmgtmap.data.forEach(item =>{
+				rmgtmapIndicator.push(item.name);
+				rmgtmapData.push(item.data1)
+			})
+			that.rmgtmap = {
+				indicator: rmgtmapIndicator,
+				data: [{value: rmgtmapData}]
+			};
+			// 月资源玫瑰图
+			var ymgtmapIndicator = [],
+				ymgtmapData = [];
+			data.ymgtmap.data.forEach(item =>{
+				ymgtmapIndicator.push(item.name);
+				ymgtmapData.push(item.data1)
+			})
+			that.ymgtmap = {
+				indicator: ymgtmapIndicator,
+				data: [{value: ymgtmapData}]
+			};
+			
+			// 72小时功率曲线图
+			let glKey = ["value2","value1","value5","value4","value7","value6"];
+			let Powertrend = [
+			  {
+			    title: "实发功率",
+			    smooth: true,
+			    value: [],
+			  },
+			  {
+			    title: "理论功率",
+			    smooth: true,
+			    value: [],
+			  },
+			  {
+			    title: "保证功率",
+			    smooth: true,
+			    value: [],
+			  },
+			  {
+			    title: "4小时预测功率",
+			    smooth: true,
+			    value: [],
+			  },
+			  {
+			    title: "24小时预测功率",
+			    smooth: true,
+			    value: [],
+			  },
+			  {
+			    title: "平均风速",
+			    smooth: true,
+			    value: [],
+			  },
+			];
+			glKey.forEach((keyEle, keyIndex) => {
+			  res.data.glvos.forEach((cEle) => {
+			    Powertrend[keyIndex].value.push({
+			      text: new Date(cEle.time).formatDate("hh:mm"),
+			      value: cEle[keyEle],
+			    });
+			  });
+			});
+			that.Powertrend = Powertrend;
+		}})
     },
     getWp () {
       let that = this;
@@ -307,7 +264,7 @@ export default {
       });
       this.wpId = res.code;
       this.renderBtnActiveIndex ();
-      this.requestData(false);
+      // this.requestData(false);
       this.requestLine();
     },
   },
@@ -317,10 +274,10 @@ export default {
     that.wpId = that.$route.params.wpId;
     that.getWp();
     that.$nextTick(() => {
-      that.requestData(false);
+      // that.requestData(false);
       that.requestLine();
       that.timmer = setInterval(() => {
-        that.requestData(false);
+        // that.requestData(false);
         that.requestLine();
       }, 60 * 1000);
     });