From 1337b825194a8ddd3304b9d67e748badf49b6338 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期日, 31 三月 2024 12:41:40 +0800
Subject: [PATCH] 更新
---
springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java | 4 ++--
Albania_Mes-ui/src/views/home/index.vue | 19 +++++++++++++++----
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 76e5c23..86cfd37 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -506,7 +506,7 @@
<el-dialog :visible.sync="Measure" :title="$t('Measure')" top="5vh"><!--娴嬮噺椤甸潰-->
<!--娴嬮噺椤甸潰涓讳綋-->
- <div>
+ <div style="height: 780px;">
<!--鍔熻兘-->
<div>
<el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState"
@@ -518,15 +518,27 @@
</div>
<br>
<!--鏄剧ず-->
- <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;">
+ <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;float: left;">
<!--鐜荤拑鍥� #81b337-->
- <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:auto auto;position:absolute;width:'
+ <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((720-(this.LastQueue.glasswidth / 25 * 7))/2)+'px auto;width:'
+ + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
+ (this.LastQueue.glassheight / 25 * 7) + 'px;background-color: #93d2f3;text-align: center;'">
{{ this.LastQueue.glasswidth }}*{{ this.LastQueue.glassheight }}
</div>
+ </div>
+ <!--鏄剧ず-->
+ <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">闀匡細</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">cm</span>
+ <br>
+ <span class="measuretitle">瀹斤細</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">cm</span>
+ <br>
+ <span class="measuretitle">鍘氾細</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">cm</span>
+ <br>
</div>
</div>
</el-dialog>
@@ -1100,7 +1112,6 @@
},
importData() {
- alert(1);
//let tbdata=JSON.stringify(this.dataList);
let tbdata=this.dataList;
console.log(tbdata);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
index cced744..0263afd 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
@@ -13,7 +13,7 @@
public class PLCAutoMes extends Thread {
// 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
- private Configuration config;
+
private static InitUtil initUtil;
// public static PlcParameterObject PlcMesObject;
// public static PlcParameterObject PlcReadObject;
@@ -50,7 +50,7 @@
// 绉佹湁鏋勯�犲嚱鏁�
public PLCAutoMes() throws IOException {
- config = new Configuration("config.properties");
+ //config = new Configuration("config.properties");
initUtil = new InitUtil();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
index 4ebf773..1772639 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
@@ -17,7 +17,7 @@
@Select("SELECT * FROM queue where glassid=#{glassid}")
List<Queue> selectQueues(@Param("glassid") int glassid);
- @Select("SELECT * FROM queue order by time asc limit 1")
+ @Select("SELECT * FROM queue order by time desc limit 1")
Queue selectLastQueue();
@Select("SELECT * FROM queue where state<=0")
--
Gitblit v1.8.0