Browse Source

推广分析

Shan9312 10 months ago
parent
commit
9e1fa5155c
64 changed files with 1149 additions and 1201 deletions
  1. 1 191
      src/lang/en/langModule/common.js
  2. 3 0
      src/lang/en/langModule/formulaStatistics.js
  3. 2 2
      src/lang/en/langModule/menus.js
  4. 1 1
      src/lang/en/langModule/navbar.js
  5. 60 0
      src/lang/en/langModule/processAnalysis.js
  6. 15 0
      src/lang/en/langModule/pushingplan.js
  7. 3 0
      src/lang/zn/langModule/formulaStatistics.js
  8. 41 0
      src/lang/zn/langModule/processAnalysis.js
  9. 16 0
      src/lang/zn/langModule/pushingplan.js
  10. 19 19
      src/views/basicData/defaultParameter/earlyWarning/index.vue
  11. 19 19
      src/views/basicData/defaultParameter/function/index.vue
  12. 6 6
      src/views/basicData/feedTable/index.vue
  13. 1 1
      src/views/basicData/groupColumn/index.vue
  14. 1 1
      src/views/basicData/sapLog/index.vue
  15. 55 55
      src/views/basicData/standardParameters/index.vue
  16. 1 1
      src/views/customboard/addboard/dashboardItem.vue
  17. 1 1
      src/views/formulationPlan/dailyExecutionPlan/index.vue
  18. 1 1
      src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue
  19. 362 362
      src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue
  20. 1 1
      src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue
  21. 2 2
      src/views/formulationPlan/dhedFormula/index - 20230829备份.vue
  22. 2 2
      src/views/formulationPlan/dhedFormula/index.vue
  23. 2 2
      src/views/formulationPlan/dhedFormula/index备.vue
  24. 3 3
      src/views/formulationPlan/formulaDistribution/index.vue
  25. 5 5
      src/views/formulationPlan/materialIssuancePlan/index.vue
  26. 5 5
      src/views/formulationPlan/materialIssuancePlan/index1.vue
  27. 1 1
      src/views/formulationPlan/premixedPlan/index.vue
  28. 1 1
      src/views/formulationPlan/pushMaterialPlan/index.vue
  29. 4 4
      src/views/formulationPlan/recipeTemplate/index.vue
  30. 2 2
      src/views/formulationPlan/surplusMaterialPlan/index.vue
  31. 2 2
      src/views/inventoryManagement/feedContract/index.vue
  32. 2 2
      src/views/inventoryManagement/inventoryList/index.vue
  33. 2 2
      src/views/inventoryManagement/laborConsumption/index.vue
  34. 1 1
      src/views/inventoryManagement/statistics/index.vue
  35. 3 3
      src/views/inventoryManagement/warehousing/index.vue
  36. 1 1
      src/views/inventoryManagement/warning/index.vue
  37. 1 1
      src/views/shedProduction/dungScores/historyRecord.vue
  38. 2 2
      src/views/shedProduction/dungScores/index.vue
  39. 2 2
      src/views/shedProduction/dutyRecord/index.vue
  40. 1 1
      src/views/shedProduction/fecalScreen/historyRecord.vue
  41. 2 2
      src/views/shedProduction/fecalScreen/index.vue
  42. 1 1
      src/views/shedProduction/formulaDryMatter/historyRecord.vue
  43. 2 2
      src/views/shedProduction/formulaDryMatter/index.vue
  44. 1 1
      src/views/shedProduction/materialRemainingRecord/index.vue
  45. 1 1
      src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue
  46. 2 2
      src/views/shedProduction/pennsylvaniaSieve/index.vue
  47. 1 1
      src/views/shedProduction/performance/index.vue
  48. 1 1
      src/views/shedProduction/physicalConditionScore/historyRecord.vue
  49. 2 2
      src/views/shedProduction/physicalConditionScore/index.vue
  50. 1 1
      src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue
  51. 6 6
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue
  52. 1 1
      src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue
  53. 1 1
      src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue
  54. 1 1
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue
  55. 299 299
      src/views/statisticalAnalysis/formulaStatistics/index.vue
  56. 2 2
      src/views/statisticalAnalysis/formulationEvaluation/index.vue
  57. 2 2
      src/views/statisticalAnalysis/formulationEvaluation/index备.vue
  58. 1 1
      src/views/statisticalAnalysis/processAnalysis/group/index.vue
  59. 142 142
      src/views/statisticalAnalysis/processAnalysis/pasture/index.vue
  60. 23 23
      src/views/statisticalAnalysis/pushingplan/index.vue
  61. 1 1
      src/views/systemManagement/customboard2/Addboard2/index.vue
  62. 1 1
      src/views/systemManagement/labelManagement/index.vue
  63. 1 1
      src/views/systemManagement/notificationManagement/index.vue
  64. 1 1
      src/views/systemManagement/operation/index.vue

+ 1 - 191
src/lang/en/langModule/common.js

@@ -32,194 +32,4 @@ export default {
     query:'Query'
   
 
-  // dashboard: {
-  //   addDashboard: 'Add Dashboard',
-  //   dashboardName: 'Dashboard Name',
-  //   dashboardDesc: 'Dashboard Description',
-  //   addOrEditDashboard: 'Add or edit Dashboard',
-  //   addChart: 'Add Chart',
-  //   shareLink: 'Share Link',
-  //   emptyDashboardTip: 'Dashboard Is Empty,Go Create Your First Chart!',
-  //   dashboardNamePlaceholder: 'Please enter dashboard name',
-  //   dashboardDescPlaceholder: 'Please enter dashboard description.',
-  //   dashboardList: 'Dashboard List',
-  //   removeChartConfirm: 'Are you sure you want to remove chart from dashboard ?',
-  //   chartQueryException: 'Something wrong with chart {0}.',
-  //   deleteConfirm: 'Are you sure you want to delete dashboard: {0}?',
-  //   noMessage:'No messages notifications at the moment',
-  //   pureBlend:'Blended Feed Accuracy',
-  //   yestday:'Yesterday',
-  //   yestday30:'Blending Accuracy of Mixed Feed in the Last 30 Days',
-  //   spreadAc:'Spreading Accuracy',
-  //   yestday30S:'Blending Accuracy of Mixed Feed in the Last 30 Days',
-  //   SpreadingCR:'Spreading Correctness Rate',
-  //   yestday30SD:'Spreading Deviation Over the Last 30 Days',
-  //   spreadSD:'Spreading Deviation',
-  //   mtime:'min',
-  //   todayTps:"Today's Plan Statistics",
-  //   StatisType:"Statistical Type",
-  //   typeAll:'All',
-  //   Fixed:'Fixed',
-  //   struck:'Spreader Truck',
-  //   bout:'bout',
-  //   cTrip:'Complete the trip',
-  //   pTrip:"Planned trip",
-  //   cWeight:"Completed Weight",
-  //   pWeight:"Planned Weight",
-  //   rWright:'Remaining Weight',
-  //   costSts:'Cost Statistics',
-  //   Export:"Export",
-  //   sTable:'Switch Table',
-  //   tripCp:'Trip completion rate',
-  //   tripCpFont:'14',
-  //   WeightP:'Weight completion rate',
-  //   taskT:"task progress",
-  //   table:{
-  //     date:"Date",
-  //     signOx:'Feed Cost per Cow',
-  //     feedCow:'Feed Cost per Kilogram of Milk',
-  //     PEWeight:'Planned Execution Weight(kg)',
-  //     FTWeight:'Formula Theoretical Weight(kg)',
-  //     PARate:'Planning Accuracy Rate',
-  //     PCWeight:"Planned Cancellation Weight(kg)",
-  //     PCancelWeight:"Planning Accuracy Rate (Excluding Canceled Weight)",
-  //     CNumP:"Correct Number in Plan",
-  //     CNumR:'Planning Correctness Rate'
-  //   },
-  //   feedCow:'Feed Cost per Kilogram of Milk',
-  //   tHeader:['Date', 'Feed Cost per Cow', 'Feed Cost per Kilogram of Milk'],
-  //   CostStatistics:'Cost Statistics',
-  //   feedCows:'ilogram of milk \n cost of feed per',
-  //   signOxs:'per Cow \n Feed Cost',
-  //   timeTitle:'Real time monitoring',
-  //   monitMsg:"There are currently no trains in progress",
-  //   curVeh:"Current Vehicle",
-  //   Dweight:"Designed Weight",
-  //   AWeight: 'Actual Weight',
-  //   SWeight:'Starting Weight',
-  //   EWight:'Ending Weight',
-  //   yWeight:'Weight(kg)',
-  //   xTime:'Time',
-  //   veh:'Vehicle',
-  //   feed:'Forage',
-  //   fname:'Pens',
-  //   remark:"Description",
-  //   vehWeight:'Current Vehicle Load',
-  //   Pweight:"Planned Weight",
-  //   compaltRate:'Completion Rate',
-  //   planSta:'Planning Correctness Rate',
-  //   cant:'Percentage',
-  //   miruTitle:'Dry Matter Intake (DMI) of Lactating Cows',
-  //   miruMilk:"Milk Yield of Lactating Cows",
-  //   miruCow:"Feed Intake of Lactating Cows”",
-  //   miruMilk1:"Milk Yield of Lactating Cows(kg)",
-  //   miruCow1:"Feed Intake of Lactating Cows”(kg)",
-  //   miruCowMilk:'Dry Matter Intake \n Lactating Cows',
-  //   mixStatic:'Statistics of Actual Weight of Mixed Feed',
-  //   stockAlart:"Stock Alert",
-  //   stockTable:{
-  //     num:"Serial Number",
-  //     feedName:'Feed Name',
-  //     stockNum:'Inventory Quantity',
-  //     lastDay:'Remaining Days of Use',
-  //   }
-    
-
-  // },
-
-  // chart: {
-  //   myChart: 'My Chart',
-  //   createNewChart: 'Create New Chart',
-  //   editChart: 'Edit Chart',
-  //   createChart: 'Create Chart',
-  //   allCharts: 'AllCharts',
-  //   addToDashboard: 'Add to Dashboard',
-  //   chartName: 'Chart Name',
-  //   chartDesc: 'Chart Description',
-  //   namePlaceholder: 'Please enter chart name',
-  //   descPlaceholder: 'Please enter chart description',
-  //   dimensions: 'Dimension',
-  //   values: 'Values',
-  //   order: 'Order',
-  //   selectOrderBy: 'Select order by',
-  //   descend: 'Descend',
-  //   ascend: 'Ascend',
-  //   filters: 'Filters',
-  //   chartType: 'Chart Types',
-  //   addFilters: 'Add Filters',
-  //   filterField: 'Filter Field',
-  //   filterCantBeEmpty: 'Field and operator can\'t be empty',
-  //   selectFilterField: 'Please select filter field',
-  //   filterOperator: 'Filter Operator',
-  //   selectFilterOperator: 'Please select filter operator',
-  //   comparedValue: 'Compared Value',
-  //   limit: 'Query {0} rows',
-  //   fieldExisted: 'Field already existed.',
-  //   beforeLeaveConfirm: 'Are you sure you want to leave, changes you made may not be saved.',
-  //   deleteConfirm: 'Are you sure you want to delete chart: {0}?',
-  //   chartNameWarning: 'Save failed, please enter chart name. '
-  // },
-  // dataSource: {
-  //   sourcePlaceholder: 'Select data source',
-  //   tablePlaceholder: 'Select table',
-  //   table: 'Table',
-  //   fields: 'Fields',
-  //   addDataSource: 'Add Data Source',
-  //   baseName: 'Base Name',
-  //   host: 'Host',
-  //   port: 'Port',
-  //   user: 'User',
-  //   password: 'Password',
-  //   dataBase: 'DataBase',
-  //   createdAt: 'Created Time',
-  //   manageTables: 'Manage Tables',
-  //   tableName: 'Table Name',
-  //   linked: 'Linked',
-  //   deleteConfirm: 'Are you sure you want to remove this data source ?'
-  // },
-  // guide: {
-  //   dataPanel: 'Data Panel',
-  //   dataPanelDesc: 'Here is the data source and the field list of the data source, you can switch the data source here, drag the field to the Data Query Panel to query.',
-  //   formPanel: 'Data Query Panel',
-  //   formPanelDesc: 'Perform data query here, you can construct and adjust query statements here to query data.',
-  //   dimensionInput: 'Dimension Editor',
-  //   dimensionInputDesc: 'Dimension refers to the angle of data summarization, such as time dimension, category dimension, etc. The dimension should generally not exceed 2.',
-  //   fieldInput: 'Field Editor',
-  //   fieldInputDesc: 'The field refers to the content of the query data, such as the number, sum, etc. There can be multiple fields, but it should not be too much so as not to affect the visualization effect.',
-  //   vizPanel: 'Visualization panel',
-  //   vizPanelDesc: 'Here is the visualization panel, where you can visualize the data, choose different chart types and styles, etc.'
-  // },
-  // chartType: {
-  //   table: 'Table',
-  //   tableDesc: 'Any dimensions and values',
-  //   line: 'Line Chart',
-  //   lineDesc: '1 or 2 dimensions;1+ values',
-  //   bar: 'Bar Chart',
-  //   barDesc: '1 or 2 dimensions;1+ values',
-  //   stackBar: 'Stacked Bar Chart',
-  //   stackBarDesc: '1 or 2 dimensions;2+ values',
-  //   pie: 'Pie Chart',
-  //   pieDesc: '1 dimension and 1 value;Or 0 dimension and multiple values',
-  //   horizontalBar: 'Horizontal Bar Chart',
-  //   horizontalBarDesc: '1 dimension;1+ values'
-  // },
-  // config: {
-  //   is: 'Is ',
-  //   greater: 'Greater',
-  //   less: 'Less',
-  //   greaterOrEqual: 'Greater Or Equal',
-  //   lessorEqual: 'Less or Equal',
-  //   isNot: 'Is Not',
-  //   between: 'Between',
-  //   in: 'In',
-  //   like: 'Like',
-  //   sum: 'Sum',
-  //   avg: 'Avg',
-  //   max: 'Max',
-  //   min: 'Min',
-  //   count: 'Count',
-  //   none: '-'
-  // },
-
- 
-}
+}

+ 3 - 0
src/lang/en/langModule/formulaStatistics.js

@@ -0,0 +1,3 @@
+export default{
+   title:'Daily Feed Mixing Batches'
+}

+ 2 - 2
src/lang/en/langModule/menus.js

@@ -5,7 +5,7 @@ export default {
     仪表盘:'Dashboard',
     配方统计:'Formula Statistics',
     推料计划分析:'Feed Push Plan Analysis',
-    过程分析:"rocess Analysis",
+    过程分析:"Process Analysis",
     图表:'Chart',
     准确性分析:'Accuracy Analysis',
     饲喂效率:'Feeding Efficiency',
@@ -78,4 +78,4 @@ export default {
    字典管理:'Dictionary Management',
    SQL管理:'SQL Management',
    测试:'Test',
-}
+}

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

@@ -5,7 +5,7 @@ export default{
     editPassword:'Update Password',
     homePage:'Home Page',
     Welcome:'Welcome',
-    title:'TMRWatch Total Mixed Rations Management and Monitoring System',
+    title:'TMRWatch Total Mixed Ration (TMR) Monitoring System',
     close:"Close",
     closeOth:'Close Others',
     closeA:'Close All'

+ 60 - 0
src/lang/en/langModule/processAnalysis.js

@@ -0,0 +1,60 @@
+export default {
+  planType:"Plan Type",
+  tmrName:"TMR Name",
+  errorRange:'Error Filtering Range',
+  workStatus:'Working Status',
+  hlwc:'Mixing Tolerance Value',
+  hlzq:'Mixing Accuracy Rate',
+  fclassid:"Mixing Category",
+  slwc:'Mixing Tolerance Value',
+  slzq:"Mixing Accuracy Rate",
+  minproesstime:"Process Time”",
+  oName:"Only Look at Data That Exceeds the Preset Values",
+  tmrName1:"TMR Equipment List",
+  //
+  startDate:"Start Date",
+  remark:'Description',
+
+  processdel:'Process Details',
+  proesstime:'Process Time',
+  proesstime1:'Mixing Time',
+  hlxq:'Mixing Details',
+  //
+  sort:'Operation Number',
+  fname:"Feed Name",
+  lweight:"Planned Weight",
+  actualweightminus:"Actual Weight",
+  diff:"Error Value",
+  diffRate:"Accuracy Rate",
+  intime:"Completion Time",
+  proesstime:"Process Time",
+  buttontype:"Transition Method",
+  lastactualweight:"Starting Weight",
+  actualweight:"Ending Weight",
+
+  watchPlan:"Monitoring Chart"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }

+ 15 - 0
src/lang/en/langModule/pushingplan.js

@@ -0,0 +1,15 @@
+export default{
+  num:'Serial Number',
+  tname:'Feed Pushcart',
+  remark:'Note',
+  startDate:'Actual Start Time',
+  endDate:'Actual end Time',
+  deviation:'Deviation Minutes',
+  date:"Actual Duration (minutes)",
+  planDate:'Planned Start Time',
+  name:"Runtime",
+  watch:'Open',
+  none:'None yet',
+  bname:'Feeding Sequence in Pens',
+  detail:'Feed Pushing Trajectory Details'
+}

+ 3 - 0
src/lang/zn/langModule/formulaStatistics.js

@@ -0,0 +1,3 @@
+export default{
+  title:'每日拌料车次',
+  }

+ 41 - 0
src/lang/zn/langModule/processAnalysis.js

@@ -0,0 +1,41 @@
+import { sort } from "core-js/core/array";
+
+export default {
+planType:"计划类型",
+tmrName:"TMR名称",
+errorRange:'误差筛选范围',
+workStatus:'工作状态',
+hlwc:'混料误差值',
+hlzq:'混料准确率',
+fclassid:"混料类别",
+slwc:'撒料误差值',
+slzq:"撒料准确率",
+minproesstime:"过程时间",
+oName:"只看超出预设值数据",
+tmrName1:"TMR设备列表",
+//
+startDate:"开始时间",
+remark:'描述',
+processdel:'过程详情',
+proesstime:'过程时间',
+proesstime1:'混料时间',
+hlxq:'混料详情',
+//
+sort:'操作编号',
+fname:"饲料名称",
+lweight:"计划重量",
+actualweightminus:"实际重量",
+diff:"误差值",
+diffRate:"准确率",
+intime:"完成时间",
+proesstime:"过程时间",
+buttontype:"跳转方式",
+lastactualweight:"开始重量",
+actualweight:"结束重量",
+
+watchPlan:"监控图"
+
+
+
+
+}

+ 16 - 0
src/lang/zn/langModule/pushingplan.js

@@ -0,0 +1,16 @@
+
+export default{
+   num:'序号',
+   tname:'推料车',
+   remark:'备注',
+   startDate:'实际开始时间',
+   endDate:'实际结束时间',
+   deviation:'偏差分钟数',
+   date:"实际时长(分钟)",
+   planDate:'计划开始时间',
+   name:"运行轨迹",
+   watch:'查看',
+   bname:"推料栏舍顺序",
+   none:'暂无',
+   detail:'推料轨迹详情'
+}

+ 19 - 19
src/views/basicData/defaultParameter/earlyWarning/index.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="app-container" style="width: 90%;">
     <div class="el-icon-info" style="font-size: 30px;float: right;color: #009C69;" @click="handleDescription" />
     <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="270px" style="margin-top: 40px;margin-bottom:30px;">
@@ -124,19 +124,19 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose" @click="description.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose" @click="description.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
-  </div>
-</template>
-
+  </div>
+</template>
+
 <script>
-import { GetDataByName, PostDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
+import { GetDataByName, PostDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
 import Cookies from 'js-cookie'
-import { MessageBox } from 'element-ui'
-export default {
-  name: 'DefaultParameter',
-  data() {
+import { MessageBox } from 'element-ui'
+export default {
+  name: 'DefaultParameter',
+  data() {
     return {
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
@@ -151,8 +151,8 @@ export default {
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
       feedontractList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用饲料合同
       leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '剩料分配' }],
-      requestParams: [
-        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
+      requestParams: [
+        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
       ],
       getdataListParm: {
         name: 'getysoptList',
@@ -178,14 +178,14 @@ export default {
       },
       requestParam: {}
 
-    }
-  },
+    }
+  },
   created() {
     this.getList()
     this.getButtons()
     this.getDownList()
-  },
-
+  },
+
   methods: {
 
     getButtons() {
@@ -286,8 +286,8 @@ export default {
       this.description.dialogStatus = 'description'
       this.description.dialogFormVisible = true
     }
-  }
-}
+  }
+}
 </script>
 <style lang="scss" scoped>
   .app-description{
@@ -296,4 +296,4 @@ export default {
       display:flex;
     }
   }
-</style>
+</style>

+ 19 - 19
src/views/basicData/defaultParameter/function/index.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="app-container" style="width: 90%;">
     <div class="el-icon-info" style="font-size: 30px;float: right;color: #009C69;" @click="handleDescription" />
     <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="250px" style="margin-top: 40px;margin-bottom:30px;">
@@ -225,19 +225,19 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose" @click="description.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose" @click="description.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
-  </div>
-</template>
-
+  </div>
+</template>
+
 <script>
-import { GetDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
+import { GetDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
 import Cookies from 'js-cookie'
-import { MessageBox } from 'element-ui'
-export default {
-  name: 'DefaultParameter',
-  data() {
+import { MessageBox } from 'element-ui'
+export default {
+  name: 'DefaultParameter',
+  data() {
     return {
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
@@ -256,8 +256,8 @@ export default {
       dataSynchronizationList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用数据同步
       accuracyList: [{ id: '1', name: '排除允许误差准确率' }, { id: '0', name: '不排除允许误差准确率' }],  //混料准确率
       yhautosecondList:[{ id: '1', name: '禁用' }, { id: '2', name: '3秒' }, { id: '3', name: '6秒' }, { id: '4', name: '9秒' }],  //预混跳转延时
-      requestParams: [
-        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
+      requestParams: [
+        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
       ],
       getdataListParm: {
         name: 'getysoptList',
@@ -283,14 +283,14 @@ export default {
       isokDisable: false,
       requestParam: {}
 
-    }
-  },
+    }
+  },
   created() {
     this.getList()
     this.getButtons()
     this.getDownList()
-  },
-
+  },
+
   methods: {
     getButtons() {
       const Edit = 'DefaultParameter'
@@ -405,8 +405,8 @@ export default {
       this.description.dialogStatus = 'description'
       this.description.dialogFormVisible = true
     }
-  }
-}
+  }
+}
 </script>
 <style lang="scss" scoped>
   .app-description{
@@ -415,4 +415,4 @@ export default {
       display:flex;
     }
   }
-</style>
+</style>

+ 6 - 6
src/views/basicData/feedTable/index.vue

@@ -301,7 +301,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
       </div>
@@ -439,7 +439,7 @@
           </el-table>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="feedBank.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="feedBank.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -572,7 +572,7 @@
           </el-table>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="relation.dialogFormVisible = false;getList() ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="relation.dialogFormVisible = false;getList() ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -655,7 +655,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="nutritive.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="nutritive.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="nutritive.dialogStatus==='nutritive' && isRoleEdit" class="save" :disabled="isokDisable" @click="nutritiveData()">确认</el-button>
         </div>
       </div>
@@ -709,7 +709,7 @@
           </u-table>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="sapCode.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="sapCode.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="sapCode.dialogStatus==='sapCode' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData()">确认</el-button>
         </div>
       </div>
@@ -749,7 +749,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="sapCode2.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="sapCode2.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="sapCode2.dialogStatus==='sapCode2' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData2()">确认</el-button>
         </div>
       </div>

+ 1 - 1
src/views/basicData/groupColumn/index.vue

@@ -168,7 +168,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="sapCode2.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="sapCode2.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="sapCode2.dialogStatus==='sapCode2' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData2()">确认</el-button>
         </div>
       </div>

+ 1 - 1
src/views/basicData/sapLog/index.vue

@@ -178,7 +178,7 @@
         </div>
         <span v-if="type.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ type.table.total }}条</span>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose1" @click="type.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose1" @click="type.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 55 - 55
src/views/basicData/standardParameters/index.vue

@@ -1,28 +1,28 @@
 <template>
-  <div class="app-container" style="position: relative;">
-    <div v-if="activeName == 'first'" class="operation" style="position: absolute;top: -5px;right: 10px;z-index:1;">
-      <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
-        <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
-      </el-upload>
-      <el-dropdown style="float: right;margin-right: 10px;">
-        <el-button class="export" icon="el-icon-upload2">导出</el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
-          <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div v-if="activeName == 'second'" class="operation" style="position: absolute;top: -5px;right: 10px;z-index:1;">
-      <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers2" :data="uploadData2" :action="uploadExcelUrl2" :show-file-list="false" :before-upload="beforeImport2" :on-success="handleImportSuccess2">
-        <el-button class="import" style="float: right;" icon="el-icon-download">导入</el-button>
-      </el-upload>
-      <el-dropdown style="float: right;margin-right: 10px;">
-        <el-button class="export" icon="el-icon-upload2">导出</el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item @click.native="handleExport(3)">导出模板</el-dropdown-item>
-          <el-dropdown-item @click.native="handleExport(4)">导出数据</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+  <div class="app-container" style="position: relative;">
+    <div v-if="activeName == 'first'" class="operation" style="position: absolute;top: -5px;right: 10px;z-index:1;">
+      <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
+        <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
+      </el-upload>
+      <el-dropdown style="float: right;margin-right: 10px;">
+        <el-button class="export" icon="el-icon-upload2">导出</el-button>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
+          <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+    <div v-if="activeName == 'second'" class="operation" style="position: absolute;top: -5px;right: 10px;z-index:1;">
+      <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers2" :data="uploadData2" :action="uploadExcelUrl2" :show-file-list="false" :before-upload="beforeImport2" :on-success="handleImportSuccess2">
+        <el-button class="import" style="float: right;" icon="el-icon-download">导入</el-button>
+      </el-upload>
+      <el-dropdown style="float: right;margin-right: 10px;">
+        <el-button class="export" icon="el-icon-upload2">导出</el-button>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="handleExport(3)">导出模板</el-dropdown-item>
+          <el-dropdown-item @click.native="handleExport(4)">导出数据</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="体况、粪便评分标准" name="first">
@@ -75,7 +75,7 @@
                 <el-button v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
               </template>
             </el-table-column>
-          </el-table>
+          </el-table>
           <span v-if="table1.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table1.total }}条</span>
         </div>
       </el-tab-pane>
@@ -162,7 +162,7 @@
                 <el-button v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
               </template>
             </el-table-column>
-          </el-table>
+          </el-table>
           <span v-if="table2.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table2.total }}条</span>
         </div>
       </el-tab-pane>
@@ -170,18 +170,18 @@
 
     <!-- 体况、粪便评分标准 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="table1.dialogFormVisible" :close-on-click-modal="false" width="80%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[table1.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[table1.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
       <div class="app-add">
         <el-form ref="temp" :rules="table1.rules" :model="table1.temp" label-position="right" label-width="160px" style="width: 90%;margin:0 auto 50px">
           <el-row>
@@ -236,7 +236,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="table1.dialogFormVisible = false;getList() ">关闭</el-button>
+          <el-button class="cancelClose" @click="table1.dialogFormVisible = false;getList() ">{{$t('common.closed')}}</el-button>
           <el-button class="save" :disabled="isokDisable" @click="updateData()">确认</el-button>
         </div>
       </div>
@@ -244,18 +244,18 @@
 
     <!-- 宾州筛、粪便筛标准范围 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="table2.dialogFormVisible" :close-on-click-modal="false" width="80%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[table2.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[table2.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
       <div class="app-add">
         <el-form ref="temp" :rules="table2.rules" :model="table2.temp" label-position="right" label-width="160px" style="width: 90%;margin:0 auto 50px">
           <el-row>
@@ -356,12 +356,12 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="table2.dialogFormVisible = false; getList2()">关闭</el-button>
+          <el-button class="cancelClose" @click="table2.dialogFormVisible = false; getList2()">{{$t('common.closed')}}</el-button>
           <el-button class="save" :disabled="isokDisable" @click="updateData()">确认</el-button>
         </div>
       </div>
     </el-dialog>
-  </div>
+  </div>
 </template>
 
 <script>
@@ -373,7 +373,7 @@ import { getToken } from '@/utils/auth'
 export default {
   name: 'StandardParameters',
   data() {
-    return {
+    return {
       dialogFull: false,
       isRoleEdit: [],
       activeName: 'first',
@@ -557,7 +557,7 @@ export default {
     // 编辑
     handleUpdate(row) {
       this.dialogFull = false
-      if (this.activeName === 'first') {
+      if (this.activeName === 'first') {
         console.log('点击了体况、粪便评分标准编辑')
         this.table1.dialogStatus = 'update'
         this.table1.dialogFormVisible = true

+ 1 - 1
src/views/customboard/addboard/dashboardItem.vue

@@ -95,7 +95,7 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="showChartList = false">关闭</el-button>
+        <el-button class="cancelClose1" @click="showChartList = false">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

+ 1 - 1
src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -802,7 +802,7 @@
         </keep-alive>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 

+ 1 - 1
src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue

@@ -31,7 +31,7 @@
         </el-tabs>
       </el-row>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="closeDialog()">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="closeDialog()">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

File diff suppressed because it is too large
+ 362 - 362
src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue


+ 1 - 1
src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue

@@ -192,7 +192,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="close();">关闭</el-button>
+          <el-button class="cancelClose" @click="close();">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save"
             :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>

+ 2 - 2
src/views/formulationPlan/dhedFormula/index - 20230829备份.vue

@@ -284,7 +284,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -725,7 +725,7 @@
           </el-tab-pane>
         </el-tabs>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="nutritional.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="nutritional.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 2 - 2
src/views/formulationPlan/dhedFormula/index.vue

@@ -328,7 +328,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false;getList() ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false;getList() ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -769,7 +769,7 @@
           </el-tab-pane>
         </el-tabs>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="nutritional.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="nutritional.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 2 - 2
src/views/formulationPlan/dhedFormula/index备.vue

@@ -284,7 +284,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -725,7 +725,7 @@
           </el-tab-pane>
         </el-tabs>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="nutritional.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="nutritional.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 3 - 3
src/views/formulationPlan/formulaDistribution/index.vue

@@ -88,7 +88,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" @click="formulaDistribution.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose" @click="formulaDistribution.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         <el-button class="save" :disabled="isokDisable" @click="nextData()">下一步</el-button>
       </div>
     </el-dialog>
@@ -104,7 +104,7 @@
         </el-checkbox-group>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" @click="formulaDistribution.pasture.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose" @click="formulaDistribution.pasture.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         <el-button class="save" :disabled="isokDisable" @click="formulaDistributionData()">确认</el-button>
       </div>
     </el-dialog>
@@ -194,7 +194,7 @@
         </el-tabs>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="see.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="see.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

+ 5 - 5
src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -163,7 +163,7 @@
           当前计划基础上继续生成计划;<br>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button style="right:240px;" class="cancelClose" @click="automaticGeneration.dialogFormVisible = false;">关闭</el-button>
+          <el-button style="right:240px;" class="cancelClose" @click="automaticGeneration.dialogFormVisible = false;">{{$t('common.closed')}}</el-button>
           <el-button style="right:130px;" class="save" :disabled="isokDisable" @click="continueData(0)">继续生成 </el-button>
           <el-button style="right:20px;" class="save" :disabled="isokDisable" @click="continueData(1)">重新生成 </el-button>
         </div>
@@ -189,7 +189,7 @@
         </keep-alive>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -259,7 +259,7 @@
           </el-row>
         </el-form>
         <div v-if="create.dialogStatus !=='update' && !isDispaly" slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="distributionAndSpreading()">分配撒料</el-button>
         </div>
         <!-- 栏舍 -->
@@ -410,7 +410,7 @@
             </div>
           </div>
           <div slot="footer" class="dialog-footer" style="height: 55px;">
-            <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">关闭</el-button>
+            <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">{{$t('common.closed')}}</el-button>
             <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">确认</el-button>
           </div>
         </div>
@@ -477,7 +477,7 @@
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" @click="allEmpty.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button class="cancelClose" @click="allEmpty.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
         <el-button class="save" :disabled="isokDisable" @click="allEmptyData()">确认</el-button>
       </div>
     </el-dialog>

+ 5 - 5
src/views/formulationPlan/materialIssuancePlan/index1.vue

@@ -139,7 +139,7 @@
           当前计划基础上继续生成计划;<br>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button style="right:240px;" class="cancelClose" @click="automaticGeneration.dialogFormVisible = false;">关闭</el-button>
+          <el-button style="right:240px;" class="cancelClose" @click="automaticGeneration.dialogFormVisible = false;">{{$t('common.closed')}}</el-button>
           <el-button style="right:130px;" class="save" :disabled="isokDisable" @click="continueData(0)">继续生成 </el-button>
           <el-button style="right:20px;" class="save" :disabled="isokDisable" @click="continueData(1)">重新生成 </el-button>
         </div>
@@ -165,7 +165,7 @@
         </keep-alive>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -235,7 +235,7 @@
           </el-row>
         </el-form>
         <div v-if="create.dialogStatus !=='update' && !isDispaly" slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="distributionAndSpreading()">分配撒料</el-button>
         </div>
         <!-- 栏舍 -->
@@ -349,7 +349,7 @@
             </div>
           </div>
           <div slot="footer" class="dialog-footer" style="height: 55px;">
-            <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">关闭</el-button>
+            <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">{{$t('common.closed')}}</el-button>
             <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">确认</el-button>
           </div>
         </div>
@@ -416,7 +416,7 @@
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" @click="allEmpty.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button class="cancelClose" @click="allEmpty.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
         <el-button class="save" :disabled="isokDisable" @click="allEmptyData()">确认</el-button>
       </div>
     </el-dialog>

+ 1 - 1
src/views/formulationPlan/premixedPlan/index.vue

@@ -189,7 +189,7 @@
           <pagination v-show="history.total>0" :total="history.total" :page.sync="history.getdataListParm.offset" :limit.sync="history.getdataListParm.pagecount" @pagination="getHistoryList" />
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 1 - 1
src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -106,7 +106,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button class="save" @click="create.dialogStatus = 'create' ? createData():updateData()" :disabled="isokDisable" >确认</el-button>
         </div>
       </div>

+ 4 - 4
src/views/formulationPlan/recipeTemplate/index.vue

@@ -653,7 +653,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="template.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="template.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -772,7 +772,7 @@
           </el-table>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="detail.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose" @click="detail.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
           <el-button class="save" :disabled="isokDisable" @click="syntheticPremixData()">确认</el-button>
         </div>
       </div>
@@ -785,7 +785,7 @@
         </keep-alive>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -840,7 +840,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="rowRecipeRecord.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="rowRecipeRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

+ 2 - 2
src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -205,7 +205,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save"
             :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
@@ -289,7 +289,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 

+ 2 - 2
src/views/inventoryManagement/feedContract/index.vue

@@ -157,8 +157,8 @@
           </el-table-column>
         </el-table>
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="create.dialogStatus == 'see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false; ">关闭</el-button>
-          <el-button v-if="create.dialogStatus !== 'see'" class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
+          <el-button v-if="create.dialogStatus == 'see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
+          <el-button v-if="create.dialogStatus !== 'see'" class="cancelClose" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus !== 'see'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
       </div>

+ 2 - 2
src/views/inventoryManagement/inventoryList/index.vue

@@ -148,8 +148,8 @@
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button v-if="create.dialogStatus==='see'" class="import" icon="el-icon-upload2" :disabled="isokDisable" @click="handleExport(2)">导出</el-button>
-          <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false; ">关闭</el-button>
-          <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
         </div>
       </div>

+ 2 - 2
src/views/inventoryManagement/laborConsumption/index.vue

@@ -171,8 +171,8 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
-          <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList();">{{$t('common.closed')}}</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
         </div>
       </div>

+ 1 - 1
src/views/inventoryManagement/statistics/index.vue

@@ -179,7 +179,7 @@
           </el-tab-pane>
         </el-tabs>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="see.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="see.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 3 - 3
src/views/inventoryManagement/warehousing/index.vue

@@ -253,8 +253,8 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="create.dialogStatus == 'see' " class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList(); ">关闭</el-button>
-          <el-button v-if="create.dialogStatus !== 'see' " class="cancelClose" @click="create.dialogFormVisible = false;getList(); ">关闭</el-button>
+          <el-button v-if="create.dialogStatus == 'see' " class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList(); ">{{$t('common.closed')}}</el-button>
+          <el-button v-if="create.dialogStatus !== 'see' " class="cancelClose" @click="create.dialogFormVisible = false;getList(); ">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus !== 'see' " class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
       </div>
@@ -308,7 +308,7 @@
             </el-table-column>
           </el-table>
           <div slot="footer" class="dialog-footer">
-            <el-button class="cancelClose" @click="initial.dialogFormVisible = false; ">关闭</el-button>
+            <el-button class="cancelClose" @click="initial.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
             <el-button class="save" :disabled="isokDisable" @click="initialData()">确认</el-button>
           </div>
         </div>

+ 1 - 1
src/views/inventoryManagement/warning/index.vue

@@ -160,7 +160,7 @@
         </el-table>
         <pagination v-show="see.total>=0" style="margin-bottom: 50px;" :total="see.total" :page.sync="see.getdataListParm.offset" :limit.sync="see.getdataListParm.pagecount" @pagination="getSeeList" />
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="see.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="see.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 1 - 1
src/views/shedProduction/dungScores/historyRecord.vue

@@ -74,7 +74,7 @@
           <Pagination v-show="seeHistory.total>0" :total="seeHistory.total" :page.sync="seeHistory.getdataListParm.offset" :limit.sync="seeHistory.getdataListParm.pagecount" @pagination="getSeeHistoryList" />
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 2 - 2
src/views/shedProduction/dungScores/index.vue

@@ -223,7 +223,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
@@ -248,7 +248,7 @@
           <component :is="historyRecord.myComponent" ref="historyRecord" />
         </keep-alive>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 2 - 2
src/views/shedProduction/dutyRecord/index.vue

@@ -143,7 +143,7 @@
                 </el-table>
               </div>
               <div slot="footer" class="dialog-footer" style="bottom: 20px;">
-                <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+                <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
                 <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
               </div>
             </div>
@@ -194,7 +194,7 @@
                 </el-table>
               </div>
               <div slot="footer" class="dialog-footer" style="bottom: 20px;">
-                <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+                <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
                 <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="createData2()">确认</el-button>
               </div>
             </div>

+ 1 - 1
src/views/shedProduction/fecalScreen/historyRecord.vue

@@ -80,7 +80,7 @@
           <Pagination v-show="seeHistory.total>0" :total="seeHistory.total" :page.sync="seeHistory.getdataListParm.offset" :limit.sync="seeHistory.getdataListParm.pagecount" @pagination="getSeeHistoryList" />
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 2 - 2
src/views/shedProduction/fecalScreen/index.vue

@@ -197,7 +197,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
@@ -222,7 +222,7 @@
           <component :is="historyRecord.myComponent" ref="historyRecord" />
         </keep-alive>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 1 - 1
src/views/shedProduction/formulaDryMatter/historyRecord.vue

@@ -69,7 +69,7 @@
           <pagination2 v-show="seeHistory.total>0" :total="seeHistory.total" :page.sync="seeHistory.getdataListParm.offset" :limit.sync="seeHistory.getdataListParm.pagecount" @pagination="getSeeHistoryList" />
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 2 - 2
src/views/shedProduction/formulaDryMatter/index.vue

@@ -194,7 +194,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
@@ -219,7 +219,7 @@
           <component :is="historyRecord.myComponent" ref="historyRecord" />
         </keep-alive>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 1 - 1
src/views/shedProduction/materialRemainingRecord/index.vue

@@ -178,7 +178,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>

+ 1 - 1
src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue

@@ -92,7 +92,7 @@
           <pagination2 v-show="seeHistory.total>0" :total="seeHistory.total" :page.sync="seeHistory.getdataListParm.offset" :limit.sync="seeHistory.getdataListParm.pagecount" @pagination="getSeeHistoryList" />
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 2 - 2
src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -226,7 +226,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
@@ -251,7 +251,7 @@
           <component :is="historyRecord.myComponent" ref="historyRecord" />
         </keep-alive>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 1 - 1
src/views/shedProduction/performance/index.vue

@@ -273,7 +273,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>

+ 1 - 1
src/views/shedProduction/physicalConditionScore/historyRecord.vue

@@ -74,7 +74,7 @@
           <Pagination v-show="seeHistory.total>0" :total="seeHistory.total" :page.sync="seeHistory.getdataListParm.offset" :limit.sync="seeHistory.getdataListParm.pagecount" @pagination="getSeeHistoryList" />
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="seeHistory.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 2 - 2
src/views/shedProduction/physicalConditionScore/index.vue

@@ -245,7 +245,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">{{$t('common.closed')}}</el-button>
           <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
@@ -271,7 +271,7 @@
         </keep-alive>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -428,7 +428,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="pasture.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="pasture.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

+ 6 - 6
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -851,7 +851,7 @@
       <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" />
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
-      <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">关闭</el-button>
+      <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">{{$t('common.closed')}}</el-button>
       <el-button  class="save" v-if="activeName=='second'" :disabled="isokDisable" @click="exportList2()">确认</el-button>
       <el-button  class="save" v-else-if="activeName=='third'" :disabled="isokDisable" @click="exportList3()">确认</el-button>
     </div>
@@ -947,7 +947,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="recipeNameTemp2.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="recipeNameTemp2.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
     <!-- 撒料统计-配方名称 -->
@@ -993,7 +993,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="recipeNameTemp3.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="recipeNameTemp3.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
     <!-- 饲料 -->
@@ -1036,7 +1036,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="feedTemp.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="feedTemp.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -1143,7 +1143,7 @@
         </el-tabs>
       </div>
         <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-          <el-button class="cancelClose1" @click="fenceTemp.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose1" @click="fenceTemp.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
     </el-dialog>
     <!-- 配方模板修改记录 -->
@@ -1232,7 +1232,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="modificationRecordTemp.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="modificationRecordTemp.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

+ 1 - 1
src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -111,7 +111,7 @@
         </el-row>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button class="cancelClose cancelClose1" @click="closeDialog()">关闭</el-button>
+        <el-button class="cancelClose cancelClose1" @click="closeDialog()">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -300,7 +300,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="pasture.dialogFormVisible = false; ">关闭</el-button>
+        <el-button class="cancelClose1" @click="pasture.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -536,7 +536,7 @@
       <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="pickerOptions" />
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
-      <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">关闭</el-button>
+      <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">{{$t('common.closed')}}</el-button>
       <el-button  class="save" v-if="activeName=='first'" :disabled="isokDisable" @click="exportList1()">确认</el-button>
       <el-button  class="save" v-else :disabled="isokDisable" @click="exportList2()">确认</el-button>
     </div>

+ 299 - 299
src/views/statisticalAnalysis/formulaStatistics/index.vue

@@ -1,299 +1,299 @@
-<template>
-  <div class="app-container" ref="searchBar">
-    <el-date-picker v-model="inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange"
-      :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 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="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
-    <h3 style="text-align: center;">每日拌料车次</h3>
-    <div id="chartLine1" :style="{height:height,width:width}" />
-  </div>
-
-</template>
-
-<script>
-  import echarts from 'echarts'
-
-  require('echarts/theme/macarons')
-  import Cookies from 'js-cookie'
-  import {
-    parseTime
-  } from '@/utils/index.js'
-  import {
-    GetDataByName,
-    postJson,
-    GetReportform,
-    whichWeek
-  } from '@/api/common'
-  export default {
-    name: 'FormulaStatistics',
-    data() {
-      return {
-        width: '100%',
-        height: document.documentElement.clientHeight - 85 - 150 + 'px',
-        startTime: parseTime(new Date(), '{y}-{m}-{d}'),
-        endTime: parseTime(new Date(), '{y}-{m}-{d}'),
-        inputDatetime: [new Date(), new Date()],
-        Beforedisabled: false,
-        Nextdisabled: false,
-        pickerOptions: {
-          onPick: ({
-            maxDate,
-            minDate
-          }) => {
-            this.pickerMinDate = minDate.getTime()
-            if (maxDate) {
-              this.pickerMinDate = ''
-            }
-          },
-          // 限制不能选择明天之后的日期
-          disabledDate: (time) => {
-            if (this.pickerMinDate !== '') {
-              const one = 31 * 24 * 3600 * 1000
-              const minTime = this.pickerMinDate - one
-              let maxTime = this.pickerMinDate + one
-
-              // console.log(minTime, 'minTime')
-              // console.log(maxTime, 'maxTime')
-              // console.log(new Date(), 'new Date()')
-              // console.log(Date.now(), 'Date.now()')
-              // console.log(time.getTime(), 'time.getTime()')
-              if (maxTime > new Date()) {
-                maxTime = Date.now() + 8.64e7
-              }
-
-              return time.getTime() < minTime || time.getTime() > maxTime
-            }
-            return time.getTime() > Date.now() + 8.64e7
-          }
-        },
-        chart1: {
-          chartLine: null,
-          chartLine_data: {},
-
-          tableKey: 1,
-          list: [],
-          total: 0,
-          listLoading: true,
-          statisticsList: [],
-          chart1Data1: [],
-          isChart: true,
-          isTable: false,
-          table: {
-            tableKey: 1,
-            list: [],
-            total: 0,
-            listLoading: false
-          }
-        }
-      }
-    },
-
-    created() {
-      this.getTimeFn()
-      this.getChart1()
-    },
-
-    methods: {
-      getTimeFn() {
-        const that = this
-        const start = new Date()
-        const end = new Date()
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
-        that.startTime = parseTime(start, '{y}-{m}-{d}')
-        that.endTime = parseTime(end, '{y}-{m}-{d}')
-        that.inputDatetime = [start, end]
-      },
-      handleBefore() {
-        if (this.inputDatetime !== '' && this.inputDatetime !== null) {
-          var start = new Date(this.inputDatetime[0].setDate(this.inputDatetime[0].getDate() - 1))
-          var stop = new Date(this.inputDatetime[1].setDate(this.inputDatetime[1].getDate() - 1))
-          if (stop > Date.now()) {
-            this.Nextdisabled = true
-            this.Beforedisabled = false
-          } else {
-            this.Nextdisabled = false
-            this.Beforedisabled = false
-          }
-          this.inputDatetime.length = 0
-          this.inputDatetime.push(start, stop)
-          this.$forceUpdate()
-        }
-        this.startTime = parseTime(this.inputDatetime[0], '{y}-{m}-{d}')
-        this.endTime = parseTime(this.inputDatetime[1], '{y}-{m}-{d}')
-        this.getList()
-      },
-      handleNext() {
-        if (this.inputDatetime !== '' && this.inputDatetime !== null) {
-          var start2 = new Date(this.inputDatetime[0].setDate(this.inputDatetime[0].getDate() + 1))
-          var stop2 = new Date(this.inputDatetime[1].setDate(this.inputDatetime[1].getDate() + 1))
-          if (stop2 > Date.now()) {
-            this.Nextdisabled = true
-            this.Beforedisabled = false
-          } else {
-            this.Nextdisabled = false
-            this.Beforedisabled = false
-          }
-          this.inputDatetime.length = 0
-          this.inputDatetime.push(start2, stop2)
-          this.$forceUpdate()
-        }
-        this.startTime = parseTime(this.inputDatetime[0], '{y}-{m}-{d}')
-        this.endTime = parseTime(this.inputDatetime[1], '{y}-{m}-{d}')
-        this.getChart1()
-      },
-      form_search() {
-        this.getChart1()
-      },
-      getChart1() {
-        this.chart1.listLoading = true
-        const url = 'authdata/formulastatistics'
-        const data = {}
-        // data.parammaps = {}
-        data.pastureId = Cookies.get('pastureid')
-        data.startTime = parseTime(this.inputDatetime[0], '{y}-{m}-{d}')
-        data.endTime = parseTime(this.inputDatetime[1], '{y}-{m}-{d}')
-        postJson(url, data).then(response => {
-          if (response.data !== null) {
-            this.chart1.chartLine_data = {}
-            this.chart1.chartLine_data = response.data
-            // this.chart1.chartLine_data.xdata = ['业务系统1', '业务系统2', '业务系统3', '业务系统4', '业务系统5', '业务系统6', '业务系统7']
-            // // this.chart1.chartLine_data.data1 = ['高危', '中低', '低危','']
-            // this.chart1.chartLine_data.data1 = ['高危', '中低', '低危']
-            // this.chart1.chartLine_data.data2 = [
-            //   [50, 60, 59, 50, 50, 50, 50],
-            //   [70, 70, 70, 70, 70, 70, 0],
-            //   [70, 70, 70, 70, 70, 70, 70]
-            // ]
-          } else {
-            this.chart1.chartLine_data = []
-          }
-          this.roadChartLine1(this.chart1.chartLine_data)
-          setTimeout(() => {
-            this.chart1.listLoading = false
-          }, 100)
-        })
-      },
-      roadChartLine1(chartLine_data) {
-        if (this.chart1.chartLine != null) {
-          this.chart1.chartLine.dispose()
-        }
-        this.chart1.chartLine = echarts.init(document.getElementById('chartLine1'))
-        var option = {
-          tooltip:{
-            // trigger: 'axis'
-            formatter: (param, ticket, callback) => {
-              var str = ''
-              str +=  param.name + '<br>' + param.marker + ' ' + param.seriesName +':' +param.value
-              console.log(ticket,'ticket')
-              return str
-            }
-          },
-          grid: {
-            top: '30%',
-            left: '3%',
-            right: '10%',
-            // bottom: '3%',
-            containLabel: true
-          },
-          legend: {
-            data:chartLine_data.data1
-          },
-          xAxis: {
-            data: chartLine_data.xdata,
-            type: 'category',
-            axisLabel: {
-              showMaxLabel: true
-            }
-          },
-          yAxis: {
-            type: 'value',
-            max: function(value) {
-              return (value.max+1)
-            }
-          },
-          series: (function() {
-            var serie = []
-            if (chartLine_data.data2 !== null) {
-              for (var i = 0; i < chartLine_data.data2.length; i++) {
-                var item = {
-                  name: chartLine_data.data1[i],
-                  type: 'bar',
-                  stack: '总量',
-                  label: {
-                    show: true,
-                    formatter: function(params) {
-                      const a = params.value
-                      if (a > 0) {
-                        return a
-                      } else {
-                        return ''
-                      }
-                    },
-                    color: 'black'
-                  },
-                  emphasis: {
-                    focus: 'series'
-                  },
-                  data: chartLine_data.data2[i]
-                }
-                serie.push(item)
-              }
-              var item2 = {
-                name: '',
-                type: 'bar',
-                stack: '总量',
-                label: {
-                  show: true,
-                  position: 'top',
-                  formatter: function(params) {
-                    const a = params.value
-                    if (a > 0) {
-                      return a
-                    } else {
-                      return ''
-                    }
-                  }
-                },
-                emphasis: {
-                  focus: 'series'
-                },
-                data: chartLine_data.data2[chartLine_data.data2.length -1]
-              }
-              serie.push(item2)
-            }
-            return serie
-          }())
-        };
-        var series = option.series
-
-        function getSum(params) {
-          var datavalue = 0
-          for (var i = 0; i < series.length; i++) {
-            datavalue += series[i].data[params.dataIndex]
-          }
-          return datavalue
-        }
-        series[series.length - 1].label.formatter = getSum
-        this.chart1.chartLine.setOption(option, true);
-
-        this.chart1.chartLine.on('legendselectchanged', (obj) => {
-               function getSum (params) {
-                 var datavalue = 0
-                 for (var i = 0; i < series.length; i++) {
-                   if (obj.selected[series[i].name]) {
-                     datavalue += series[i].data[params.dataIndex]
-                   }
-                 }
-                 return datavalue
-               }
-               series[series.length - 1].label.formatter = getSum
-               this.chart1.chartLine.setOption(option)
-             })
-        // this.chart1.chartLine.setOption(option, true);
-      },
-    }
-  }
-</script>
+<template>
+  <div class="app-container" ref="searchBar">
+    <el-date-picker v-model="inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange"
+      :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 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="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+    <h3 style="text-align: center;">{{ $t('formulaStatistics.title') }}</h3>
+    <div id="chartLine1" :style="{height:height,width:width}" />
+  </div>
+
+</template>
+
+<script>
+  import echarts from 'echarts'
+
+  require('echarts/theme/macarons')
+  import Cookies from 'js-cookie'
+  import {
+    parseTime
+  } from '@/utils/index.js'
+  import {
+    GetDataByName,
+    postJson,
+    GetReportform,
+    whichWeek
+  } from '@/api/common'
+  export default {
+    name: 'FormulaStatistics',
+    data() {
+      return {
+        width: '100%',
+        height: document.documentElement.clientHeight - 85 - 150 + 'px',
+        startTime: parseTime(new Date(), '{y}-{m}-{d}'),
+        endTime: parseTime(new Date(), '{y}-{m}-{d}'),
+        inputDatetime: [new Date(), new Date()],
+        Beforedisabled: false,
+        Nextdisabled: false,
+        pickerOptions: {
+          onPick: ({
+            maxDate,
+            minDate
+          }) => {
+            this.pickerMinDate = minDate.getTime()
+            if (maxDate) {
+              this.pickerMinDate = ''
+            }
+          },
+          // 限制不能选择明天之后的日期
+          disabledDate: (time) => {
+            if (this.pickerMinDate !== '') {
+              const one = 31 * 24 * 3600 * 1000
+              const minTime = this.pickerMinDate - one
+              let maxTime = this.pickerMinDate + one
+
+              // console.log(minTime, 'minTime')
+              // console.log(maxTime, 'maxTime')
+              // console.log(new Date(), 'new Date()')
+              // console.log(Date.now(), 'Date.now()')
+              // console.log(time.getTime(), 'time.getTime()')
+              if (maxTime > new Date()) {
+                maxTime = Date.now() + 8.64e7
+              }
+
+              return time.getTime() < minTime || time.getTime() > maxTime
+            }
+            return time.getTime() > Date.now() + 8.64e7
+          }
+        },
+        chart1: {
+          chartLine: null,
+          chartLine_data: {},
+
+          tableKey: 1,
+          list: [],
+          total: 0,
+          listLoading: true,
+          statisticsList: [],
+          chart1Data1: [],
+          isChart: true,
+          isTable: false,
+          table: {
+            tableKey: 1,
+            list: [],
+            total: 0,
+            listLoading: false
+          }
+        }
+      }
+    },
+
+    created() {
+      this.getTimeFn()
+      this.getChart1()
+    },
+
+    methods: {
+      getTimeFn() {
+        const that = this
+        const start = new Date()
+        const end = new Date()
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
+        that.startTime = parseTime(start, '{y}-{m}-{d}')
+        that.endTime = parseTime(end, '{y}-{m}-{d}')
+        that.inputDatetime = [start, end]
+      },
+      handleBefore() {
+        if (this.inputDatetime !== '' && this.inputDatetime !== null) {
+          var start = new Date(this.inputDatetime[0].setDate(this.inputDatetime[0].getDate() - 1))
+          var stop = new Date(this.inputDatetime[1].setDate(this.inputDatetime[1].getDate() - 1))
+          if (stop > Date.now()) {
+            this.Nextdisabled = true
+            this.Beforedisabled = false
+          } else {
+            this.Nextdisabled = false
+            this.Beforedisabled = false
+          }
+          this.inputDatetime.length = 0
+          this.inputDatetime.push(start, stop)
+          this.$forceUpdate()
+        }
+        this.startTime = parseTime(this.inputDatetime[0], '{y}-{m}-{d}')
+        this.endTime = parseTime(this.inputDatetime[1], '{y}-{m}-{d}')
+        this.getList()
+      },
+      handleNext() {
+        if (this.inputDatetime !== '' && this.inputDatetime !== null) {
+          var start2 = new Date(this.inputDatetime[0].setDate(this.inputDatetime[0].getDate() + 1))
+          var stop2 = new Date(this.inputDatetime[1].setDate(this.inputDatetime[1].getDate() + 1))
+          if (stop2 > Date.now()) {
+            this.Nextdisabled = true
+            this.Beforedisabled = false
+          } else {
+            this.Nextdisabled = false
+            this.Beforedisabled = false
+          }
+          this.inputDatetime.length = 0
+          this.inputDatetime.push(start2, stop2)
+          this.$forceUpdate()
+        }
+        this.startTime = parseTime(this.inputDatetime[0], '{y}-{m}-{d}')
+        this.endTime = parseTime(this.inputDatetime[1], '{y}-{m}-{d}')
+        this.getChart1()
+      },
+      form_search() {
+        this.getChart1()
+      },
+      getChart1() {
+        this.chart1.listLoading = true
+        const url = 'authdata/formulastatistics'
+        const data = {}
+        // data.parammaps = {}
+        data.pastureId = Cookies.get('pastureid')
+        data.startTime = parseTime(this.inputDatetime[0], '{y}-{m}-{d}')
+        data.endTime = parseTime(this.inputDatetime[1], '{y}-{m}-{d}')
+        postJson(url, data).then(response => {
+          if (response.data !== null) {
+            this.chart1.chartLine_data = {}
+            this.chart1.chartLine_data = response.data
+            // this.chart1.chartLine_data.xdata = ['业务系统1', '业务系统2', '业务系统3', '业务系统4', '业务系统5', '业务系统6', '业务系统7']
+            // // this.chart1.chartLine_data.data1 = ['高危', '中低', '低危','']
+            // this.chart1.chartLine_data.data1 = ['高危', '中低', '低危']
+            // this.chart1.chartLine_data.data2 = [
+            //   [50, 60, 59, 50, 50, 50, 50],
+            //   [70, 70, 70, 70, 70, 70, 0],
+            //   [70, 70, 70, 70, 70, 70, 70]
+            // ]
+          } else {
+            this.chart1.chartLine_data = []
+          }
+          this.roadChartLine1(this.chart1.chartLine_data)
+          setTimeout(() => {
+            this.chart1.listLoading = false
+          }, 100)
+        })
+      },
+      roadChartLine1(chartLine_data) {
+        if (this.chart1.chartLine != null) {
+          this.chart1.chartLine.dispose()
+        }
+        this.chart1.chartLine = echarts.init(document.getElementById('chartLine1'))
+        var option = {
+          tooltip:{
+            // trigger: 'axis'
+            formatter: (param, ticket, callback) => {
+              var str = ''
+              str +=  param.name + '<br>' + param.marker + ' ' + param.seriesName +':' +param.value
+              console.log(ticket,'ticket')
+              return str
+            }
+          },
+          grid: {
+            top: '30%',
+            left: '3%',
+            right: '10%',
+            // bottom: '3%',
+            containLabel: true
+          },
+          legend: {
+            data:chartLine_data.data1
+          },
+          xAxis: {
+            data: chartLine_data.xdata,
+            type: 'category',
+            axisLabel: {
+              showMaxLabel: true
+            }
+          },
+          yAxis: {
+            type: 'value',
+            max: function(value) {
+              return (value.max+1)
+            }
+          },
+          series: (function() {
+            var serie = []
+            if (chartLine_data.data2 !== null) {
+              for (var i = 0; i < chartLine_data.data2.length; i++) {
+                var item = {
+                  name: chartLine_data.data1[i],
+                  type: 'bar',
+                  stack: '总量',
+                  label: {
+                    show: true,
+                    formatter: function(params) {
+                      const a = params.value
+                      if (a > 0) {
+                        return a
+                      } else {
+                        return ''
+                      }
+                    },
+                    color: 'black'
+                  },
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: chartLine_data.data2[i]
+                }
+                serie.push(item)
+              }
+              var item2 = {
+                name: '',
+                type: 'bar',
+                stack: '总量',
+                label: {
+                  show: true,
+                  position: 'top',
+                  formatter: function(params) {
+                    const a = params.value
+                    if (a > 0) {
+                      return a
+                    } else {
+                      return ''
+                    }
+                  }
+                },
+                emphasis: {
+                  focus: 'series'
+                },
+                data: chartLine_data.data2[chartLine_data.data2.length -1]
+              }
+              serie.push(item2)
+            }
+            return serie
+          }())
+        };
+        var series = option.series
+
+        function getSum(params) {
+          var datavalue = 0
+          for (var i = 0; i < series.length; i++) {
+            datavalue += series[i].data[params.dataIndex]
+          }
+          return datavalue
+        }
+        series[series.length - 1].label.formatter = getSum
+        this.chart1.chartLine.setOption(option, true);
+
+        this.chart1.chartLine.on('legendselectchanged', (obj) => {
+               function getSum (params) {
+                 var datavalue = 0
+                 for (var i = 0; i < series.length; i++) {
+                   if (obj.selected[series[i].name]) {
+                     datavalue += series[i].data[params.dataIndex]
+                   }
+                 }
+                 return datavalue
+               }
+               series[series.length - 1].label.formatter = getSum
+               this.chart1.chartLine.setOption(option)
+             })
+        // this.chart1.chartLine.setOption(option, true);
+      },
+    }
+  }
+</script>

+ 2 - 2
src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -400,7 +400,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" style="right: 20px" @click="see.dialogFormVisible = false;$route.params.tname = '' ">关闭</el-button>
+        <el-button class="cancelClose" style="right: 20px" @click="see.dialogFormVisible = false;$route.params.tname = '' ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -494,7 +494,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" style="right: 20px" @click="details.dialogFormVisible = false;">关闭</el-button>
+        <el-button class="cancelClose" style="right: 20px" @click="details.dialogFormVisible = false;">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

+ 2 - 2
src/views/statisticalAnalysis/formulationEvaluation/index备.vue

@@ -390,7 +390,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" style="right: 20px" @click="see.dialogFormVisible = false;$route.params.tname = '' ">关闭</el-button>
+        <el-button class="cancelClose" style="right: 20px" @click="see.dialogFormVisible = false;$route.params.tname = '' ">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
 
@@ -484,7 +484,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" style="right: 20px" @click="details.dialogFormVisible = false;">关闭</el-button>
+        <el-button class="cancelClose" style="right: 20px" @click="details.dialogFormVisible = false;">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
   </div>

+ 1 - 1
src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -21,7 +21,7 @@
     </div>
     <el-row :gutter="20">
       <el-col :span="8">
-        <h4>TMR设备列表123</h4>
+        <h4>TMR设备列表</h4>
         <div class="table">
           <el-table
             :key="table.tableKey"

+ 142 - 142
src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -4,55 +4,55 @@
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
       <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-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="计划类型" class="filter-item" style="width: 120px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.lpplantype" :placeholder="$t('processAnalysis.planType')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in planTypeList" :key="item.value" :label="item.lable" :value="item.value" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.tmrtname" placeholder="TMR名称" class="filter-item" style="width: 180px;" clearable multiple>
+      <el-select v-model="table.getdataListParm.parammaps.tmrtname" :placeholder="$t('processAnalysis.tmrName')" class="filter-item" style="width: 180px;" clearable multiple>
         <el-option v-for="item in TMRList" :key="item.tmrtname" :label="item.tmrtname" :value="item.tmrtname" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.error" placeholder="误差筛选范围" class="filter-item" style="width: 140px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.error" :placeholder="$t('processAnalysis.errorRange')" class="filter-item" style="width: 140px;" clearable>
         <el-option v-for="item in errorList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.iscompleted" placeholder="工作状态" class="filter-item" style="width: 120px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.iscompleted" :placeholder="$t('processAnalysis.workStatus')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in workingConditionList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <!-- 临时注释 -->
       <div style="display: inline-block;" class="filter-item1">
-        <el-input-number :controls="false" :precision="2" v-model="hlwc1" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="hlwc1" :placeholder="$t('processAnalysis.hlwc')" style="width: 120px;" class="filter-item" clearable />
         <span>-</span>
-        <el-input-number :controls="false" :precision="2"  v-model="hlwc2" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2"  v-model="hlwc2" :placeholder="$t('processAnalysis.hlwc')" style="width: 120px;" class="filter-item" clearable />
       </div>
       <div style="display: inline-block;" class="filter-item1">
-        <el-input-number :controls="false" :precision="2" v-model="hlzq1" placeholder="混料准确率" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="hlzq1" :placeholder="$t('processAnalysis.hlzq')" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
         <span>-</span>
-        <el-input-number :controls="false" :precision="2" v-model="hlzq2" placeholder="混料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="hlzq2" :placeholder="$t('processAnalysis.hlzq')" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
       </div>
-      <el-select v-model="table.getdataListParm.parammaps.fclassid" placeholder="混料类别" class="filter-item" style="width: 120px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.fclassid" :placeholder="$t('processAnalysis.fclassid')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in cixCategoryList" :key="item.id" :label="item.fcname" :value="item.id" />
       </el-select>
       <div style="display: inline-block;" class="filter-item1">
-        <el-input-number :controls="false" :precision="2" v-model="slwc1" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="slwc1" :placeholder="$t('processAnalysis.slwc')" style="width: 120px;" class="filter-item" clearable />
         <span>-</span>
-        <el-input-number :controls="false" :precision="2"  v-model="slwc2" placeholder="撒料误差值" style="width: 120px;" class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2"  v-model="slwc2" :placeholder="$t('processAnalysis.slwc')" style="width: 120px;" class="filter-item" clearable />
       </div>
       <div style="display: inline-block;" class="filter-item1">
-        <el-input-number :controls="false" :precision="2" v-model="slzq1" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="slzq1" :placeholder="$t('processAnalysis.slzq')" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
         <span>-</span>
-        <el-input-number :controls="false" :precision="2" v-model="slzq2" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="slzq2" :placeholder="$t('processAnalysis.slzq')" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
       </div>
       <div style="display: inline-block;" class="filter-item1">
-        <el-input-number :controls="false" :precision="2" v-model="minproesstime" placeholder="过程时间" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="minproesstime" :placeholder="$t('processAnalysis.minproesstime')" :min="0" :max="100" style="width: 120px;"  class="filter-item" clearable />
         <span>-</span>
-        <el-input-number :controls="false" :precision="2" v-model="maxproesstime" placeholder="过程时间" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
+        <el-input-number :controls="false" :precision="2" v-model="maxproesstime" :placeholder="$t('processAnalysis.minproesstime')" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
       </div>
-      <el-checkbox v-model="ccys"  style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
+      <el-checkbox v-model="ccys"  style="margin-right: 10px;" @change="changeccysChecked">{{$t('processAnalysis.oName')}}</el-checkbox>
       <!-- 临时注释 -->
       <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
       <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <el-row :gutter="10">
       <el-col :span="8">
-        <h4>TMR设备列表</h4>
+        <h4>{{$t('processAnalysis.tmrName1')}}</h4>
         <div class="table">
           <el-table
             :key="table.tableKey"
@@ -69,11 +69,11 @@
             :height="myheight"
             @row-click="rowClick"
           >
-            <el-table-column sortable label="开始时间" min-width="100px" align="center" prop="intime" />
-            <el-table-column sortable label="计划类型" min-width="80px" align="center" prop="lpplantype" />
-            <el-table-column sortable label="描述" min-width="90px" align="center" prop="remark" />
-            <el-table-column sortable label="TMR名称" min-width="80px" align="center" prop="tmrtname" />
-            <el-table-column sortable label="过程时间" min-width="80px" align="center" prop="proesstime" />
+            <el-table-column sortable :label="$t('processAnalysis.startDate')" min-width="100px" align="center" prop="intime" />
+            <el-table-column sortable :label="$t('processAnalysis.planType')" min-width="80px" align="center" prop="lpplantype" />
+            <el-table-column sortable :label="$t('processAnalysis.remark')" min-width="90px" align="center" prop="remark" />
+            <el-table-column sortable :label="$t('processAnalysis.tmrName')" min-width="80px" align="center" prop="tmrtname" />
+            <el-table-column sortable :label="$t('processAnalysis.minproesstime')" min-width="80px" align="center" prop="proesstime" />
           </el-table>
         </div>
         <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
@@ -81,33 +81,33 @@
       <!-- 预混计划 -->
       <el-col v-if="isPremixedPlan" :span="16">
         <div class="title">
-          <b>过程详情</b>
+          <b>{{$t('processAnalysis.processdel')}}</b>
           <span>&nbsp;({{ title }})</span>
         </div>
         <div class="detail">
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>过程时间</span>
+            <span>{{$t('processAnalysis.proesstime')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>混料时间</span>
+            <span>{{$t('processAnalysis.proesstime1')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].iscompleted }}</b>
-            <span>工作状态</span>
+            <span>{{$t('processAnalysis.workStatus')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].Hdif }}</b>
-            <span>混料误差值</span>
+            <span>{{$t('processAnalysis.hlwc')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].HdifRate }}</b>
-            <span>混料准确率</span>
+            <span>{{$t('processAnalysis.hlzq')}}</span>
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情</h4>
+          <h4>{{$t('processAnalysis.hlxq')}}</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -122,63 +122,63 @@
             class="elTable table-fixed"
             max-height="270px"
           >
-            <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
-            <el-table-column label="饲料名称" min-width="60px" align="center" prop="fname" />
-            <el-table-column label="计划重量" min-width="60px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column :label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
+            <el-table-column :label="$t('processAnalysis.fname')" min-width="60px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.actualweightminus')" min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="误差值" min-width="60px" align="center" prop="diff" />
-            <el-table-column label="准确率" min-width="60px" align="center" prop="diffRate" />
-            <el-table-column label="完成时间" min-width="60px" align="center" prop="intime" />
-            <el-table-column label="过程时间" min-width="60px" align="center" prop="proesstime" />
-            <el-table-column label="跳转方式" min-width="60px" align="center" prop="buttontype" />
-            <el-table-column label="开始重量" min-width="60px" align="center" prop="lastactualweight" />
-            <el-table-column label="结束重量" min-width="60px" align="center" prop="actualweight" />
+            <el-table-column :label="$t('processAnalysis.diff')" min-width="60px" align="center" prop="diff" />
+            <el-table-column :label="$t('processAnalysis.diffRate')" min-width="60px" align="center" prop="diffRate" />
+            <el-table-column :label="$t('processAnalysis.intime')" min-width="60px" align="center" prop="intime" />
+            <el-table-column :label="$t('processAnalysis.proesstime')" min-width="60px" align="center" prop="proesstime" />
+            <el-table-column :label="$t('processAnalysis.buttontype')" min-width="60px" align="center" prop="buttontype" />
+            <el-table-column :label="$t('processAnalysis.lastactualweight')" min-width="60px" align="center" prop="lastactualweight" />
+            <el-table-column :label="$t('processAnalysis.actualweight')" min-width="60px" align="center" prop="actualweight" />
           </el-table>
         </div>
       </el-col>
       <!-- 撒料计划 -->
       <el-col v-if="isSpreadingPlan" :span="16">
         <div class="title">
-          <b>过程详情</b>
+          <b>{{$t('processAnalysis.processdel')}}</b>
           <span>&nbsp;({{ title }})</span>
         </div>
         <div class="detail">
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>过程时间</span>
+            <span>{{$t('processAnalysis.proesstime')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>混料时间</span>
+            <span>{{$t('processAnalysis.proesstime1')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].iscompleted }}</b>
-            <span>工作状态</span>
+            <span>{{$t('processAnalysis.workStatus')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].Hdif }}kg</b>
-            <span>混料误差值</span>
+            <span>{{$t('processAnalysis.hlwc')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].HdifRate }}</b>
-            <span>混料准确率</span>
+            <span>{{$t('processAnalysis.hlzq')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].Sdif }}kg</b>
-            <span>撒料误差值</span>
+            <span>{{$t('processAnalysis.slwc')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].SdifRate }}</b>
-            <span>撒料准确率</span>
+            <span>{{$t('processAnalysis.slzq')}}</span>
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情</h4>
+          <h4>{{$t('processAnalysis.hlxq')}}</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -193,27 +193,27 @@
             class="elTable table-fixed"
             max-height="270px"
           >
-            <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
-            <el-table-column label="饲料名称" min-width="70px" align="center" prop="fname" />
-            <el-table-column label="计划重量" min-width="50px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column :label="$t('processAnalysis.sort')" min-width="70px" align="center" prop="sort" />
+            <el-table-column :label="$t('processAnalysis.fname')" min-width="70px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.lweight')" min-width="50px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="误差值" min-width="70px" align="center" prop="diff" />
-            <el-table-column label="准确率" min-width="70px" align="center" prop="diffRate" />
-            <el-table-column label="完成时间" min-width="70px" align="center" prop="intime" />
-            <el-table-column label="过程时间" min-width="70px" align="center" prop="proesstime" />
-            <el-table-column label="跳转方式" min-width="70px" align="center" prop="buttontype" />
-            <el-table-column label="开始重量" min-width="70px" align="center" prop="lastactualweight" />
-            <el-table-column label="结束重量" min-width="70px" align="center" prop="actualweight" />
+            <el-table-column :label="$t('processAnalysis.diff')"  min-width="70px" align="center" prop="diff" />
+            <el-table-column :label="$t('processAnalysis.diffRate')"  min-width="70px" align="center" prop="diffRate" />
+            <el-table-column :label="$t('processAnalysis.intime')"  min-width="70px" align="center" prop="intime" />
+            <el-table-column :label="$t('processAnalysis.proesstime')"  min-width="70px" align="center" prop="proesstime" />
+            <el-table-column :label="$t('processAnalysis.buttontype')"  min-width="70px" align="center" prop="buttontype" />
+            <el-table-column :label="$t('processAnalysis.lastactualweight')"  min-width="70px" align="center" prop="lastactualweight" />
+            <el-table-column :label="$t('processAnalysis.actualweight')"  min-width="70px" align="center" prop="actualweight" />
           </el-table>
         </div>
 
         <div class="SpreadingMaterials">
-          <h4>撒料详情</h4>
+          <h4>{{$t('processAnalysis.hlxq')}}</h4>
           <el-table
             :key="table4.tableKey"
             v-loading="table4.listLoading"
@@ -228,43 +228,43 @@
             class="elTable table-fixed"
             max-height="260px"
           >
-            <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
-            <el-table-column label="栏舍名称" min-width="70px" align="center" prop="fname" />
-            <el-table-column label="计划重量" min-width="70px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column :label="$t('processAnalysis.sort')" min-width="70px" align="center" prop="sort" />
+            <el-table-column :label="栏舍名称" min-width="70px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.lweight')" min-width="70px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="误差值" min-width="70px" align="center" prop="diff" />
-            <el-table-column label="准确率" min-width="70px" align="center" prop="diffRate" />
-            <el-table-column label="完成时间" min-width="70px" align="center" prop="intime" />
-            <el-table-column label="过程时间" min-width="70px" align="center" prop="proesstime" />
-            <el-table-column label="跳转方式" min-width="70px" align="center" prop="buttontype" />
-            <el-table-column label="开始重量" min-width="70px" align="center" prop="lastactualweight" />
-            <el-table-column label="结束重量" min-width="70px" align="center" prop="actualweight" />
+            <el-table-column :label="$t('processAnalysis.diff')"  min-width="70px" align="center" prop="diff" />
+            <el-table-column :label="$t('processAnalysis.diffRate')"  min-width="70px" align="center" prop="diffRate" />
+            <el-table-column :label="$t('processAnalysis.intime')"  min-width="70px" align="center" prop="intime" />
+            <el-table-column :label="$t('processAnalysis.proesstime')"  min-width="70px" align="center" prop="proesstime" />
+            <el-table-column :label="$t('processAnalysis.buttontype')"  min-width="70px" align="center" prop="buttontype" />
+            <el-table-column :label="$t('processAnalysis.lastactualweight')"  min-width="70px" align="center" prop="lastactualweight" />
+            <el-table-column :label="$t('processAnalysis.actualweight')"  min-width="70px" align="center" prop="actualweight" />
           </el-table>
         </div>
         <div class="ControlChart">
-          <h4>监控图</h4>
+          <h4>{{$t('processAnalysis.watchPlan')}}</h4>
           <div id="chartLine" style="width: 100%;height:300px;" />
         </div>
       </el-col>
       <!-- 剩料计划 -->
       <el-col v-if="isResidualMaterialPlan" :span="16">
         <div class="title">
-          <b>过程详情</b>
+          <b>{{$t('processAnalysis.processdel')}}</b>
           <span>&nbsp;({{ title }})</span>
         </div>
         <div class="detail">
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>过程时间</span>
+            <span>{{$t('processAnalysis.proesstime')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].iscompleted }}</b>
-            <span>工作状态</span>
+            <span>{{$t('processAnalysis.workStatus')}}</span>
           </div>
         </div>
         <div class="Mixture">
@@ -283,7 +283,7 @@
             class="elTable table-fixed"
             max-height="260px"
           >
-            <el-table-column label="操作编号" min-width="110px" align="center">
+            <el-table-column label="$t('processAnalysis.sort')" min-width="110px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.sort }}</span>
               </template>
@@ -302,7 +302,7 @@
         </div>
 
         <div class="SpreadingMaterials">
-          <h4>撒料详情</h4>
+          <h4>{{$t('processAnalysis.hlxq')}}</h4>
           <el-table
             :key="table4.tableKey"
             v-loading="table4.listLoading"
@@ -318,7 +318,7 @@
             class="elTable table-fixed"
             max-height="260px"
           >
-            <el-table-column label="操作编号" min-width="110px" align="center" prop="sort" />
+            <el-table-column label="$t('processAnalysis.sort')" min-width="110px" align="center" prop="sort" />
             <el-table-column label="转投栏舍" 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" />
@@ -329,41 +329,41 @@
       <!-- 撒料计划-混料 -->
       <el-col v-if="isSpreadingPlanSH" :span="16">
         <div class="title">
-          <b>过程详情</b>
+          <b>{{$t('processAnalysis.processdel')}}</b>
           <span>&nbsp;({{ title }})</span>
         </div>
         <div class="detail">
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>过程时间</span>
+            <span>{{$t('processAnalysis.proesstime')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>混料时间</span>
+            <span>{{$t('processAnalysis.proesstime1')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].iscompleted }}</b>
-            <span>工作状态</span>
+            <span>{{$t('processAnalysis.workStatus')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].Hdif }}kg</b>
-            <span>混料误差值</span>
+            <span>{{$t('processAnalysis.hlwc')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].HdifRate }}</b>
-            <span>混料准确率</span>
+            <span>{{$t('processAnalysis.hlzq')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].Sdif }}kg</b>
-            <span>撒料误差值</span>
+            <span>{{$t('processAnalysis.slwc')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].SdifRate }}</b>
-            <span>撒料准确率</span>
+            <span>{{$t('processAnalysis.slzq')}}</span>
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情</h4>
+          <h4>{{$t('processAnalysis.hlxq')}}</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -379,27 +379,27 @@
             max-height="270px"
 
           >
-            <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
-            <el-table-column label="饲料名称" min-width="60px" align="center" prop="fname" />
-            <el-table-column label="计划重量" min-width="60px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column :label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
+            <el-table-column :label="$t('processAnalysis.fname')" min-width="60px" align="center" prop="fname" />
+            <el-table-column :label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="误差值" min-width="60px" align="center" prop="diff" />
-            <el-table-column label="准确率" min-width="60px" align="center" prop="diffRate" />
-            <el-table-column label="完成时间" min-width="60px" align="center" prop="intime" />
-            <el-table-column label="过程时间" min-width="60px" align="center" prop="proesstime" />
-            <el-table-column label="跳转方式" min-width="60px" align="center" prop="buttontype" />
-            <el-table-column label="开始重量" min-width="60px" align="center" prop="lastactualweight" />
-            <el-table-column label="结束重量" min-width="60px" align="center" prop="actualweight" />
+            <el-table-column :label="$t('processAnalysis.diff')"  min-width="60px" align="center" prop="diff" />
+            <el-table-column :label="$t('processAnalysis.diffRate')"  min-width="60px" align="center" prop="diffRate" />
+            <el-table-column :label="$t('processAnalysis.intime')"  min-width="60px" align="center" prop="intime" />
+            <el-table-column :label="$t('processAnalysis.proesstime')"  min-width="60px" align="center" prop="proesstime" />
+            <el-table-column :label="$t('processAnalysis.buttontype')"  min-width="60px" align="center" prop="buttontype" />
+            <el-table-column :label="$t('processAnalysis.lastactualweight')"  min-width="60px" align="center" prop="lastactualweight" />
+            <el-table-column :label="$t('processAnalysis.actualweight')"  min-width="60px" align="center" prop="actualweight" />
           </el-table>
         </div>
 
         <div class="SpreadingMaterials">
-          <h4>撒料详情</h4>
+          <h4>{{$t('processAnalysis.hlxq')}}</h4>
           <el-table
             :key="table4.tableKey"
             v-loading="table4.listLoading"
@@ -414,67 +414,67 @@
             class="elTable table-fixed"
             max-height="260px"
           >
-            <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
+            <el-table-column label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
-            <el-table-column label="计划重量" min-width="60px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
+            <el-table-column label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="误差值" min-width="60px" align="center" prop="diff" />
-            <el-table-column label="准确率" min-width="60px" align="center" prop="diffRate" />
-            <el-table-column label="完成时间" min-width="60px" align="center" prop="intime" />
-            <el-table-column label="过程时间" min-width="60px" align="center" prop="proesstime" />
-            <el-table-column label="跳转方式" min-width="60px" align="center" prop="buttontype" />
-            <el-table-column label="开始重量" min-width="60px" align="center" prop="lastactualweight" />
-            <el-table-column label="结束重量" min-width="60px" align="center" prop="actualweight" />
+            <el-table-column label="$t('processAnalysis.diff')"  min-width="60px" align="center" prop="diff" />
+            <el-table-column label="$t('processAnalysis.diffRate')"  min-width="60px" align="center" prop="diffRate" />
+            <el-table-column label="$t('processAnalysis.intime')"  min-width="60px" align="center" prop="intime" />
+            <el-table-column label="$t('processAnalysis.proesstime')"  min-width="60px" align="center" prop="proesstime" />
+            <el-table-column label="$t('processAnalysis.buttontype')"  min-width="60px" align="center" prop="buttontype" />
+            <el-table-column label="$t('processAnalysis.lastactualweight')"  min-width="60px" align="center" prop="lastactualweight" />
+            <el-table-column label="$t('processAnalysis.actualweight')"  min-width="60px" align="center" prop="actualweight" />
           </el-table>
         </div>
         <div class="ControlChart">
-          <h4>监控图</h4>
+          <h4>{{$t('processAnalysis.watchPlan')}}</h4>
           <div id="chartLine" style="width: 100%;height:300px;" />
         </div>
       </el-col>
       <!-- 撒料计划-撒料 -->
       <el-col v-if="isSpreadingPlanSS" :span="16">
         <div class="title">
-          <b>过程详情</b>
+          <b>{{$t('processAnalysis.processdel')}}</b>
           <span>&nbsp;({{ title }})</span>
         </div>
         <div class="detail">
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>过程时间</span>
+            <span>{{$t('processAnalysis.proesstime')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].proesstime }}</b>
-            <span>混料时间</span>
+            <span>{{$t('processAnalysis.proesstime1')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].iscompleted }}</b>
-            <span>工作状态</span>
+            <span>{{$t('processAnalysis.workStatus')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].Hdif }}kg</b>
-            <span>混料误差值</span>
+            <span>{{$t('processAnalysis.hlwc')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].HdifRate }}</b>
-            <span>混料准确率</span>
+            <span>{{$t('processAnalysis.hlzq')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].Sdif }}kg</b>
-            <span>撒料误差值</span>
+            <span>{{$t('processAnalysis.slwc')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].SdifRate }}</b>
-            <span>撒料准确率</span>
+            <span>{{$t('processAnalysis.slzq')}}</span>
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情</h4>
+          <h4>{{$t('processAnalysis.hlxq')}}</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -489,27 +489,27 @@
             class="elTable table-fixed"
             max-height="270px"
           >
-            <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
+            <el-table-column label="$t('processAnalysis.sort')" min-width="60px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
-            <el-table-column label="计划重量" min-width="60px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column label="$t('processAnalysis.lweight')" min-width="60px" align="center" prop="lweight" />
+            <el-table-column label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="误差值" min-width="60px" align="center" prop="diff" />
-            <el-table-column label="准确率" min-width="60px" align="center" prop="diffRate" />
-            <el-table-column label="完成时间" min-width="60px" align="center" prop="intime" />
-            <el-table-column label="过程时间" min-width="60px" align="center" prop="proesstime" />
-            <el-table-column label="跳转方式" min-width="60px" align="center" prop="buttontype" />
-            <el-table-column label="开始重量" min-width="60px" align="center" prop="lastactualweight" />
-            <el-table-column label="结束重量" min-width="60px" align="center" prop="actualweight" />
+            <el-table-column label="$t('processAnalysis.diff')"  min-width="60px" align="center" prop="diff" />
+            <el-table-column label="$t('processAnalysis.diffRate')"  min-width="60px" align="center" prop="diffRate" />
+            <el-table-column label="$t('processAnalysis.intime')"  min-width="60px" align="center" prop="intime" />
+            <el-table-column label="$t('processAnalysis.proesstime')"  min-width="60px" align="center" prop="proesstime" />
+            <el-table-column label="$t('processAnalysis.buttontype')"  min-width="60px" align="center" prop="buttontype" />
+            <el-table-column label="$t('processAnalysis.lastactualweight')"  min-width="60px" align="center" prop="lastactualweight" />
+            <el-table-column label="$t('processAnalysis.actualweight')"  min-width="60px" align="center" prop="actualweight" />
           </el-table>
         </div>
 
         <div class="SpreadingMaterials">
-          <h4>撒料详情</h4>
+          <h4>{{$t('processAnalysis.hlxq')}}</h4>
           <el-table
             :key="table4.tableKey"
             v-loading="table4.listLoading"
@@ -524,26 +524,26 @@
             class="elTable table-fixed"
             max-height="260px"
           >
-            <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
+            <el-table-column :label="$t('processAnalysis.sort')" min-width="70px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="70px" align="center" prop="fname" />
-            <el-table-column label="计划重量" min-width="70px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column :label="$t('processAnalysis.lweight')" min-width="70px" align="center" prop="lweight" />
+            <el-table-column :label="$t('processAnalysis.actualweightminus')"  min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="误差值" min-width="70px" align="center" prop="diff" />
-            <el-table-column label="准确率" min-width="70px" align="center" prop="diffRate" />
-            <el-table-column label="完成时间" min-width="70px" align="center" prop="intime" />
-            <el-table-column label="过程时间" min-width="70px" align="center" prop="proesstime" />
-            <el-table-column label="跳转方式" min-width="70px" align="center" prop="buttontype" />
-            <el-table-column label="开始重量" min-width="70px" align="center" prop="lastactualweight" />
-            <el-table-column label="结束重量" min-width="70px" align="center" prop="actualweight" />
+            <el-table-column :label="$t('processAnalysis.diff')"  min-width="70px" align="center" prop="diff" />
+            <el-table-column :label="$t('processAnalysis.diffRate')"  min-width="70px" align="center" prop="diffRate" />
+            <el-table-column :label="$t('processAnalysis.intime')"  min-width="70px" align="center" prop="intime" />
+            <el-table-column :label="$t('processAnalysis.proesstime')"  min-width="70px" align="center" prop="proesstime" />
+            <el-table-column :label="$t('processAnalysis.buttontype')"  min-width="70px" align="center" prop="buttontype" />
+            <el-table-column :label="$t('processAnalysis.lastactualweight')"  min-width="70px" align="center" prop="lastactualweight" />
+            <el-table-column :label="$t('processAnalysis.actualweight')"  min-width="70px" align="center" prop="actualweight" />
           </el-table>
         </div>
         <div class="ControlChart">
-          <h4>监控图</h4>
+          <h4>{{$t('processAnalysis.watchPlan')}}</h4>
           <div id="chartLine" style="width: 100%;height:300px;" />
         </div>
       </el-col>

+ 23 - 23
src/views/statisticalAnalysis/pushingplan/index.vue

@@ -12,7 +12,7 @@
       </el-date-picker>
       <el-input
         v-model="table.parammaps.tname"
-        placeholder="推料车"
+        :placeholder="$t('pushingplan.tname')"
         style="width: 180px"
         class="filter-item"
         clearable
@@ -37,56 +37,56 @@
         :max-height="myHeight"
       >
         <el-table-column
-          label="序号"
+          :label="$t('pushingplan.num')"
           align="center"
           type="index"
-          width="50px"
+          width="110px"
         />
         <el-table-column
-          label="推料车"
+        :label="$t('pushingplan.tname')"
           min-width="100px"
           align="center"
           prop="tname"
         />
         <el-table-column
-          label="备注"
+        :label="$t('pushingplan.remark')"
           min-width="100px"
           align="center"
           prop="remark"
         />
         <el-table-column
-          label="计划开始时间"
+        :label="$t('pushingplan.planDate')"
           min-width="100px"
           align="center"
           prop="plandate"
         />
         <el-table-column
-          label="实际开始时间"
+        :label="$t('pushingplan.startDate')"
           min-width="100px"
           align="center"
           prop="startdate"
         />
         <el-table-column
-          label="偏差分钟数"
+        :label="$t('pushingplan.deviation')"
           min-width="100px"
           align="center"
           prop="deviation"
         />
         <el-table-column
-          label="实际结束时间"
+        :label="$t('pushingplan.endDate')"
           min-width="100px"
           align="center"
           prop="enddate"
         />
         <el-table-column
-          label="实际时长(分钟)"
+        :label="$t('pushingplan.date')"
           min-width="100px"
           align="center"
           prop="dates"
         />
 
         <el-table-column
-          label="运行轨迹"
+        :label="$t('pushingplan.name')"
           align="center"
           width="80"
           class-name="small-padding fixed-width"
@@ -97,7 +97,7 @@
               v-if="isRoleEdit"
               class="miniSuccess"
               @click="handleRunning_trajectory(row)"
-              >查看</el-button
+              >{{$t('pushingplan.watch')}}</el-button
             >
           </template>
         </el-table-column>
@@ -141,7 +141,7 @@
                 margin-top: 2px;
               "
             />
-            运行轨迹
+            {{$t('pushingplan.name')}}
           </span>
           <div
             class="avue-crud__dialog__menu"
@@ -154,32 +154,32 @@
       </template>
       <!-- <div style="margin-bottom: 20px;background-image: url('http://niu305.cn:8091/uploads/image/headphoto1.png');background-position: top right;"> -->
         <div>
-          <h3>推料计划详情</h3>
+          <h3>{{$t('pushingplan.detail')}}</h3>
           <div class="run-box-rg">
             <div>
-              <span>推料车:</span>{{runDate?.tname || '暂无'}}
+              <span>{{$t('pushingplan.tname')}}:</span>{{runDate?.tname || $t('pushingplan.none')}}
             </div>
             <div>
-              <span>备注:</span>{{runDate?.remark || '暂无'}}
+              <span>{{$t('pushingplan.remark')}}:</span>{{runDate?.remark || $t('pushingplan.none')}}
             </div>
             <div>
-              <span>计划开始时间:</span>{{runDate?.plandate || '暂无'}}
+              <span>{{$t('pushingplan.planDate')}}:</span>{{runDate?.plandate || $t('pushingplan.none')}}
             </div>
             <div>
-              <span>实际开始时间:</span>{{runDate?.startdate || '暂无'}}
+              <span>{{$t('pushingplan.startDate')}}:</span>{{runDate?.startdate || $t('pushingplan.none')}}
             </div>
             <div>
-              <span>偏差分钟数:</span>{{runDate?.deviation || '暂无'}}
+              <span>{{$t('pushingplan.deviation')}}:</span>{{runDate?.deviation || $t('pushingplan.none')}}
             </div>
             <div>
-              <span>实际结束时间:</span>{{runDate?.enddate || '暂无'}}
+              <span>{{$t('pushingplan.endDate')}}:</span>{{runDate?.enddate || $t('pushingplan.none')}}
             </div>
             <div>
-              <span>实际时长:</span>{{runDate?.dates || '暂无'}} 分钟
+              <span>{{$t('pushingplan.date')}}:</span>{{runDate?.dates || $t('pushingplan.none')}}
             </div>
 
             <div>
-              <span>推料栏舍顺序:</span>{{ runDate?.bname || '暂无' }}
+              <span>{{$t('pushingplan.bname')}}:</span>{{ runDate?.bname || $t('pushingplan.none') }}
             </div>
           </div>
           <div ref="map" class="map-container"></div>
@@ -193,7 +193,7 @@
             run.dialogFormVisible = false
             getList()
           "
-          >关闭</el-button
+          >{{$t('common.closed')}}</el-button
         >
       </div>
     </el-dialog>

+ 1 - 1
src/views/systemManagement/customboard2/Addboard2/index.vue

@@ -86,7 +86,7 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose1" @click="showChartList = false">关闭</el-button>
+        <el-button class="cancelClose1" @click="showChartList = false">{{$t('common.closed')}}</el-button>
       </div>
     </el-dialog>
  

+ 1 - 1
src/views/systemManagement/labelManagement/index.vue

@@ -151,7 +151,7 @@
           </el-table>
         </el-form>
         <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
           <el-button class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
         </div>
       </div>

+ 1 - 1
src/views/systemManagement/notificationManagement/index.vue

@@ -86,7 +86,7 @@
         </el-table>
         <pagination v-show="statisticsRead.total>=0" :total="statisticsRead.total" :page.sync="statisticsRead.getdataListParm.offset" :limit.sync="statisticsRead.getdataListParm.pagecount" @pagination="getStatisticsReadList" />
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="statisticsRead.dialogFormVisible = false;getList(); ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="statisticsRead.dialogFormVisible = false;getList(); ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

+ 1 - 1
src/views/systemManagement/operation/index.vue

@@ -82,7 +82,7 @@
           </div>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="see.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="cancelClose cancelClose1" @click="see.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
         </div>
       </div>
     </el-dialog>

Some files were not shown because too many files changed in this diff