Merge branch 'new-power' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into daping-power

src/api/powerGenerating/index.js

@@ -139,7 +139,7 @@ export function dataOptionDel(data, timeout = 5000) {
   return request({
     baseURL: process.env.VUE_APP_TEST,
     url: "/data/option/delete",
-    method: "delete",
+    method: "get",
     params: data,
     headers,
     timeout,