From d3d50f064a38c3eebed88c3831e77b826f2ad057 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 十一月 2023 16:04:06 +0800
Subject: [PATCH] 修改部分语言
---
CanadaMes-ui/src/views/home/index.vue | 64 ++++++++++++++++----------------
CanadaMes-ui/src/lang/locales/en-US.json | 26 ++++++-------
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 2
CanadaMes-ui/src/lang/locales/zh-CN.json | 25 +++++-------
4 files changed, 56 insertions(+), 61 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 4cb0513..f5e850b 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -227,8 +227,8 @@
"deleteCancelledMessage": "Deletion cancelled",
- "Enter the glass lD":"Enter the glass lD",
- "Infeed barcodid":"Infeed barcodid",
+ "Enter the glass barcode":"Enter the glass barcode",
+ "Manually Infeed Glass":"Manually Infeed Glass",
"Enter the order number":"Enter the order number",
"Exit the glass by order number":"Exit the glass by order number",
"Please confirm the glass information":"Please confirm the glass information",
@@ -239,28 +239,26 @@
"length":"length",
"width":"width",
"Operate":"Operate",
- "end task":"end task",
+ "Terminate Task":"Terminate Task",
"cancel":"cancel",
"confirm":"confirm",
"number":"number",
- "Outfeed Barcodid":"Outfeed Barcodid",
- "Infeed Barcodid":"Infeed Barcodid",
- "The Cage number being used":"The Cage Number being used",
- "The Slot number being used":"The Slot Number being used",
+ "Outfeed glass barcode":"Outfeed glass barcode",
+ "Infeed glass barcode鈥�":"Infeed glass barcode鈥�",
+ "Cage No":"Cage No",
+ "Slot No":"Slot No",
"Order Nmuber":"Order Nmuber",
- "Length and Width":"Length and Width",
+ "Dim":"Dim",
"id":"id",
"content":"content",
"timeon":"timeon",
"endTime":"endTime",
- "The Cage number":"The Cage number",
"The Side":"The Side",
- "The Slot Number":"The Slot Number",
"Barcodid":"Barcodid",
- "Order Number":"Order Number",
- "List Number":"List Number",
- "Box Number":"Box Number",
+ "Order No":"Order No",
+ "List No":"List No",
+ "Box No":"Box No",
"delete":"delete",
"out":"out",
@@ -289,7 +287,7 @@
"Usage":"Usage",
"Space (Pieces)":"Space (Pieces)",
"This glass is already in the cage":"This glass is already in the cage",
- "Enter the Order lD":"Enter the Order lD",
+ "Enter the Order No":"Enter the Order No",
"OrderInfo":"OrderInfo",
"Query":"Query",
"permission update":"permission update",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index fa58c91..a150194 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -222,9 +222,8 @@
- "Enter the glass lD":"杈撳叆鐜荤拑id",
- "Infeed barcodid":"鎵嬪姩涓婄墖",
- "Enter the order number":"杈撳叆璁㈠崟鍙�",
+ "Enter the glass barcode":"杈撳叆鐜荤拑id",
+ "Manually Infeed Glass":"鎵嬪姩涓婄墖",
"Exit the glass by order number":"鎸夎鍗曞嚭鐗�",
"Please confirm the glass information":"璇风‘璁ょ幓鐠冧俊鎭�",
"Please confirm the Ordering Information":"璇风‘璁よ鍗曚俊鎭�",
@@ -234,26 +233,24 @@
"length":"闀�",
"width":"瀹�",
"Operate":"鎿嶄綔",
- "end task":"瀹屾垚浠诲姟",
+ "Terminate Task":"瀹屾垚浠诲姟",
"cancel":"鍙栨秷",
"confirm":"纭",
"number":"鏁伴噺",
- "Outfeed Barcodid":"鍑虹墖鐜荤拑id",
- "Infeed Barcodid":"杩涚墖鐜荤拑id",
+ "Outfeed glass barcode":"鍑虹墖鐜荤拑id",
+ "Cage No鈥�":"杩涚墖鐜荤拑id",
"The Cage number being used":"绗煎瓙",
- "The Slot number being used":"鏍煎瓙",
- "Order Nmuber":"璁㈠崟缂栧彿",
- "List Number":"鍒楄〃缂栧彿",
- "Box Number":"绠卞瓙缂栧彿",
- "Length and Width":"灏哄",
+ "Slot No":"鏍煎瓙",
+ "Order No":"璁㈠崟缂栧彿",
+ "List No":"鍒楄〃缂栧彿",
+ "Box No":"绠卞瓙缂栧彿",
+ "Dim":"灏哄",
"id":"id",
"content":"鍐呭",
"timeon":"鎶ヨ鏃堕棿",
"endTime":"缁撴潫鏃堕棿",
- "The Cage number":"绗煎瓙",
"The Side":"鍐呭渚�",
- "The Slot Number":"鏍煎瓙",
"Barcodid":"鐜荤拑id",
"Order Number":"璁㈠崟",
"delete":"鍒犻櫎",
@@ -292,7 +289,7 @@
"Usage":"浣跨敤鐜�",
"Space (Pieces)":"绌洪棿(鐗囨暟)",
"This glass is already in the cage":"绗煎瓙閲屽凡鏈夋鐜荤拑",
- "Enter the Order lD":"璇疯緭鍏ヨ鍗昳d",
+ "Enter the Order No":"璇疯緭鍏ヨ鍗昳d",
"OrderInfo":"璁㈠崟淇℃伅",
"Query":"鏌ヨ",
"permission update":"鏉冮檺缂栬緫",
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 8b8aa91..69e2eed 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -194,39 +194,39 @@
</div>
</div>
<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
- <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
- <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Infeed barcodid') }}</el-button>
- <el-input style="width:15%;" :placeholder="$t('Enter the order number')" v-model="order"></el-input>
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"></el-input>
+ <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Manually Infeed Glass') }}</el-button>
+ <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>
</div>
<div>
<el-table :data="this.tasklist1" border style="width: 100%">
- <el-table-column :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
- <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>
- <el-table-column :width="150" prop="glassId" :label="$t('Outfeed Barcodid')"></el-table-column>
- <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
- <el-table-column prop="list" :label="$t('List Number')"></el-table-column>
- <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
- <el-table-column :label="$t('Operate')">
+ <el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
+ <el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
+ <el-table-column :width="150" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
+ <el-table-column :width="130" prop="orderId" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="list" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="box" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-table-column :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>
+ @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task') }}</el-button>
</template>
</el-table-column>
</el-table>
<el-table :data="this.tasklist2" border style="width: 100%">
- <el-table-column :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
- <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>
- <el-table-column :width="150" prop="glassId" :label="$t('Infeed Barcodid')"></el-table-column>
- <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
- <el-table-column prop="list" :label="$t('List Number')"></el-table-column>
- <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
- <el-table-column :label="$t('Operate')">
+ <el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
+ <el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
+ <el-table-column :width="150" prop="glassId" :label="$t('Infeed glass barcode鈥�')"></el-table-column>
+ <el-table-column :width="130" prop="orderId" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="list" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="box" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-table-column :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>
+ @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -305,7 +305,7 @@
<el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
<el-form-item :label="$t('Barcodid')">
- <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid"></el-input>
<el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
</el-form-item>
<el-form-item :label="$t('order')">
@@ -350,13 +350,13 @@
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item>
- <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass lD')"
+ <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"
v-model="glassid2"></el-input>
<el-button type="primary" @click="SelectGlassByGlassIDs(1)" :disabled="disabled">{{ $t('Query')
}}</el-button>
</el-form-item>
<el-form-item>
- <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass lD')"
+ <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"
v-model="glassid1"></el-input>
<el-button type="primary" @click="SelectGlassByGlassIDs(2)" :disabled="disabled">{{ $t('Query')
}}</el-button>
@@ -463,14 +463,14 @@
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
<el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
- <el-table-column :width="90" prop="cage" :label="$t('The Cage number')"></el-table-column>
- <el-table-column :width="90" prop="cell" :label="$t('The Slot Number')"></el-table-column>
+ <el-table-column :width="90" prop="cage" :label="$t('Cage No')"></el-table-column>
+ <el-table-column :width="90" prop="cell" :label="$t('Slot No')"></el-table-column>
<el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
<el-table-column :width="100" prop="glassId" :label="$t('Barcodid')"></el-table-column>
- <el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>
- <el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>
- <el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column :width="170" prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+ <el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
+ <el-table-column :width="100" prop="list" :label="$t('List No')"></el-table-column>
+ <el-table-column :width="100" prop="box" :label="$t('Box No')"></el-table-column>
+ <el-table-column :width="170" prop="lengthWidth" :label="$t('Dim')"></el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -488,12 +488,12 @@
</el-table>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
- <el-input style="width:15%;" :placeholder="$t('Enter the Order lD')" v-model="orderid"></el-input>
+ <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
<el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
<el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
" :height="700" border style="width: 100%;overflow: auto;">
<el-table-column prop="glassId" :label="$t('Barcodid')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('Order Number')"></el-table-column>
+ <el-table-column prop="orderId" :label="$t('Order No')"></el-table-column>
<el-table-column prop="width" :label="$t('length')"></el-table-column>
<el-table-column prop="height" :label="$t('width')"></el-table-column>
</el-table>
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 7d20171..3840f68 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -203,7 +203,7 @@
map.put("message", "300");
} else {
homeMapper.Inglassid(glass, cage, cell, tier);
- spianMapper.UpdataAddCage1(glass.getWidth(), cage, cell);
+ spianMapper.UpdataAddCage1(glass.getwidth(), cage, cell);
}
return Result.success(map);
}
--
Gitblit v1.8.0