Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx

src/api/axios.js

@@ -12,7 +12,7 @@ axios.defaults.withCredentials = true;
     isMust: true, // 请求是否携带 token ，默认为 true ，可缺省 
     showLoading: false, // 请求是否显示加载中遮罩层，默认 false ，可缺省
     method: "GET", // 请求方式，默认为 GET ，可缺省
-    baseURL: "http://192.168.10.23:8082/", // 请求服务器地址 + 端口，可缺省
+    baseURL: "http://192.168.10.23:8082/", // 请求服务器地址 + 端口，可缺省
     subUrl: "api/repassword", // 请求接口地址，必传项
     timeout: 3000, // 请求超时时间，默认 3s ，可缺省
     body: { id: "151", name: "张三" }, // 请求体所携带的 Body ，如果后端要求 Body 传参的话需要携带此参数，且请求方式需为 POST
@@ -75,7 +75,7 @@ export function requestData(options) {
       if (options.showLoading) {
         BASE.closeLoading();
       }
-      if (response.code === 501) { // 用户类请求错误code (账号密码错误、用户锁定、token过期等)
+      if (response.data.code === 501) { // 用户类请求错误code (账号密码错误、用户锁定、token过期等)
 
         localStorage.removeItem('authToken');
         BASE.showMsg({
@@ -85,7 +85,7 @@ export function requestData(options) {
         // window.location.reload();
         // window.__STATICVUE__.$router.replace('/login');
 
-      } else if (response.data.code === 200 || response.data.length>=0 || response.data.records) { // 请求成功 code
+      } else if (response.data.code === 200 || response.data.length >= 0 || response.data.records) { // 请求成功 code
 
         options.success && options.success(response.data);
         resolve(response);

src/views/wtSaturability/index.vue

@@ -1,9 +1,27 @@
 <template>
   <div class="health">
     <div class="selections mg-b-16">
-      <div class="item" @click="tabSelect(0)" :class="{ active: tabIndex == 0 }">总功率情况</div>
-      <div class="item" @click="tabSelect(1)" :class="{ active: tabIndex == 1 }">月功率情况</div>
-      <div class="item" @click="tabSelect(2)" :class="{ active: tabIndex == 2 }">日功率情况</div>
+      <div
+        class="item"
+        @click="tabSelect(0)"
+        :class="{ active: tabIndex == 0 }"
+      >
+        总功率情况
+      </div>
+      <div
+        class="item"
+        @click="tabSelect(1)"
+        :class="{ active: tabIndex == 1 }"
+      >
+        月功率情况
+      </div>
+      <div
+        class="item"
+        @click="tabSelect(2)"
+        :class="{ active: tabIndex == 2 }"
+      >
+        日功率情况
+      </div>
     </div>
     <div class="curHeight" v-if="tabIndex == 0">
       <Tab1 />
@@ -29,11 +47,11 @@ export default {
   components: {
     Tab1,
     Tab2,
-    Tab3
+    Tab3,
   },
 
   // 数据
-  data () {
+  data() {
     const that = this;
     return {
       tabIndex: 0,
@@ -42,22 +60,20 @@ export default {
 
   // 函数
   methods: {
-    tabSelect (state) {
+    tabSelect(state) {
       this.tabIndex = state;
     },
     // 请求服务
-    requestData () {
-      
-    }
+    requestData() {},
   },
 
-  created () {
+  created() {
     this.requestData();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 

src/views/wtSaturability/tab1.vue

@@ -5,16 +5,41 @@
         <div class="query-item">
           <div class="lable">场站：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="(wpId) => { getWt(wpId, true); }">
-              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+              @change="
+                (wpId) => {
+                  getWt(wpId, true);
+                }
+              "
+            >
+              <el-option
+                v-for="item in wpArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">风机：</div>
           <div class="search-input">
-            <el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wtId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wtArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
@@ -26,7 +51,12 @@
     <div class="df-table">
       <ComTable height="35vh" :data="tableData"></ComTable>
     </div>
-    <Mlc height="300px" :list="chartData" :units="chartUnit" :showLegend="true" />
+    <Mlc
+      height="300px"
+      :list="chartData"
+      :units="chartUnit"
+      :showLegend="true"
+    />
   </div>
 </template>
 
@@ -44,7 +74,7 @@ export default {
   },
 
   // 数据
-  data () {
+  data() {
     return {
       isAsc: "asc",
       wpArray: [],
@@ -58,60 +88,62 @@ export default {
             field: "windturbineid",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "风速",
             field: "speed",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "实际拟合功率",
             field: "actualpower",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "最优拟合功率",
             field: "optimalpower",
             is_num: false,
             is_light: false,
-            sortable: true
-          }
+            sortable: true,
+          },
         ],
         data: [],
       },
-      chartData: [{
-        title: "",
-        yAxisIndex: 0,
-        value: []
-      }],
+      chartData: [
+        {
+          title: "",
+          yAxisIndex: 0,
+          value: [],
+        },
+      ],
       // chartUnit: ["功率(MW)", "(m/s)"]
-       chartUnit: ["功率(MW)"]
+      chartUnit: ["功率(MW)"],
     };
   },
 
   // 函数
   methods: {
     // 获取风场
-    getWp (reGetWp) {
+    getWp(reGetWp) {
       let that = this;
       that.API.requestData({
         method: "GET",
         subUrl: "powercompare/windfarmAjax",
-        success (res) {
+        success(res) {
           that.wpArray = res.data;
           that.wpId = res.data[0].id;
           that.getWt(that.wpId, reGetWp);
-        }
+        },
       });
     },
 
     // 获取风机
-    getWt (wpid, reGetWp) {
+    getWt(wpid, reGetWp) {
       let that = this;
       if (that.wpId) {
         that.API.requestData({
@@ -119,115 +151,120 @@ export default {
           baseURL: "http://10.155.32.4:9001",
           subUrl: "benchmarking/wtList",
           data: {
-            wpid
+            wpid,
           },
-          success (res) {
+          success(res) {
             that.wtArray = res.data;
             that.wtId = res.data[0].id;
             if (!reGetWp) {
               that.getTabData();
             }
-          }
+          },
         });
       }
     },
 
-    getTabData () {
+    getTabData() {
       let that = this;
       that.API.requestData({
         method: "POST",
         subUrl: "powersaturation/powersaturationamonutlist",
         data: {
-          wtId: that.wtId
+          wtId: that.wtId,
         },
-        success (res) {
+        success(res) {
           that.tableData.data = res.data.list;
           that.getChartData();
-        }
+        },
       });
     },
 
     // 获取图表数据
-    getChartData () {
+    getChartData() {
       let that = this;
       that.API.requestData({
         method: "POST",
         subUrl: "powersaturation/powersaturationamonutchart",
         data: {
-          wtId: that.wtId
+          wtId: that.wtId,
         },
-        success (res) {
-          console.log('chartData1:',res)
+        success(res) {
           const keyArray = [
-          //   {
-          //   key: "value1",
-          //   title: "风速"
-          // }, 
-          {
-            key: "value2",
-            title: "实际拟合功率"
-          }, {
-            key: "value3",
-            title: "最优拟合功率"
-          }, {
-            key: "value4",
-            title: "保证功率"
-          }];
+            //   {
+            //   key: "value1",
+            //   title: "风速"
+            // },
+            {
+              key: "value2",
+              title: "实际拟合功率",
+            },
+            {
+              key: "value3",
+              title: "最优拟合功率",
+            },
+            {
+              key: "value4",
+              title: "保证功率",
+            },
+          ];
 
           let chartData = [
-          //   {
-          //   title: "风速",
-          //   // yAxisIndex: 1,
-          //    yAxisIndex: 0,
-          //   value: []
-          // },
+            //   {
+            //   title: "风速",
+            //   // yAxisIndex: 1,
+            //    yAxisIndex: 0,
+            //   value: []
+            // },
 
-           {
-            title: "实际拟合功率",
-            yAxisIndex: 0,
-            value: []
-          }, {
-            title: "最优拟合功率",
-            yAxisIndex: 0,
-            value: []
-          }, {
-            title: "保证功率",
-            yAxisIndex: 0,
-            value: []
-          }];
+            {
+              title: "实际拟合功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+            {
+              title: "最优拟合功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+            {
+              title: "保证功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+          ];
 
           keyArray.forEach((keyEle, keyIndex) => {
-            res.data.forEach(ele => {
+            res.data.forEach((ele) => {
               chartData[keyIndex].value.push({
                 text: "",
-                value: ele[keyEle.key]
+                value: ele[keyEle.key],
               });
             });
           });
 
           that.chartData = chartData;
-        }
+        },
       });
     },
 
-    search () {
+    search() {
       if (!this.wpId || !this.wtId) {
         this.BASE.showMsg({
-          msg: '场站与风机为必选项'
+          msg: "场站与风机为必选项",
         });
       } else {
         this.getTabData();
       }
-    }
+    },
   },
 
-  created () {
+  created() {
     this.getWp();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 
@@ -256,7 +293,7 @@ export default {
     height: 30vh;
 
     &:before {
-      content: '';
+      content: "";
       width: 0.37vh;
       height: 0.37vh;
       background: @write;

src/views/wtSaturability/tab2.vue

@@ -5,27 +5,57 @@
         <div class="query-item">
           <div class="lable">场站：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="(wpId) => { getWt(wpId, true); }">
-              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+              @change="
+                (wpId) => {
+                  getWt(wpId, true);
+                }
+              "
+            >
+              <el-option
+                v-for="item in wpArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">风机：</div>
           <div class="search-input">
-            <el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wtId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wtArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
-					<div class="lable">日期：</div>
-					<div class="search-input">
-						<el-date-picker v-model="recorddate" type="date"
-							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
-						</el-date-picker>
-					</div>
-				</div>
+          <div class="lable">日期：</div>
+          <div class="search-input">
+            <el-date-picker
+              v-model="recorddate"
+              type="month"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              popper-class="date-select"
+            >
+            </el-date-picker>
+          </div>
+        </div>
       </div>
       <div class="query-actions">
         <button class="btn green" @click="search">搜索</button>
@@ -34,8 +64,20 @@
     <div class="df-table">
       <ComTable height="35vh" :data="tableData"></ComTable>
     </div>
-    <Mlc height="300px" :list="chartData" :units="chartUnit" :showLegend="true" />
-    <el-dialog title="月风电功率编辑" v-model="dialogShow" width="85%" top="10vh" custom-class="modal" :close-on-click-modal="true">
+    <Mlc
+      height="300px"
+      :list="chartData"
+      :units="chartUnit"
+      :showLegend="true"
+    />
+    <el-dialog
+      title="月风电功率编辑"
+      v-model="dialogShow"
+      width="85%"
+      top="10vh"
+      custom-class="modal"
+      :close-on-click-modal="true"
+    >
       <el-form class="mg-b-16" label-width="100px" inline>
         <el-form-item class="mg-b-8" label="风机编号：">
           <el-input v-model="wtId" readonly placeholder=""></el-input>
@@ -44,19 +86,29 @@
           <el-input v-model="editItem._year" readonly placeholder=""></el-input>
         </el-form-item>
         <el-form-item class="mg-b-8" label="月份：">
-          <el-input v-model="editItem._month" readonly placeholder=""></el-input>
+          <el-input
+            v-model="editItem._month"
+            readonly
+            placeholder=""
+          ></el-input>
         </el-form-item>
         <el-form-item class="mg-b-8" label="风速：">
           <el-input v-model="editItem.speed" readonly placeholder=""></el-input>
         </el-form-item>
         <el-form-item class="mg-b-8" label="实际拟合：">
-          <el-input v-model="editItem.actualpower" placeholder="请输入"></el-input>
+          <el-input
+            v-model="editItem.actualpower"
+            placeholder="请输入"
+          ></el-input>
         </el-form-item>
         <el-form-item class="mg-b-8" label="最优拟合：">
-          <el-input v-model="editItem.optimalpower" placeholder="请输入"></el-input>
+          <el-input
+            v-model="editItem.optimalpower"
+            placeholder="请输入"
+          ></el-input>
         </el-form-item>
       </el-form>
-      <button style="width:100%;" class="btn" @click="editWtInfo">修改</button>
+      <button style="width: 100%" class="btn" @click="editWtInfo">修改</button>
     </el-dialog>
   </div>
 </template>
@@ -71,11 +123,11 @@ export default {
   // 使用组件
   components: {
     ComTable,
-    Mlc
+    Mlc,
   },
 
   // 数据
-  data () {
+  data() {
     const that = this;
     return {
       isAsc: "asc",
@@ -83,9 +135,11 @@ export default {
       wtArray: [],
       wpId: "",
       wtId: "",
-      editItem:{},
-      dialogShow:false,
-      recorddate:new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd"),
+      editItem: {},
+      dialogShow: false,
+      recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
+        "yyyy-MM-dd"
+      ),
       tableData: {
         column: [
           {
@@ -93,28 +147,28 @@ export default {
             field: "windturbineid",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "风速",
             field: "speed",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "实际拟合功率",
             field: "actualpower",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "最优拟合功率",
             field: "optimalpower",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           // {
           //   name: "操作",
@@ -122,8 +176,8 @@ export default {
           //   is_num: false,
           //   is_light: false,
           //   template() {
-					// 			return "<el-button type='text' style='cursor: pointer;'>修改</el-button>";
-					// 	},
+          // 			return "<el-button type='text' style='cursor: pointer;'>修改</el-button>";
+          // 	},
           //   click(e, row){
           //     that.editItem = row;
           //     that.editItem._year = new Date(that.recorddate).getFullYear();
@@ -134,34 +188,36 @@ export default {
         ],
         data: [],
       },
-      chartData: [{
-        title: "",
-        yAxisIndex: 0,
-        value: []
-      }],
+      chartData: [
+        {
+          title: "",
+          yAxisIndex: 0,
+          value: [],
+        },
+      ],
       // chartUnit: ["功率(MW)", "(m/s)"]
-       chartUnit: ["功率(MW)"]
+      chartUnit: ["功率(MW)"],
     };
   },
 
   // 函数
   methods: {
     // 获取风场
-    getWp (reGetWp) {
+    getWp(reGetWp) {
       let that = this;
       that.API.requestData({
         method: "GET",
         subUrl: "powercompare/windfarmAjax",
-        success (res) {
+        success(res) {
           that.wpArray = res.data;
           that.wpId = res.data[0].id;
           that.getWt(that.wpId, reGetWp);
-        }
+        },
       });
     },
 
     // 获取风机
-    getWt (wpid, reGetWp) {
+    getWt(wpid, reGetWp) {
       let that = this;
       if (that.wpId) {
         that.API.requestData({
@@ -169,20 +225,20 @@ export default {
           baseURL: "http://10.155.32.4:9001",
           subUrl: "benchmarking/wtList",
           data: {
-            wpid
+            wpid,
           },
-          success (res) {
+          success(res) {
             that.wtArray = res.data;
             that.wtId = res.data[0].id;
             if (!reGetWp) {
               that.getTabData();
             }
-          }
+          },
         });
       }
     },
 
-    getTabData () {
+    getTabData() {
       let that = this;
       that.API.requestData({
         method: "POST",
@@ -190,17 +246,17 @@ export default {
         data: {
           wtId: that.wtId,
           year: new Date(that.recorddate).getFullYear(),
-          month: (new Date(that.recorddate).getMonth() + 1)
+          month: new Date(that.recorddate).getMonth() + 1,
         },
-        success (res) {
+        success(res) {
           that.tableData.data = res.data.list;
           that.getChartData();
-        }
+        },
       });
     },
 
     // 获取图表数据
-    getChartData () {
+    getChartData() {
       let that = this;
       that.API.requestData({
         method: "POST",
@@ -208,95 +264,99 @@ export default {
         data: {
           wtId: that.wtId,
           year: new Date(that.recorddate).getFullYear(),
-          month: (new Date(that.recorddate).getMonth() + 1)
+          month: new Date(that.recorddate).getMonth() + 1,
         },
-        success (res) {
-
+        success(res) {
           const keyArray = [
-          //   {
-          //   key: "value1",
-          //   title: "风速"
-          // }, 
-          {
-            key: "value2",
-            title: "实际拟合功率"
-          }, {
-            key: "value3",
-            title: "最优拟合功率"
-          }, {
-            key: "value4",
-            title: "保证功率"
-          }];
+            //   {
+            //   key: "value1",
+            //   title: "风速"
+            // },
+            {
+              key: "value2",
+              title: "实际拟合功率",
+            },
+            {
+              key: "value3",
+              title: "最优拟合功率",
+            },
+            {
+              key: "value4",
+              title: "保证功率",
+            },
+          ];
 
           let chartData = [
-          //   {
-          //   title: "风速",
-          //   // yAxisIndex: 1,
-          //    yAxisIndex: 0,
-          //   value: []
-          // },
-           {
-            title: "实际拟合功率",
-            yAxisIndex: 0,
-            value: []
-          }, {
-            title: "最优拟合功率",
-            yAxisIndex: 0,
-            value: []
-          }, {
-            title: "保证功率",
-            yAxisIndex: 0,
-            value: []
-          }];
+            //   {
+            //   title: "风速",
+            //   // yAxisIndex: 1,
+            //    yAxisIndex: 0,
+            //   value: []
+            // },
+            {
+              title: "实际拟合功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+            {
+              title: "最优拟合功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+            {
+              title: "保证功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+          ];
 
           keyArray.forEach((keyEle, keyIndex) => {
-            res.data.forEach(ele => {
+            res.data.forEach((ele) => {
               chartData[keyIndex].value.push({
                 text: "",
-                value: ele[keyEle.key]
+                value: ele[keyEle.key],
               });
             });
           });
 
           that.chartData = chartData;
-        }
+        },
       });
     },
 
     // 编辑
-    editWtInfo(){
+    editWtInfo() {
       let that = this;
 
       that.editItem.actualpower += "";
       that.editItem.optimalpower += "";
 
-      if(!that.editItem.actualpower || !that.editItem.optimalpower){
+      if (!that.editItem.actualpower || !that.editItem.optimalpower) {
         that.BASE.showMsg({
-          msg:"实际拟合与最优拟合不可为空"
+          msg: "实际拟合与最优拟合不可为空",
         });
-      }else{
-        
+      } else {
       }
     },
 
-    search () {
+    search() {
       if (!this.wpId || !this.wtId) {
         this.BASE.showMsg({
-          msg: '场站与风机为必选项'
+          msg: "场站与风机为必选项",
         });
       } else {
         this.getTabData();
       }
-    }
+    },
   },
 
-  created () {
+  created() {
     this.getWp();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 
@@ -325,7 +385,7 @@ export default {
     height: 30vh;
 
     &:before {
-      content: '';
+      content: "";
       width: 0.37vh;
       height: 0.37vh;
       background: @write;

src/views/wtSaturability/tab3.vue

@@ -5,27 +5,57 @@
         <div class="query-item">
           <div class="lable">场站：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="(wpId) => { getWt(wpId, true); }">
-              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+              @change="
+                (wpId) => {
+                  getWt(wpId, true);
+                }
+              "
+            >
+              <el-option
+                v-for="item in wpArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">风机：</div>
           <div class="search-input">
-            <el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wtId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wtArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
-					<div class="lable">日期：</div>
-					<div class="search-input">
-						<el-date-picker v-model="recorddate" type="date"
-							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
-						</el-date-picker>
-					</div>
-				</div>
+          <div class="lable">日期：</div>
+          <div class="search-input">
+            <el-date-picker
+              v-model="recorddate"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              popper-class="date-select"
+            >
+            </el-date-picker>
+          </div>
+        </div>
       </div>
       <div class="query-actions">
         <button class="btn green" @click="search">搜索</button>
@@ -34,8 +64,20 @@
     <div class="df-table">
       <ComTable height="35vh" :data="tableData"></ComTable>
     </div>
-    <Mlc height="300px" :list="chartData" :units="chartUnit" :showLegend="true" />
-    <el-dialog title="月风电功率编辑" v-model="dialogShow" width="85%" top="10vh" custom-class="modal" :close-on-click-modal="true">
+    <Mlc
+      height="300px"
+      :list="chartData"
+      :units="chartUnit"
+      :showLegend="true"
+    />
+    <el-dialog
+      title="月风电功率编辑"
+      v-model="dialogShow"
+      width="85%"
+      top="10vh"
+      custom-class="modal"
+      :close-on-click-modal="true"
+    >
       <el-form class="mg-b-16" label-width="100px" inline>
         <el-form-item class="mg-b-8" label="风机编号：">
           <el-input v-model="wtId" readonly placeholder=""></el-input>
@@ -44,19 +86,29 @@
           <el-input v-model="editItem._year" readonly placeholder=""></el-input>
         </el-form-item>
         <el-form-item class="mg-b-8" label="月份：">
-          <el-input v-model="editItem._month" readonly placeholder=""></el-input>
+          <el-input
+            v-model="editItem._month"
+            readonly
+            placeholder=""
+          ></el-input>
         </el-form-item>
         <el-form-item class="mg-b-8" label="风速：">
           <el-input v-model="editItem.speed" readonly placeholder=""></el-input>
         </el-form-item>
         <el-form-item class="mg-b-8" label="实际拟合：">
-          <el-input v-model="editItem.actualpower" placeholder="请输入"></el-input>
+          <el-input
+            v-model="editItem.actualpower"
+            placeholder="请输入"
+          ></el-input>
         </el-form-item>
         <el-form-item class="mg-b-8" label="最优拟合：">
-          <el-input v-model="editItem.optimalpower" placeholder="请输入"></el-input>
+          <el-input
+            v-model="editItem.optimalpower"
+            placeholder="请输入"
+          ></el-input>
         </el-form-item>
       </el-form>
-      <button style="width:100%;" class="btn" @click="editWtInfo">修改</button>
+      <button style="width: 100%" class="btn" @click="editWtInfo">修改</button>
     </el-dialog>
   </div>
 </template>
@@ -71,11 +123,11 @@ export default {
   // 使用组件
   components: {
     ComTable,
-    Mlc
+    Mlc,
   },
 
   // 数据
-  data () {
+  data() {
     const that = this;
     return {
       isAsc: "asc",
@@ -83,9 +135,11 @@ export default {
       wtArray: [],
       wpId: "",
       wtId: "",
-      editItem:{},
-      dialogShow:false,
-      recorddate:new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd"),
+      editItem: {},
+      dialogShow: false,
+      recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
+        "yyyy-MM-dd"
+      ),
       tableData: {
         column: [
           {
@@ -93,28 +147,28 @@ export default {
             field: "windturbineid",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "风速",
             field: "speed",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "实际拟合功率",
             field: "actualpower",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "最优拟合功率",
             field: "optimalpower",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           // {
           //   name: "操作",
@@ -122,8 +176,8 @@ export default {
           //   is_num: false,
           //   is_light: false,
           //   template() {
-					// 			return "<el-button type='text' style='cursor: pointer;'>修改</el-button>";
-					// 	},
+          // 			return "<el-button type='text' style='cursor: pointer;'>修改</el-button>";
+          // 	},
           //   click(e, row){
           //     that.editItem = row;
           //     that.editItem._year = new Date(that.recorddate).getFullYear();
@@ -134,34 +188,36 @@ export default {
         ],
         data: [],
       },
-      chartData: [{
-        title: "",
-        yAxisIndex: 0,
-        value: []
-      }],
+      chartData: [
+        {
+          title: "",
+          yAxisIndex: 0,
+          value: [],
+        },
+      ],
       // chartUnit: ["功率(MW)", "(m/s)"]
-       chartUnit: ["功率(MW)"]
+      chartUnit: ["功率(MW)"],
     };
   },
 
   // 函数
   methods: {
     // 获取风场
-    getWp (reGetWp) {
+    getWp(reGetWp) {
       let that = this;
       that.API.requestData({
         method: "GET",
         subUrl: "powercompare/windfarmAjax",
-        success (res) {
+        success(res) {
           that.wpArray = res.data;
           that.wpId = res.data[0].id;
           that.getWt(that.wpId, reGetWp);
-        }
+        },
       });
     },
 
     // 获取风机
-    getWt (wpid, reGetWp) {
+    getWt(wpid, reGetWp) {
       let that = this;
       if (that.wpId) {
         that.API.requestData({
@@ -169,132 +225,136 @@ export default {
           baseURL: "http://10.155.32.4:9001",
           subUrl: "benchmarking/wtList",
           data: {
-            wpid
+            wpid,
           },
-          success (res) {
+          success(res) {
             that.wtArray = res.data;
             that.wtId = res.data[0].id;
             if (!reGetWp) {
               that.getTabData();
             }
-          }
+          },
         });
       }
     },
 
-    getTabData () {
+    getTabData() {
       let that = this;
       that.API.requestData({
         method: "POST",
         subUrl: "powersaturation/powersaturationlist",
         data: {
           wtId: that.wtId,
-          recorddate: that.recorddate
+          recorddate: that.recorddate,
         },
-        success (res) {
+        success(res) {
           that.tableData.data = res.data.list;
           that.getChartData();
-        }
+        },
       });
     },
 
     // 获取图表数据
-    getChartData () {
+    getChartData() {
       let that = this;
       that.API.requestData({
         method: "POST",
         subUrl: "powersaturation/powersaturationchart",
         data: {
           wtId: that.wtId,
-          recorddate: that.recorddate
+          recorddate: that.recorddate,
         },
-        success (res) {
-
+        success(res) {
           const keyArray = [
-          //   {
-          //   key: "value1",
-          //   title: "风速"
-          // }, 
-          {
-            key: "value2",
-            title: "实际拟合功率"
-          }, {
-            key: "value3",
-            title: "最优拟合功率"
-          }, {
-            key: "value4",
-            title: "保证功率"
-          }];
+            //   {
+            //   key: "value1",
+            //   title: "风速"
+            // },
+            {
+              key: "value2",
+              title: "实际拟合功率",
+            },
+            {
+              key: "value3",
+              title: "最优拟合功率",
+            },
+            {
+              key: "value4",
+              title: "保证功率",
+            },
+          ];
 
           let chartData = [
-          //   {
-          //   title: "风速",
-          //   // yAxisIndex: 1,
-          //    yAxisIndex: 0,
-          //   value: []
-          // }, 
-          {
-            title: "实际拟合功率",
-            yAxisIndex: 0,
-            value: []
-          }, {
-            title: "最优拟合功率",
-            yAxisIndex: 0,
-            value: []
-          }, {
-            title: "保证功率",
-            yAxisIndex: 0,
-            value: []
-          }];
+            //   {
+            //   title: "风速",
+            //   // yAxisIndex: 1,
+            //    yAxisIndex: 0,
+            //   value: []
+            // },
+            {
+              title: "实际拟合功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+            {
+              title: "最优拟合功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+            {
+              title: "保证功率",
+              yAxisIndex: 0,
+              value: [],
+            },
+          ];
 
           keyArray.forEach((keyEle, keyIndex) => {
-            res.data.forEach(ele => {
+            res.data.forEach((ele) => {
               chartData[keyIndex].value.push({
                 text: "",
-                value: ele[keyEle.key]
+                value: ele[keyEle.key],
               });
             });
           });
 
           that.chartData = chartData;
-        }
+        },
       });
     },
 
     // 编辑
-    editWtInfo(){
+    editWtInfo() {
       let that = this;
 
       that.editItem.actualpower += "";
       that.editItem.optimalpower += "";
 
-      if(!that.editItem.actualpower || !that.editItem.optimalpower){
+      if (!that.editItem.actualpower || !that.editItem.optimalpower) {
         that.BASE.showMsg({
-          msg:"实际拟合与最优拟合不可为空"
+          msg: "实际拟合与最优拟合不可为空",
         });
-      }else{
-        
+      } else {
       }
     },
 
-    search () {
+    search() {
       if (!this.wpId || !this.wtId) {
         this.BASE.showMsg({
-          msg: '场站与风机为必选项'
+          msg: "场站与风机为必选项",
         });
       } else {
         this.getTabData();
       }
-    }
+    },
   },
 
-  created () {
+  created() {
     this.getWp();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 
@@ -323,7 +383,7 @@ export default {
     height: 30vh;
 
     &:before {
-      content: '';
+      content: "";
       width: 0.37vh;
       height: 0.37vh;
       background: @write;