From 5465a833a00ee1ab59774398ced083d88bc0027d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 六月 2024 16:58:41 +0800
Subject: [PATCH] 添加中英文显示
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 26 ++++++--
Albania_Mes-ui/src/views/Electrical/AlbaniaServo.vue | 11 +--
Albania_Mes-ui/src/lang/locales/zh-CN.json | 5 +
Albania_Mes-ui/src/lang/locales/en-US.json | 5 +
Albania_Mes-ui/src/views/home/index.vue | 71 ++++++++++++++++-------
springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java | 2
springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java | 2
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 5 +
8 files changed, 90 insertions(+), 37 deletions(-)
diff --git a/Albania_Mes-ui/src/lang/locales/en-US.json b/Albania_Mes-ui/src/lang/locales/en-US.json
index f6f959f..f520c42 100644
--- a/Albania_Mes-ui/src/lang/locales/en-US.json
+++ b/Albania_Mes-ui/src/lang/locales/en-US.json
@@ -43,6 +43,11 @@
"MeasureNumber":"MeasureNumber",
"results":"results",
"start work":"start work",
+ "Line":"Line",
+ "Please select a route":"Please select a route",
+ "This route already has a task":"This route already has a task",
+ "Save":"Save",
+ "Select file":"Select file",
diff --git a/Albania_Mes-ui/src/lang/locales/zh-CN.json b/Albania_Mes-ui/src/lang/locales/zh-CN.json
index 12efa83..2fc4342 100644
--- a/Albania_Mes-ui/src/lang/locales/zh-CN.json
+++ b/Albania_Mes-ui/src/lang/locales/zh-CN.json
@@ -42,6 +42,11 @@
"MeasureNumber":"娴嬮噺鏁伴噺",
"results":"缁撴灉",
"start work":"寮�濮嬪伐浣�",
+ "Line":"绾胯矾",
+ "Please select a route":"璇烽�夋嫨绾胯矾",
+ "This route already has a task":"姝よ矾绾垮凡瀛樺湪浠诲姟",
+ "Save":"淇濆瓨",
+ "Select file":"閫夋嫨鏂囦欢",
"ip":"localhost",
"systemTitle": "鐧诲綍绯荤粺",
diff --git a/Albania_Mes-ui/src/views/Electrical/AlbaniaServo.vue b/Albania_Mes-ui/src/views/Electrical/AlbaniaServo.vue
index 561c77d..2bfad3f 100644
--- a/Albania_Mes-ui/src/views/Electrical/AlbaniaServo.vue
+++ b/Albania_Mes-ui/src/views/Electrical/AlbaniaServo.vue
@@ -44,7 +44,7 @@
<el-card class="json-block" style="width:670px;margin-bottom: 10px;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
- <span class="name" style="width:300px;">{{ item.CNname }}</span>
+ <span class="name" style="width:300px;">{{ language=='en-US'?item.USname:item.CNname}}</span>
@@ -76,16 +76,15 @@
</div>
<div class="button-row" style="display: flex; justify-content: center;flex-wrap: wrap;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
- <el-button v-if="item.button && language === 'en-US' && item.state != 0" :name="item.button.CNname"
+ <el-button v-if="item.button && language === 'en-US' && item.state != 0" :name="item.button.USname"
v-model="item.button.value"
:class="{ 'action-button': true, 'error-button': item.button.CNname === 'Fault' && item.button.value === 1, 'error-button2': item.button.CNname === 'NotZero' && item.button.value === 0, 'error-button3': item.button.CNname === 'Zero' && item.button.value === 1, 'greenbutton': item.button.CNname !== 'NotZero' && item.button.CNname !== 'Fault' && item.button.value === 1 }"
- @click="updateButtonValue(dataGroup, itemIndex);">{{
- item.button.CNname }}</el-button>
+ @click="updateButtonValue(dataGroup, itemIndex);">{{ language=='en-US'?item.button.USname:item.button.CNname}}</el-button>
+
<el-button v-if="item.button && language === 'zh-CN' && item.state != 0" :name="item.button.CNname"
v-model="item.button.value"
:class="{ 'action-button': true, 'error-button': item.button.CNname === '鏁呴殰' && item.button.value === 1, 'error-button2': item.button.CNname === '鏈洖闆�' && item.button.value === 0, 'error-button3': item.button.CNname === '宸插洖闆�' && item.button.value === 1, 'greenbutton': item.button.CNname !== '鏈洖闆�' && item.button.CNname !== '鏁呴殰' && item.button.value === 1 }"
- @click="updateButtonValue(dataGroup, itemIndex);">{{
- item.button.CNname }}</el-button>
+ @click="updateButtonValue(dataGroup, itemIndex);">{{ language=='en-US'?item.button.USname:item.button.CNname}}</el-button>
</div>
</div>
</el-card>
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index a562313..af9ad8b 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -309,6 +309,17 @@
.custom-row-class{
background-color: rgb(150, 238, 234) !important;
}
+.file-upload input[type="file"] {
+ display: none;
+}
+
+.file-upload label {
+ padding: 10px;
+ background-color: #007bff;
+ color: white;
+ display: inline-block;
+ cursor: pointer;
+}
</style>
<template>
<el-container>
@@ -428,7 +439,7 @@
</template>
</el-table-column>
</el-table>
- <el-table :data="this.tasklist2" border style="width: 100%" >
+ <el-table :data="this.tasklist2" border style="width: 100%">
<el-table-column prop="glassId" :label="$t('Glasstype')"></el-table-column>
<el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>
<el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>
@@ -454,9 +465,14 @@
<div id="" class="container">
<div class="header">
<div class="btn">
- <el-button type="primary" @click="importData()">淇濆瓨</el-button>
+
- <input type="file" id="uploadExcel" multiple @change="Change" />
+ <div class="file-upload">
+ <el-button type="primary" @click="importData()">{{ $t('Save') }}</el-button>
+ <input type="file" id="file-upload" multiple @change="Change" />
+ <label for="file-upload">{{ $t('Select file') }}</label>
+ </div>
+
</div>
</div>
<el-table :data="this.dataList" border style="width: 100%;">
@@ -480,14 +496,14 @@
<div style="height: 780px;">
<!--鍔熻兘-->
<div>
- <el-button type="primary" @click="ManualMatching()" :disabled="(this.LastQueue.state <= 0)"
+ <!-- <el-button type="primary" @click="ManualMatching()" :disabled="(this.LastQueue.state <= 0)"
style="z-index: 999;">{{ $t('Manual matching') }}</el-button>
<el-button type="primary" @click="ManualTake()" :disabled="(this.LastQueue.state <= 0)"
style="z-index: 999;">{{
- $t('Manual removal') }}</el-button>
+ $t('Manual removal') }}</el-button> -->
<el-button type="primary" @click="AnewMeasure()" :disabled="(this.LastQueue.state <= 0)"
style="z-index: 999;">{{
- $t('Remeasure') }}</el-button>
+ $t('Remeasure') }}</el-button>
</div>
<br>
<!--鏄剧ず-->
@@ -499,17 +515,19 @@
+ (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
+ (this.LastQueue.glassheight / 25 * 7/3) + 'px; background-color: '
+ (this.LastQueue.state > 0 ? '#4CCCE4' : (this.LastQueue.state == 0 ? '#E4CA4C' : '#E4CA4C')) + ';text-align: center;font-size:50px'">
- <div>
+ <div>
{{ $t('Measure')}}
</div>
<div>
- {{ $t('Width')+"*"+$t('Height') }}:{{(this.LastQueue.glasswidth + this.LastQueue.glassheight) != 0 ? (this.LastQueue.glasswidth + "*"+this.LastQueue.glassheight)+"" : ""}}
+ {{ $t('Width')+"*"+$t('Height') }}:{{(this.LastQueue.glasswidth +
+ this.LastQueue.glassheight) != 0 ? (this.LastQueue.glasswidth +
+ "*"+this.LastQueue.glassheight)+"" : ""}}
</div>
-
+
<div>
{{ $t('results') }}:{{this.LastState[this.LastQueue.state]}}
</div>
-
+
</div>
</div>
@@ -536,7 +554,7 @@
(this.LastQueue.state == 0 ? $t('Multiple data matching') : $t('Matching failed')) }}</span>
<br> -->
<el-table :data="this.tasklist3" :row-class-name="rowClassName" style="width: 100%;padding:0;">
- <el-table-column prop="flowcard" :label="$t('flowcard')"></el-table-column>
+ <el-table-column prop="flowcard" :label="$t('Flowcard')"></el-table-column>
<el-table-column prop="films" :label="$t('Films')"></el-table-column>
<el-table-column prop="width" :label="$t('Width')"></el-table-column>
<el-table-column prop="height" :label="$t('Height')"></el-table-column>
@@ -545,7 +563,7 @@
<el-table-column prop="measurenumber" :label="$t('MeasureNumber')"></el-table-column>
</el-table>
</div>
-
+
</div>
</el-dialog>
@@ -618,7 +636,7 @@
</el-table-column>
<el-table-column prop="line" :label="$t('Task Line')">
</el-table-column>
- <el-table-column width="350" :label="$t('Operate')">
+ <el-table-column width="380" :label="$t('Operate')">
<template slot-scope='scope'>
<el-select v-model="selected[scope.$index]" :placeholder="$t('Line')"
@@ -629,19 +647,16 @@
</el-select>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
v-show="scope.row.state >= 0 ? true : false"
- @click="ClaimTasks(scope.row.flowcard, scope.row.state, selected[scope.$index])">
+ @click="ClaimTasks(scope.row.flowcard, scope.row.state, selected[scope.$index],scope.row.line)">
{{ scope.row.state > 0 ? $t('Stop Task') : $t('Start Task') }}</el-button>
-
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
v-show="scope.row.state >= 0 ? true : false"
@click="ModeChange(scope.row.flowcard, scope.row.method)">
{{ $t('Mode Change') }}</el-button>
-
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- v-show="scope.row.state >= 0 ? true : false"
- @click="StartChange(scope.row.flowcard)">
+ v-show="scope.row.state >= 0 ? true : false" @click="StartChange(scope.row.flowcard)">
{{ $t('start work') }}</el-button>
</template>
</el-table-column>
@@ -980,12 +995,26 @@
},
//棰嗗彇/鏆傚仠浠诲姟
- ClaimTasks(flowcard, state, line) {
- ClaimTasks(flowcard, state, line).then(res => {
+ ClaimTasks(flowcard, state, line, taksline) {
+ if(line===undefined&&state==1){
+ this.$message.error(this.$t('Please select a route'));
+ }
+ if(line===undefined&&state==0){
+ this.$message.error(this.$t('Please select a route'));
+ }else{
+ if(line===undefined||state==1){
+ line=taksline;
+ }
+ ClaimTasks(flowcard, state, line).then(res => {
+
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
- }
+ }else{
+ this.$message.error(this.$t('This route already has a task'));
+ }
});
+ }
+
},
//淇敼鍑虹墖鏂瑰紡
ModeChange(flowcard, method) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
index 345d508..5e3b9a8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
@@ -6,7 +6,7 @@
import lombok.Data;
@Data
-@TableName("`glassinfo`")
+@TableName("`glassInfo`")
public class GlassInfo {
private Integer id;// 鑷id
private String flowcard;// 娴佺▼鍗d
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
index 345d508..5e3b9a8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
@@ -6,7 +6,7 @@
import lombok.Data;
@Data
-@TableName("`glassinfo`")
+@TableName("`glassInfo`")
public class GlassInfo {
private Integer id;// 鑷id
private String flowcard;// 娴佺▼鍗d
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 5bcf1ab..2d43d28 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -321,6 +321,9 @@
+" select #{flowcard}, 0, #{number}, 0, 0, 0, now() where 0=( select count(*) from flowcard where flowcard=#{flowcard});")
void InsertFlowcard(String flowcard, Integer number);
- @Select("Delete from queue where glassid=#{glassId}")
+ @Delete("Delete from queue where glassid=#{glassId}")
void DeletequeueByGlassid(String glassId);
+
+ @Select("select count(*) from flowcard where line=#{line} and state=1 and flowcard!=#{flowcard}")
+ int SelectTaskCount(String flowcard,Integer line);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index 0025656..b177138 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -233,13 +233,19 @@
// 鏌ヨ杩�/鍑虹墖浠诲姟
public List<StorageTask> SelectStorageTask(int task_type) {
List<StorageTask> storageTasks = new ArrayList<>();
+ String loadrack="0";
if (task_type == 0) {
storageTasks = homeMapper.SelectStorageTask(task_type);
} else {
storageTasks = homeMapper.SelectStorageTask(task_type);
}
for (StorageTask storageTask : storageTasks) {
- storageTask.setstorageCage(homeMapper.SelectStorageByCell(storageTask.getLoadrack()));
+ if (task_type == 0) {
+ loadrack=storageTask.getLoadrack();
+ }else{
+ loadrack=storageTask.getShelfRack();
+ }
+ storageTask.setstorageCage(homeMapper.SelectStorageByCell(loadrack));
}
return storageTasks;
}
@@ -293,13 +299,19 @@
// 寮�濮嬩换鍔�
public Result ClaimTasks(String flowcard, Integer state, Integer line) {
- if (state == 1) {
- homeMapper.ClaimTasks(flowcard, 0, line);
- } else {
- homeMapper.ClaimTasks(flowcard, 1, line);
- }
+ int count=homeMapper.SelectTaskCount(flowcard,line);
Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
+ if(count==0){
+ if (state == 1) {
+ homeMapper.ClaimTasks(flowcard, 0, line);
+ } else {
+ homeMapper.ClaimTasks(flowcard, 1, line);
+ }
+ map.put("message", "200");
+ }else{
+ map.put("message", "300");
+ }
+
return Result.success(map);
}
--
Gitblit v1.8.0