فهرست منبع

中英文切换功能添加

asd26269546 1 سال پیش
والد
کامیت
7bfa81532c
8فایلهای تغییر یافته به همراه287 افزوده شده و 251 حذف شده
  1. 11 0
      .env.prod
  2. 11 0
      .env.staging
  3. 2 0
      package.json
  4. 1 0
      src/lang/cn.js
  5. 245 247
      src/lang/en.js
  6. 2 2
      src/lang/index.js
  7. 1 2
      src/views/equipment/threadHead.vue
  8. 14 0
      src/views/home/index.vue

+ 11 - 0
.env.prod

@@ -0,0 +1,11 @@
+# 页面标题
+VITE_APP_TITLE = ByteSailing
+
+# 生产环境配置
+VITE_APP_ENV = 'production'
+
+# 若依管理系统/生产环境
+VITE_APP_BASE_API = '/prod-api'
+
+# 是否在打包时开启压缩,支持 gzip 和 brotli
+VITE_BUILD_COMPRESS = gzip

+ 11 - 0
.env.staging

@@ -0,0 +1,11 @@
+# 页面标题
+VITE_APP_TITLE = ByteSailing
+
+# 生产环境配置
+VITE_APP_ENV = 'staging'
+
+# 若依管理系统/生产环境
+VITE_APP_BASE_API = '/test-api'
+
+# 是否在打包时开启压缩,支持 gzip 和 brotli
+VITE_BUILD_COMPRESS = gzip

+ 2 - 0
package.json

@@ -5,6 +5,8 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
+    "build:prod": "vue-cli-service build --mode prod",
+    "build:staging": "vue-cli-service build --mode staging",
     "dev": "vue-cli-service serve"
   },
   "dependencies": {

+ 1 - 0
src/lang/cn.js

@@ -867,6 +867,7 @@ export const lang = {
 		areYouSureYouWantToExitThisLogin:'您确定退出本次登录么?',
 		logOutSuccess:'退出成功',
 		logOutFailed:'退出失败',
+		switchLanguage:'switch English',
 		
 	},
 	login:{

+ 245 - 247
src/lang/en.js

@@ -3,12 +3,12 @@ export const lang = {
 	common:{
 		//消息,工作台,物联网,我的,请输入关键词,添加没有更多了,释放即可刷新,下拉即可刷新,加载中,加载失败,加载完成,没有更多了,返回,提交,修改成功,新增成功,删除成功,确定,取消,提示,自动,手动,正常,运行,离线,明细,请选择,删除,添加明细,标题,请添加明细
 		//操作成功,产品明细,设备状态,正常,工作模式,自动,设备参数,型号
-		message:'消息',
-		workbench:'工作台',
-		things:'物联网',
-		mine:'我的',
+		message:'Msg',
+		workbench:'Home',
+		things:'IoT',
+		mine:'Me',
 		pleaseEnterKeywords:'请输入关键词',
-		add:'添加',
+		add:'add',
 		noMore:'没有更多了',
 		releaseToRefresh:'释放即可刷新',
 		pullDownToRefresh:'下拉即可刷新',
@@ -17,7 +17,7 @@ export const lang = {
 		loadComplete:'加载完成',
 		noMore:'没有更多了',
 		back:'返回',
-		submit:'提交',
+		submit:'submit',
 		modifySuccess:'修改成功',
 		addSuccess:'新增成功',
 		deleteSuccess:'删除成功',
@@ -26,10 +26,10 @@ export const lang = {
 		prompt:'提示',
 		auto:'自动',
 		manual:'手动',
-		normal:'正常',
+		normal:'correct',
 		equipmentStatus:"设备状态",
 		operatingMode:"工作模式",
-		running:"运行",
+		running:"running",
 		offline:"离线",
 		details:"明细",
 		pleaseSelect:"请选择",
@@ -40,33 +40,31 @@ export const lang = {
 		operationSuccessful:"操作成功",
 		productDetails:"产品明细",
 		equipmentParameters:"设备参数",
-		model:"型号",
+		model:"type",
 
 	},
 	feedback:{
 		//我的反馈,反馈,全部,待回复,已回复,姓名,公司名称,联系方式,问题反馈,关注企业公众号,企业微信客服,请填写姓名,请填写公司名称,请填写联系方式,请填写备注
 		//姓名,公司名称,联系方式,模块类型,备注,图片补充
-		name:'我的反馈',
-		feedback:'反馈',
-		all:'全部',
-		toReply:'待回复',
-		replied:'已回复',
-		nameText:'姓名',
-		companyName:'公司名称',
-		contactInformation:'联系方式',
-		problemFeedback:'问题反馈',
-		attentionToEnterprisePublicNumber:'关注企业公众号',
-		enterpriseWeChatCustomerService:'企业微信客服',
-		pleaseFillInYourName:'请填写姓名',
-		pleaseFillInTheCompanyName:'请填写公司名称',
-		pleaseFillInTheContactInformation:'请填写联系方式',
-		pleaseFillInTheRemarks:'请填写备注',
-		nameText:'姓名',
-		companyName:'公司名称',
-		contactInformation:'联系方式',
-		moduleType:'模块类型',
-		remarks:'备注',
-		pictureSupplement:'图片补充',
+		all:'All',
+		toReply:'To Reply',
+		replied:'Replied',
+		nameText:'Name',
+		companyName:'Company Name',
+		contactInformation:'Contact Information',
+		problemFeedback:'Problem Feedback',
+		attentionToEnterprisePublicNumber:'Attention to Enterprise Public Number',
+		enterpriseWeChatCustomerService:'Enterprise WeChat Customer Service',
+		pleaseFillInYourName:'Please fill in your name',
+		pleaseFillInTheCompanyName:'Please fill in the company name',
+		pleaseFillInTheContactInformation:'Please fill in the contact information',
+		pleaseFillInTheRemarks:'Please fill in the remarks',
+		nameText:'Name',
+		companyName:'Company Name',
+		contactInformation:'Contact Information',
+		moduleType:'Module Type',
+		remarks:'Remark',
+		pictureSupplement:'Picture Supplement'
 
 	},
 	salesContract:{
@@ -84,12 +82,12 @@ export const lang = {
 		pleaseEnterTheUnitPrice:'请输入单价',
 		pleaseEnterTheQuantity:'请输入数量',
 		contractDetails:'合同明细',
-		productName:'产品名称',
+		productName:'item name',
 		whetherToCustomize:'是否定制',
 		yes:'是',
 		no:'否',
-		unitPrice:'单价',
-		quantity:'数量',
+		unitPrice:'unit price',
+		quantity:'quantity',
 		amountSubtotal:'金额小计',
 		automaticallyCalculatedBasedOnUnitPriceAndQuantity:'根据单价、数量自动计算',
 		customerName:'客户名称',
@@ -98,7 +96,7 @@ export const lang = {
 		freightPayer:'运费支付方',
 		partyA:'甲方',
 		partyB:'乙方',
-		remarks:'备注',
+		remarks:'remark',
 		contractTotalAmount:'合同总金额',
 		pleaseAddContractDetails:'请添加合同明细!',
 
@@ -112,7 +110,7 @@ export const lang = {
 		warehousingQuantityCanNotBeEmpty:'入库数量不能为空',
 		confirmReceipt:'确认接收',
 		return:'退回',
-		productName:'产品名称',
+		productName:'item name',
 		productSN:'产品SN',
 		previousProcess:'前道工序',
 		circulationInto:'流转入',
@@ -120,30 +118,30 @@ export const lang = {
 	forward:{
 		//任务流转,产品名称,产品SN,当前工序,请选择负责人,当前工序,工序图纸,目标工序,负责人,产品名称,产品SN,当前工序,工序图纸,提交入库
 		name:'任务流转',
-		productName:'产品名称',
+		productName:'item name',
 		productSN:'产品SN',
 		pleaseSelectThePersonInCharge:'请选择负责人',
 		processDrawing:'工序图纸',
 		targetProcess:'目标工序',
-		personInCharge:'负责人',
+		personInCharge:'person in Charge',
 		currentProcess:'当前工序',
 		submitStorage:'提交入库',
 		
 	},
 	inventoryQuery:{
 		//库存查询,查看库位,物品分类,物品名称,库存数量,全部,产品,物料,库位,仓库名称,仓管员,物品分类,物品名称
-		name:'库存查询',
+		name:'stock inquiry',
 		viewLocation:'查看库位',
-		itemName:'物品名称',
-		inventoryQuantity:'库存数量',
-		all:'全部',
+		itemName:'item name',
+		inventoryQuantity:'QTY in stock',
+		all:'all',
 		product:'产品',
 		material:'物料',
 		location:'库位',
-		warehouseName:'仓库名称',
-		warehouseKeeper:'仓管员',
+		warehouseName:'warehouse name',
+		warehouseKeeper:'warehouse keeper',
 		itemClassification:'物品分类',
-		itemName:'物品名称',
+		itemName:'item name',
 
 	},
 	afterSales:{
@@ -165,72 +163,72 @@ export const lang = {
 		afterSalesReason:'售后原因',
 		operationSuccessful:'操作成功',
 		scanSuccess:'扫描成功',
-		error:'错误',
+		error:'error',
 		pleaseSelectTheCustomerName:'请选择客户名称',
 		originalPartsList:'原配件清单',
 		programFile:'程序文件',
 		afterSalesCode:'售后编码',
-		productName:'产品名称',
+		productName:'item name',
 		productSN:'产品SN',
 		accessoriesName:'配件名称',
-		quantity:'数量',
+		quantity:'quantity',
 		afterSales:'(售后)',
 	},
 	workOrder:{
 		//工单管理,工单编号,工单来源,产品名称,工单数量,工单状态,工单来源,选择工单来源,工单来源不能为空,产品名称,选择产品名称,产品名称不能为空,工单数量,请输入工单数量,工单数量不能为空,备注,请输入备注,生产计划
 		//计划日期,计划数量,计划状态
-		name:'工单管理',
+		name:'workorder management',
 		workOrderCode:'工单编号',
-		workOrderQuantity:'工单数量',
-		workOrderStatus:'工单状态',
-		workOrderSource:'工单来源',
+		workOrderQuantity:'order QTY',
+		workOrderStatus:'order state',
+		workOrderSource:'order source',
 		selectWorkOrderSource:'选择工单来源',
 		workOrderSourceCanNotBeEmpty:'工单来源不能为空',
-		productName:'产品名称',
+		productName:'item name',
 		selectProductName:'选择产品名称',
 		productNameCanNotBeEmpty:'产品名称不能为空',
-		workOrderQuantity:'工单数量',
+		workOrderQuantity:'order QTY',
 		pleaseEnterTheWorkOrderQuantity:'请输入工单数量',
 		workOrderQuantityCanNotBeEmpty:'工单数量不能为空',
-		remarks:'备注',
+		remarks:'remark',
 		pleaseEnterRemarks:'请输入备注',
-		productionPlan:'生产计划',
-		planDate:'计划日期',
-		planQuantity:'计划数量',
-		planStatus:'计划状态',
+		productionPlan:'production schedule',
+		planDate:'planned date',
+		planQuantity:'planned QTY',
+		planStatus:'state',
 	},
 	reportWork:{
 		//生产报工,报工,任务编码,报工时间,操作人,生产任务,选择生产任务,生产任务不能为空,产品名称,任务数量,负责人,完成期限,工序名称,选择工序名称,工序名称不能为空,姓名,请输入姓名,姓名不能为空,报工数量,请输入报工数量,
 		//报工数量不能为空,报工成功,计划时间,计划数量,计划状态,完成状态,未开始,进行中,完成
-		name:'生产报工',
-		reportWork:'报工',
-		taskCode:'任务编码',
-		reportWorkTime:'报工时间',
-		operator:'操作人',
-		productionTask:'生产任务',
+		name:'Production report',
+		reportWork:'add',
+		taskCode:'task code',
+		reportWorkTime:'report date',
+		operator:'operator',
+		productionTask:'productive task',
 		selectProductionTask:'选择生产任务',
 		productionTaskCanNotBeEmpty:'生产任务不能为空',
-		productName:'产品名称',
-		taskQuantity:'任务数量',
-		principal:'负责人',
-		completionDeadline:'完成期限',
-		processName:'工序名称',
+		productName:'item name',
+		taskQuantity:'task QTY',
+		principal:'person in Charge',
+		completionDeadline:'deadline',
+		processName:'task name',
 		selectProcessName:'选择工序名称',
 		processNameCanNotBeEmpty:'工序名称不能为空',
-		name:'姓名',
+		name:'name',
 		pleaseEnterTheName:'请输入姓名',
 		nameCanNotBeEmpty:'姓名不能为空',
-		reportWorkQuantity:'报工数量',
+		reportWorkQuantity:'report QTY',
 		pleaseEnterTheReportWorkQuantity:'请输入报工数量',
 		reportWorkQuantityCanNotBeEmpty:'报工数量不能为空',
 		reportWorkSuccess:'报工成功',
 		planTime:'计划时间',
-		planQuantity:'计划数量',
-		planStatus:'计划状态',
+		planQuantity:'planned QTY',
+		planStatus:'state',
 		completionStatus:'完成状态',
 		notStarted:'未开始',
 		ongoing:'进行中',
-		completed:'完成',
+		completed:'complated',
 	},
 	completeProject:{
 		//完工入库
@@ -238,53 +236,53 @@ export const lang = {
 	task:{
 		//生产任务,任务编码,产品名称,任务数量,完成期限,负责人,生产计划,请选择生产计划,生产计划不能为空,产品名称,待生产数量,任务数量,请输入任务数量,任务数量不能为空,负责人,请选择负责人,负责人不能为空,完成期限,请选择完成期限,完成期限不能为空
 		//任务数量不可大于待生产数量,完成期限不能早于计划开始时间,当前工序,累计耗时,待排程数量,任务数量不可大于待排程数量,完成期限不能早于计划开始时间
-		name:'生产任务',
-		taskCode:'任务编码',
-		taskQuantity:'任务数量',
-		completionDeadline:'完成期限',
-		principal:'负责人',
-		productionPlan:'生产计划',
+		name:'productive task',
+		taskCode:'task code',
+		taskQuantity:'task QTY',
+		completionDeadline:'deadline',
+		principal:'person in Charge',
+		productionPlan:'production schedule',
 		selectProductionPlan:'请选择生产计划',
 		productionPlanCanNotBeEmpty:'生产计划不能为空',
-		productName:'产品名称',
+		productName:'item name',
 		toBeProducedQuantity:'待生产数量',
-		taskQuantity:'任务数量',
+		taskQuantity:'task QTY',
 		pleaseEnterTheTaskQuantity:'请输入任务数量',
 		taskQuantityCanNotBeEmpty:'任务数量不能为空',
-		principal:'负责人',
+		principal:'person in Charge',
 		selectPrincipal:'请选择负责人',
 		principalCanNotBeEmpty:'负责人不能为空',
-		completionDeadline:'完成期限',
+		completionDeadline:'deadline',
 		selectCompletionDeadline:'请选择完成期限',
 		completionDeadlineCanNotBeEmpty:'完成期限不能为空',
 		taskQuantityCanNotBeGreaterThanTheToBeProducedQuantity:'任务数量不可大于待生产数量',
 		completionDeadlineCanNotBeEarlierThanThePlanStartTime:'完成期限不能早于计划开始时间',
 		currentProcess:'当前工序',
 		accumulatedTimeConsumption:'累计耗时',
-		scheduledQuantity:'待排程数量',
+		scheduledQuantity:'QTY unqueued',
 		taskQuantityCanNotBeGreaterThanTheScheduledQuantity:'任务数量不可大于待排程数量',
 	},
 	lineSide:{
 		//线边管理,物料类型,物料名称,线边数量,物品类型,请选择物品类型,物品类型不能为空,物品名称,请选择物品名称,物品名称不能为空,线边数量,添加数量,请输入添加数量,添加数量不能为空,处理类型,请选择处理类型,处理类型不能为空
 		//数量,请输入数量,数量不能为空,用料,回仓,报废,其他,操作成功
-		name:'线边管理',
-		materialType:'物料类型',
-		materialName:'物料名称',
-		lineSideQuantity:'线边数量',
-		itemType:'物品类型',
+		name:'Point Of Use (POU)',
+		materialType:'material types',
+		materialName:'material name',
+		lineSideQuantity:'material quantity',
+		itemType:'item type',
 		selectItemType:'请选择物品类型',
 		itemTypeCanNotBeEmpty:'物品类型不能为空',
-		materialName:'物品名称',
+		materialName:'item name',
 		selectMaterialName:'请选择物品名称',
 		materialNameCanNotBeEmpty:'物品名称不能为空',
-		lineSideQuantity:'线边数量',
-		addQuantity:'添加数量',
+		lineSideQuantity:'material quantity',
+		addQuantity:'add quantity',
 		pleaseEnterTheAddQuantity:'请输入添加数量',
 		addQuantityCanNotBeEmpty:'添加数量不能为空',
-		processingType:'处理类型',
+		processingType:'type of treatment',
 		selectProcessingType:'请选择处理类型',
 		processingTypeCanNotBeEmpty:'处理类型不能为空',
-		quantity:'数量',
+		quantity:'quantity',
 		pleaseEnterTheQuantity:'请输入数量',
 		quantityCanNotBeEmpty:'数量不能为空',
 		used:'用料',
@@ -296,15 +294,15 @@ export const lang = {
 	completeProject:{
 		//完工入库,生产任务,产品名称,完工数量,生产任务,选择生产任务,生产任务不能为空,产品名称,任务数量,负责人,完成期限,完工数量,请输入完工数量,完工数量不能为空,完工入库成功
 		name:'完工入库',
-		completionQuantity:'完工数量',
-		productionTask:'生产任务',
+		completionQuantity:'complete QTY',
+		productionTask:'productive task',
 		selectProductionTask:'选择生产任务',
 		productionTaskCanNotBeEmpty:'生产任务不能为空',
-		productName:'产品名称',
-		taskQuantity:'任务数量',
-		principal:'负责人',
-		completionDeadline:'完成期限',
-		completionQuantity:'完工数量',
+		productName:'item name',
+		taskQuantity:'task QTY',
+		principal:'person in Charge',
+		completionDeadline:'deadline',
+		completionQuantity:'complete QTY',
 		pleaseEnterTheCompletionQuantity:'请输入完工数量',
 		completionQuantityCanNotBeEmpty:'完工数量不能为空',
 		completeProjectSuccess:'完工入库成功',
@@ -313,33 +311,33 @@ export const lang = {
 	plan:{
 		//生产计划,计划时间,产品名称,计划数量,计划状态,未开始,进行中,完成,选择工单,请选择工单,工单不能为空,产品名称,待排程数量,计划开始时间,请选择计划开始时间,计划开始时间不能为空,计划数量,请输入计划数量,计划数量不能为空,计划数量不可大于待排程数量
 		//时间选择存在问题,计划结束时间,请选择计划结束时间,计划结束时间不能为空,工单管理,生产任务,任务数量,负责人,完成状态
-		name:'生产计划',
+		name:'production schedule',
 		planTime:'计划时间',
-		planQuantity:'计划数量',
-		planStatus:'计划状态',
+		planQuantity:'planned QTY',
+		planStatus:'state',
 		notStarted:'未开始',
 		ongoing:'进行中',
-		complete:'完成',
-		selectWorkOrder:'选择工单',
+		complete:'complated',
+		selectWorkOrder:'select orders on hand',
 		selectWorkOrder:'请选择工单',
 		workOrderCanNotBeEmpty:'工单不能为空',
-		productName:'产品名称',
-		schedulingQuantity:'待排程数量',
-		planStartTime:'计划开始时间',
+		productName:'item name',
+		schedulingQuantity:'QTY unqueued',
+		planStartTime:'stcheduled start time',
 		selectPlanStartTime:'请选择计划开始时间',
 		planStartTimeCanNotBeEmpty:'计划开始时间不能为空',
-		planQuantity:'计划数量',
+		planQuantity:'planned QTY',
 		pleaseEnterThePlanQuantity:'请输入计划数量',
 		planQuantityCanNotBeEmpty:'计划数量不能为空',
 		planQuantityCanNotBeGreaterThanTheSchedulingQuantity:'计划数量不可大于待排程数量',
 		timeSelectionProblem:'时间选择存在问题',
-		planEndTime:'计划结束时间',
+		planEndTime:'scheduled end time',
 		selectPlanEndTime:'请选择计划结束时间',
 		planEndTimeCanNotBeEmpty:'计划结束时间不能为空',
-		workOrderManagement:'工单管理',
-		productionTask:'生产任务',
-		taskQuantity:'任务数量',
-		principal:'负责人',
+		workOrderManagement:'workorder management',
+		productionTask:'productive task',
+		taskQuantity:'task QTY',
+		principal:'person in Charge',
 		completionStatus:'完成状态',
 
 	},
@@ -354,28 +352,28 @@ export const lang = {
 	supplierConfig:{
 		//供应商信息,供应商类型,供应商名称,联系人信息,贸易商,工厂,供应商类型,请选择供应商类型,供应商类型不能为空,供应商名称,请填写供应商名称,供应商名称不能为空,所在城市,选择所在城市,所在城市不能为空,请选择所在地区,详细地址,请填写详细地址
 		//联系人,请填写联系人,联系人不能为空,联系电话,请填写联系电话,联系电话不能为空,文件上传
-		name:'供应商信息',
-		supplierType:'供应商类型',
-		supplierName:'供应商名称',
-		contactInformation:'联系人信息',
+		name:'vendor info.',
+		supplierType:'vendor type',
+		supplierName:'vendor name',
+		contactInformation:'contact info.',
 		trader:'贸易商',
 		factory:'工厂',
-		supplierType:'供应商类型',
-		selectSupplierType:'请选择供应商类型',
-		supplierTypeCanNotBeEmpty:'供应商类型不能为空',
-		supplierName:'供应商名称',
-		pleaseFillInTheSupplierName:'请填写供应商名称',
-		supplierNameCanNotBeEmpty:'供应商名称不能为空',
-		city:'所在城市',
+		supplierType:'vendor type',
+		selectSupplierType:'choose vendor type',
+		supplierTypeCanNotBeEmpty:'vendor type can not be null',
+		supplierName:'vendor name',
+		pleaseFillInTheSupplierName:'choose vendor name',
+		supplierNameCanNotBeEmpty:'vendor name can not be null',
+		city:'city',
 		selectCity:'选择所在城市',
 		cityCanNotBeEmpty:'所在城市不能为空',
 		selectArea:'请选择所在地区',
-		detailedAddress:'详细地址',
+		detailedAddress:'address',
 		pleaseFillInTheDetailedAddress:'请填写详细地址',
-		contact:'联系人',
-		pleaseFillInTheContact:'请填写联系人',
-		contactCanNotBeEmpty:'联系人不能为空',
-		contactNumber:'联系电话',
+		contact:'contact',
+		pleaseFillInTheContact:'choose contact',
+		contactCanNotBeEmpty:'contact can not be null',
+		contactNumber:'phone number',
 		pleaseFillInTheContactNumber:'请填写联系电话',
 		contactNumberCanNotBeEmpty:'联系电话不能为空',
 		fileUpload:'文件上传',
@@ -389,11 +387,11 @@ export const lang = {
 	},
 	subscribe:{
 		//申购,发起申购,申购单号,物品名称,数量,请输入数量,数量不能为空,事由,请输入事由,事由不能为空,申购成功
-		name:'申购',
-		initiateProcurement:'发起申购',
-		procurementNumber:'申购单号',
-		itemName:'物品名称',
-		quantity:'数量',
+		name:'purchasing application',
+		initiateProcurement:'request',
+		procurementNumber:'PurRqs No.',
+		itemName:'item name',
+		quantity:'quantity',
 		pleaseEnterTheQuantity:'请输入数量',
 		quantityCanNotBeEmpty:'数量不能为空',
 		cause:'事由',
@@ -405,37 +403,37 @@ export const lang = {
 	purchased:{
 		//已采购,申购单号,供应商,采购金额,采购状态,草稿,审批中,驳回,通过,新增采购,申购部门,选择申购部门,申购部门不能为空,申购人名称,请填写申购人名称,申购人名称不能为空,申购时间,点击选择时间,申购时间不能为空
 		//供应商,选择供应商,供应商不能为空,申购说明,请填写申购说明,申购产品,选择申购产品,申购产品不能为空,本次采购,请输入本次采购,本次采购不能为空,单价,请输入单价,单价不能为空,总价,根据本次采购和单价自动计算,所有明细的金额合计,采购申请成功
-		name:'已采购',
-		procurementNumber:'申购单号',
+		name:'purchased: ',
+		procurementNumber:'PurRqs No.',
 		purchaseAmount:'采购金额',
-		purchaseStatus:'采购状态',
+		purchaseStatus:'status',
 		draft:'草稿',
-		approval:'审批中',
+		approval:'in approval process',
 		reject:'驳回',
 		pass:'通过',
-		addProcurement:'新增采购',
-		procurementDepartment:'申购部门',
+		addProcurement:'new order',
+		procurementDepartment:'operator department',
 		selectProcurementDepartment:'选择申购部门',
 		procurementDepartmentCanNotBeEmpty:'申购部门不能为空',
 		procurementPersonName:'申购人名称',
 		pleaseFillInTheProcurementPersonName:'请填写申购人名称',
 		procurementPersonNameCanNotBeEmpty:'申购人名称不能为空',
-		procurementTime:'申购时间',
+		procurementTime:'Pur date',
 		clickToSelectTime:'点击选择时间',
 		procurementTimeCanNotBeEmpty:'申购时间不能为空',
-		supplier:'供应商',
+		supplier:'vendor',
 		selectSupplier:'选择供应商',
 		supplierCanNotBeEmpty:'供应商不能为空',
-		procurementDescription:'申购说明',
+		procurementDescription:'description',
 		pleaseFillInTheProcurementDescription:'请填写申购说明',
 		procurementDescriptionCanNotBeEmpty:'申购说明不能为空',
 		procurementProduct:'申购产品',
 		selectProcurementProduct:'选择申购产品',
 		procurementProductCanNotBeEmpty:'申购产品不能为空',
-		purchase:'本次采购',
+		purchase:'QTY for this sub-order',
 		pleaseEnterThePurchase:'请输入本次采购',
 		purchaseCanNotBeEmpty:'本次采购不能为空',
-		unitPrice:'单价',
+		unitPrice:'unit price',
 		pleaseEnterTheUnitPrice:'请输入单价',
 		unitPriceCanNotBeEmpty:'单价不能为空',
 		totalPrice:'总价',
@@ -447,37 +445,37 @@ export const lang = {
 	procureList:{
 		//待采购,采购,申购单号,物品名称,申购数量,已采购,申购部门,选择申购部门,申购部门不能为空,申购人名称,请填写申购人名称,申购人名称不能为空,申购时间,点击选择时间,申购时间不能为空,供应商,选择供应商,供应商不能为空,申购说明,请填写申购说明,申购说明不能为空,申购产品,选择申购产品,申购产品不能为空,数量,请输入数量,数量不能为空,本次采购,请输入本次采购,本次采购不能为空
 		//单价,请输入单价,单价不能为空,总价,根据本次采购和单价自动计算,所有明细的金额合计,采购申请成功
-		name:'待采购',
-		purchase:'采购',
-		procurementNumber:'申购单号',
-		itemName:'物品名称',
-		procurementQuantity:'申购数量',
-		purchased:'已采购',
-		procurementDepartment:'申购部门',
+		name:'planning order',
+		purchase:'new plan',
+		procurementNumber:'PurRqs No.',
+		itemName:'item name',
+		procurementQuantity:'quantity',
+		purchased:'purchased: ',
+		procurementDepartment:'operator department',
 		selectProcurementDepartment:'选择申购部门',
 		procurementDepartmentCanNotBeEmpty:'申购部门不能为空',
 		procurementPersonName:'申购人名称',
 		pleaseFillInTheProcurementPersonName:'请填写申购人名称',
 		procurementPersonNameCanNotBeEmpty:'申购人名称不能为空',
-		procurementTime:'申购时间',
+		procurementTime:'Pur date',
 		clickToSelectTime:'点击选择时间',
 		procurementTimeCanNotBeEmpty:'申购时间不能为空',
-		supplier:'供应商',
+		supplier:'vendor',
 		selectSupplier:'选择供应商',
 		supplierCanNotBeEmpty:'供应商不能为空',
-		procurementDescription:'申购说明',
+		procurementDescription:'description',
 		pleaseFillInTheProcurementDescription:'请填写申购说明',
 		procurementDescriptionCanNotBeEmpty:'申购说明不能为空',
 		procurementProduct:'申购产品',
 		selectProcurementProduct:'选择申购产品',
 		procurementProductCanNotBeEmpty:'申购产品不能为空',
-		quantity:'数量',
+		quantity:'quantity',
 		pleaseEnterTheQuantity:'请输入数量',
 		quantityCanNotBeEmpty:'数量不能为空',
-		thisPurchase:'本次采购',
+		thisPurchase:'QTY for this sub-order',
 		pleaseEnterThisPurchase:'请输入本次采购',
 		thisPurchaseCanNotBeEmpty:'本次采购不能为空',
-		unitPrice:'单价',
+		unitPrice:'unit price',
 		pleaseEnterTheUnitPrice:'请输入单价',
 		unitPriceCanNotBeEmpty:'单价不能为空',
 		totalPrice:'总价',
@@ -487,14 +485,14 @@ export const lang = {
 	},
 	priceConfig:{
 		//供应价格,供应商,物品名称,供应单价,选择供应商,供应商不能为空,供应物品,选择物品名称,物品名称不能为空,请输入供应单价,供应单价不能为空
-		name:'供应价格',
-		supplyPrice:'供应价格',
-		supplier:'供应商',
-		itemName:'物品名称',
-		supplyUnitPrice:'供应单价',
+		name:'purchase price',
+		supplyPrice:'purchase price',
+		supplier:'vendor',
+		itemName:'item name',
+		supplyUnitPrice:'unit price',
 		selectSupplier:'选择供应商',
 		supplierCanNotBeEmpty:'供应商不能为空',
-		supplyItems:'供应物品',
+		supplyItems:'item',
 		selectItemName:'选择物品名称',
 		itemNameCanNotBeEmpty:'物品名称不能为空',
 		pleaseEnterSupplyUnitPrice:'请输入供应单价',
@@ -503,30 +501,30 @@ export const lang = {
 	},
 	productLibrary:{
 		//产品库,产品分类,产品编码,产品名称,产品类型,成品,半成品,规格型号,单位,文件上传,备注,产品分类不能为空,产品类型不能为空,产品名称不能为空,规格型号不能为空,单位不能为空,请选择,请选择时间,请选择级联
-		name:'产品库',
-		productClassification:'产品分类',
-		productCode:'产品编码',
-		productName:'产品名称',
-		productType:'产品类型',
+		name:'product inventory',
+		productClassification:'product classification',
+		productCode:'product code',
+		productName:'item name',
+		productType:'product type',
 		finishedProduct:'成品',
 		semifinishedProduct:'半成品',
-		specificationModel:'规格型号',
-		unit:'单位',
+		specificationModel:'product model',
+		unit:'unit',
 		fileUpload:'文件上传',
-		remarks:'备注',
+		remarks:'remark',
 		productClassificationCanNotBeEmpty:'产品分类不能为空',
 		productTypeCanNotBeEmpty:'产品类型不能为空',
 		productNameCanNotBeEmpty:'产品名称不能为空',
 		specificationModelCanNotBeEmpty:'规格型号不能为空',
 		unitCanNotBeEmpty:'单位不能为空',
-		pleaseSelect:'请选择',
-		pleaseSelectTime:'请选择时间',
+		pleaseSelect:'choose',
+		pleaseSelectTime:'choose time',
 		pleaseSelectCascader:'请选择级联',
 
 	},
 	productClassification:{
 		//产品分类,添加一级节点,是否确认删除该分类,产品分类添加,节点名称,请填写节点名称,节点名称不能为空,产品分类编辑
-		name:'产品分类',
+		name:'product classification',
 		addFirstLevelNode:'添加一级节点',
 		confirmDeleteTheClassification:'是否确认删除该分类',
 		productClassificationAdd:'产品分类添加',
@@ -537,33 +535,33 @@ export const lang = {
 	},
 	library:{
 		//物料库,物料分类,物料编码,物料名称,物料类型,原料,辅料,配件,包材,其他,规格型号,单位,文件上传,备注,产品分类不能为空,产品类型不能为空,产品名称不能为空,规格型号不能为空,单位不能为空,请选择,请选择时间,请选择级联
-		name:'物料库',
-		materialClassification:'物料分类',
-		materialCode:'物料编码',
-		materialName:'物料名称',
-		materialType:'物料类型',
+		name:'material inventory',
+		materialClassification:'material classification',
+		materialCode:'material code',
+		materialName:'material name',
+		materialType:'material types',
 		rawMaterial:'原料',
 		accessory:'辅料',
 		fittings:'配件',
 		packaging:'包材',
 		other:'其他',
-		specificationModel:'规格型号',
-		unit:'单位',
+		specificationModel:'product model',
+		unit:'unit',
 		fileUpload:'文件上传',
-		remark:'备注',
+		remark:'remark',
 		productClassificationCanNotBeEmpty:'产品分类不能为空',
 		productTypeCanNotBeEmpty:'产品类型不能为空',
 		productNameCanNotBeEmpty:'产品名称不能为空',
 		specificationModelCanNotBeEmpty:'规格型号不能为空',
 		unitCanNotBeEmpty:'单位不能为空',
-		pleaseSelect:'请选择',
+		pleaseSelect:'choose',
 		pleaseSelectTime:'请选择时间',
 		pleaseSelectCascader:'请选择级联',
 		
 	},
 	classification:{
 		//物料分类,物料分类添加,节点名称,请填写节点名称,节点名称不能为空,添加一级节点,是否确认删除该分类,物料分类编辑
-		name:'物料分类',
+		name:'material classification',
 		materialClassificationAdd:'物料分类添加',
 		nodeName:'节点名称',
 		pleaseFillInNodeName:'请填写节点名称',
@@ -581,8 +579,8 @@ export const lang = {
 		ordinaryWorkshop:'普通车间',
 		semiAutomaticWorkshop:'半自动化车间',
 		automaticWorkshop:'自动化车间',
-		principal:'负责人',
-		remarks:'备注',
+		principal:'person in Charge',
+		remarks:'remark',
 		workshopTypeCanNotBeEmpty:'车间类型不能为空',
 		workshopNameCanNotBeEmpty:'车间名称不能为空',
 		principalCanNotBeEmpty:'负责人不能为空',
@@ -590,7 +588,7 @@ export const lang = {
 	workingProcedure:{
 		//工序管理,工序名称,工序说明,工序文件,车间类型不能为空,请上传工序文件
 		name:'工序管理',
-		processName:'工序名称',
+		processName:'task name',
 		processDescription:'工序说明',
 		processFile:'工序文件',
 		workshopTypeCanNotBeEmpty:'车间类型不能为空',
@@ -600,7 +598,7 @@ export const lang = {
 	technology:{
 		//工艺管理,工序名称,工艺路线,适用产品,车间名称,工艺线路,适用产品,车间类型不能为空,请上传工序文件
 		name:'工艺管理',
-		processName:'工序名称',
+		processName:'task name',
 		processRoute:'工艺路线',
 		applicableProducts:'适用产品',
 		workshopName:'车间名称',
@@ -621,7 +619,7 @@ export const lang = {
 		workshopName:'车间名称',
 		lineType:'产线类型',
 		lineName:'产线名称',
-		principal:'负责人',
+		principal:'person in Charge',
 		lineDescription:'产线说明',
 		lineTypeCanNotBeEmpty:'产线类型不能为空',
 		lineNameCanNotBeEmpty:'产线名称不能为空',
@@ -629,16 +627,16 @@ export const lang = {
 	},
 	manualInbound:{
 		//手动入库,仓库名称,入库时间,操作人,关闭摄像头,仓库名称不能为空,物品名称不能为空,入库数量不能为空,物品名称,入库数量,请添加明细,入库成功,扫描成功
-		name:'手动入库',
-		warehouseName:'仓库名称',
-		warehousingTime:'入库时间',
-		operator:'操作人',
+		name:'manual IM-warehousing',
+		warehouseName:'warehouse name',
+		warehousingTime:'entry date',
+		operator:'operator',
 		closeCamera:'关闭摄像头',
 		warehouseNameCanNotBeEmpty:'仓库名称不能为空',
 		goodsNameCanNotBeEmpty:'物品名称不能为空',
 		warehousingQuantityCanNotBeEmpty:'入库数量不能为空',
-		goodsName:'物品名称',
-		warehousingQuantity:'入库数量',
+		goodsName:'item name',
+		warehousingQuantity:'QTY received to stock',
 		addDetails:'请添加明细!',
 		warehousingSuccess:'入库成功',
 		scanSuccess:'扫描成功',
@@ -647,36 +645,36 @@ export const lang = {
 		//BOM管理,新建版本,产品名称,产品编码,版本号,新选择进入详情后的功能,新建版本,修改,物料编码,物料名称,单位,数量,成本,产品名称,请填写数量,请填写成本
 		name:'BOM管理',
 		newVersion:'新建版本',
-		productName:'产品名称',
-		productCode:'产品编码',
+		productName:'item name',
+		productCode:'product code',
 		versionNumber:'版本号',
 		newSelect:'新选择进入详情后的功能',
 		newVersion:'新建版本',
-		modify:'修改',
-		materialCode:'物料编码',
-		materialName:'物料名称',
-		unit:'单位',
-		quantity:'数量',
+		modify:'modify',
+		materialCode:'material code',
+		materialName:'material name',
+		unit:'unit',
+		quantity:'quantity',
 		cost:'成本',
 		pleaseFillInQuantity:'请填写数量',
 		pleaseFillInCost:'请填写成本',
 	},
 	waitOutbound:{
 		//待出库,数据来源,物品名称,待办数量,线边回仓.完工入库,采购到货,退货出库,京东订单,销售订单出库,生产任务出库,待出库数量,本次出库,出库数量,请输入出库数量,出库数量不能为空,销售订单出库,京东订单出库,出库成功
-		name:'待出库',
-		dataSource:'数据来源',
-		goodsName:'物品名称',
-		toBeDoneQuantity:'待办数量',
+		name:'scheduled EX-warehouse',
+		dataSource:'news source',
+		goodsName:'item name',
+		toBeDoneQuantity:'scheduled QTY',
 		lineSideReturnWarehouse:'线边回仓',
 		completedWarehouse:'完工入库',
-		purchaseArrival:'采购到货',
+		purchaseArrival:'scheduled Pur order',
 		returnOutbound:'退货出库',
 		jdOrder:'京东订单',
 		salesOrderOutbound:'销售订单出库',
 		productionTaskOutbound:'生产任务出库',
-		waitOutboundQuantity:'待出库数量',
+		waitOutboundQuantity:'scheduled QTY',
 		thisTimeOutbound:'本次出库',
-		outboundQuantity:'出库数量',
+		outboundQuantity:'QTY',
 		pleaseEnterOutboundQuantity:'出库数量不能为空',
 		outboundQuantityCanNotBeEmpty:'出库数量不能为空',
 		salesOrderOutbound:'销售订单出库',
@@ -687,59 +685,59 @@ export const lang = {
 	},
 	waitInbound:{
 		//待入库,数据来源,物品名称,代办数量,线边回仓,完工入库,采购到货,退货出库,京东订单,销售订单出库,待入库数量,单号,本次入库,仓库名称,选择仓库名称,仓库名称不能为空,入库数量,请输入入库数量,入库数量不能为空
-		name:'待入库',
-		dataSource:'数据来源',
-		goodsName:'物品名称',
+		name:'scheduled IM-warehousing',
+		dataSource:'news source',
+		goodsName:'item name',
 		toBeDoneQuantity:'代办数量',
 		lineSideReturnWarehouse:'线边回仓',
 		completedWarehouse:'完工入库',
-		purchaseArrival:'采购到货',
+		purchaseArrival:'scheduled Pur order',
 		returnOutbound:'退货出库',
 		jdOrder:'京东订单',
 		salesOrderOutbound:'销售订单出库',
 		waitInboundQuantity:'待入库数量',
-		orderNumber:'单号',
-		thisTimeInbound:'本次入库',
-		warehouseName:'仓库名称',
+		orderNumber:'PO No.',
+		thisTimeInbound:'QTY received to stock',
+		warehouseName:'warehouse name',
 		selectWarehouseName:'选择仓库名称',
 		warehouseNameCanNotBeEmpty:'仓库名称不能为空',
-		warehousingQuantity:'入库数量',
+		warehousingQuantity:'QTY received to stock',
 		pleaseEnterWarehousingQuantity:'入库数量不能为空',
 		warehousingQuantityCanNotBeEmpty:'入库数量不能为空',
 	},
 	transferWarehouse:{
 		//调仓,调出仓库,调入仓库,操作人,选择调出仓库,调出仓库不能为空,选择调入仓库,调入仓库不能为空,物品名称,选择物品名称,物品名称不能为空,出库数量,请输入出库数量,出库数量不能为空,仓库不可相同!,请添加明细!,调仓成功,添加明细
-		name:'调仓',
-		outWarehouse:'调出仓库',
-		inWarehouse:'调入仓库',
-		operator:'操作人',
+		name:'change warehouse',
+		outWarehouse:'out from',
+		inWarehouse:'change to',
+		operator:'operator',
 		selectOutWarehouse:'选择调出仓库',
 		outWarehouseCanNotBeEmpty:'调出仓库不能为空',
 		selectInWarehouse:'选择调入仓库',
 		inWarehouseCanNotBeEmpty:'调入仓库不能为空',
-		goodsName:'物品名称',
+		goodsName:'item name',
 		selectGoodsName:'选择物品名称',
 		goodsNameCanNotBeEmpty:'物品名称不能为空',
-		outboundQuantity:'出库数量',
+		outboundQuantity:'QTY',
 		pleaseEnterOutboundQuantity:'请输出库数量',
 		outboundQuantityCanNotBeEmpty:'出库数量不能为空',
 		warehouseCanNotBeSame:'仓库不可相同!',
 		addDetails:'请添加明细!',
 		transferSuccess:'调仓成功',
-		addDetailsBtn:'添加明细',
+		addDetailsBtn:'items',
 	},
 	manualOutbound:{
 		//手动出库,仓库名称,出库时间,操作人,关闭摄像头,仓库名称不能为空,物品名称不能为空,出库数量不能为空,物品名称,出库数量,请添加明细,出库成功,扫描成功
-		name:'手动出库',
-		warehouseName:'仓库名称',
-		outboundTime:'出库时间',
-		operator:'操作人',
+		name:'manual EX-warehouse',
+		warehouseName:'warehouse name',
+		outboundTime:'EX-warehouse date',
+		operator:'operator',
 		closeCamera:'关闭摄像头',
 		warehouseNameCanNotBeEmpty:'仓库名称不能为空',
 		goodsNameCanNotBeEmpty:'物品名称不能为空',
 		outboundQuantityCanNotBeEmpty:'出库数量不能为空',
-		goodsName:'物品名称',
-		outboundQuantity:'出库数量',
+		goodsName:'item name',
+		outboundQuantity:'QTY',
 		addDetails:'请添加明细!',
 		outboundSuccess:'出库成功',
 		scanSuccess:'扫描成功',
@@ -748,13 +746,13 @@ export const lang = {
 	warehouse:{
 		//仓库维护,仓库名称,仓库类型
 		name:'仓库维护',
-		warehouseName:'仓库名称',
-		warehouseType:'仓库类型',
+		warehouseName:'warehouse name',
+		warehouseType:'warehouse type',
 	},
 	user:{
 		//用户管理,姓名,用户名,手机号,普通产线,半自动化产线,自动化产线,添加用户,部门名称,密码,系统用户,是,否,角色,手机号,工号,部门名称不能为空,姓名不能为空,用户名不能为空,密码不能为空,角色不能为空,手机号不能为空
 		name:'用户管理',
-		nickName:'姓名',
+		nickName:'name',
 		userName:'用户名',
 		phone:'手机号',
 		ordinaryProductionLine:'普通产线',
@@ -788,7 +786,7 @@ export const lang = {
 		sortCanNotBeEmpty:'排序不能为空',
 		dictionaryName:'字典名称',
 		dictionaryCode:'字典编码',
-		remark:'备注',
+		remark:'remark',
 		enableStatus:'启用状态',
 		enable:'启用',
 		disable:'禁用',
@@ -811,7 +809,7 @@ export const lang = {
 		businessCenter:'业务中心',
 		department:'部门',
 		group:'组',
-		principal:'负责人',
+		principal:'person in Charge',
 		director:'总监',
 		departmentSort:'部门排序',
 		organizationNameCanNotBeEmpty:'机构名称不能为空',
@@ -837,7 +835,7 @@ export const lang = {
 		areYouSureYouWantToExitThisLogin:'您确定退出本次登录么?',
 		logOutSuccess:'退出成功',
 		logOutFailed:'退出失败',
-		
+		switchLanguage:'切换语言',
 	},
 	login:{
 		deviceInformation:"设备信息",
@@ -861,12 +859,12 @@ export const lang = {
 	},
 	equipment:{
 		//设备列表,型号,今日产量,贾卡,横移,运行
-		name:"设备列表",
+		name:"MC list",
 		model:"型号",
-		todayOutput:"今日产量",
-		jaka:"贾卡",
-		horizontalShift:"横移",
-		operation:"运行",
+		todayOutput:"today output",
+		jaka:"PJ",
+		horizontalShift:"EL",
+		operation:"running",
 
 	},
 	fermentator:{
@@ -954,8 +952,8 @@ export const lang = {
 	warpKnitting:{
 		name:'经编机',
 		spindleSpeed:'主轴转速',
-		jaca:'贾卡',
-		traverse:'横移',
+		jaca:'PJ',
+		traverse:'EL',
 		currentClothLength:'当前布长',
 		setClothLength:'设定布长',
 		density:'密度',

+ 2 - 2
src/lang/index.js

@@ -17,8 +17,8 @@ const i18n = createI18n({
 })
 console.log(require('./cn.js').lang)
 get('/open/multilingual/getJson',{}).then(res=>{
-  console.log(JSON.parse(res.data),'下载')
-  window.localStorage.setItem('lang',res.data)
+  // console.log(JSON.parse(res.data),'下载')
+  // window.localStorage.setItem('lang',res.data)
   // i18n.global.setLocaleMessage('zh-cn', require('./cn.js').lang)
 })
 

+ 1 - 2
src/views/equipment/threadHead.vue

@@ -23,7 +23,7 @@
             <div>
               <div class="label">{{ $t("threadedHead.mode") }}</div>
               <div class="value" style="color: #ff8800">{{ $t("common.auto") }}</div>
-            </div>
+            </div> 
           </div>
         </van-col>
       </van-row>
@@ -147,7 +147,6 @@ const getData = () => {
 onMounted(() => {
 	getData()
 })
-
 </script>
 
 <style lang="scss" scoped>

+ 14 - 0
src/views/home/index.vue

@@ -40,6 +40,15 @@
 					<van-icon name="arrow" size="16" />
 				</div>
 			</li>
+			<li @click="switchLanguage()">
+				<div class="icon-box">
+					<i class="iconfont icon-icomm__earth"></i>
+				</div>
+				<div class="text">{{$t('userCenter.switchLanguage')}}</div>
+				<div class="more">
+					<van-icon name="arrow" size="16" />
+				</div>
+			</li>
 		</ul>
 		<van-button class="logout" v-if="!corpId" type="primary" @click="logout" block
 			>{{$t('userCenter.logOut')}}</van-button
@@ -62,6 +71,11 @@ const toMessageList = () => {
 const toRouter = (url) => {
     proxy.$router.push('/main/' + url)
 }
+const switchLanguage = () => {
+	console.log(proxy.$i18n.locale)
+	proxy.$i18n.locale = proxy.$i18n.locale == 'zh-cn' ? 'en-us' : 'zh-cn'
+	window.localStorage.setItem('lang', proxy.$i18n.locale)
+}
 const logout = () => {
 	showConfirmDialog({
 		title: proxy.t('common.prompt'),