Merge remote-tracking branch 'origin/master'

xyc

2024-11-04 e48a56c2171f023f1978b0b6aec9befd43e7a9dc

 web/src/views/modules/taskReliability/RBD-edit-img.vue

@@ -18,7 +18,10 @@
              <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-button type="primary" @click="layoutDiagram()">一键排版</el-button>
              <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>
              </el-button>
@@ -576,7 +579,8 @@
          publishContent: null,
          hasPublish: 0,
          urlPref: '',
          nodeArr: []
          nodeArr: [],
          autoLayout: 1,
        },
        type: '',
        id: '',
@@ -754,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')
@@ -1580,6 +1585,7 @@
        })
      },
      async layoutDiagram() {
        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']
@@ -1600,6 +1606,7 @@
            this.graph.positionContent('left')
          }
        })
        }
      },
      leftAlign() {
        const NODE = this.graph.getSelectedCells()
@@ -1776,9 +1783,11 @@
            inEdges[0].target = {cell: result.newStartNode.id}
            outEdges[0].source = {cell: result.newEndNode.id}
            graphNode.remove()
            if (this.dataForm.autoLayout == 1) {
            if (!result.canPlace) {
//调用自动排版
              this.layoutDiagram()
              }
            }
          }
        } else { //并行结构
@@ -1831,9 +1840,11 @@
            connector: {name: 'rounded'},
            zIndex: -1
          })
          if (this.dataForm.autoLayout == 1) {
          if (!result.canPlace) {
//调用自动排版
            this.layoutDiagram()
            }
          }
        }
      },
@@ -1963,9 +1974,12 @@
            })
            graphEdge.source = {cell: result.newEndNode.id}
          }
          if (this.dataForm.autoLayout == 1) {
          if (!result.canPlace) {
              //调用自动排版
            this.layoutDiagram()
          }
          }
          // graphEdge.remove()
        }
      },