Merge remote-tracking branch 'origin/master'

ipfcst/ipfcst-reportquery/src/main/frontend/views/parameterConfiguration/FanUnitInfo/index.vue

@@ -59,7 +59,7 @@
           </el-table-column>
           <el-table-column
             prop="fanNumArrs"
-            label="风机编号组"
+            label="风机编号"
           >
           </el-table-column>
           <el-table-column label="操作">
@@ -112,7 +112,7 @@
             <el-form-item label="基准风机" prop="benchmarkFan">
               <el-input v-model="form.benchmarkFan" style="width: 70%"></el-input>
             </el-form-item>
-            <el-form-item label="风机编号组" prop="fanNumArrs">
+            <el-form-item label="风机编号" prop="fanNumArrs">
               <el-input
                 type="textarea"
                 :rows="3"

ipfcst/ipfcst-reportquery/src/main/frontend/views/parameterConfiguration/WindTurbinePowerCurve/charts/index.vue

@@ -121,7 +121,7 @@
           }],
           yAxis: [{
             type: 'value',
-            name: '(MW)',
+            name: '(KW)',
             axisTick: {
               show: false
             },