From c3204d686fbf8a64dd7fa4dcbb48c0a075df06e0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 05 十二月 2023 08:06:19 +0800
Subject: [PATCH] 更新电气管理界面
---
CanadaMes-ui/src/views/home/index.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 77116c1..4005110 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -795,7 +795,7 @@
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
//console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
- let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
+ let socketUrl = "ws://" + this.$t('ip')+":8888" + "/springboot-vue3/api/talk/" + viewname;
if (socket != null) {
socket.close();
socket = null;
@@ -853,7 +853,6 @@
}
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
-
} else {
this.form3 = {};
}
@@ -1561,19 +1560,22 @@
//鍒ゆ柇鐜荤拑鏄惁瓒呭嚭鑼冨洿
Sizerange(Glass) {
if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {
- if (this.disabled == false) {
+ // if (this.disabled == false) {
this.disabled = true;
- this.$message.error(this.$t('The glass size is not within the range'));
+ // this.$message.error(this.$t('The glass size is not within the range'));
this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {
confirmButtonText: this.$t('Yes'),
+ type:'info',
callback: action => {
this.$message({
type: 'info',
- message: `action: ${action}`
- });
+ action: action
+ }).then(
+ this.DeleteBarcodeGlass()
+ );
}
});
- }
+ // }
// this.$message(this.$t('The glass size is not within the range'), this.$t('confirm'), {
// // confirmwidth: 7000,
// // height: 8000,
@@ -1592,6 +1594,9 @@
} else {
this.disabled1 = false;
}
+ },
+ DeleteBarcodeGlass(){
+ this.form5={};
}
}
}
--
Gitblit v1.8.0