From 664db98c9e8595ce4dd636a27f480e3a08b81ff5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 21 二月 2025 11:13:51 +0800
Subject: [PATCH] 新增可忽略的维修时间

---
 web/src/views/modules/taskReliability/RBD-edit-img.vue |   47 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 58fa825..a83d7e4 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -18,7 +18,9 @@
               <el-button type="primary" @click="saveDiagram()">鏆傚瓨</el-button>
               <el-button type="primary" @click="analyzeDiagram()">鎻愪氦</el-button>
               <el-button type="primary" @click="clearDiagram()">娓呯┖鍥惧舰</el-button>
-              <el-checkbox style="margin: 0 10px 0 10px" v-model="dataForm.autoLayout">鏄惁寮�鍚竴閿帓鐗�</el-checkbox>
+              <el-checkbox style="margin: 0 10px 0 10px" v-model="dataForm.autoLayout" :true-label="1" :false-label="0">
+                鏄惁寮�鍚竴閿帓鐗�
+              </el-checkbox>
               <el-button type="primary" @click="layoutDiagram()" :disabled="!dataForm.autoLayout">涓�閿帓鐗�</el-button>
               <el-button @click="leftAlign()">
                 <i style="font-size: 1rem;" class="wt-iconfont icon-zuoduiqi"></i>
@@ -578,7 +580,7 @@
           hasPublish: 0,
           urlPref: '',
           nodeArr: [],
-          autoLayout:true,
+          autoLayout: 1,
         },
         type: '',
         id: '',
@@ -756,6 +758,7 @@
         }
         let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
         this.dataForm = res.data
+        this.dataForm.autoLayout = parseInt(this.dataForm.autoLayout)
         if (res.data.content != null) {
           console.log(this.dataForm, 'getDiagram datafrom')
           console.log(res.data, 'getDiagram res.data')
@@ -932,9 +935,11 @@
               for (let i = 1; i <= node.getData().basicUnitNum; i++) {
                 if (deviceNoArr.findIndex(item => item === i) === -1) {
                   no = i
-                  if (node.getData().basicUnitNum>1){
+                  if (node.getData().basicUnitNum >= 1) {
                     node.getData().deviceNo = i
-                    node.attr('text/text', node.attr('text/text') + '-' + i)
+                    if(node.getData().deviceNo > 1){
+                      node.attr('text/text', node.attr('text/text') + '-' + i)
+                    }
                   }
                   break
                 }
@@ -1035,7 +1040,7 @@
               type: 'imageNodes2',
               dataId: item.dataId,
               basicUnitNum: item.basicUnitNum,
-              deviceNo: 0,
+              deviceNo: 1,
               nodeType: item.nodeType,
               nodeTypeExt: item.nodeTypeExt,
               productType: item.productType,
@@ -1063,12 +1068,12 @@
                 //'xlink:href': urlObject.createObjectURL(new Blob([item.svgContent])),
               },
               title: {
-                text: item.basicUnitNum>1?item.basicUnitNum:'',
+                text: item.basicUnitNum > 1 ? item.basicUnitNum : '',
                 refX: 15,
                 refY: 10,
                 fill: '#748be7',
                 fontSize: 14,
-                fontWeight:'bold',
+                fontWeight: 'bold',
                 'text-anchor': 'start',
               },
               text: {
@@ -1221,7 +1226,7 @@
         // 鐩戝惉鑺傜偣娣诲姞浜嬩欢
         this.graph.on('node:added', ({node}) => {
           node.setAttrs({
-            title: { text: '' },
+            title: {text: ''},
           })
           if (this.isFirstLoad) {
             return
@@ -1582,7 +1587,7 @@
         })
       },
       async layoutDiagram() {
-        if(this.dataForm.autoLayout){
+        if (this.dataForm.autoLayout == 1) {
           console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
           this.dataForm.content = JSON.stringify(this.graph.toJSON())
           this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
@@ -1780,7 +1785,7 @@
             inEdges[0].target = {cell: result.newStartNode.id}
             outEdges[0].source = {cell: result.newEndNode.id}
             graphNode.remove()
-            if(this.dataForm.autoLayout){
+            if (this.dataForm.autoLayout == 1) {
               if (!result.canPlace) {
                 //璋冪敤鑷姩鎺掔増
                 this.layoutDiagram()
@@ -1837,7 +1842,7 @@
             connector: {name: 'rounded'},
             zIndex: -1
           })
-          if(this.dataForm.autoLayout){
+          if (this.dataForm.autoLayout == 1) {
             if (!result.canPlace) {
               //璋冪敤鑷姩鎺掔増
               this.layoutDiagram()
@@ -1971,7 +1976,7 @@
             })
             graphEdge.source = {cell: result.newEndNode.id}
           }
-          if(this.dataForm.autoLayout){
+          if (this.dataForm.autoLayout == 1) {
             if (!result.canPlace) {
               //璋冪敤鑷姩鎺掔増
               this.layoutDiagram()
@@ -2476,7 +2481,7 @@
 <style>
   #containerImg {
     display: flex;
-    border: 1px solid #dfe3e8;
+    /*border: 1px solid #dfe3e8;*/
     height: 400px;
     width: 100% !important;
   }
@@ -2510,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