Jelajahi Sumber

修改多语言翻译

Shan9312 9 bulan lalu
induk
melakukan
9f5ad2e65c

+ 1 - 1
src/components/index.vue

@@ -905,7 +905,7 @@ export default {
     // 图表总查询
     handleChartDate() {
       console.log('点击了确认时间')
-      MessageBox.confirm('是否调整以下所有图表查询时间?', {
+      MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
         confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this

+ 1 - 1
src/lang/en/langModule/dhedFormula.js

@@ -6,7 +6,7 @@ lsjl:"Historical Record",
 rjntstb:"Software Data Synchronization",
 rjnts:"software headcount",
 xs:'coefficient(%)',
-xsts:"number of coefficients",
+xsts:"count  coefficients",
 bcbl:"Shift Ratio",
 blpf:"Supplement Formula",
 bczl:"Shift Weight",

+ 21 - 7
src/lang/en/langModule/errorAnalysis.js

@@ -72,7 +72,7 @@ jhzxzl:'Planned Execution Weight(kg)',
 pfllzl:'Formula Theoretical Weight(kg)',
 jhqxzl:'Planned Cancellation Weight(kg)',
 jhs:"Planned Number",
-clzql:'accuracy rate per batch(weight)',
+clzql:'Vehicle Accuracy Rate(weight)',
 jhzl:"Planned weight(kg)",
 skzl:'Actual Weight(kg)',
 zql:"Accuracy rate",
@@ -90,7 +90,7 @@ sdtzzql:"Manual transition accuracy rate",
 zdtzllzl:'Theoretical weight of automatic transition',
 time:'Time',
 pen:'Pen',
-czNum:"peration Number",
+czNum:"Operation Number",
 wcz:"Error Value",
 planTime:"Planned time",
 startTime:"Start time",
@@ -98,10 +98,10 @@ endTime:'End time',
 jsTime:'Mix time',
 stWeight:'Starting Weight',
 edWeight:'Ending Weight',
-isOK:'Is it up to standard?',
+isOK:'Is it up to standard',
 area:'Area',
 tzfs:'Transition method',
-ccms:'Batch description',
+ccms:'Description',
 sfytj:'Whether to Pre-calculate Statistics',
 one: 'First Shift',
 two: "Second Shift",
@@ -151,9 +151,23 @@ zqxxq:"Accuracy Details",
 pfxgjl: "Formula Modification Record",
 pfmbxgjl: "Formula Template Modification Record",
 
-zwsj:"No Data Available"
-
-
+zwsj:"No Data Available",
+
+msg1: "Adjust the query time for all the following charts?",
+msg2: "Please enter the year.",
+msg3: "Please enter the start week and end week for the query.",
+msg4: "Please enter the month.",
+wwc: "Incomplete",
+bfwc: "Partially Completed",
+qbwc: "Fully Completed",
+sfyhjh: "Is it a premix",
+yh: "Premix",
+fyh: "Not premixed",
+export: "Export",
+xs: "Coefficient (%)",
+bl: "Proportion (%)",
+cczl: "Train Weight",
+slzls: "Feed Weight (KG)",
 
 
 

+ 24 - 1
src/lang/zn/langModule/errorAnalysis.js

@@ -150,7 +150,30 @@ zqxxq:"准确性详情",
 pfxgjl:"配方修改记录",
 pfmbxgjl:"配方模板修改记录",
 
-zwsj:"暂无数据"
+zwsj:"暂无数据",
+
+msg1:"是否调整以下所有图表查询时间?",
+msg2:"请输入年",
+msg3:"请输入查询开始周跟结束周",
+msg4:"请输入月",
+wwc:"未完成",
+bfwc:"部分完成",
+qbwc:"全部完成",
+sfyhjh:"是否预混计划",
+yh:"预混",
+fyh:"非预混",
+export:"导出",
+
+xs:"系数(%)",
+bl:"比例(%)",
+cczl:"车次重量",
+slzls:"饲料重量(KG)"
+
+
+
+
+
+
 
 
 

+ 4 - 0
src/styles/element-ui.scss

@@ -82,4 +82,8 @@
 
 .el-date-editor .el-range__close-icon {
   width:10px !important;
+}
+
+.el-date-editor .el-range-separator{
+  width:6%
 }

+ 2 - 2
src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue

@@ -1308,7 +1308,7 @@ export default {
     // 表总查询
     handleChartDate() {
       console.log('点击了确认时间')
-      MessageBox.confirm('是否调整以下所有图表查询时间?', {
+      MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
         confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this
@@ -1568,7 +1568,7 @@ export default {
         },
         xAxis: [{ type: 'category', data: chartLine_data.data1, axisPointer: { type: 'shadow' }}],
         yAxis: [{ type: 'value', name: '次数', min: 0, max: 100, interval: 20, axisLabel: { formatter: '{value}' }}],
-        series: [{ name: '自动跳转', type: 'bar', itemStyle: { normal: { color: '#7ecf51' }},
+        series: [{  name:this.$t('errorAnalysis.zdtz'), type: 'bar', itemStyle: { normal: { color: '#7ecf51' }},
           data: chartLine_data.data2,
           markLine: {
             data: [{ type: 'average' }],

+ 2 - 2
src/views/statisticalAnalysis/errorAnalysis/group/tab2.vue

@@ -125,8 +125,8 @@ export default {
         }
       },
       frequencyList: [],
-      jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1', name: '自动跳转' }],
-      isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }],
+      jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1',  name:this.$t('errorAnalysis.zdtz') }],
+      isuseList: [{ id: '0',  name:this.$t('errorAnalysis.wwc')}, { id: '2', name:this.$t('errorAnalysis.bfwc')}, { id: '1',  name:this.$t('errorAnalysis.qbwc') }],
       table: {
         getdataListParm: {
           name: 'getStatisticsHL',

+ 2 - 2
src/views/statisticalAnalysis/errorAnalysis/group/tab3.vue

@@ -124,9 +124,9 @@ export default {
           }
         }
       },
-      jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1', name: '自动跳转' }],
+      jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1',  name:this.$t('errorAnalysis.zdtz') }],
       frequencyList: [],
-      isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }],
+      isuseList: [{ id: '0',  name:this.$t('errorAnalysis.wwc')}, { id: '2', name:this.$t('errorAnalysis.bfwc')}, { id: '1',  name:this.$t('errorAnalysis.qbwc') }],
       table: {
         getdataListParm: {
           name: 'getStatisticsSL',

+ 96 - 39
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -84,6 +84,9 @@
             class="elTable table-fixed"
             :max-height="myHeight2"
           >
+          <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
             <u-table-column v-if="tab.checked && !tab.isTrainNumber" :key="0" sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="计划时间" />
             <u-table-column v-if="tab.isTrainNumber" :key="117" sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="计划时间1" />
             <u-table-column v-if="tab.isTrainNumber" :key="113" sortable  :label="$t('errorAnalysis.feedName')"  min-width="70px" align="center" prop="templetname" />
@@ -139,7 +142,6 @@
               ref="plTable22"
               :key="tab.table2.tableKey"
               v-loading="tab.table2.listLoading"
-              :element-loading-text="$t('common.tableMsg')"
               :data="tab.table2.list"
               border
               fit
@@ -150,6 +152,9 @@
               class="elTable table-fixed"
               :max-height="myHeight2"
             >
+            <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
               <u-table-column v-if="tab.checked && !tab.isTrainNumber" :key="0" sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="计划时间" />
               <u-table-column v-if="tab.isTrainNumber" :key="117" sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="计划时间1" />
               <u-table-column v-if="tab.isTrainNumber" :key="113" sortable  :label="$t('errorAnalysis.feedName')"  min-width="70px" align="center" prop="templetname" />
@@ -267,7 +272,7 @@
                   <el-table
                     :key="tab.chart2.table.tableKey"
                     v-loading="tab.chart2.table.listLoading"
-                    :element-loading-text="$t('common.tableMsg')"
+                   
                     :data="tab.chart2.table.list"
                     border
                     fit
@@ -278,6 +283,9 @@
                     :cell-style="cellStyle"
                     class="elTable table-fixed"
                   >
+                  <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="85px" align="center" prop="日期" />
                     <el-table-column :label="$t('errorAnalysis.jhzxzl')" sortable min-width="80px" align="center" prop="实际量" />
                     <el-table-column :label="$t('errorAnalysis.pfllzl')" sortable min-width="80px" align="center" prop="理论量" />
@@ -331,7 +339,7 @@
                   <el-table
                     :key="tab.chart1.table.tableKey"
                     v-loading="tab.chart1.table.listLoading"
-                    :element-loading-text="$t('common.tableMsg')"
+                   
                     :data="tab.chart1.table.list"
                     border
                     fit
@@ -342,6 +350,9 @@
                     :cell-style="cellStyle"
                     class="elTable table-fixed"
                   >
+                  <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="90px" align="center" prop="日期" />
                     <el-table-column  :label="$t('errorAnalysis.feedName')"  sortable min-width="90px" align="center" prop="名称" />
                     <el-table-column :label="$t('errorAnalysis.jhzl')" sortable min-width="100px" align="center" prop="理论量" />
@@ -404,6 +415,9 @@
                     :cell-style="cellStyle"
                     class="elTable table-fixed"
                   >
+                  <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="90px" align="center" prop="日期" />
                     <el-table-column :label="$t('errorAnalysis.sxlb')" sortable min-width="90px" align="center" prop="名称" />
                     <el-table-column :label="$t('errorAnalysis.jhzl')" sortable min-width="100px" align="center" prop="理论量" />
@@ -453,7 +467,7 @@
                   <el-table
                     :key="tab.chart4.table.tableKey"
                     v-loading="tab.chart4.table.listLoading"
-                    :element-loading-text="$t('common.tableMsg')"
+                   
                     :data="tab.chart4.table.list"
                     border
                     fit
@@ -464,6 +478,9 @@
                     :cell-style="cellStyle"
                     class="elTable table-fixed"
                   >
+                  <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="90px" align="center" prop="日期" />
                     <el-table-column :label="$t('errorAnalysis.projname')" sortable min-width="90px" align="center" prop="名称" />
                     <el-table-column :label="$t('errorAnalysis.jhzl')" sortable min-width="100px" align="center" prop="理论量" />
@@ -515,7 +532,6 @@
                   <el-table
                     :key="tab.chart5.table.tableKey"
                     v-loading="tab.chart5.table.listLoading"
-                    :element-loading-text="$t('common.tableMsg')"
                     :data="tab.chart5.table.list"
                     ref='myTable'
                     border
@@ -527,6 +543,9 @@
                     :cell-style="cellStyle"
                     class="elTable table-fixed"
                   >
+                  <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="100px" align="center" prop="日期" />
                     <el-table-column :label="$t('errorAnalysis.zdtzcs')" sortable min-width="130px" align="center" prop="field1" />
                     <el-table-column :label="$t('errorAnalysis.sdtzcs')" sortable min-width="130px" align="center" prop="field2" />
@@ -590,6 +609,9 @@
                     :cell-style="cellStyle"
                     class="elTable table-fixed"
                   >
+                  <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                 </template>
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="110px" align="center" prop="日期" />
                     <el-table-column :label="$t('errorAnalysis.hlqxcs')" sortable min-width="110px" align="center" prop="field1" />
                   </el-table>
@@ -647,7 +669,7 @@
                   <el-table
                     :key="tab.chart7.table.tableKey"
                     v-loading="tab.chart7.table.listLoading"
-                    :element-loading-text="$t('common.tableMsg')"
+                   
                     :data="tab.chart7.table.list"
                     border
                     fit
@@ -658,6 +680,9 @@
                     :cell-style="cellStyle"
                     class="elTable table-fixed"
                   >
+                  <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
                     <el-table-column :label="$t('errorAnalysis.date')" sortable min-width="110px" align="center" prop="日期" />
                     <el-table-column :label="$t('errorAnalysis.pen')" sortable min-width="110px" align="center" prop="fname" />
                     <el-table-column  :label="$t('errorAnalysis.slsj')"  sortable min-width="110px" align="center" prop="撒料时间" />
@@ -701,7 +726,7 @@
             <span>-</span>
             <el-input-number :controls="false" :precision="2" v-model="tab2.table.getdataListParm.parammaps.hlzql2" :placeholder="$t('processAnalysis.hlzql')"  :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
-          <el-select v-model="tab2.table.getdataListParm.parammaps.premix" filterable placeholder="是否预混计划" class="filter-item" style="width: 120px;" clearable>
+          <el-select v-model="tab2.table.getdataListParm.parammaps.premix" filterable :placeholder="$t('errorAnalysis.sfyhjh')" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in tab2.premixList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-checkbox v-model="tab2.table.getdataListParm.parammaps.error" style="margin-right: 10px;">{{$t('processAnalysis.oName')}}</el-checkbox>
@@ -726,6 +751,9 @@
             class="elTable table-fixed"
             :height="myHeightSecond"
           >
+          <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
             <u-table-column sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
             <u-table-column sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
             <u-table-column sortable :label="$t('errorAnalysis.czNum')"  min-width="70px" align="center" prop="sort" />
@@ -814,6 +842,9 @@
             class="elTable table-fixed"
             :height="myHeightThird"
           >
+          <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
             <u-table-column sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
             <u-table-column sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
             <u-table-column sortable :label="$t('errorAnalysis.czNum')"  min-width="70px" align="center" prop="sort" />
@@ -846,7 +877,7 @@
       </el-tab-pane>
     </el-tabs>
     <!-- 导出 -->
-    <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="20%">
+    <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="30%">
     <div>
       <span>{{$t('feedingEfficiency.dcskff')}}</span>
       <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions2" />
@@ -881,6 +912,9 @@
             class="elTable table-fixed"
             :max-height="450"
           >
+          <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
             <el-table-column :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50px" />
             <el-table-column :label="$t('formulationEvaluation.xgsj')" width="130px" align="center" prop="createdate" />
             <el-table-column :label="$t('formulationEvaluation.xgyh')" width="130px" align="center" prop="empname" />
@@ -971,7 +1005,11 @@
             :cell-style="cellStyle"
             class="elTable table-fixed"
             :max-height="450"
+           
           >
+          <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
             <el-table-column :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50px" />
             <el-table-column :label="$t('formulationEvaluation.slz')" width="130px" align="center" prop="feedgroup" />
             <el-table-column :label="$t('InventoryManagement.silc')"    min-width="70px" align="center"  prop="fname">
@@ -1016,7 +1054,11 @@
             :row-style="rowStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
+            
           >
+          <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
             <el-table-column :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50px">
               <template slot-scope="scope">
                 <span>{{ scope.$index + (feedTemp.pageNum-1) * feedTemp.pageSize + 1 }}</span>
@@ -1024,7 +1066,7 @@
             </el-table-column>
             <el-table-column :label="$t('formulationEvaluation.xgsj')" min-width="100px" align="center" prop="updateTime" />
             <el-table-column :label="$t('formulationEvaluation.xgyh')" width="130px" align="center" prop="empname" />
-            <el-table-column label="饲料重量(KG)" min-width="100px" align="center">
+            <el-table-column :label="$t('errorAnalysis.slzls')" min-width="100px" align="center">
               <template slot-scope="{row}">
                 <span v-if="row.weight !==undefined &&row.weight.indexOf('/') !== -1" style="color: red;">
                   {{row.weight}}
@@ -1063,18 +1105,22 @@
                   :cell-style="cellStyle"
                   class="elTable table-fixed"
                   :span-method="objectSpanMethod1"
+                
                 >
+                <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
                   <u-table-column :label="$t('formulationEvaluation.xh')" width="50px" align="center" type="index" />
                   <u-table-column :label="$t('formulationEvaluation.xgsj')" width="100px" align="center" prop="createdate" />
                   <u-table-column :label="$t('formulationEvaluation.xgyh')" width="130px" align="center" prop="empname" />
-                  <u-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="100px" align="center" prop="times" />
+                  <u-table-column :label="$t('errorAnalysis.projname')"  min-width="100px" align="center" prop="times" />
                   <u-table-column :label="$t('feedingEfficiency.sjnts')" min-width="100px" align="center" prop="ccount">
                     <template slot-scope="{row}">
                       <span v-if="row.ccountstatus == 1" style="color: red;">{{row.ccount}}</span>
                       <span v-else >{{row.ccount}}</span>
                     </template>
                   </u-table-column>
-                  <u-table-column label="系数(%)" min-width="100px" align="center" prop="ratio">
+                  <u-table-column :label="$t('errorAnalysis.xs')" min-width="100px" align="center" prop="ratio">
                     <template slot-scope="{row}">
                       <span v-if="row.ratiostatus == 1" style="color: red;">{{row.ratio}}</span>
                       <span v-else >{{row.ratio}}</span>
@@ -1092,13 +1138,13 @@
                       <a v-else @click="clickRecipeTemplate3(row)" style="text-decoration: underline;">{{ row.ftname }}</a>
                     </template>
                   </u-table-column>
-                  <u-table-column label="比例(%)" min-width="100px" align="center">
+                  <u-table-column :label="$t('errorAnalysis.bl')" min-width="100px" align="center">
                     <template slot-scope="{row}">
                         <span v-if="row.tratiostatus == 1" style="color: red;">{{row.tratio}}</span>
                         <span v-else >{{row.tratio}}</span>
                       </template>
                   </u-table-column>
-                  <u-table-column :label="$t('formulationEvaluation.reset1')"min-width="100px" align="center" prop="weight">
+                  <u-table-column :label="$t('formulationEvaluation.reset1')" min-width="100px" align="center" prop="weight">
                     <template slot-scope="{row}">
                         <span v-if="row.weightstatus == 1" style="color: red;">{{row.weight}}</span>
                         <span v-else>{{row.weight}}</span>
@@ -1107,7 +1153,7 @@
                 </u-table>
               </div>
           </el-tab-pane>
-          <el-tab-pane label="车次重量" name="second">
+          <el-tab-pane :label="$t('errorAnalysis.cczl')" name="second">
               <div class="search">
                 <el-date-picker ref="inputDatetime" :clearable="false" v-model="fenceTemp.tab2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" />
                 <el-button class="successBorder" @click="handleFenceSearch">{{$t('common.query')}}</el-button>
@@ -1121,14 +1167,18 @@
                   border
                   highlight-current-row
                   style="width: 100%;"
+                 
                   :row-style="rowStyle"
                   class="elTable table-fixed"
                   :span-method="objectSpanMethod2"
                   >
+                  <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
                   <u-table-column :label="$t('formulationEvaluation.xh')" width="50px" align="center" type="index" />
                   <u-table-column :label="$t('formulationEvaluation.xgsj')" width="100px" align="center" prop="createdate" />
                   <u-table-column :label="$t('formulationEvaluation.xgyh')" width="130px" align="center" prop="empname" />
-                  <u-table-column :label="$t('errorAnalysis.isTrainNumber')"  width="100px" align="center" prop="times" />
+                  <u-table-column :label="$t('errorAnalysis.projname')"  width="100px" align="center" prop="times" />
                   <!-- <u-table-column v-for="(item, index) in fenceTemp.tab2.tableLabel" :key="index" align="center" :min-width="item.width" :prop="item.prop" :label="item.label"> -->
                   <u-table-column v-for="(item, index) in fenceTemp.tab2.tableLabel" :key="index" align="center" :min-width="item.width" :prop="item.prop"  :label="item.label">
                     <template slot-scope="scope">
@@ -1179,6 +1229,9 @@
               show-summary
               :summary-method="getSummaries1"
             >
+            <template slot="empty">
+                <span style="color: #969799;">No more data</span>
+              </template>
               <el-table-column :label="$t('formulationEvaluation.slz')" min-width="90px" align="center" prop="feedgroup" />
               <el-table-column :label="$t('InventoryManagement.silc')"    min-width="90px" align="center" prop="fname" />
               <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
@@ -1218,8 +1271,12 @@
               :cell-style="cellStyle"
               class="elTable table-fixed"
               show-summary
+               
               :summary-method="getSummaries2"
             >
+            <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
               <el-table-column :label="$t('formulationEvaluation.slz')" min-width="90px" align="center" prop="feedgroup" />
               <el-table-column :label="$t('InventoryManagement.silc')"    min-width="90px" align="center" prop="fname" />
               <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
@@ -1733,7 +1790,7 @@ export default {
 
       tab2: {
         TMRNameList:[],
-        premixList:[{id:0,name:'预混'},{id:1,name:'非预混'}],
+        premixList:[{id:0,name:this.$t('errorAnalysis.yh')},{id:1,name:this.$t('errorAnalysis.fyh')}],
         table: {
           getdataListParm: {
             name: 'getStatisticsHL',
@@ -1763,8 +1820,8 @@ export default {
           temp: {}
         },
         frequencyList: [],
-        jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1', name: '自动跳转' }],
-        isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }]
+        jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1',  name:this.$t('errorAnalysis.zdtz') }],
+        isuseList: [{ id: '0',  name:this.$t('errorAnalysis.wwc')}, { id: '2', name:this.$t('errorAnalysis.bfwc')}, { id: '1',  name:this.$t('errorAnalysis.qbwc') }]
       },
       tab3: {
         TMRNameList:[],
@@ -1797,8 +1854,8 @@ export default {
           temp: {}
         },
         frequencyList: [],
-        jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1', name: '自动跳转' }],
-        isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }]
+        jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1',  name:this.$t('errorAnalysis.zdtz') }],
+        isuseList: [{ id: '0',  name:this.$t('errorAnalysis.wwc')}, { id: '2', name:this.$t('errorAnalysis.bfwc')}, { id: '1',  name:this.$t('errorAnalysis.qbwc') }]
       },
       titlefname: '',
       methodName:'',
@@ -1816,7 +1873,7 @@ export default {
         inputDatetime: [new Date(), new Date()]
       },
       textMap: {
-        exportList: '导出',
+        exportList: this.$t('errorAnalysis.export'),
         recipeNameTxt:this.$t('errorAnalysis.pfxgjl'),
         feedTxt:this.$t('errorAnalysis.isFeed'),
         fenceTxt:this.$t('errorAnalysis.pen'),
@@ -1963,7 +2020,7 @@ export default {
     },
     handleAllDate() {
       console.log('点击了确认时间')
-      MessageBox.confirm('是否调整以下所有图表查询时间?', {
+      MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
         confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var startDate = ''
@@ -1984,12 +2041,12 @@ export default {
           console.log('结束日时==>', endDate)
         } else if (this.tab.specificDate == '2') {
           if (this.tab.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if(this.tab.selectWeek !== null){
             if (this.tab.selectWeek.length !== 2) {
-              this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
               return
             }
           }
@@ -2038,7 +2095,7 @@ export default {
               console.log('开始月时间==>', startDate)
               console.log('结束月时间==>', endDate)
             } else {
-              this.$message({ type: 'error', message: '请输入月', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg4'), duration: 2000 })
             }
           }
         }
@@ -2276,12 +2333,12 @@ export default {
           this.tab.chart1.getdataListParm.parammaps.status = 0
         } else if (this.tab.chart1.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart1.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if(this.tab.chart1.getdataListParm.parammaps.selectWeek !== null){
             if (this.tab.chart1.getdataListParm.parammaps.selectWeek.length !== 2) {
-              this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
               return
             }
           }
@@ -2309,12 +2366,12 @@ export default {
           console.log('计划统计结束日期==>', endDate)
         } else if (this.tab.chart2.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart2.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart2.getdataListParm.parammaps.selectWeek !== null) {
             if (this.tab.chart2.getdataListParm.parammaps.selectWeek.length !== 2) {
-              this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
               return
             }
           }
@@ -2343,12 +2400,12 @@ export default {
           console.log('牛群准确率结束日期==>', endDate)
         } else if (this.tab.chart3.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart3.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart3.getdataListParm.parammaps.selectWeek !== null) {
             if (this.tab.chart3.getdataListParm.parammaps.selectWeek.length !== 2) {
-              this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
               return
             }
           }
@@ -2376,12 +2433,12 @@ export default {
           console.log('车辆准确率(重量)结束日期==>', endDate)
         } else if (this.tab.chart4.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart4.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart4.getdataListParm.parammaps.selectWeek !== null) {
             if (this.tab.chart4.getdataListParm.parammaps.selectWeek.length !== 2) {
-              this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
               return
             }
           }
@@ -2409,12 +2466,12 @@ export default {
           console.log('混料统计结束日期==>', endDate)
         } else if (this.tab.chart5.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart5.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart5.getdataListParm.parammaps.selectWeek !== null) {
             if (this.tab.chart5.getdataListParm.parammaps.selectWeek.length !== 2) {
-              this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
               return
             }
           }
@@ -2442,12 +2499,12 @@ export default {
           console.log('混料计划取消次数结束日期==>', endDate)
         } else if (this.tab.chart6.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart6.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart6.getdataListParm.parammaps.selectWeek !== null) {
             if (this.tab.chart6.getdataListParm.parammaps.selectWeek.length !== 2) {
-              this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
               return
             }
           }
@@ -2475,12 +2532,12 @@ export default {
           console.log('栏舍撒料时间统计结束日期==>', endDate)
         } else if (this.tab.chart7.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart7.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart7.getdataListParm.parammaps.selectWeek !== null) {
             if (this.tab.chart7.getdataListParm.parammaps.selectWeek.length !== 2) {
-              this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
               return
             }
           }

+ 1 - 1
src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue

@@ -730,7 +730,7 @@ export default {
     // 图表总查询
     handleChartDate() {
       console.log('点击了确认时间')
-      MessageBox.confirm('是否调整以下所有图表查询时间?', {
+      MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
         confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this

+ 14 - 14
src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -1069,7 +1069,7 @@ export default {
     },
     handleAllDate() {
       console.log('点击了确认时间')
-      MessageBox.confirm('是否调整以下所有图表查询时间?', {
+      MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
         confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var startDate = ''
@@ -1088,11 +1088,11 @@ export default {
           console.log('结束日时==>', endDate)
         } else if (this.tab.specificDate == '2') {
           if (this.tab.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.selectWeek.length !== 2) {
-            this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
             return
           }
           startDate = this.tab.selectYear + '-' + whichWeek(this.tab.selectYear)[this.tab.selectWeek[0]].month + '-' + whichWeek(this.tab.selectYear)[this.tab.selectWeek[0]].date
@@ -1131,7 +1131,7 @@ export default {
             console.log('开始月时间==>', startDate)
             console.log('结束月时间==>', endDate)
           } else {
-            this.$message({ type: 'error', message: '请输入月', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg4'), duration: 2000 })
           }
         }
         this.tab.chart1.getdataListParm.parammaps.specificDate = this.tab.specificDate
@@ -1298,11 +1298,11 @@ export default {
           this.tab.chart1.getdataListParm.parammaps.status = 0
         } else if (this.tab.chart1.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart1.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart1.getdataListParm.parammaps.selectWeek.length !== 2) {
-            this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
             return
           }
           startDate = this.tab.chart1.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart1.getdataListParm.parammaps.selectYear)[this.tab.chart1.getdataListParm.parammaps.selectWeek[0]].month + '-' + whichWeek(this.tab.chart1.getdataListParm.parammaps.selectYear)[this.tab.chart1.getdataListParm.parammaps.selectWeek[0]].date
@@ -1329,11 +1329,11 @@ export default {
           console.log('牛栏剩料率结束日期==>', endDate)
         } else if (this.tab.chart2.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart2.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart2.getdataListParm.parammaps.selectWeek.length !== 2) {
-            this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
             return
           }
           startDate = this.tab.chart2.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart2.getdataListParm.parammaps.selectYear)[this.tab.chart2.getdataListParm.parammaps.selectWeek[0]].month + '-' + whichWeek(this.tab.chart2.getdataListParm.parammaps.selectYear)[this.tab.chart2.getdataListParm.parammaps.selectWeek[0]].date
@@ -1361,11 +1361,11 @@ export default {
           console.log('混料时间统计结束日期==>', endDate)
         } else if (this.tab.chart3.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart3.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart3.getdataListParm.parammaps.selectWeek.length !== 2) {
-            this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
             return
           }
           startDate = this.tab.chart3.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart3.getdataListParm.parammaps.selectYear)[this.tab.chart3.getdataListParm.parammaps.selectWeek[0]].month + '-' + whichWeek(this.tab.chart3.getdataListParm.parammaps.selectYear)[this.tab.chart3.getdataListParm.parammaps.selectWeek[0]].date
@@ -1392,11 +1392,11 @@ export default {
           console.log('转化率结束日期==>', endDate)
         } else if (this.tab.chart4.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart4.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart4.getdataListParm.parammaps.selectWeek.length !== 2) {
-            this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
             return
           }
           startDate = this.tab.chart4.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart4.getdataListParm.parammaps.selectYear)[this.tab.chart4.getdataListParm.parammaps.selectWeek[0]].month + '-' + whichWeek(this.tab.chart4.getdataListParm.parammaps.selectYear)[this.tab.chart4.getdataListParm.parammaps.selectWeek[0]].date
@@ -1423,11 +1423,11 @@ export default {
           console.log('成本分析结束日期==>', endDate)
         } else if (this.tab.chart5.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart5.getdataListParm.parammaps.selectYear == '') {
-            this.$message({ type: 'error', message: '请输入年', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg2'), duration: 2000 })
             return
           }
           if (this.tab.chart5.getdataListParm.parammaps.selectWeek.length !== 2) {
-            this.$message({ type: 'error', message: '请输入查询开始周跟结束周', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('errorAnalysis.msg3'), duration: 2000 })
             return
           }
           startDate = this.tab.chart5.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart5.getdataListParm.parammaps.selectYear)[this.tab.chart5.getdataListParm.parammaps.selectWeek[0]].month + '-' + whichWeek(this.tab.chart5.getdataListParm.parammaps.selectYear)[this.tab.chart5.getdataListParm.parammaps.selectWeek[0]].date