From cf00f005c1e3fa4b19caf1efd61501da0331c876 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 05 十二月 2023 08:15:37 +0800
Subject: [PATCH] 修改提示框大小
---
CanadaMes-ui/src/views/home/index.vue | 77 ++++++++++++++++---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 10 +-
CanadaMes-ui/src/views/login/index.vue | 2
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 2
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 117 ++++++++++++++---------------
5 files changed, 129 insertions(+), 79 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index bfb3046..606fde7 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -187,7 +187,7 @@
if (typeof WebSocket === "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
- let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
+ let socketUrl = "ws://" + "192.168.10.102:8888" + "/springboot-vue3/api/talk/" + viewname;
if (socket != null) {
socket.close();
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 0ef8a09..54fffcf 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -182,8 +182,32 @@
}
}
+
+.blocks {
+ transform: scale(1, 1);
+}
+
+
.el-dialog {
width: 90%;
+}
+
+.el-message-box__message {
+ font-size: 27px;
+}
+
+.el-message-box {
+ height: 200px;
+ width: 600px;
+}
+
+.el-button--small {
+ font-size: 25px;
+}
+
+.el-message-box__btns {
+ padding: 0px 15px 0;
+ text-align: right;
}
/* .el-table td,
@@ -873,8 +897,19 @@
},
load() {
//鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
+ let cookies = document.cookie;
+ var cooks = cookies.split(";")[0];
+ var value = cooks.substring(cooks.indexOf("=") + 1);
+ console.log(value);
+ // let cookie=cookies.split(';');
+ // console.log()
+ // console.log(cookies.get('name'));
home().then(res => {
this.tableData = res.data.list;
+ });
+ SelectCageInfo(1).then(res => {
+ this.cageinfo = res.data.cageinfo;
+ this.currentPages = 1;
});
//鍔犺浇鐞嗙墖绗肩幓鐠冩暟鎹�
home2().then(res => {
@@ -1542,25 +1577,41 @@
if (this.disabled == false) {
this.disabled = true;
this.$message.error(this.$t('The glass size is not within the range'));
- this.$confirm(this.$t('The glass size is not within the range'), this.$t('confirm'), {
- // confirmwidth: 7000,
- // height: 8000,
- // confirmButtonText: this.$t('Yes'),
- // cancelButtonText: this.$t('No'),
- type: 'warning'
- }).then(() => {
- this.$message.success(this.$t('Operation successful'));
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
+ this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {
+ confirmButtonText: this.$t('Yes'),
+ callback: action => {
+ this.$message({
+ type: 'info',
+ message: this.DeleteBarcodeGlass()
+ });
+ }
});
}
+ // this.$message(this.$t('The glass size is not within the range'), this.$t('confirm'), {
+ // // confirmwidth: 7000,
+ // // height: 8000,
+ // confirmButtonText: this.$t('Yes'),
+ // type: 'info'
+ // }).then(() => {
+ // this.$message.success(this.$t('Operation successful'));
+ // }).catch(() => {
+ // this.$message({
+ // type: 'warning',
+ // message: this.$t('Operation canceled')
+ // });
+ // });
+ // }
this.disabled1 = true;
} else {
+ // if(isConfirmStates==true){
+ // this.InsertQueueGlass();
+ // }
this.disabled1 = false;
}
+
+ },
+ DeleteBarcodeGlass(){
+ this.form5={};
}
}
}
diff --git a/CanadaMes-ui/src/views/login/index.vue b/CanadaMes-ui/src/views/login/index.vue
index b34532b..05f8592 100644
--- a/CanadaMes-ui/src/views/login/index.vue
+++ b/CanadaMes-ui/src/views/login/index.vue
@@ -78,6 +78,8 @@
this.$refs.loginFormRef.validate(async valid => {
if (!valid) return;
login(this.loginForm).then(res => {
+ document.cookie="Authorizationssss="+this.loginForm.username+"; expires=Thu, 18 Dec 2203 12:00:00 GMT";
+
// 璁剧疆token
setToken(res.data.Authorization);
this.$router.push('/layout')
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index ee259d6..abb213e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -4,6 +4,7 @@
import cn.hutool.poi.excel.sax.handler.MapRowHandler;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +19,6 @@
import com.example.springboot.service.North_Glass_Buffer1Service;
import com.example.springboot.service.SpianService;
-
public class Plchome extends Thread {
@Autowired
@@ -27,12 +27,13 @@
private SpianService spianService;
private North_Glass_Buffer1Service north_Glass_Buffer1Service;
private JdbcConnections dbserve;
- //鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
- public static Boolean isAllowQueue=true;
- //閾濇id
+ // 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
+ public static Boolean isAllowQueue = true;
+ // 閾濇id
public static String FrameNo;
- //鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
- public static Boolean isConfirm=true;
+ // 鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
+ public static Boolean isConfirm = true;
+
// public static Map b=new HashMap<>();
// b.put()
@Override
@@ -71,25 +72,28 @@
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
// 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
- // List<String> addressList = new ArrayList<String>();
- // addressList.add("DB106.12");
- // addressList.add("DB106.0");
- // List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
- // if (paramlist != null) {
- // jsonObject.append("params", paramlist);
- // }
- // // 鑾峰彇杩涚墖杞︾姸鎬�
- // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
- // 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- // boolean exist1 = datas1ListState.contains((short) 0);
- // jsonObject.append("zhuangtai", exist1);
- // //鑾峰彇杩涚墖鐜荤拑淇℃伅
- // List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
- // if (inglassInfo != null) {
- // if (inglassInfo.size() > 0)
- // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
- // }
- // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
+ List<String> addressList = new ArrayList<String>();
+ if (addressList != null) {
+ addressList.add("DB106.12");
+ addressList.add("DB106.0");
+ }
+
+ List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
+ if (paramlist != null) {
+ jsonObject.append("params", paramlist);
+ }
+ // 鑾峰彇杩涚墖杞︾姸鎬�
+ List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
+ 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ boolean exist1 = datas1ListState.contains((short) 0);
+ jsonObject.append("zhuangtai", exist1);
+ // 鑾峰彇杩涚墖鐜荤拑淇℃伅
+ List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
+ if (inglassInfo != null) {
+ if (inglassInfo.size() > 0)
+ jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
+ }
+ // 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
String queid = spianMapper.Selectqueueid();
int state = spianMapper.Selectqueuestate();
jsonObject.append("queid", queid);
@@ -97,10 +101,10 @@
// 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
Queue form2 = homeMapper.GetQueueInfo(2);
Queue form3 = homeMapper.GetQueueInfo(1);
- if(form2.getglassId()!=null&&form2.getglassId()!=""){
+ if (form2.getglassId() != null && form2.getglassId() != "") {
jsonObject.append("form2", form2);
}
- if(form3.getglassId()!=null&&form3.getglassId()!=""){
+ if (form3.getglassId() != null && form3.getglassId() != "") {
jsonObject.append("form3", form3);
}
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
@@ -109,53 +113,48 @@
out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
jsonObject.append("listoutslice", listoutslice);
- //鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
- jsonObject.append("isAllowQueue",Plchome.isAllowQueue);
+ // 鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
+ jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
- //鑾峰彇閾濇idDB106.DBW64
+ // 鑾峰彇閾濇idDB106.DBW64
// String frameno=spianService.queGlassid("DB106.24",14).toString();
// if(frameno!=Plchome.FrameNo){
- // Plchome.FrameNo=frameno;
+ // Plchome.FrameNo=frameno;
// }
// Plchome.FrameNo="123";
// try {
- // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
// } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
// }
- //鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
+ // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
- //閾濇绾夸氦浜�
+ // 閾濇绾夸氦浜�
// //閾濇id璇锋眰瀛�
// List<Short> framerequest = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
// if(framerequest!=null){
- // //閾濇id
- // String franmeno= spianService.queGlassid("閾濇id鍦板潃", 14).toString();
- // String position;
- // try {
- // position=dbserve.SelectPositionByFrameBarcode(franmeno);
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // position="0";
- // e.printStackTrace();
- // }
- // Short send;
- // if(position=="0"){
- // send=0;
- // }else{
- // send=1;
- // }
- // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short)send);
+ // //閾濇id
+ // String franmeno= spianService.queGlassid("閾濇id鍦板潃", 14).toString();
+ // String position;
+ // try {
+ // position=dbserve.SelectPositionByFrameBarcode(franmeno);
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // position="0";
+ // e.printStackTrace();
// }
-
+ // Short send;
+ // if(position=="0"){
+ // send=0;
+ // }else{
+ // send=1;
+ // }
+ // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short)send);
+ // }
-
-
-
-
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
try {
@@ -172,8 +171,6 @@
sendwServer.sendMessage(jsonObject.toString());
}
-
-
}
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 15adfff..58b8199 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -35,11 +35,11 @@
//
System.out.println("鍚姩瀹屾垚");
-// new PlcHold().start();
-//
- //
-// new Plchome().start();
-// //
+ // new PlcHold().start();
+
+
+ new Plchome().start();
+ //
new PlcParameter().start();
//
// new Plcalarm().start();
--
Gitblit v1.8.0