From 59b47441175f1ba367ef56fe4a4eca94c3c9d850 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 09:04:10 +0800
Subject: [PATCH] 测试合并
---
springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java | 4
springboot-vue3/src/main/resources/config.properties | 2
Albania_Mes-ui/src/lang/locales/zh-CN.json | 2
Albania_Mes-ui/src/configuration/Sign.json | 210 +++++++++++++++++++++++-----------
Albania_Mes-ui/src/lang/locales/en-US.json | 2
Albania_Mes-ui/src/views/home/index.vue | 74 ++++++++----
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 2
Albania_Mes-ui/src/views/Electrical/alarm.vue | 1
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 6
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 7
Albania_Mes-ui/src/views/Electrical/Sign.vue | 11 +
11 files changed, 210 insertions(+), 111 deletions(-)
diff --git a/Albania_Mes-ui/src/configuration/Sign.json b/Albania_Mes-ui/src/configuration/Sign.json
index 88bac50..a770d0f 100644
--- a/Albania_Mes-ui/src/configuration/Sign.json
+++ b/Albania_Mes-ui/src/configuration/Sign.json
@@ -6,7 +6,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I10.0"
+ "unit":"I10.0",
+ "name1":"LOW-E鑶滄娴�"
},
{
"name": "A01Sr.dec",
@@ -14,7 +15,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I10.1"
+ "unit":"I10.1",
+ "name1":"A01鍑忛��"
},
{
"name": "A01Sr.Pos",
@@ -22,7 +24,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I10.2"
+ "unit":"I10.2",
+ "name1":"A01鍒颁綅"
},
{
@@ -31,7 +34,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I10.3"
+ "unit":"I10.3",
+ "name1":"A02-Y杞村師鐐�"
},
{
"name": "A02Sr.YH1",
@@ -39,7 +43,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I10.4"
+ "unit":"I10.4",
+ "name1":"A02-Y杞撮珮搴︽劅搴�1"
},
{
"name": "A02Sr.YH2",
@@ -47,7 +52,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I10.5"
+ "unit":"I10.5",
+ "name1":"A02-Y杞撮珮搴︽劅搴�2"
},
{
"name": "A02Sr.YH3",
@@ -55,7 +61,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I10.6"
+ "unit":"I10.6",
+ "name1":"A02-Y杞撮珮搴︽劅搴�3"
},
{
"name": "A02Sr.YH4",
@@ -63,7 +70,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I10.7"
+ "unit":"I10.7",
+ "name1":"A02-Y杞撮珮搴︽劅搴�4"
},
{
"name": "A02Sr.LimitTop",
@@ -71,7 +79,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I11.0"
+ "unit":"I11.0",
+ "name1":"A02-Y杞翠笂鏋侀檺"
},
{
@@ -80,7 +89,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I11.1"
+ "unit":"I11.1",
+ "name1":"A02-Y杞翠笅鏋侀檺"
},
{
"name": "A02Sr.Check",
@@ -88,7 +98,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I11.2"
+ "unit":"I11.2",
+ "name1":"A02-Y杞村杈�"
},
{
"name": "A02Sr.YDec",
@@ -96,7 +107,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I11.3"
+ "unit":"I11.3",
+ "name1":"A02-Y杞村噺閫�"
},
{
"name": "A02Sr.Xin",
@@ -104,7 +116,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I11.4"
+ "unit":"I11.4",
+ "name1":"A02-X杞翠笂鐗�"
},
{
"name": "A02Sr.XCheck",
@@ -112,7 +125,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I11.5"
+ "unit":"I11.5",
+ "name1":"A02-X杞村杈�"
},
{
"name": "A02Sr.XDec",
@@ -120,7 +134,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I11.6"
+ "unit":"I11.6",
+ "name1":"A02-X杞村噺閫�"
},
{
"name": "A02Sr.XPos",
@@ -128,7 +143,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I11.7"
+ "unit":"I11.7",
+ "name1":"A02-X杞村埌浣�"
},
{
"name": "C01Sr.Zero",
@@ -136,7 +152,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I124.0"
+ "unit":"I124.0",
+ "name1":"C01鍘熺偣"
},
{
@@ -145,7 +162,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I124.1"
+ "unit":"I124.1",
+ "name1":"C01.YV1鍘熺偣浣�1"
},
{
"name": "C01YV1.Work1",
@@ -153,7 +171,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I124.2"
+ "unit":"I124.2",
+ "name1":"C01.YV1鍔ㄤ綔浣�1"
},
{
"name": "C01.YV1.Bas2",
@@ -161,7 +180,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I124.3"
+ "unit":"I124.3",
+ "name1":"C01.YV1鍘熺偣浣�2"
},
{
"name": "C01.YV1.Work2",
@@ -169,7 +189,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I124.4"
+ "unit":"I124.4",
+ "name1":"C01.YV1鍔ㄤ綔浣�2"
},
{
"name": "C01.YV2.Bas1",
@@ -177,7 +198,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I124.5"
+ "unit":"I124.5",
+ "name1":"C01.YV2鍘熺偣浣�1"
},
{
"name": "C01.YV2.Bas2",
@@ -185,7 +207,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I124.6"
+ "unit":"I124.6",
+ "name1":"C01.YV2鍘熺偣浣�2"
},
{
"name": "C01.YV2.Bas3",
@@ -193,7 +216,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I124.7"
+ "unit":"I124.7",
+ "name1":"C01.YV2鍘熺偣浣�3"
},
{
"name": "C01.YV2.Bas4",
@@ -201,7 +225,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I125.0"
+ "unit":"I125.0",
+ "name1":"C01.YV2鍘熺偣浣�4"
},
{
"name": "C01.YV2.Work1",
@@ -209,7 +234,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I125.1"
+ "unit":"I125.1",
+ "name1":"C01.YV2鍔ㄤ綔浣�1"
},
{
"name": "C01.YV2.Work2",
@@ -217,7 +243,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I125.2"
+ "unit":"I125.2",
+ "name1":"C01.YV2鍔ㄤ綔浣�2"
},
{
"name": "C01.YV2.Work3",
@@ -225,7 +252,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I125.3"
+ "unit":"I125.3",
+ "name1":"C01.YV2鍔ㄤ綔浣�3"
},
{
"name": "C01.YV2.Work4",
@@ -233,7 +261,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I125.4"
+ "unit":"I125.4",
+ "name1":"C01.YV2鍔ㄤ綔浣�4"
},
{
"name": "C01.YV.Blow1",
@@ -241,7 +270,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I125.5"
+ "unit":"I125.5",
+ "name1":"C01鍚规皵1"
},
{
"name": "C01.YV.Blow2",
@@ -249,7 +279,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I125.6"
+ "unit":"I125.6",
+ "name1":"C01鍚规皵2"
},
{
"name": "C01.YV.Blow3",
@@ -257,7 +288,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I125.7"
+ "unit":"I125.7",
+ "name1":"C01鍚规皵3"
},
{
"name": "C01.YV.Blow4",
@@ -265,7 +297,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I126.0"
+ "unit":"I126.0",
+ "name1":"C01鍚规皵4"
},
{
"name": "C01.SR.Limit1",
@@ -273,7 +306,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I126.1"
+ "unit":"I126.1",
+ "name1":"C01瀵瑰皠淇濇姢"
},
{
"name": "C02.Sr.Zero",
@@ -281,7 +315,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I126.2"
+ "unit":"I126.2",
+ "name1":"C02鍘熺偣"
},
{
"name": "C02.YV1.Bas1",
@@ -289,7 +324,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I126.3"
+ "unit":"I126.3",
+ "name1":"C02.YV1鍘熺偣浣�1"
},
{
"name": "C02.YV1.Work1",
@@ -297,7 +333,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I126.4"
+ "unit":"I126.4",
+ "name1":"C02.YV1鍔ㄤ綔浣�1"
},
{
"name": "C02.YV1.Bas2",
@@ -305,7 +342,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I126.5"
+ "unit":"I126.5",
+ "name1":"C02.YV1鍘熺偣浣�2"
},
{
"name": "C02.YV1.Work2",
@@ -313,7 +351,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I126.6"
+ "unit":"I126.6",
+ "name1":"C02.YV1鍔ㄤ綔浣�2"
},
{
"name": "C02.Sr.limit1",
@@ -321,7 +360,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I126.7"
+ "unit":"I126.7",
+ "name1":"C02瀵瑰皠淇濇姢"
},
{
"name": "C02.YV2.Bas1",
@@ -329,7 +369,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I127.0"
+ "unit":"I127.0",
+ "name1":"C02.YV2鍘熺偣浣�1"
},
{
"name": "C02.YV2.Bas2",
@@ -337,7 +378,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I127.1"
+ "unit":"I127.1",
+ "name1":"C02.YV2鍘熺偣浣�2"
},
{
"name": "C02.YV2.Bas3",
@@ -345,7 +387,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I127.2"
+ "unit":"I127.2",
+ "name1":"C02.YV2鍘熺偣浣�3"
},
{
"name": "C02.YV2.Bas4",
@@ -353,7 +396,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I127.3"
+ "unit":"I127.3",
+ "name1":"C02.YV2鍘熺偣浣�4"
},
{
"name": "C02.YV2.Work1",
@@ -361,7 +405,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I127.4"
+ "unit":"I127.4",
+ "name1":"C02.YV2鍔ㄤ綔浣�1"
},
{
"name": "C02.YV2.Work2",
@@ -369,7 +414,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I127.5"
+ "unit":"I127.5",
+ "name1":"C02.YV2鍔ㄤ綔浣�2"
},
{
"name": "C02.YV2.Work3",
@@ -377,7 +423,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I127.6"
+ "unit":"I127.6",
+ "name1":"C02.YV2鍔ㄤ綔浣�3"
},
{
"name": "C02.YV2.Work4",
@@ -385,7 +432,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I127.7"
+ "unit":"I127.7",
+ "name1":"C02.YV2鍔ㄤ綔浣�4"
},
{
"name": "C02.YV.Blow1",
@@ -393,7 +441,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I128.0"
+ "unit":"I128.0",
+ "name1":"C02鍚规皵1"
},
{
"name": "C02.YV.Blow2",
@@ -401,7 +450,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I128.1"
+ "unit":"I128.1",
+ "name1":"C02鍚规皵2"
},
{
"name": "C02.YV.Blow3",
@@ -409,7 +459,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I128.2"
+ "unit":"I128.2",
+ "name1":"C02鍚规皵3"
},
{
"name": "C02.YV.Blow4",
@@ -417,7 +468,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I128.3"
+ "unit":"I128.3",
+ "name1":"C02鍚规皵4"
},
{
"name": "bStart",
@@ -425,7 +477,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I128.4"
+ "unit":"I128.4",
+ "name1":"鍚姩"
},
{
"name": "bStop",
@@ -433,7 +486,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I128.5"
+ "unit":"I128.5",
+ "name1":"鍋滄"
},
{
"name": "bEstop",
@@ -441,7 +495,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I128.6"
+ "unit":"I128.6",
+ "name1":"鎬ュ仠"
},
{
"name": "bReset",
@@ -449,7 +504,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I128.7"
+ "unit":"I128.7",
+ "name1":"澶嶄綅"
},
{
"name": "bAuto/Manual",
@@ -457,7 +513,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I129.0"
+ "unit":"I129.0",
+ "name1":"妯″紡閫夋嫨"
},
{
"name": "bPause",
@@ -465,7 +522,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I129.1"
+ "unit":"I129.1",
+ "name1":"鏆傚仠"
},
{
"name": "C01.Sr.Limit2",
@@ -473,7 +531,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I129.2"
+ "unit":"I129.2",
+ "name1":"C01瀵瑰皠淇濇姢2"
},
{
"name": "C02.Sr.Limit2",
@@ -481,7 +540,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I129.3"
+ "unit":"I129.3",
+ "name1":"C02瀵瑰皠淇濇姢2"
},
{
"name": "A01.FootControl",
@@ -489,7 +549,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I129.4"
+ "unit":"I129.4",
+ "name1":"鑴氳笍寮�鍏�"
},
{
"name": "B01.Sr.DecLeft",
@@ -497,7 +558,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I129.5"
+ "unit":"I129.5",
+ "name1":"B01宸﹀噺閫�"
},
{
"name": "B01.Sr.PosLeft",
@@ -505,7 +567,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I129.6"
+ "unit":"I129.6",
+ "name1":"B01宸﹀埌浣�"
},
{
"name": "B01.Sr.SafetyLeft",
@@ -513,7 +576,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I129.7"
+ "unit":"I129.7",
+ "name1":"B01宸﹀畨鍏ㄦ娴�"
}
,
{
@@ -522,7 +586,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I130.0"
+ "unit":"I130.0",
+ "name1":"B01鍙冲噺閫�"
}
,
{
@@ -531,7 +596,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I130.1"
+ "unit":"I130.1",
+ "name1":"B01鍙冲埌浣�"
}
,
{
@@ -540,7 +606,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I130.2"
+ "unit":"I130.2",
+ "name1":"B01鍙冲畨鍏ㄦ娴�"
}
,
{
@@ -549,7 +616,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I130.3"
+ "unit":"I130.3",
+ "name1":"B01澶ц溅缈昏浆鍘熺偣"
}
,
{
@@ -558,7 +626,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I130.4"
+ "unit":"I130.4",
+ "name1":"B01澶ц溅缈昏浆涓婃瀬闄�"
}
,
{
@@ -567,7 +636,8 @@
"state": "1",
"type": "1",
"page": "1",
- "unit":"I130.5"
+ "unit":"I130.5",
+ "name1":"B01澶ц溅缈昏浆涓嬫瀬闄�"
}
diff --git a/Albania_Mes-ui/src/lang/locales/en-US.json b/Albania_Mes-ui/src/lang/locales/en-US.json
index d22eba1..8ca0508 100644
--- a/Albania_Mes-ui/src/lang/locales/en-US.json
+++ b/Albania_Mes-ui/src/lang/locales/en-US.json
@@ -42,7 +42,7 @@
"Clear":"Clear",
- "ip":"192.168.10.97",
+ "ip":"localhost",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
diff --git a/Albania_Mes-ui/src/lang/locales/zh-CN.json b/Albania_Mes-ui/src/lang/locales/zh-CN.json
index 3e3327d..1e709c4 100644
--- a/Albania_Mes-ui/src/lang/locales/zh-CN.json
+++ b/Albania_Mes-ui/src/lang/locales/zh-CN.json
@@ -40,7 +40,7 @@
"Thickness":"鍘氬害",
"Clear":"娓呴櫎",
- "ip":"192.168.10.97",
+ "ip":"localhost",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
diff --git a/Albania_Mes-ui/src/views/Electrical/Sign.vue b/Albania_Mes-ui/src/views/Electrical/Sign.vue
index bde8673..fe1c1ac 100644
--- a/Albania_Mes-ui/src/views/Electrical/Sign.vue
+++ b/Albania_Mes-ui/src/views/Electrical/Sign.vue
@@ -25,7 +25,7 @@
item.unit
}}</span> -->
<span style="width: 100%;" class="in_mc">{{
- item.name
+ language === 'zh-CN'?item.name1:item.name
}}</span>
</div>
@@ -50,8 +50,7 @@
params: [],
xyData: [],
},
-
-
+ language :this.$i18n.locale,
messagepack: {
data: { taskname: "" }
},
@@ -63,13 +62,14 @@
}
},
created () {
-
//this.showdata();
},
activated(){
this.init();
this.record.xyData = this.jsonData.sign;
const language = this.$i18n.locale;
+
+
if (language === 'zh-CN') {
this.replaceChineseWithEnglish();
} else {
@@ -138,7 +138,8 @@
);
- const language = this.$i18n.locale;
+ const language = this.$i18n.locale;language
+ console.log(language);
if (language === 'zh-CN') {
this.replaceChineseWithEnglish();
} else {
diff --git a/Albania_Mes-ui/src/views/Electrical/alarm.vue b/Albania_Mes-ui/src/views/Electrical/alarm.vue
index e7ace7a..512b893 100644
--- a/Albania_Mes-ui/src/views/Electrical/alarm.vue
+++ b/Albania_Mes-ui/src/views/Electrical/alarm.vue
@@ -154,6 +154,7 @@
this.roles = res.data.list;
//table涓殑鍐呭杩涜璇█杞崲
const language = this.$i18n.locale;
+
if (language === 'zh-CN') {
this.replaceChineseWithEnglish();
} else {
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 94f15c1..cd87755 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -346,14 +346,14 @@
</div>
<div style="display: flex;align-items: center;overflow: hidden;">
<div class="blocks" style="position: relative;width: 100%;">
- <div class="blocks-img" :style="'z-index:999;left:150px;top:'+carposition+'px;'">
+ <div class="blocks-img" :style="'z-index:999;left:150px;top:' + carposition + 'px;'">
</div>
<div
:style="'position: absolute;z-index:99;left:271px;top:987px;width:210px;height:38px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
- :style="'position: absolute;z-index:1000;left:553px;top:'+(400+carposition)+'px;width:110px;height:88px;background-color:' + ShowDeviceList(0) + ';'">
+ :style="'position: absolute;z-index:1000;left:553px;top:' + (400 + carposition) + 'px;width:110px;height:88px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
:style="'position: absolute;z-index:99;left:800px;top:450px;width:115px;height:30px;background-color:' + ShowDeviceList(0) + ';'">
@@ -480,20 +480,25 @@
<el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState"
style="z-index: 999;">{{ $t('Manual matching') }}</el-button>
<el-button type="primary" @click="ManualTake()" :disabled="SoftEmergencyStopState"
- style="z-index: 999;">{{ $t('Manual removal') }}</el-button>
+ style="z-index: 999;">{{
+ $t('Manual removal') }}</el-button>
<el-button type="primary" @click="AnewMeasure()" :disabled="SoftEmergencyStopState"
- style="z-index: 999;">{{ $t('Remeasure') }}</el-button>
+ style="z-index: 999;">{{
+ $t('Remeasure') }}</el-button>
</div>
<br>
<!--鏄剧ず-->
<div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;float: left;">
<!--鐜荤拑鍥� #81b337-->
- <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((720-(this.LastQueue.glassheight / 25 * 7))/2)+'px auto;width:'
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
- + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
- + (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
- + (this.LastQueue.state>0?'#4CCCE4':(this.LastQueue.state==0?'#E4CA4C':'#E4CA4C'))+';text-align: center;'">
- {{ (this.LastQueue.glasswidth+this.LastQueue.glassheight)!=0?(this.LastQueue.glasswidth+"*"+this.LastQueue.glassheight):"" }}
+ <div
+ :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:' + ((720 - (this.LastQueue.glassheight / 25 * 7)) / 2) + 'px auto;width:'
+ + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
+ + (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
+ + (this.LastQueue.state > 0 ? '#4CCCE4' : (this.LastQueue.state == 0 ? '#E4CA4C' : '#E4CA4C')) + ';text-align: center;'">
+ {{
+ (this.LastQueue.glasswidth + this.LastQueue.glassheight) != 0 ? (this.LastQueue.glasswidth + "*" + this.LastQueue.glassheight) : ""
+ }}
</div>
</div>
@@ -501,17 +506,25 @@
<div style="width:20px;height: 720px;float: left;"></div>
<div style="width:500px;height: 620px;border: 2px solid #d1d1d1;float: left;padding: 50px 50px;">
<!--鐜荤拑鍥� #81b337-->
- <span class="measuretitle">{{ $t('Width') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Width') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.glasswidth
+ }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Height') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Height') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Thickness') }}锛�</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Thickness') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Measure Width') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">{{ $t('Measure Height') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Measure Width') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Matching results') }}锛�</span> <span class="measureValue">{{ this.LastQueue.state>0?$t('Matching successful'):(this.LastQueue.state==0?$t('Multiple data matching'):$t('Matching failed')) }}</span>
+ <span class="measuretitle">{{ $t('Measure Height') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
+ <br>
+ <span class="measuretitle">{{ $t('Matching results') }}锛�</span> <span class="measureValue">{{
+ this.LastQueue.state > 0 ? $t('Matching successful') : (this.LastQueue.state == 0 ? $t('Multiple data
+ matching'):$t('Matching failed')) }}</span>
<br>
</div>
</div>
@@ -660,7 +673,7 @@
name: "Home",
data() {
return {
- carposition:0,
+ carposition: 0,
selected: [],
options: [{
value: '1',
@@ -809,7 +822,7 @@
socket.onmessage = function (msg) {
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
- if(obj.carposition != null){
+ if (obj.carposition != null) {
this.carposition = obj.carposition[0];
}
// 鑾峰彇璁惧鐘舵��
@@ -823,7 +836,20 @@
this.cagelist4 = obj.cagelist4[0];
this.tasklist2 = obj.StoragTaskeTaskFeed[0];
this.tasklist1 = obj.StoragTaskeTaskOut[0];
- this.alarm = obj.alarmmg[0];
+ if (obj.alarmmg[0].length > 0) {
+ if (this.alarm.length > 0) {
+ if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
+ this.alarm = obj.alarmmg[0];
+ this.dialogFormVisible2 = true;
+ }
+ } else {
+ this.alarm = obj.alarmmg[0];
+ this.dialogFormVisible2 = true;
+ }
+ } else {
+ this.alarm = obj.alarmmg[0];
+ this.dialogFormVisible2 = false;
+ }
this.tableData1 = obj.OrderTask[0];
this.LastQueue = obj.LastQueue[0];
@@ -911,7 +937,7 @@
StorageCageAddGlass(this.cell, this.StorageCageAddInfo[index]).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
- this.StorageCageAdd=false;
+ this.StorageCageAdd = false;
}
})
} else {
@@ -959,7 +985,7 @@
UpdateStroageCageByCell(cell, nownum, num) {
if (nownum == null && num == 1) {
this.StorageCageAdd = true;
- this.Measuermode=true;
+ this.Measuermode = true;
this.cell = cell;
} else {
if (nownum + num == 0) {
@@ -1047,7 +1073,7 @@
//浜哄伐鍖归厤
ManualMatching() {
this.StorageCageAdd = true;
- this.Measuermode=false;
+ this.Measuermode = false;
},
//浜哄伐鎷胯蛋
ManualTake() {
@@ -1098,7 +1124,7 @@
},
importData() {
//let tbdata=JSON.stringify(this.dataList);
- let tbdata=this.dataList;
+ let tbdata = this.dataList;
console.log(tbdata);
importData(tbdata).then(res => {
if (res.data.message == 200) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index 49863c4..2232695 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -37,9 +37,9 @@
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
if(plcmes.getPlcParameter("PLCToMES").getValue()!=null){
- //spianService.Mestast("NG0001-1",1,4,1,"MESID1",1);
-
-
+ // spianService.Mestast("NG0001-1",40,1,0,"MESID1",1);
+ // spianService.Mestast("NG0001-2",40,2,0,"MESID2",2);
+ // spianService.Mestast("NG0001-3",40,2,1,"MESID3",3);
String ExportTOMES1=plcmes.getPlcParameter("ExportTOMES1").getValue();//鍑虹墖璇锋眰涓�绾�
String ExportToMES2=plcmes.getPlcParameter("ExportToMES2").getValue();//鍑虹墖璇锋眰浜岀嚎
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index 1a4e0f9..2e74215 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -74,8 +74,8 @@
}
List<String> addressList21 = Arrays.asList(config.getProperty("PlcIO.State").split(","));
List<Boolean> plclist = S7control.getinstance().readBits(addressList21);
- List<String> addressListName = Arrays.asList(config.getProperty("PlcIO.Name").split(","));
-
+ // List<String> addressListName = Arrays.asList(config.getProperty("PlcIO.Name").split(","));
+ // List<String> addressListName1 = Arrays.asList(config.getProperty("PlcIO.Name1").split(","));
// System.out.println("鎬ュ仠"+S7control.getinstance().ReadBits("DB10.0.5", 1));
if (plclist != null) {
@@ -89,7 +89,8 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.append("sig", Intlist);
- jsonObject.append("addressListName", addressListName);
+ // jsonObject.append("addressListName", addressListName);
+ // jsonObject.append("addressListName1", addressListName1);
// WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
// if (sendwServer3 != null) {
// sendwServer3.sendMessage(jsonObject.toString());
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
index 2af94de..0464e36 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
@@ -12,7 +12,7 @@
@Repository
public interface AlbaniaMapper {
//鍒ゆ柇绗煎唴鏄惁鏈夊悎閫傜殑绫诲瀷绌烘牸
- @Select("select id from storage_cage where glasstype=#{glasstype} and width>=#{width}+#{widths} and state=0 and disabled=0 order by id limit 1")
+ @Select("select id from storage_cage where glasstype=#{glasstype} and width>=#{width}+#{widths} and disabled=0 order by id limit 1")
StorageCage SelectCage(int glasstype,Double width,int widths);
//鍒ゆ柇绗煎唴娌℃湁鐜荤拑鐨勭┖鏍�
@Select("select id from storage_cage where number=0 and cage>#{cage} and cage<#{cage2} and disabled=0 order by id limit 1")
@@ -28,7 +28,7 @@
void Inserttask(int tasktype, int taskstate, int shelfrack, int loadrack, String glassid, int glasstype,String flowcard,int mateid,int tier);
//鏂板涓�鏉＄瀛愭暟鎹�
@Update("UPDATE `albania`.`storage_cage` SET `glass_id` =#{glassid}, `width` =width-#{glasswidth}, `glasswidth` =#{glasswidth}, `glassheight` =#{glassheight}, `glasswidthmm` =#{glasswidth}, `glassheightmm` = #{glassheight}, `state` = #{state}, `glasstype` = #{glasstype}, `number` = #{number} WHERE `id` =#{id};")
- void AddCage(int id,String glassid,Double glasswidth,Double glassheight,int state,String glasstype,int number);
+ void AddCage(int id,String glassid,Double glasswidth,Double glassheight,int state,int glasstype,int number);
//鑾峰彇杩涚墖鏁版嵁
@Select("select glassid,flowcard,glasswidth as width,glassheight as height,glasswidthmm,glassheightmm,glasstype,thickness from queue where state=1 limit 1")
GlassInfo SelectGlass();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index b0e8782..8d2912d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -48,7 +48,7 @@
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
if(cage!=null){
- albaniaMapper.AddCage(cage.getId(), glassid,width, height, 1, cage.getGlasstype(), 0);
+ albaniaMapper.AddCage(cage.getId(), glassid,width, height, 1, glasstype, 0);
Mestast(glassid,1001,cage.getId(),1,"MESID1",1);
albaniaMapper.UpdateStorage(width,height,cage.getId());
albaniaMapper.UpdateQueueState(glassid);
diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 6919bdc..001da20 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -226,7 +226,7 @@
#IO鐘舵��
PlcIO.State=DB10.2.1,DB10.2.2,DB10.2.5,DB10.10.6,DB10.11.1,DB10.11.2,DB10.11.3,DB10.11.4,DB10.11.5,DB10.11.6,DB10.12.1,DB10.12.3,DB10.10.0,DB10.10.2,DB10.10.3,DB10.10.5,DB10.26.6,DB10.30.4,DB10.33.0,DB10.30.5,DB10.33.1,DB10.30.0,DB10.30.1,DB10.30.2,DB10.30.3,DB10.32.4,DB10.32.5,DB10.32.6,DB10.32.7,DB10.32.0,DB10.32.1,DB10.32.2,DB10.32.3,DB10.27.7,DB10.24.6,DB10.38.4,DB10.41.0,DB10.38.5,DB10.41.1,DB10.35.7,DB10.38.0,DB10.38.1,DB10.38.2,DB10.38.3,DB10.40.4,DB10.40.5,DB10.40.6,DB10.40.7,DB10.40.0,DB10.40.1,DB10.40.2,DB10.40.3,DB10.0.0,DB10.0.1,DB10.0.5,DB10.0.2,DB10.0.7,DB10.0.3,DB10.28.0,DB10.36.0,DB10.1.0,DB10.18.2,DB10.18.4,DB10.19.7,DB10.18.3,DB10.18.5,DB10.20.0,DB10.18.6,DB10.19.5,DB10.19.6
PlcIO.Name=A01Sr.Low-E,A01Sr.dec,A01Sr.Pos,A02Sr.YZero,A02Sr.YH1,A02Sr.YH2,A02Sr.YH3,A02Sr.YH4,A02Sr.LimitTop,A02Sr.LimiBottom,A02Sr.Check,A02Sr.YDec,A02Sr.Xin,A02Sr.XCheck,A02Sr.XDec,A02Sr.XPos,C01Sr.Zero,C01YV1.Bas1,C01YV1.Work1,C01.YV1.Bas2,C01.YV1.Work2,C01.YV2.Bas1,C01.YV2.Bas2,C01.YV2.Bas3,C01.YV2.Bas4,C01.YV2.Work1,C01.YV2.Work2,C01.YV2.Work3,C01.YV2.Work4,C01.YV.Blow1,C01.YV.Blow2,C01.YV.Blow3,C01.YV.Blow4,C01.SR.Limit1,C02.Sr.Zero,C02.YV1.Bas1,C02.YV1.Work1,C02.YV1.Bas2,C02.YV1.Work2,C02.Sr.limit1,C02.YV2.Bas1,C02.YV2.Bas2,C02.YV2.Bas3,C02.YV2.Bas4,C02.YV2.Work1,C02.YV2.Work2,C02.YV2.Work3,C02.YV2.Work4,C02.YV.Blow1,C02.YV.Blow2,C02.YV.Blow3,C02.YV.Blow4,bStart,bStop,bEstop,bReset,bAuto/Manual,bPause,C01.Sr.Limit2,C02.Sr.Limit2,A01.FootControl,B01.Sr.DecLeft,B01.Sr.PosLeft,B01.Sr.SafetyLeft,B01.Sr.DecRight,B01.Sr.PosRight,B01.Sr.SafetyRight,B01.Sr.TurnZero,B01.Sr.TurnLimitTop,B01.Sr.TurnLimitBottom
-
+PlcIo.Name1=LOW-E鑶滄娴�,A01鍑忛��,A01鍒颁綅,A02-Y杞村師鐐�,A02-Y杞撮珮搴︽劅搴�1,A02-Y杞撮珮搴︽劅搴�2,A02-Y杞撮珮搴︽劅搴�3,A02-Y杞撮珮搴︽劅搴�4,A02-Y杞翠笂鏋侀檺,A02-Y杞翠笅鏋侀檺,A02-Y杞村杈�,A02-Y杞村噺閫�,A02-X杞翠笂鐗�,A02-X杞村杈�,A02-X杞村噺閫�,A02-X杞村埌浣�,C01鍘熺偣,C01.YV1鍘熺偣浣�1,C01.YV1鍔ㄤ綔浣�1,C01.YV1鍘熺偣浣�2,C01.YV1鍔ㄤ綔浣�2,C01.YV2鍘熺偣浣�1,C01.YV2鍘熺偣浣�2,C01.YV2鍘熺偣浣�3,C01.YV2鍘熺偣浣�4,C01.YV2鍔ㄤ綔浣�1,C01.YV2鍔ㄤ綔浣�2,C01.YV2鍔ㄤ綔浣�3,C01.YV2鍔ㄤ綔浣�4,C01鍚规皵1,C01鍚规皵2,C01鍚规皵3,C01鍚规皵4,C01瀵瑰皠淇濇姢,C02鍘熺偣,C02.YV1鍘熺偣浣�1,C02.YV1鍔ㄤ綔浣�1,C02.YV1鍘熺偣浣�2,C02.YV1鍔ㄤ綔浣�2,C02瀵瑰皠淇濇姢,C02.YV2鍘熺偣浣�1,C02.YV2鍘熺偣浣�2,C02.YV2鍘熺偣浣�3,C02.YV2鍘熺偣浣�4,C02.YV2鍔ㄤ綔浣�1,C02.YV2鍔ㄤ綔浣�2,C02.YV2鍔ㄤ綔浣�3,C02.YV2鍔ㄤ綔浣�4,C02鍚规皵1,C02鍚规皵2,C02鍚规皵3,C02鍚规皵4,鍚姩,鍋滄,鎬ュ仠,澶嶄綅,妯″紡閫夋嫨,鏆傚仠,C01瀵瑰皠淇濇姢2,C02瀵瑰皠淇濇姢2,鑴氳笍寮�鍏�,B01宸﹀噺閫�,B01宸﹀埌浣�,B01宸﹀畨鍏ㄦ娴�,B01鍙冲噺閫�,B01鍙冲埌浣�,B01鍙冲畨鍏ㄦ娴�,B01
#A01鍙傛暟
PlcA01.param=DB10.1664,DB10.1668,DB10.1672,DB10.1676,DB10.1680
#A01鎸夐挳
--
Gitblit v1.8.0