From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片:fixbug:大理片出片逻辑修改,钢化版图是否到齐:sql逻辑问题,包含人工出片任务,造成钢化版图是否到齐需要获取已出片的玻璃,造成已出笼的玻璃会重复计算并准备生成钢化任务,但获取的玻璃信息为空,造成插入钢化表异常。且排除已出笼的钢化版图较复杂(暂不关联钢化小片表),目前解决方案:把所有到齐的钢化版图数据查出来,排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的

---
 UI-Project/src/views/UnLoadGlass/Landingindication.vue |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index f8d1715..89d7621 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -171,8 +171,7 @@
 
   Swal.fire({
     // title: '鐜荤拑淇℃伅',
-    title: this.$t('reportWork.glassinformation'),
-    // title: "$t('reportWork.glassinformation')",
+    title: t('reportWork.glassinformation'),
     html: tableContent,
     customClass: {
       popup: 'format-pre'
@@ -199,7 +198,7 @@
 
 <style scoped>
 .glass-rack {
-  margin-left: 20px;
+  /* margin-left: 10px; */
   width: 500px;
   margin-top: 5px;
 }

--
Gitblit v1.8.0