导入模版字段修改

.env.development

@@ -5,10 +5,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/'
 # 白少后台本地
 # VUE_APP_BASE_API = 'http://192.168.1.56:80/'
-# VUE_APP_BASE_API = 'http://192.168.1.93/'
+VUE_APP_BASE_API = 'http://192.168.1.233/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().

src/lang/en/langModule/dailyExecutionPlan.js

@@ -52,7 +52,7 @@ exportTypeList: [{ lable: 'Simple Feeding ', value: '0' }, { lable: 'Cumulative
 iscompletedList: [{ lable: 'Yes', value: '1' },{ lable: 'No', value: '0' }  ],
 
 lspf: "Pen Formula",
-sljh: "Feed Distribution Plan",
+sljh: "Feed Spreading  Plan",
 yhjh: "Pre-mixed Feed Plan",
 sljh: "Leftover Feed Plan",
 

src/lang/en/langModule/errorAnalysis.js

@@ -30,7 +30,7 @@ export default{
   sljhczs:'Planned feed spreslwcading operation count',
   slczl:"Feed spreading operation rate",
   slsj:"Spreading Time",
-  flstartTime:"Material Distribution Start Time",
+  flstartTime:"Material Spreading  Start Time",
   waitTime:'Waiting Time',
 slzdtzcs:'Automatic transition count for feed spreading',
 slsdzdtzcs:'Manual transition count for feed spreading',

src/lang/en/langModule/feedChart.js

@@ -69,9 +69,9 @@ tHeader: [
   "Feed Source",
   "Plan Type",
   "Allowed Error (kg)",
-  "Package Unit Weight (kg)",
+  "Packing Unit Weight",
   "Unit Price",
-  "Jump Weight Range (kg)",
+  "Permissible Error Weight (kg)",
   "Jump Delay",
   "Confirm Start",
   "Relay Position",
@@ -87,9 +87,9 @@ tHeader2: [
   "Feed Source",
   "Plan Type",
   "Allowed Error (kg)",
-  "Package Unit Weight (kg)",
+  "Packing Unit Weight",
   "Unit Price",
-  "Jump Weight Range (kg)",
+  "Permissible Error Weight (kg)",
   "Jump Delay",
   "Confirm Start",
   "Relay Position",

src/lang/en/langModule/message.js

@@ -414,26 +414,28 @@ msg355:"Customize",
 msg356:'Spreading Feed',
 msg357: 'Mixing Feed ',
 recipe:{
-  name: 'checkfttype,checkbigcowclass,checkFeed,insertFTUploadEnglish,insertFTdetailUpload',
+  name: 'checkfttypeEnglish,checkbigcowclassEnglish,checkFeedEnglish,insertFTUploadEnglish,insertFTdetailUploadEnglish',
   importParams: 'Formula Name,Livestock Category,Formula Type,Note,Feed Group,Feed Name,with Weight (kg),Mixing Delay (min),Lock the Ratio of Cattle Heads',
   requiredParams: 'Formula Name,Livestock Category,Formula Type,Feed Name,with Weight (kg),Mixing Delay (min),Lock the Ratio of Cattle Heads',
-numParams: 'with Weight (kg),Mixing Delay (min)',
+  numParams: 'with Weight (kg),Mixing Delay (min)',
 },
 
 dhedform:{
-  name:'checkbarname,checkftsw,checkftbl',
-  importParams: 'Pen Name,Actual Headcount,Coefficient(%), Formula Template ,Supplement Formula,First Shift Ratio(%),Second Shift Ratio(%),Third Shift Ratio(%)',
-  requiredParams: 'Pen Name,Actual Headcount,Coefficient(%), Formula Template ,',
-  numParams: 'Actual Headcount,Coefficient(%),First Shift Ratio(%),Second Shift Ratio(%),Third Shift Ratio(%),Fourth Shift Ratio(%)',
-  theader:['Pen Name','Actual Headcount','Coefficient(%)','Formula Template','Supplement Formula',' First Shift Ratio(%)','Second Shift Ratio(%)','Third Shift Ratio(%)','Fourth Shift Ratio(%)','Fourth Shift Ratio(%)','Sixth shift Ratio(%)'],
+  name:'checkbarnameEnglish,checkftswEnglish,checkftblEnglish',
+  importParams: 'Pen Name,Actual Cattle Number,Coefficient(%),Formula Template,Supplement Formula,First Shift Ratio(%),Second Shift Ratio(%),Third Shift Ratio(%)',
+  requiredParams: 'Pen Name,Actual Cattle Number,Coefficient(%),Formula Template',
+  numParams:'Actual Cattle Number,Coefficient(%),First Shift Ratio(%),Second Shift Ratio(%),Third Shift Ratio(%),Fourth Shift Ratio(%)',
+  theader:['Pen Name','Actual Cattle Number','Coefficient(%)','Formula Template','Supplement Formula','First Shift Ratio(%)','Second Shift Ratio(%)','Third Shift Ratio(%)','Fourth Shift Ratio(%)','Fifth shift Ratio(%)','Sixth shift Ratio(%)'],
   },
 
   feedObj: {
+     name: 'checkFeedNameEnglish,checkProjectTypeEnglish,checkFeedCodeEnglish,checkFeedTypeEnglish,importFeedEnglish,updateFeedSortByCodeEnglish',
       importParams:
-      'Feed Name,Feed Category,Unique Code,Plan Type,Package Unit Weight (kg),Unit Price,Jump Weight Range (kg)，Jump Dela,Confirm Star,Enabled/Disabled,Relay Without Upper Domain',
-      requiredParams: 'Feed Name,Feed Category,',
+      'Feed Name,Feed Category,Unique Code,Plan Type,Packing Unit Weight,Unit Price,Permissible Error Weight (kg),Jump Delay,Confirm Star,Enabled/Disabled,Relay Position,Without Upper Domain',
+      requiredParams: 'Feed Name,Feed Category',
   },
   msg360: "1.The file type should be in xlsx format, with the corresponding table file name format as: File Name.xlsx.",
-  msg361:"2.The name of the bottom worksheet cannot be changed, and the default is: Sheet1."
+  msg361:"2.The name of the bottom worksheet cannot be changed, and the default is: Sheet1.",
+  msg362: 'file/导入导出模板/配方计划/Spreading.xlsx',
 
 }

src/lang/en/langModule/premixedPlan.js

@@ -5,7 +5,7 @@ jscc:"Delete",
 sx:"Take Effect",
 jy:"Disable",
 tmrbh:"TMR Number",
-sljhccgs:"Feed Distribution Plan with Batch Following",
+sljhccgs:"Feed Spreading  Plan with Batch Following",
 zdjbl:"Maximum Mixing Quantity(KG)",
 hlzl:"Mixed Material Weight",
 fljhcsgs:" Material Issuance Plan with Train Number Following",

src/lang/en/langModule/processAnalysis.js

@@ -37,7 +37,7 @@ slzql:"Feed Spreading Correctness Rate",
 
   watchPlan:"Monitoring Chart",
 
-  planTypeList: [{ lable: 'Pre-mixed Plan', value: '4' }, { lable: 'Feed Distribution Plan', value: '0' }, { lable: 'Leftover Feed Plan ', value: '3' }, { lable: 'Feed Spreading  Plan-mixing', value: '1' }, { lable: 'Feed Spreading  Plan-Spreading Feed', value: '2' }, { lable: 'Pre-weighing Plan', value: '5' }],
+  planTypeList: [{ lable: 'Pre-mixed Plan', value: '4' }, { lable: 'Feed Spreading  Plan', value: '0' }, { lable: 'Leftover Feed Plan ', value: '3' }, { lable: 'Feed Spreading  Plan-mixing', value: '1' }, { lable: 'Feed Spreading  Plan-Spreading Feed', value: '2' }, { lable: 'Pre-weighing Plan', value: '5' }],
 
   workingConditionList: [{ id: '0', name: 'In Progress' }, { id: '1', name: 'Completed' }],
 
@@ -62,8 +62,8 @@ slzql:"Feed Spreading Correctness Rate",
     slsjxq: 'Remaining Material Collection Details',
     lsmc: "Pens Name",
     slcjzl: "Remaining Material Collection Weight (kg)",
-    yxfpsl: "Allowable Distribution of Remaining Material",
-    sjfpzl: "Actual Distribution Weight (kg)",
+    yxfpsl: "Allowable Spreading  of Remaining Material",
+    sjfpzl: "Actual Spreading  Weight (kg)",
     fqslzl: "Waste Remaining Material Weight",
 
 

src/lang/zn/langModule/message.js

@@ -434,13 +434,16 @@ numParams: '实际牛头数,系数（%）,第一班比例（%）,第二班比例
 theader:['栏舍名称', '实际牛头数', '系数（%）', '配方模板', '补料配方', '第一班比例（%）', '第二班比例（%）', '第三班比例（%）', '第四班比例（%）','第五班比例（%）','第六班比例（%）'],
 },
   feedObj: {
+     name: 'checkFeedName,checkProjectType,checkFeedCode,checkFeedType,importFeed,updateFeedSortByCode',
       importParams:
       '饲料名称，饲料类别，唯一编码，计划类型，包装单位重量，单价，允许误差数，跳转延时，确认开始，是否启用，继电器位置，无上域',
       requiredParams: '饲料名称,饲料分类',
   },
 
   msg360: '1、文件类型为xlsx类型，对应表格文件名格式为：文件名称.xlsx；',
-  msg361:'2、底部工作表名称不可更改，默认为：Sheet1；'
+  msg361:'2、底部工作表名称不可更改，默认为：Sheet1；',
+  msg362: 'file/导入导出模板/配方计划/配方模板导入模板.xlsx',
+  
 
 
 }

src/views/basicData/feedTable/index.vue

@@ -2162,7 +2162,7 @@ export default {
     },
     uploadData() {
       return {
-        name: 'checkFeedName,checkProjectType, checkFeedCode, checkFeedType, importFeed,updateFeedSortByCode',
+        name: this.$t('message.feedObj.name'),
         importParams: this.$t('message.feedObj.importParams'),
         sheetname: 'Sheet1',
         // 登录牧场

src/views/formulationPlan/dhedFormula/index.vue

@@ -1012,9 +1012,9 @@
               fixed="right"
             >
               <template slot-scope="scope">
-                <span style="color: blue" @click="handleRestore(scope.row)"
-                  >{{ $t('message.msg334') }}</span
-                >
+                <span style="color: blue" @click="handleRestore(scope.row)">{{
+                  $t('message.msg334')
+                }}</span>
               </template>
             </u-table-column>
           </u-table>
@@ -2282,8 +2282,8 @@ export default {
     },
     uploadData() {
       return {
-        name: 'checkbarname,checkftsw,checkftbl',
-        importParams:this.$t('message.dhedform.importParams'),
+        name: this.$t('message.dhedform.name'),
+        importParams: this.$t('message.dhedform.importParams'),
         sheetname: 'Sheet1',
         // 登录牧场
         pastureid: Cookies.get('pastureid'),
@@ -2292,7 +2292,7 @@ export default {
         // 必填参数
         requiredParams: this.$t('message.dhedform.requiredParams'),
         // 为数值的参数
-        numParams:this.$t('message.dhedform.numParams')
+        numParams: this.$t('message.dhedform.numParams')
       }
     },
     // 设置上传地址
@@ -5732,12 +5732,12 @@ export default {
           const table = this.$refs.table
           const columns = table.columns
           const labels = columns.map((column) => column.label)
-          const labelArr = labels.splice(0,2);
-          console.log(labels,'1111------------');
+          const labelArr = labels.splice(0, 2)
+          console.log(labels, '1111------------')
 
           var excelDatas = [
             {
-              tHeader:this.$t('message.dhedform.theader'),
+              tHeader: this.$t('message.dhedform.theader'),
               filterVal: ['barname', '', '', '', '', '', '', '', ''],
               tableDatas: this.download.list,
               sheetName: 'Sheet1'

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -580,7 +580,7 @@
                   style="width: 100%"
                   :clearable="false"
                   type="datetime"
-                  placeholder="时间"
+                  :placeholder="$t('dashboard.xTime')"
                   format="HH:mm"
                   value-format="HH:mm"
                 />

src/views/formulationPlan/recipeTemplate/index.vue

@@ -1871,7 +1871,7 @@ export default {
       if (item == 1) {
         console.log('点击了导出模板')
         const requestParam = this.requestParam
-        const url = Cookies.get('url') + 'file/导入导出模板/配方计划/配方模板导入模板.xlsx' // 请求下载文件的地址
+        const url = Cookies.get('url') + this.$t('message.msg362') // 请求下载文件的地址
         console.log(url)
         axios({
           method: 'GET',