From 90e7cf2c4b1f47e5165e8132686bd49f842744a8 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 13:55:53 +0800
Subject: [PATCH] 更新
---
springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java | 4 ++--
Albania_Mes-ui/src/views/home/index.vue | 52 +++++++++++++++++++++++++++++++++++++++-------------
springboot-vue3/src/main/resources/application.properties | 4 ++--
3 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index bad3360..9f571a7 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -306,6 +306,19 @@
.cells {
height: 100%;
}
+.measure_Content{
+ margin-bottom: 20px;
+ font-size: 30px;
+}
+.measuretitle{
+
+}
+.measureValue{
+
+}
+.measureUnit{
+ margin-left: 10px;
+}
</style>
<template>
<el-container>
@@ -520,7 +533,7 @@
<!--鏄剧ず-->
<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.glasswidth / 25 * 7))/2)+'px auto;width:'
+ <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((1000-(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: '
@@ -534,18 +547,31 @@
<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">mm</span>
- <br>
- <span class="measuretitle">瀹斤細</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">鍘氾細</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">娴嬮噺闀匡細</span> <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">娴嬮噺瀹斤細</span> <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">鍖归厤缁撴灉锛�</span> <span class="measureValue">{{ this.LastQueue.state>0?"鍖归厤鎴愬姛":(this.LastQueue.state==0?"鍖归厤澶辫触":"澶氭暟鎹尮閰�") }}</span>
- <br>
+ <div class="measure_Content">
+ <span class="measuretitle" style="font-size: 30px;">闀匡細</span>
+ <span class="measureValue">{{ this.LastQueue.glasswidth }}</span>
+ <span class="measureUnit"> mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">瀹斤細</span>
+ <span class="measureValue">{{ this.LastQueue.glassheight }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">娴嬮噺闀匡細</span>
+ <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">娴嬮噺瀹斤細</span>
+ <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">鍖归厤缁撴灉锛�</span>
+ <span class="measureValue">{{ this.LastQueue.state>0?"鍖归厤鎴愬姛":(this.LastQueue.state==0?"鍖归厤澶辫触":"澶氭暟鎹尮閰�") }}</span>
+ </div>
+
</div>
</div>
</el-dialog>
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 1772639..2772b5c 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
@@ -30,8 +30,8 @@
// @Update("UPDATE role_permission SET state = #{state} WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
// void updateState(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);
- @Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time) "+
- "select glassid,flowcard,null,null,width,height,#{glasswidthmm},#{glassheightmm},glasstype,#{state},NOW() from glassinfo where glassid=#{glassid}")
+ @Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time,thickness) "+
+ "select glassid,flowcard,null,null,width,height,#{glasswidthmm},#{glassheightmm},glasstype,#{state},NOW(),thickness from glassinfo where glassid=#{glassid}")
void insert(@Param("glassid") String glassid, @Param("glasswidthmm") double glasswidthmm, @Param("glassheightmm") double glassheightmm,@Param("state") int state);
@Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time) "+
diff --git a/springboot-vue3/src/main/resources/application.properties b/springboot-vue3/src/main/resources/application.properties
index bb1147e..01f54d2 100644
--- a/springboot-vue3/src/main/resources/application.properties
+++ b/springboot-vue3/src/main/resources/application.properties
@@ -6,8 +6,8 @@
#\u6570\u636E\u5E93\u9A71\u52A8
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#\u6570\u636E\u5E93\u8FDE\u63A5\u5730\u5740
-spring.datasource.url=jdbc:mysql://localhost:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-#spring.datasource.url=jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+#spring.datasource.url=jdbc:mysql://localhost:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#\u6570\u636E\u5E93\u7528\u6237\u540D
spring.datasource.username=root
#\u6570\u636E\u5E93\u7528\u6237\u5BC6\u7801
--
Gitblit v1.8.0