英文更改

.env.development

@@ -3,11 +3,10 @@
 ENV = 'development'
 
 # base api
-# 测试线
-# VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+# 测试线'
+# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/':q
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.56:80/'
+VUE_APP_BASE_API = 'http://192.168.1.79:8081/'
 # VUE_APP_BASE_API = 'http://192.168.1.93/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/lang/en/langModule/InventoryManagement.js

@@ -1,57 +1,57 @@
-export default{
-  kctj:'Inventory Statistics',
-  yltj:"Feed Analysis",
-  jgfx:"Price Analysis",
-   silc:'feed name',
-   qc:'Beginning of Period',
-   qckc:"Beginning Inventory（kg）",
-   qcje:"Beginning Balance",
-   yl:"Usage",
-   xtckyl:"System Outward Weight（kg）",
-   rkylzl:"Inward Weight（kg）",
-   rgylzl:"Manual Feed Weight（kg）",
-   chzl:"Loss Weight（kg）",
-   qm:'End of Period',
-   qmkc:"End of Period Inventory（kg）",
-   qmje:"End of Period Amount（$)",
-   ylfx:"Feed Analysis",
-   tjlx:"Type of Statistics",
-   wc:"Error",
-   sfcfxl:"Whether to Split the Small Materials",
-   rq:"Date",
-   tmrsbbh:"TMR Equipment Number",
-   lbxs:"List Display",
-   qhzs:"Switch Display",
-   tmrbcc:"TMRshift",
-   bcf: "Do Not Split",
+export default {
+  kctj: "Inventory Statistics",
+  yltj: "Feed Analysis",
+  jgfx: "Price Analysis",
+  silc: "feed name",
+  qc: "Beginning of Period",
+  qckc: "Beginning Inventory（kg）",
+  qcje: "Beginning Balance",
+  yl: "Usage",
+  xtckyl: "System Outward Weight（kg）",
+  rkylzl: "Inward Weight（kg）",
+  rgylzl: "Manual Feed Weight（kg）",
+  chzl: "Loss Weight（kg）",
+  qm: "End of Period",
+  qmkc: "End of Period Inventory（kg）",
+  qmje: "End of Period Amount（$)",
+  ylfx: "Feed Analysis",
+  tjlx: "Type of Statistics",
+  wc: "Error",
+  sfcfxl: "Whether to Split the Small Materials",
+  rq: "Date",
+  tmrsbbh: "TMR Equipment Number",
+  lbxs: "List Display",
+  qhzs: "Switch Display",
+  tmrbcc: "TMRshift",
+  bcf: "Do Not Split",
   cf: "Split",
   ll: "Theory",
   sj: "Actual",
 
-    multiHeader:[['Feed Name', 'Beginning of Period', '', 'Usage', '', '', '', 'End of Period', '']],
-    multiHeader2 : [['', 'Initial Inventory(kg)', 'Initial Amount ($)', 'Inbound Weight (kg)', 'System Outbound Weight (kg)', 'Manual Material Usage Weight (kg)', 'Waste Weight', 'Final Inventory (kg)', 'Final Amount ($)']]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
+  multiHeader: [
+    [
+      "Feed Name",
+      "Beginning of Period",
+      "",
+      "Usage",
+      "",
+      "",
+      "",
+      "End of Period",
+      "",
+    ],
+  ],
+  multiHeader2: [
+    [
+      "",
+      "Initial Inventory(kg)",
+      "Initial Amount ($)",
+      "Inbound Weight (kg)",
+      "System Outbound Weight (kg)",
+      "Manual Material Usage Weight (kg)",
+      "Waste Weight",
+      "Final Inventory (kg)",
+      "Final Amount ($)",
+    ],
+  ],
+};

src/lang/en/langModule/dailyExecutionPlan.js

@@ -38,7 +38,6 @@ export default {
   dyBan3: "Third Shift:",
   dyBan4: "Fourth Shift:",
   zztb: "Synchronizing",
-
   bcbl: "Shift Ratio(%)",
   dcczzd: "Single Vehicle Operating Weight",
   planTypeList: [

src/lang/en/langModule/dashboard.js

@@ -1,106 +1,118 @@
 export default {
-  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',
-  spreadAc:'Spreading Accuracy',
-  SpreadingCR:'Spreading Correctness Rate',
-  yestday:'Yesterday',
-  yestday30:'Mixture Accuracy of Mixed Feed in the Last 30 Days',
-  yestday30S:'Spreading Correctness Rate Over the Last 30 Days',
-  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:'Times',
-  cTrip:'Complete the Train',
-  pTrip:"Planned Train",
-  cWeight:"Completed Weight",
-  pWeight:"Planned Weight",
-  rWright:'Remaining Weight',
-  costSts:'Cost Statistics',
-  Export:"Export",
-  sTable:'Switch Table',
-  tripCp:'Weight Completion Rate',
-  tripCp1:"Train  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',
-    PNum:"Planned Number",
+  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",
+  spreadAc: "Spreading Accuracy",
+  SpreadingCR: "Spreading Correctness Rate",
+  yestday: "Yesterday",
+  yestday30: "Mixture Accuracy of Mixed Feed in the Last 30 Days",
+  yestday30S: "Spreading Correctness Rate Over the Last 30 Days",
+  yestday30zq: "Spreading Correctness of Mixed Feed in the Last 30 Day",
+  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: "Times",
+  cTrip: "Complete the Train",
+  pTrip: "Planned Train",
+  cWeight: "Completed Weight",
+  pWeight: "Planned Weight",
+  rWright: "Remaining Weight",
+  costSts: "Cost Statistics",
+  Export: "Export",
+  sTable: "Switch Table",
+  tripCp: "Weight Completion Rate",
+  tripCp1: "Train  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",
+    PNum: "Planned Number",
   },
-  feedCow:'Feed Cost per Kilogram of Milk',
-  tHeader:['Date', 'Feed Cost per Cow', 'Feed Cost per Kilogram of Milk'],
-  CostStatistics:'Cost Statistics',
-  feedCows:'Feed Cost per \n Kilogram of Milk',
-  signOxs:'Feed Cost \n per Cow',
-  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:'Planned Statistics',
-  cant:'Percentage',
-  miruTitle:'Dry Matter Intake (DMI) of Lactating Cows',
-  miruMilk:"Milk Yield \n  of Lactating Cows",
-  miruCow:"Feed Intake of Lactating Cows",
-  miruMilk1:"Milk Yield  of Lactating Cows（kg）",
-  miruCow1:"Dry Matter Intake (DMI) of Lactating Cows（kg）",
-  miruCowMilk:'Dry Matter  \n Intake Lactating Cows',
-  mixStatic:'Statistics of Actual Weight of Mixed Feed',
-  stockAlart:"Stock Alert",
-  stockTable:{
-    num:"Serial Number",
-    feedName:'Feed Name',
-    stockNum:'Inventory Quantity(Kg)',
-    lastDay:'Remaining Days of Use',
+  feedCow: "Feed Cost per Kilogram of Milk",
+  tHeader: ["Date", "Feed Cost per Cow", "Feed Cost per Kilogram of Milk"],
+  CostStatistics: "Cost Statistics",
+  feedCows: "Feed Cost per \n Kilogram of Milk",
+  signOxs: "Feed Cost \n per Cow",
+  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: "Planned Statistics",
+  cant: "Percentage",
+  miruTitle: "Dry Matter Intake (DMI) of Lactating Cows",
+  miruMilk: "Milk Yield \n  of Lactating Cows",
+  miruCow: "Feed Intake of Lactating Cows",
+  miruMilk1: "Milk Yield  of Lactating Cows（kg）",
+  miruCow1: "Dry Matter Intake (DMI) of Lactating Cows（kg）",
+  miruCowMilk: "Dry Matter  \n Intake Lactating Cows",
+  mixStatic: "Statistics of Actual Weight of Mixed Feed",
+  stockAlart: "Stock Alert",
+  stockTable: {
+    num: "Serial Number",
+    feedName: "Feed Name",
+    stockNum: "Inventory Quantity(Kg)",
+    lastDay: "Remaining Days of Use",
   },
 
+  tHeader1: [
+    "Date",
+    "Planned Execution Weight（kg）",
+    "Formula Theoretical Weight（kg）",
+    "Planning Accuracy Rate",
+    "Planned Cancellation Weight（kg）",
+    "Planning Accuracy Rate (Excluding Canceled Weight)",
+    "Correct Number in Plan”",
+    "Planned Number",
+    "Planning Correctness Rate",
+  ],
+  sheetName1: "Planned Statistics",
 
+  tHeader2: [
+    "Date",
+    "Feed Intake of Lactating Cows（kg）",
+    "Milk Yield of Lactating Cows（kg）",
+  ],
+  sheetName2: "DMI of Lactating Cows",
 
-  tHeader1: ['Date', 'Planned Execution Weight（kg）', 'Formula Theoretical Weight（kg）', 'Planning Accuracy Rate', 'Planned Cancellation Weight（kg）', 'Planning Accuracy Rate (Excluding Canceled Weight)', 'Correct Number in Plan”', 'Planned Number', 'Planning Correctness Rate'],
-  sheetName1: 'Planned Statistics',
-
-  tHeader2: ['Date', 'Feed Intake of Lactating Cows（kg）', 'Milk Yield of Lactating Cows（kg）'],
-  sheetName2: 'DMI of Lactating Cows',
-
-  tHeader3: ['Date', 'Weight'],
-  sheetName3: 'Actual Weight Statistics'
-
-}
+  tHeader3: ["Date", "Weight"],
+  sheetName3: "Actual Weight Statistics",
+};

src/lang/en/langModule/driver.js

@@ -1,64 +1,55 @@
-export default{
-  drivername:"Driver's Name",
-  drivercode:"Driver's Number",
-  enableList: [{ id: 1, name: 'Yes' }, { id: 0, name: 'No' }], // 是
-  
-  classname:"TMR Equipment Type",
-  rl:"Capacity(m³)",
-  clys:"Vehicle Color",
-  sjcjkbh:"DAQ Card Number",
-  tzys:"Jump Delay(s)",
-  tzys1:"Jump Delay",
-  sjjk:"Data Interface",
-  tmrsjjk:"TMR Data Interface",
-  zdsb:"Designated Equipment",
-
-  sbcode:"Equipment Number",
-  sbname:'Equipment Name',
-  sbtype:"Equipment Type",
-
-  equipmentTypeList: [{ id: '0', name: 'Equipment' }, { id: '6', name: 'Feed Pushcart' }, { id: '7', name: 'Manure Pusher' }],
-
-  scfl:"Livestock Parent Category",
-  scflcode:"Livestock Category Code",
-  scftype:"Livestock Category",
-  sclbfl:"Livestock Category Parent",
-
-
-  lsmc:"Pen Name",
-  lsbh:"Pen Number",
-  xzsstj:"Please Click to Select Search Criteria",
-  yxwcs:"Allowed Error Number（kg）",
-  tzzly:"Transition Weight Range",
-  tzys:"Jump Delay",
-  hqspanccode:"Get SAP Code",
-  hqudls:"Get UD Pen",
-  qrks:"Confirm Start",
-  udcode:"UD Code",
-  udname:"UD Name",
-
-
-  messageNote:"The current content has not been saved. Please click Cancel or Save to continue the operation.",
-
-  message1: 'Stall Name/Stall Number/Barn Type/Herds cannot be empty',
+export default {
+  drivername: "Driver's Name",
+  drivercode: "Driver's Number",
+  enableList: [
+    { id: 1, name: "Yes" },
+    { id: 0, name: "No" },
+  ], // 是
+
+  classname: "TMR Equipment Type",
+  rl: "Capacity(m³)",
+  clys: "Vehicle Color",
+  sjcjkbh: "DAQ Card Number",
+  tzys1: "Jump Delay(s)",
+  tzys: "Jump Delay",
+  sjjk: "Data Interface",
+  tmrsjjk: "TMR Data Interface",
+  zdsb: "Designated Equipment",
+
+  sbcode: "Equipment Number",
+  sbname: "Equipment Name",
+  sbtype: "Equipment Type",
+
+  equipmentTypeList: [
+    { id: "0", name: "Equipment" },
+    { id: "6", name: "Feed Pushcart" },
+    { id: "7", name: "Manure Pusher" },
+  ],
+
+  scfl: "Livestock Parent Category",
+  scflcode: "Livestock Category Code",
+  scftype: "Livestock Category",
+  sclbfl: "Livestock Category Parent",
+
+  lsmc: "Pen Name",
+  lsbh: "Pen Number",
+  xzsstj: "Please Click to Select Search Criteria",
+  yxwcs: "Allowed Error Number（kg）",
+  tzzly: "Transition Weight Range(kg)",
+  tzys: "Jump Delay",
+  hqspanccode: "Get SAP Code",
+  hqudls: "Get UD Pen",
+  qrks: "Confirm Start",
+  udcode: "UD Code",
+  udname: "UD Name",
+
+  messageNote:
+    "The current content has not been saved. Please click Cancel or Save to continue the operation.",
+  message1: "Stall Name/Stall Number/Barn Type/Herds cannot be empty",
   message2: "Stall Name cannot be empty",
   message3: "Stall Number cannot be empty",
 
-  qxzjsyxx:"Please select driver information",
-  saveFail: 'Save failed',
-  saveSuccess:"Success saved"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
+  qxzjsyxx: "Please select driver information",
+  saveFail: "Save failed",
+  saveSuccess: "Success saved",
+};

src/lang/en/langModule/feedChart.js

@@ -1,104 +1,98 @@
-export default{
-  sldl:"Feed Category",
-  slflmc:"Feed Classification",
-  slflbh:"Feed Classification Code",
-  sldlflbh:'"Feed Category/Feed Classification/Feed Classification Code cannot be empty',
-  sldlno:"Feed Category cannot be empty",
-  slflno:"Feed Classification cannot be empty",
-  slbhno:"Feed Classification Code cannot be empty",
-  slfltszi:" Cannot contain special characters",
-  slflxx:"Please select feed classification",
+export default {
+  sldl: "Feed Category",
+  slflmc: "Feed Classification",
+  slflbh: "Feed Classification Code",
+  sldlflbh:
+    "Feed Category/Feed Classification/Feed Classification Code cannot be empty",
+  slflbh1: "/Feed Classification/Feed Classification Code cannot be empty",
+  sldlno: "Feed Category cannot be empty",
+  slflno: "Feed Classification cannot be empty",
+  slbhno: "Feed Classification Code cannot be empty",
+  slfltszi: " Cannot contain special characters",
+  slflxx: "Please select feed classification",
 
+  sllb: "Feed Type",
+  slly: "Feed Source",
+  sz: "Setting",
+  slk: "Feed Inventory",
+  hqudsl: "Acquire UD Feed",
+  wllx: "Material Type",
+  wybm: "Unique Code",
+  slly: "Feed Source",
+  yxwcs: "Permissible Error Weight (kg)",
+  bzdwzl: "Packing Unit Weight (kg)",
+  dj: "Unit Price",
+  jdq: "Relay Position",
+  wsy: "Without Upper Domain",
+  byzd: "Spare Field",
+  byzd1: "Spare Field 01",
+  byzd2: "Spare Field 02",
+  byzd3: "Spare Field 03",
+  yes: "Yes",
+  no: "No",
+  yyjz: "Nutritional Value",
+  gl: "Association",
+  jcxx: "Basic Information",
+  slmc: "Feed Name",
+  jhlx: "Plan Type",
+  spalh: "SAP Location",
+  spabm: "SAP Code:",
+  jbcs: "Mixing Parameters",
+  tzzly: "Jump Weight Domain (kg):",
+  tzys: "Jump Delay:",
+  qrks: "Confirm Start:",
+  sfqy: "Enable",
+  xkc: "Minor Ingredient Scale",
+  zgslh: "China Feed Number",
+  price: "Price",
+  ypsm: "Sample Description",
+  wgz: "Dry Matter (DM%)",
+  cdb1: "Crude Protein (CP%DM)",
+  gai: "Calcium (Ca%DM)",
+  lin: "Phosphorus (P%DM)",
+  cnjn: "Milk production net energy(MJ) ",
+  chf: "Crude Ash (%)",
+  cl: "Coarse Material",
+  glzt: "Association Status",
+  df: "Starch (%DM)",
+  zf: "Fat (%DM)",
+  qxgl: "Cancel Association",
+  jinyong: "Disabled",
+  wu: "None",
 
-sllb: "Feed Type",
-slly: "Feed Source",
-sz: "Setting",
-slk: "Feed Inventory",
-hqudsl: "Acquire UD Feed",
-wllx: "Material Type",
-wybm: "Unique Code",
-slly: "Feed Source" ,
-yxwcs: "Permissible Error Weight (kg)",
-bzdwzl: "Packing Unit Weight (kg)",
-dj: "Unit Price",
-jdq: "Relay Position",
-wsy: "Without Upper Domain",
-byzd: "Spare Field",
-byzd1: "Spare Field 01",
-byzd2: "Spare Field 02",
-byzd3: "Spare Field 03",
-yes: "Yes",
-no: "No",
-yyjz: "Nutritional Value",
-gl: "Association",
-jcxx: "Basic Information",
-slmc: "Feed Name",
-jhlx: "Plan Type",
-spalh: "SAP Location",
-spabm: "SAP Code:",
-jbcs: "Mixing Parameters",
-tzzly: "Jump Weight Domain (kg):",
-tzys: "Jump Delay:",
-qrks: "Confirm Start:",
-sfqy: "Enable",
-xkc: "Minor Ingredient Scale",
-zgslh: "China Feed Number",
-price: "Price",
-ypsm: "Sample Description",
-wgz: "Dry Matter (DM%)",
-cdb1: "Crude Protein (CP%DM)",
-gai: "Calcium (Ca%DM)",
-lin: "Phosphorus (P%DM)",
-cnjn: "Milk production net energy ",
-chf: "Crude Ash (%)",
-cl: "Coarse Material",
-glzt: "Association Status",
-df: "Starch (%DM)" ,
-zf: "Fat (%DM)",
-qxgl: "Cancel Association",
-
-
-bzdwzlqsrzs: "Please enter a positive integer for the packaging unit weight.",
-djbllwxs: "Please keep the unit price to two decimal places.",
-tzzl050: "Please enter an integer between 0 and 50 for the transfer weight range.",
-
-tHeader: [
-  "Feed Name",
-  "Feed Category",
-  "Unique Code",
-  "Feed Source",
-  "Plan Type",
-  "Allowed Error (kg)",
-  "Package Unit Weight (kg)",
-  "Unit Price",
-  "Jump Weight Range (kg)",
-  "Jump Delay",
-  "Confirm Start",
-  "Relay Position",
-  "Upper Limit",
-  "Reserved Field 01",
-  "Reserved Field 02",
-  "Reserved Field 03",
-],
-tHeader2: [
-  "Feed Name",
-  "Feed Category",
-  "Unique Code",
-  "Feed Source",
-  "Plan Type",
-  "Allowed Error (kg)",
-  "Package Unit Weight (kg)",
-  "Unit Price",
-  "Jump Weight Range (kg)",
-  "Jump Delay",
-  "Confirm Start",
-  "Relay Position",
-  "Upper Limit",
-  "Reserved Field 01",
-  "Reserved Field 02",
-  "Reserved Field 03",
-  "Error Message"
-]
-
-
-}
+  tHeader: [
+    "Feed Name",
+    "Feed Category",
+    "Unique Code",
+    "Feed Source",
+    "Plan Type",
+    "Allowed Error (kg)",
+    "Unit Price",
+    "Jump Weight Range (kg)",
+    "Jump Delay",
+    "Confirm Start",
+    "Upper Limit",
+    "Reserved Field 01",
+    "Reserved Field 02",
+    "Reserved Field 03",
+  ],
+  tHeader2: [
+    "Feed Name",
+    "Feed Category",
+    "Unique Code",
+    "Feed Source",
+    "Plan Type",
+    "Allowed Error (kg)",
+    // "Package Unit Weight (kg)",
+    "Unit Price",
+    "Jump Weight Range (kg)",
+    "Jump Delay",
+    "Confirm Start",
+    // "Relay Position",
+    "Upper Limit",
+    "Reserved Field 01",
+    "Reserved Field 02",
+    "Reserved Field 03",
+    "Error Message",
+  ],
+};

src/lang/en/langModule/feedingEfficiency.js

@@ -1,93 +1,88 @@
-export default{
-  xltj:"Efficiency statistics",
-  nxpg:'Cattle Herd Assessment',
-  pf:"Formulation",
-  pfmb:"Formula Template",
-  sjnts:"Actual head count of cattle",
-  yhll:"Required mixing quantity（kg）",
-  sjhll:"Actual mixing quantity（kg）",
-  sll:"Feed Spreading Quantity（kg）",
-  pjhlsj:"Average mixing tim",
-  ztsll:"Leftover Feed Transfer （kg）",
-  zrsll:"Yesterday's leftover feed quantity（kg）",
-  sll:"Residual Feed Rate(%）",
-  tmrgwz:"TMR DM（%）",
-  pfgwzcsl:"Formulated dry matter intake（kg/head）",
-  sjgwzcsl:"Actual DMI（kg/head）",
-  csl:"Feed Intake Rate（%）",
-  pfllcb:"Formula Theoretical Cost (per head/$)",
-  pfcb:"Formulacost (per head/$)",
-  sjcb:"Actual cost(per head/$)",
-  cnl:"Milk yield（kg/head）",
-  slzhl:"FCR(%)",
-  gjnclcb:"Cost of feed per kilogram of milk",
-  tbcxsj:"Icon Inquiry Time",
-  gwzcsl:"DMI",
-  nlsll:"Cow Barn Leftover Rate",
-  hlsjtj:"Feed Mixing Time Statistics",
-  zhl:"Conversion Rate",
-  cbfx:"Cost Analysis",
-  zhdmb:"Best Template",
-  gjnclcb1:"cost of feed per kilogram of milk($)",
-  cxlb:"Livestock Categories",
-  bzsfx:"PSPS",
+export default {
+  xltj: "Efficiency statistics",
+  nxpg: "Cattle Herd Assessment",
+  pf: "Formulation",
+  pfmb: "Formula Template",
+  sjnts: "Actual head count of cattle",
+  yhll: "Required mixing quantity（kg）",
+  sjhll: "Actual mixing quantity（kg）",
+  sll: "Feed Spreading Quantity（kg）",
+  pjhlsj: "Average mixing tim",
+  ztsll: "Leftover Feed Transfer （kg）",
+  zrsll: "Yesterday's leftover feed quantity（kg）",
+  sll: "Residual Feed Rate(%）",
+  tmrgwz: "TMR DM（%）",
+  pfgwzcsl: "Formulated dry matter intake（kg/head）",
+  sjgwzcsl: "Actual DMI（kg/head）",
+  csl: "Feed Intake Rate（%）",
+  pfllcb: "Formula Theoretical Cost (per head/$)",
+  pfcb: "Formulacost (per head/$)",
+  sjcb: "Actual cost(per head/$)",
+  cnl: "Milk yield（kg/head）",
+  slzhl: "FCR(%)",
+  gjnclcb: "Cost of feed per kilogram of milk",
+  tbcxsj: "Icon Inquiry Time",
+  gwzcsl: "DMI",
+  nlsll: "Cow Barn Leftover Rate",
+  hlsjtj: "Feed Mixing Time Statistics",
+  zhl: "Conversion Rate",
+  cbfx: "Cost Analysis",
+  zhdmb: "Best Template",
+  gjnclcb1: "cost of feed per kilogram of milk($)",
+  cxlb: "Livestock Categories",
+  bzsfx: "PSPS",
 
+  bzs: "Penn State Sieve",
+  dczl1: "First Layer Weight",
+  dcbfb1: "First Layer Percentage",
+  dczl2: "Second Layer Weight",
+  dcbfb2: "Second Layer Percentage",
+  dczl3: "Third Layer Weight",
+  dcbfb3: "Third Layer Percentage",
+  dczl4: "fourh layer percentagth Layer Weight",
+  dcbfb4: "Fourth Layer Percentage”",
+  ckbz: "Reference Standard",
+  fbsfx: "Fecal Screenin",
 
-bzs:"Penn State Sieve",
-dczl1:"First Layer Weight",
-dcbfb1:"First Layer Percentage",
-dczl2:"Second Layer Weight",
-dcbfb2:"Second Layer Percentage",
-dczl3:"Third Layer Weight",
-dcbfb3:"Third Layer Percentage",
-dczl4:"fourh layer percentagth Layer Weight",
-dcbfb4:"Fourth Layer Percentage”",
-ckbz:"Reference Standard",
-fbsfx:"Fecal Screenin",
+  tkpl: "Body Condition Scoring",
+  czybs: "Sample Size for Spot Checks",
+  mrts: "DIM",
+  bzfs: "Standard Score",
+  bfb1: "1 points(Quantity, Percentage)",
+  bfb2: "2 points(Quantity, Percentage)",
+  bfb3: "3 points(Quantity, Percentage)",
+  bfb4: "4 points(Quantity, Percentage）",
+  bfb5: "5 points(Quantity, Percentage)",
+  bfb25: "2.5 point(Quantity, Percentage）",
+  bfb275: "2.75 points(Quantity, Percentage)",
+  bfb3: "3分(Quantity, Percentage)",
+  bfb325: "3.25points(Quantity, Percentage)",
+  bfb35: "3.5 points(Quantity, Percentage)",
+  bfb375: "3.75 points(Quantity, Percentage)",
+  bfb44: "4+ points(Quantity, Percentage)",
 
-tkpl:"Body Condition Scoring",
-czybs:"Sample Size for Spot Checks",
-mrts:"DIM",
-bzfs:"Standard Score",
-bfb1:'1 points(Quantity, Percentage)',
-bfb2:'2 points(Quantity, Percentage)',
-bfb3:'3 points(Quantity, Percentage)',
-bfb4:'4 points(Quantity, Percentage）',
-bfb5:'5 points(Quantity, Percentage)',
-bfb25:'2.5 point(Quantity, Percentage）',
-bfb275:"2.75 points(Quantity, Percentage)",
-bfb325:"3.25points(Quantity, Percentage)",
-bfb35:"3.5 points(Quantity, Percentage)",
-bfb375:"3.75 points(Quantity, Percentage)",
-bfb44:"4+ points(Quantity, Percentage)",
+  fbpf: "Fecal Scoring",
+  dcskff: "Export Time Range",
+  dc: "Yield per Unit",
+  jrsll: "Today's Leftover Material（kg）",
+  mrngwzcl: "Dry Matter Intake (DMI) of Lactating Cows",
+  mc: "Ranch",
+  mrngwzcl1: "Dry Matter Intake (DMI) of Lactating Cows （kg）",
+  sll1: "Leftover Feed Rate",
+  csl1: "Feed Intake（kg）",
+  cnl1: "Milk yield",
+  //
+  fenz: "min",
+  sjfz: "Time (min)",
+  mrncsl: "Lactating Cow Feed Intake",
+  xltj1: "Efficiency Statistics - Formula",
+  xltj2: "Efficiency Statistics - Formula",
+  xltj3: "Efficiency Statistics - Livestock Category",
+  xltj4: "Efficiency Statistics - Shift",
+  xltj5: "Feeding Efficiency - Herd Assessment",
+  fbs: "Fecal Sieve",
 
-fbpf:"Fecal Scoring",
-dcskff:"Export Time Range",
-dc:"Yield per Unit",
-jrsll:"Today's Leftover Material（kg）",
-mrngwzcl:"Dry Matter Intake (DMI) of Lactating Cows",
-mc:"Ranch",
-mrngwzcl1:"Dry Matter Intake (DMI) of Lactating Cows （kg）",
-sll1:"Leftover feed rate",
-csl1:"Feed Intake（kg）",
-cnl1:"Milk yield",
-
-
-//
-fenz:"min",
-sjfz:'Time (min)',
-mrncsl:"Lactating Cow Feed Intake",
-xltj1:"Efficiency Statistics - Formula",
-xltj2:'Efficiency Statistics - Formula',
-xltj3:'Efficiency Statistics - Livestock Category',
-xltj4:'Efficiency Statistics - Shift',
-xltj5:'Feeding Efficiency - Herd Assessment',
-fbs:"Fecal Sieve",
-
-slls:"Leftover Feed",
-slls1:"Feed Spreading Quantity",
+  slls: "Leftover Feed",
   zql: "Accuracy Rate",
-  cnl2:"Milk yield（kg）",
-
-
-  }
+  cnl2: "Milk yield（kg）",
+};

src/lang/en/langModule/formulationEvaluation.js

@@ -1,115 +1,114 @@
-export default{
-  qsrpfmc:"Please enter the formula name",
-  xzls:'Please select the stall',
-  pfmbzb:"Formula Template/Indicator",
-  nts:"head count",
-  tmrl:"TMR Feed",
-  csl:"Feed Intake",
-  cnjn:"Milk production net energy ",
-
-
-   nnnldw:"Dairy Cow Energy Units(NND)",
-   cdb:"Crude Protein(g)",
-   pfl:"Formula Quantity",
-   l:"Phosphorus(g)",
-   cnjndm:"Milk production net energy(MCal/DM)",
-   zf:"Fat(%DM)",
-   df:'Starch(%DM)',
-   dnf:"NDF(%DM)",
-   clzdnf:"Neutral Detergent Fiber (NDF) in Forage(%DM)",
-   adf:'ADF(%DM)',
-   ca:'Calcium(%DM)',
-   lin:"Phosphorus(%DM)",
-   jcb:"Concentrate to Forage Ratio(%)",
-   lszb:"Pens/Indicator",
-   nnxq:"Cows Need",
-   gwz:"Dry Matter(kg)",
-   slzhl:"(4.0)Feed Conversion Efficiency(kg/DM)",
-
-
-   rlcb:"Daily Feed Cost($)",
-   gwzcb:"Cost per Dry Matter($/kg)",
-   rgjncb:"Cost per Kilogram of Milk per Day($)",
-   lssjjl:"History Log Time",
-   pfmbb:"Formula Template Table",
-   pflx:"Formula type",
-   sfqy:"Is Enabled",
-   ly:"source",
-   pfmc:"Formula Name",
-   remark:"note",
-cancel:'Cancel',
-search:'Search',
-add:"Add",
-pfsc:"Formula Upload",
-enter:"Import",
-out:"Export",
-outmb:"Export Template",
-outsj:"Export Data",
-pfjl:"Formula Records",
-xh:"Serial Number",
-pfbm:"Formula code",
-rl:"Bulk Density(kg/m³)",
-pfys:"Formula color",
-
-bbh:'version number',
-nqlb:"Cattle Herd Categories",
-tzzly:"Transition Weight Range(kg)",
-pfbqb:"Formula Detail Table",
-pfmc:"Formula name",
-cclx:"Livestock Category",
-
-del:"Delete",
-hcyhl:"Synthetic Premix",
-ggsx:"Change Order",
-save:'Save',
-slmc:"Feed Name",
-slzmc:"Feed Group Name",
-reset:"Weight",
-reset1:"Weight（KG）",
-jbys:"mixing delay",
-sfsdntbs:"Lock the Head Count Ratio",
-sort:"Order",
-hide:"Hide",
-fd:'Zoom In',
-sx:'Zoom Out',
-jbys:"mixing delay",
-yxyspc:"Allowable Time Delay Tolerance(min)",
-jlqtj:"Stop Before Feeding",
-slz:"feed group",
-bbsj:"Version Time",
-feed:"feed",
-xgsj:"modification time",
-xgyh:"modifying user",
-slmcdw:"Feed Name(kg)",
-slzhl1:"(3.5)Feed Conversion Efficiency(kg/DM)",
-shi:'Yes',
-fou:"No",
-tHeader:['Formula Name', 'Formula Code', 'Livestock Category', 'Formula Type', 'Source', 'Remarks', 'Is Enabled', 'Feed Group', 'Feed Name', 'Weight (kg)', 'Mixing Delay (min)', 'Is the Ratio of Cattle Heads Locked', 'Order'],
-tHeader1:[
-  'Formula Name', 'Livestock Category', 'Formula Type', 'Remarks', 'Feed Group', 'Feed Name', 'Weight (kg)', 'Mixing Delay (min)', 'Is the Ratio of Cattle Heads Locked', 'Error Message'
+export default {
+  qsrpfmc: "Please enter the formula name",
+  xzls: "Please select the stall",
+  pfmbzb: "Formula Template/Indicator",
+  nts: "head count",
+  tmrl: "TMR Feed",
+  csl: "Feed Intake",
+  cnjn: "Milk production net energy(MJ) ",
+
+  nnnldw: "Dairy Cow Energy Units(NND)",
+  cdb: "Crude Protein(g)",
+  pfl: "Formula Quantity",
+  l: "Phosphorus(g)",
+  cnjndm: "Milk production net energy(MCal/DM)",
+  zf: "Fat(%DM)",
+  df: "Starch(%DM)",
+  dnf: "NDF(%DM)",
+  clzdnf: "Neutral Detergent Fiber (NDF) in Forage(%DM)",
+  adf: "ADF(%DM)",
+  ca: "Calcium(%DM)",
+  lin: "Phosphorus(%DM)",
+  jcb: "Concentrate to Forage Ratio(%)",
+  lszb: "Pens/Indicator",
+  nnxq: "Cows Need",
+  gwz: "Dry Matter(kg)",
+  slzhl: "(4.0)Feed Conversion Efficiency(kg/DM)",
+
+  rlcb: "Daily Feed Cost($)",
+  gwzcb: "Cost per Dry Matter($/kg)",
+  rgjncb: "Cost per Kilogram of Milk per Day($)",
+  lssjjl: "History Log Time",
+  pfmbb: "Formula Template Table",
+  pflx: "Formula type",
+  sfqy: "Is Enabled",
+  ly: "source",
+  pfmc: "Formula Name",
+  remark: "note",
+  cancel: "Cancel",
+  search: "Search",
+  add: "Add",
+  pfsc: "Formula Upload",
+  enter: "Import",
+  out: "Export",
+  outmb: "Export Template",
+  outsj: "Export Data",
+  pfjl: "Formula Records",
+  xh: "Serial Number",
+  pfbm: "Formula code",
+  rl: "Bulk Density(kg/m³)",
+  pfys: "Formula color",
+
+  bbh: "version number",
+  nqlb: "Cattle Herd Categories",
+  tzzly: "Transition Weight Range(kg)",
+  pfbqb: "Formula Detail Table",
+  pfmc: "Formula name",
+  cclx: "Livestock Category",
+
+  del: "Delete",
+  hcyhl: "Synthetic Premix",
+  ggsx: "Change Order",
+  save: "Save",
+  slmc: "Feed Name",
+  slzmc: "Feed Group Name",
+  reset: "Weight",
+  reset1: "Weight（KG）",
+  jbys: "mixing delay",
+  sfsdntbs: "Lock the Head Count Ratio",
+  sort: "Order",
+  hide: "Hide",
+  fd: "Zoom In",
+  sx: "Zoom Out",
+  jbys: "mixing delay",
+  yxyspc: "Allowable Time Delay Tolerance(min)",
+  jlqtj: "Stop Before Feeding",
+  slz: "feed group",
+  bbsj: "Version Time",
+  feed: "feed",
+  xgsj: "modification time",
+  xgyh: "modifying user",
+  slmcdw: "Feed Name(kg)",
+  slzhl1: "(3.5)Feed Conversion Efficiency(kg/DM)",
+  shi: "Yes",
+  fou: "No",
+  tHeader: [
+    "Formula Name",
+    "Formula Code",
+    "Livestock Category",
+    "Formula Type",
+    "Source",
+    "Remarks",
+    "Is Enabled",
+    "Feed Group",
+    "Feed Name",
+    "Weight (kg)",
+    "Mixing Delay (min)",
+    "Is the Ratio of Cattle Heads Locked",
+    "Order",
+  ],
+  tHeader1: [
+    "Formula Name",
+    "Livestock Category",
+    "Formula Type",
+    "Remarks",
+    "Feed Group",
+    "Feed Name",
+    "Weight (kg)",
+    "Mixing Delay (min)",
+    "Is the Ratio of Cattle Heads Locked",
+    "Error Message",
   ],
 
-   cdb1:"Crude Protein(%DM)"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
+  cdb1: "Crude Protein(%DM)",
+};

src/lang/zn/langModule/InventoryManagement.js

@@ -1,62 +1,45 @@
-export default{
-  kctj:'库存统计',
-  yltj:"用料分析",
-  jgfx:"价格分析",
- silc:'饲料名称',
-   qc:'期初',
-   qckc:"期初库存（kg）",
-   qcje:"期初金额（元）",
-   yl:"用量",
-   xtckyl:"系统出库重量（kg）",
-   rkylzl:"入库重量（kg）",
-   rgylzl:"人工用料重量（kg）",
-   chzl:"损耗重量（kg）",
-   qm:'期末',
-   qmkc:"期末库存（kg）",
-   qmje:"期末金额（元)",
-   ylfx:"用料分析",
-   tjlx:"统计类型",
-   wc:"误差",
-   sfcfxl:"是否拆分小料",
-   rq:"日期",
-   tmrsbbh:"TMR设备编号",
-   lbxs:"列表显示",
-   tjlx:"统计类型",
-   qhzs:"切换展示",
-   tmrbcc:"TMR班次",
-
-   bcf:"不拆分",
-   cf:"拆分",
-   ll:"理论",
-   sj:"实际",
-
-   multiHeader:[['饲料名称', '期初', '', '用量', '', '', '', '期末', '']],
-   multiHeader2 : [['', '期初库存(kg)', '期初金额(元)', '入库重量(kg)', '系统出库重量(kg)', '人工用料重量(kg)', '损耗重量', '期末库存(kg)', '期末金额(元)']]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
+export default {
+  kctj: "库存统计",
+  yltj: "用料分析",
+  jgfx: "价格分析",
+  silc: "饲料名称",
+  qc: "期初",
+  qckc: "期初库存（kg）",
+  qcje: "期初金额（元）",
+  yl: "用量",
+  xtckyl: "系统出库重量（kg）",
+  rkylzl: "入库重量（kg）",
+  rgylzl: "人工用料重量（kg）",
+  chzl: "损耗重量（kg）",
+  qm: "期末",
+  qmkc: "期末库存（kg）",
+  qmje: "期末金额（元)",
+  ylfx: "用料分析",
+  tjlx: "统计类型",
+  wc: "误差",
+  sfcfxl: "是否拆分小料",
+  rq: "日期",
+  tmrsbbh: "TMR设备编号",
+  lbxs: "列表显示",
+  qhzs: "切换展示",
+  tmrbcc: "TMR班次",
+  bcf: "不拆分",
+  cf: "拆分",
+  ll: "理论",
+  sj: "实际",
+
+  multiHeader: [["饲料名称", "期初", "", "用量", "", "", "", "期末", ""]],
+  multiHeader2: [
+    [
+      "",
+      "期初库存(kg)",
+      "期初金额(元)",
+      "入库重量(kg)",
+      "系统出库重量(kg)",
+      "人工用料重量(kg)",
+      "损耗重量",
+      "期末库存(kg)",
+      "期末金额(元)",
+    ],
+  ],
+};

src/lang/zn/langModule/common.js

@@ -20,8 +20,6 @@ export default {
   deleteSuccess: "删除成功",
   openGuide: "开启新手引导",
   requestMsg: "请求超时",
-  // logoIcon: require('../../../assets/images/logo1.png'),
-  // logoM: require('../../../assets/images/logo_u3.png'),
   logoIcon: require("../../../assets/images/logo-icon.jpg"),
   logoM: require("../../../assets/images/logo-en-m.png"),
   relogo: "重新登陆", //重新登陆
@@ -32,7 +30,6 @@ export default {
   to: "至",
   reset: "重置",
   query: "查询",
-  //
   tableMsg: "给我一点时间",
   noMsg: "暂无数据",
   delMsg: "是否确认删除此信息?",

src/lang/zn/langModule/dashboard.js

@@ -1,105 +1,114 @@
-
 export default {
-  addDashboard: '添加看板',
-  dashboardName: '看板名称',
-  dashboardDesc: '看板描述',
-  addOrEditDashboard: '添加或编辑看板',
-  addChart: '添加图表',
-  shareLink: '分享链接',
-  emptyDashboardTip: '看板空空如也, 去创建新的图表吧!',
-  dashboardNamePlaceholder: '请输入看板名称',
-  dashboardDescPlaceholder: '请输入看板描述.',
-  dashboardList: '看板列表',
-  removeChartConfirm: '确定要把该图表从仪表盘中移除 ?',
-  chartQueryException: '图表：{0} 查询语句异常',
-  deleteConfirm: '确定要删除{0}仪表盘吗？',
-  noMessage:'暂无消息通知',
-  pureBlend:'混合饲料准确率',
-  spreadAc:'撒料准确率',
-  SpreadingCR:'撒料正确率',
-  yestday:'昨日',
-  yestday30:'近30天混料准确率',
-  yestday30S:'近30天撒料正确率',
-  yestday30SD:'近30天撒料偏差',
-  spreadSD:'撒料偏差',
-  mtime:'分钟',
-  todayTps:'今日计划统计',
-  StatisType:"统计类型",
-  typeAll:'全部',
-  Fixed:'固定式',
-  struck:'抛料车',
-  bout:"次",
-  cTrip:"完成车次",
-  pTrip:"计划车次",
-  cWeight:'完成重量',
-  pWeight:"计划重量",
-  rWright:'剩余重量',
-  costSts:'成本统计',
-  Export:'导出',
-  sTable:'切换表格',
-  tripCp:'重量完成率',
-  tripCp1:"车次完成率",
-  tripCpFont:'20',
-  WeightP:'重量完成率',
-  taskT:"任务进度",
-  table:{
-    date:"日期",
-    signOx:'单头牛饲料成本',
-    feedCow:'公斤奶饲料成本(元)',
-    PEWeight:'计划执行重量(kg)',
-    FTWeight:'配方理论重量(kg)',
-    PARate:'计划准确率',
-    PCWeight:"计划取消重量(kg)",
-    PCancelWeight:"计划准确率(去除取消重量)",
-    CNumP:"计划正确数",
-    CNumR:'计划正确率',
-    PNum:"计划数",
+  addDashboard: "添加看板",
+  dashboardName: "看板名称",
+  dashboardDesc: "看板描述",
+  addOrEditDashboard: "添加或编辑看板",
+  addChart: "添加图表",
+  shareLink: "分享链接",
+  emptyDashboardTip: "看板空空如也, 去创建新的图表吧!",
+  dashboardNamePlaceholder: "请输入看板名称",
+  dashboardDescPlaceholder: "请输入看板描述.",
+  dashboardList: "看板列表",
+  removeChartConfirm: "确定要把该图表从仪表盘中移除 ?",
+  chartQueryException: "图表：{0} 查询语句异常",
+  deleteConfirm: "确定要删除{0}仪表盘吗？",
+  noMessage: "暂无消息通知",
+  pureBlend: "混合准确率",
+  spreadAc: "撒料准确率",
+  SpreadingCR: "撒料正确率",
+  yestday: "昨日",
+  yestday30: "近30天混料准确率",
+  yestday30S: "近30天撒料正确率",
+  yestday30zq: "近30天撒料准确率",
+  yestday30SD: "近30天撒料偏差",
+  spreadSD: "撒料偏差",
+  mtime: "分钟",
+  todayTps: "今日计划统计",
+  StatisType: "统计类型",
+  typeAll: "全部",
+  Fixed: "固定式",
+  struck: "抛料车",
+  bout: "次",
+  cTrip: "完成车次",
+  pTrip: "计划车次",
+  cWeight: "完成重量",
+  pWeight: "计划重量",
+  rWright: "剩余重量",
+  costSts: "成本统计",
+  Export: "导出",
+  sTable: "切换表格",
+  tripCp: "重量完成率",
+  tripCp1: "车次完成率",
+  tripCpFont: "20",
+  WeightP: "重量完成率",
+  taskT: "任务进度",
+  table: {
+    date: "日期",
+    signOx: "单头牛饲料成本",
+    feedCow: "公斤奶饲料成本(元)",
+    PEWeight: "计划执行重量(kg)",
+    FTWeight: "配方理论重量(kg)",
+    PARate: "计划准确率",
+    PCWeight: "计划取消重量(kg)",
+    PCancelWeight: "计划准确率(去除取消重量)",
+    CNumP: "计划正确数",
+    CNumR: "计划正确率",
+    PNum: "计划数",
   },
-  feedCow:'公斤奶饲料成本',
-  tHeader:['日期', '单头牛饲料成本', '公斤奶饲料成本（元）'],
-  CostStatistics:'成本统计',
-  feedCows:'公斤奶\n饲料成本（元）',
-  signOxs:'单头牛\n饲料成本（元）',
-  timeTitle:'实时监控',
-  monitMsg:"当前无正在进行中车次",
-  curVeh:"当前车辆",
-  Dweight:'设计重量',
-  AWeight:'实际重量',
-  SWeight:'开始重量',
-  EWight:'结束重量',
-  yWeight:'重量（kg）',
-  xTime:"时间",
-  veh:'车辆',
-  feed:'饲料',
-  fname:'栏舍',
-  remark:"描述",
-  vehWeight:'当前车辆载重',
-  Pweight:"计划重量",
-  compaltRate:"完成度",
-  planSta:"计划统计",
-  cant:'百分比',
-  miruTitle:'泌乳牛干物质采食量',
-  miruMilk:"泌乳牛产奶量",
-  miruCow:"泌乳牛采食量",
-  miruMilk1:"泌乳牛产奶量（kg）",
-  miruCow1:"乳牛干物质采食量（kg）",
-  miruCowMilk:'泌乳牛干\n物质采食量',
-  mixStatic:'混料实际重量统计',
-  stockAlart:"库存预警",
-  stockTable:{
-    num:"序号",
-    feedName:'饲料名称',
-    stockNum:'库存量(Kg)',
-    lastDay:'剩余使用天数',
+  feedCow: "公斤奶饲料成本",
+  tHeader: ["日期", "单头牛饲料成本", "公斤奶饲料成本（元）"],
+  CostStatistics: "成本统计",
+  feedCows: "公斤奶\n饲料成本（元）",
+  signOxs: "单头牛\n饲料成本（元）",
+  timeTitle: "实时监控",
+  monitMsg: "当前无正在进行中车次",
+  curVeh: "当前车辆",
+  Dweight: "设计重量",
+  AWeight: "实际重量",
+  SWeight: "开始重量",
+  EWight: "结束重量",
+  yWeight: "重量（kg）",
+  xTime: "时间",
+  veh: "车辆",
+  feed: "饲料",
+  fname: "栏舍",
+  remark: "描述",
+  vehWeight: "当前车辆载重",
+  Pweight: "计划重量",
+  compaltRate: "完成度",
+  planSta: "计划统计",
+  cant: "百分比",
+  miruTitle: "泌乳牛干物质采食量",
+  miruMilk: "泌乳牛产奶量",
+  miruCow: "泌乳牛采食量",
+  miruMilk1: "泌乳牛产奶量（kg）",
+  miruCow1: "乳牛干物质采食量（kg）",
+  miruCowMilk: "泌乳牛干\n物质采食量",
+  mixStatic: "混料实际重量统计",
+  stockAlart: "库存预警",
+  stockTable: {
+    num: "序号",
+    feedName: "饲料名称",
+    stockNum: "库存量(Kg)",
+    lastDay: "剩余使用天数",
   },
 
-  tHeader1: ['日期', '计划执行重量（kg）', '配方理论重量（kg）', '计划准确率', '计划取消重量（kg）', '计划准确率（去除取消重量）', '计划正确数', '计划数', '计划正确率'],
-  sheetName1: '计划统计',
-
-  tHeader2: ['日期', '泌乳牛采食量（kg）', '泌乳牛产奶量（kg）'],
-  sheetName2: '泌乳牛采食量',
+  tHeader1: [
+    "日期",
+    "计划执行重量（kg）",
+    "配方理论重量（kg）",
+    "计划准确率",
+    "计划取消重量（kg）",
+    "计划准确率（去除取消重量）",
+    "计划正确数",
+    "计划数",
+    "计划正确率",
+  ],
+  sheetName1: "计划统计",
 
-  tHeader3: ['日期', '重量'],
-  sheetName3: '混料实际重量统计'
+  tHeader2: ["日期", "泌乳牛采食量（kg）", "泌乳牛产奶量（kg）"],
+  sheetName2: "泌乳牛采食量",
 
-}
+  tHeader3: ["日期", "重量"],
+  sheetName3: "混料实际重量统计",
+};

src/lang/zn/langModule/defaultParameter.js

@@ -54,7 +54,7 @@ export default {
 
   jhzqlyjz: "计划准确率预警值（%）：",
   slfpzb: "剩料分配占比原混料",
-  pfzqlyjz: "配方名称预警值（%）：",
+  pfzqlyjz: "配方准确预警值（%）：",
   nqzqlyjz: "牛群准确率预警值（%）：",
   cczqlyjz: "车次准确率预警值（%）：",
   hlzdtzzqlyj: "混料自动跳转准确率预警值（%）：",

src/lang/zn/langModule/driver.js

@@ -1,76 +1,53 @@
-export default{
-  drivername:'驾驶员名称',
-  drivercode:'驾驶员编号',
-  enableList: [{ id: 1, name: '是' }, { id: 0,  
-name: '否' }], // 是
-  
-  classname:"TMR设备类型",
-  rl:"容量(m³)",
-  clys:"车辆颜色",
-  sjcjkbh:"数据采集卡编号",
-  tzys:"跳转延时(s)",
-  tzys1:"跳转延时",
-  sjjk:"数据接口",
-  tmrsjjk:"TMR数据接口",
-  zdsb:"指定设备",
-
-  sbcode:"设备编号",
-  sbname:'设备名称',
-  sbtype:"设备类型",
-
-  equipmentTypeList: [{ id: '0', name: '设备' }, { id: '6', name: '推料车' }, { id: '7', name: '推粪车' }],
-
-  scfl:"牲畜父类",
-  scflcode:"牲畜类别编号",
-  scftype:"牲畜类别",
-  sclbfl:"牲畜类别父类",
-
-
-  lsmc:"栏舍名称",
-  lsbh:"栏舍编号",
-  xzsstj:"请点击选择搜索条件",
-  yxwcs:"允许误差数（kg）",
-  tzzly:"跳转重量域",
-  tzys:"跳转延时",
-  hqspanccode:"获取SAP编码",
-  hqudls:"获取UD栏舍",
-  qrks:"确认开始",
-  udcode:"ud编码",
-  udname:"ud名称",
-
-  messageNote:"当前内容未保存，请点击取消或保存继续进行操作",
-  message1:'栏舍名称/栏舍编号/牛舍类型/牛群不能为空',
-  message2:"栏舍名称不能为空 ",
-  message3:"栏舍编号不能为空 ",
+export default {
+  drivername: "驾驶员名称",
+  drivercode: "驾驶员编号",
+  enableList: [
+    { id: 1, name: "是" },
+    { id: 0, name: "否" },
+  ], // 是
+
+  classname: "TMR设备类型",
+  rl: "容量(m³)",
+  clys: "车辆颜色",
+  sjcjkbh: "数据采集卡编号",
+  tzys1: "跳转延时(s)",
+  tzys: "跳转延时",
+  sjjk: "数据接口",
+  tmrsjjk: "TMR数据接口",
+  zdsb: "指定设备",
+
+  sbcode: "设备编号",
+  sbname: "设备名称",
+  sbtype: "设备类型",
+
+  equipmentTypeList: [
+    { id: "0", name: "设备" },
+    { id: "6", name: "推料车" },
+    { id: "7", name: "推粪车" },
+  ],
+
+  scfl: "牲畜父类",
+  scflcode: "牲畜类别编号",
+  scftype: "牲畜类别",
+  sclbfl: "牲畜类别父类",
+
+  lsmc: "栏舍名称",
+  lsbh: "栏舍编号",
+  xzsstj: "请点击选择搜索条件",
+  yxwcs: "允许误差数（kg）",
+  tzzly: "跳转重量域(kg)",
+  hqspanccode: "获取SAP编码",
+  hqudls: "获取UD栏舍",
+  qrks: "确认开始",
+  udcode: "ud编码",
+  udname: "ud名称",
+
+  messageNote: "当前内容未保存，请点击取消或保存继续进行操作",
+  message1: "栏舍名称/栏舍编号/牛舍类型/牛群不能为空",
+  message2: "栏舍名称不能为空 ",
+  message3: "栏舍编号不能为空 ",
   //
-  qxzjsyxx:"请选择驾驶员信息",
-  saveFail: '保存失败',
-  saveSuccess:"保存成功"
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
+  qxzjsyxx: "请选择驾驶员信息",
+  saveFail: "保存失败",
+  saveSuccess: "保存成功",
+};

src/lang/zn/langModule/errorAnalysis.js

@@ -125,7 +125,7 @@ export default {
   hlzql: "混料正确率",
   slwcz: "撒料误差值",
   slzql: "撒料准确率",
-  hlsj: "'混料时间'",
+  hlsj: "混料时间",
   hztjjsy: "汇总统计—驾驶员",
   hztjpfmc: "汇总统计—配方名称",
   hztjwfl: "汇总统计-无分类",

src/lang/zn/langModule/feedChart.js

@@ -1,103 +1,97 @@
-export default{
-   sldl:"饲料大类",
-   slflmc:"饲料分类",
-   slflbh:"饲料分类编号",
-   sldlflbh:'饲料大类/饲料分类/饲料分类编号不能为空',
-   slflbh:"饲料分类/饲料分类编号不能为空",
-   sldlno:"饲料大类不能为空",
-   slflno:"饲料分类不能为空",
-   slbhno:"饲料分类编号不能为空",
-   slfltszi:"不可输入特殊字符",
-   slflxx:"请选择饲料分类信息",
-
-   sllb:"饲料类别",
-   slly:"饲料来源",
-   sz:"设置",
-   slk:"饲料库",
-   hqudsl:"获取UD饲料",
-   wllx:"物料类型",
-   wybm:"唯一编码",
-   slly:"饲料来源",
-   yxwcs:"允许误差数(kg)",
-   bzdwzl:"包装单位重量(kg)",
-   dj:"单价",
-   jdq:"继电器位置",
-   wsy:"无上域",
-   byzd:"备用字段",
-   byzd1:"备用字段01",
-   byzd2:"备用字段02",
-   byzd3:"备用字段03",
-    yes:"是",
-    no:"否",
-    yyjz:"营养价值",
-    gl:"关联",
-    jcxx:"基础信息",
-    slmc:"饲料名称",
-    jhlx:"计划类型",
-    spalh:"SAP货位",
-    spabm:"SAP编码：",
-    jbcs:"搅拌参数",
-    tzzly:"跳转重量域（kg）：",
-    tzys:"跳转延时：",
-    qrks:"确认开始：",
-    sfqy:"是否启用",
-    xkc:"小料秤",
-    zgslh:"中国饲料号",
-    price:"价格",
-    ypsm:"样品说明",
-    wgz:"干物质(DM%)",
-    cdb:"粗蛋白(CP%DM)",
-    gai:"钙(Ca%DM)",
-    lin:"磷(P%DM)",
-    cnjn:"产奶净能(%DM)",
-    chf:"粗灰分(Ash%)",
-    cl:"粗料",
-    glzt:"关联状态",
-    df:"淀粉（%DM",
-    zf:"脂肪（%DM）",
-    qxgl:"取消关联",
-
-    //
-    tHeader: [
-      '饲料名称', '饲料分类', '唯一编码',  '饲料来源', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03'
-    ],
-    tHeader2: [
-      '饲料名称', '饲料分类', '唯一编码', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03', '错误信息'
-    ],
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
+export default {
+  sldl: "饲料大类",
+  slflmc: "饲料分类",
+  slflbh: "饲料分类编号",
+  sldlflbh: "饲料大类/饲料分类/饲料分类编号不能为空",
+  slflbh1: "饲料分类/饲料分类编号不能为空",
+  sldlno: "饲料大类不能为空",
+  slflno: "饲料分类不能为空",
+  slbhno: "饲料分类编号不能为空",
+  slfltszi: "不可输入特殊字符",
+  slflxx: "请选择饲料分类信息",
+
+  sllb: "饲料类别",
+  slly: "饲料来源",
+  sz: "设置",
+  slk: "饲料库",
+  hqudsl: "获取UD饲料",
+  wllx: "物料类型",
+  wybm: "唯一编码",
+  slly: "饲料来源",
+  yxwcs: "允许误差数(kg)",
+  bzdwzl: "包装单位重量(kg)",
+  dj: "单价",
+  jdq: "继电器位置",
+  wsy: "无上域",
+  byzd: "备用字段",
+  byzd1: "备用字段01",
+  byzd2: "备用字段02",
+  byzd3: "备用字段03",
+  yes: "是",
+  no: "否",
+  yyjz: "营养价值",
+  gl: "关联",
+  jcxx: "基础信息",
+  slmc: "饲料名称",
+  jhlx: "计划类型",
+  spalh: "SAP货位",
+  spabm: "SAP编码：",
+  jbcs: "搅拌参数",
+  tzzly: "跳转重量域（kg）：",
+  tzys: "跳转延时：",
+  qrks: "确认开始：",
+  sfqy: "是否启用",
+  xkc: "小料秤",
+  zgslh: "中国饲料号",
+  price: "价格",
+  ypsm: "样品说明",
+  wgz: "干物质(DM%)",
+  cdb: "粗蛋白(CP%DM)",
+  gai: "钙(Ca%DM)",
+  lin: "磷(P%DM)",
+  cnjn: "产奶净能(%DM)",
+  chf: "粗灰分(Ash%)",
+  cl: "粗料",
+  glzt: "关联状态",
+  df: "淀粉（%DM",
+  zf: "脂肪（%DM）",
+  qxgl: "取消关联",
+  jinyong: "禁用",
+  wu: "无",
+
+  tHeader: [
+    "饲料名称",
+    "饲料分类",
+    "唯一编码",
+    "饲料来源",
+    "计划类型",
+    "允许误差数（kg）",
+    "单价",
+    "跳转重量域(kg)",
+    "跳转延时",
+    "确认开始",
+    "无上域",
+    "备用字段01",
+    "备用字段02",
+    "备用字段03",
+  ],
+
+  tHeader2: [
+    "饲料名称",
+    "饲料分类",
+    "唯一编码",
+    "计划类型",
+    "允许误差数（kg）",
+    // "包装单位重量(kg)",
+    "单价",
+    "跳转重量域(kg)",
+    "跳转延时",
+    "确认开始",
+    // "继电器位置",
+    "无上域",
+    "备用字段01",
+    "备用字段02",
+    "备用字段03",
+    "错误信息",
+  ],
+};

src/lang/zn/langModule/feedingEfficiency.js

@@ -1,92 +1,88 @@
-export default{
-xltj:"效率统计",
-nxpg:'牛群评估',
-pf:"配方",
-pfmb:"配方模版",
-sjnts:"实际牛头数",
-yhll:"应混料量（kg）",
-sjhll:"实际混料量（kg）",
-slls1:"撒料量（kg）",
-pjhlsj:"平均混料时间",
-ztsll:"转投剩料量（kg）",
-zrsll:"昨日剩料量（kg）",
-sll:"剩料率（%）",
-tmrgwz:"TMR干物质（%）",
-pfgwzcsl:"配方干物质采食量（kg/头）",
-sjgwzcsl:"实际干物质采食量（kg/头）",
-csl:"采食率（%）",
-pfllcb:"配方理论成本",
-pfcb:"配方成本(元/头)",
-sjcb:"实际成本(元/头)",
-cnl:"产奶量（kg/头）",
-slzhl:"饲料转化率(%)",
-gjnclcb:"公斤奶饲料成本",
-tbcxsj:"图表查询时间",
-gwzcsl:"干物质采食量",
-nlsll:"牛栏剩料率",
-hlsjtj:"混料时间统计",
-zhl:"转化率",
-cbfx:"成本分析",
-zhdmb:"最好的模版",
-gjnclcb1:"公斤奶饲料成本(元)",
-cxlb:"牲畜类别",
-bzsfx:"宾州筛分析",
+export default {
+  xltj: "效率统计",
+  nxpg: "牛群评估",
+  pf: "配方",
+  pfmb: "配方模版",
+  sjnts: "实际牛头数",
+  yhll: "应混料量（kg）",
+  sjhll: "实际混料量（kg）",
+  slls1: "撒料量（kg）",
+  pjhlsj: "平均混料时间",
+  ztsll: "转投剩料量（kg）",
+  zrsll: "昨日剩料量（kg）",
+  sll: "剩料率（%）",
+  tmrgwz: "TMR干物质（%）",
+  pfgwzcsl: "配方干物质采食量（kg/头）",
+  sjgwzcsl: "实际干物质采食量（kg/头）",
+  csl: "采食率（%）",
+  pfllcb: "配方理论成本",
+  pfcb: "配方成本(元/头)",
+  sjcb: "实际成本(元/头)",
+  cnl: "产奶量（kg/头）",
+  slzhl: "饲料转化率(%)",
+  gjnclcb: "公斤奶饲料成本",
+  tbcxsj: "图表查询时间",
+  gwzcsl: "干物质采食量",
+  nlsll: "牛栏剩料率",
+  hlsjtj: "混料时间统计",
+  zhl: "转化率",
+  cbfx: "成本分析",
+  zhdmb: "最好的模版",
+  gjnclcb1: "公斤奶饲料成本(元)",
+  cxlb: "牲畜类别",
+  bzsfx: "宾州筛分析",
 
-bzs:"宾州筛",
-dczl1:"第一层重量",
-dcbfb1:"第一层百分比",
-dczl2:"第二层重量",
-dcbfb2:"第二层百分比",
-dczl3:"第三层重量",
-dcbfb3:"第三层百分比",
-dczl4:"第四层重量",
-dcbfb4:"第四层百分比",
-ckbz:"参考标准",
-fbsfx:"粪便筛分析",
+  bzs: "宾州筛",
+  dczl1: "第一层重量",
+  dcbfb1: "第一层百分比",
+  dczl2: "第二层重量",
+  dcbfb2: "第二层百分比",
+  dczl3: "第三层重量",
+  dcbfb3: "第三层百分比",
+  dczl4: "第四层重量",
+  dcbfb4: "第四层百分比",
+  ckbz: "参考标准",
+  fbsfx: "粪便筛分析",
 
-tkpl:"体况评分",
-czybs:"抽查样本数",
-mrts:"泌乳天数",
-bzfs:"标准分数",
-bfb1:'1分（数量、百分比）',
-bfb2:'2分（数量、百分比）',
-bfb3:'3分（数量、百分比）',
-bfb4:'4分（数量、百分比）',
-bfb5:'5分（数量、百分比）',
-bfb25:'2.5-分（数量、百分比）',
-bfb275:"2.75分（数量、百分比)",
-bfb3:"3分（数量、百分比）",
-bfb325:"3.25分（数量、百分比）",
-bfb35:"3.5分（数量、百分比）",
-bfb375:"3.75分（数量、百分比）",
-bfb44:"4+分（数量、百分比）",
+  tkpl: "体况评分",
+  czybs: "抽查样本数",
+  mrts: "泌乳天数",
+  bzfs: "标准分数",
+  bfb1: "1分（数量、百分比）",
+  bfb2: "2分（数量、百分比）",
+  bfb3: "3分（数量、百分比）",
+  bfb4: "4分（数量、百分比）",
+  bfb5: "5分（数量、百分比）",
+  bfb25: "2.5-分（数量、百分比）",
+  bfb275: "2.75分（数量、百分比)",
+  bfb3: "3分（数量、百分比）",
+  bfb325: "3.25分（数量、百分比）",
+  bfb35: "3.5分（数量、百分比）",
+  bfb375: "3.75分（数量、百分比）",
+  bfb44: "4+分（数量、百分比）",
 
-fbpf:"粪便评分",
-dcskff:"导出时间范围",
-dc:"单产",
-jrsll:"今日剩料量（kg）",
-mrngwzcl:"泌乳牛干物质采食量",
-mc:"牧场",
-mrngwzcl1:"泌乳牛干物质采食量 （kg）",
-sll1:"剩料率",
-csl1:"采食量（kg）",
-cnl1:"产奶量",
-//
-fenz:"分钟",
-sjfz:'时间(分钟)',
-mrncsl:"泌乳牛采食量",
-xltj1:"效率统计-配方",
-xltj2:'效率统计-栏舍',
-xltj3:'效率统计-牲畜类别',
-xltj4:'效率统计-班次',
-xltj5:'饲喂效率—牛群评估',
-fbs:"粪便筛",
-
-slls:"剩料量",
-slls1:"撒料量", // “Leftover Feed” 剩料量
-//“Feed Spreading Quantity” 撒料量
+  fbpf: "粪便评分",
+  dcskff: "导出时间范围",
+  dc: "单产",
+  jrsll: "今日剩料量（kg）",
+  mrngwzcl: "泌乳牛干物质采食量",
+  mc: "牧场",
+  mrngwzcl1: "泌乳牛干物质采食量 （kg）",
+  sll1: "剩料率",
+  csl1: "采食量（kg）",
+  cnl1: "产奶量",
+  //
+  fenz: "分钟",
+  sjfz: "时间(分钟)",
+  mrncsl: "泌乳牛采食量",
+  xltj1: "效率统计-配方",
+  xltj2: "效率统计-栏舍",
+  xltj3: "效率统计-牲畜类别",
+  xltj4: "效率统计-班次",
+  xltj5: "饲喂效率—牛群评估",
+  fbs: "粪便筛",
 
+  slls: "剩料量",
   zql: "准确率",
-cnl2:'产奶量（kg）'
-
-}
+  cnl2: "产奶量（kg）",
+};

src/lang/zn/langModule/premixedPlan.js

@@ -1,79 +1,67 @@
-export default{
+export default {
+  xzcc: "新增车次",
+  jscc: "减少车次",
+  sx: "生效",
+  jy1: "禁用",
+  tmrbh: "TMR编号",
+  sljhccgs: "撒料计划车次跟随:",
+  zdjbl: "最大搅拌量(KG)",
+  hlzl: "混料重量",
+  fljhcsgs: "发料计划车次跟随",
+  time: "时间",
 
-xzcc:"新增车次",
-jscc:"减少车次",
-sx:"生效",
-jy1:"禁用",
-tmrbh:"TMR编号",
-sljhccgs:"撒料计划车次跟随:",
-zdjbl:"最大搅拌量(KG)",
-hlzl:"混料重量",
-fljhcsgs:"发料计划车次跟随",
-time:"时间:",
+  jy: "校验",
+  zdsc: "自动生成",
+  save: "保存",
+  qkyfls: "清空已分配栏舍",
+  bc: "班次",
+  lsjl: "历史记录",
+  ms: "描述",
+  zdzl: "最大重量",
+  hjzl: "合计重量",
+  pfmb: "模板配方",
+  wlxq: "物料详情",
+  xq: "详情",
+  sftqcfxl: "是否提前小料拆分",
+  rlzt: "容量状态",
+  sl: "撒料",
+  lsqc: "栏舍全称",
+  slzl: "饲料重量",
+  slc: "撒料车",
+  qxzzdscfa1: "请选择自动生成方式",
+  qxzzdscfa2: "清空计划并生成新计划",
+  qxzzdscfa3: "当前计划基础上继续生成计划",
+  jxsc: "继续生成",
+  cxsc: "重新生成",
+  weight: "重量",
+  zb: "占比",
+  wl: "物料",
+  fpsl: "分配撒料",
+  clrj: "车辆容积量",
+  rjl: "容积量",
+  qk: "清空",
+  tlc: "推料车",
+  status: "状态",
+  ls: "栏舍",
+  clbm: "车辆编码",
+  tljh: "推料计划",
 
-jy:"校验",
-zdsc:"自动生成",
-save:"保存",
-qkyfls:"清空已分配栏舍",
-bc:"班次",
-lsjl:"历史记录",
-ms:"描述",
-zdzl:"最大重量",
-hjzl:"合计重量",
-pfmb:"模板配方",
-wlxq:"物料详情",
-xq:"详情",
-sftqcfxl:"是否提前小料拆分",
-rlzt:"容量状态",
-sl:"撒料",
-lsqc:"栏舍全称",
-slzl:"饲料重量",
-slc:"撒料车",
-qxzzdscfa1:'请选择自动生成方式',
-qxzzdscfa2:"清空计划并生成新计划",
-qxzzdscfa3:"当前计划基础上继续生成计划",
-jxsc:"继续生成",
-cxsc:"重新生成",
-weight:"重量",
-zb:"占比",
-wl:"物料",
-fpsl:"分配撒料",
-clrj:"车辆容积量",
-rjl:"容积量",
-qk:"清空",
-tlc:"推料车",
-status:'状态',
-ls:"栏舍",
-clbm:"车辆编码",
-tljh:"推料计划",
+  jscc: "减少车次",
+  slclfs: "剩料处理方式",
+  ztls: "转投栏舍",
+  cci: "车次:",
+  lsname: "栏舍名称:",
 
-jscc:"减少车次",
-slclfs:"剩料处理方式",
-ztls:"转投栏舍",
-cci:"车次:",
-lsname:"栏舍名称:",
-
-fuzhi:'复制',
-taici:"胎次",
-pjmrts:"平均泌乳天数",
-hyts:"怀孕天数",
-cnl:"产奶量(kg/头)",
-jlr:"记录人",
-sxsj:"生效时间",
-sxrq:"生效日期",
-jlr:"记录人：",
-lsxx:"栏舍信息",
-sxlb:"牲畜类别：",
-nts:"牛头数：",
-
-
-
-
-
-
-
-
-
-
-
-}
+  fuzhi: "复制",
+  taici: "胎次",
+  pjmrts: "平均泌乳天数",
+  hyts: "怀孕天数",
+  cnl: "产奶量(kg/头)",
+  jlr: "记录人",
+  sxsj: "生效时间",
+  sxrq: "生效日期",
+  jlr: "记录人：",
+  lsxx: "栏舍信息",
+  sxlb: "牲畜类别：",
+  nts: "牛头数：",
+};

src/views/basicData/defaultParameter/earlyWarning/index.vue

@@ -244,7 +244,7 @@
         class="save"
         :disabled="isokDisable"
         @click="handleSave"
-        >{{ $t('formulationEvaluation.save') }}</el-button
+        >{{ $t("formulationEvaluation.save") }}</el-button
       >
       <el-button
         v-if="isRoleEdit"
@@ -252,7 +252,7 @@
         :disabled="isokDisable"
         @click="handleRecovery"
       >
-        {{ $t('defaultParameter.hfmr') }}</el-button
+        {{ $t("defaultParameter.hfmr") }}</el-button
       >
     </div>
     <el-dialog
@@ -264,41 +264,41 @@
     >
       <div class="app-description dialogMinHeight">
         <div class="content">
-          {{ $t('defaultParameter.emsg1') }}
+          {{ $t("defaultParameter.emsg1") }}
           <br />
 
-          {{ $t('defaultParameter.emsg2') }}
+          {{ $t("defaultParameter.emsg2") }}
           <br />
-          {{ $t('defaultParameter.emsg3') }}
+          {{ $t("defaultParameter.emsg3") }}
           <br />
-          {{ $t('defaultParameter.emsg4') }}
+          {{ $t("defaultParameter.emsg4") }}
           <br />
-          {{ $t('defaultParameter.emsg5') }}
+          {{ $t("defaultParameter.emsg5") }}
           <br />
-          {{ $t('defaultParameter.emsg6') }}
+          {{ $t("defaultParameter.emsg6") }}
           <br />
-          {{ $t('defaultParameter.emsg7') }}
+          {{ $t("defaultParameter.emsg7") }}
           <br />
-          {{ $t('defaultParameter.emsg8') }}
+          {{ $t("defaultParameter.emsg8") }}
           <br />
-          {{ $t('defaultParameter.emsg9') }}
+          {{ $t("defaultParameter.emsg9") }}
           <br />
-          {{ $t('defaultParameter.emsg10') }}
+          {{ $t("defaultParameter.emsg10") }}
           <br />
-          {{ $t('defaultParameter.emsg11') }}
+          {{ $t("defaultParameter.emsg11") }}
           <br />
-          {{ $t('defaultParameter.emsg12') }}
+          {{ $t("defaultParameter.emsg12") }}
           <br />
-          {{ $t('defaultParameter.emsg13') }}
+          {{ $t("defaultParameter.emsg13") }}
           <br />
-          {{ $t('defaultParameter.emsg14') }}
+          {{ $t("defaultParameter.emsg14") }}
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button
           class="cancelClose"
           @click="description.dialogFormVisible = false"
-          >{{ $t('common.closed') }}</el-button
+          >{{ $t("common.closed") }}</el-button
         >
       </div>
     </el-dialog>
@@ -312,82 +312,82 @@ import {
   GetDataByNames,
   failproccess,
   checkButtons,
-  ExecDataByConfig
-} from '@/api/common'
-import Cookies from 'js-cookie'
-import { MessageBox } from 'element-ui'
+  ExecDataByConfig,
+} from "@/api/common";
+import Cookies from "js-cookie";
+import { MessageBox } from "element-ui";
 export default {
-  name: 'DefaultParameter',
+  name: "DefaultParameter",
   data() {
     return {
       isRoleEdit: [],
       planBeforeDayList: [
-        { id: '1', name: this.$t('supplier.yes') },
-        { id: '0', name: this.$t('supplier.no') }
+        { id: "1", name: this.$t("supplier.yes") },
+        { id: "0", name: this.$t("supplier.no") },
       ], // 是否可取前一天计划
       planNextDayList: [
-        { id: '1', name: this.$t('supplier.yes') },
-        { id: '0', name: this.$t('supplier.no') }
+        { id: "1", name: this.$t("supplier.yes") },
+        { id: "0", name: this.$t("supplier.no") },
       ], // 是否可取后一天计划
       isSupplementList: [
-        { id: '1', name: this.$t('supplier.yes') },
-        { id: '0', name: this.$t('supplier.no') }
+        { id: "1", name: this.$t("supplier.yes") },
+        { id: "0", name: this.$t("supplier.no") },
       ], // 是否启用补料
       isLeftoverMaterialList: [
-        { id: '1', name: this.$t('supplier.yes') },
-        { id: '0', name: this.$t('supplier.no') }
+        { id: "1", name: this.$t("supplier.yes") },
+        { id: "0", name: this.$t("supplier.no") },
       ], // 是否启用剩料
       decimalPlacesList: [
-        { id: '0', name: this.$t('supplier.zs') },
-        { id: '1', name: this.$t('supplier.xs1') },
-        { id: '2', name: this.$t('supplier.xs2') },
-        { id: '3', name: this.$t('supplier.xs3') }
+        { id: "0", name: this.$t("supplier.zs") },
+        { id: "1", name: this.$t("supplier.xs1") },
+        { id: "2", name: this.$t("supplier.xs2") },
+        { id: "3", name: this.$t("supplier.xs3") },
       ], // 日计划报表小数点位数
       isLockBullsList: [
-        { id: '1', name: this.$t('supplier.yes') },
-        { id: '0', name: this.$t('supplier.no') }
+        { id: "1", name: this.$t("supplier.yes") },
+        { id: "0", name: this.$t("supplier.no") },
       ], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
       waterConditioningList: [
-        { id: '0', name: this.$t('defaultParameter.qz') },
-        { id: '1', name: this.$t('defaultParameter.bcl') },
-        { id: '2', name: this.$t('defaultParameter.bcl') }
+        { id: "0", name: this.$t("defaultParameter.qz") },
+        { id: "1", name: this.$t("defaultParameter.bcl") },
+        { id: "2", name: this.$t("defaultParameter.bcl") },
       ], // 水分调节选项
       priceCalculationList: [
-        { id: '1', name: this.$t('supplier.yes') },
-        { id: '0', name: this.$t('supplier.no') }
+        { id: "1", name: this.$t("supplier.yes") },
+        { id: "0", name: this.$t("supplier.no") },
       ], // 是否启用库存管理
       numberList: [
-        { id: '0', name: '1' },
-        { id: '1', name: '2' },
-        { id: '2', name: '3' },
-        { id: '3', name: '4' }
+        { id: "0", name: "1" },
+        { id: "1", name: "2" },
+        { id: "2", name: "3" },
+        { id: "3", name: "4" },
       ], // 班次数量
       feedontractList: [
-        { id: '1', name: this.$t('supplier.yes') },
-        { id: '0', name: this.$t('supplier.no') }
+        { id: "1", name: this.$t("supplier.yes") },
+        { id: "0", name: this.$t("supplier.no") },
       ], // 是否启用饲料合同
       leftoverMaterialList: [
-        { id: '0', name: this.$t('supplier.defb') },
-        { id: '1', name: this.$t('supplier.slfb') }
+        { id: "0", name: this.$t("supplier.defb") },
+        { id: "1", name: this.$t("supplier.slfb") },
       ],
       requestParams: [
         {
-          name: 'getRemainFeedList',
+          name: "getRemainFeedList",
           offset: 0,
           pagecount: 0,
-          parammaps: { pastureid: Cookies.get('pastureid') }
-        }
+          parammaps: { pastureid: Cookies.get("pastureid") },
+        },
       ],
       getdataListParm: {
-        name: 'getysoptList',
+        name: "getysoptList",
         page: 1,
         offset: 1,
         pagecount: 10,
-        returntype: 'Map',
+        returntype: "Map",
         parammaps: {
-          pastureid: Cookies.get('pastureid')
-        }
+          pastureid: Cookies.get("pastureid"),
+        },
       },
       tableKey: 0,
       listLoading: true,
@@ -396,59 +396,59 @@ export default {
       isokDisable: false,
       description: {
         dialogFormVisible: false,
-        dialogStatus: ''
+        dialogStatus: "",
       },
       textMap: {
-        description: this.$t('supplier.cssm')
+        description: this.$t("supplier.cssm"),
       },
-      requestParam: {}
-    }
+      requestParam: {},
+    };
   },
   created() {
-    this.getList()
-    this.getButtons()
-    this.getDownList()
+    this.getList();
+    this.getButtons();
+    this.getDownList();
   },
 
   methods: {
     getButtons() {
-      const Edit = 'DefaultParameter'
+      const Edit = "DefaultParameter";
       const isRoleEdit = checkButtons(
-        JSON.parse(sessionStorage.getItem('buttons')),
+        JSON.parse(sessionStorage.getItem("buttons")),
         Edit
-      )
-      this.isRoleEdit = isRoleEdit
+      );
+      this.isRoleEdit = isRoleEdit;
     },
     getDownList() {
       GetDataByNames(this.requestParams).then((response) => {
-        this.disposalList = response.data.getRemainFeedList.list
-      })
+        this.disposalList = response.data.getRemainFeedList.list;
+      });
     },
     getList() {
-      this.listLoading = true
+      this.listLoading = true;
       GetDataByName(this.getdataListParm).then((response) => {
-        console.log('table1数据', response.data.list)
+        console.log("table1数据", response.data.list);
         if (response.data.list !== null) {
-          this.createTemp = response.data.list[0]
+          this.createTemp = response.data.list[0];
         } else {
-          this.list = []
+          this.list = [];
         }
         setTimeout(() => {
-          this.listLoading = false
-        }, 100)
-      })
+          this.listLoading = false;
+        }, 100);
+      });
     },
     handleSave() {
-      console.log('点击了保存')
-      this.isokDisable = true
+      console.log("点击了保存");
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.requestParam.common = { returnmap: '0' }
-      this.requestParam.data = []
+        this.isokDisable = false;
+      }, 1000);
+      this.requestParam.common = { returnmap: "0" };
+      this.requestParam.data = [];
       this.requestParam.data[0] = {
-        name: 'updatesysopt',
-        type: 'e',
+        name: "updatesysopt",
+        type: "e",
         parammaps: {
           pastureid: this.createTemp.pastureid,
           isGetLastPlan: this.createTemp.isGetLastPlan,
@@ -466,92 +466,92 @@ export default {
           times: this.createTemp.times,
           isEnableContract: this.createTemp.isEnableContract,
           remainOptDis: this.createTemp.remainOptDis,
-          remainOptRate: this.createTemp.remainOptRate
-        }
-      }
+          remainOptRate: this.createTemp.remainOptRate,
+        },
+      };
       this.requestParam.data[1] = {
-        name: 'updateFPbyFTChangeALL',
-        type: 'e',
+        name: "updateFPbyFTChangeALL",
+        type: "e",
         parammaps: {
-          pastureid: this.createTemp.pastureid
-        }
-      }
+          pastureid: this.createTemp.pastureid,
+        },
+      };
 
       ExecDataByConfig(this.requestParam).then((response) => {
-        console.log('保存发送参数', this.requestParam)
-        if (response.msg !== 'fail') {
+        console.log("保存发送参数", this.requestParam);
+        if (response.msg !== "fail") {
           this.$notify({
-            title: this.$t('common.succes'),
-            message: this.$t('driver.saveSuccess'),
-            type: 'success',
-            duration: 2000
-          })
-          this.getList()
+            title: this.$t("common.succes"),
+            message: this.$t("driver.saveSuccess"),
+            type: "success",
+            duration: 2000,
+          });
+          this.getList();
         } else {
           this.$notify({
-            title: this.$t('driver.saveFail'),
+            title: this.$t("driver.saveFail"),
             message: response.data,
-            type: 'warning',
-            duration: 2000
-          })
+            type: "warning",
+            duration: 2000,
+          });
         }
-      })
+      });
     },
     handleRecovery() {
-      console.log('点击了恢复默认')
-      this.isokDisable = true
+      console.log("点击了恢复默认");
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      MessageBox.confirm(this.$t('defaultParameter.config'), {
-        confirmButtonText: this.$t('common.confirm'),
-        cancelButtonText: this.$t('common.cancel'),
-        type: 'warning'
+        this.isokDisable = false;
+      }, 1000);
+      MessageBox.confirm(this.$t("defaultParameter.config"), {
+        confirmButtonText: this.$t("common.confirm"),
+        cancelButtonText: this.$t("common.cancel"),
+        type: "warning",
       }).then(() => {
-        this.requestParam.common = { returnmap: '0' }
-        this.requestParam.data = []
+        this.requestParam.common = { returnmap: "0" };
+        this.requestParam.data = [];
         this.requestParam.data[0] = {
-          name: 'updatesysoptinit',
-          type: 'e',
+          name: "updatesysoptinit",
+          type: "e",
           parammaps: {
-            pastureid: this.createTemp.pastureid
-          }
-        }
+            pastureid: this.createTemp.pastureid,
+          },
+        };
         this.requestParam.data[1] = {
-          name: 'updateFPbyFTChangeALL',
-          type: 'e',
+          name: "updateFPbyFTChangeALL",
+          type: "e",
           parammaps: {
-            pastureid: this.createTemp.pastureid
-          }
-        }
+            pastureid: this.createTemp.pastureid,
+          },
+        };
 
         ExecDataByConfig(this.requestParam).then((response) => {
-          console.log('保存发送参数', this.requestParam)
-          if (response.msg !== 'fail') {
+          console.log("保存发送参数", this.requestParam);
+          if (response.msg !== "fail") {
             this.$notify({
-              title: this.$t('common.succes'),
-              message: this.$t('driver.saveSuccess'),
-              type: 'success',
-              duration: 2000
-            })
-            this.getList()
+              title: this.$t("common.succes"),
+              message: this.$t("driver.saveSuccess"),
+              type: "success",
+              duration: 2000,
+            });
+            this.getList();
           } else {
             this.$notify({
-              title: this.$t('driver.saveFail'),
+              title: this.$t("driver.saveFail"),
               message: response.data,
-              type: 'warning',
-              duration: 2000
-            })
+              type: "warning",
+              duration: 2000,
+            });
           }
-        })
-      })
+        });
+      });
     },
     handleDescription() {
-      this.description.dialogStatus = 'description'
-      this.description.dialogFormVisible = true
-    }
-  }
-}
+      this.description.dialogStatus = "description";
+      this.description.dialogFormVisible = true;
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .app-description {

src/views/basicData/groupColumn/index.vue

@@ -1,45 +1,162 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-input v-model="table.getdataListParm.parammaps.bname" :placeholder="$t('driver.lsmc')" style="width: 180px;" class="filter-item" clearable />
-      <el-input v-model="table.getdataListParm.parammaps.bcode" :placeholder="$t('driver.lsbh')" style="width: 180px;" class="filter-item" clearable />
-      <el-select v-model="table.getdataListParm.parammaps.enable" filterable :placeholder="$t('formulationEvaluation.sfqy')" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
+      <el-input
+        v-model="table.getdataListParm.parammaps.bname"
+        :placeholder="$t('driver.lsmc')"
+        style="width: 180px"
+        class="filter-item"
+        clearable
+      />
+      <el-input
+        v-model="table.getdataListParm.parammaps.bcode"
+        :placeholder="$t('driver.lsbh')"
+        style="width: 180px"
+        class="filter-item"
+        clearable
+      />
+      <el-select
+        v-model="table.getdataListParm.parammaps.enable"
+        filterable
+        :placeholder="$t('formulationEvaluation.sfqy')"
+        class="filter-item"
+        style="width: 120px"
+        clearable
+      >
+        <el-option
+          v-for="item in enableList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
       <div ref="selectInput" class="filter-item selectInput">
-        <el-input type="text" name="" value="" :placeholder="$t('driver.xzsstj')" class="Input" />
-        <i v-if="arrowDown" icon="el-icon-arrow-down" class="el-icon-arrow-down" />
+        <el-input
+          type="text"
+          name=""
+          value=""
+          :placeholder="$t('driver.xzsstj')"
+          class="Input"
+        />
+        <i
+          v-if="arrowDown"
+          icon="el-icon-arrow-down"
+          class="el-icon-arrow-down"
+        />
         <i v-if="arrowUp" icon="el-icon-arrow-up" class="el-icon-arrow-up" />
         <ul v-if="arrowUp" class="selectUl">
-          <li><a>{{$t('driver.yxwcs')}}</a><el-input v-model="table.getdataListParm.parammaps.allowratio" type="text" style="width: 245px;" /></li>
-          <li><a>{{$t('driver.tzzly')}}</a><el-input v-model="table.getdataListParm.parammaps.autozone" type="text" style="width: 245px;" /></li>
           <li>
-            <a>{{$t('driver.tzys')}}</a>
-            <el-select v-model="table.getdataListParm.parammaps.autosecond" filterable class="filter-item" style="width: 245px;" clearable>
-              <el-option v-for="item in jumpDelayList" :key="item.value" :label="item.label" :value="item.value" />
+            <a>{{ $t("driver.yxwcs") }}</a
+            ><el-input
+              v-model="table.getdataListParm.parammaps.allowratio"
+              type="text"
+              style="width: 245px"
+            />
+          </li>
+          <li>
+            <a>{{ $t("driver.tzzly") }}</a
+            ><el-input
+              v-model="table.getdataListParm.parammaps.autozone"
+              type="text"
+              style="width: 245px"
+            />
+          </li>
+          <li>
+            <a>{{ $t("driver.tzys1") }}</a>
+            <el-select
+              v-model="table.getdataListParm.parammaps.autosecond"
+              filterable
+              class="filter-item"
+              style="width: 245px"
+              clearable
+            >
+              <el-option
+                v-for="item in jumpDelayList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </li>
           <li>
-            <div style="float: right;">
-              <el-button class="downminCancel" @click="arrowUp=false;arrowDown=true;">{{$t('formulationEvaluation.cancel')}}</el-button>
-              <el-button class="miniPrimary" @click="form_search">{{$t('formulationEvaluation.search')}}</el-button>
+            <div style="float: right">
+              <el-button
+                class="downminCancel"
+                @click="
+                  arrowUp = false;
+                  arrowDown = true;
+                "
+                >{{ $t("formulationEvaluation.cancel") }}</el-button
+              >
+              <el-button class="miniPrimary" @click="form_search">{{
+                $t("formulationEvaluation.search")
+              }}</el-button>
             </div>
           </li>
         </ul>
       </div>
-      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
-      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
+      <el-button class="successBorder" @click="form_search">{{
+        $t("common.query")
+      }}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{
+        $t("common.reset")
+      }}</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" style="float:left;" class="success" icon="el-icon-plus" @click="handleCreate">{{$t('formulationEvaluation.add')}}</el-button>
-      <el-button v-if="isRoleEdit" style="float:left;" class="danger" icon="el-icon-delete" @click="form_delete">{{$t('formulationEvaluation.del')}}</el-button>
-      <el-button v-if="isOrder && isRoleEdit" style="float:left;" icon="el-icon-sort" class="success" @click="handleChangeOrder">{{$t('formulationEvaluation.ggsx')}}</el-button>
-       <div v-else style="float:left;margin-left: 10px;">
-        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">{{$t('formulationEvaluation.save')}}</el-button>
-        <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">{{$t('formulationEvaluation.cancel')}}</el-button>
+      <el-button
+        v-if="isRoleEdit"
+        style="float: left"
+        class="success"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >{{ $t("formulationEvaluation.add") }}</el-button
+      >
+      <el-button
+        v-if="isRoleEdit"
+        style="float: left"
+        class="danger"
+        icon="el-icon-delete"
+        @click="form_delete"
+        >{{ $t("formulationEvaluation.del") }}</el-button
+      >
+      <el-button
+        v-if="isOrder && isRoleEdit"
+        style="float: left"
+        icon="el-icon-sort"
+        class="success"
+        @click="handleChangeOrder"
+        >{{ $t("formulationEvaluation.ggsx") }}</el-button
+      >
+      <div v-else style="float: left; margin-left: 10px">
+        <el-button
+          v-if="isRoleEdit"
+          icon="el-icon-folder-checked"
+          class="success"
+          @click="saveChangeOrder"
+          >{{ $t("formulationEvaluation.save") }}</el-button
+        >
+        <el-button
+          v-if="isRoleEdit"
+          icon="el-icon-close"
+          class="sortCancel"
+          @click="cancelChangeOrder"
+          >{{ $t("formulationEvaluation.cancel") }}</el-button
+        >
       </div>
-      <el-button v-if="isRoleEdit && sapUpload.isSap" class="success" icon="el-icon-plus" @click="handleGetSapCode">{{$t('driver.hqspanccode')}}</el-button>
-      <el-button v-if="isRoleEdit && ispalyUd" class="success" icon="el-icon-plus" @click="handleGetUd">{{$t('driver.hqudls')}}</el-button>
+      <el-button
+        v-if="isRoleEdit && sapUpload.isSap"
+        class="success"
+        icon="el-icon-plus"
+        @click="handleGetSapCode"
+        >{{ $t("driver.hqspanccode") }}</el-button
+      >
+      <el-button
+        v-if="isRoleEdit && ispalyUd"
+        class="success"
+        icon="el-icon-plus"
+        @click="handleGetUd"
+        >{{ $t("driver.hqudls") }}</el-button
+      >
     </div>
     <div class="table">
       <u-table
@@ -52,7 +169,7 @@
         border
         fit
         highlight-current-row
-        style="width: 100%;"
+        style="width: 100%"
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
@@ -61,751 +178,1248 @@
         :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
-        <el-table-column :label="$t('formulationEvaluation.xh')" type="index" align="center" width="50" />
-        <el-table-column  :label="$t('errorAnalysis.isHouseName')"  min-width="130px" align="center">
+        <el-table-column
+          :label="$t('formulationEvaluation.xh')"
+          type="index"
+          align="center"
+          width="50"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.isHouseName')"
+          min-width="130px"
+          align="center"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.bname }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.bname" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" style="width:95%;padding:10px 0;" maxlength="32" />
+            <el-input
+              v-if="scope.row.Edit"
+              v-model="scope.row.bname"
+              type="textarea"
+              :autosize="{ minRows: 1.3, maxRows: 4 }"
+              style="width: 95%; padding: 10px 0"
+              maxlength="32"
+            />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('driver.lsbh')" min-width="130px" align="center">
+        <el-table-column
+          :label="$t('driver.lsbh')"
+          min-width="130px"
+          align="center"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.bcode }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.bcode"
-:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
+            <el-input
+              v-if="scope.row.Edit"
+              v-model="scope.row.bcode"
+              :placeholder="$t('supplier.zf1')"
+              type="textarea"
+              :autosize="{ minRows: 1.3, maxRows: 4 }"
+              maxlength="32"
+              style="width: 95%; padding: 10px 0"
+            />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('driver.yxwcs')" min-width="150px" align="center">
+        <el-table-column
+          :label="$t('driver.yxwcs')"
+          min-width="150px"
+          align="center"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.allowratio }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.allowratio" style="width:95%;padding:10px 0;" />
+            <el-input
+              v-if="scope.row.Edit"
+              v-model="scope.row.allowratio"
+              style="width: 95%; padding: 10px 0"
+            />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('driver.tzzly')" min-width="150px" align="center">
+        <el-table-column
+          :label="$t('driver.tzzly')"
+          min-width="150px"
+          align="center"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.autozone }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.autozone" :disabled="scope.row.autosecond=='0'" style="width:95%;padding:10px 0;" />
+            <el-input
+              v-if="scope.row.Edit"
+              v-model="scope.row.autozone"
+              :disabled="scope.row.autosecond == '0'"
+              style="width: 95%; padding: 10px 0"
+            />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('driver.tzys')" min-width="150px" align="center">
+        <el-table-column
+          :label="$t('driver.tzys1')"
+          min-width="150px"
+          align="center"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.autosecondname }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.autosecond" filterable class="filter-item" style="width: 95%;padding:10px 0;" @change="changeAutosecond">
-              <el-option v-for="item in jumpDelayList" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-if="scope.row.Edit"
+              v-model="scope.row.autosecond"
+              filterable
+              class="filter-item"
+              style="width: 95%; padding: 10px 0"
+              @change="changeAutosecond"
+            >
+              <el-option
+                v-for="item in jumpDelayList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
               <!-- <el-option v-for="item in jumpDelayList" :key="item.label" :label="item.label" :value="item.label" /> -->
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('errorAnalysis.pen')" min-width="150px" align="center">
+        <!-- <el-table-column :label="$t('errorAnalysis.pen')" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.KTEXT }}</span>
             <el-select v-if="scope.row.Edit" v-model="scope.row.AUFNR" filterable class="filter-item" style="width: 95%;padding:10px 0;">
               <el-option v-for="item in cattleorderList" :key="item.AUFNR" :label="item.KTEXT" :value="item.AUFNR" />
             </el-select>
           </template>
-        </el-table-column>
-        <el-table-column :label="$t('driver.qrks')" min-width="110px" align="center">
+        </el-table-column> -->
+        <el-table-column
+          :label="$t('driver.qrks')"
+          min-width="110px"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.isstart" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleConfirmStartChange(scope.$index, scope.row)" />
+            <el-switch
+              v-model="scope.row.isstart"
+              :disabled="scope.row.NoEdit == true"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-value="1"
+              :inactive-value="0"
+              @change="handleConfirmStartChange(scope.$index, scope.row)"
+            />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('formulationEvaluation.sfqy')" min-width="110px" align="center">
+        <el-table-column
+          :label="$t('formulationEvaluation.sfqy')"
+          min-width="110px"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
+            <el-switch
+              v-model="scope.row.enable"
+              :disabled="scope.row.NoEdit == true"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-value="1"
+              :inactive-value="0"
+              @change="handleEnableChange(scope.$index, scope.row)"
+            />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('driver.udcode')" min-width="110px" align="center">
+        <el-table-column
+          :label="$t('driver.udcode')"
+          min-width="110px"
+          align="center"
+        >
           <template slot-scope="scope">
-            <span>{{scope.row.udcode}}</span>
+            <span>{{ scope.row.udcode }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('driver.udname')" min-width="110px" align="center">
+        <el-table-column
+          :label="$t('driver.udname')"
+          min-width="110px"
+          align="center"
+        >
           <template slot-scope="scope">
-            <span>{{scope.row.udname}}</span>
+            <span>{{ scope.row.udname }}</span>
           </template>
         </el-table-column>
-        <el-table-column  :label="$t('errorAnalysis.cz')" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="{row}">
+        <el-table-column
+          :label="$t('errorAnalysis.cz')"
+          align="center"
+          width="80"
+          class-name="small-padding fixed-width"
+          fixed="right"
+        >
+          <template slot-scope="{ row }">
             <!-- 新增 -->
-            <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
+            <el-button
+              v-if="row.isCreate"
+              :disabled="isokDisable"
+              icon="el-icon-folder-checked"
+              class="miniSuccess"
+              @click="createData(row)"
+            />
             <span v-if="row.isCreate" class="centerSpan">|</span>
-            <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
+            <el-button
+              v-if="row.isCreate"
+              class="minCancel"
+              icon="el-icon-close"
+              @click="createCancel(row)"
+            />
             <!-- 编辑 -->
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <el-button
+              v-if="row.isUpdate && isRoleEdit"
+              class="miniSuccess"
+              icon="el-icon-edit-outline"
+              @click="handleUpdate(row)"
+            />
             <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+            <el-button
+              v-if="row.isUpdate && isRoleEdit"
+              class="miniDanger"
+              icon="el-icon-delete"
+              @click="handleRowDelete(row)"
+            />
             <!-- 编辑保存 -->
-            <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+            <el-button
+              v-if="row.isUpdateSave"
+              :disabled="isokDisable"
+              icon="el-icon-folder-checked"
+              class="miniSuccess"
+              @click="updateData(row)"
+            />
             <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+            <el-button
+              v-if="row.isUpdateSave"
+              class="minCancel"
+              icon="el-icon-close"
+              @click="updateCancel(row)"
+            />
           </template>
         </el-table-column>
       </u-table>
-      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
+      <span
+        v-if="table.listLoading == false"
+        style="margin-right: 30px; margin-top: 10px; font-size: 14px"
+        >{{ $t("processAnalysis.total") }}{{ table.total
+        }}{{ $t("processAnalysis.tiao") }}</span
+      >
       <!-- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" /> -->
     </div>
     <!-- 获取SAP编码 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="sapCode2.dialogFormVisible" :close-on-click-modal="false" width="50%">
+    <el-dialog
+      :fullscreen="dialogFull"
+      :visible.sync="sapCode2.dialogFormVisible"
+      :close-on-click-modal="false"
+      width="50%"
+    >
       <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" />
+            <span
+              style="
+                display: inline-block;
+                width: 3px;
+                height: 20px;
+                margin-right: 5px;
+                float: left;
+                margin-top: 2px;
+              "
+            />
             {{ textMap[sapCode2.dialogStatus] }}
           </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+          <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="sapCode2" :rules="sapCode2.rules" :model="sapCode2.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
+        <el-form
+          ref="sapCode2"
+          :rules="sapCode2.rules"
+          :model="sapCode2.temp"
+          label-position="right"
+          label-width="155px"
+          style="width: 100%; margin: 0 auto 50px"
+        >
           <el-row>
             <el-col :span="18">
-              <el-form-item :label="$t('dailyExecutionPlan.sjfw')"   prop="inputDatetime">
-                <el-date-picker v-model="sapCode2.temp.inputDatetime"  class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
+              <el-form-item
+                :label="$t('dailyExecutionPlan.sjfw')"
+                prop="inputDatetime"
+              >
+                <el-date-picker
+                  v-model="sapCode2.temp.inputDatetime"
+                  class="inputDatetime filter-item"
+                  type="daterange"
+                  :range-separator="$t('common.to')"
+                  :start-placeholder="$t('common.startTime')"
+                  :end-placeholder="$t('common.endTime')"
+                  style="width: 100%"
+                  :clearable="false"
+                />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <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()">{{$t('errorAnalysis.confirm')}}</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()"
+            >{{ $t("errorAnalysis.confirm") }}</el-button
+          >
         </div>
       </div>
     </el-dialog>
   </div>
-
 </template>
 
 <script>
-import { GetDataByName, GetDataByNames, PostDataByName, failproccess, ExecDataByConfig, checkButtons,postJson } from '@/api/common'
-import Cookies from 'js-cookie'
-import draggable from 'vuedraggable'
-import Sortable from 'sortablejs'
-import { parseTime } from '@/utils/index.js'
-import Pagination from '@/components/Pagination'
-import { MessageBox } from 'element-ui'
+import {
+  GetDataByName,
+  GetDataByNames,
+  PostDataByName,
+  failproccess,
+  ExecDataByConfig,
+  checkButtons,
+  postJson,
+} from "@/api/common";
+import Cookies from "js-cookie";
+import draggable from "vuedraggable";
+import Sortable from "sortablejs";
+import { parseTime } from "@/utils/index.js";
+import Pagination from "@/components/Pagination";
+import { MessageBox } from "element-ui";
 export default {
-  name: 'GroupColumn',
-  components: { Pagination,draggable },
+  name: "GroupColumn",
+  components: { Pagination, draggable },
   data() {
     return {
       dialogFull: false,
       isRoleEdit: [],
       requestParams: [
-        { name: 'getDictByName', offset: 0, pagecount: 0, params: ['跳转延时'] },
-        { name: 'getBarClass', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} },
-        { name: 'getScopeherd', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} },
-        { name: 'getCattleorder', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} }
+        {
+          name: "getDictByName",
+          offset: 0,
+          pagecount: 0,
+          params: ["跳转延时"],
+        },
+        {
+          name: "getBarClass",
+          offset: 0,
+          pagecount: 0,
+          parammaps: { pastureid: Cookies.get("pastureid") },
+        },
+        {
+          name: "getScopeherd",
+          offset: 0,
+          pagecount: 0,
+          parammaps: { pastureid: Cookies.get("pastureid") },
+        },
+        {
+          name: "getCattleorder",
+          offset: 0,
+          pagecount: 0,
+          parammaps: { pastureid: Cookies.get("pastureid") },
+        },
+      ],
+      enableList: [
+        { id: "1", name: this.$t("supplier.yes") },
+        { id: "0", name: this.$t("supplier.no") },
       ],
-      enableList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0',  
-name:this.$t('supplier.no') }],
       jumpDelayList: [],
-      barClassList:[],
-      scopeherdList:[],
-      cattleorderList:[],
+      barClassList: [],
+      scopeherdList: [],
+      cattleorderList: [],
       table: {
         getdataListParm: {
-          name: 'getBarList',
+          name: "getBarList",
           page: 1,
           offset: 1,
-          pagecount: '',
-          returntype: 'Map',
+          pagecount: "",
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            bcode: '',
-            bname: '',
-            allowratio: '',
-            autozone: '',
-            autosecond: '',
-            enable: ''
-          }
+            pastureid: Cookies.get("pastureid"),
+            bcode: "",
+            bname: "",
+            allowratio: "",
+            autozone: "",
+            autosecond: "",
+            enable: "",
+          },
         },
         tableKey: 0,
         list: [],
         total: 0,
         listLoading: true,
-        temp: {}
+        temp: {},
       },
-      sapCode2:{
+      sapCode2: {
         dialogFormVisible: false,
-        dialogStatus: '',
-        materialtypeList:[],
-        temp:{
-          inputDatetime: [parseTime(new Date(), '{y}-{m}-{d}'), parseTime(new Date(), '{y}-{m}-{d}')],
-          sapMaterialtype:'',
+        dialogStatus: "",
+        materialtypeList: [],
+        temp: {
+          inputDatetime: [
+            parseTime(new Date(), "{y}-{m}-{d}"),
+            parseTime(new Date(), "{y}-{m}-{d}"),
+          ],
+          sapMaterialtype: "",
         },
         rules: {
-          inputDatetime :[{required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
-        }
+          inputDatetime: [
+            {
+              required: true,
+              message: this.$t("hardwareTest.bt"),
+              trigger: "blur",
+            },
+          ],
+        },
       },
       textMap: {
-        sapCode2: '获取SAP编码',
+        sapCode2: "获取SAP编码",
       },
-      sapUpload:{
+      sapUpload: {
         getdataListParm: {
-          name: 'getSysoptEnable',
+          name: "getSysoptEnable",
           page: 1,
           offset: 1,
           pagecount: 1,
-          returntype: 'Map',
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'xdmyBarSync'
-          }
+            pastureid: Cookies.get("pastureid"),
+            inforname: "xdmyBarSync",
+          },
         },
-        isSap: false
+        isSap: false,
       },
       requestParam: {},
       isokDisable: false,
       selectList: [],
       arrowDown: true,
       arrowUp: false,
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
+      rowStyle: { maxHeight: 30 + "px", height: 30 + "px" },
+      cellStyle: { padding: 0 + "px" },
       dropState: false,
       isOrder: true,
       ispalyUd: true,
-      myHeight:document.documentElement.clientHeight - 85- 150
-    }
+      myHeight: document.documentElement.clientHeight - 85 - 150,
+    };
   },
 
   created() {
-    this.getIspalyUd()
-    this.getList()
-    this.getDownList()
-    this.getButtons()
-    this.getIsSap()
+    this.getIspalyUd();
+    this.getList();
+    this.getDownList();
+    this.getButtons();
+    this.getIsSap();
   },
   mounted() {
-    document.addEventListener('click', (e) => {
+    document.addEventListener("click", (e) => {
       if (this.$refs.selectInput !== undefined) {
         if (!this.$refs.selectInput.contains(e.target)) {
-          this.arrowDown = true
-          this.arrowUp = false
+          this.arrowDown = true;
+          this.arrowUp = false;
         } else {
-          this.arrowDown = false
-          this.arrowUp = true
+          this.arrowDown = false;
+          this.arrowUp = true;
         }
       }
-    })
+    });
   },
   methods: {
     getIsSap() {
-      GetDataByName(this.sapUpload.getdataListParm).then(response => {
+      GetDataByName(this.sapUpload.getdataListParm).then((response) => {
         // console.log()
-        if(response.data.list !== null){
-          if(response.data.list[0].inforvalue == 1){
-            this.sapUpload.isSap = true
-          }else{
-            this.sapUpload.isSap = false
+        if (response.data.list !== null) {
+          if (response.data.list[0].inforvalue == 1) {
+            this.sapUpload.isSap = true;
+          } else {
+            this.sapUpload.isSap = false;
           }
-          console.log(this.sapUpload.isSap)
+          console.log(this.sapUpload.isSap);
         }
-      })
+      });
     },
     getButtons() {
-      const Edit = 'GroupColumn'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      console.log(isRoleEdit,'hss------')
-      this.isRoleEdit = isRoleEdit
+      const Edit = "GroupColumn";
+      const isRoleEdit = checkButtons(
+        JSON.parse(sessionStorage.getItem("buttons")),
+        Edit
+      );
+      console.log(isRoleEdit, "hss------");
+      this.isRoleEdit = isRoleEdit;
     },
     getDownList() {
-      GetDataByNames(this.requestParams).then(response => {
-        this.jumpDelayList = response.data.getDictByName.list
-        this.barClassList = response.data.getBarClass.list
-        this.scopeherdList = response.data.getScopeherd.list
-        this.cattleorderList = response.data.getCattleorder.list
-      })
+      GetDataByNames(this.requestParams).then((response) => {
+        this.jumpDelayList = response.data.getDictByName.list;
+        this.barClassList = response.data.getBarClass.list;
+        this.scopeherdList = response.data.getScopeherd.list;
+        this.cattleorderList = response.data.getCattleorder.list;
+      });
     },
     getList() {
-      this.table.listLoading = true
-      GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
+      this.table.listLoading = true;
+      GetDataByName(this.table.getdataListParm).then((response) => {
+        console.log("table数据", response.data.list);
         if (response.data.list !== null) {
           for (let i = 0; i < response.data.list.length; i++) {
-            this.$set(response.data.list[i], 'Edit', false) // 编辑
-            this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
-            this.$set(response.data.list[i], 'isCreate', false) // 新增操作
-            this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
-            this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
+            this.$set(response.data.list[i], "Edit", false); // 编辑
+            this.$set(response.data.list[i], "NoEdit", true); // 不可编辑/输入
+            this.$set(response.data.list[i], "isCreate", false); // 新增操作
+            this.$set(response.data.list[i], "isUpdate", true); // 编辑操作
+            this.$set(response.data.list[i], "isUpdateSave", false); // 编辑保存
           }
-          this.table.list = response.data.list
-          this.table.pageNum = response.data.pageNum
-          this.table.pageSize = response.data.pageSize
+          this.table.list = response.data.list;
+          this.table.pageNum = response.data.pageNum;
+          this.table.pageSize = response.data.pageSize;
         } else {
-          this.table.list = []
+          this.table.list = [];
         }
-        this.table.total = response.data.total
+        this.table.total = response.data.total;
         setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
+          this.table.listLoading = false;
+        }, 100);
+      });
     },
     handleEnableChange() {
-      console.log('点击了是否启用')
+      console.log("点击了是否启用");
     },
     handleConfirmStartChange() {
-      console.log('点击了确认开始')
+      console.log("点击了确认开始");
     },
     form_search() {
-      console.log('点击了查询')
-      this.table.getdataListParm.offset = 1
-      this.getList()
-      this.arrowDown = true
-      this.arrowUp = false
+      console.log("点击了查询");
+      this.table.getdataListParm.offset = 1;
+      this.getList();
+      this.arrowDown = true;
+      this.arrowUp = false;
     },
     handleRefresh() {
-      console.log('点击了重置')
-      this.table.getdataListParm.parammaps.bcode = ''
-      this.table.getdataListParm.parammaps.bname = ''
-      this.table.getdataListParm.parammaps.allowratio = ''
-      this.table.getdataListParm.parammaps.autozone = ''
-      this.table.getdataListParm.parammaps.autosecond = ''
-      this.table.getdataListParm.parammaps.enable = ''
-      this.table.getdataListParm.offset = 1
-      this.getList()
+      console.log("点击了重置");
+      this.table.getdataListParm.parammaps.bcode = "";
+      this.table.getdataListParm.parammaps.bname = "";
+      this.table.getdataListParm.parammaps.allowratio = "";
+      this.table.getdataListParm.parammaps.autozone = "";
+      this.table.getdataListParm.parammaps.autosecond = "";
+      this.table.getdataListParm.parammaps.enable = "";
+      this.table.getdataListParm.offset = 1;
+      this.getList();
     },
 
     changeAutosecond(item) {
-      this.table.temp.autosecondname = this.jumpDelayList.find(obj => obj.value === item).label
-      console.log(this.table.temp.autosecondname)
+      this.table.temp.autosecondname = this.jumpDelayList.find(
+        (obj) => obj.value === item
+      ).label;
+      console.log(this.table.temp.autosecondname);
     },
     handleCreate() {
-      console.log('点击了新增')
+      console.log("点击了新增");
       // 编辑true/不可编辑false
       // 新增操true,编辑false，编辑保存false
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit == true) {
-          this.$message({ type: 'error', message: this.$t('driver.messageNote'), duration: 2000 })
-          return false
+          this.$message({
+            type: "error",
+            message: this.$t("driver.messageNote"),
+            duration: 2000,
+          });
+          return false;
         }
       }
-      this.table.temp.autosecondname = ''
-      this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'isstart': 1, 'bname': '', 'bcode': '', 'allowratio': '', 'autozone': '', 'autosecond': '0', 'autosecondname': '禁用','scopeherdid':'','classid':'' })
+      this.table.temp.autosecondname = "";
+      this.table.list.unshift({
+        myId: new Date().valueOf(),
+        Edit: true,
+        NoEdit: false,
+        isCreate: true,
+        isUpdate: false,
+        isUpdateSave: false,
+        enable: 1,
+        isstart: 1,
+        bname: "",
+        bcode: "",
+        allowratio: "",
+        autozone: "",
+        autosecond: "0",
+        autosecondname: this.$t("feedChart.jinyong"),
+        scopeherdid: "",
+        classid: "",
+      });
     },
     createData(row) {
-      console.log('点击了新增保存', row)
-      this.table.temp.pastureid = Cookies.get('pastureid')
-      this.table.temp.bcode = row.bcode
-      this.table.temp.bname = row.bname
-      this.table.temp.allowratio = row.allowratio
-      this.table.temp.autozone = row.autozone
-      this.table.temp.autosecond = row.autosecond
-      if (this.table.temp.autosecondname == '') {
-        this.table.temp.autosecondname = row.autosecondname
+      console.log("点击了新增保存", row);
+      this.table.temp.pastureid = Cookies.get("pastureid");
+      this.table.temp.bcode = row.bcode;
+      this.table.temp.bname = row.bname;
+      this.table.temp.allowratio = row.allowratio;
+      this.table.temp.autozone = row.autozone;
+      this.table.temp.autosecond = row.autosecond;
+      if (this.table.temp.autosecondname == "") {
+        this.table.temp.autosecondname = row.autosecondname;
       } else {
-        this.table.temp.autosecondname = this.table.temp.autosecondname
+        this.table.temp.autosecondname = this.table.temp.autosecondname;
       }
-      this.table.temp.AUFNR = row.AUFNR
-      this.table.temp.isstart = row.isstart
-      this.table.temp.enable = row.enable
+      this.table.temp.AUFNR = row.AUFNR;
+      this.table.temp.isstart = row.isstart;
+      this.table.temp.enable = row.enable;
       // 检验用户名称/角色是否为空
-      if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: this.$t('driver.message1'), duration: 2000 })
-        return false
-      }else if (this.table.temp.bname == '') {
-        this.$message({ type: 'error', message: this.$t('driver.message2'), duration: 2000 })
-        return false
-      } else if (this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: this.$t('driver.message3'), duration: 2000 })
-        return false
+      if (this.table.temp.bname == "" && this.table.temp.bcode == "") {
+        this.$message({
+          type: "error",
+          message: this.$t("driver.message1"),
+          duration: 2000,
+        });
+        return false;
+      } else if (this.table.temp.bname == "") {
+        this.$message({
+          type: "error",
+          message: this.$t("driver.message2"),
+          duration: 2000,
+        });
+        return false;
+      } else if (this.table.temp.bcode == "") {
+        this.$message({
+          type: "error",
+          message: this.$t("driver.message3"),
+          duration: 2000,
+        });
+        return false;
       }
 
       // if (this.table.temp.bcode.length > 8) {
       //   this.$message({ type: 'error', message: '栏舍编号请输入1-8位数字', duration: 2000 })
       //   return false
       // }
-      if (this.table.temp.allowratio !== '') {
-        console.log(this.table.temp.allowratio)
-        const allowratio = /^[0-9]\d*$/
+      if (this.table.temp.allowratio !== "") {
+        console.log(this.table.temp.allowratio);
+        const allowratio = /^[0-9]\d*$/;
         if (!allowratio.test(parseFloat(this.table.temp.allowratio))) {
-          this.$message({ type: 'error', message: this.$t('message.msg254'), duration: 2000 })
-          return false
+          this.$message({
+            type: "error",
+            message: this.$t("message.msg254"),
+            duration: 2000,
+          });
+          return false;
         }
       } else {
-        this.table.temp.allowratio = '0'
+        this.table.temp.allowratio = "0";
       }
-      if (this.table.temp.autozone !== '') {
-        console.log(this.table.temp.autozone)
-        const autozone = /^(\d|[1-9]\d|1[0-1]\d|120)$/
+      if (this.table.temp.autozone !== "") {
+        console.log(this.table.temp.autozone);
+        const autozone = /^(\d|[1-9]\d|1[0-1]\d|120)$/;
         if (!autozone.test(parseFloat(this.table.temp.autozone))) {
-          this.$message({ type: 'error', message: this.$t('message.msg255'), duration: 2000 })
-          return false
+          this.$message({
+            type: "error",
+            message: this.$t("message.msg255"),
+            duration: 2000,
+          });
+          return false;
         }
       } else {
-        this.table.temp.autozone = '0'
+        this.table.temp.autozone = "0";
       }
-      const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
+      const pattern = new RegExp(
+        "[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]"
+      );
       if (pattern.test(this.table.temp.eqcode)) {
-        this.$message({ type: 'error', message: this.$t('message.msg236'), duration: 2000 })
-        return false
+        this.$message({
+          type: "error",
+          message: this.$t("message.msg236"),
+          duration: 2000,
+        });
+        return false;
       }
       if (pattern.test(this.table.temp.tname)) {
-        this.$message({ type: 'error', message: this.$t('message.msg237'), duration: 2000 })
-        return false
+        this.$message({
+          type: "error",
+          message: this.$t("message.msg237"),
+          duration: 2000,
+        });
+        return false;
       }
-      this.isokDisable = true
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.requestParam.name = 'insertBar'
-      this.requestParam.parammaps = this.table.temp
-      PostDataByName(this.requestParam).then(response => {
-        console.log('新增保存发送参数', this.requestParam)
-        if (response.msg !== 'fail') {
-          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
-          this.getList()
+        this.isokDisable = false;
+      }, 1000);
+      this.requestParam.name = "insertBar";
+      this.requestParam.parammaps = this.table.temp;
+      PostDataByName(this.requestParam).then((response) => {
+        console.log("新增保存发送参数", this.requestParam);
+        if (response.msg !== "fail") {
+          this.$notify({
+            title: this.$t("common.succes"),
+            message: this.$t("driver.saveSuccess"),
+            type: "success",
+            duration: 2000,
+          });
+          this.getList();
         } else {
-          const isRepeat = new RegExp('Duplicate entry :bar_bcode')
+          const isRepeat = new RegExp("Duplicate entry :bar_bcode");
           if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: this.$t('message.msg256'), duration: 2000 })
-            return false
+            this.$notify({
+              type: "error",
+              message: this.$t("message.msg256"),
+              duration: 2000,
+            });
+            return false;
           }
-          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({
+            title: this.$t("driver.saveFail"),
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
         }
-      })
+      });
     },
     createCancel(row) {
-      console.log('点击了新增取消')
+      console.log("点击了新增取消");
       for (let i = 0; i < this.table.list.length; i++) {
         if (row.myId === this.table.list[i].myId) {
-          var listIndex = this.table.list.indexOf(this.table.list[i])
+          var listIndex = this.table.list.indexOf(this.table.list[i]);
         }
         if (listIndex > -1) {
-          this.table.list.splice(listIndex, 1)
-          return
+          this.table.list.splice(listIndex, 1);
+          return;
         }
       }
     },
     handleUpdate(row) {
-      console.log('点击了编辑', row)
+      console.log("点击了编辑", row);
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit == true) {
-          this.$message({ type: 'error', message: this.$t('driver.messageNote'), duration: 2000 })
-          return false
+          this.$message({
+            type: "error",
+            message: this.$t("driver.messageNote"),
+            duration: 2000,
+          });
+          return false;
         }
       }
       // 编辑true,不可编辑false
-      row.Edit = true
-      row.NoEdit = false
+      row.Edit = true;
+      row.NoEdit = false;
       // 新增false,编辑false,编辑保存true
-      row.isCreate = false
-      row.isUpdate = false
-      row.isUpdateSave = true
-      row.autosecond = String(row.autosecond)
-      this.table.temp.autosecondname = row.autosecondname
-      this.table.temp.autosecond = row.autosecond
+      row.isCreate = false;
+      row.isUpdate = false;
+      row.isUpdateSave = true;
+      row.autosecond = String(row.autosecond);
+      this.table.temp.autosecondname = row.autosecondname;
+      this.table.temp.autosecond = row.autosecond;
     },
     updateData(row) {
-      console.log('点击了编辑保存', row)
-      this.table.temp.pastureid = Cookies.get('pastureid')
-      this.table.temp.bcode = row.bcode
-      this.table.temp.bname = row.bname
-      this.table.temp.allowratio = row.allowratio
-      this.table.temp.autozone = row.autozone
-      this.table.temp.autosecond = row.autosecond
-      this.table.temp.autosecondname = this.table.temp.autosecondname
-      this.table.temp.isstart = row.isstart
-      this.table.temp.enable = row.enable
-      this.table.temp.id = row.id
-      this.table.temp.AUFNR = row.AUFNR
+      console.log("点击了编辑保存", row);
+      this.table.temp.pastureid = Cookies.get("pastureid");
+      this.table.temp.bcode = row.bcode;
+      this.table.temp.bname = row.bname;
+      this.table.temp.allowratio = row.allowratio;
+      this.table.temp.autozone = row.autozone;
+      this.table.temp.autosecond = row.autosecond;
+      this.table.temp.autosecondname = this.table.temp.autosecondname;
+      this.table.temp.isstart = row.isstart;
+      this.table.temp.enable = row.enable;
+      this.table.temp.id = row.id;
+      this.table.temp.AUFNR = row.AUFNR;
       // 检验用户名称/角色是否为空
-      if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: this.$t('message.msg257'), duration: 2000 })
-        return false
-      }else if (this.table.temp.bname == '') {
-        this.$message({ type: 'error', message: this.$t('driver.message2'), duration: 2000 })
-        return false
-      } else if (this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: this.$t('driver.message3'), duration: 2000 })
-        return false
+      if (this.table.temp.bname == "" && this.table.temp.bcode == "") {
+        this.$message({
+          type: "error",
+          message: this.$t("message.msg257"),
+          duration: 2000,
+        });
+        return false;
+      } else if (this.table.temp.bname == "") {
+        this.$message({
+          type: "error",
+          message: this.$t("driver.message2"),
+          duration: 2000,
+        });
+        return false;
+      } else if (this.table.temp.bcode == "") {
+        this.$message({
+          type: "error",
+          message: this.$t("driver.message3"),
+          duration: 2000,
+        });
+        return false;
       }
-      if (this.table.temp.allowratio !== '') {
-        console.log(this.table.temp.allowratio)
-        const allowratio = /^[0-9]\d*$/
+      if (this.table.temp.allowratio !== "") {
+        console.log(this.table.temp.allowratio);
+        const allowratio = /^[0-9]\d*$/;
         if (!allowratio.test(parseFloat(this.table.temp.allowratio))) {
-          this.$message({ type: 'error', message: this.$t('message.msg254'), duration: 2000 })
-          return false
+          this.$message({
+            type: "error",
+            message: this.$t("message.msg254"),
+            duration: 2000,
+          });
+          return false;
         }
       } else {
-        this.table.temp.allowratio = '0'
+        this.table.temp.allowratio = "0";
       }
-      if (this.table.temp.autozone !== '') {
-        console.log(this.table.temp.autozone)
-        const autozone = /^(\d|[1-9]\d|1[0-1]\d|120)$/
+      if (this.table.temp.autozone !== "") {
+        console.log(this.table.temp.autozone);
+        const autozone = /^(\d|[1-9]\d|1[0-1]\d|120)$/;
         if (!autozone.test(parseFloat(this.table.temp.autozone))) {
-          this.$message({ type: 'error', message: this.$t('message.msg255'), duration: 2000 })
-          return false
+          this.$message({
+            type: "error",
+            message: this.$t("message.msg255"),
+            duration: 2000,
+          });
+          return false;
         }
       } else {
-        this.table.temp.autozone = '0'
+        this.table.temp.autozone = "0";
       }
-      const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
+      const pattern = new RegExp(
+        "[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]"
+      );
       if (pattern.test(this.table.temp.eqcode)) {
-        this.$message({ type: 'error', message: this.$t('message.msg236'), duration: 2000 })
-        return false
+        this.$message({
+          type: "error",
+          message: this.$t("message.msg236"),
+          duration: 2000,
+        });
+        return false;
       }
       if (pattern.test(this.table.temp.tname)) {
-        this.$message({ type: 'error', message: this.$t('message.msg237'), duration: 2000 })
-        return false
+        this.$message({
+          type: "error",
+          message: this.$t("message.msg237"),
+          duration: 2000,
+        });
+        return false;
       }
-      this.isokDisable = true
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.requestParam.name = 'updateBar'
-      this.requestParam.parammaps = this.table.temp
-      PostDataByName(this.requestParam).then(response => {
-        console.log('新增保存发送参数', this.requestParam)
-        if (response.msg !== 'fail') {
-          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
-          this.getList()
+        this.isokDisable = false;
+      }, 1000);
+      this.requestParam.name = "updateBar";
+      this.requestParam.parammaps = this.table.temp;
+      PostDataByName(this.requestParam).then((response) => {
+        console.log("新增保存发送参数", this.requestParam);
+        if (response.msg !== "fail") {
+          this.$notify({
+            title: this.$t("common.succes"),
+            message: this.$t("driver.saveSuccess"),
+            type: "success",
+            duration: 2000,
+          });
+          this.getList();
         } else {
-          const isRepeat = new RegExp('Duplicate entry :bar_bcode')
+          const isRepeat = new RegExp("Duplicate entry :bar_bcode");
           if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: this.$t('message.msg256'), duration: 2000 })
-            return false
+            this.$notify({
+              type: "error",
+              message: this.$t("message.msg256"),
+              duration: 2000,
+            });
+            return false;
           }
-          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({
+            title: this.$t("driver.saveFail"),
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
         }
-      })
+      });
     },
     updateCancel(row) {
-      console.log('点击了编辑取消')
+      console.log("点击了编辑取消");
       // 编辑false,不可编辑true
-      row.Edit = false
-      row.NoEdit = true
+      row.Edit = false;
+      row.NoEdit = true;
       // 新增false,编辑true,编辑保存false
-      row.isCreate = false
-      row.isUpdate = true
-      row.isUpdateSave = false
-      this.getList()
+      row.isCreate = false;
+      row.isUpdate = true;
+      row.isUpdateSave = false;
+      this.getList();
     },
     handleRowDelete(row) {
-      console.log('点击了行内删除')
-      MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
-      }).then(() => {
-        this.selectList = []
-        this.requestParam = {}
-        this.requestParam.common = { 'returnmap': '0' }
-        this.requestParam.data = []
-        this.requestParam.data[0] = { 'name': 'checkDeleteBar', 'type': 'v', 'parammaps': {
-          'pastureid': row.pastureid,
-          'id': row.id
-        }}
-        this.requestParam.data[1] = { 'name': 'deleteBar', 'type': 'e', 'parammaps': {
-          'pastureid': row.pastureid,
-          'id': row.id
-        }}
-        ExecDataByConfig(this.requestParam).then(response => {
-          console.log('删除保存发送参数', this.requestParam)
-          if (response.msg === 'fail') {
-            this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
-          } else {
-            this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
-            this.getList()
-          }
-        })
-      }).catch(() => {
-        this.$message({ type: 'info', message: this.$t('common.cancelMsg') })
+      console.log("点击了行内删除");
+      MessageBox.confirm(this.$t("common.delMsg"), {
+        confirmButtonText: this.$t("common.confirm"),
+        cancelButtonText: this.$t("common.cancel"),
+        type: "warning",
       })
+        .then(() => {
+          this.selectList = [];
+          this.requestParam = {};
+          this.requestParam.common = { returnmap: "0" };
+          this.requestParam.data = [];
+          this.requestParam.data[0] = {
+            name: "checkDeleteBar",
+            type: "v",
+            parammaps: {
+              pastureid: row.pastureid,
+              id: row.id,
+            },
+          };
+          this.requestParam.data[1] = {
+            name: "deleteBar",
+            type: "e",
+            parammaps: {
+              pastureid: row.pastureid,
+              id: row.id,
+            },
+          };
+          ExecDataByConfig(this.requestParam).then((response) => {
+            console.log("删除保存发送参数", this.requestParam);
+            if (response.msg === "fail") {
+              this.$notify({
+                title: this.$t("common.delfail"),
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
+            } else {
+              this.$notify({
+                title: "",
+                message: this.$t("common.delSuccess"),
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({ type: "info", message: this.$t("common.cancelMsg") });
+        });
     },
     handleSelectionChange(val) {
-      console.log('勾选数据', val)
-      this.selectList = val
+      console.log("勾选数据", val);
+      this.selectList = val;
     },
     form_delete() {
-      console.log('点击了删除')
+      console.log("点击了删除");
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: this.$t('message.msg258'), duration: 2000 })
+        this.$message({
+          type: "error",
+          message: this.$t("message.msg258"),
+          duration: 2000,
+        });
       } else {
-        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
-        }).then(() => {
-          console.log(this.selectList)
-          this.requestParam = {}
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'checkDeleteBar', 'type': 'v', 'parammaps': {
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid'
-          }}
-          this.requestParam.data[0].children[1] = { 'name': 'deleteBar', 'type': 'e', 'parammaps': {
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('删除保存发送参数', this.requestParam)
-            if (response.msg === 'fail') {
-              this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
+        MessageBox.confirm(
+          this.$t("message.msg29") +
+            this.selectList.length +
+            this.$t("message.msg31"),
+          {
+            confirmButtonText: this.$t("common.confirm"),
+            cancelButtonText: this.$t("common.cancel"),
+            type: "warning",
+          }
+        ).then(() => {
+          console.log(this.selectList);
+          this.requestParam = {};
+          this.requestParam.common = { returnmap: "0" };
+          this.requestParam.data = [];
+          this.requestParam.data[0] = {
+            name: "insertSpotList",
+            resultmaps: { list: this.selectList },
+          };
+          this.requestParam.data[0].children = [];
+          this.requestParam.data[0].children[0] = {
+            name: "checkDeleteBar",
+            type: "v",
+            parammaps: {
+              id: "@insertSpotList.id",
+              pastureid: "@insertSpotList.pastureid",
+            },
+          };
+          this.requestParam.data[0].children[1] = {
+            name: "deleteBar",
+            type: "e",
+            parammaps: {
+              id: "@insertSpotList.id",
+              pastureid: "@insertSpotList.pastureid",
+            },
+          };
+          ExecDataByConfig(this.requestParam).then((response) => {
+            console.log("删除保存发送参数", this.requestParam);
+            if (response.msg === "fail") {
+              this.$notify({
+                title: this.$t("common.delfail"),
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
             } else {
-              this.$notify({ title: '',message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
-              this.getList()
+              this.$notify({
+                title: "",
+                message: this.$t("common.delSuccess"),
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
             }
-          })
-        })
+          });
+        });
       }
     },
     handleChangeOrder() {
-      this.isOrder = false
-      this.rowDrop()
+      this.isOrder = false;
+      this.rowDrop();
     },
 
     saveChangeOrder() {
       // 保存顺序
-      var sortArr = []
+      var sortArr = [];
       for (let i = 0; i < this.table.list.length; i++) {
-        var obj = {}
-        obj.sort = i + 1
-        obj.id = this.table.list[i].id
-        obj.pastureid = this.table.list[i].pastureid
-        sortArr.push(obj)
+        var obj = {};
+        obj.sort = i + 1;
+        obj.id = this.table.list[i].id;
+        obj.pastureid = this.table.list[i].pastureid;
+        sortArr.push(obj);
       }
-      this.requestParam = {}
-      this.requestParam.common = { 'returnmap': '0' }
-      this.requestParam.data = []
-      this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': sortArr }}
-      this.requestParam.data[0].children = []
-      this.requestParam.data[0].children[0] = { 'name': 'updateBarSort', 'type': 'e', 'parammaps': {
-        id: '@insertSpotList.id',
-        pastureid: '@insertSpotList.pastureid',
-        sort: '@insertSpotList.sort'
-      }}
-      this.table.listLoading = true
-      ExecDataByConfig(this.requestParam).then(response => {
-        console.log('顺序切换保存发送参数', this.requestParam)
-        this.table.listLoading = false
-        if (response.msg === 'fail') {
-          this.$notify({ title: this.$t('message.msg51'), message: response.data, type: 'warning', duration: 2000 })
+      this.requestParam = {};
+      this.requestParam.common = { returnmap: "0" };
+      this.requestParam.data = [];
+      this.requestParam.data[0] = {
+        name: "insertSpotList",
+        resultmaps: { list: sortArr },
+      };
+      this.requestParam.data[0].children = [];
+      this.requestParam.data[0].children[0] = {
+        name: "updateBarSort",
+        type: "e",
+        parammaps: {
+          id: "@insertSpotList.id",
+          pastureid: "@insertSpotList.pastureid",
+          sort: "@insertSpotList.sort",
+        },
+      };
+      this.table.listLoading = true;
+      ExecDataByConfig(this.requestParam).then((response) => {
+        console.log("顺序切换保存发送参数", this.requestParam);
+        this.table.listLoading = false;
+        if (response.msg === "fail") {
+          this.$notify({
+            title: this.$t("message.msg51"),
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
         } else {
-          this.$notify({ title: '', message: this.$t('message.msg50'), type: 'success', duration: 2000 })
-          this.getList()
-          this.isOrder = true
+          this.$notify({
+            title: "",
+            message: this.$t("message.msg50"),
+            type: "success",
+            duration: 2000,
+          });
+          this.getList();
+          this.isOrder = true;
         }
-      })
+      });
     },
     cancelChangeOrder() {
       // 取消顺序
-      this.getList()
-      this.isOrder = true
+      this.getList();
+      this.isOrder = true;
     },
 
-     // 行拖拽
+    // 行拖拽
     rowDrop() {
-      console.log(document.querySelector('#table .el-table__body-wrapper tbody'))
-      const tbody = document.querySelector('#table .el-table__body-wrapper tbody')
-      const that = this
+      console.log(
+        document.querySelector("#table .el-table__body-wrapper tbody")
+      );
+      const tbody = document.querySelector(
+        "#table .el-table__body-wrapper tbody"
+      );
+      const that = this;
       var sortable = Sortable.create(tbody, {
         disabled: that.dropState,
         onChoose({ newIndex, oldIndex }) {
-          console.log(that.isOrder, 'that.isOrder == false')
-          console.log(that.dropState, 'that.dropState')
+          console.log(that.isOrder, "that.isOrder == false");
+          console.log(that.dropState, "that.dropState");
           if (that.dropState == true || that.isOrder == true) {
-            sortable.destroy()
+            sortable.destroy();
           }
         },
         onEnd({ newIndex, oldIndex }) {
-          const currRow = that.table.list.splice(oldIndex, 1)[0]
-          that.table.list.splice(newIndex, 0, currRow)
-          console.log('currRow', currRow)
-          console.log('oldIndex', oldIndex)
-          console.log('索引newIndex', newIndex)
-          console.log('拖动数据', currRow)
-          console.log('上', that.table.list[newIndex - 1])
-          console.log('下', that.table.list[newIndex + 1])
-        }
-      })
+          const currRow = that.table.list.splice(oldIndex, 1)[0];
+          that.table.list.splice(newIndex, 0, currRow);
+          console.log("currRow", currRow);
+          console.log("oldIndex", oldIndex);
+          console.log("索引newIndex", newIndex);
+          console.log("拖动数据", currRow);
+          console.log("上", that.table.list[newIndex - 1]);
+          console.log("下", that.table.list[newIndex + 1]);
+        },
+      });
     },
-    handleGetSapCode(){
-        this.dialogFull = false
-        this.sapCode2.dialogStatus = 'sapCode2'
-        this.sapCode2.dialogFormVisible = true
+    handleGetSapCode() {
+      this.dialogFull = false;
+      this.sapCode2.dialogStatus = "sapCode2";
+      this.sapCode2.dialogFormVisible = true;
     },
-    sapCodeData2(){
-      this.$refs['sapCode2'].validate(valid => {
+    sapCodeData2() {
+      this.$refs["sapCode2"].validate((valid) => {
         if (valid) {
-          let url = 'authdata/sap/bar'
+          let url = "authdata/sap/bar";
           let data = {
-            startTime:parseTime(this.sapCode2.temp.inputDatetime[0],'{y}-{m}-{d}'),
-            endTime:parseTime(this.sapCode2.temp.inputDatetime[1],'{y}-{m}-{d}'),
-            pastureId:Cookies.get('pastureid')
-          }
-          postJson(url,data).then(response => {
-            if (response.msg !== 'fail') {
-              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
-              this.sapCode2.dialogFormVisible = false
-              this.getList()
+            startTime: parseTime(
+              this.sapCode2.temp.inputDatetime[0],
+              "{y}-{m}-{d}"
+            ),
+            endTime: parseTime(
+              this.sapCode2.temp.inputDatetime[1],
+              "{y}-{m}-{d}"
+            ),
+            pastureId: Cookies.get("pastureid"),
+          };
+          postJson(url, data).then((response) => {
+            if (response.msg !== "fail") {
+              this.$notify({
+                title: this.$t("common.succes"),
+                message: this.$t("driver.saveSuccess"),
+                type: "success",
+                duration: 2000,
+              });
+              this.sapCode2.dialogFormVisible = false;
+              this.getList();
             } else {
-              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({
+                title: this.$t("driver.saveFail"),
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
             }
-          })
+          });
         }
-      })
+      });
     },
-    getIspalyUd(){
-      let url = 'authdata/GetDataByName'
+    getIspalyUd() {
+      let url = "authdata/GetDataByName";
       let data = {
-        "name":"getSysoptEnable","page":1,"offset":1,"pagecount":1,"returntype":"Map",
-        "parammaps":{"pastureid":Cookies.get('pastureid'),"inforname":"gmUdSync"}
-      }
-      postJson(url,data).then(response => {
-        if (response.msg !== 'fail') {
-          if(response.data.list[0].inforvalue == 0){
-            this.ispalyUd = false
-          }else{
-            this.ispalyUd = true
+        name: "getSysoptEnable",
+        page: 1,
+        offset: 1,
+        pagecount: 1,
+        returntype: "Map",
+        parammaps: {
+          pastureid: Cookies.get("pastureid"),
+          inforname: "gmUdSync",
+        },
+      };
+      postJson(url, data).then((response) => {
+        if (response.msg !== "fail") {
+          if (response.data.list[0].inforvalue == 0) {
+            this.ispalyUd = false;
+          } else {
+            this.ispalyUd = true;
           }
         } else {
-          this.$notify({ title:this.$t('message.msg14'), message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({
+            title: this.$t("message.msg14"),
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
         }
-      })
+      });
     },
-    handleGetUd(){
-      MessageBox.confirm(this.$t('message.msg343'), {
-        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
+    handleGetUd() {
+      MessageBox.confirm(this.$t("message.msg343"), {
+        confirmButtonText: this.$t("common.confirm"),
+        cancelButtonText: this.$t("common.cancel"),
+        type: "warning",
       }).then(() => {
-        let url = 'authdata/gm/udbar'
+        let url = "authdata/gm/udbar";
         let data = {
-          pastureId:Cookies.get('pastureid')
-        }
-        postJson(url,data).then(response => {
-          if (response.msg !== 'fail') {
-            this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
-            this.getList()
+          pastureId: Cookies.get("pastureid"),
+        };
+        postJson(url, data).then((response) => {
+          if (response.msg !== "fail") {
+            this.$notify({
+              title: this.$t("common.succes"),
+              message: this.$t("driver.saveSuccess"),
+              type: "success",
+              duration: 2000,
+            });
+            this.getList();
           } else {
-            this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
+            this.$notify({
+              title: this.$t("driver.saveFail"),
+              message: response.data,
+              type: "warning",
+              duration: 2000,
+            });
           }
-        })
-      })
-    }
-  }
-}
+        });
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .search{margin-top:10px;}
+.search {
+  margin-top: 10px;
+}
 
-  $width:350px;
-  $left:325px;
-  .selectInput{
+$width: 350px;
+$left: 325px;
+.selectInput {
+  position: relative;
+  display: inline-block;
+  .Input {
+    width: $width;
     position: relative;
-    display: inline-block;
-    .Input{width: $width;position: relative;}
-    .el-icon-arrow-down{width: 30px;height: 30px;position: absolute;left: $left;top:10px;color:#C0C4CC;}
-    .el-icon-arrow-up{width: 30px;height: 30px;position: absolute;left: $left;top:10px;color:#C0C4CC;}
-    .selectUl{
-      z-index: 111;width: $width;background: #fff;border: 1px solid #E4E7ED;box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);margin: -1px 0 0 0;padding: 6px 0; margin: 0;box-sizing: border-box;position: absolute;
-      li{
-        list-style: none;font-size: 14px; padding: 0 10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: #606266; height: 50px; line-height: 50px; box-sizing: border-box; cursor: pointer;
-        a{float:left;width: 80px;}
-        a:hover{color: rgba(0, 204, 102, 0.71); font-weight: 700;}
+  }
+  .el-icon-arrow-down {
+    width: 30px;
+    height: 30px;
+    position: absolute;
+    left: $left;
+    top: 10px;
+    color: #c0c4cc;
+  }
+  .el-icon-arrow-up {
+    width: 30px;
+    height: 30px;
+    position: absolute;
+    left: $left;
+    top: 10px;
+    color: #c0c4cc;
+  }
+  .selectUl {
+    z-index: 111;
+    width: $width;
+    background: #fff;
+    border: 1px solid #e4e7ed;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    margin: -1px 0 0 0;
+    padding: 6px 0;
+    margin: 0;
+    box-sizing: border-box;
+    position: absolute;
+    li {
+      list-style: none;
+      font-size: 14px;
+      padding: 0 10px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      color: #606266;
+      height: 50px;
+      line-height: 50px;
+      box-sizing: border-box;
+      cursor: pointer;
+      a {
+        float: left;
+        width: 80px;
+      }
+      a:hover {
+        color: rgba(0, 204, 102, 0.71);
+        font-weight: 700;
       }
     }
   }
-
- </style>
+}
+</style>

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -4193,7 +4193,7 @@ export default {
     handleRowSort(row) {
       this.$prompt(this.$t("message.msg206"), this.$t("message.msg207"), {
         inputPlaceholder: this.$t("message.msg208"),
-        confirmButtonText: "确定",
+        confirmButtonText: this.$t("common.confirm"),
         cancelButtonText: this.$t("common.cancel"),
         inputPattern: /^\d+$/,
         inputErrorMessage: this.$t("message.msg209"),

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -1,16 +1,37 @@
- <template>
+<template>
   <div class="app-container">
     <div class="search">
-      <el-time-picker v-model="table.parammaps.date" style="width: 250px;" value-format="HH:mm:ss" />
-      <el-input v-model="table.parammaps.eqCode" :placeholder="$t('premixedPlan.clbm')" style="width: 180px;" class="filter-item" clearable />
+      <el-time-picker
+        v-model="table.parammaps.date"
+        style="width: 250px"
+        value-format="HH:mm:ss"
+      />
+      <el-input
+        v-model="table.parammaps.eqCode"
+        :placeholder="$t('premixedPlan.clbm')"
+        style="width: 180px"
+        class="filter-item"
+        clearable
+      />
       <!-- <el-select v-model="table.getdataListParm.parammaps.enable" filterable :placeholder="$t('formulationEvaluation.sfqy')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select> -->
-      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
-      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{
+        $t("common.reset")
+      }}</el-button>
+      <el-button class="successBorder" @click="form_search">{{
+        $t("common.query")
+      }}</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">{{$t('formulationEvaluation.add')}}</el-button>
+      <el-button
+        v-if="isRoleEdit"
+        class="success"
+        icon="el-icon-plus"
+        style="float: left"
+        @click="handleCreate"
+        >{{ $t("formulationEvaluation.add") }}</el-button
+      >
     </div>
     <div class="table">
       <el-table
@@ -22,7 +43,7 @@
         border
         fit
         highlight-current-row
-        style="width: 100%;"
+        style="width: 100%"
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
@@ -30,46 +51,144 @@
         :max-height="myHeight"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column :key="1" :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left" />
-        <el-table-column :label="$t('premixedPlan.tlc')" min-width="100px" align="center" class-name="small-padding fixed-width" fixed="left" prop="tname" />
-        <el-table-column :label="$t('premixedPlan.time')"   min-width="100px" align="center" prop="date" />
-        <el-table-column :label="$t('formulationEvaluation.remark')" min-width="100px" align="center" prop="remark" />
-        <el-table-column :label="$t('errorAnalysis.pen')" min-width="100px" align="center" prop="bname" />
-        <el-table-column :label="$t('premixedPlan.status')" min-width="90px" align="center">
+        <el-table-column
+          :key="1"
+          :label="$t('formulationEvaluation.xh')"
+          align="center"
+          type="index"
+          width="50px"
+          class-name="small-padding fixed-width"
+          fixed="left"
+        />
+        <el-table-column
+          :label="$t('premixedPlan.tlc')"
+          min-width="100px"
+          align="center"
+          class-name="small-padding fixed-width"
+          fixed="left"
+          prop="tname"
+        />
+        <el-table-column
+          :label="$t('premixedPlan.time')"
+          min-width="100px"
+          align="center"
+          prop="date"
+        />
+        <el-table-column
+          :label="$t('formulationEvaluation.remark')"
+          min-width="100px"
+          align="center"
+          prop="remark"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.pen')"
+          min-width="100px"
+          align="center"
+          prop="bname"
+        />
+        <el-table-column
+          :label="$t('premixedPlan.status')"
+          min-width="90px"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
+            <el-switch
+              v-model="scope.row.enable"
+              :disabled="scope.row.NoEdit == true"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-value="1"
+              :inactive-value="0"
+              @change="handleEnableChange(scope.$index, scope.row)"
+            />
           </template>
         </el-table-column>
 
-        <el-table-column  :label="$t('errorAnalysis.cz')" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="{row}">
-            <el-button v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <el-button v-if="isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+        <el-table-column
+          :label="$t('errorAnalysis.cz')"
+          align="center"
+          width="80"
+          class-name="small-padding fixed-width"
+          fixed="right"
+        >
+          <template slot-scope="{ row }">
+            <el-button
+              v-if="isRoleEdit"
+              class="miniSuccess"
+              icon="el-icon-edit-outline"
+              @click="handleUpdate(row)"
+            />
+            <el-button
+              v-if="isRoleEdit"
+              class="miniDanger"
+              icon="el-icon-delete"
+              @click="handleRowDelete(row)"
+            />
           </template>
         </el-table-column>
       </el-table>
-      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table.total }}{{$t('processAnalysis.tiao')}}</span>
+      <span
+        v-if="table.listLoading == false"
+        style="margin-right: 30px; margin-top: 10px; font-size: 14px"
+        >{{ $t("processAnalysis.total") }}{{ table.total
+        }}{{ $t("processAnalysis.tiao") }}</span
+      >
     </div>
-     <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="50%">
+    <el-dialog
+      :fullscreen="dialogFull"
+      :visible.sync="create.dialogFormVisible"
+      :close-on-click-modal="false"
+      width="50%"
+    >
       <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" />
-            {{$t('premixedPlan.tljh')}}
+            <span
+              style="
+                display: inline-block;
+                width: 3px;
+                height: 20px;
+                margin-right: 5px;
+                float: left;
+                margin-top: 2px;
+              "
+            />
+            {{ $t("premixedPlan.tljh") }}
           </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+          <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="create.rules" :model="create.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
+        <el-form
+          ref="temp"
+          :rules="create.rules"
+          :model="create.temp"
+          label-position="right"
+          label-width="155px"
+          style="width: 100%; margin: 0 auto 50px"
+        >
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('premixedPlan.tlc')" prop="tmrId">
-                <el-select v-model="create.temp.tmrId" filterable placeholder="推料车" class="filter-item" style="width: 100%;">
-                  <el-option v-for="item in tmrList" :key="item.id" :label="item.tname" :value="item.id" />
+                <el-select
+                  v-model="create.temp.tmrId"
+                  filterable
+                  :placeholder="$t('premixedPlan.tlc')"
+                  class="filter-item"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in tmrList"
+                    :key="item.id"
+                    :label="item.tname"
+                    :value="item.id"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -77,22 +196,48 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('premixedPlan.time')" prop="date">
-                <el-time-picker v-model="create.temp.date" style="width: 100%;" value-format="HH:mm:ss" />
+                <el-time-picker
+                  v-model="create.temp.date"
+                  style="width: 100%"
+                  value-format="HH:mm:ss"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('formulationEvaluation.remark')" prop="remark">
-                <el-input ref="remark" v-model="create.temp.remark" class="filter-item" placeholder="备注" type="text" style="width: 100%;" />
+              <el-form-item
+                :label="$t('formulationEvaluation.remark')"
+                prop="remark"
+              >
+                <el-input
+                  ref="remark"
+                  v-model="create.temp.remark"
+                  class="filter-item"
+                  :placeholder="$t('formulationEvaluation.remark')"
+                  type="text"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('premixedPlan.ls')" prop="barId">
-                <el-select v-model="create.temp.barId" multiple  filterable :placeholder="$t('errorAnalysis.pen')" class="filter-item" style="width: 100%;">
-                  <el-option v-for="item in barList" :key="item.id" :label="item.bname" :value="item.id" />
+                <el-select
+                  v-model="create.temp.barId"
+                  multiple
+                  filterable
+                  :placeholder="$t('errorAnalysis.pen')"
+                  class="filter-item"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in barList"
+                    :key="item.id"
+                    :label="item.bname"
+                    :value="item.id"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -100,38 +245,63 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('premixedPlan.status')" prop="enable">
-                <el-switch v-model="create.temp.enable" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"  />
+                <el-switch
+                  v-model="create.temp.enable"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  :active-value="1"
+                  :inactive-value="0"
+                />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <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" >{{$t('errorAnalysis.confirm')}}</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"
+            >{{ $t("errorAnalysis.confirm") }}</el-button
+          >
         </div>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-import { GetDataByName, postJson,getJson, formatNum, checkButtons } from '@/api/common'
-import { parseTime} from '@/utils/index.js'
-import { MessageBox } from 'element-ui'
-import Cookies from 'js-cookie'
-import axios from 'axios'
-import { getToken } from '@/utils/auth'
+import {
+  GetDataByName,
+  postJson,
+  getJson,
+  formatNum,
+  checkButtons,
+} from "@/api/common";
+import { parseTime } from "@/utils/index.js";
+import { MessageBox } from "element-ui";
+import Cookies from "js-cookie";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
 
 export default {
-  name: 'PushMaterialPlan',
+  name: "PushMaterialPlan",
   data() {
     return {
       table: {
         parammaps: {
-          pastureid: Cookies.get('pastureid'),
-          date:'',
-          eqCode:''
+          pastureid: Cookies.get("pastureid"),
+          date: "",
+          eqCode: "",
         },
         tableKey: 0,
         list: [],
@@ -140,213 +310,307 @@ export default {
       },
       create: {
         dialogFormVisible: false,
-        dialogStatus: '',
-        temp: { pastureId: Cookies.get('pastureid'), tmrId: '',date: '',remark: '',barId: '',enable: ''},
+        dialogStatus: "",
+        temp: {
+          pastureId: Cookies.get("pastureid"),
+          tmrId: "",
+          date: "",
+          remark: "",
+          barId: "",
+          enable: "",
+        },
         rules: {
-          tmrId: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
-          date: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
-          remark: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
-          barId: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
-          enable: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
-        }
+          tmrId: [
+            {
+              required: true,
+              message: this.$t("hardwareTest.bt"),
+              trigger: "blur",
+            },
+          ],
+          date: [
+            {
+              required: true,
+              message: this.$t("hardwareTest.bt"),
+              trigger: "blur",
+            },
+          ],
+          remark: [
+            {
+              required: true,
+              message: this.$t("hardwareTest.bt"),
+              trigger: "blur",
+            },
+          ],
+          barId: [
+            {
+              required: true,
+              message: this.$t("hardwareTest.bt"),
+              trigger: "blur",
+            },
+          ],
+          enable: [
+            {
+              required: true,
+              message: this.$t("hardwareTest.bt"),
+              trigger: "blur",
+            },
+          ],
+        },
       },
       dialogFull: false,
-      tmrList:[],
-      barList:[],
+      tmrList: [],
+      barList: [],
       isRoleEdit: [],
       selectList: [],
       isokDisable: false,
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-      myHeight: document.documentElement.clientHeight - 85- 150,
-    }
+      rowStyle: { maxHeight: 30 + "px", height: 30 + "px" },
+      cellStyle: { padding: 0 + "px" },
+      myHeight: document.documentElement.clientHeight - 85 - 150,
+    };
   },
   created() {
-    this.getButtons()
-    this.getTMR_barList()
-    this.getList()
-
+    this.getButtons();
+    this.getTMR_barList();
+    this.getList();
   },
 
   methods: {
     getButtons() {
-      const Edit = 'PushMaterialPlan'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      this.isRoleEdit = isRoleEdit
+      const Edit = "PushMaterialPlan";
+      const isRoleEdit = checkButtons(
+        JSON.parse(sessionStorage.getItem("buttons")),
+        Edit
+      );
+      this.isRoleEdit = isRoleEdit;
     },
     getTMR_barList() {
-      let url = '/authdata/GetDataByName'
+      let url = "/authdata/GetDataByName";
       let data = {
-        name: 'getTMRList', page: 1, offset: 1,
+        name: "getTMRList",
+        page: 1,
+        offset: 1,
         parammaps: {
-          pastureid: Cookies.get('pastureid'),eqtype:'1'
-        }
-      }
-      postJson(url,data).then(response => {
+          pastureid: Cookies.get("pastureid"),
+          eqtype: "1",
+        },
+      };
+      postJson(url, data).then((response) => {
         if (response.data.list !== null) {
-          this.tmrList = response.data.list
+          this.tmrList = response.data.list;
         } else {
-          this.tmrList = []
+          this.tmrList = [];
         }
-      })
-      let url2 = '/authdata/GetDataByName'
+      });
+      let url2 = "/authdata/GetDataByName";
       let data2 = {
-        name: 'getBarList', page: 1, offset: 1,
+        name: "getBarList",
+        page: 1,
+        offset: 1,
         parammaps: {
-          pastureid: Cookies.get('pastureid')
-        }
-      }
-      postJson(url2,data2).then(response => {
+          pastureid: Cookies.get("pastureid"),
+        },
+      };
+      postJson(url2, data2).then((response) => {
         if (response.data.list !== null) {
-          this.barList = response.data.list
+          this.barList = response.data.list;
         } else {
-          this.barList = []
+          this.barList = [];
         }
-      })
+      });
     },
     getList() {
-      this.table.listLoading = true
-      let url = '/authdata/tmrequipment'
-      let data = '?pastureId='+ Cookies.get('pastureid') +'&offset=1' + '&page=50'+'&date='+this.table.parammaps.date +'&eqCode='+this.table.parammaps.eqCode
-      getJson(url,data).then(response => {
-        console.log('table数据', response.data.list)
+      this.table.listLoading = true;
+      let url = "/authdata/tmrequipment";
+      let data =
+        "?pastureId=" +
+        Cookies.get("pastureid") +
+        "&offset=1" +
+        "&page=50" +
+        "&date=" +
+        this.table.parammaps.date +
+        "&eqCode=" +
+        this.table.parammaps.eqCode;
+      getJson(url, data).then((response) => {
+        console.log("table数据", response.data.list);
         if (response.data.list !== null) {
-          this.table.list = response.data.data
+          this.table.list = response.data.data;
         } else {
-          this.table.list = []
+          this.table.list = [];
         }
-        this.table.total = response.data.count
+        this.table.total = response.data.count;
         setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
+          this.table.listLoading = false;
+        }, 100);
+      });
     },
-     // 新增
+    // 新增
     handleCreate() {
-      this.resetTemp()
-      this.dialogFull = false
-      this.create.dialogStatus = 'create'
-      this.create.dialogFormVisible = true
+      this.resetTemp();
+      this.dialogFull = false;
+      this.create.dialogStatus = "create";
+      this.create.dialogFormVisible = true;
     },
     resetTemp() {
-      this.create.temp.tmrId = ''
-      this.create.temp.pastureId = Cookies.get('pastureid')
-      this.create.temp.date = ''
-      this.create.temp.remark = ''
-      this.create.temp.barId = ''
-      this.create.temp.enable = 1
+      this.create.temp.tmrId = "";
+      this.create.temp.pastureId = Cookies.get("pastureid");
+      this.create.temp.date = "";
+      this.create.temp.remark = "";
+      this.create.temp.barId = "";
+      this.create.temp.enable = 1;
     },
-    createData(){
-      this.isokDisable = true
+    createData() {
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.$refs['temp'].validate(valid => {
+        this.isokDisable = false;
+      }, 1000);
+      this.$refs["temp"].validate((valid) => {
         if (valid) {
-          let url = '/authdata/tmrequipment/edit'
-          let data = this.create.temp
-          data.barId = this.create.temp.barId.join()
+          let url = "/authdata/tmrequipment/edit";
+          let data = this.create.temp;
+          data.barId = this.create.temp.barId.join();
           // data.date = parseTime(this.create.temp.date,'{h}:{i}:{s}')
-          postJson(url,data).then(response => {
-            if(response.msg == 'fail'){
-              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
-            }else{
-              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
-              this.create.dialogFormVisible = false
-              this.getList()
+          postJson(url, data).then((response) => {
+            if (response.msg == "fail") {
+              this.$notify({
+                title: this.$t("driver.saveFail"),
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
+            } else {
+              this.$notify({
+                title: this.$t("common.succes"),
+                message: this.$t("driver.saveSuccess"),
+                type: "success",
+                duration: 2000,
+              });
+              this.create.dialogFormVisible = false;
+              this.getList();
             }
-          })
+          });
         }
-      })
+      });
     },
     // 编辑
     handleUpdate(row) {
-      this.create.temp = Object.assign({},row)
-      this.create.temp.barId = row.barId.split(',')
-      this.dialogFull = false
-      this.create.dialogStatus = 'create'
-      this.create.dialogFormVisible = true
+      this.create.temp = Object.assign({}, row);
+      this.create.temp.barId = row.barId.split(",");
+      this.dialogFull = false;
+      this.create.dialogStatus = "create";
+      this.create.dialogFormVisible = true;
     },
     updateData(row) {
-      this.isokDisable = true
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.$refs['temp'].validate(valid => {
+        this.isokDisable = false;
+      }, 1000);
+      this.$refs["temp"].validate((valid) => {
         if (valid) {
-          let url = '/authdata/tmrequipment/edit'
-          let data = this.create.temp
-          data.barId = this.create.temp.barId.join()
+          let url = "/authdata/tmrequipment/edit";
+          let data = this.create.temp;
+          data.barId = this.create.temp.barId.join();
           // data.date = parseTime(this.create.temp.date,'{h}:{i}:{s}')
-          postJson(url,data).then(response => {
-            if(response.msg == 'fail'){
-              this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
-            }else{
-              this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
-              this.create.dialogFormVisible = false
-              this.getList()
+          postJson(url, data).then((response) => {
+            if (response.msg == "fail") {
+              this.$notify({
+                title: this.$t("driver.saveFail"),
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
+            } else {
+              this.$notify({
+                title: this.$t("common.succes"),
+                message: this.$t("driver.saveSuccess"),
+                type: "success",
+                duration: 2000,
+              });
+              this.create.dialogFormVisible = false;
+              this.getList();
             }
-          })
+          });
         }
-      })
+      });
     },
-    handleRowDelete(row){
-      let url = '/authdata/tmrequipment/del'
-      let data = {}
-      data.id = row.id
-      postJson(url,data).then(response => {
-        if(response.msg == 'fail'){
-          this.$notify({ title: this.$t('common.delfail'), message: response.data, type: 'warning', duration: 2000 })
-        }else{
-          this.$notify({ title: this.$t('common.succes'),message: this.$t('common.delSuccess'), type: 'success', duration: 2000 })
-          this.getList()
+    handleRowDelete(row) {
+      let url = "/authdata/tmrequipment/del";
+      let data = {};
+      data.id = row.id;
+      postJson(url, data).then((response) => {
+        if (response.msg == "fail") {
+          this.$notify({
+            title: this.$t("common.delfail"),
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
+        } else {
+          this.$notify({
+            title: this.$t("common.succes"),
+            message: this.$t("common.delSuccess"),
+            type: "success",
+            duration: 2000,
+          });
+          this.getList();
         }
-      })
+      });
     },
     handleSelect(val) {
-      console.log('勾选数据', val)
-      this.selectList = val
+      console.log("勾选数据", val);
+      this.selectList = val;
     },
-    handleEnableChange(index,row) {
-      console.log('点击了是否启用')
-      let url = '/authdata/tmrequipment/edit'
-      let data = row
+    handleEnableChange(index, row) {
+      console.log("点击了是否启用");
+      let url = "/authdata/tmrequipment/edit";
+      let data = row;
       // data.barId = row.barId.join()
       // data.date = parseTime(this.create.temp.date,'{h}:{i}:{s}')
-      postJson(url,data).then(response => {
-        if(response.msg == 'fail'){
-          this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
-        }else{
-          this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success', duration: 2000 })
-          this.create.dialogFormVisible = false
-          this.getList()
+      postJson(url, data).then((response) => {
+        if (response.msg == "fail") {
+          this.$notify({
+            title: this.$t("driver.saveFail"),
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
+        } else {
+          this.$notify({
+            title: this.$t("common.succes"),
+            message: this.$t("driver.saveSuccess"),
+            type: "success",
+            duration: 2000,
+          });
+          this.create.dialogFormVisible = false;
+          this.getList();
         }
-      })
+      });
     },
 
     form_search() {
-      console.log('点击了查询')
-      this.getList()
+      console.log("点击了查询");
+      this.getList();
     },
-    handleRefresh(){
-      this.table.parammaps.date = ''
-      this.table.parammaps.eqCode = ''
-    }
-  }
-}
+    handleRefresh() {
+      this.table.parammaps.date = "";
+      this.table.parammaps.eqCode = "";
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .search {
-    clear: both;
-  }
+.search {
+  clear: both;
+}
 
-  .table {
-    margin-top: 10px;
-  }
-  .el-tag{margin-right: 5px;}
+.table {
+  margin-top: 10px;
+}
+.el-tag {
+  margin-right: 5px;
+}
 </style>
 <style lang="scss">
-  .red-row{
-    background: #fde2e2 !important;
-  }
+.red-row {
+  background: #fde2e2 !important;
+}
 </style>

src/views/formulationPlan/recipeTemplate/index.vue

@@ -1143,7 +1143,7 @@ export default {
         // 为数值的参数
         numParams: this.$t('message.recipe.numParams'),
       }
-      
+
     },
     // 设置上传地址
     uploadExcelUrl() {
@@ -1243,7 +1243,7 @@ export default {
             }
           }, 0)
           // 后台待发
-          sums[index] += '(干物质量：' + this.template.table2.getdataListParm.parammaps.dryweight + ')'
+          sums[index] += this.$t('message.msg352') + this.template.table2.getdataListParm.parammaps.dryweight + ')'
         } else {
           sums[index] = ''
         }
@@ -1960,7 +1960,7 @@ export default {
              const data1 = this.formatJson(filterVal, list1)
              excel.export_json_to_excel({ header: tHeader, data: data1, filename: this.$t('message.msg56'), autoWidth: true, bookType: 'xlsx' })
            })
-          
+
         }
       } else {
         const isRepeat = new RegExp('Duplicate entry :feedtemplet_tname')

src/views/leftoverManagement/index.vue

@@ -1,30 +1,29 @@
 <template>
   <div class="container">
     <div class="header-box">
-      <p> 剩料计划</p>
-      <el-button type="primary" plain class="add-btn" @click="dialogVisible = true">新 增</el-button>
+      <p>剩料计划</p>
+      <el-button
+        type="primary"
+        plain
+        class="add-btn"
+        @click="dialogVisible = true"
+        >新 增</el-button
+      >
     </div>
 
     <div class="table">
       <el-table
-       element-loading-text="给我一点时间"
+        element-loading-text="给我一点时间"
         :data="tableData"
         border
         fit
         highlight-current-row
-        style="width: 100%;"
+        style="width: 100%"
         class="elTable table-fixed"
-        >
-        <el-table-column
-          label="序号"
-          width="60"
-          type="index"
-          >
+      >
+        <el-table-column label="序号" width="60" type="index">
         </el-table-column>
-        <el-table-column
-          label="替代方案"
-          prop="name"
-          width="180">
+        <el-table-column label="替代方案" prop="name" width="180">
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -32,146 +31,153 @@
               size="mini"
               class="miniSuccess"
               icon="el-icon-edit-outline"
-              @click="handleEdit(scope.$index, scope.row)"></el-button>
+              @click="handleEdit(scope.$index, scope.row)"
+            ></el-button>
             <el-button
               size="mini"
               type="danger"
               icon="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)"></el-button>
+              @click="handleDelete(scope.$index, scope.row)"
+            ></el-button>
           </template>
         </el-table-column>
       </el-table>
       <!--  -->
       <el-pagination
-      class="page"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page.sync="currentPage1"
-      :page-size="100"
-      layout="total, prev, pager, next"
-      :total="1000">
-    </el-pagination>
-     </div>
-
-     <!-- 新增删除提示 -->
-     <el-dialog
-        title="剩料新增"
-        :visible.sync="dialogVisible"
-        width="30%"
-       >
-        <div>
-          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-            <el-form-item label="替代方案" prop="name">
-              <el-select v-model="ruleForm.name" placeholder="请选择替代方案">
-                <el-option label="日料" value="1"></el-option>
-                <el-option label="豆bo" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-form>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button class="add-btn" @click="dialogVisible = false">取 消</el-button>
-          <el-button class="add-btn" type="primary" @click="dialogVisible = false">确 定</el-button>
-        </span>
-      </el-dialog>
+        class="page"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page.sync="currentPage1"
+        :page-size="100"
+        layout="total, prev, pager, next"
+        :total="1000"
+      >
+      </el-pagination>
+    </div>
 
+    <!-- 新增删除提示 -->
+    <el-dialog title="剩料新增" :visible.sync="dialogVisible" width="30%">
+      <div>
+        <el-form
+          :model="ruleForm"
+          :rules="rules"
+          ref="ruleForm"
+          label-width="100px"
+          class="demo-ruleForm"
+        >
+          <el-form-item label="替代方案" prop="name">
+            <el-select v-model="ruleForm.name" placeholder="请选择替代方案">
+              <el-option label="日料" value="1"></el-option>
+              <el-option label="豆bo" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="add-btn" @click="dialogVisible = false"
+          >取 消</el-button
+        >
+        <el-button class="add-btn" type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-  import {
-    GetDataByName,
-    GetDataByNames
-  } from '@/api/common'
-  import Cookies from 'js-cookie'
-  import {
-    MessageBox
-  } from 'element-ui'
-  export default {
-    name: 'LeftoverManagement',
-    data() {
-      return {
-        tableData: [{
-          id:1,
-          num: '1',
-          name: '日粮',
-        }, {
-          id:2,
-          num: '2',
-          name: '豆泊',
-        }, {
-          id:3,
-          num: '3',
-          name: '日粮',
-        }],
-        currentPage1: 1,
-        dialogVisible:false,
-        //
-        ruleForm: {
-          name: '',
+import { GetDataByName, GetDataByNames } from "@/api/common";
+import Cookies from "js-cookie";
+import { MessageBox } from "element-ui";
+export default {
+  name: "LeftoverManagement",
+  data() {
+    return {
+      tableData: [
+        {
+          id: 1,
+          num: "1",
+          name: "日粮",
         },
-        rules:{
-          name: [
-            { required: true, message: '请选择替代方案', trigger: 'change' }
-          ]
-        }
-      }
-    },
-    created() {},
-    methods: {
-      handleEdit(index, row) {
-        console.log(index, row);
-        // 获取当前数据,点击编辑
-        this.ruleForm = row;
-        this.dialogVisible = true;
+        {
+          id: 2,
+          num: "2",
+          name: "豆泊",
+        },
+        {
+          id: 3,
+          num: "3",
+          name: "日粮",
+        },
+      ],
+      currentPage1: 1,
+      dialogVisible: false,
+      //
+      ruleForm: {
+        name: "",
+      },
+      rules: {
+        name: [
+          { required: true, message: "请选择替代方案", trigger: "change" },
+        ],
       },
-      handleDelete(index, row) {
-        console.log(index, row);
-        this.$confirm('确定删除当前剩料配置吗?', this.$t('message.msg111'), {
-          confirmButtonText: '确定',
-          cancelButtonText: this.$t('common.cancel'),
-          type: 'warning'
-        }).then(() => {
+    };
+  },
+  created() {},
+  methods: {
+    handleEdit(index, row) {
+      console.log(index, row);
+      // 获取当前数据,点击编辑
+      this.ruleForm = row;
+      this.dialogVisible = true;
+    },
+    handleDelete(index, row) {
+      console.log(index, row);
+      this.$confirm("确定删除当前剩料配置吗?", this.$t("message.msg111"), {
+        confirmButtonText: this.$t("common.confirm"),
+        cancelButtonText: this.$t("common.cancel"),
+        type: "warning",
+      })
+        .then(() => {
           this.$message({
-            type: 'success',
-            message: '删除成功!'
+            type: "success",
+            message: "删除成功!",
           });
-        }).catch(() => {
+        })
+        .catch(() => {
           this.$message({
-            type: 'info',
-            message: this.$t('common.cancelMsg')
+            type: "info",
+            message: this.$t("common.cancelMsg"),
           });
-        })
-      },
-      //
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-      },
-      handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
-      }
-
+        });
     },
-
-  }
+    //
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .header-box{
-    display: flex;
-    justify-content: space-between;
-  }
+.header-box {
+  display: flex;
+  justify-content: space-between;
+}
 
-  .container{
-    padding: 15px;
-    min-height:600px;
-    margin-left:10px;
-    .add-btn{
-      width:90px;
-      height:40px;
-    }
-    .page{
-      margin-top:20px;
-    }
+.container {
+  padding: 15px;
+  min-height: 600px;
+  margin-left: 10px;
+  .add-btn {
+    width: 90px;
+    height: 40px;
+  }
+  .page {
+    margin-top: 20px;
   }
+}
 </style>

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

@@ -3584,7 +3584,12 @@ export default {
             sheetName: this.$t("errorAnalysis.hltj"),
           },
         ];
-        json2excel(excelDatasTabChart5, "混料统计", true, "xlsx");
+        json2excel(
+          excelDatasTabChart5,
+          this.$t("errorAnalysis.hltj"),
+          true,
+          "xlsx"
+        );
       } else if (item == "chart6") {
         console.log("混料计划取消次数导出");
         var excelDatasTabChart5 = [

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

@@ -2,30 +2,122 @@
   <div class="app-container">
     <div class="search">
       <div>
-        <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
-        <el-button style="float: left;margin-bottom: 10px;" class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
-        <el-button style="float: left;margin-bottom: 10px;" class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
+        <el-date-picker
+          v-model="table.getdataListParm.parammaps.inputDatetime"
+          :clearable="false"
+          style="width: 250px; float: left; margin-bottom: 10px"
+          class="inputDatetime filter-item"
+          type="daterange"
+          :range-separator="$t('common.to')"
+          :start-placeholder="$t('common.startTime')"
+          :end-placeholder="$t('common.endTime')"
+          :picker-options="pickerOptions"
+        />
+        <el-button
+          style="float: left; margin-bottom: 10px"
+          class="el-icon-arrow-left elIconArrowLeft"
+          :disabled="Beforedisabled"
+          @click="handleBefore"
+        />
+        <el-button
+          style="float: left; margin-bottom: 10px"
+          class="el-icon-arrow-right elIconArrowRight"
+          :disabled="Nextdisabled"
+          @click="handleNext"
+        />
       </div>
-      <div style="clear: both;">
-        <el-select v-model="table.getdataListParm.parammaps.pastureid"
-:placeholder="$t('supplier.mc')" class="filter-item" style="width: 120px;float: left;">
-          <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
+      <div style="clear: both">
+        <el-select
+          v-model="table.getdataListParm.parammaps.pastureid"
+          :placeholder="$t('supplier.mc')"
+          class="filter-item"
+          style="width: 120px; float: left"
+        >
+          <el-option
+            v-for="item in pastureList"
+            :key="item.pastureid"
+            :label="item.pasturename"
+            :value="item.pastureid"
+          />
         </el-select>
-        <el-input v-model="table.getdataListParm.parammaps.tmrtname" style="width: 110px;float: left;"  :placeholder="$t('processAnalysis.tmrName')"   class="filter-item" clearable />
-        <el-input v-model="table.getdataListParm.parammaps.projname" style="width: 100px;float: left;" :placeholder="$t('errorAnalysis.projname')"  class="filter-item" clearable />
-        <el-select v-model="table.getdataListParm.parammaps.times" style="width: 100px;float: left;" filterable :placeholder="$t('errorAnalysis.isTrainNumber')"  class="filter-item" clearable>
-          <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+        <el-input
+          v-model="table.getdataListParm.parammaps.tmrtname"
+          style="width: 110px; float: left"
+          :placeholder="$t('processAnalysis.tmrName')"
+          class="filter-item"
+          clearable
+        />
+        <el-input
+          v-model="table.getdataListParm.parammaps.projname"
+          style="width: 100px; float: left"
+          :placeholder="$t('errorAnalysis.projname')"
+          class="filter-item"
+          clearable
+        />
+        <el-select
+          v-model="table.getdataListParm.parammaps.times"
+          style="width: 100px; float: left"
+          filterable
+          :placeholder="$t('errorAnalysis.isTrainNumber')"
+          class="filter-item"
+          clearable
+        >
+          <el-option
+            v-for="item in frequencyList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
         </el-select>
-        <el-input v-model="table.getdataListParm.parammaps.templetname" style="width: 120px;float: left;" placeholder="配方名称" class="filter-item" clearable />
-        <el-select v-model="table.getdataListParm.parammaps.buttontype" style="width: 120px;float: left;" filterable :placeholder="$t('errorAnalysis.tzfs')"class="filter-item" clearable>
-          <el-option v-for="item in jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
+        <el-input
+          v-model="table.getdataListParm.parammaps.templetname"
+          style="width: 120px; float: left"
+          placeholder="配方名称"
+          class="filter-item"
+          clearable
+        />
+        <el-select
+          v-model="table.getdataListParm.parammaps.buttontype"
+          style="width: 120px; float: left"
+          filterable
+          :placeholder="$t('errorAnalysis.tzfs')"
+          class="filter-item"
+          clearable
+        >
+          <el-option
+            v-for="item in jumpModeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
         </el-select>
-        <el-select v-model="table.getdataListParm.parammaps.isuse" style="width: 120px;float: left;" filterable placeholder="上传状态" class="filter-item" clearable>
-          <el-option v-for="item in isuseList" :key="item.id" :label="item.name" :value="item.id" />
+        <el-select
+          v-model="table.getdataListParm.parammaps.isuse"
+          style="width: 120px; float: left"
+          filterable
+          placeholder="上传状态"
+          class="filter-item"
+          clearable
+        >
+          <el-option
+            v-for="item in isuseList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
         </el-select>
-        <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
-        <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
-        <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport">{{$t('dashboard.Export')}}</el-button>
+        <el-button class="successBorder" @click="form_search">{{
+          $t("common.query")
+        }}</el-button>
+        <el-button class="successBorder" @click="handleRefresh">{{
+          $t("common.reset")
+        }}</el-button>
+        <el-button
+          class="export"
+          style="float: right; margin-right: 10px; margin-bottom: 10px"
+          @click="handleExport"
+          >{{ $t("dashboard.Export") }}</el-button
+        >
       </div>
     </div>
 
@@ -38,270 +130,490 @@
         border
         fit
         highlight-current-row
-        style="width: 100%;"
+        style="width: 100%"
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
         :height="myHeight2"
       >
-        <el-table-column :label="$t('feedingEfficiency.mc')"min-width="90px" align="center" prop="牧场" />
-        <el-table-column :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
-        <el-table-column :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
-        <el-table-column :label="$t('errorAnalysis.projname')" min-width="50px" align="center" prop="车次" />
-        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="50px" align="center" prop="班次" />
-        <el-table-column  :label="$t('errorAnalysis.feedName')"  min-width="90px" align="center" prop="配方名称" />
-        <el-table-column :label="$t('errorAnalysis.isFeed')"  min-width="70px" align="center" prop="饲料" />
-        <el-table-column  :label="$t('errorAnalysis.llzl')"  min-width="55px" align="center" prop="理论重量" />
-        <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="55px" align="center" prop="实际重量" />
-        <el-table-column :label="$t('errorAnalysis.wcz')" min-width="45px" align="center" prop="误差值" />
-        <el-table-column :label="$t('errorAnalysis.zql')" min-width="45px" align="center" prop="准确率" />
-        <el-table-column :label="$t('errorAnalysis.planTime')"  min-width="55px" align="center" prop="计划时间" />
-        <el-table-column :label="$t('errorAnalysis.startTime')"  min-width="55px" align="center" prop="开始时间" />
-        <el-table-column :label="$t('errorAnalysis.endTime')"  min-width="55px" align="center" prop="结束时间" />
-        <el-table-column :label="$t('errorAnalysis.jsTime')"  min-width="55px" align="center" prop="搅拌时间" />
-        <el-table-column :label="$t('errorAnalysis.tzfs')"  min-width="55px" align="center" prop="跳转方式" />
-        <el-table-column :label="$t('errorAnalysis.stWeight')"  min-width="55px" align="center" prop="开始重量" />
-        <el-table-column :label="$t('errorAnalysis.edWeight')"  min-width="55px" align="center" prop="结束重量" />
+        <el-table-column
+          :label="$t('feedingEfficiency.mc')"
+          min-width="90px"
+          align="center"
+          prop="牧场"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.date')"
+          min-width="70px"
+          align="center"
+          prop="日期"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.tmrnames')"
+          min-width="70px"
+          align="center"
+          prop="TMR名称"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.projname')"
+          min-width="50px"
+          align="center"
+          prop="车次"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.isTrainNumber')"
+          min-width="50px"
+          align="center"
+          prop="班次"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.feedName')"
+          min-width="90px"
+          align="center"
+          prop="配方名称"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.isFeed')"
+          min-width="70px"
+          align="center"
+          prop="饲料"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.llzl')"
+          min-width="55px"
+          align="center"
+          prop="理论重量"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.acWeight')"
+          min-width="55px"
+          align="center"
+          prop="实际重量"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.wcz')"
+          min-width="45px"
+          align="center"
+          prop="误差值"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.zql')"
+          min-width="45px"
+          align="center"
+          prop="准确率"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.planTime')"
+          min-width="55px"
+          align="center"
+          prop="计划时间"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.startTime')"
+          min-width="55px"
+          align="center"
+          prop="开始时间"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.endTime')"
+          min-width="55px"
+          align="center"
+          prop="结束时间"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.jsTime')"
+          min-width="55px"
+          align="center"
+          prop="搅拌时间"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.tzfs')"
+          min-width="55px"
+          align="center"
+          prop="跳转方式"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.stWeight')"
+          min-width="55px"
+          align="center"
+          prop="开始重量"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.edWeight')"
+          min-width="55px"
+          align="center"
+          prop="结束重量"
+        />
       </el-table>
     </div>
   </div>
 </template>
 
 <script>
-import echarts from 'echarts'
+import echarts from "echarts";
 
-require('echarts/theme/macarons')
-import { GetDataByName, GetReportform, GetDataByNames } from '@/api/common'
-import Cookies from 'js-cookie'
-import { parseTime } from '@/utils/index.js'
-import Pagination from '@/components/Pagination'
-import { json2excel } from '@/utils/index.js'
-import { MessageBox } from 'element-ui'
+require("echarts/theme/macarons");
+import { GetDataByName, GetReportform, GetDataByNames } from "@/api/common";
+import Cookies from "js-cookie";
+import { parseTime } from "@/utils/index.js";
+import Pagination from "@/components/Pagination";
+import { json2excel } from "@/utils/index.js";
+import { MessageBox } from "element-ui";
 export default {
-  name: 'Tab2',
+  name: "Tab2",
   components: { Pagination },
   data() {
     return {
       Beforedisabled: false,
       Nextdisabled: false,
-      pickerMinDate: '',
+      pickerMinDate: "",
       pickerOptions: {
         onPick: ({ maxDate, minDate }) => {
-          this.pickerMinDate = minDate.getTime()
+          this.pickerMinDate = minDate.getTime();
           if (maxDate) {
-            this.pickerMinDate = ''
+            this.pickerMinDate = "";
           }
         },
         // 限制不能选择今天之后的日期
         disabledDate: (time) => {
-          if (this.pickerMinDate !== '') {
-            const one = 31 * 24 * 3600 * 1000
-            const minTime = this.pickerMinDate - one
-            let maxTime = this.pickerMinDate + one
+          if (this.pickerMinDate !== "") {
+            const one = 31 * 24 * 3600 * 1000;
+            const minTime = this.pickerMinDate - one;
+            let maxTime = this.pickerMinDate + one;
             if (maxTime > new Date()) {
-              maxTime = new Date()
+              maxTime = new Date();
             }
-            return time.getTime() < minTime || time.getTime() > maxTime
+            return time.getTime() < minTime || time.getTime() > maxTime;
           }
-          return time.getTime() > Date.now()
-        }
+          return time.getTime() > Date.now();
+        },
       },
       requestParams: [
-        { name: 'getPastureListJT', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid'), pasturename: '' }}
+        {
+          name: "getPastureListJT",
+          offset: 0,
+          pagecount: 0,
+          parammaps: { pastureid: Cookies.get("pastureid"), pasturename: "" },
+        },
       ],
       pastureList: [], // 牧场
       // 班次
       maxTime: {
         getMaxTimesParm: {
-          name: 'getSysoptEnable',
+          name: "getSysoptEnable",
           page: 1,
           offset: 1,
           pagecount: 1,
-          returntype: 'Map',
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'times'
-          }
-        }
+            pastureid: Cookies.get("pastureid"),
+            inforname: "times",
+          },
+        },
       },
       frequencyList: [],
-      jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1',  name:this.$t('errorAnalysis.zdtz') }],
-      isuseList: [{ id: '0',  name:this.$t('errorAnalysis.wwc')}, { id: '2', name:this.$t('errorAnalysis.bfwc')}, { id: '1',  name:this.$t('errorAnalysis.qbwc') }],
+      jumpModeList: [
+        { id: "0", name: this.$t("errorAnalysis.sdtz") },
+        { id: "1", name: this.$t("errorAnalysis.zdtz") },
+      ],
+      isuseList: [
+        { id: "0", name: this.$t("errorAnalysis.wwc") },
+        { id: "2", name: this.$t("errorAnalysis.bfwc") },
+        { id: "1", name: this.$t("errorAnalysis.qbwc") },
+      ],
       table: {
         getdataListParm: {
-          name: 'getStatisticsHL',
+          name: "getStatisticsHL",
           page: 1,
           offset: 1,
-          pagecount: '',
-          returntype: 'Map',
+          pagecount: "",
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            startTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
+            pastureid: Cookies.get("pastureid"),
+            startTime: parseTime(new Date(), "{y}-{m}-{d}"),
+            stopTime: parseTime(new Date(), "{y}-{m}-{d}"),
             inputDatetime: [new Date(), new Date()],
-            tmrtname: '',
-            projname: '',
-            times: '',
-            buttontype: '',
-            templetname: ''
-          }
+            tmrtname: "",
+            projname: "",
+            times: "",
+            buttontype: "",
+            templetname: "",
+          },
         },
         tableKey: 1,
         list: [],
         total: 0,
         listLoading: true,
-        temp: {}
+        temp: {},
       },
 
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-      myHeight2: document.documentElement.clientHeight - 85 - 210
-    }
+      rowStyle: { maxHeight: 30 + "px", height: 30 + "px" },
+      cellStyle: { padding: 0 + "px" },
+      myHeight2: document.documentElement.clientHeight - 85 - 210,
+    };
   },
   created() {
-    this.getTimeFn()
-    this.getDownList()
-    this.getIsDisplay()
+    this.getTimeFn();
+    this.getDownList();
+    this.getIsDisplay();
   },
   activated() {
-    this.getDownList()
-    this.getIsDisplay()
+    this.getDownList();
+    this.getIsDisplay();
   },
   methods: {
     getTimeFn() {
-      const that = this
-      const start = new Date()
-      const end = new Date()
-      const start2 = new Date()
-      const end2 = new Date()
-      start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
-      end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
-      that.table.getdataListParm.parammaps.inputDatetime = [start2, end2]
-      that.table.getdataListParm.parammaps.startTime = parseTime(start2, '{y}-{m}-{d}')
-      that.table.getdataListParm.parammaps.stopTime = parseTime(end2, '{y}-{m}-{d}')
+      const that = this;
+      const start = new Date();
+      const end = new Date();
+      const start2 = new Date();
+      const end2 = new Date();
+      start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1);
+      end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1);
+      that.table.getdataListParm.parammaps.inputDatetime = [start2, end2];
+      that.table.getdataListParm.parammaps.startTime = parseTime(
+        start2,
+        "{y}-{m}-{d}"
+      );
+      that.table.getdataListParm.parammaps.stopTime = parseTime(
+        end2,
+        "{y}-{m}-{d}"
+      );
     },
     getIsDisplay() {
-      GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
+      GetDataByName(this.maxTime.getMaxTimesParm).then((response) => {
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+          ];
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+          ];
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+          ];
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+          ];
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+            { id: "3", name: this.$t("errorAnalysis.three") },
+          ];
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+            { id: "3", name: this.$t("errorAnalysis.three") },
+          ];
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+            { id: "3", name: this.$t("errorAnalysis.three") },
+          ];
         } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+            { id: "3", name: this.$t("errorAnalysis.three") },
+            { id: "4", name: this.$t("errorAnalysis.four") },
+          ];
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+            { id: "3", name: this.$t("errorAnalysis.three") },
+            { id: "4", name: this.$t("errorAnalysis.four") },
+          ];
         }
-      })
+      });
     },
     getDownList() {
-      GetDataByNames(this.requestParams).then(response => {
-        this.pastureList = response.data.getPastureListJT.list
-        this.table.getdataListParm.parammaps.pastureid = response.data.getPastureListJT.list[0].pastureid
-        this.getList()
-      })
+      GetDataByNames(this.requestParams).then((response) => {
+        this.pastureList = response.data.getPastureListJT.list;
+        this.table.getdataListParm.parammaps.pastureid =
+          response.data.getPastureListJT.list[0].pastureid;
+        this.getList();
+      });
     },
     getList() {
-      this.table.listLoading = true
-      GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('混料统计table数据', response.data.list)
+      this.table.listLoading = true;
+      GetDataByName(this.table.getdataListParm).then((response) => {
+        console.log("混料统计table数据", response.data.list);
         if (response.data.list !== null) {
-          this.table.list = response.data.list
-          this.table.total = response.data.total
+          this.table.list = response.data.list;
+          this.table.total = response.data.total;
         } else {
-          this.table.list = []
+          this.table.list = [];
         }
         setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
+          this.table.listLoading = false;
+        }, 100);
+      });
     },
     form_search() {
-      this.table.getdataListParm.name = 'getStatisticsHL'
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        console.log(this.table.getdataListParm.parammaps.inputDatetime)
-        this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.table.getdataListParm.name = "getStatisticsHL";
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        console.log(this.table.getdataListParm.parammaps.inputDatetime);
+        this.table.getdataListParm.parammaps.startTime = parseTime(
+          this.table.getdataListParm.parammaps.inputDatetime[0],
+          "{y}-{m}-{d}"
+        );
+        this.table.getdataListParm.parammaps.stopTime = parseTime(
+          this.table.getdataListParm.parammaps.inputDatetime[1],
+          "{y}-{m}-{d}"
+        );
       } else {
-        this.table.getdataListParm.parammaps.inputDatetime = ''
-        this.table.getdataListParm.parammaps.startTime = ''
-        this.table.getdataListParm.parammaps.stopTime = ''
+        this.table.getdataListParm.parammaps.inputDatetime = "";
+        this.table.getdataListParm.parammaps.startTime = "";
+        this.table.getdataListParm.parammaps.stopTime = "";
       }
-      this.table.getdataListParm.offset = 1
-      this.getList()
+      this.table.getdataListParm.offset = 1;
+      this.getList();
     },
     handleRefresh() {
-      this.table.getdataListParm.parammaps.tmrtname = ''
-      this.table.getdataListParm.parammaps.projname = ''
-      this.table.getdataListParm.parammaps.times = ''
-      this.table.getdataListParm.parammaps.templetname = ''
-      this.table.getdataListParm.parammaps.buttontype = ''
-      this.getList()
+      this.table.getdataListParm.parammaps.tmrtname = "";
+      this.table.getdataListParm.parammaps.projname = "";
+      this.table.getdataListParm.parammaps.times = "";
+      this.table.getdataListParm.parammaps.templetname = "";
+      this.table.getdataListParm.parammaps.buttontype = "";
+      this.getList();
     },
     handleBefore() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        var start = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[0].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1
+          )
+        );
+        var stop = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[1].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1
+          )
+        );
         if (stop > Date.now() - 8.64e7) {
-          this.Nextdisabled = true
-          this.Beforedisabled = false
+          this.Nextdisabled = true;
+          this.Beforedisabled = false;
         } else {
-          this.Nextdisabled = false
-          this.Beforedisabled = false
+          this.Nextdisabled = false;
+          this.Beforedisabled = false;
         }
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0;
+        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop);
+        this.$forceUpdate();
       }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getList()
+      this.table.getdataListParm.parammaps.startTime = parseTime(
+        this.table.getdataListParm.parammaps.inputDatetime[0],
+        "{y}-{m}-{d}"
+      );
+      this.table.getdataListParm.parammaps.stopTime = parseTime(
+        this.table.getdataListParm.parammaps.inputDatetime[1],
+        "{y}-{m}-{d}"
+      );
+      this.getList();
     },
     handleNext() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        var start2 = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[0].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1
+          )
+        );
+        var stop2 = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[1].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1
+          )
+        );
         if (stop2 > Date.now() - 8.64e7) {
-          this.Nextdisabled = true
-          this.Beforedisabled = false
+          this.Nextdisabled = true;
+          this.Beforedisabled = false;
         } else {
-          this.Nextdisabled = false
-          this.Beforedisabled = false
+          this.Nextdisabled = false;
+          this.Beforedisabled = false;
         }
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
-        this.$forceUpdate()
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0;
+        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2);
+        this.$forceUpdate();
       }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getList()
+      this.table.getdataListParm.parammaps.startTime = parseTime(
+        this.table.getdataListParm.parammaps.inputDatetime[0],
+        "{y}-{m}-{d}"
+      );
+      this.table.getdataListParm.parammaps.stopTime = parseTime(
+        this.table.getdataListParm.parammaps.inputDatetime[1],
+        "{y}-{m}-{d}"
+      );
+      this.getList();
     },
     handleExport() {
       var excelDatasTab2 = [
         {
-          tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', ' 跳转方式', '开始重量', '结束重量', '搅拌时间'],
-          filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
+          tHeader: [
+            "日期",
+            "TMR名称",
+            "车次",
+            "班次",
+            "配方名称",
+            "饲料",
+            "理论重量",
+            "实际重量",
+            "误差值",
+            "准确率",
+            "计划时间",
+            "开始时间",
+            "结束时间",
+            " 跳转方式",
+            "开始重量",
+            "结束重量",
+            "搅拌时间",
+          ],
+          filterVal: [
+            "日期",
+            "TMR名称",
+            "车次",
+            "班次",
+            "配方名称",
+            "饲料",
+            "理论重量",
+            "实际重量",
+            "误差值",
+            "准确率",
+            "计划时间",
+            "开始时间",
+            "结束时间",
+            "跳转方式",
+            "开始重量",
+            "结束重量",
+            "搅拌时间",
+          ],
           tableDatas: this.table.list,
-          sheetName: this.$t('errorAnalysis.hltj')
-        }
-      ]
-      json2excel(excelDatasTab2, '混料统计', true, 'xlsx')
-    }
-  }
-}
+          sheetName: this.$t("errorAnalysis.hltj"),
+        },
+      ];
+      json2excel(excelDatasTab2, this.$t("errorAnalysis.hltj"), true, "xlsx");
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  /deep/ .el-table th>.cell{
-    padding-left: 0 !important;;
-    padding-right: 0 !important;;
-  }
-  /deep/ .el-table td>.cell{
-    padding-left: 0 !important;;
-    padding-right: 0 !important;;
-  }
+/deep/ .el-table th > .cell {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
+/deep/ .el-table td > .cell {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
 </style>

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

@@ -2,31 +2,135 @@
   <div class="app-content">
     <div class="search">
       <div>
-        <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
-        <el-button style="float: left;margin-bottom: 10px;" :disabled="Beforedisabled" class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
-        <el-button style="float: left;margin-bottom: 10px;" :disabled="Nextdisabled" class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
+        <el-date-picker
+          v-model="table.getdataListParm.parammaps.inputDatetime"
+          :clearable="false"
+          style="width: 250px; float: left; margin-bottom: 10px"
+          class="inputDatetime filter-item"
+          type="daterange"
+          :range-separator="$t('common.to')"
+          :start-placeholder="$t('common.startTime')"
+          :end-placeholder="$t('common.endTime')"
+          :picker-options="pickerOptions"
+        />
+        <el-button
+          style="float: left; margin-bottom: 10px"
+          :disabled="Beforedisabled"
+          class="el-icon-arrow-left elIconArrowLeft"
+          @click="handleBefore"
+        />
+        <el-button
+          style="float: left; margin-bottom: 10px"
+          :disabled="Nextdisabled"
+          class="el-icon-arrow-right elIconArrowRight"
+          @click="handleNext"
+        />
       </div>
-      <div style="clear: both; margin-top: 10px;">
-        <el-select v-model="table.getdataListParm.parammaps.pastureid"
-:placeholder="$t('supplier.mc')" class="filter-item" style="width: 110px;float: left;">
-          <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
+      <div style="clear: both; margin-top: 10px">
+        <el-select
+          v-model="table.getdataListParm.parammaps.pastureid"
+          :placeholder="$t('supplier.mc')"
+          class="filter-item"
+          style="width: 110px; float: left"
+        >
+          <el-option
+            v-for="item in pastureList"
+            :key="item.pastureid"
+            :label="item.pasturename"
+            :value="item.pastureid"
+          />
         </el-select>
-        <el-input v-model="table.getdataListParm.parammaps.tmrtname" style="width: 110px;float: left;"  :placeholder="$t('processAnalysis.tmrName')"   class="filter-item" clearable />
-        <el-input v-model="table.getdataListParm.parammaps.projname" style="width: 110px;float: left;" :placeholder="$t('errorAnalysis.projname')"  class="filter-item" clearable />
-        <el-select v-model="table.getdataListParm.parammaps.times" style="width: 110px;float: left;" filterable :placeholder="$t('errorAnalysis.isTrainNumber')"  class="filter-item" clearable>
-          <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+        <el-input
+          v-model="table.getdataListParm.parammaps.tmrtname"
+          style="width: 110px; float: left"
+          :placeholder="$t('processAnalysis.tmrName')"
+          class="filter-item"
+          clearable
+        />
+        <el-input
+          v-model="table.getdataListParm.parammaps.projname"
+          style="width: 110px; float: left"
+          :placeholder="$t('errorAnalysis.projname')"
+          class="filter-item"
+          clearable
+        />
+        <el-select
+          v-model="table.getdataListParm.parammaps.times"
+          style="width: 110px; float: left"
+          filterable
+          :placeholder="$t('errorAnalysis.isTrainNumber')"
+          class="filter-item"
+          clearable
+        >
+          <el-option
+            v-for="item in frequencyList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
         </el-select>
-        <el-input v-model="table.getdataListParm.parammaps.templetname" style="width: 110px;float: left;" placeholder="配方名称" class="filter-item" clearable />
-        <el-input v-model="table.getdataListParm.parammaps.fname" style="width: 110px;float: left;" :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" clearable />
-        <el-select v-model="table.getdataListParm.parammaps.buttontype" style="width: 110px;float: left;" filterable :placeholder="$t('errorAnalysis.tzfs')"class="filter-item" clearable>
-          <el-option v-for="item in jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
+        <el-input
+          v-model="table.getdataListParm.parammaps.templetname"
+          style="width: 110px; float: left"
+          placeholder="配方名称"
+          class="filter-item"
+          clearable
+        />
+        <el-input
+          v-model="table.getdataListParm.parammaps.fname"
+          style="width: 110px; float: left"
+          :placeholder="$t('errorAnalysis.isHouseName')"
+          class="filter-item"
+          clearable
+        />
+        <el-select
+          v-model="table.getdataListParm.parammaps.buttontype"
+          style="width: 110px; float: left"
+          filterable
+          :placeholder="$t('errorAnalysis.tzfs')"
+          class="filter-item"
+          clearable
+        >
+          <el-option
+            v-for="item in jumpModeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
         </el-select>
-        <el-select v-model="table.getdataListParm.parammaps.isuse" style="width: 110px;float: left;" filterable placeholder="上传状态" class="filter-item" clearable>
-          <el-option v-for="item in isuseList" :key="item.id" :label="item.name" :value="item.id" />
+        <el-select
+          v-model="table.getdataListParm.parammaps.isuse"
+          style="width: 110px; float: left"
+          filterable
+          placeholder="上传状态"
+          class="filter-item"
+          clearable
+        >
+          <el-option
+            v-for="item in isuseList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
         </el-select>
-        <el-button class="successBorder" style="float:left;" @click="form_search">{{$t('common.query')}}</el-button>
-        <el-button class="successBorder" style="float:left;" @click="handleRefresh">{{$t('common.reset')}}</el-button>
-        <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport">{{$t('dashboard.Export')}}</el-button>
+        <el-button
+          class="successBorder"
+          style="float: left"
+          @click="form_search"
+          >{{ $t("common.query") }}</el-button
+        >
+        <el-button
+          class="successBorder"
+          style="float: left"
+          @click="handleRefresh"
+          >{{ $t("common.reset") }}</el-button
+        >
+        <el-button
+          class="export"
+          style="float: right; margin-right: 10px; margin-bottom: 10px"
+          @click="handleExport"
+          >{{ $t("dashboard.Export") }}</el-button
+        >
       </div>
     </div>
     <div class="table">
@@ -38,29 +142,109 @@
         border
         fit
         highlight-current-row
-        style="width: 100%;"
+        style="width: 100%"
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
         :height="myHeight2"
       >
-        <el-table-column :label="$t('feedingEfficiency.mc')"min-width="55px" align="center" prop="牧场" />
-        <el-table-column :label="$t('errorAnalysis.date')" min-width="55px" align="center" prop="日期" />
-        <el-table-column :label="$t('errorAnalysis.tmrnames')" min-width="55px" align="center" prop="TMR名称" />
-        <el-table-column :label="$t('errorAnalysis.projname')" min-width="55px" align="center" prop="车次" />
-        <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="55px" align="center" prop="班次" />
-        <el-table-column  :label="$t('errorAnalysis.feedName')"  min-width="55px" align="center" prop="配方名称" />
-        <el-table-column :label="$t('errorAnalysis.pen')" min-width="55px" align="center" prop="栏舍" />
-        <el-table-column  :label="$t('errorAnalysis.llzl')"  min-width="55px" align="center" prop="理论重量" />
-        <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="55px" align="center" prop="实际重量" />
-        <el-table-column :label="$t('errorAnalysis.wcz')" min-width="55px" align="center" prop="误差值" />
-        <el-table-column :label="$t('errorAnalysis.zql')" min-width="55px" align="center" prop="准确率" />
-        <el-table-column :label="$t('errorAnalysis.startTime')"  min-width="55px" align="center" prop="开始时间" />
-        <el-table-column :label="$t('errorAnalysis.endTime')"  min-width="55px" align="center" prop="结束时间" />
+        <el-table-column
+          :label="$t('feedingEfficiency.mc')"
+          min-width="55px"
+          align="center"
+          prop="牧场"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.date')"
+          min-width="55px"
+          align="center"
+          prop="日期"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.tmrnames')"
+          min-width="55px"
+          align="center"
+          prop="TMR名称"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.projname')"
+          min-width="55px"
+          align="center"
+          prop="车次"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.isTrainNumber')"
+          min-width="55px"
+          align="center"
+          prop="班次"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.feedName')"
+          min-width="55px"
+          align="center"
+          prop="配方名称"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.pen')"
+          min-width="55px"
+          align="center"
+          prop="栏舍"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.llzl')"
+          min-width="55px"
+          align="center"
+          prop="理论重量"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.acWeight')"
+          min-width="55px"
+          align="center"
+          prop="实际重量"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.wcz')"
+          min-width="55px"
+          align="center"
+          prop="误差值"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.zql')"
+          min-width="55px"
+          align="center"
+          prop="准确率"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.startTime')"
+          min-width="55px"
+          align="center"
+          prop="开始时间"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.endTime')"
+          min-width="55px"
+          align="center"
+          prop="结束时间"
+        />
         <!-- <el-table-column :label="$t('errorAnalysis.jsTime')"  min-width="70px" align="center" prop="搅拌时间" /> -->
-        <el-table-column :label="$t('errorAnalysis.tzfs')"  min-width="55px" align="center" prop="跳转方式" />
-        <el-table-column :label="$t('errorAnalysis.stWeight')"  min-width="55px" align="center" prop="开始重量" />
-        <el-table-column :label="$t('errorAnalysis.edWeight')"  min-width="55px" align="center" prop="结束重量" />
+        <el-table-column
+          :label="$t('errorAnalysis.tzfs')"
+          min-width="55px"
+          align="center"
+          prop="跳转方式"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.stWeight')"
+          min-width="55px"
+          align="center"
+          prop="开始重量"
+        />
+        <el-table-column
+          :label="$t('errorAnalysis.edWeight')"
+          min-width="55px"
+          align="center"
+          prop="结束重量"
+        />
       </el-table>
       <!-- <pagination v-show="tab3.table.total>=0" :total="tab3.table.total" :page.sync="tab3.table.getdataListParm.offset" :limit.sync="tab3.table.getdataListParm.pagecount" @pagination="getTab3List" /> -->
     </div>
@@ -68,237 +252,346 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import echarts from "echarts";
 
-require('echarts/theme/macarons')
-import { GetDataByName, GetReportform, GetDataByNames } from '@/api/common'
-import Cookies from 'js-cookie'
-import { parseTime } from '@/utils/index.js'
-import Pagination from '@/components/Pagination'
-import { json2excel } from '@/utils/index.js'
-import { MessageBox } from 'element-ui'
+require("echarts/theme/macarons");
+import { GetDataByName, GetReportform, GetDataByNames } from "@/api/common";
+import Cookies from "js-cookie";
+import { parseTime } from "@/utils/index.js";
+import Pagination from "@/components/Pagination";
+import { json2excel } from "@/utils/index.js";
+import { MessageBox } from "element-ui";
 export default {
-  name: 'Tab2',
+  name: "Tab2",
   components: { Pagination },
   data() {
     return {
       Beforedisabled: false,
       Nextdisabled: false,
-      pickerMinDate: '',
+      pickerMinDate: "",
       pickerOptions: {
         onPick: ({ maxDate, minDate }) => {
-          this.pickerMinDate = minDate.getTime()
+          this.pickerMinDate = minDate.getTime();
           if (maxDate) {
-            this.pickerMinDate = ''
+            this.pickerMinDate = "";
           }
         },
         // 限制不能选择今天之后的日期
         disabledDate: (time) => {
-          if (this.pickerMinDate !== '') {
-            const one = 31 * 24 * 3600 * 1000
-            const minTime = this.pickerMinDate - one
-            let maxTime = this.pickerMinDate + one
+          if (this.pickerMinDate !== "") {
+            const one = 31 * 24 * 3600 * 1000;
+            const minTime = this.pickerMinDate - one;
+            let maxTime = this.pickerMinDate + one;
             if (maxTime > new Date()) {
-              maxTime = new Date()
+              maxTime = new Date();
             }
-            return time.getTime() < minTime || time.getTime() > maxTime
+            return time.getTime() < minTime || time.getTime() > maxTime;
           }
-          return time.getTime() > Date.now()
-        }
+          return time.getTime() > Date.now();
+        },
       },
       requestParams: [
-        { name: 'getPastureListJT', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid'), pasturename: '' }}
+        {
+          name: "getPastureListJT",
+          offset: 0,
+          pagecount: 0,
+          parammaps: { pastureid: Cookies.get("pastureid"), pasturename: "" },
+        },
       ],
       pastureList: [], // 牧场
       // 班次
       maxTime: {
         getMaxTimesParm: {
-          name: 'getSysoptEnable',
+          name: "getSysoptEnable",
           page: 1,
           offset: 1,
           pagecount: 1,
-          returntype: 'Map',
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'times'
-          }
-        }
+            pastureid: Cookies.get("pastureid"),
+            inforname: "times",
+          },
+        },
       },
-      jumpModeList: [{ id: '0', name:this.$t('errorAnalysis.sdtz') }, { id: '1',  name:this.$t('errorAnalysis.zdtz') }],
+      jumpModeList: [
+        { id: "0", name: this.$t("errorAnalysis.sdtz") },
+        { id: "1", name: this.$t("errorAnalysis.zdtz") },
+      ],
       frequencyList: [],
-      isuseList: [{ id: '0',  name:this.$t('errorAnalysis.wwc')}, { id: '2', name:this.$t('errorAnalysis.bfwc')}, { id: '1',  name:this.$t('errorAnalysis.qbwc') }],
+      isuseList: [
+        { id: "0", name: this.$t("errorAnalysis.wwc") },
+        { id: "2", name: this.$t("errorAnalysis.bfwc") },
+        { id: "1", name: this.$t("errorAnalysis.qbwc") },
+      ],
       table: {
         getdataListParm: {
-          name: 'getStatisticsSL',
+          name: "getStatisticsSL",
           page: 1,
           offset: 1,
-          pagecount: '',
-          returntype: 'Map',
+          pagecount: "",
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            startTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
+            pastureid: Cookies.get("pastureid"),
+            startTime: parseTime(new Date(), "{y}-{m}-{d}"),
+            stopTime: parseTime(new Date(), "{y}-{m}-{d}"),
             inputDatetime: [new Date(), new Date()],
-            tmrtname: '',
-            projname: '',
-            times: '',
-            templetname: '',
-            fname: '',
-            buttontype: '',
-            isuse: ''
-          }
+            tmrtname: "",
+            projname: "",
+            times: "",
+            templetname: "",
+            fname: "",
+            buttontype: "",
+            isuse: "",
+          },
         },
         tableKey: 1,
         list: [],
         total: 0,
         listLoading: true,
-        temp: {}
+        temp: {},
       },
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-      myHeight2: document.documentElement.clientHeight - 85 - 210
-    }
+      rowStyle: { maxHeight: 30 + "px", height: 30 + "px" },
+      cellStyle: { padding: 0 + "px" },
+      myHeight2: document.documentElement.clientHeight - 85 - 210,
+    };
   },
   create() {
-    this.getDownList()
-    this.getIsDisplay()
+    this.getDownList();
+    this.getIsDisplay();
   },
   activated() {
-    this.getTimeFn()
-    this.getDownList()
-    this.getIsDisplay()
+    this.getTimeFn();
+    this.getDownList();
+    this.getIsDisplay();
   },
   methods: {
     getTimeFn() {
-      const that = this
-      const start = new Date()
-      const end = new Date()
-      const start2 = new Date()
-      const end2 = new Date()
-      start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
-      end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
-      that.table.getdataListParm.parammaps.inputDatetime = [start2, end2]
-      that.table.getdataListParm.parammaps.startTime = parseTime(start2, '{y}-{m}-{d}')
-      that.table.getdataListParm.parammaps.stopTime = parseTime(end2, '{y}-{m}-{d}')
+      const that = this;
+      const start = new Date();
+      const end = new Date();
+      const start2 = new Date();
+      const end2 = new Date();
+      start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1);
+      end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1);
+      that.table.getdataListParm.parammaps.inputDatetime = [start2, end2];
+      that.table.getdataListParm.parammaps.startTime = parseTime(
+        start2,
+        "{y}-{m}-{d}"
+      );
+      that.table.getdataListParm.parammaps.stopTime = parseTime(
+        end2,
+        "{y}-{m}-{d}"
+      );
     },
     getIsDisplay() {
-      GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
+      GetDataByName(this.maxTime.getMaxTimesParm).then((response) => {
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }]
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+          ];
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }]
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+          ];
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }]
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+            { id: "3", name: this.$t("errorAnalysis.three") },
+          ];
         } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: this.$t('errorAnalysis.one'), }, { id: '2', name: this.$t('errorAnalysis.two'), }, { id: '3', name: this.$t('errorAnalysis.three'), }, { id: '4', name: this.$t('errorAnalysis.four'), }]
+          this.frequencyList = [
+            { id: "1", name: this.$t("errorAnalysis.one") },
+            { id: "2", name: this.$t("errorAnalysis.two") },
+            { id: "3", name: this.$t("errorAnalysis.three") },
+            { id: "4", name: this.$t("errorAnalysis.four") },
+          ];
         }
-      })
+      });
     },
     getDownList() {
-      GetDataByNames(this.requestParams).then(response => {
-        this.pastureList = response.data.getPastureListJT.list
-        this.table.getdataListParm.parammaps.pastureid = response.data.getPastureListJT.list[0].pastureid
-        this.getList()
-      })
+      GetDataByNames(this.requestParams).then((response) => {
+        this.pastureList = response.data.getPastureListJT.list;
+        this.table.getdataListParm.parammaps.pastureid =
+          response.data.getPastureListJT.list[0].pastureid;
+        this.getList();
+      });
     },
     getList() {
-      this.table.listLoading = true
-      GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('撒料统计table数据', response.data.list)
+      this.table.listLoading = true;
+      GetDataByName(this.table.getdataListParm).then((response) => {
+        console.log("撒料统计table数据", response.data.list);
         if (response.data.list !== null) {
-          this.table.list = response.data.list
-          this.table.total = response.data.total
+          this.table.list = response.data.list;
+          this.table.total = response.data.total;
         } else {
-          this.table.list = []
+          this.table.list = [];
         }
         setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
+          this.table.listLoading = false;
+        }, 100);
+      });
     },
     form_search() {
-      this.table.getdataListParm.name = 'getStatisticsSL'
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.table.getdataListParm.name = "getStatisticsSL";
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        this.table.getdataListParm.parammaps.startTime = parseTime(
+          this.table.getdataListParm.parammaps.inputDatetime[0],
+          "{y}-{m}-{d}"
+        );
+        this.table.getdataListParm.parammaps.stopTime = parseTime(
+          this.table.getdataListParm.parammaps.inputDatetime[1],
+          "{y}-{m}-{d}"
+        );
       } else {
-        this.table.getdataListParm.parammaps.inputDatetime = ''
-        this.table.getdataListParm.parammaps.startTime = ''
-        this.table.getdataListParm.parammaps.stopTime = ''
+        this.table.getdataListParm.parammaps.inputDatetime = "";
+        this.table.getdataListParm.parammaps.startTime = "";
+        this.table.getdataListParm.parammaps.stopTime = "";
       }
-      this.table.getdataListParm.offset = 1
-      this.getList()
+      this.table.getdataListParm.offset = 1;
+      this.getList();
     },
     handleRefresh() {
-      this.table.getdataListParm.parammaps.tmrtname = ''
-      this.table.getdataListParm.parammaps.projname = ''
-      this.table.getdataListParm.parammaps.times = ''
-      this.table.getdataListParm.parammaps.templetname = ''
-      this.table.getdataListParm.parammaps.buttontype = ''
-      this.table.getdataListParm.parammaps.fname = ''
-      this.getList()
+      this.table.getdataListParm.parammaps.tmrtname = "";
+      this.table.getdataListParm.parammaps.projname = "";
+      this.table.getdataListParm.parammaps.times = "";
+      this.table.getdataListParm.parammaps.templetname = "";
+      this.table.getdataListParm.parammaps.buttontype = "";
+      this.table.getdataListParm.parammaps.fname = "";
+      this.getList();
     },
     handleExport() {
       var excelDatasTab3 = [
         {
-          tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
-          filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
+          tHeader: [
+            "日期",
+            "TMR名称",
+            "车次",
+            "班次",
+            "配方名称",
+            "栏舍",
+            "理论重量",
+            "实际重量",
+            "误差值",
+            "准确率",
+            "开始时间",
+            "结束时间",
+            "跳转方式",
+            "开始重量",
+            "结束重量",
+            "搅拌时间",
+          ],
+          filterVal: [
+            "日期",
+            "TMR名称",
+            "车次",
+            "班次",
+            "配方名称",
+            "栏舍",
+            "理论重量",
+            "实际重量",
+            "误差值",
+            "准确率",
+            "开始时间",
+            "结束时间",
+            "跳转方式",
+            "开始重量",
+            "结束重量",
+            "搅拌时间",
+          ],
           tableDatas: this.tab3.table.list,
-          sheetName: '撒料统计'
-        }
-      ]
-      json2excel(excelDatasTab3, '撒料统计', true, 'xlsx')
+          sheetName: this.$t("errorAnalysis.sltj"),
+        },
+      ];
+      json2excel(excelDatasTab3, this.$t("errorAnalysis.sltj"), true, "xlsx");
     },
     handleBefore() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        var start = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[0].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1
+          )
+        );
+        var stop = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[1].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1
+          )
+        );
         if (stop > Date.now() - 8.64e7) {
-          this.Nextdisabled = true
-          this.Beforedisabled = false
+          this.Nextdisabled = true;
+          this.Beforedisabled = false;
         } else {
-          this.Nextdisabled = false
-          this.Beforedisabled = false
+          this.Nextdisabled = false;
+          this.Beforedisabled = false;
         }
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0;
+        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop);
+        this.$forceUpdate();
       }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getList()
+      this.table.getdataListParm.parammaps.startTime = parseTime(
+        this.table.getdataListParm.parammaps.inputDatetime[0],
+        "{y}-{m}-{d}"
+      );
+      this.table.getdataListParm.parammaps.stopTime = parseTime(
+        this.table.getdataListParm.parammaps.inputDatetime[1],
+        "{y}-{m}-{d}"
+      );
+      this.getList();
     },
     handleNext() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        var start2 = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[0].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1
+          )
+        );
+        var stop2 = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[1].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1
+          )
+        );
         if (stop2 > Date.now() - 8.64e7) {
-          this.Nextdisabled = true
-          this.Beforedisabled = false
+          this.Nextdisabled = true;
+          this.Beforedisabled = false;
         } else {
-          this.Nextdisabled = false
-          this.Beforedisabled = false
+          this.Nextdisabled = false;
+          this.Beforedisabled = false;
         }
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
-        this.$forceUpdate()
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0;
+        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2);
+        this.$forceUpdate();
       }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getList()
-    }
-
-  }
-}
+      this.table.getdataListParm.parammaps.startTime = parseTime(
+        this.table.getdataListParm.parammaps.inputDatetime[0],
+        "{y}-{m}-{d}"
+      );
+      this.table.getdataListParm.parammaps.stopTime = parseTime(
+        this.table.getdataListParm.parammaps.inputDatetime[1],
+        "{y}-{m}-{d}"
+      );
+      this.getList();
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  /deep/ .el-table th>.cell{
-    padding-left: 0 !important;;
-    padding-right: 0 !important;;
-  }
-  /deep/ .el-table td>.cell{
-    padding-left: 0 !important;;
-    padding-right: 0 !important;;
-  }
+/deep/ .el-table th > .cell {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
+/deep/ .el-table td > .cell {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
 </style>

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

@@ -7214,7 +7214,7 @@ export default {
               'field4'
             ],
             tableDatas: this.tab.chart5.table.list,
-            sheetName: '混料统计'
+             sheetName:this.$t('errorAnalysis.hltj')
           }
         ]
         json2excel(
@@ -7407,7 +7407,7 @@ export default {
       //     tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', ' 跳转方式', '开始重量', '结束重量', '搅拌时间'],
       //     filterVal: ['日期', 'TMR名称', '车次', '班次', '配方名称', '饲料', '理论重量', '实际重量', '误差值', '准确率', '计划时间', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
       //     tableDatas: this.tab2.table.list,
-      //      sheetName: '混料统计'
+      //       sheetName:this.$t('errorAnalysis.hltj')
       //   }
       // ]
       // json2excel(excelDatasTab2, '混料统计', true, 'xlsx')
@@ -7504,7 +7504,7 @@ export default {
               'barname'
             ],
             tableDatas: exportList,
-            sheetName: '混料统计'
+             sheetName:this.$t('errorAnalysis.hltj')
           }
         ]
         json2excel(excelDatasTab2, this.$t('errorAnalysis.hltj'), true, 'xlsx')
@@ -8343,7 +8343,7 @@ export default {
             }
             sums[index] =
               sums[index].toFixed(4) +
-              '(干物质量：' +
+              this.$t('message.msg352') +
               this.modificationRecordTemp.lastdate +
               ')'
           } else {
@@ -8379,7 +8379,7 @@ export default {
             }
             sums[index] =
               sums[index].toFixed(4) +
-              '(干物质量：' +
+              this.$t('message.msg352') +
               this.modificationRecordTemp.currentdate +
               ')'
           } else {

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -69,7 +69,7 @@
         class="successBorder"
         style="margin-left: 10px"
         @click="form_search"
-        >{{ $t('common.query') }}</el-button
+        >{{ $t("common.query") }}</el-button
       >
     </div>
     <div class="search" />
@@ -264,7 +264,7 @@
           </el-table-column>
         </el-table-column>
         <el-table-column
-          :label="$t('formulationEvaluation.cnjn')"
+          :label="$t('formulationEvaluation.cnjndm')"
           align="center"
         >
           <el-table-column
@@ -1270,10 +1270,10 @@
           class="cancelClose"
           style="right: 20px"
           @click="
-            see.dialogFormVisible = false
-            $route.params.tname = ''
+            see.dialogFormVisible = false;
+            $route.params.tname = '';
           "
-          >{{ $t('common.closed') }}</el-button
+          >{{ $t("common.closed") }}</el-button
         >
       </div>
     </el-dialog>
@@ -1403,7 +1403,7 @@
         </div>
         <div class="table2 detailDialog">
           <div class="recipeTemplateF">
-            <p>{{ $t('formulationEvaluation.pfbqb') }}</p>
+            <p>{{ $t("formulationEvaluation.pfbqb") }}</p>
           </div>
           <el-table
             :key="details.table2.tableKey"
@@ -1456,10 +1456,10 @@
             >
               <template slot-scope="scope">
                 <span v-if="scope.row.islockcount == '0'">{{
-                  $t('feedChart.no')
+                  $t("feedChart.no")
                 }}</span>
                 <span v-if="scope.row.islockcount == '1'">{{
-                  $t('feedChart.yes')
+                  $t("feedChart.yes")
                 }}</span>
               </template>
             </el-table-column>
@@ -1480,7 +1480,7 @@
           class="cancelClose"
           style="right: 20px"
           @click="details.dialogFormVisible = false"
-          >{{ $t('common.closed') }}</el-button
+          >{{ $t("common.closed") }}</el-button
         >
       </div>
     </el-dialog>
@@ -1488,54 +1488,54 @@
 </template>
 
 <script>
-import { GetDataByName, postJson } from '@/api/common'
-import Cookies from 'js-cookie'
-import Pagination from '@/components/Pagination'
-import { parseTime } from '@/utils/index.js'
+import { GetDataByName, postJson } from "@/api/common";
+import Cookies from "js-cookie";
+import Pagination from "@/components/Pagination";
+import { parseTime } from "@/utils/index.js";
 export default {
-  name: 'FormulationEvaluation',
+  name: "FormulationEvaluation",
   components: { Pagination },
   filters: {
     keepTreeNum(value) {
-      value = Number(value)
-      return value.toFixed(3)
-    }
+      value = Number(value);
+      return value.toFixed(3);
+    },
   },
   data() {
     return {
       dialogFull: false,
       searchList: [
-        { id: '0', name: this.$t('dhedFormula.apfcx') },
-        { id: '1', name: this.$t('dhedFormula.alscx') }
+        { id: "0", name: this.$t("dhedFormula.apfcx") },
+        { id: "1", name: this.$t("dhedFormula.alscx") },
       ],
       formulaList: [],
       fenceHouseList: [],
       table: {
         getdataListParm: {
-          name: 'judgenurFTReport',
+          name: "judgenurFTReport",
           page: 1,
           offset: 1,
-          pagecount: parseInt(Cookies.get('pageCount')),
-          returntype: 'Map',
+          pagecount: parseInt(Cookies.get("pageCount")),
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            startTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
+            pastureid: Cookies.get("pastureid"),
+            startTime: parseTime(new Date(), "{y}-{m}-{d}"),
+            stopTime: parseTime(new Date(), "{y}-{m}-{d}"),
             inputDatetime: [new Date(), new Date()],
-            search: '0',
-            templetid: '',
-            barid: ''
-          }
+            search: "0",
+            templetid: "",
+            barid: "",
+          },
         },
         tableKey: 1,
         list: [],
         total: 0,
         listLoading: true,
-        temp: {}
+        temp: {},
       },
       see: {
         dialogFormVisible: false,
-        dialogStatus: '',
+        dialogStatus: "",
         temp: {},
         rules: {},
         table: {
@@ -1544,23 +1544,23 @@ export default {
           total: 0,
           listLoading: true,
           getdataListParm: {
-            name: 'judgenurFTReport',
+            name: "judgenurFTReport",
             page: 1,
             offset: 1,
             pagecount: 0,
-            returntype: 'Map',
+            returntype: "Map",
             parammaps: {
-              name: 'judgenurBarBmReport',
-              name1: 'judgenurBarHSL'
-            }
-          }
-        }
+              name: "judgenurBarBmReport",
+              name1: "judgenurBarHSL",
+            },
+          },
+        },
       },
       details: {
         dialogFormVisible: false,
-        dialogStatus: '',
+        dialogStatus: "",
         temp: {
-          maxDate: ''
+          maxDate: "",
         },
         rules: {},
         table1: {
@@ -1569,16 +1569,16 @@ export default {
           total: 0,
           listLoading: true,
           getdataListParm: {
-            name: 'getFTListDateHis',
+            name: "getFTListDateHis",
             page: 1,
             offset: 1,
             pagecount: 10,
-            returntype: 'Map',
+            returntype: "Map",
             parammaps: {
-              pastureid: '',
-              id: ''
-            }
-          }
+              pastureid: "",
+              id: "",
+            },
+          },
         },
         table2: {
           tableKey: 0,
@@ -1586,339 +1586,339 @@ export default {
           total: 0,
           listLoading: true,
           getdataListParm: {
-            name: 'getFTdetailListDate',
+            name: "getFTdetailListDate",
             page: 1,
             offset: 1,
             pagecount: 10,
-            returntype: 'Map',
+            returntype: "Map",
             parammaps: {
-              pastureid: '',
-              ftid: '',
-              date: '',
-              version: ''
-            }
-          }
+              pastureid: "",
+              ftid: "",
+              date: "",
+              version: "",
+            },
+          },
         },
         maxDate: {
           getdataListParm: {
-            name: 'getFTMaxDate',
+            name: "getFTMaxDate",
             page: 1,
             offset: 1,
             pagecount: 10,
-            returntype: 'Map',
+            returntype: "Map",
             parammaps: {
-              pastureid: ''
-            }
-          }
-        }
+              pastureid: "",
+            },
+          },
+        },
       },
       textMap: {
-        see: '',
-        details: this.$t('message.msg63')
+        see: "",
+        details: this.$t("message.msg63"),
       },
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
-    }
+      rowStyle: { maxHeight: 30 + "px", height: 30 + "px" },
+      cellStyle: { padding: 0 + "px" },
+    };
   },
 
   created() {
     if (
-      this.$route.params.tname !== '' &&
+      this.$route.params.tname !== "" &&
       this.$route.params.tname !== undefined &&
       this.$route.params.startTime !== undefined &&
       this.$route.params.stopTime !== undefined
     ) {
       console.log(
         this.table.getdataListParm.parammaps.inputDatetime,
-        'this.table.getdataListParm.parammaps.inputDatetime'
-      )
+        "this.table.getdataListParm.parammaps.inputDatetime"
+      );
       this.table.getdataListParm.parammaps.startTime =
-        this.$route.params.startTime
+        this.$route.params.startTime;
       this.table.getdataListParm.parammaps.stopTime =
-        this.$route.params.stopTime
-      this.textMap.see = this.$t('message.msg62') + this.$route.params.tname
+        this.$route.params.stopTime;
+      this.textMap.see = this.$t("message.msg62") + this.$route.params.tname;
       setTimeout(() => {
-        this.dialogFull = false
-        this.see.dialogStatus = 'see'
-        this.see.dialogFormVisible = true
-      }, 500)
-      this.see.table.getdataListParm.parammaps.ftid = this.$route.params.ftid
+        this.dialogFull = false;
+        this.see.dialogStatus = "see";
+        this.see.dialogFormVisible = true;
+      }, 500);
+      this.see.table.getdataListParm.parammaps.ftid = this.$route.params.ftid;
       this.see.table.getdataListParm.parammaps.pastureid =
-        this.$route.params.pastureid
+        this.$route.params.pastureid;
       this.see.table.getdataListParm.parammaps.startTime =
-        this.table.getdataListParm.parammaps.startTime
+        this.table.getdataListParm.parammaps.startTime;
       this.see.table.getdataListParm.parammaps.stopTime =
-        this.table.getdataListParm.parammaps.stopTime
-      this.getListSee()
+        this.table.getdataListParm.parammaps.stopTime;
+      this.getListSee();
     }
-    this.getList()
-    this.getformulaList()
-    this.getfenceHouseList()
+    this.getList();
+    this.getformulaList();
+    this.getfenceHouseList();
   },
 
   methods: {
     getformulaList() {
-      const url = 'authdata/GetDataByName'
-      const data = {}
-      data.name = 'getBarListEnable'
-      data.parammaps = {}
-      data.parammaps.pastureid = Cookies.get('pastureid')
+      const url = "authdata/GetDataByName";
+      const data = {};
+      data.name = "getBarListEnable";
+      data.parammaps = {};
+      data.parammaps.pastureid = Cookies.get("pastureid");
       postJson(url, data).then((response) => {
         if (response.data.list !== null) {
-          this.formulaList = response.data.list
+          this.formulaList = response.data.list;
         } else {
-          this.formulaList = []
+          this.formulaList = [];
         }
-      })
+      });
     },
     getfenceHouseList() {
-      const url = 'authdata/GetDataByName'
-      const data = {}
-      data.name = 'getFeedTempletName'
+      const url = "authdata/GetDataByName";
+      const data = {};
+      data.name = "getFeedTempletName";
       postJson(url, data).then((response) => {
         if (response.data.list !== null) {
-          this.fenceHouseList = response.data.list
+          this.fenceHouseList = response.data.list;
         } else {
-          this.fenceHouseList = []
+          this.fenceHouseList = [];
         }
-      })
+      });
     },
     getList() {
-      this.table.listLoading = true
+      this.table.listLoading = true;
       GetDataByName(this.table.getdataListParm).then((response) => {
-        console.log('table数据', response.data.list)
+        console.log("table数据", response.data.list);
         if (response.data.list !== null) {
-          this.table.list = response.data.list
-          this.table.pageNum = response.data.pageNum
-          this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
+          this.table.list = response.data.list;
+          this.table.pageNum = response.data.pageNum;
+          this.table.pageSize = response.data.pageSize;
+          this.table.total = response.data.total;
         } else {
-          this.table.list = []
-          this.table.pageNum = 0
-          this.table.pageSize = 0
-          this.table.total = 0
+          this.table.list = [];
+          this.table.pageNum = 0;
+          this.table.pageSize = 0;
+          this.table.total = 0;
         }
         setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
+          this.table.listLoading = false;
+        }, 100);
+      });
     },
     form_search() {
-      if (this.table.getdataListParm.parammaps.search == '0') {
-        this.table.getdataListParm.parammaps.barid = ''
+      if (this.table.getdataListParm.parammaps.search == "0") {
+        this.table.getdataListParm.parammaps.barid = "";
       } else {
-        this.table.getdataListParm.parammaps.templetid = ''
-        console.log(this.table.getdataListParm.parammaps.barid)
+        this.table.getdataListParm.parammaps.templetid = "";
+        console.log(this.table.getdataListParm.parammaps.barid);
       }
-      this.getList()
+      this.getList();
     },
     changeDate() {
       if (
-        this.table.getdataListParm.parammaps.inputDatetime !== '' &&
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
         this.table.getdataListParm.parammaps.inputDatetime !== null
       ) {
         this.table.getdataListParm.parammaps.startTime = parseTime(
           this.table.getdataListParm.parammaps.inputDatetime[0],
-          '{y}-{m}-{d}'
-        )
+          "{y}-{m}-{d}"
+        );
         this.table.getdataListParm.parammaps.stopTime = parseTime(
           this.table.getdataListParm.parammaps.inputDatetime[1],
-          '{y}-{m}-{d}'
-        )
-        this.getList()
+          "{y}-{m}-{d}"
+        );
+        this.getList();
       }
     },
     handleBefore() {
       if (
-        this.table.getdataListParm.parammaps.inputDatetime !== '' &&
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
         this.table.getdataListParm.parammaps.inputDatetime !== null
       ) {
         var start = new Date(
           this.table.getdataListParm.parammaps.inputDatetime[0].setDate(
             this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1
           )
-        )
+        );
         var stop = new Date(
           this.table.getdataListParm.parammaps.inputDatetime[1].setDate(
             this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1
           )
-        )
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
+        );
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0;
+        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop);
+        this.$forceUpdate();
       }
       this.table.getdataListParm.parammaps.startTime = parseTime(
         this.table.getdataListParm.parammaps.inputDatetime[0],
-        '{y}-{m}-{d}'
-      )
+        "{y}-{m}-{d}"
+      );
       this.table.getdataListParm.parammaps.stopTime = parseTime(
         this.table.getdataListParm.parammaps.inputDatetime[1],
-        '{y}-{m}-{d}'
-      )
-      this.getList()
+        "{y}-{m}-{d}"
+      );
+      this.getList();
     },
     handleNext() {
       if (
-        this.table.getdataListParm.parammaps.inputDatetime !== '' &&
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
         this.table.getdataListParm.parammaps.inputDatetime !== null
       ) {
         var start2 = new Date(
           this.table.getdataListParm.parammaps.inputDatetime[0].setDate(
             this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1
           )
-        )
+        );
         var stop2 = new Date(
           this.table.getdataListParm.parammaps.inputDatetime[1].setDate(
             this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1
           )
-        )
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
-        this.$forceUpdate()
+        );
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0;
+        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2);
+        this.$forceUpdate();
       }
       this.table.getdataListParm.parammaps.startTime = parseTime(
         this.table.getdataListParm.parammaps.inputDatetime[0],
-        '{y}-{m}-{d}'
-      )
+        "{y}-{m}-{d}"
+      );
       this.table.getdataListParm.parammaps.stopTime = parseTime(
         this.table.getdataListParm.parammaps.inputDatetime[1],
-        '{y}-{m}-{d}'
-      )
-      this.getList()
+        "{y}-{m}-{d}"
+      );
+      this.getList();
     },
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
         return {
-          textDecoration: 'underline'
-        }
+          textDecoration: "underline",
+        };
       }
       return {
-        textDecoration: 'none'
-      }
+        textDecoration: "none",
+      };
     },
     clickFormulaTemplateIndex(row) {
-      console.log('点击了配方模板/指标')
-      this.dialogFull = false
-      this.details.dialogStatus = 'details'
-      this.details.dialogFormVisible = true
-      this.details.table1.getdataListParm.parammaps.pastureid = row.pastureid
-      this.details.table1.getdataListParm.parammaps.id = row.ftid
+      console.log("点击了配方模板/指标");
+      this.dialogFull = false;
+      this.details.dialogStatus = "details";
+      this.details.dialogFormVisible = true;
+      this.details.table1.getdataListParm.parammaps.pastureid = row.pastureid;
+      this.details.table1.getdataListParm.parammaps.id = row.ftid;
 
-      this.details.maxDate.getdataListParm.parammaps.pastureid = row.pastureid
-      this.getMaxDate()
+      this.details.maxDate.getdataListParm.parammaps.pastureid = row.pastureid;
+      this.getMaxDate();
     },
 
     getMaxDate() {
       GetDataByName(this.details.maxDate.getdataListParm).then((response) => {
         if (response.data.list !== null) {
-          this.details.temp.maxDate = response.data.list[0].maxdate
+          this.details.temp.maxDate = response.data.list[0].maxdate;
         } else {
-          this.details.temp.maxDate = ''
+          this.details.temp.maxDate = "";
         }
         this.details.table1.getdataListParm.parammaps.date =
-          this.details.temp.maxDate
+          this.details.temp.maxDate;
         this.details.table2.getdataListParm.parammaps.date =
-          this.details.temp.maxDate
+          this.details.temp.maxDate;
 
-        this.getListDetails1()
-      })
+        this.getListDetails1();
+      });
     },
     changeMaxDate(item) {
       this.details.table1.getdataListParm.parammaps.date =
-        this.details.temp.maxDate
-      this.getListDetails1()
+        this.details.temp.maxDate;
+      this.getListDetails1();
     },
     getListDetails1() {
-      this.details.table1.listLoading = true
+      this.details.table1.listLoading = true;
       GetDataByName(this.details.table1.getdataListParm).then((response) => {
-        console.log('table数据', response.data.list)
+        console.log("table数据", response.data.list);
         if (response.data.list !== null) {
-          this.details.table1.list = response.data.list
-          this.details.table1.pageNum = response.data.pageNum
-          this.details.table1.pageSize = response.data.pageSize
-          this.details.table1.total = response.data.total
+          this.details.table1.list = response.data.list;
+          this.details.table1.pageNum = response.data.pageNum;
+          this.details.table1.pageSize = response.data.pageSize;
+          this.details.table1.total = response.data.total;
 
           this.details.table2.getdataListParm.parammaps.pastureid =
-            this.details.table1.list[0].pastureid
+            this.details.table1.list[0].pastureid;
           this.details.table2.getdataListParm.parammaps.ftid =
-            this.details.table1.list[0].id
+            this.details.table1.list[0].id;
           this.details.table2.getdataListParm.parammaps.version =
-            this.details.table1.list[0].version
-          this.getListDetails2()
+            this.details.table1.list[0].version;
+          this.getListDetails2();
         } else {
-          this.details.table1.list = []
-          this.details.table2.list = []
-          this.details.table1.pageNum = 0
-          this.details.table1.pageSize = 0
-          this.details.table1.total = 0
+          this.details.table1.list = [];
+          this.details.table2.list = [];
+          this.details.table1.pageNum = 0;
+          this.details.table1.pageSize = 0;
+          this.details.table1.total = 0;
         }
         setTimeout(() => {
-          this.details.table1.listLoading = false
-        }, 100)
-      })
+          this.details.table1.listLoading = false;
+        }, 100);
+      });
     },
     getListDetails2() {
-      this.details.table2.listLoading = true
+      this.details.table2.listLoading = true;
       GetDataByName(this.details.table2.getdataListParm).then((response) => {
-        console.log('table数据', response.data.list)
+        console.log("table数据", response.data.list);
         if (response.data.list !== null) {
-          this.details.table2.list = response.data.list
-          this.details.table2.pageNum = response.data.pageNum
-          this.details.table2.pageSize = response.data.pageSize
-          this.details.table2.total = response.data.total
+          this.details.table2.list = response.data.list;
+          this.details.table2.pageNum = response.data.pageNum;
+          this.details.table2.pageSize = response.data.pageSize;
+          this.details.table2.total = response.data.total;
         } else {
-          this.details.table2.list = []
-          this.details.table2.pageNum = 0
-          this.details.table2.pageSize = 0
-          this.details.table2.total = 0
+          this.details.table2.list = [];
+          this.details.table2.pageNum = 0;
+          this.details.table2.pageSize = 0;
+          this.details.table2.total = 0;
         }
         setTimeout(() => {
-          this.details.table2.listLoading = false
-        }, 100)
-      })
+          this.details.table2.listLoading = false;
+        }, 100);
+      });
     },
     clickFormulaHurdlesIndex(row) {
-      console.log('点击了栏舍/指标')
-      this.$router.push('/formulationPlan/DhedFormula')
+      console.log("点击了栏舍/指标");
+      this.$router.push("/formulationPlan/DhedFormula");
     },
     form_see(row) {
-      console.log(this.$t('pushingplan.watch'), row)
-      this.dialogFull = false
-      this.textMap.see = this.$t('message.msg62') + row.tname
-      this.see.dialogStatus = 'see'
-      this.see.dialogFormVisible = true
-      this.see.table.getdataListParm.parammaps.ftid = row.ftid
-      this.see.table.getdataListParm.parammaps.pastureid = row.pastureid
+      console.log(this.$t("pushingplan.watch"), row);
+      this.dialogFull = false;
+      this.textMap.see = this.$t("message.msg62") + row.tname;
+      this.see.dialogStatus = "see";
+      this.see.dialogFormVisible = true;
+      this.see.table.getdataListParm.parammaps.ftid = row.ftid;
+      this.see.table.getdataListParm.parammaps.pastureid = row.pastureid;
       this.see.table.getdataListParm.parammaps.startTime =
-        this.table.getdataListParm.parammaps.startTime
+        this.table.getdataListParm.parammaps.startTime;
       this.see.table.getdataListParm.parammaps.stopTime =
-        this.table.getdataListParm.parammaps.stopTime
-      this.getListSee()
+        this.table.getdataListParm.parammaps.stopTime;
+      this.getListSee();
     },
     getListSee() {
-      this.see.table.listLoading = true
-      const url = 'authdata/GETNurJudgeRport'
-      const data = this.see.table.getdataListParm
+      this.see.table.listLoading = true;
+      const url = "authdata/GETNurJudgeRport";
+      const data = this.see.table.getdataListParm;
       postJson(url, data).then((response) => {
         if (response.data !== null) {
-          console.log('table数据', response.data)
-          this.see.table.list = response.data
-          this.see.table.pageNum = response.data.pageNum
-          this.see.table.pageSize = response.data.pageSize
-          this.see.table.total = response.data.total
+          console.log("table数据", response.data);
+          this.see.table.list = response.data;
+          this.see.table.pageNum = response.data.pageNum;
+          this.see.table.pageSize = response.data.pageSize;
+          this.see.table.total = response.data.total;
         } else {
-          this.see.table.list = []
-          this.see.table.pageNum = 0
-          this.see.table.pageSize = 0
-          this.see.table.total = 0
+          this.see.table.list = [];
+          this.see.table.pageNum = 0;
+          this.see.table.pageSize = 0;
+          this.see.table.total = 0;
         }
         setTimeout(() => {
-          this.see.table.listLoading = false
-        }, 100)
-      })
-    }
-  }
-}
+          this.see.table.listLoading = false;
+        }, 100);
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .search {