Merge branch 'feature/ErrorAnalysis_formulaselect' of duanxiaoduan/tmr-admin into release/v1.0.2

src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -601,7 +601,10 @@
                     </el-select> -->
                     <!-- 其他牧场  -->
                     <my-select ref="tenantselect" :model="tab.chart7.getdataListParm.parammaps.statisticsList" :option="tab.chart7.statisticsList"  :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart7" />
-                    <el-radio-group v-model="tab.chart7.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart7')">
+                    <el-select v-model="tab.chart7.getdataListParm.parammaps.ftId" multiple collapse-tags placeholder="请选择"  @change="changeformula()">
+                      <el-option v-for="item in tab.chart7.formulaList" :key="item.id" :label="item.tname" :value="item.id" />
+                    </el-select>
+                    <el-radio-group v-model="tab.chart7.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;margin-left: 10px;" @change="changeChartSpecificDate('chart7')">
                       <el-radio-button label="1" border>日</el-radio-button>
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
@@ -1701,6 +1704,7 @@ export default {
           listLoading: true,
           statisticsList: [],
           chart7Data3: [],
+          formulaList:[],
           isChart: true,
           isTable: false,
           table: {
@@ -1877,6 +1881,7 @@ export default {
     this.getIsDisplay()
     this.getTabList()
     this.getTabList2()
+    this.getformulaList()
     // 暂时注释
     // this.getChart1()
     // this.getChart2()
@@ -1887,6 +1892,22 @@ export default {
   },
   mounted() {},
   methods: {
+    // tab.chart7.formulaList
+    getformulaList() {
+      let url = 'authdata/GetDataByName'
+      let data = {
+        "name":"getFeedTempletName",
+        "page":1,"offset":1,"pagecount":"","returntype":"Map",
+        "parammaps":{"pastureid":Cookies.get('pastureid')},
+      }
+      postJson(url, data).then(response => {
+        if (response.data.list !== null) {
+          this.tab.chart7.formulaList = response.data.list
+        } else {
+          this.tab.chart7.formulaList = []
+        }
+      })
+    },
     getAllYear() {
       var myDate = new Date()
       var thisYear = myDate.getFullYear() // 获取当年年份
@@ -4175,7 +4196,9 @@ export default {
         this.tab.chart6.chartLine.resize()
       }
     },
-
+    changeformula(){
+      this.getChart7()
+    },
     // 栏舍撒料时间统计
     changeStatisticChart7(arr) {
       console.log(arr,'arr')
@@ -4225,11 +4248,13 @@ export default {
         data.parammaps.startTime = parseTime(this.tab.chart7.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         data.parammaps.stopTime = parseTime(this.tab.chart7.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
         data.parammaps.status = this.tab.chart7.getdataListParm.parammaps.status
+        data.parammaps.ftId = this.tab.chart7.getdataListParm.parammaps.ftId.join(",")
       } else {
         data.parammaps.pastureid = this.tab.chart7.getdataListParm.parammaps.pastureid
         data.parammaps.startTime = this.tab.chart7.getdataListParm.parammaps.startTime
         data.parammaps.stopTime = this.tab.chart7.getdataListParm.parammaps.stopTime
         data.parammaps.status = this.tab.chart7.getdataListParm.parammaps.status
+        data.parammaps.ftId = this.tab.chart7.getdataListParm.parammaps.ftId.join(",")
       }
       postJson(url, data).then(response => {
         if (response.data !== null && response.data.list !== null && response.data.data !== null) {