Merge branch 'feature/ci-test11' of duanxiaoduan/tmr-group-admin into develop

src/views/dashboard/index.vue

@@ -83,10 +83,10 @@
                 <el-option v-for="item in time.cattleTpyeList" :key="item.value" :label="item.label"
                   :value="item.value"> </el-option>
               </el-select>
-              <el-select v-model="time.value2" style="width:150px;margin-right: 5px;" class="filter-item" @change="changeformula('2')">
+              <!-- <el-select v-model="time.value2" style="width:150px;margin-right: 5px;" class="filter-item" @change="changeformula('2')">
                 <el-option v-for="item in time.formulaList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
-              </el-select>
+              </el-select> -->
               <el-date-picker v-model="time.inputDatetime" :clearable="false" class="inputDatetime filter-item"
                 type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
                 style="width: 250px;" :picker-options="pickerOptions" @change="changeDate('2')"/>
@@ -603,14 +603,14 @@
         })
         let data = {
           'cattle_parent_category_id': this.time.value1,
-          'feed_formula_id':this.time.value2,
+          // 'feed_formula_id':this.time.value2,
           'start_date': parseTime(this.time.inputDatetime[0], '{y}-{m}-{d}'),
           'end_date': parseTime(this.time.inputDatetime[1], '{y}-{m}-{d}'),
           'pasture_ids': pasture_ids,
         }
-        if (this.time.value2 == '') {
-          data.feed_formula_id = 0
-        }
+        // if (this.time.value2 == '') {
+        //   data.feed_formula_id = 0
+        // }
         postJson(url, data).then(response => {
           if (response.code == 200) {
             this.time.chart1.lineData1 = response.data.chart
@@ -727,18 +727,17 @@
             containLabel: true
           },
           xAxis: [{
-            type: 'category',
-            boundaryGap: false,
             data: chartLine_data.date_day,
-            axisLabel: {
-              showMinLabel: true,
-              showMaxLabel: true,
-            },
-            axisLine: {
-              lineStyle: {
-                color: '#666'
-              }
-            },
+            type: 'category',
+            // boundaryGap: false,
+            // axisLabel: {
+            //   showMinLabel: true,
+            // },
+            // axisLine: {
+            //   lineStyle: {
+            //     color: '#666'
+            //   }
+            // },
           }],
           yAxis: [{
             type: 'value',
@@ -756,15 +755,17 @@
               var item = {
                 name: chartLine_data.pasture_name[i],
                 data: chartLine_data.data_list[i],
-                type: 'bar',
+                type: 'bar',
+                barMaxWidth: 20, // 每一个都要设置
+                barMinWidth: 5,
                 // smooth: true,
                 // itemStyle: {
                 //   borderColor: '#fff',
                 //   borderWidth: 2
                 // },
-                label: {
-                  // normal: {  show: true },
-                },
+                // label: {
+                //   // normal: {  show: true },
+                // },
               }
               serie.push(item);
             }
@@ -893,9 +894,7 @@
                   rate2 = 0
                 }
 
-                var res = data[0].marker + data[0].seriesName + '<br/>'
-                + "总占比"+rate1+"%"+ '<span style="margin-left:10px;color:#ccc;">'+ a + '次'+'</span>'+ '<br/>'
-                 + data[1].marker + data[1].seriesName+':'+'<br/>' + "总占比"+rate2+"%"+ "<span style='margin-left:10px;color:#ccc;'>"+ data[1].data + '次' + "</span>"
+                var res = data[0].marker + data[0].seriesName + '<br/>' + "总占比"+rate1+"%"+ '<span style="margin-left:10px;color:#ccc;">'+ a + '次'+'</span>'+ '<br/>' + data[1].marker + data[1].seriesName+':'+'<br/>' + "总占比"+rate2+"%"+ "<span style='margin-left:10px;color:#ccc;'>"+ data[1].data + '次' + "</span>"
                 return res
             }
           },

src/views/recipe/recipeList/index.vue

@@ -1160,7 +1160,7 @@ export default {
         dialogFormVisible: false,
         getdataListParm: {
           name: 'getFitHistory1', 'name1': 'getFitHistory2', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
-          parammaps: { inputDatetime: '', pastureid: '', fitid: '' }
+          parammaps: { inputDatetime: [new Date(), new Date()], pastureid: '', fitid: '' }
         },
         tableKey: 0, total: 0, listLoading: true, list: []
       },
@@ -3124,12 +3124,11 @@ export default {
     },
     handleFormulationEvaluation(row) {
       console.log(row)
-      alert('跳转页面弹窗接口待对接')
       // this.$router.push({ path: '/statisticalAnalysis/FormulationEvaluation', query: { tname: row.tname }})
       this.$router.push({
         name: 'FormulationEvaluation',
         params: {
-          tname: row.tname,
+          tname: row.name,
           ftid: row.id,
           pastureid: row.pastureid,
           startTime: parseTime(new Date(), '{y}-{m}-{d}'),
@@ -3140,15 +3139,14 @@ export default {
     },
     // 使用概况
     handleRowUsageOverview(row) {
-      alert('接口待对接')
       console.log(row)
       this.usageOverview.temp = Object.assign({}, row)
       this.usageOverview.dialogFormVisible = true
-      this.textMap.usageOverviewTxt = row.tname + '配方使用概况'
+      this.textMap.usageOverviewTxt = row.name + '配方使用概况'
       this.usageOverview.dialogStatus = 'usageOverviewTxt'
       this.usageOverview.getdataListParm.parammaps.pastureid = row.pastureid
       this.usageOverview.getdataListParm.parammaps.fitid = row.id
-      this.usageOverview.getdataListParm.parammaps.inputDatetime = []
+      this.usageOverview.getdataListParm.parammaps.inputDatetime = [new Date(), new Date()]
       this.getRowUsageOverviewList()
     },
     getRowUsageOverviewList() {
@@ -3159,11 +3157,15 @@ export default {
         this.usageOverview.getdataListParm.parammaps.startTime = ''
         this.usageOverview.getdataListParm.parammaps.stopTime = ''
       } else {
-        this.usageOverview.getdataListParm.parammaps.startTime = this.usageOverview.getdataListParm.parammaps.inputDatetime[0]
-        this.usageOverview.getdataListParm.parammaps.stopTime = this.usageOverview.getdataListParm.parammaps.inputDatetime[1]
+        this.usageOverview.getdataListParm.parammaps.startTime = parseTime(this.usageOverview.getdataListParm.parammaps.inputDatetime[0],'{y}-{m}-{d}')
+        this.usageOverview.getdataListParm.parammaps.stopTime = parseTime(this.usageOverview.getdataListParm.parammaps.inputDatetime[1],'{y}-{m}-{d}')
+      }
+      const url = 'api/v1/ops/feed_formula/usage'
+      const data = {
+        'feed_formula_id':this.usageOverview.temp.id,
+        'start_time':this.usageOverview.getdataListParm.parammaps.startTime,
+        'end_time':this.usageOverview.getdataListParm.parammaps.stopTime
       }
-      const url = 'authdata/GetArrList'
-      const data = this.usageOverview.getdataListParm
       postJson(url, data).then(response => {
         if (response.data.list !== null) {
           for (let i = 0; i < response.data.list.length; i++) {

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -641,19 +641,19 @@ export default {
 
   created() {
     if (this.$route.params.tname !== '' && this.$route.params.tname !== undefined && this.$route.params.start_time !== undefined && this.$route.params.end_time !== undefined) {
-      console.log(this.table.getdataListParm.parammaps.inputDatetime, 'this.table.getdataListParm.parammaps.inputDatetime')
-      this.table.getdataListParm.parammaps.start_time = this.$route.params.start_time
-      this.table.getdataListParm.parammaps.end_time = this.$route.params.end_time
+      console.log(this.table.parammaps.inputDatetime, 'this.table.parammaps.inputDatetime')
+      this.table.parammaps.start_time = this.$route.params.start_time
+      this.table.parammaps.end_time = this.$route.params.end_time
       this.textMap.see = '栏舍详情——' + this.$route.params.tname
       setTimeout(() => {
         this.dialogFull = false
         this.see.dialogStatus = 'see'
         this.see.dialogFormVisible = true
       }, 500)
-      this.see.table.getdataListParm.parammaps.ftid = this.$route.params.ftid
-      this.see.table.getdataListParm.parammaps.pastureid = this.$route.params.pastureid
-      this.see.table.getdataListParm.parammaps.start_time = this.table.getdataListParm.parammaps.start_time
-      this.see.table.getdataListParm.parammaps.end_time = this.table.getdataListParm.parammaps.end_time
+      this.see.table.parammaps.ftid = this.$route.params.ftid
+      this.see.table.parammaps.pastureid = this.$route.params.pastureid
+      this.see.table.parammaps.start_time = this.table.parammaps.start_time
+      this.see.table.parammaps.end_time = this.table.parammaps.end_time
       this.getListSee()
     }
     this.getList()
@@ -752,34 +752,34 @@ export default {
     },
 
     changeDate() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        this.table.getdataListParm.parammaps.start_time = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-        this.table.getdataListParm.parammaps.end_time = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      if (this.table.parammaps.inputDatetime !== '' && this.table.parammaps.inputDatetime !== null) {
+        this.table.parammaps.start_time = parseTime(this.table.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+        this.table.parammaps.end_time = parseTime(this.table.parammaps.inputDatetime[1], '{y}-{m}-{d}')
         this.getList()
       }
     },
     handleBefore() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
+      if (this.table.parammaps.inputDatetime !== '' && this.table.parammaps.inputDatetime !== null) {
+        var start = new Date(this.table.parammaps.inputDatetime[0].setDate(this.table.parammaps.inputDatetime[0].getDate() - 1))
+        var stop = new Date(this.table.parammaps.inputDatetime[1].setDate(this.table.parammaps.inputDatetime[1].getDate() - 1))
+        this.table.parammaps.inputDatetime.length = 0
+        this.table.parammaps.inputDatetime.push(start, stop)
         this.$forceUpdate()
       }
-      this.table.getdataListParm.parammaps.start_time = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.end_time = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.table.parammaps.start_time = parseTime(this.table.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.table.parammaps.end_time = parseTime(this.table.parammaps.inputDatetime[1], '{y}-{m}-{d}')
       this.getList()
     },
     handleNext() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
+      if (this.table.parammaps.inputDatetime !== '' && this.table.parammaps.inputDatetime !== null) {
+        var start2 = new Date(this.table.parammaps.inputDatetime[0].setDate(this.table.parammaps.inputDatetime[0].getDate() + 1))
+        var stop2 = new Date(this.table.parammaps.inputDatetime[1].setDate(this.table.parammaps.inputDatetime[1].getDate() + 1))
+        this.table.parammaps.inputDatetime.length = 0
+        this.table.parammaps.inputDatetime.push(start2, stop2)
         this.$forceUpdate()
       }
-      this.table.getdataListParm.parammaps.start_time = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.end_time = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.table.parammaps.start_time = parseTime(this.table.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.table.parammaps.end_time = parseTime(this.table.parammaps.inputDatetime[1], '{y}-{m}-{d}')
       this.getList()
     },
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
@@ -879,8 +879,8 @@ export default {
       this.see.dialogFormVisible = true
       this.see.table.getdataListParm.parammaps.ftid = row.ftid
       this.see.table.getdataListParm.parammaps.pastureid = row.pastureid
-      this.see.table.getdataListParm.parammaps.start_time = this.table.getdataListParm.parammaps.start_time
-      this.see.table.getdataListParm.parammaps.end_time = this.table.getdataListParm.parammaps.end_time
+      this.see.table.getdataListParm.parammaps.start_time = this.table.parammaps.start_time
+      this.see.table.getdataListParm.parammaps.end_time = this.table.parammaps.end_time
       this.getListSee()
     },
     getListSee() {

src/views/statisticalAnalysis/processAnalysis/index.vue

@@ -511,7 +511,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+ import * as echarts from 'echarts';
 
 require('echarts/theme/macarons')
 import { GetDataByName,GetDataByNames, GetReportform, formatNum,processAnalysist,postJson } from '@/api/common'