From 0c341d0f873673ee277e8fb180cd1db5b714bd76 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 17 五月 2024 15:21:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index e9bd3c7..bf305e6 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -83,8 +83,8 @@
const newItem = {
content: itemData.item.content,
fillColor: itemData.item.fillColor,
- width: itemData.item.width === "" ? "" : 10,
- height: itemData.item.height === "" ? "" : 90
+ width: itemData.item.width === 0 ? "" : 10,
+ height: itemData.item.height === 0 ? "" : 90
};
if (index === 2 && itemData.item.width > 0) {
@@ -115,22 +115,22 @@
//setInterval(fetchFlowCardId, 2000)
-// const showCustomAlert = (content) => {
-// var str="鏋跺彿 : 111\n" +
-// "闀� : 111\n" +
-// "瀹� : 111\n" +
-// "鍘� : 111\n"+
-// "鐜荤拑ID : 111\n"+
-// "鑶滅郴 : 111\n";
+const showCustomAlert = (content) => {
+ var str="鏋跺彿 : 111\n" +
+ "闀� : 111\n" +
+ "瀹� : 111\n" +
+ "鍘� : 111\n"+
+ "鐜荤拑ID : 111\n"+
+ "鑶滅郴 : 111\n";
-// Swal.fire({
-// title: '鐜荤拑淇℃伅',
-// html: '<pre>' + str + '</pre>',
-// customClass: {
-// popup: 'format-pre'
-// }
-// });
-// };
+ Swal.fire({
+ title: '鐜荤拑淇℃伅',
+ html: '<pre>' + str + '</pre>',
+ customClass: {
+ popup: 'format-pre'
+ }
+ });
+};
const showRectInfo = (rectInfo) => {
const content = rectInfo.item.content;
--
Gitblit v1.8.0