修改 江

src/views/overview/components/production_indicator_all/index.vue

@@ -40,47 +40,7 @@
           ></Rader> -->
           <!-- {{ Object.keys(itemCsv.data[0]).length }} -->
           <el-table
-<<<<<<< HEAD
-            v-if="Object.keys(itemCsv.data[0]).length > 4"
-            :data="itemCsv.data"
-            :key="itemind + 'itemCsv'"
-            border
-            style="width: 100%"
-            max-height="500"
-            align="center"
-          >
-            <el-table-column prop="EPActualTotal" label="实发电量（瓦）">
-            </el-table-column>
-            <el-table-column prop="TurbinePowerRate" label="风机能量利用率（百分比）">
-            </el-table-column>
-            <el-table-column prop="EPLostStopPercent" label="停机损失百分比">
-            </el-table-column>
-            <el-table-column prop="EPLostBadPercent" label="欠发损失百分比">
-            </el-table-column>
-            <el-table-column
-              prop="EPLostPerformPercent"
-              label="功率曲线未达标损失百分比"
-            >
-            </el-table-column>
-            <el-table-column prop="EPLostLimitPercent" label="限电损失百分比">
-            </el-table-column>
-            <el-table-column prop="TurbineRunRate" label="风机可利用率">
-            </el-table-column>
-            <el-table-column prop="mean_width" label="功率水平平均宽度">
-            </el-table-column>
-            <el-table-column prop="variance_width" label="功率水平方差">
-            </el-table-column>
-            <el-table-column prop="WindSpeedAvr" label="平均风速（m/s）">
-            </el-table-column>
-            <el-table-column prop="Thi" label="利用小时"> </el-table-column>
-            <el-table-column prop="Ws" label="功率曲线一致性系数">
-            </el-table-column>
-          </el-table>
-          <el-table
-            v-else
-=======
             v-if="Object.keys(itemCsv.data[0]).length <= 4"
->>>>>>> bde28cebc42d6e697f93ab31156a79a2970d71f8
             :data="itemCsv.data"
             border
             style="width: 100%"