更新了饲喂效率接口

.env.development

@@ -3,11 +3,11 @@ ENV = 'development'
 
 # base api
 # 测试线
-# VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
+VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
 
 
 #许义平本地
-VUE_APP_BASE_API = 'http://192.168.1.96:8090/'
+# VUE_APP_BASE_API = 'http://192.168.1.96:8090/'
 
 #=====
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

src/views/dashboard/index.vue

@@ -164,7 +164,15 @@
           <div v-if="abnormal.chart1.isChart">
             <div id="chartLine3" v-loading="abnormal.chart1.listLoading" style="height:420px;" />
           </div>
-          <div v-else style="margin: 10px 10px;">
+          <div v-else style="margin: 10px 10px;">
+            <el-select v-model="abnormal.value2" style="width:100px;margin-right: 5px;margin-bottom:10px;" class="filter-item" @change="changeformula('3')">
+              <el-option v-for="item in abnormal.formulaList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select v-model="abnormal.value2" style="width:100px;margin-right: 5px;margin-bottom:10px;" class="filter-item" @change="changeformula('3')">
+              <el-option v-for="item in abnormal.formulaList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
             <el-table :data="abnormal.chart1.tableDataList1" border style="width: 100%;" :max-height="410"
               :row-style="rowStyle" :cell-style="cellStyle" class="elTable">
               <el-table-column label="牧场" min-width="130px" align="center" prop="pasture_name" />
@@ -370,7 +378,7 @@
         start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 31)
         end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
         that.abnormal.inputDatetime = [start2, end2]
-        // that.getFormulaList()
+        that.getFormulaList()
       },
       getFormulaList() {
         let page = 1

src/views/statisticalAnalysis/feedingEfficiency/index.vue

@@ -640,10 +640,11 @@ export default {
         selectYear: parseTime(new Date(), '{y}'),
         yearList: [],
         weekList: [],
-        
+
         table: {
           getdataListParm: {
-            name: 'getFeedEfficiencyFT',
+            // name: 'getFeedEfficiencyFT',
+            name:'getPriceAnalysisLS',
             page: 1,
             offset: 1,
             pagecount: '',
@@ -1707,7 +1708,7 @@ export default {
       let page_size = 0
       let url = '/api/v1/ops/feed_efficiency/statistics' + '?page=' + page + '&page_size=' + page_size
       let data = {
-        'pasture_id':this.tab.table.getdataListParm.parammaps.pastureId,
+        'pasture_id':[this.tab.table.getdataListParm.parammaps.pastureId],
         'start_time':this.tab.table.getdataListParm.parammaps.startTime,
         'api_name':this.tab.table.getdataListParm.name,
         'formula_template':this.tab.table.getdataListParm.parammaps.ftname,