From 41091ccf87e8e77b4a1a50f5a7bf62d14c604d39 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 18 四月 2025 13:24:16 +0800
Subject: [PATCH] 完善英文翻译,根据中英文切换进行页面调整
---
UI-Project/src/layout/MainErpView.vue | 17 +
UI-Project/src/lang/en.js | 527 +++++++++++++++++-----------------
UI-Project/src/lang/py.js | 1
UI-Project/src/lang/zh.js | 1
UI-Project/src/views/ReportWork/reportWork.vue | 4
UI-Project/src/views/hollow/hollowequipment.vue | 172 +++++-----
UI-Project/src/views/Returns/upreturns.vue | 10
UI-Project/src/views/Slicecage/slicecage.vue | 4
UI-Project/src/views/Returns/upreturns2.vue | 12
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 50 +-
UI-Project/src/views/hollow/hellowquiptwohistory.vue | 6
UI-Project/src/views/User/userlist.vue | 4
UI-Project/src/views/hollow/hellowquiphistory.vue | 86 ++--
UI-Project/src/views/User/userpageNo.vue | 4
14 files changed, 459 insertions(+), 439 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 2c58e51..90b7e7f 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -34,12 +34,12 @@
quit: "Exit",
},
basicData: {
- untask: '鏃犱换鍔�',
- tonumber: '涓婄墖鎬绘暟閲�',
- finishnumber: '宸插畬鎴愭暟閲�',
- rackreset: '鏋跺瓙澶嶄綅',
- prackreset: '鏄惁鏋跺瓙澶嶄綅锛�',
- printing: '鑷姩鎵撳嵃',
+ untask: 'No task',
+ tonumber: 'Total number of films uploaded',
+ finishnumber: 'Completed quantity',
+ rackreset: 'Rack reset',
+ prackreset: 'Is the rack reset锛�',
+ printing: 'automatic printing',
laserprinting: 'Laser printing machine ready status锛�',
cuttingmachine: 'Cutting machine ready status锛�',
machine: 'Online status of the loading table锛�',
@@ -92,25 +92,25 @@
layoutSequence: 'Serial Number',
},
sorter: {
- onesort: '涓�绾挎幇鐗�',
- twosort: '浜岀嚎鎺扮墖',
- inPlace: '鍒颁綅',
- ninPlace: '鏈埌浣�',
- emptymissions: '绌轰换鍔�',
- advancetask: '杩涚墖浠诲姟',
- outputtasks: '鍑虹墖浠诲姟',
- schedulingtasks: '璋冨害浠诲姟',
- advancerequests: '杩涚墖璇锋眰',
- releaserequest: '鍑虹墖璇锋眰',
- straighttasks: '鐩撮�氫换鍔�',
- endingtask: '缁撴潫',
- another: '鍏朵粬',
- taskRunning: '浠诲姟璇锋眰',
- updateTime: '鏇存柊鏃堕棿',
- id: '纾ㄨ竟鍓嶇悊鐗囩琛↖D',
- remainWidth: '鍓╀綑',
- place: '鏄惁鍒颁綅',
- layernow: '褰撳墠灞傚彿',
+ onesort: 'Line breaking pieces',
+ twosort: 'Second line breaking piece',
+ inPlace: 'In place',
+ ninPlace: 'Not in place',
+ emptymissions: 'Empty task',
+ advancetask: 'Film entry task',
+ outputtasks: 'Production task',
+ schedulingtasks: 'Scheduling tasks',
+ advancerequests: 'Film entry request',
+ releaserequest: 'Production request',
+ straighttasks: 'Direct Task',
+ endingtask: 'end',
+ another: 'other',
+ taskRunning: 'task request',
+ updateTime: 'update time',
+ id: 'Edge grinding pre conditioning cage table ID',
+ remainWidth: 'remaining',
+ place: 'Is it in place',
+ layernow: 'Current floor number',
gridnumber: 'Grid number',
glassnumber: 'Glass number',
width: 'Width',
@@ -128,56 +128,56 @@
cancel: 'Cancel',
},
order: {
- projectnumber: '璇疯緭鍏ュ伐绋嬪彿',
+ projectnumber: 'Please enter the project number',
dilapidation: 'Breakage',
takeaway: 'Manual removal',
- takeawaya: '鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
+ takeawaya: 'Should the information be manually taken away锛�',
takeon: 'The arrangement is complete',
},
searchOrder: {
- furnfullTemp: '鐜荤拑鎬婚噺',
- startCell: '鐩爣灞傚彿',
- endCell: '棰勭暀灞傚彿',
- begin: '寮�濮�',
- finish: '瀹屾垚',
- uncar: '鏈笂杞�',
- inkage: '杩涚墖',
- successfullyprocessed: '浠诲姟鎴愬姛澶勭悊',
- psuccessfullyprocessed: '鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
- taskfailure: '浠诲姟澶辫触澶勭悊',
- ptaskfailure: '鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
- totallogarithms: '鎬诲鏁�',
- numberpairs: '閰嶅鏁�',
- numberoccupied: '鍗犵敤鏍煎瓙鏁�',
- totalfurnaces: '鎬荤倝鏁�',
- cagesnumber: '绗煎唴鏁伴噺',
- slotnumber: '鍗犳湁鏍煎瓙鏁�',
- progress: '杩涘害%',
- whethersame: '鏄惁鐩稿悓',
- same: '鐩稿悓',
- notsame: '涓嶇浉鍚�',
- partask: '浠诲姟閲嶇疆',
- partasks: '鏄惁浠诲姟閲嶇疆锛�',
- empty: '榛樿绌轰换鍔�',
- historicaltasks: '鍘嗗彶浠诲姟',
- cagedetails: '绗煎唴璇︽儏',
- inkageEntity: '杩涚墖鑱旀満鐘舵�侊細',
- requestEntity: '杩涚墖璇锋眰鐘舵�侊細',
- mesReplyEntity: '鍚姩鍛戒护锛�',
- outInkageEntity: '鍑虹墖鑱旀満鐘舵�侊細',
- outRequestEntity: '鍑虹墖璇锋眰鐘舵�侊細',
- breakagn: '鏈牬鎹�',
- lacknumber: '缂虹墖鏁伴噺',
- processcard: '鎸囧畾娴佺▼鍗�',
- filminformation: '浜哄伐涓嬬墖淇℃伅',
- currentglassinformation: '鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
- printlabels: '鎵撳嵃鏍囩',
- deleteTask: '缁撴潫宸ョ▼',
- pdeleteTask: '鏄惁缁撴潫宸ョ▼锛�',
+ furnfullTemp: 'Total amount of glass',
+ startCell: 'Target layer number',
+ endCell: 'Reserved layer number',
+ begin: 'start',
+ finish: 'complete',
+ uncar: 'Not getting on the car yet',
+ inkage: 'Enter the film',
+ successfullyprocessed: 'Task successfully processed',
+ psuccessfullyprocessed: 'Whether the task has been successfully processed锛�',
+ taskfailure: 'Task failure handling',
+ ptaskfailure: 'Should task failure be handled锛�',
+ totallogarithms: 'Total logarithm',
+ numberpairs: 'pairing number',
+ numberoccupied: 'Number of occupied cells',
+ totalfurnaces: 'Total number of furnaces',
+ cagesnumber: 'Quantity inside the cage',
+ slotnumber: 'Number of occupied cells',
+ progress: 'progress%',
+ whethersame: 'Are they the same',
+ same: 'the same',
+ notsame: 'different',
+ partask: 'Task reset',
+ partasks: 'Do you want to reset the task锛�',
+ empty: 'Default empty task',
+ historicaltasks: 'historical tasks',
+ cagedetails: 'Cage Details',
+ inkageEntity: 'Online status of film entry锛�',
+ requestEntity: 'Entry request status锛�',
+ mesReplyEntity: 'start command锛�',
+ outInkageEntity: 'Online status of film release锛�',
+ outRequestEntity: 'Production request status锛�',
+ breakagn: 'unbroken',
+ lacknumber: 'Number of missing pieces',
+ processcard: 'Specify process card',
+ filminformation: 'Manually downloading information',
+ currentglassinformation: 'Scan the current glass information of the barcode scanner',
+ printlabels: 'print label',
+ deleteTask: 'End of project',
+ pdeleteTask: 'Whether to end the project锛�',
searchlayout: 'Non-tempered process card inquiry',
fullfurnaces: 'Number of full furnaces',
specifiedproject: 'The currently specified project',
- undesignate: '鍙栨秷閽㈠寲',
+ undesignate: 'Cancel tempered steel',
allnumber: 'Total quantity',
numbercages: 'Number of cages',
missingquantity: 'Missing quantity',
@@ -284,12 +284,12 @@
tit: 'data',
temperingqueries: 'Tempering queries',
specifytempering: 'Specify a furnace',
- specifyout: '鎸囧畾浜哄伐鍑虹墖',
+ specifyout: 'Designate manual film production',
specifyengineerid: 'Specify the project',
projectnumber: 'Project number',
layoutnumber: 'Drawing number of loading for tempering furnace',
numberglasses: 'Number of glasses',
- specifytemperinga: '璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
+ specifytemperinga: 'Please confirm if the device has turned off MES online connection锛�',
temperedswitch: 'Tempered switch',
dutyinformation: 'Duty information',
process: 'Process',
@@ -298,12 +298,12 @@
makesure: 'Confirm the save',
temperingtotal: 'Number of tempering furnaces锛�',
glasstotal: 'Total number of glasses锛�',
- Labelprinting: '鏍囩鎵撳嵃',
- Schedulingswitch: '璋冨害寮�鍏�',
+ Labelprinting: 'label printing',
+ Schedulingswitch: 'Dispatch switch',
},
workOrder: {
- upnumber: '涓婄墖浣嶇紪鍙�',
- coatingtypesbe: '鍘熺墖鑶滅郴',
+ upnumber: 'Upper position number',
+ coatingtypesbe: 'Original film system',
glassID: 'Glass ID',
height: 'Height',
width: 'Width',
@@ -399,9 +399,9 @@
height: 'Height',
},
productStock: {
- configName: '閰嶇疆鍚�',
- configCode: '閰嶇疆浠g爜',
- configValue: '閰嶇疆鍊�',
+ configName: 'configure name',
+ configCode: 'Configuration Code',
+ configValue: 'Configuration value',
addusers: 'Add user',
username: 'User name',
usernamea: 'User name锛�',
@@ -552,7 +552,7 @@
brokeno: 'The report is broken and not filled',
close: 'Shut down',
orderId: 'Order ID',
- order: '璁㈠崟璇︽儏',
+ order: 'Order details',
customerName: 'The name of the customer',
project: 'The name of the project',
are: 'are',
@@ -650,19 +650,19 @@
premark: 'Please enter a note',
},
film: {
- resetnumber: '鏋跺瓙鍙�',
- fail: '澶辫触',
+ resetnumber: 'Shelf number',
+ fail: 'fail',
mes: 'Original film storage details',
warehousing: 'store',
- pwarehousing: '鍏ュ簱璇锋眰',
- wareout: '鍘熺墖鍑哄簱',
- information: '鏄惁鍑哄簱璇ユ潯淇℃伅锛�',
- pwareout: '鍑哄簱璇锋眰',
- position: '鍚婅浣嶏細',
- cposition: '璇烽�夋嫨鍚婅浣�',
- position1: '鍚婅浣�1',
- position2: '鍚婅浣�2',
- addglass: '鍘熺墖淇℃伅',
+ pwarehousing: 'Inventory request',
+ wareout: 'Original film outbound',
+ information: 'Whether to release this information from the warehouse锛�',
+ pwareout: 'Outbound request',
+ position: 'Lifting position锛�',
+ cposition: 'Please select the lifting position',
+ position1: 'Lifting position 1',
+ position2: 'Lifting position 2',
+ addglass: 'Original film information',
operate: 'Operate',
exit: 'Edit',
delete: 'Delete',
@@ -674,7 +674,7 @@
startslot: 'Start workstation',
endslot: 'Target workstation',
slotid: 'Grid ID',
- slot: '鏍煎瓙鍙�',
+ slot: 'Grid number',
width: 'Width',
widtha: 'Width锛�',
inwidth: 'Please enter width',
@@ -695,7 +695,7 @@
quantitya: 'Number锛�',
enableid: 'Task ID',
originateslot: 'Starting grid',
- endoriginateslot: '鐩爣鏍煎瓙',
+ endoriginateslot: 'Target grid',
patternquantity: 'Number',
enabletype: 'Task Type',
enablestate: 'Workstation status',
@@ -738,182 +738,183 @@
state: 'state',
createtime: 'Creation time',
all: 'Select All',
- removalmethod: '璇烽�夋嫨闄よ啘鏂瑰紡',
- removalmethodp: '闄よ啘鏂瑰紡',
- removalmethoda: '闄よ啘鏂瑰紡锛�',
- noremoval: '涓嶉櫎鑶�',
- removal: '闄よ啘',
- coarselyground: '绮楃(',
- finegrinding: '绮剧(',
+ removalmethod: 'Please choose the membrane removal method',
+ removalmethodp: 'Membrane removal method',
+ removalmethoda: 'Membrane removal method锛�',
+ noremoval: 'The film is not removed',
+ removal: 'Membrane removal',
+ coarselyground: 'Rough grinding',
+ finegrinding: 'Fine grinding',
},
hellow: {
- totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
- pairQuantitya: '宸插嚭閰嶅鏁�',
- waitingout: '绛夊緟鍑虹墖',
- finishout: '鍑虹墖瀹屾垚',
- hollowSequence: '涓┖椤哄簭',
- isPair: '鏄惁閰嶅',
- no: '鍚�',
- listFormula: '閰嶆柟淇℃伅',
- HollowGlass: '闃熷垪淇℃伅',
- totalLayer: '鎬诲眰鏁�',
- totalPairQuantity: '鎬婚厤瀵规暟閲�',
- pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
- isForceList: '鏄惁寮哄埗',
- yesisForceList: '寮哄埗',
- noisForceList: '闈炲己鍒�',
- hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
- hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
- hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
- hollowTotalAreaOutTwo: '涓┖浜岀嚎鐜荤拑闈㈢Н',
- countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冩暟閲�',
- countOut: '閽㈠寲鐜荤拑鏁伴噺',
- countOutOne: '鍒囧壊涓�绾跨幓鐠冩暟閲�',
- countOutTwo: '鍒囧壊浜岀嚎鐜荤拑鏁伴噺',
- totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冮潰绉�',
- totalAreaOut: '閽㈠寲鐜荤拑闈㈢Н',
- totalAreaOutOne: '鍒囧壊涓�绾跨幓鐠冮潰绉�',
- totalAreaOutTwo: '鍒囧壊浜岀嚎鐜荤拑闈㈢Н',
- freeone: '涓�绾跨┖闂茬姸鎬侊細',
- freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
- freethree: '涓夌嚎绌洪棽鐘舵�侊細',
- casFour: '姘斾綋4',
- casFourb: '姘斾綋4锛�',
- casFoura: '璇烽�夋嫨姘斾綋4',
- casOne: '姘斾綋1',
- casOneb: '姘斾綋1锛�',
- casOnea: '璇烽�夋嫨姘斾綋1',
- casThree: '姘斾綋3',
- casThreeb: '姘斾綋3锛�',
- casThreea: '璇烽�夋嫨姘斾綋3',
- casTwo: '姘斾綋2',
- casTwob: '姘斾綋2锛�',
- casTwoa: '璇烽�夋嫨姘斾綋2',
- Y: '鏈�',
- F: '鏃�',
- frameFour: '闂撮殧鏉�4',
- frameFourb: '闂撮殧鏉�4锛�',
- frameFoura: '璇疯緭鍏ラ棿闅旀澘4',
- frameOne: '闂撮殧鏉�1',
- frameOneb: '闂撮殧鏉�1锛�',
- frameOnea: '璇疯緭鍏ラ棿闅旀澘1',
- frameThree: '闂撮殧鏉�3',
- frameThreeb: '闂撮殧鏉�3锛�',
- frameThreea: '璇疯緭鍏ラ棿闅旀澘3',
- frameTwo: '闂撮殧鏉�2',
- frameTwob: '闂撮殧鏉�2锛�',
- frameTwoa: '璇疯緭鍏ラ棿闅旀澘2',
- intervalFrameHeightOne: '闂撮殧妗嗛珮搴�1',
- intervalFrameHeightTwo: '闂撮殧妗嗛珮搴�2',
- intervalFrameHeightThree: '闂撮殧妗嗛珮搴�3',
- intervalFrameHeightFour: '闂撮殧妗嗛珮搴�4',
- intervalFrameHeightaOne: '璇疯緭鍏ラ棿闅旀楂樺害1',
- intervalFrameHeightaTwo: '璇疯緭鍏ラ棿闅旀楂樺害2',
- intervalFrameHeightaThree: '璇疯緭鍏ラ棿闅旀楂樺害3',
- intervalFrameHeightaFour: '璇疯緭鍏ラ棿闅旀楂樺害4',
- intervalFrameHeightbOne: '闂撮殧妗嗛珮搴�1锛�',
- intervalFrameHeightbTwo: '闂撮殧妗嗛珮搴�2锛�',
- intervalFrameHeightbThree: '闂撮殧妗嗛珮搴�3锛�',
- intervalFrameHeightbFour: '闂撮殧妗嗛珮搴�4锛�',
- intervalFrameTypeOne: '闂撮殧妗嗙被鍨�1',
- intervalFrameTypeTwo: '闂撮殧妗嗙被鍨�2',
- intervalFrameTypeThree: '闂撮殧妗嗙被鍨�3',
- intervalFrameTypeFour: '闂撮殧妗嗙被鍨�4',
- intervalFrameTypecOne: '璇烽�夋嫨闂撮殧妗嗙被鍨�1',
- intervalFrameTypecTwo: '璇烽�夋嫨闂撮殧妗嗙被鍨�2',
- intervalFrameTypecThree: '璇烽�夋嫨闂撮殧妗嗙被鍨�3',
- intervalFrameTypecFour: '璇烽�夋嫨闂撮殧妗嗙被鍨�4',
- intervalFrameTypedOne: '闂撮殧妗嗙被鍨�1锛�',
- intervalFrameTypedTwo: '闂撮殧妗嗙被鍨�2锛�',
- intervalFrameTypedThree: '闂撮殧妗嗙被鍨�3锛�',
- intervalFrameTypedFour: '闂撮殧妗嗙被鍨�4锛�',
- intervalFrameTypea: 'tps鑳�',
- intervalFrameTypeb: '閾濋棿闅旀潯',
- intervalFrameWidthOne: '闂撮殧妗嗗搴�1',
- intervalFrameWidthTwo: '闂撮殧妗嗗搴�2',
- intervalFrameWidthThree: '闂撮殧妗嗗搴�3',
- intervalFrameWidthFour: '闂撮殧妗嗗搴�4',
- intervalFrameWidthaOne: '璇疯緭鍏ラ棿闅旀瀹藉害1',
- intervalFrameWidthaTwo: '璇疯緭鍏ラ棿闅旀瀹藉害2',
- intervalFrameWidthaThree: '璇疯緭鍏ラ棿闅旀瀹藉害3',
- intervalFrameWidthaFour: '璇疯緭鍏ラ棿闅旀瀹藉害4',
- intervalFrameWidthbOne: '闂撮殧妗嗗搴�1锛�',
- intervalFrameWidthbTwo: '闂撮殧妗嗗搴�2锛�',
- intervalFrameWidthbThree: '闂撮殧妗嗗搴�3锛�',
- intervalFrameWidthbFour: '闂撮殧妗嗗搴�4锛�',
- sealInsert: '瀵嗗皝宓屽叆',
- sealInsertb: '瀵嗗皝宓屽叆锛�',
- sealInserta: '璇疯緭鍏ュ瘑灏佸祵鍏�',
- hollowformula: '涓┖閰嶆柟',
- hollowformuldet: '鏄惁鍒犻櫎璇ヤ腑绌洪厤鏂癸紵',
- hollowtaskdet: '鏄惁鍒犻櫎璇ヤ换鍔★紵',
- taskdet: '鍒犻櫎浠诲姟',
- edithollowformula: '淇敼涓┖閰嶆柟',
- phollowformula: '璇烽�夋嫨涓┖閰嶆柟',
- hollowformulp: '涓┖閰嶆柟锛�',
- bottomRemove: '涓嬩晶闄よ啘閲忥細',
- bottomRemovep: '涓嬩晶闄よ啘閲�',
- bottomRemovea: '璇疯緭鍏ヤ笅渚ч櫎鑶滈噺',
- topRemove: '涓婁晶闄よ啘閲忥細',
- topRemovep: '涓婁晶闄よ啘閲�',
- topRemovea: '璇疯緭鍏ヤ笂渚ч櫎鑶滈噺',
- leftRemove: '宸︿晶闄よ啘閲忥細',
- leftRemovep: '宸︿晶闄よ啘閲�',
- leftRemovea: '璇疯緭鍏ュ乏渚ч櫎鑶滈噺',
- rightRemove: '鍙充晶闄よ啘閲忥細',
- rightRemovep: '鍙充晶闄よ啘閲�',
- rightRemovea: '璇疯緭鍏ュ彸渚ч櫎鑶滈噺',
- formulaNamep: '閰嶆柟鍚�',
- formulaName: '閰嶆柟鍚嶏細',
- formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
- stopproject: '鏆傚仠浠诲姟',
- pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
- reviewproject: '棰勮宸ョ▼',
- line: '绾胯矾',
- linea: '绾胯矾锛�',
- line1: '绾胯矾涓�',
- line2: '绾胯矾浜�',
- line3: '绾胯矾涓�',
- createtask: '鍒涘缓浠诲姟',
- starttask: '寮�濮嬩换鍔�',
- pstarttask: '鏄惁寮�濮嬩换鍔★紵',
- stoptask: '鍋滄浠诲姟',
- pstoptask: '鏄惁鍋滄浠诲姟锛�',
- currenttask: '褰撳墠浠诲姟锛�',
- claimednumber: '宸查鍙栭厤瀵规暟閲忥細',
- linenumber: '杩涘叆涓┖绾挎暟閲忥細',
- order: '鍑虹墖椤哄簭',
- flowCardId: '娴佺▼鍗�',
- thickness: '鍘氬害',
- coatingtypes: '鑶滅郴',
- layer: '灞傛暟',
- height: '闀�',
- width: '瀹�',
- state: '鐘舵��',
- cardnumber: '娴佺▼鍗″彿',
- cardnumbera: '娴佺▼鍗″彿锛�',
- layernumber: '灞傚彿',
- totalnumber: '鎬荤墖鏁�',
- pairsnumber: '宸查厤瀵规暟閲�',
- missingnumber: '缂虹墖鏁伴噺',
- damagenumber: '鐮存崯鏁伴噺',
- operate: '鎿嶄綔',
- claimquest: '棰嗗彇浠诲姟',
- pclaimquest: '鏄惁棰嗗彇浠诲姟锛�',
- missingfilms: '缂虹墖璇︽儏',
- forcedfilming: '寮哄埗鍑虹墖',
- pforcedfilming: '鏄惁寮哄埗鍑虹墖锛�',
- brokenpieces: '鐮存崯鐗囨暟',
- realpieces: '瀹為檯鐗囨暟',
- route: '璺嚎锛�',
- croute: '璇烽�夋嫨璺嚎',
- ptotalpairQuantity: '鎬婚厤瀵规暟閲忥細',
- cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
- schedulingswitch: '璋冨害寮�鍏�',
+ totalPairQuantitya: 'Total number of task allocation pairs',
+ pairQuantitya: 'Number of deployed pairs',
+ waitingout: 'Waiting for the release of the film',
+ finishout: 'Film release completed',
+ hollowSequence: 'Hollow sequence',
+ isPair: 'Whether to pair or not',
+ no: 'deny',
+ listFormula: 'Formula information',
+ HollowGlass: 'Queue information',
+ totalLayer: 'Total number of floors',
+ totalPairQuantity: 'Total number of pairs',
+ pairQuantity: 'Completed pairing quantity',
+ isForceList: 'Is it mandatory',
+ yesisForceList: 'force',
+ noisForceList: 'optional',
+ hollowCountOutOne: 'Quantity of insulated first-line glass',
+ hollowCountOutTwo: 'Quantity of hollow second-line glass',
+ hollowTotalAreaOutOne: 'Hollow first-line glass area',
+ hollowTotalAreaOutTwo: 'Hollow second-line glass area',
+ countIn: 'Quantity of large cage glass before tempering',
+ countOut: 'Quantity of tempered glass',
+ countOutOne: 'Quantity of glass cut along the cutting line',
+ countOutTwo: 'Quantity of cutting second-line glass',
+ totalAreaIn: 'Area of large cage glass before tempering',
+ totalAreaOut: 'Tempered glass area',
+ totalAreaOutOne: 'Cut the area of glass along the cutting line',
+ totalAreaOutTwo: 'Cut the area of second-line glass',
+ freeone: 'First line idle state锛�',
+ freetwo: 'Second line idle state锛�',
+ freethree: 'Third line idle state锛�',
+ casFour: 'Gas 4',
+ casFourb: 'Gas 4锛�',
+ casFoura: 'Please select gas 4',
+ casOne: 'Gas 1',
+ casOneb: 'Gas 1锛�',
+ casOnea: 'Please select gas 1',
+ casThree: 'Gas 3',
+ casThreeb: 'Gas 3锛�',
+ casThreea: 'Please select gas 3',
+ casTwo: 'Gas 2',
+ casTwob: 'Gas 2锛�',
+ casTwoa: 'Please select gas 2',
+ Y: 'have',
+ F: 'not have',
+ frameFour: 'Spacer board 4',
+ frameFourb: 'Spacer board 4锛�',
+ frameFoura: 'Please enter the spacing board 4',
+ frameOne: 'Spacer board 1',
+ frameOneb: 'Spacer board 1锛�',
+ frameOnea: 'Please enter the spacing board 1',
+ frameThree: 'Spacer board 3',
+ frameThreeb: 'Spacer board 3锛�',
+ frameThreea: 'Please enter the spacing board 3',
+ frameTwo: 'Spacer board 2',
+ frameTwob: 'Spacer board 2锛�',
+ frameTwoa: 'Please enter the spacing board 2',
+ intervalFrameHeightOne: 'Interval frame height 1',
+ intervalFrameHeightTwo: 'Interval frame height 2',
+ intervalFrameHeightThree: 'Interval frame height 3',
+ intervalFrameHeightFour: 'Interval frame height 4',
+ intervalFrameHeightaOne: 'Please enter the interval box height 1',
+ intervalFrameHeightaTwo: 'Please enter the interval box height 2',
+ intervalFrameHeightaThree: 'Please enter the interval box height 3',
+ intervalFrameHeightaFour: 'Please enter the interval box height 4',
+ intervalFrameHeightbOne: 'Interval frame height 1锛�',
+ intervalFrameHeightbTwo: 'Interval frame height 2锛�',
+ intervalFrameHeightbThree: 'Interval frame height 3锛�',
+ intervalFrameHeightbFour: 'Interval frame height 4锛�',
+ intervalFrameTypeOne: 'Interval box type 1',
+ intervalFrameTypeTwo: 'Interval box type 2',
+ intervalFrameTypeThree: 'Interval box type 3',
+ intervalFrameTypeFour: 'Interval box type 4',
+ intervalFrameTypecOne: 'Please select interval box type 1',
+ intervalFrameTypecTwo: 'Please select interval box type 2',
+ intervalFrameTypecThree: 'Please select interval box type 3',
+ intervalFrameTypecFour: 'Please select interval box type 4',
+ intervalFrameTypedOne: 'Interval box type 1锛�',
+ intervalFrameTypedTwo: 'Interval box type 2锛�',
+ intervalFrameTypedThree: 'Interval box type 3锛�',
+ intervalFrameTypedFour: 'Interval box type 4锛�',
+ intervalFrameTypea: 'TPS adhesive',
+ intervalFrameTypeb: 'Aluminum spacer strip',
+ intervalFrameWidthOne: 'Interval frame width 1',
+ intervalFrameWidthTwo: 'Interval frame width 2',
+ intervalFrameWidthThree: 'Interval frame width 3',
+ intervalFrameWidthFour: 'Interval frame width 4',
+ intervalFrameWidthaOne: 'Please enter the width of the interval box as 1',
+ intervalFrameWidthaTwo: 'Please enter the width of the interval box as 2',
+ intervalFrameWidthaThree: 'Please enter the width of the interval box as 3',
+ intervalFrameWidthaFour: 'Please enter the width of the interval box as 4',
+ intervalFrameWidthbOne: 'Interval frame width 1锛�',
+ intervalFrameWidthbTwo: 'Interval frame width 2锛�',
+ intervalFrameWidthbThree: 'Interval frame width 3锛�',
+ intervalFrameWidthbFour: 'Interval frame width 4锛�',
+ sealInsert: 'Sealed embedding',
+ sealInsertb: 'Sealed embedding锛�',
+ sealInserta: 'Please enter sealed embedding',
+ hollowformula: 'Hollow formula',
+ hollowformuldet: 'Do you want to delete this hollow formula锛�',
+ hollowtaskdet: 'Do you want to delete this task锛�',
+ taskdet: 'Delete Task',
+ edithollowformula: 'Modify the hollow formula',
+ phollowformula: 'Please choose a hollow formula',
+ hollowformulp: 'Hollow formula锛�',
+ bottomRemove: 'Lower side film removal amount锛�',
+ bottomRemovep: 'Lower side film removal amount',
+ bottomRemovea: 'Please enter the amount of film removal on the lower side',
+ topRemove: 'Upper side membrane removal amount锛�',
+ topRemovep: 'Upper side membrane removal amount',
+ topRemovea: 'Please enter the amount of film removal on the upper side',
+ leftRemove: 'Left side membrane removal amount锛�',
+ leftRemovep: 'Left side membrane removal amount',
+ leftRemovea: 'Please enter the amount of membrane removal on the left side',
+ rightRemove: 'Right side membrane removal amount锛�',
+ rightRemovep: 'Right side membrane removal amount',
+ rightRemovea: 'Please enter the amount of membrane removal on the right side',
+ formulaNamep: 'Recipe Name',
+ formulaName: 'Recipe Name锛�',
+ formulaNamea: 'Please enter the formula name',
+ stopproject: 'Pause Task',
+ pstopproject: 'Do you want to pause the task锛�',
+ reviewproject: 'Preview project',
+ line: 'line',
+ linea: 'line锛�',
+ line1: 'Line 1',
+ line2: 'Line 2',
+ line3: 'Line 3',
+ createtask: 'Create task',
+ starttask: 'Start Task',
+ pstarttask: 'Do you want to start the task锛�',
+ stoptask: 'stop task',
+ pstoptask: 'Do you want to stop the task锛�',
+ currenttask: 'Current task锛�',
+ claimednumber: 'Received pairing quantity锛�',
+ linenumber: 'Number of lines entering the airspace锛�',
+ order: 'Production order',
+ flowCardId: 'Flow Card',
+ thickness: 'thickness',
+ coatingtypes: 'films',
+ layer: 'Number of layers',
+ height: 'long',
+ width: 'width',
+ state: 'state',
+ cardnumber: 'Process card number',
+ cardnumbera: 'Process card number锛�',
+ layernumber: 'Layer number',
+ totalnumber: 'Total number of films',
+ pairsnumber: 'Matched quantity',
+ missingnumber: 'Number of missing pieces',
+ damagenumber: 'A quantity broken.',
+ operate: 'operate',
+ claimquest: 'Collecting tasks',
+ pclaimquest: 'Do you want to receive the task锛�',
+ missingfilms: 'Missing chip details',
+ forcedfilming: 'Compulsory film release',
+ pforcedfilming: 'Is it mandatory to release the film锛�',
+ brokenpieces: 'Number of damaged pieces',
+ realpieces: 'Actual number of films',
+ route: 'route锛�',
+ croute: 'Please choose a route',
+ ptotalpairQuantity: 'Total number of pairs锛�',
+ cpairQuantity: 'Please enter the total number of pairs',
+ schedulingswitch: 'Dispatch switch',
},
screendisplay: {
- pwidth: '璇疯緭鍏ュ搴�',
- pheight: '璇疯緭鍏ラ珮搴�',
- upnumber: '涓婄墖鏁伴噺',
+ pchoice: 'Please select',
+ pwidth: 'Please enter the width',
+ pheight: 'Please enter the height',
+ upnumber: 'Number of films uploaded',
}
}
\ No newline at end of file
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 8b884b7..a4c123f 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -873,6 +873,7 @@
schedulingswitch: '璋冨害寮�鍏�',
},
screendisplay:{
+ pchoice: '璇烽�夋嫨',
pwidth: '璇疯緭鍏ュ搴�',
pheight: '璇疯緭鍏ラ珮搴�',
upnumber: '涓婄墖鏁伴噺',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 18b081e..2b5d481 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -916,6 +916,7 @@
schedulingswitch: '璋冨害寮�鍏�',
},
screendisplay:{
+ pchoice: '璇烽�夋嫨',
pwidth: '璇疯緭鍏ュ搴�',
pheight: '璇疯緭鍏ラ珮搴�',
upnumber: '涓婄墖鏁伴噺',
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index f41d08b..a38750d 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -79,16 +79,23 @@
// 瀹氫箟涓嫳鏂囧鐓у叧绯诲璞�
const translation = {
'涓婄墖鏈�': 'Loading Machine',
- '涓婄墖': 'Start showing a movie',
+ '涓婄墖涓�绾�': 'First line on film',
+ '涓婄墖浜岀嚎': 'Second line on film',
'鎺扮墖/璇嗗埆': 'Breaking /Identification',
+ '鎺扮墖涓�绾�': 'Broken piece line',
+ '鎺扮墖浜岀嚎': 'Broken pieces with two lines',
'鍗у紡缂撳瓨': 'Horizontal cache',
+ '鍗у紡缂撳瓨涓�鍙风嚎': 'Horizontal Cache 1',
+ '鍗у紡缂撳瓨浜屽彿绾�': 'Horizontal Cache 2',
'纾ㄨ竟鍓嶅崸寮忕紦瀛�': 'Horizontal buffer before edge grinding',
'涓嬬墖鍗у紡缂撳瓨': 'Offline horizontal cache',
'纾ㄨ竟锛堝喎鍔犲伐锛�': 'Grinding edge (cold processing)',
+ '纾ㄨ竟(鍐峰姞宸�)': 'Grinding edge (cold processing)',
'1绾跨(杈�(鍐峰姞宸�)': '1-line edge grinding (cold processing)',
'2绾跨(杈�(鍐峰姞宸�)': '2-line edge grinding (cold processing)',
'澶х悊鐗囩': 'Dali slice cage',
'閽㈠寲': 'Toughened',
+ '閽㈠寲鏌ヨ': 'Tempered steel inquiry',
'閽㈠寲鍓�': 'Before Tempering',
'閽㈠寲鍚�': 'After Tempering',
'涓嬬墖鍙�': 'Next Stage',
@@ -96,10 +103,18 @@
'鐢ㄦ埛绠$悊': 'User Management',
'鏉冮檺绠$悊': 'Rights Management',
'瑙掕壊绠$悊': 'Roles',
+ '绯荤粺閰嶇疆': 'system configuration',
'鍙鍖栫郴缁�': 'visualization system',
'鎶ュ伐绠$悊': 'Job reporting management',
'浠撳偍涓績': 'Storage Center',
'鍘熺墖浠撳偍': 'Original film storage',
+ '涓┖': 'Hollow',
+ '涓┖涓�绾�': 'Hollow Line',
+ '涓┖浜岀嚎': 'Hollow Second Line',
+ '涓┖涓夌嚎': 'Hollow three line',
+ '涓┖鐞嗙墖绗�': 'Hollow Film processing cage',
+ '涓┖鎶橀摑妗�': 'Hollow folded aluminum frame',
+ '澶у睆鏄剧ず': 'Large Screen Display',
};
menuData.forEach(menu => {
menu.menuName = translation[menu.menuName] || menu.menuName;
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 5400e22..e3923e6 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -35,9 +35,9 @@
<el-table height="740" ref="table" :data="reportData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="teamsGroupsName" align="center" :label="$t('reportmanage.reporteam')"
- min-width="120" />
+ min-width="135" />
<el-table-column prop="deviceName" align="center" :label="$t('reportmanage.reportingequipment')"
- min-width="120" />
+ min-width="156" />
<el-table-column prop="line" align="center" :label="$t('reportmanage.line')" min-width="120" />
<el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="120" />
<el-table-column prop="glassId" align="center" :label="$t('reportmanage.glassID')" min-width="130" />
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 16a3edc..b658a1f 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -453,7 +453,7 @@
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="400" ref="table" :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }"
:data="tableData">
- <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center" />
+ <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="120" align="center" />
<el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center" />
<el-table-column prop="height" :label="$t('Mounting.height')" align="center" />
<el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center" />
@@ -476,14 +476,14 @@
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
<el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="50" />
- <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80" />
- <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80" />
+ <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="65" />
+ <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="75" />
+ <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="75" />
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
<el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80" />
<el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')"
min-width="60" />
- <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
<template #default="scope">
<el-button :disabled="(!scope.row.patternThickness)" type="text" plain
@click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index fff5ebb..bfbad91 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -453,7 +453,7 @@
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
:data="tableData"
>
- <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center"/>
+ <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="120" align="center"/>
<el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center"/>
<el-table-column prop="height" :label="$t('Mounting.height')" align="center"/>
<el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center"/>
@@ -482,15 +482,15 @@
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt=""
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
- <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
+ <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" >
- <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="50"/>
- <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
+ <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="65"/>
+ <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="75"/>
+ <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="75"/>
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
<el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80"/>
<el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="60"/>
- <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
<template #default="scope">
<el-button :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
</template>
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index d289f6f..87493ef 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1392,7 +1392,7 @@
<div style="margin-bottom: 20px">
<el-form>
<el-row style="margin-top: -15px;margin-bottom: -2px;">
- <el-col :span="4">
+ <el-col :span="2">
<div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('searchOrder.temperingtotal')" style="width: 14vw">
{{ temperingtotal }}
@@ -1609,7 +1609,7 @@
</el-dialog>
</template>
<style>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+#dt { display:block; float:left;line-height: 20px;margin-left: 150px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
text-align: center;
diff --git a/UI-Project/src/views/User/userlist.vue b/UI-Project/src/views/User/userlist.vue
index 6d78378..5887777 100644
--- a/UI-Project/src/views/User/userlist.vue
+++ b/UI-Project/src/views/User/userlist.vue
@@ -210,7 +210,7 @@
<el-dialog v-model="add" top="23vh" width="37%" :title="$t('productStock.addusers')">
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form label-width="150px">
- <el-form label-width="100px" label-position="right">
+ <el-form label-width="105px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
@@ -271,7 +271,7 @@
<el-dialog v-model="adda" top="23vh" width="37%" :title="$t('productStock.reusername')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form ref="formRef" label-width="150px">
- <el-form label-width="100px" label-position="right">
+ <el-form label-width="105px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
diff --git a/UI-Project/src/views/User/userpageNo.vue b/UI-Project/src/views/User/userpageNo.vue
index f6a9cbc..63f5b2a 100644
--- a/UI-Project/src/views/User/userpageNo.vue
+++ b/UI-Project/src/views/User/userpageNo.vue
@@ -215,7 +215,7 @@
<el-dialog v-model="adda" top="23vh" width="37%" :title="$t('productStock.reusername')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form ref="formRef" label-width="150px">
- <el-form label-width="100px" label-position="right">
+ <el-form label-width="120px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
@@ -259,7 +259,7 @@
</el-dialog>
</template>
<style scoped>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+#dt { display:block; float:left;line-height: 20px;margin-left: 150px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
text-align: center;
diff --git a/UI-Project/src/views/hollow/hellowquiphistory.vue b/UI-Project/src/views/hollow/hellowquiphistory.vue
index 695c72b..fd2d995 100644
--- a/UI-Project/src/views/hollow/hellowquiphistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiphistory.vue
@@ -95,18 +95,18 @@
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
<el-form label-width="150px" label-position="right">
<!-- 绗竴琛岋細3涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.formulaName')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 90%;">
<el-input disabled v-model="formulaName" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 100%;">
- <el-select v-model="filmRemove" clearable style="width: 100%" disabled>
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 90%;">
+ <el-select v-model="filmRemove" clearable style="width: 100%" disabled placeholder=" ">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -115,7 +115,7 @@
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.sealInsertb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.sealInsertb')" style="width: 90%;">
<el-input disabled v-model="sealInsert" autocomplete="off" />
</el-form-item>
</div>
@@ -123,31 +123,31 @@
</el-row>
<!-- 绗簩琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.topRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 90%;">
<el-input disabled v-model="topRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.bottomRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 90%;">
<el-input disabled v-model="bottomRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.leftRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 90%;">
<el-input disabled v-model="leftRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.rightRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 90%;">
<el-input disabled v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div>
@@ -155,11 +155,11 @@
</el-row>
<!-- 绗笁琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casOneb')" style="width: 100%;">
- <el-select v-model="casOne" clearable disabled style="width: 100%">
+ <el-form-item :label="$t('hellow.casOneb')" style="width: 90%;">
+ <el-select v-model="casOne" clearable disabled style="width: 100%" placeholder=" ">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -168,8 +168,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casTwob')" style="width: 100%;">
- <el-select v-model="casTwo" clearable disabled style="width: 100%">
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 90%;">
+ <el-select v-model="casTwo" clearable disabled style="width: 100%" placeholder=" ">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -178,8 +178,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casThreeb')" style="width: 100%;">
- <el-select v-model="casThree" clearable disabled style="width: 100%">
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 90%;">
+ <el-select v-model="casThree" clearable disabled style="width: 100%" placeholder=" ">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -188,8 +188,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casFourb')" style="width: 100%;">
- <el-select v-model="casFour" clearable disabled style="width: 100%">
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 90%;">
+ <el-select v-model="casFour" clearable disabled style="width: 100%" placeholder=" ">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -199,31 +199,31 @@
</el-row>
<!-- 绗洓琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameOneb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameOneb')" style="width: 90%;">
<el-input disabled v-model="frameOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameTwob')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 90%;">
<el-input disabled v-model="frameTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameThreeb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 90%;">
<el-input disabled v-model="frameThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameFourb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 90%;">
<el-input disabled v-model="frameFour" autocomplete="off" />
</el-form-item>
</div>
@@ -231,31 +231,31 @@
</el-row>
<!-- 绗簲琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 90%;">
<el-input disabled v-model="intervalFrameHeightOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 90%;">
<el-input disabled v-model="intervalFrameHeightTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 90%;">
<el-input disabled v-model="intervalFrameHeightThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 90%;">
<el-input disabled v-model="intervalFrameHeightFour" autocomplete="off" />
</el-form-item>
</div>
@@ -263,31 +263,31 @@
</el-row>
<!-- 绗叚琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 90%;">
<el-input disabled v-model="intervalFrameWidthOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 90%;">
<el-input disabled v-model="intervalFrameWidthTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 90%;">
<el-input disabled v-model="intervalFrameWidthThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 90%;">
<el-input disabled v-model="intervalFrameWidthFour" autocomplete="off" />
</el-form-item>
</div>
@@ -295,11 +295,11 @@
</el-row>
<!-- 绗竷琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" disabled>
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" disabled placeholder=" ">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -308,8 +308,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" disabled>
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" disabled placeholder=" ">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -318,8 +318,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" disabled>
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" disabled placeholder=" ">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -328,8 +328,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" disabled>
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" disabled placeholder=" ">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
diff --git a/UI-Project/src/views/hollow/hellowquiptwohistory.vue b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
index cad45e2..824e909 100644
--- a/UI-Project/src/views/hollow/hellowquiptwohistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
@@ -117,7 +117,7 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="8">
<div id="dt" style="font-size: 15px;">
<div>
@@ -134,7 +134,7 @@
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="8">
<div id="dt" style="font-size: 15px;">
<div>
@@ -503,4 +503,6 @@
});
</script>
<style scoped>
+#dt { display:block; float:left;line-height: 20px;margin-left: 10px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 50%;}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index b5bb8b0..27bb9b6 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -137,22 +137,22 @@
</el-table>
</el-dialog>
<!-- 涓┖閰嶆柟娣诲姞 -->
-<el-dialog v-model="add" top="15vh" width="85%" :title="$t('hellow.hollowformula')" >
+<el-dialog v-model="add" top="15vh" width="90%" :title="$t('hellow.hollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
<el-form label-width="150px" label-position="right">
<!-- 绗竴琛岋細3涓厓绱� -->
<el-row style="margin-top: 10px;">
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.formulaName')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 90%;">
<el-input v-model="formulaName" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 100%;">
- <el-select v-model="filmRemove" clearable style="width: 100%" >
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 90%;">
+ <el-select v-model="filmRemove" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -161,7 +161,7 @@
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.sealInsertb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.sealInsertb')" style="width: 90%;">
<el-input v-model="sealInsert" autocomplete="off" />
</el-form-item>
</div>
@@ -169,31 +169,31 @@
</el-row>
<!-- 绗簩琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.topRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 90%;">
<el-input v-model="topRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.bottomRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 90%;">
<el-input v-model="bottomRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.leftRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 90%;">
<el-input v-model="leftRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.rightRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 90%;">
<el-input v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div>
@@ -201,11 +201,11 @@
</el-row>
<!-- 绗笁琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casOneb')" style="width: 100%;">
- <el-select v-model="casOne" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casOneb')" style="width: 90%;">
+ <el-select v-model="casOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -214,8 +214,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casTwob')" style="width: 100%;">
- <el-select v-model="casTwo" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 90%;">
+ <el-select v-model="casTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -224,8 +224,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casThreeb')" style="width: 100%;">
- <el-select v-model="casThree" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 90%;">
+ <el-select v-model="casThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -234,8 +234,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casFourb')" style="width: 100%;">
- <el-select v-model="casFour" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 90%;">
+ <el-select v-model="casFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -245,31 +245,31 @@
</el-row>
<!-- 绗洓琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameOneb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameOneb')" style="width: 90%;">
<el-input v-model="frameOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameTwob')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 90%;">
<el-input v-model="frameTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameThreeb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 90%;">
<el-input v-model="frameThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameFourb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 90%;">
<el-input v-model="frameFour" autocomplete="off" />
</el-form-item>
</div>
@@ -277,31 +277,31 @@
</el-row>
<!-- 绗簲琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 90%;">
<el-input v-model="intervalFrameHeightOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 90%;">
<el-input v-model="intervalFrameHeightTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 90%;">
<el-input v-model="intervalFrameHeightThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 90%;">
<el-input v-model="intervalFrameHeightFour" autocomplete="off" />
</el-form-item>
</div>
@@ -309,31 +309,31 @@
</el-row>
<!-- 绗叚琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 90%;">
<el-input v-model="intervalFrameWidthOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 90%;">
<el-input v-model="intervalFrameWidthTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 90%;">
<el-input v-model="intervalFrameWidthThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 90%;">
<el-input v-model="intervalFrameWidthFour" autocomplete="off" />
</el-form-item>
</div>
@@ -341,11 +341,11 @@
</el-row>
<!-- 绗竷琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -354,8 +354,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -364,8 +364,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -374,8 +374,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeFour" style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -399,18 +399,18 @@
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
<el-form label-width="150px" label-position="right">
<!-- 绗竴琛岋細3涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.formulaName')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 90%;">
<el-input v-model="formulaName" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 100%;">
- <el-select v-model="filmRemove" clearable style="width: 100%" >
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 90%;">
+ <el-select v-model="filmRemove" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -419,7 +419,7 @@
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.sealInsertb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.sealInsertb')" style="width: 90%;">
<el-input v-model="sealInsert" autocomplete="off" />
</el-form-item>
</div>
@@ -427,31 +427,31 @@
</el-row>
<!-- 绗簩琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.topRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 90%;">
<el-input v-model="topRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.bottomRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 90%;">
<el-input v-model="bottomRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.leftRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 90%;">
<el-input v-model="leftRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.rightRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 90%;">
<el-input v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div>
@@ -459,11 +459,11 @@
</el-row>
<!-- 绗笁琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casOneb')" style="width: 100%;">
- <el-select v-model="casOne" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casOneb')" style="width: 90%;">
+ <el-select v-model="casOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -472,8 +472,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casTwob')" style="width: 100%;">
- <el-select v-model="casTwo" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 90%;">
+ <el-select v-model="casTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -482,8 +482,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casThreeb')" style="width: 100%;">
- <el-select v-model="casThree" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 90%;">
+ <el-select v-model="casThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -492,8 +492,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casFourb')" style="width: 100%;">
- <el-select v-model="casFour" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 90%;">
+ <el-select v-model="casFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -503,31 +503,31 @@
</el-row>
<!-- 绗洓琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameOneb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameOneb')" style="width: 90%;">
<el-input v-model="frameOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameTwob')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 90%;">
<el-input v-model="frameTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameThreeb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 90%;">
<el-input v-model="frameThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameFourb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 90%;">
<el-input v-model="frameFour" autocomplete="off" />
</el-form-item>
</div>
@@ -535,31 +535,31 @@
</el-row>
<!-- 绗簲琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 90%;">
<el-input v-model="intervalFrameHeightOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 90%;">
<el-input v-model="intervalFrameHeightTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 90%;">
<el-input v-model="intervalFrameHeightThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 90%;">
<el-input v-model="intervalFrameHeightFour" autocomplete="off" />
</el-form-item>
</div>
@@ -567,31 +567,31 @@
</el-row>
<!-- 绗叚琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 90%;">
<el-input v-model="intervalFrameWidthOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 90%;">
<el-input v-model="intervalFrameWidthTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 90%;">
<el-input v-model="intervalFrameWidthThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 90%;">
<el-input v-model="intervalFrameWidthFour" autocomplete="off" />
</el-form-item>
</div>
@@ -599,11 +599,11 @@
</el-row>
<!-- 绗竷琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -612,8 +612,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -622,8 +622,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -632,8 +632,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index c1b8d08..33e4597 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -113,21 +113,21 @@
<!-- 涓┖閰嶆柟娣诲姞 -->
<el-dialog v-model="add" top="23vh" width="55%" :title="$t('hellow.hollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form label-width="150px">
- <el-form label-width="150px" label-position="right">
+ <el-form label-width="200px">
+ <el-form label-width="200px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
- <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
+ <el-select v-model="filmRemove" clearable style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -136,35 +136,35 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
</el-form-item>
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div></div>
@@ -185,21 +185,21 @@
<!-- 涓┖閰嶆柟淇敼 -->
<el-dialog v-model="adda" top="23vh" width="55%" :title="$t('hellow.edithollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form label-width="150px">
- <el-form label-width="150px" label-position="right">
+ <el-form label-width="200px">
+ <el-form label-width="200px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
- <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
+ <el-select v-model="filmRemove" clearable style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -208,35 +208,35 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
</el-form-item>
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div></div>
@@ -1007,11 +1007,11 @@
});
</script>
<style scoped>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
-#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
+#dt { display:block; float:left;line-height: 20px;margin-left: 10px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 70%;}
#dialog-footer {
text-align: center;
- margin-top: -15px;
+ margin-top: -5px;
}
#dotClass {
display: flex;
--
Gitblit v1.8.0