From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index e331399..a83d7e4 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -937,7 +937,7 @@
no = i
if (node.getData().basicUnitNum >= 1) {
node.getData().deviceNo = i
- if(node.getData().basicUnitNum > 1){
+ if(node.getData().deviceNo > 1){
node.attr('text/text', node.attr('text/text') + '-' + i)
}
}
@@ -1040,7 +1040,7 @@
type: 'imageNodes2',
dataId: item.dataId,
basicUnitNum: item.basicUnitNum,
- deviceNo: 0,
+ deviceNo: 1,
nodeType: item.nodeType,
nodeTypeExt: item.nodeTypeExt,
productType: item.productType,
@@ -2481,7 +2481,7 @@
<style>
#containerImg {
display: flex;
- border: 1px solid #dfe3e8;
+ /*border: 1px solid #dfe3e8;*/
height: 400px;
width: 100% !important;
}
@@ -2515,4 +2515,20 @@
top: 0
}
+ #containerImg .x6-graph-pagebreak>.x6-graph-pagebreak-horizontal {
+ position: absolute;
+ right: 0;
+ left: 0;
+ box-sizing: border-box;
+ height: 0;
+ border-top: none;
+ }
+ #containerImg .x6-graph-pagebreak>.x6-graph-pagebreak-vertical {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ box-sizing: border-box;
+ width: 0;
+ border-left: none;
+ }
</style>
--
Gitblit v1.9.1