修改

.svn/pristine/08/08a53babda9daf240711ef5164f95e4b7e5ab622.svn-base

@@ -63,9 +63,9 @@
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 200px;" placeholder="车次" />
           <el-button class="successBorder" @click="handleSearch('second')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;" icon="el-icon-upload2" @click="handleExport('tab2')">导出</el-button>
-        </div>
-
-        <div v-if="tab2.table.list.length>0" class="table">
+        </div>
+
+        <div v-if="tab2.table.list.length>0" class="table">
           <el-table
             v-if="tab2.table.list.length>0"
             :key="tab2.table.tableKey"
@@ -77,7 +77,7 @@
             highlight-current-row
             style="width: 100%;"
             :row-style="rowStyle"
-            :cell-style="cellStyle"
+            :cell-style="cellStyle"
             class="elTable table-fixed"
           >
             <el-table-column v-for="item in tab2.table.tableConfig" align="center" :label="item.label" :prop="item.prop">
@@ -86,8 +86,8 @@
               </el-table-column>
             </el-table-column>
           </el-table>
-        </div>
-        <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div>
+        </div>
+        <div v-if="tab2.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div>
       </el-tab-pane>
       <el-tab-pane label="价格分析" name="third">
         <div class="search">
@@ -103,7 +103,7 @@
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 245px;" placeholder="TMR设备编号" />
           <el-button class="successBorder" @click="handleSearch('third')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;" icon="el-icon-upload2" @click="handleExport('tab3')">导出</el-button>
-        </div>
+        </div>
         <div v-if="tab3.table.list.length>0" class="table">
           <el-table
             :key="tab3.table.tableKey"
@@ -123,9 +123,9 @@
                 <el-table-column v-for="item2 in item1.children" v-if="item1.children || item1.children.length>0" :label="item2.label" :prop="item2.prop" />
               </el-table-column>
             </el-table-column>
-          </el-table>
-        </div>
-        <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div>
+          </el-table>
+        </div>
+        <div v-if="tab2.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -252,7 +252,7 @@ export default {
         isRadio2: false,
         isRadio3: false,
         isRadio4: false
-      },
+      },
       downLoad: {},
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' }
@@ -361,7 +361,7 @@ export default {
         } else {
           this.tab2.table.list = []
           this.tab2.table.data = []
-        }
+        }
         console.log(this.tab2.table.list.length)
         setTimeout(() => {
           this.tab2.table.listLoading = false
@@ -487,28 +487,28 @@ export default {
     },
     handleExport(item) {
       if (item == 'tab1') {
-        console.log('库存统计导出')
-        this.downLoad.getdataListParm = {}
-        this.downLoad.getdataListParm.name = 'getfsStaticlist'
-        this.downLoad.getdataListParm.pagecount = ''
-        this.downLoad.getdataListParm.parammaps = this.tab.table.getdataListParm.parammaps
-        GetDataByName(this.downLoad.getdataListParm).then(response => {
-          if (response.data.list !== null) {
-            this.$nextTick(() => {
-              this.downLoad.list = response.data.list
-            })
-          } else {
-            this.downLoad.list = []
-          }
-          import('@/vendor/Export5Excel').then(excel => {
-            const multiHeader = [['饲料名称', '期初', '', '用量', '', '', '', '期末', '']]
-            const multiHeader2 = [['', '期初库存(kg)', '期初金额(元)', '入库重量(kg)', '系统出库重量(kg)', '人工用料重量(kg)', '损耗重量', '期末库存(kg)', '期末金额(元)']]
-            const filterVal = ['feedname', 'startsum', 'startprice', 'laidsum', 'usesumXT', 'usesumRG', 'usesumXH', 'stopsum', 'stopprice']
-            const data = this.downLoad.list.map((v) => filterVal.map((j) => v[j]))
-            const merges = ['A1:A2', 'B1:C1', 'D1:G1', 'H1:I1']
-            excel.export_json_to_excel({ multiHeader, multiHeader2, data, filename: '库存统计', merges })
-          })
-        })
+        console.log('库存统计导出')
+        this.downLoad.getdataListParm = {}
+        this.downLoad.getdataListParm.name = 'getfsStaticlist'
+        this.downLoad.getdataListParm.pagecount = ''
+        this.downLoad.getdataListParm.parammaps = this.tab.table.getdataListParm.parammaps
+        GetDataByName(this.downLoad.getdataListParm).then(response => {
+          if (response.data.list !== null) {
+            this.$nextTick(() => {
+              this.downLoad.list = response.data.list
+            })
+          } else {
+            this.downLoad.list = []
+          }
+          import('@/vendor/Export5Excel').then(excel => {
+            const multiHeader = [['饲料名称', '期初', '', '用量', '', '', '', '期末', '']]
+            const multiHeader2 = [['', '期初库存(kg)', '期初金额(元)', '入库重量(kg)', '系统出库重量(kg)', '人工用料重量(kg)', '损耗重量', '期末库存(kg)', '期末金额(元)']]
+            const filterVal = ['feedname', 'startsum', 'startprice', 'laidsum', 'usesumXT', 'usesumRG', 'usesumXH', 'stopsum', 'stopprice']
+            const data = this.downLoad.list.map((v) => filterVal.map((j) => v[j]))
+            const merges = ['A1:A2', 'B1:C1', 'D1:G1', 'H1:I1']
+            excel.export_json_to_excel({ multiHeader, multiHeader2, data, filename: '库存统计', merges })
+          })
+        })
       } else if (item == 'tab2') {
         console.log('用料分析导出数据', this.tab2.table.list)
         console.log('用料分析导出表头', this.tab2.table.tableConfig)

.svn/pristine/09/09b05632f25444bf03836aa6d34f132316eb6826.svn-base

@@ -97,7 +97,7 @@
           </el-table-column>
         </el-table>
         <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
-        <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div> -->
+        <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div> -->
       </el-tab-pane>
       <el-tab-pane label="价格分析" name="third">
         <div class="search">
@@ -141,7 +141,7 @@
           </el-table-column>
         </el-table>
         <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
-        <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">暂无数据</div> -->
+        <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div> -->
       </el-tab-pane>
     </el-tabs>
   </div>

.svn/pristine/21/21a559ff2e80b7953d62ade5758bdf00695f7658.svn-base

@@ -8,8 +8,8 @@
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
-          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
+          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
           <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="float: left;width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
           <el-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="handleSearch('first')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport(tab1)">导出</el-button>
@@ -57,8 +57,8 @@
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
           <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
-          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
+          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
           <span style="margin-left: 10px;">统计类型：</span>
           <el-radio v-model="tab2.radio" label="1" @change="changeRadio2">牲畜类别</el-radio>
           <el-radio v-model="tab2.radio" label="2" @change="changeRadio2">栏舍名称</el-radio>
@@ -93,9 +93,9 @@
               <el-table-column v-for="item2 in item1.children" v-if="item1.children || item1.children.length>0" :label="item2.label" :prop="item2.prop" />
             </el-table-column>
           </el-table-column>
-        </el-table>
-        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
-        <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div> -->
+        </el-table>
+        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
+        <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div> -->
       </el-tab-pane>
       <el-tab-pane label="价格分析" name="third">
         <div class="search">
@@ -103,8 +103,8 @@
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
           <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
-          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled3" @click="handleBefore3" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
+          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled3" @click="handleBefore3" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
           <span style="margin-left: 10px;">统计类型：</span>
           <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">牲畜类别</el-radio>
           <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">栏舍名称</el-radio>
@@ -135,9 +135,9 @@
               <el-table-column v-for="item2 in item1.children" v-if="item1.children || item1.children.length>0" :label="item2.label" :prop="item2.prop" />
             </el-table-column>
           </el-table-column>
-        </el-table>
-        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
-        <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">暂无数据</div> -->
+        </el-table>
+        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
+        <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div> -->
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -154,10 +154,10 @@ export default {
   name: 'GroupInventoryManagement',
   components: { Pagination },
   data() {
-    return {
-      Beforedisabled: false,
-      Nextdisabled: false,
-      Beforedisabled2: false,
+    return {
+      Beforedisabled: false,
+      Nextdisabled: false,
+      Beforedisabled2: false,
       Nextdisabled2: false,
       pickerMinDate: '',
       pickerOptions: {
@@ -294,7 +294,7 @@ export default {
       const that = this
       const end = new Date()
       const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
       end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
       that.tab.chartDate[0] = parseTime(start, '{y}-{m}-{d}')
       that.tab.chartDate[1] = parseTime(end, '{y}-{m}-{d}')
@@ -309,31 +309,31 @@ export default {
       that.tab3.chartDate[0] = parseTime(start, '{y}-{m}-{d}')
       that.tab3.chartDate[1] = parseTime(end, '{y}-{m}-{d}')
       that.tab3.table.getdataListParm.parammaps.startTime = parseTime(start, '{y}-{m}-{d}')
-      that.tab3.table.getdataListParm.parammaps.stopTime = parseTime(end, '{y}-{m}-{d}')
+      that.tab3.table.getdataListParm.parammaps.stopTime = parseTime(end, '{y}-{m}-{d}')
       that.tab3.table.getdataListParm.parammaps.inputDatetime = [start, end]
     },
     handleTabClick() {
-      if (this.activeName == 'first') {
-        const start = new Date()
-        const end = new Date()
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 1)
-        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
+      if (this.activeName == 'first') {
+        const start = new Date()
+        const end = new Date()
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 1)
+        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
         this.tab.table.getdataListParm.parammaps.inputDatetime = [start, end]
         this.getTabList()
       } else if (this.activeName == 'second') {
-        console.log(this.pastureList)
-        const start2 = new Date()
-        const end2 = new Date()
-        start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
-        end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
+        console.log(this.pastureList)
+        const start2 = new Date()
+        const end2 = new Date()
+        start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
+        end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
         this.tab2.table.getdataListParm.parammaps.inputDatetime = [start2, end2]
         this.tab2.table.getdataListParm.parammaps.pastureid = this.pastureList[0].pastureid
         this.getTab2List()
-      } else if (this.activeName == 'third') {
-        const start3 = new Date()
-        const end3 = new Date()
-        start3.setTime(start3.getTime() - 3600 * 1000 * 24 * 1)
-        end3.setTime(end3.getTime() - 3600 * 1000 * 24 * 1)
+      } else if (this.activeName == 'third') {
+        const start3 = new Date()
+        const end3 = new Date()
+        start3.setTime(start3.getTime() - 3600 * 1000 * 24 * 1)
+        end3.setTime(end3.getTime() - 3600 * 1000 * 24 * 1)
         this.tab3.table.getdataListParm.parammaps.inputDatetime = [start3, end3]
         this.tab3.table.getdataListParm.parammaps.pastureid = this.pastureList[0].pastureid
         this.getTab3List()
@@ -639,130 +639,130 @@ export default {
         this.tab3.table.getdataListParm.offset = 1
         this.getTab3List()
       }
-    },
-
-    handleBefore() {
-      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        if (stop > Date.now() - 8.64e7) {
-          this.Nextdisabled = true
-          this.Beforedisabled = false
-        } else {
-          this.Nextdisabled = false
-          this.Beforedisabled = false
-        }
-        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
-      }
-      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTabList()
-    },
-    handleNext() {
-      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start2 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop2 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        if (stop2 > Date.now() - 8.64e7) {
-          this.Nextdisabled = true
-          this.Beforedisabled = false
-        } else {
-          this.Nextdisabled = false
-          this.Beforedisabled = false
-        }
-        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
-        this.$forceUpdate()
-      }
-      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTabList()
-    },
-    handleBefore2() {
-      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        if (stop3 > Date.now() - 8.64e7) {
-          this.Nextdisabled2 = true
-          this.Beforedisabled2 = false
-        } else {
-          this.Nextdisabled2 = false
-          this.Beforedisabled2 = false
-        }
-        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start3, stop3)
-        this.$forceUpdate()
-      }
-      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTab2List()
-    },
-    handleNext2() {
-      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        if (stop4 > Date.now() - 8.64e7) {
-          this.Nextdisabled2 = true
-          this.Beforedisabled2 = false
-        } else {
-          this.Nextdisabled2 = false
-          this.Beforedisabled2 = false
-        }
-        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start4, stop4)
-        this.$forceUpdate()
-      }
-      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTab2List()
-    },
-    handleBefore3() {
-      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        if (stop5 > Date.now() - 8.64e7) {
-          this.Nextdisabled3 = true
-          this.Beforedisabled3 = false
-        } else {
-          this.Nextdisabled3 = false
-          this.Beforedisabled3 = false
-        }
-        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start5, stop5)
-        this.$forceUpdate()
-      }
-      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTab3List()
-    },
-    handleNext3() {
-      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        if (stop6 > Date.now() - 8.64e7) {
-          this.Nextdisabled3 = true
-          this.Beforedisabled3 = false
-        } else {
-          this.Nextdisabled3 = false
-          this.Beforedisabled3 = false
-        }
-        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start6, stop6)
-        this.$forceUpdate()
-      }
-      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTab3List()
+    },
+
+    handleBefore() {
+      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        if (stop > Date.now() - 8.64e7) {
+          this.Nextdisabled = true
+          this.Beforedisabled = false
+        } else {
+          this.Nextdisabled = false
+          this.Beforedisabled = false
+        }
+        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
+        this.$forceUpdate()
+      }
+      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTabList()
+    },
+    handleNext() {
+      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start2 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop2 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        if (stop2 > Date.now() - 8.64e7) {
+          this.Nextdisabled = true
+          this.Beforedisabled = false
+        } else {
+          this.Nextdisabled = false
+          this.Beforedisabled = false
+        }
+        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
+        this.$forceUpdate()
+      }
+      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTabList()
+    },
+    handleBefore2() {
+      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        if (stop3 > Date.now() - 8.64e7) {
+          this.Nextdisabled2 = true
+          this.Beforedisabled2 = false
+        } else {
+          this.Nextdisabled2 = false
+          this.Beforedisabled2 = false
+        }
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start3, stop3)
+        this.$forceUpdate()
+      }
+      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTab2List()
+    },
+    handleNext2() {
+      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        if (stop4 > Date.now() - 8.64e7) {
+          this.Nextdisabled2 = true
+          this.Beforedisabled2 = false
+        } else {
+          this.Nextdisabled2 = false
+          this.Beforedisabled2 = false
+        }
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start4, stop4)
+        this.$forceUpdate()
+      }
+      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTab2List()
+    },
+    handleBefore3() {
+      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        if (stop5 > Date.now() - 8.64e7) {
+          this.Nextdisabled3 = true
+          this.Beforedisabled3 = false
+        } else {
+          this.Nextdisabled3 = false
+          this.Beforedisabled3 = false
+        }
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start5, stop5)
+        this.$forceUpdate()
+      }
+      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTab3List()
+    },
+    handleNext3() {
+      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        if (stop6 > Date.now() - 8.64e7) {
+          this.Nextdisabled3 = true
+          this.Beforedisabled3 = false
+        } else {
+          this.Nextdisabled3 = false
+          this.Beforedisabled3 = false
+        }
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start6, stop6)
+        this.$forceUpdate()
+      }
+      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTab3List()
     }
 
   }
 }
 </script>
 <style lang="scss" scoped>
-  .search{
-    margin-bottom:10px;
-    .el-radio{margin-right: 10px;}
-    .filter-item1{margin-top: 10px;}
+  .search{
+    margin-bottom:10px;
+    .el-radio{margin-right: 10px;}
+    .filter-item1{margin-top: 10px;}
   }
 </style>

.svn/pristine/b7/b7859043aad59ebb31e7e0552f0717c02276fdd9.svn-base

@@ -8,8 +8,8 @@
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
-          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
+          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
           <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
           <el-button class="successBorder" style="margin-left: 10px;margin-bottom:10px;" @click="handleSearch('first')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport(tab1)">导出</el-button>
@@ -57,8 +57,8 @@
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
           <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
-          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
+          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
           <span style="margin-left: 10px;">统计类型：</span>
           <el-radio v-model="tab2.radio" label="1" @change="changeRadio2">牲畜类别</el-radio>
           <el-radio v-model="tab2.radio" label="2" @change="changeRadio2">栏舍名称</el-radio>
@@ -93,9 +93,9 @@
               <el-table-column v-for="item2 in item1.children" v-if="item1.children || item1.children.length>0" :label="item2.label" :prop="item2.prop" />
             </el-table-column>
           </el-table-column>
-        </el-table>
-        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
-        <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div> -->
+        </el-table>
+        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
+        <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div> -->
       </el-tab-pane>
       <el-tab-pane label="价格分析" name="third">
         <div class="search">
@@ -103,8 +103,8 @@
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
           </el-select>
           <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
-          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled3" @click="handleBefore3" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
+          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled3" @click="handleBefore3" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
           <span style="margin-left: 10px;">统计类型：</span>
           <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">牲畜类别</el-radio>
           <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">栏舍名称</el-radio>
@@ -135,9 +135,9 @@
               <el-table-column v-for="item2 in item1.children" v-if="item1.children || item1.children.length>0" :label="item2.label" :prop="item2.prop" />
             </el-table-column>
           </el-table-column>
-        </el-table>
-        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
-        <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">暂无数据</div> -->
+        </el-table>
+        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
+        <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div> -->
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -154,10 +154,10 @@ export default {
   name: 'GroupInventoryManagement',
   components: { Pagination },
   data() {
-    return {
-      Beforedisabled: false,
-      Nextdisabled: false,
-      Beforedisabled2: false,
+    return {
+      Beforedisabled: false,
+      Nextdisabled: false,
+      Beforedisabled2: false,
       Nextdisabled2: false,
       pickerMinDate: '',
       pickerOptions: {
@@ -294,7 +294,7 @@ export default {
       const that = this
       const end = new Date()
       const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
       end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
       that.tab.chartDate[0] = parseTime(start, '{y}-{m}-{d}')
       that.tab.chartDate[1] = parseTime(end, '{y}-{m}-{d}')
@@ -309,31 +309,31 @@ export default {
       that.tab3.chartDate[0] = parseTime(start, '{y}-{m}-{d}')
       that.tab3.chartDate[1] = parseTime(end, '{y}-{m}-{d}')
       that.tab3.table.getdataListParm.parammaps.startTime = parseTime(start, '{y}-{m}-{d}')
-      that.tab3.table.getdataListParm.parammaps.stopTime = parseTime(end, '{y}-{m}-{d}')
+      that.tab3.table.getdataListParm.parammaps.stopTime = parseTime(end, '{y}-{m}-{d}')
       that.tab3.table.getdataListParm.parammaps.inputDatetime = [start, end]
     },
     handleTabClick() {
-      if (this.activeName == 'first') {
-        const start = new Date()
-        const end = new Date()
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 1)
-        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
+      if (this.activeName == 'first') {
+        const start = new Date()
+        const end = new Date()
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 1)
+        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
         this.tab.table.getdataListParm.parammaps.inputDatetime = [start, end]
         this.getTabList()
       } else if (this.activeName == 'second') {
-        console.log(this.pastureList)
-        const start2 = new Date()
-        const end2 = new Date()
-        start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
-        end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
+        console.log(this.pastureList)
+        const start2 = new Date()
+        const end2 = new Date()
+        start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
+        end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
         this.tab2.table.getdataListParm.parammaps.inputDatetime = [start2, end2]
         this.tab2.table.getdataListParm.parammaps.pastureid = this.pastureList[0].pastureid
         this.getTab2List()
-      } else if (this.activeName == 'third') {
-        const start3 = new Date()
-        const end3 = new Date()
-        start3.setTime(start3.getTime() - 3600 * 1000 * 24 * 1)
-        end3.setTime(end3.getTime() - 3600 * 1000 * 24 * 1)
+      } else if (this.activeName == 'third') {
+        const start3 = new Date()
+        const end3 = new Date()
+        start3.setTime(start3.getTime() - 3600 * 1000 * 24 * 1)
+        end3.setTime(end3.getTime() - 3600 * 1000 * 24 * 1)
         this.tab3.table.getdataListParm.parammaps.inputDatetime = [start3, end3]
         this.tab3.table.getdataListParm.parammaps.pastureid = this.pastureList[0].pastureid
         this.getTab3List()
@@ -639,130 +639,130 @@ export default {
         this.tab3.table.getdataListParm.offset = 1
         this.getTab3List()
       }
-    },
-
-    handleBefore() {
-      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        if (stop > Date.now() - 8.64e7) {
-          this.Nextdisabled = true
-          this.Beforedisabled = false
-        } else {
-          this.Nextdisabled = false
-          this.Beforedisabled = false
-        }
-        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
-      }
-      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTabList()
-    },
-    handleNext() {
-      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start2 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop2 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        if (stop2 > Date.now() - 8.64e7) {
-          this.Nextdisabled = true
-          this.Beforedisabled = false
-        } else {
-          this.Nextdisabled = false
-          this.Beforedisabled = false
-        }
-        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
-        this.$forceUpdate()
-      }
-      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTabList()
-    },
-    handleBefore2() {
-      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        if (stop3 > Date.now() - 8.64e7) {
-          this.Nextdisabled2 = true
-          this.Beforedisabled2 = false
-        } else {
-          this.Nextdisabled2 = false
-          this.Beforedisabled2 = false
-        }
-        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start3, stop3)
-        this.$forceUpdate()
-      }
-      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTab2List()
-    },
-    handleNext2() {
-      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        if (stop4 > Date.now() - 8.64e7) {
-          this.Nextdisabled2 = true
-          this.Beforedisabled2 = false
-        } else {
-          this.Nextdisabled2 = false
-          this.Beforedisabled2 = false
-        }
-        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start4, stop4)
-        this.$forceUpdate()
-      }
-      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTab2List()
-    },
-    handleBefore3() {
-      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        if (stop5 > Date.now() - 8.64e7) {
-          this.Nextdisabled3 = true
-          this.Beforedisabled3 = false
-        } else {
-          this.Nextdisabled3 = false
-          this.Beforedisabled3 = false
-        }
-        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start5, stop5)
-        this.$forceUpdate()
-      }
-      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTab3List()
-    },
-    handleNext3() {
-      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        if (stop6 > Date.now() - 8.64e7) {
-          this.Nextdisabled3 = true
-          this.Beforedisabled3 = false
-        } else {
-          this.Nextdisabled3 = false
-          this.Beforedisabled3 = false
-        }
-        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start6, stop6)
-        this.$forceUpdate()
-      }
-      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getTab3List()
+    },
+
+    handleBefore() {
+      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        if (stop > Date.now() - 8.64e7) {
+          this.Nextdisabled = true
+          this.Beforedisabled = false
+        } else {
+          this.Nextdisabled = false
+          this.Beforedisabled = false
+        }
+        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
+        this.$forceUpdate()
+      }
+      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTabList()
+    },
+    handleNext() {
+      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start2 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop2 = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        if (stop2 > Date.now() - 8.64e7) {
+          this.Nextdisabled = true
+          this.Beforedisabled = false
+        } else {
+          this.Nextdisabled = false
+          this.Beforedisabled = false
+        }
+        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
+        this.$forceUpdate()
+      }
+      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTabList()
+    },
+    handleBefore2() {
+      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop3 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        if (stop3 > Date.now() - 8.64e7) {
+          this.Nextdisabled2 = true
+          this.Beforedisabled2 = false
+        } else {
+          this.Nextdisabled2 = false
+          this.Beforedisabled2 = false
+        }
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start3, stop3)
+        this.$forceUpdate()
+      }
+      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTab2List()
+    },
+    handleNext2() {
+      if (this.tab2.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop4 = new Date(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab2.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        if (stop4 > Date.now() - 8.64e7) {
+          this.Nextdisabled2 = true
+          this.Beforedisabled2 = false
+        } else {
+          this.Nextdisabled2 = false
+          this.Beforedisabled2 = false
+        }
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab2.table.getdataListParm.parammaps.inputDatetime.push(start4, stop4)
+        this.$forceUpdate()
+      }
+      this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTab2List()
+    },
+    handleBefore3() {
+      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab3.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop5 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        if (stop5 > Date.now() - 8.64e7) {
+          this.Nextdisabled3 = true
+          this.Beforedisabled3 = false
+        } else {
+          this.Nextdisabled3 = false
+          this.Beforedisabled3 = false
+        }
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start5, stop5)
+        this.$forceUpdate()
+      }
+      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTab3List()
+    },
+    handleNext3() {
+      if (this.tab3.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab2.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop6 = new Date(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab3.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        if (stop6 > Date.now() - 8.64e7) {
+          this.Nextdisabled3 = true
+          this.Beforedisabled3 = false
+        } else {
+          this.Nextdisabled3 = false
+          this.Beforedisabled3 = false
+        }
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab3.table.getdataListParm.parammaps.inputDatetime.push(start6, stop6)
+        this.$forceUpdate()
+      }
+      this.tab3.table.getdataListParm.parammaps.startTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab3.table.getdataListParm.parammaps.stopTime = parseTime(this.tab3.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getTab3List()
     }
 
   }
 }
 </script>
 <style lang="scss" scoped>
-  .search{
-    margin-bottom:10px;
-    .el-radio{margin-right: 10px;}
-    .filter-item1{margin-top: 10px;}
+  .search{
+    margin-bottom:10px;
+    .el-radio{margin-right: 10px;}
+    .filter-item1{margin-top: 10px;}
   }
 </style>

.svn/pristine/e5/e50f315ac9466238f14f067ad874a247790c753b.svn-base

@@ -63,9 +63,9 @@
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 200px;" placeholder="车次" />
           <el-button class="successBorder" @click="handleSearch('second')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;" icon="el-icon-upload2" @click="handleExport('tab2')">导出</el-button>
-        </div>
-
-        <div v-if="tab2.table.list.length>0" class="table">
+        </div>
+
+        <div v-if="tab2.table.list.length>0" class="table">
           <el-table
             v-if="tab2.table.list.length>0"
             :key="tab2.table.tableKey"
@@ -77,7 +77,7 @@
             highlight-current-row
             style="width: 100%;"
             :row-style="rowStyle"
-            :cell-style="cellStyle"
+            :cell-style="cellStyle"
             class="elTable table-fixed"
           >
             <el-table-column v-for="item in tab2.table.tableConfig" align="center" :label="item.label" :prop="item.prop">
@@ -86,9 +86,9 @@
               </el-table-column>
             </el-table-column>
           </el-table>
-        </div>
-        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
-        <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div>
+        </div>
+        <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
+        <div v-if="tab2.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div>
       </el-tab-pane>
       <el-tab-pane label="价格分析" name="third">
         <div class="search">
@@ -104,7 +104,7 @@
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 245px;" placeholder="TMR设备编号" />
           <el-button class="successBorder" @click="handleSearch('third')">查询</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;" icon="el-icon-upload2" @click="handleExport('tab3')">导出</el-button>
-        </div>
+        </div>
         <div v-if="tab3.table.list.length>0" class="table">
           <el-table
             :key="tab3.table.tableKey"
@@ -124,10 +124,10 @@
                 <el-table-column v-for="item2 in item1.children" v-if="item1.children || item1.children.length>0" :label="item2.label" :prop="item2.prop" />
               </el-table-column>
             </el-table-column>
-          </el-table>
-        </div>
-        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
-        <div v-if="tab3.table.list.length==0" style="text-align: center;">暂无数据</div>
+          </el-table>
+        </div>
+        <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab3.table.total }}条</span>
+        <div v-if="tab3.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -254,7 +254,7 @@ export default {
         isRadio2: false,
         isRadio3: false,
         isRadio4: false
-      },
+      },
       downLoad: {},
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' }
@@ -357,26 +357,26 @@ export default {
         if (response.data !== null && response.data.data !== null && response.data.data1 !== null) {
           console.log('库存统计-用料分析', response.data.list)
           this.tab2.table.data = response.data.data
-          this.tab2.table.list = response.data.list.data1
-          for (let i = 0; i < response.data.list.data2.length; i++) {
-            if (response.data.list.data2[i].children.length > 1) {
-              for (let j = 0; j < response.data.list.data2[i].children.length; j++) {
-                if (response.data.list.data2[i].children[j].label == '理论' || response.data.list.data2[i].children[j].label == '实际') {
-                  this.$set(response.data.list.data2[i].children[j], 'width', '45px')
-                } else {
-                  this.$set(response.data.list.data2[i].children[j], 'width', '60px')
-                }
-              }
-            } else {
-              this.$set(response.data.list.data2[i].children[0], 'width', '70px')
-            }
+          this.tab2.table.list = response.data.list.data1
+          for (let i = 0; i < response.data.list.data2.length; i++) {
+            if (response.data.list.data2[i].children.length > 1) {
+              for (let j = 0; j < response.data.list.data2[i].children.length; j++) {
+                if (response.data.list.data2[i].children[j].label == '理论' || response.data.list.data2[i].children[j].label == '实际') {
+                  this.$set(response.data.list.data2[i].children[j], 'width', '45px')
+                } else {
+                  this.$set(response.data.list.data2[i].children[j], 'width', '60px')
+                }
+              }
+            } else {
+              this.$set(response.data.list.data2[i].children[0], 'width', '70px')
+            }
           }
           this.tab2.table.tableConfig = response.data.list.data2
           this.tab2.table.total = response.data.list.data1.length
         } else {
           this.tab2.table.list = []
           this.tab2.table.data = []
-        }
+        }
         console.log(this.tab2.table.list.length)
         setTimeout(() => {
           this.tab2.table.listLoading = false
@@ -502,28 +502,28 @@ export default {
     },
     handleExport(item) {
       if (item == 'tab1') {
-        console.log('库存统计导出')
-        this.downLoad.getdataListParm = {}
-        this.downLoad.getdataListParm.name = 'getfsStaticlist'
-        this.downLoad.getdataListParm.pagecount = ''
-        this.downLoad.getdataListParm.parammaps = this.tab.table.getdataListParm.parammaps
-        GetDataByName(this.downLoad.getdataListParm).then(response => {
-          if (response.data.list !== null) {
-            this.$nextTick(() => {
-              this.downLoad.list = response.data.list
-            })
-          } else {
-            this.downLoad.list = []
-          }
-          import('@/vendor/Export5Excel').then(excel => {
-            const multiHeader = [['饲料名称', '期初', '', '用量', '', '', '', '期末', '']]
-            const multiHeader2 = [['', '期初库存(kg)', '期初金额(元)', '入库重量(kg)', '系统出库重量(kg)', '人工用料重量(kg)', '损耗重量', '期末库存(kg)', '期末金额(元)']]
-            const filterVal = ['feedname', 'startsum', 'startprice', 'laidsum', 'usesumXT', 'usesumRG', 'usesumXH', 'stopsum', 'stopprice']
-            const data = this.downLoad.list.map((v) => filterVal.map((j) => v[j]))
-            const merges = ['A1:A2', 'B1:C1', 'D1:G1', 'H1:I1']
-            excel.export_json_to_excel({ multiHeader, multiHeader2, data, filename: '库存统计', merges })
-          })
-        })
+        console.log('库存统计导出')
+        this.downLoad.getdataListParm = {}
+        this.downLoad.getdataListParm.name = 'getfsStaticlist'
+        this.downLoad.getdataListParm.pagecount = ''
+        this.downLoad.getdataListParm.parammaps = this.tab.table.getdataListParm.parammaps
+        GetDataByName(this.downLoad.getdataListParm).then(response => {
+          if (response.data.list !== null) {
+            this.$nextTick(() => {
+              this.downLoad.list = response.data.list
+            })
+          } else {
+            this.downLoad.list = []
+          }
+          import('@/vendor/Export5Excel').then(excel => {
+            const multiHeader = [['饲料名称', '期初', '', '用量', '', '', '', '期末', '']]
+            const multiHeader2 = [['', '期初库存(kg)', '期初金额(元)', '入库重量(kg)', '系统出库重量(kg)', '人工用料重量(kg)', '损耗重量', '期末库存(kg)', '期末金额(元)']]
+            const filterVal = ['feedname', 'startsum', 'startprice', 'laidsum', 'usesumXT', 'usesumRG', 'usesumXH', 'stopsum', 'stopprice']
+            const data = this.downLoad.list.map((v) => filterVal.map((j) => v[j]))
+            const merges = ['A1:A2', 'B1:C1', 'D1:G1', 'H1:I1']
+            excel.export_json_to_excel({ multiHeader, multiHeader2, data, filename: '库存统计', merges })
+          })
+        })
       } else if (item == 'tab2') {
         console.log('用料分析导出数据', this.tab2.table.list)
         console.log('用料分析导出表头', this.tab2.table.tableConfig)
@@ -645,6 +645,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .search{margin-bottom:10px;}
+  .search{margin-bottom:10px;}
   .el-radio{margin-right: 20px;}
 </style>

src/components/index.vue

@@ -38,7 +38,7 @@
             <el-table-column :label="$t('feedingEfficiency.yhll')" min-width="60px" align="center" prop="应混料量" />
             <el-table-column :label="$t('feedingEfficiency.sjhll')" min-width="70px" align="center" prop="实际混料量" />
             <el-table-column :label="$t('feedingEfficiency.sll')"min-width="60px" align="center" prop="撒料量" />
-            <el-table-column label="混料时间" min-width="70px" align="center" prop="混料时间" />
+            <el-table-column :label="$t('errorAnalysis.hlsj')" min-width="70px" align="center" prop="混料时间" />
             <el-table-column :label="$t('feedingEfficiency.ztsll')" min-width="70px" align="center" prop="转投剩料量" />
             <el-table-column :label="$t('feedingEfficiency.jrsll')" min-width="70px" align="center" prop="今日剩料量" />
             <el-table-column :label="$t('feedingEfficiency.csl')" min-width="60px" align="center" prop="剩料率" />

src/lang/en/langModule/errorAnalysis.js

@@ -1,7 +1,7 @@
 export default{
   sumName:"Summary Statistics",
-  hltj:'mixing statistics',
-  sltj:"feed spreading statistics",
+  hltj:'Mixing statistics',
+  sltj:"Feed spreading statistics",
   accName:"Accuracy Analysis",
   typeName:'Statistical Type',
   tjBydate:'Statistics by Date',
@@ -10,7 +10,7 @@ export default{
   feedName:'Formula Name',
   isHouseName:"Shelter Name",
   animelName:"Livestock Category",
-  projname:'Batch',
+  projname:'Number of Times the Vehicle Was Used ',
   isFeed:"Feed",
   isTrainNumber:"Batch",
   tmrName:"TMR equipment",
@@ -25,35 +25,35 @@ export default{
   drivername:'Vehicle Name',
   stratJl:'Start of Feeding Time',
   endJl:"End of Feeding Time",
-  llzl:'theoretical weight',
+  llzl:'Theoretical weight',
   acWeight:'Actual Weight',
-  sljhczs:'planned feed spreading operation count',
-  slczl:"feed spreading operation rate",
+  sljhczs:'Planned feed spreslwcading operation count',
+  slczl:"Feed spreading operation rate",
   slsj:"Spreading Time",
   flstartTime:"Material Distribution Start Time",
   waitTime:'Waiting Time',
-slzdtzcs:'automatic transition count for feed spreading',
-slsdzdtzcs:'manual transition count for feed spreading',
+slzdtzcs:'Automatic transition count for feed spreading',
+slsdzdtzcs:'Manual transition count for feed spreading',
 qxcs:'Cancellation Count',
-slzqs:'correct feed spreading count',
+slzqs:'Correct feed spreading count',
 qcqxzql:"Correctness Rate Excluding Cancellations ",
-bzc:'standard deviation',
+bzc:'Standard deviation',
 cz:"operation",
-sxlb:'livestock categories',
-jshlczs:'planned mixing operands',
-yhlczs:'operands that have been blended',
-hlczl:'mixing operation rate',
-hlzdtzcs:'automatic blending transition count' ,
-hlsdzdtzcs:'manual blending transition count',
+sxlb:'Livestock categories',
+jshlczs:'Planned mixing operands',
+yhlczs:'Operands that have been blended',
+hlczl:'Mixing operation rate',
+hlzdtzcs:'Automatic blending transition count' ,
+hlsdzdtzcs:'Manual blending transition count',
 hlzqs:'Correct number of mixed materials',
-yclczs:'the count of operations for feed that has been spread',
+yclczs:'The count of operations for feed that has been spread',
 
-statisticalTypeList: [{ id: '7', name: 'Unclassified' }, { id: '0', name: 'Driver' }, { id: '1', name: 'Formula Name' }, { id: '2', name: 'Shelter Name' }, { id: '3', name: 'Livestock Category' }, { id: '4', name: 'Batch' }, { id: '5', name: 'TMR Name' }, { id: '6', name: 'Feed' }],
+statisticalTypeList: [{ id: '7', name: 'Unclassified' }, { id: '0', name: 'Driver' }, { id: '1', name: 'Formula Name' }, { id: '2', name: 'Shelter Name' }, { id: '3', name: 'Livestock Category' }, { id: '4', name: 'Number of Times the Vehicle Was Used ' }, { id: '5', name: 'TMR Name' }, { id: '6', name: 'Feed' }],
 planName:"Planning Statistics",
  day:"Day",
 month:"Month",
 confirm:"OK",
-feedName:'Formulation Accuracy Rate',
+feedName:'Formulation Name',
 changeTable:'Switch Table',
 qxznf:'"Please Select Year',
 qxzz:"Please Select Week",
@@ -63,9 +63,9 @@ xztjcs:"Please Select Statistical Parameters",
 qxz:"Please Select",
 nqName:"Herd Accuracy Rate",
 
-jhzql:'Planning Accuracy',
-jhzql1:"Planned Statistics",
-jhzqll:"Planning Accuracy Rate (Excluding Canceled Weight",
+jhzql:'Planning Accuracy Rate',
+jhzql1:"Planning Correctness Rate",
+jhzqll:"Planning Accuracy Rate (Excluding Canceled Weight)",
 bfb:'Percentage',
 
 jhzxzl:'Planned Execution Weight(kg)',
@@ -80,28 +80,28 @@ hlqxcs:"Planned blending cancellation count",
 lsslsjtj:"Feed spreading time statistics in pens",
 tmrnames:'TMR Name',
 
-zdtzcs:"automatic transition count",
-sdtzcs:'manual transition count',
-zdtzsjzl:'actual weight of automatic transition',
-zdtzzql:"automatic transition accuracy rate",
-sdtzllzl:"theoretical weight of manual transition",
-sdtzsjzl:"actual weight of manual transition",
-sdtzzql:"manual transition accuracy rate",
-zdtzllzl:'theoretical weight of automatic transition',
+zdtzcs:"Automatic transition count",
+sdtzcs:'Manual transition count',
+zdtzsjzl:'Actual weight of automatic transition',
+zdtzzql:"Automatic transition accuracy rate",
+sdtzllzl:"Theoretical weight of manual transition",
+sdtzsjzl:"Actual weight of manual transition",
+sdtzzql:"Manual transition accuracy rate",
+zdtzllzl:'Theoretical weight of automatic transition',
 time:'Time',
-pen:'pen',
+pen:'Pen',
 czNum:"peration Number",
 wcz:"Error Value",
-planTime:"planned time",
-startTime:"start time",
-endTime:'end time',
-jsTime:'mix time',
+planTime:"Planned time",
+startTime:"Start time",
+endTime:'End time',
+jsTime:'Mix time',
 stWeight:'Starting Weight',
 edWeight:'Ending Weight',
 isOK:'Is it up to standard?',
 area:'Area',
-tzfs:'transition method',
-ccms:'batch description',
+tzfs:'Transition method',
+ccms:'Batch description',
 sfytj:'Whether to Pre-calculate Statistics',
 one: 'First Shift',
 two: "Second Shift",
@@ -120,7 +120,7 @@ hlzqls:"Mixing Accuracy Rate",
 hlzql:"Mixing Correctness Rate",
 slwcz:"Spreading Tolerance Value",
 slzql:'Feed Spreading Accuracy Rate',
-hlsj:"'mixing time'",
+hlsj:"'Mixing time'",
 hztjjsy:'Summary Statistics - Driver',
 hztjpfmc:'Summary Statistics - Formula Name',
 hztjwfl:'Summary Statistics - Unclassified',
@@ -129,8 +129,8 @@ hztjxslb:'Summary Statistics - Livestock Category',
 hztjcc:'Summary Statistics - Vehicle Number',
 hztjtmr:'Summary Statistics - TMR Name',
 hztjsl:'Summary Statistics - Feed',
-not:'count',
-tzcs:'transition count',
+not:'Count',
+tzcs:'Transition count',
 
 ccxx: "Train Information",
 zdrq: "Scheduling Date",
@@ -147,4 +147,14 @@ kzt: "Monitoring Chart",
 sjzl:"Designed Weight",
 sjzl1:"Actual Weight",
 
+zqxxq:"Accuracy Details",
+pfxgjl: "Formula Modification Record",
+pfmbxgjl: "Formula Template Modification Record",
+
+zwsj:"No Data Available"
+
+
+
+
+
 }

src/lang/zn/langModule/errorAnalysis.js

@@ -146,12 +146,11 @@ kzt:"监控图",
 sjzl:"设计重量",
 sjzl1:"实际重量",
 
+zqxxq:"准确性详情",
+pfxgjl:"配方修改记录",
+pfmbxgjl:"配方模板修改记录",
 
-
-
-
-
-
+zwsj:"暂无数据"
 
 
 

src/lang/zn/langModule/processAnalysis.js

@@ -68,4 +68,6 @@ sjfpzl:"实际分配重量（kg）",
 fqslzl:"废弃剩料重量",
 
 
+
+
 }

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

@@ -5,7 +5,7 @@
       <el-tab-pane  :label="$t('errorAnalysis.sumName')"     name="first">
         <component :is="myComponent1" ref="detail1" />
       </el-tab-pane>
-      <el-tab-pane :label="$t('errorAnalysis.hltj')"name="second">
+      <el-tab-pane :label="$t('errorAnalysis.hltj')" name="second">
         <keep-alive>
           <component :is="myComponent2" ref="detail2" />
         </keep-alive>

src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue

@@ -76,12 +76,12 @@
         <el-table-column sortable  :label="$t('errorAnalysis.sljhczs')"  min-width="100px" align="center" prop="计划撒料操作数" />
         <el-table-column sortable :label="$t('errorAnalysis.yclczs')" min-width="90px" align="center" prop="已撒料操作数" />
         <el-table-column sortable  :label="$t('errorAnalysis.slczl')"  min-width="90px" align="center" prop="撒料操作率" />
-        <el-table-column sortable  :label="$t('processAnalysis.slwc')"  min-width="90px" align="center" prop="撒料误差值" />
-        <el-table-column sortable  :label="$t('processAnalysis.hlzq')"  min-width="90px" align="center" prop="撒料准确率" />
+        <el-table-column sortable  :label="$t('errorAnalysis.slwcz')"  min-width="90px" align="center" prop="撒料误差值" />
+        <el-table-column sortable  :label="$t('errorAnalysis.slzql')"  min-width="90px" align="center" prop="撒料准确率" />
         <el-table-column sortable  :label="$t('errorAnalysis.slzdtzcs')"  min-width="90px" align="center" prop="撒料自动跳转次数" />
         <el-table-column sortable  :label="$t('errorAnalysis.slsdzdtzcs')"  min-width="90px" align="center" prop="撒料手动跳转次数" />
-        <el-table-column :key="20" sortable  :label="$t('processAnalysis.slzql')"  min-width="90px" align="center" prop="撒料正确数" />
-        <el-table-column :key="21" sortable label="撒料正确率" min-width="90px" align="center" prop="撒料正确率" />
+        <el-table-column :key="20" sortable  :label="$t('processAnalysis.slzqs')"  min-width="90px" align="center" prop="撒料正确数" />
+        <el-table-column :key="21" sortable :label="$t('errorAnalysis.slzql')" min-width="90px" align="center" prop="撒料正确率" />
         <el-table-column :key="22" sortable :label="$t('errorAnalysis.qcqxzql')" min-width="90px" align="center" prop="去除取消正确率" />
         <el-table-column sortable  :label="$t('errorAnalysis.bzc')"  min-width="90px" align="center" prop="方差" />
       </el-table>
@@ -383,7 +383,7 @@
             <el-table-column :key="13" sortable :label="$t('errorAnalysis.hlczl')" min-width="110px" align="center" prop="混料操作率" />
             <el-table-column :key="14" sortable :label="$t('processAnalysis.hlwc')" min-width="110px" align="center" prop="混料误差值" />
             <el-table-column :key="15" sortable :label="$t('processAnalysis.hlzq')" min-width="110px" align="center" prop="混料准确率" />
-            <el-table-column v-if="pasture.isTrainNumber" :key="16" sortable label="混料时间" min-width="100px" align="center" prop="混料时间" />
+            <el-table-column v-if="pasture.isTrainNumber" :key="16" sortable :label="$t('errorAnalysis.hlsj')" min-width="100px" align="center" prop="混料时间" />
             <el-table-column v-if="pasture.isTrainNumber" :key="17" sortable  :label="$t('errorAnalysis.waitTime')" min-width="100px" align="center" prop="等待时间" />
             <el-table-column :key="18" sortable :label="$t('errorAnalysis.hlzdtzcs')" min-width="110px" align="center" prop="混料自动跳转次数" />
             <el-table-column :key="19" sortable :label="$t('errorAnalysis.hlsdzdtzcs')" min-width="110px" align="center" prop="混料手动跳转次数" />

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

@@ -110,7 +110,7 @@
             <u-table-column :key="18" sortable :label="$t('errorAnalysis.hlczl')" min-width="60px" align="center" prop="混料操作率" />
             <u-table-column :key="19" sortable :label="$t('processAnalysis.hlwc')" min-width="60px" align="center" prop="混料误差值" />
             <u-table-column :key="20" sortable :label="$t('processAnalysis.hlzq')" min-width="60px" align="center" prop="混料准确率" />
-            <u-table-column v-if="tab.isTrainNumber" :key="21" sortable label="混料时间" min-width="70px" align="center" prop="混料时间" />
+            <u-table-column v-if="tab.isTrainNumber" :key="21" sortable :label="$t('errorAnalysis.hlsj')" min-width="70px" align="center" prop="混料时间" />
             <u-table-column v-if="tab.isTrainNumber" :key="22" sortable  :label="$t('errorAnalysis.flstartTime')"  min-width="70px" align="center" prop="startMaterialTime" />
             <u-table-column v-if="tab.isTrainNumber" :key="23" sortable  :label="$t('errorAnalysis.waitTime')" min-width="70px" align="center" prop="等待时间" />
             <u-table-column :key="24" sortable :label="$t('errorAnalysis.hlzdtzcs')" min-width="65px" align="center" prop="混料自动跳转次数" />
@@ -174,8 +174,8 @@
               <u-table-column :key="16" sortable  :label="$t('errorAnalysis.sljhczs')"  min-width="60px" align="center" prop="计划撒料操作数" />
               <u-table-column :key="17" sortable :label="$t('errorAnalysis.yclczs')" min-width="50px" align="center" prop="已撒料操作数" />
               <u-table-column :key="18" sortable  :label="$t('errorAnalysis.slczl')"  min-width="60px" align="center" prop="撒料操作率" />
-              <u-table-column :key="19" sortable  :label="$t('errorAnalysis.slczl')"  min-width="60px" align="center" prop="撒料误差值" />
-              <u-table-column :key="20" sortable  :label="$t('processAnalysis.slzq')"  min-width="60px" align="center" prop="撒料准确率" />
+              <u-table-column :key="19" sortable  :label="$t('errorAnalysis.slwcz')"  min-width="60px" align="center" prop="撒料误差值" />
+              <u-table-column :key="20" sortable  :label="$t('errorAnalysis.slzql')"  min-width="60px" align="center" prop="撒料准确率" />
               <u-table-column v-if="tab.isTrainNumber" :key="21" sortable  :label="$t('errorAnalysis.slsj')"  min-width="70px" align="center" prop="撒料时间" />
               <u-table-column v-if="tab.isTrainNumber" :key="22" sortable  :label="$t('errorAnalysis.flstartTime')"  min-width="70px" align="center" prop="startMaterialTime" />
               <u-table-column v-if="tab.isTrainNumber" :key="23" sortable  :label="$t('errorAnalysis.waitTime')" min-width="70px" align="center" prop="等待时间" />
@@ -1147,7 +1147,7 @@
           <el-button class="cancelClose1" @click="fenceTemp.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
     </el-dialog>
-    <!-- 配方模板修改记录 -->
+    <!-- this.$t('errorAnalysis.pfmbxgjl') -->
     <el-dialog :title="textMap[modificationRecordTemp.dialogStatus]" :visible.sync="modificationRecordTemp.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="modificationRecord">
         <h3 style="flex: 1;">修改前</h3>
@@ -1817,10 +1817,10 @@ export default {
       },
       textMap: {
         exportList: '导出',
-        recipeNameTxt:'配方修改记录',
-        feedTxt:'饲料',
-        fenceTxt:'栏舍',
-        modificationRecord:'配方模板修改记录'
+        recipeNameTxt:this.$t('errorAnalysis.pfxgjl'),
+        feedTxt:this.$t('errorAnalysis.isFeed'),
+        fenceTxt:this.$t('errorAnalysis.pen'),
+        modificationRecord:this.$t('errorAnalysis.pfmbxgjl')
       },
       isokDisable:false,
       // search
@@ -4809,66 +4809,66 @@ export default {
         if (this.tab.radio == 0) {
           this.methodName = 'getDownloadedplanByJsyHL'
           this.optdevice = row.驾驶员
-          this.titlefname = '准确性详情——驾驶员：' + row.驾驶员
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.驾驶员
         }else if (this.tab.radio == 1) {
           this.methodName = 'getDownloadedplanByTemHL'
           this.optdevice = row.配方名称
-          this.titlefname = '准确性详情——配方名称：' + row.配方名称
+          this.titlefname = this.$t('errorAnalysis.zqxxq')+ row.配方名称
         } else if (this.tab.radio == 2) {
           this.methodName = 'getDownloadedplanByBarHL'
           this.optdevice = row.栏舍名称
-          this.titlefname = '准确性详情——栏舍名称：' + row.栏舍名称
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.栏舍名称
         } else if (this.tab.radio == 3) {
           this.methodName = 'getDownloadedplanBySCHL'
           this.optdevice = row.牲畜类别
-          this.titlefname = '准确性详情——牲畜类别：' + row.牲畜类别
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.牲畜类别
         } else if (this.tab.radio == 4) {
           this.methodName = 'getDownloadedplanByTrainsHL'
           this.optdevice = row.车次
-          this.titlefname = '准确性详情——车次：' + row.车次
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.车次
         } else if (this.tab.radio == 5) {
           this.methodName = 'getDownloadedplanByTmrHL'
           this.optdevice = row.TMR名称
-          this.titlefname = '准确性详情——TMR名称：' + row.TMR名称
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.TMR名称
         } else if (this.tab.radio == 6) {
           this.methodName = 'getDownloadedplanByFeedHL'
           this.optdevice = row.fname
-          this.titlefname = '准确性详情——饲料：' + row.fname
+          this.titlefname = this.$t('errorAnalysis.zqxxq')+ row.fname
         } else if (this.tab.radio == 7) {
           this.methodName = 'getDownloadedplanByWflHL'
           this.optdevice = row.fname
-          this.titlefname = '准确性详情'
+          this.titlefname = this.$t('errorAnalysis.zqxxq')
         }
       }else{
         // 撒料
         if (this.tab.radio == 0) {
           this.methodName = 'getDownloadedplanByJsySL'
           this.optdevice = row.驾驶员
-          this.titlefname = '准确性详情——驾驶员：' + row.驾驶员
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.驾驶员
         }else if (this.tab.radio == 1) {
           this.methodName = 'getDownloadedplanByTemSL'
           this.optdevice = row.配方名称
-          this.titlefname = '准确性详情——配方名称：' + row.配方名称
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.配方名称
         } else if (this.tab.radio == 2) {
           this.methodName = 'getDownloadedplanByBarSL'
           this.optdevice = row.栏舍名称
-          this.titlefname = '准确性详情——栏舍名称：' + row.栏舍名称
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.栏舍名称
         } else if (this.tab.radio == 3) {
           this.methodName = 'getDownloadedplanBySCSL'
           this.optdevice = row.牲畜类别
-          this.titlefname = '准确性详情——牲畜类别：' + row.牲畜类别
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.牲畜类别
         } else if (this.tab.radio == 4) {
           this.methodName = 'getDownloadedplanByTrainsSL'
           this.optdevice = row.车次
-          this.titlefname = '准确性详情——车次：' + row.车次
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.车次
         } else if (this.tab.radio == 5) {
           this.methodName = 'getDownloadedplanByTmrSL'
           this.optdevice = row.TMR名称
-          this.titlefname = '准确性详情——TMR名称：' + row.TMR名称
+          this.titlefname = this.$t('errorAnalysis.zqxxq') + row.TMR名称
         }else if (this.tab.radio == 7) {
           this.methodName = 'getDownloadedplanByWflSL'
           this.optdevice = row.fname
-          this.titlefname = '准确性详情'
+          this.titlefname = this.$t('errorAnalysis.zqxxq')
         }
       }
 
@@ -4927,7 +4927,7 @@ export default {
       console.log('点击了混料统计-配方名称',row)
       this.recipeNameTemp2.temp = Object.assign({}, row)
       this.recipeNameTemp2.dialogFormVisible = true
-      this.textMap.recipeNameTxt = '配方修改记录——配方：' + row.配方名称
+      this.textMap.recipeNameTxt = this.$t('errorAnalysis.pfxgjl') + row.配方名称
       this.recipeNameTemp2.dialogStatus = 'recipeNameTxt'
       this.recipeNameTemp2.getdataListParm.parammaps.pastureid = Cookies.get('pastureid')
       this.recipeNameTemp2.getdataListParm.parammaps.ftid = row.ftid
@@ -4976,7 +4976,7 @@ export default {
       this.recipeNameTemp3.list = row.fit
       this.recipeNameTemp3.temp = Object.assign({}, row)
       this.recipeNameTemp3.dialogFormVisible = true
-      this.textMap.recipeNameTxt = '配方饲料修改记录'
+      this.textMap.recipeNameTxt = this.$t('errorAnalysis.pfxgjl')
       this.recipeNameTemp3.dialogStatus = 'recipeNameTxt'
       const start = new Date()
       const end = new Date()
@@ -4988,7 +4988,7 @@ export default {
       console.log('点击了混料统计-饲料',row)
       this.feedTemp.temp = Object.assign({}, row)
       this.feedTemp.dialogFormVisible = true
-      this.textMap.feedTxt = '配方修改记录——饲料：' + row.饲料
+      this.textMap.feedTxt = this.$t('errorAnalysis.pfxgjl') + row.饲料
       this.feedTemp.dialogStatus = 'feedTxt'
       this.feedTemp.getdataListParm.parammaps.pastureid = row.pastureid
       this.feedTemp.getdataListParm.parammaps.ftid = row.ftid
@@ -5047,7 +5047,7 @@ export default {
       console.log('点击了撒料统计-配方名称',row)
       this.recipeNameTemp2.temp = Object.assign({}, row)
       this.recipeNameTemp2.dialogFormVisible = true
-      this.textMap.recipeNameTxt = '配方修改记录——配方：' + row.配方名称
+      this.textMap.recipeNameTxt = this.$t('errorAnalysis.pfxgjl') + row.配方名称
       this.recipeNameTemp2.dialogStatus = 'recipeNameTxt'
       this.recipeNameTemp2.getdataListParm.parammaps.pastureid = Cookies.get('pastureid')
       this.recipeNameTemp2.getdataListParm.parammaps.ftid = row.ftid
@@ -5106,7 +5106,7 @@ export default {
       console.log('点击了撒料统计-栏舍',row)
       this.fenceTemp.temp = Object.assign({}, row)
       this.fenceTemp.dialogFormVisible = true
-      this.textMap.fenceTxt = '配方修改记录——栏舍：' + row.栏舍
+      this.textMap.fenceTxt = this.$t('errorAnalysis.pfxgjl') + row.栏舍
       this.fenceTemp.dialogStatus = 'fenceTxt'
       this.fenceTemp.activeName = 'first'
       this.fenceTemp.tab1.getdataListParm.parammaps.barname = row.栏舍

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

@@ -44,7 +44,7 @@
           </el-col>
           <el-col :span="14">
             <div class="mixture">
-              <h4>混料信息</h4>
+              <h4>{{$t('errorAnalysis.hlxx')}}</h4>
               <div class="table">
                 <el-table
                   :key="table2.tableKey"
@@ -104,7 +104,7 @@
               </div>
             </div>
             <div class="controlChart">
-              <h4>监控图</h4>
+              <h4>{{$t('errorAnalysis.kzt')}}</h4>
               <div id="chartLine" style="width: 100%;height:300px;" />
             </div>
           </el-col>
@@ -126,7 +126,7 @@ export default {
   name: 'See',
   props: {
     show: { type: Boolean, default: false }, // 弹框可见标志
-    titleFname: { type: String, defalut: '准确性详情' },
+    titleFname: { type: String, defalut: '' },
     methodName:{ type: String, defalut: '' },
     rowPid: { type: String, defalut: '0' },
     optdevice: { type: String, defalut: '' },

src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue

@@ -283,7 +283,7 @@
             <el-table-column :label="$t('feedingEfficiency.yhll')"   min-width="110px" align="center" prop="应混料量" />
             <el-table-column :label="$t('feedingEfficiency.sjhll')"   min-width="110px" align="center" prop="实际混料量" />
             <el-table-column :label="$t('feedingEfficiency.sll')"   min-width="110px" align="center" prop="撒料量" />
-            <el-table-column label="混料时间"   min-width="110px" align="center" prop="混料时间" />
+            <el-table-column :label="$t('errorAnalysis.hlsj')"   min-width="110px" align="center" prop="混料时间" />
             <el-table-column :label="$t('feedingEfficiency.ztsll')"   min-width="110px" align="center" prop="转投剩料量" />
             <el-table-column :label="$t('feedingEfficiency.jrsll')"   min-width="110px" align="center" prop="今日剩料量" />
             <el-table-column :label="$t('feedingEfficiency.csl')"   min-width="110px" align="center" prop="剩料率" />

src/views/statisticalAnalysis/inventoryManagement/group/index.vue

@@ -100,7 +100,7 @@
           </el-table-column>
         </el-table>
         <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab2.table.total }}{{$t('processAnalysis.tiao')}}</span>
-        <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div> -->
+        <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div> -->
       </el-tab-pane>
       <el-tab-pane :label="$t('InventoryManagement.jgfx')"  name="third" >
         <div class="search">
@@ -145,7 +145,7 @@
           </el-table-column>
         </el-table>
         <span v-if="tab3.table.listLoading == false && tab3.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab3.table.total }}{{$t('processAnalysis.tiao')}}</span>
-        <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">暂无数据</div> -->
+        <!-- <div v-if="tab3.table.list.length==0" style="text-align: center;">{{$t('errorAnalysis.zwsj')}}</div> -->
       </el-tab-pane>
     </el-tabs>
   </div>

src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -262,7 +262,7 @@
                 <span>{{ scope.row.fname }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="剩料采集重量（kg）" min-width="110px" align="center">
+            <el-table-column :label="$t('processAnalysis.slcjzl')"  min-width="110px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.sweight }}</span>
               </template>
@@ -289,9 +289,9 @@
           >
             <el-table-column :label="$t('processAnalysis.sort')"  min-width="110px" align="center" prop="sort" />
             <el-table-column :label="$t('premixedPlan.ztls')"min-width="110px" align="center" prop="fname" />
-            <el-table-column label="允许分配剩料量" min-width="110px" align="center" prop="lweight" />
-            <el-table-column label="实际分配重量（kg）" min-width="110px" align="center" prop="actualweightminus" />
-            <el-table-column label="废弃剩料重量" min-width="110px" align="center" prop="aweight" />
+            <el-table-column :label="$t('processAnalysis.yxfpsl')"  min-width="110px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.sjfpzl')"  min-width="110px" align="center" prop="actualweightminus" />
+            <el-table-column :label="$t('processAnalysis.fqslzl')"  min-width="110px" align="center" prop="aweight" />
           </el-table>
         </div>
       </el-col>

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

@@ -293,7 +293,7 @@
                 <span>{{ scope.row.fname }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="剩料采集重量（kg）" min-width="110px" align="center">
+            <el-table-column :label="$t('processAnalysis.slcjzl')"  min-width="110px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.sweight }}</span>
               </template>
@@ -319,10 +319,10 @@
             max-height="260px"
           >
             <el-table-column :label="$t('processAnalysis.sort')"  min-width="110px" align="center" prop="sort" />
-            <el-table-column :label="$t('premixedPlan.ztls')"min-width="110px" align="center" prop="fname" />
-            <el-table-column label="允许分配剩料量" min-width="110px" align="center" prop="lweight" />
-            <el-table-column label="实际分配重量（kg）" min-width="110px" align="center" prop="actualweightminus" />
-            <el-table-column label="废弃剩料重量" min-width="110px" align="center" prop="aweight" />
+            <el-table-column :label="$t('premixedPlan.ztls')" min-width="110px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.yxfpsl')"  min-width="110px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.sjfpzl')"  min-width="110px" align="center" prop="actualweightminus" />
+            <el-table-column :label="$t('processAnalysis.fqslzl')"  min-width="110px" align="center" prop="aweight" />
           </el-table>
         </div>
       </el-col>