Merge branch 'beefcattleAdmin' of http://192.168.1.8:3000/duanxiaoduan/tmr-admin into beefcattleAdmin

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

@@ -92,7 +92,7 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4 style="text-align:center;">泌乳牛干物质采食量</h4>
+                <h4 style="text-align:center;">干物质采食量</h4>
                 <div v-if="tab.chart1.isChart" class="button">
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart1.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart1')">
@@ -383,7 +383,7 @@
                   >
                     <el-table-column sortable label="日期" min-width="110px" align="center" prop="日期" />
                     <el-table-column sortable label="牲畜类别" min-width="110px" align="center" prop="名称" />
-                    <el-table-column sortable label="公斤奶饲料成本（元）" min-width="110px" align="center" prop="准确率" />
+                    <el-table-column sortable label="饲喂成本（元）" min-width="110px" align="center" prop="准确率" />
                   </el-table>
                 </div>
               </div>
@@ -1254,8 +1254,8 @@ export default {
         if (this.tab.chart1.getdataListParm.parammaps.specificDate == '1') {
           startDate = parseTime(this.tab.chart1.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
           endDate = parseTime(this.tab.chart1.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-          console.log('泌乳牛干物质采食量开始日期==>', startDate)
-          console.log('泌乳牛干物质采食量结束日期==>', endDate)
+          console.log('干物质采食量开始日期==>', startDate)
+          console.log('干物质采食量结束日期==>', endDate)
           this.tab.chart1.getdataListParm.parammaps.status = 0
         } else if (this.tab.chart1.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart1.getdataListParm.parammaps.selectYear == '') {
@@ -1268,14 +1268,14 @@ export default {
           }
           startDate = this.tab.chart1.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart1.getdataListParm.parammaps.selectYear)[this.tab.chart1.getdataListParm.parammaps.selectWeek[0]].month + '-' + whichWeek(this.tab.chart1.getdataListParm.parammaps.selectYear)[this.tab.chart1.getdataListParm.parammaps.selectWeek[0]].date
           endDate = this.tab.chart1.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart1.getdataListParm.parammaps.selectYear)[this.tab.chart1.getdataListParm.parammaps.selectWeek[1]].last.month + '-' + whichWeek(this.tab.chart1.getdataListParm.parammaps.selectYear)[this.tab.chart1.getdataListParm.parammaps.selectWeek[1]].last.date
-          console.log('泌乳牛干物质采食量开始周日期==>', startDate)
-          console.log('泌乳牛干物质采食量结束周日期==>', endDate)
+          console.log('干物质采食量开始周日期==>', startDate)
+          console.log('干物质采食量结束周日期==>', endDate)
           this.tab.chart1.getdataListParm.parammaps.status = 1
         } else if (this.tab.chart1.getdataListParm.parammaps.specificDate == '3') {
           startDate = this.tab.chart1.getdataListParm.parammaps.chartMonth[0]
           endDate = this.tab.chart1.getdataListParm.parammaps.chartMonth[1].substring(0, 8) + '31'
-          console.log('泌乳牛干物质采食量开始月日期==>', startDate)
-          console.log('泌乳牛干物质采食量结束月日期==>', endDate)
+          console.log('干物质采食量开始月日期==>', startDate)
+          console.log('干物质采食量结束月日期==>', endDate)
           this.tab.chart1.getdataListParm.parammaps.status = 2
         }
         this.tab.chart1.getdataListParm.parammaps.startTime = startDate
@@ -1868,7 +1868,7 @@ export default {
     handleQuickJumpTop() {
       window.scrollTo(0, 0)
     },
-    // 泌乳牛干物质采食量
+    // 干物质采食量
     getChart1() {
       this.tab.chart1.listLoading = true
       const url = 'authdata/chart/feedEffMR'
@@ -1887,7 +1887,7 @@ export default {
       }
       postJson(url, data).then(response => {
         if (response.data !== null && response.data.list !== null && response.data.data !== null) {
-          console.log('泌乳牛干物质采食量图表数据', response.data.list)
+          console.log('干物质采食量图表数据', response.data.list)
           for (let i = 0; i < response.data.data.length; i++) {
             if (response.data.data[i].field1 !== '' && response.data.data[i].field1 !== undefined) {
               response.data.data[i].field1 = parseFloat(response.data.data[i].field1)
@@ -1916,7 +1916,7 @@ export default {
       this.tab.chart1.chartLine = echarts.init(document.getElementById('chartLine1'))
       var option = {
         tooltip: { trigger: 'axis', axisPointer: { type: 'cross', crossStyle: { color: '#999' }}},
-        legend: { data: ['泌乳牛干物质采食量', '泌乳牛产奶量'], right: 10, show: true, type: 'scroll' },
+        legend: { data: ['干物质采食量', '泌乳牛产奶量'], right: 10, show: true, type: 'scroll' },
         grid: { top: '15%', left: '8%', right: '8%', containLabel: true },
         xAxis: [{ type: 'category', data: chartLine_data.data1 }],
         yAxis: [
@@ -1924,7 +1924,7 @@ export default {
           { splitLine: { show: false }, type: 'value', name: '泌乳牛产奶量', axisLabel: { formatter: '{value} ' }}
         ],
         series: [
-          { name: '泌乳牛干物质采食量', type: 'bar', itemStyle: { normal: { color: '#61a5e8' }}, data: chartLine_data.data2 },
+          { name: '干物质采食量', type: 'bar', itemStyle: { normal: { color: '#61a5e8' }}, data: chartLine_data.data2 },
           { name: '泌乳牛产奶量', type: 'line', itemStyle: { normal: { color: '#ff2d2d' }}, yAxisIndex: 1, data: chartLine_data.data3 }
         ]
       }
@@ -2423,16 +2423,16 @@ export default {
     // 导出
     handleExport(item) {
       if (item == 'chart1') {
-        console.log('泌乳牛干物质采食量导出')
+        console.log('干物质采食量导出')
         var excelDatasTabChart1 = [
           {
             tHeader: ['日期', '泌乳牛采食量', '泌乳牛产奶量'],
             filterVal: ['日期', 'field1', 'field2'],
             tableDatas: this.tab.chart1.table.list,
-            sheetName: '泌乳牛采食量'
+            sheetName: '干物质采食量'
           }
         ]
-        json2excel(excelDatasTabChart1, '泌乳牛采食量', true, 'xlsx')
+        json2excel(excelDatasTabChart1, '干物质采食量', true, 'xlsx')
       } else if (item == 'chart2') {
         console.log('牛栏剩料率导出')
         var excelDatasTabChart2 = [
@@ -2470,7 +2470,7 @@ export default {
         console.log('成本分析导出')
         var excelDatasTabChart5 = [
           {
-            tHeader: ['日期', '牲畜类别', '公斤奶饲料成本（元）'],
+            tHeader: ['日期', '牲畜类别', '饲喂成本（元）'],
             filterVal: ['日期', '名称', '准确率'],
             tableDatas: this.tab.chart5.table.list,
             sheetName: '成本分析'