Merge branch 'feature/index' into feature/merge1115

src/views/dashboard/editor/index.vue

@@ -729,7 +729,7 @@ export default {
         series: [
           { type: 'bar', barWidth: 20, data: chart_data1.data2, name:'设备指标迄今预算' },
           { type: 'bar', barWidth: 20, data: chart_data1.data3, name:'设备指标迄今实际' },
-          { type: 'line', data: chart_data1.data4, name:'完成率' }
+          { type: 'line',yAxisIndex: 1, data: chart_data1.data4, name:'完成率' }
         ]
       }
       this.row2.chart3.Chart.setOption(option)

src/views/report/equipmentIndex/index.vue

@@ -44,7 +44,7 @@
                 <a @click="clickEquipmentIndex(row)">{{ row.pastureName }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="饲养头日" sortable min-width="80px" align="center" prop="monthBudget" />
+            <el-table-column label="饲养头日" sortable min-width="80px" align="center" prop="cowSum" />
           </el-table-column>
           <el-table-column label="总指标(万元)" align="center">
             <el-table-column label="预算" sortable min-width="80px" align="center" prop="monthBudget" />