Merge remote-tracking branch 'origin/master'

xyc

2024-10-22 e4246536ec8218b0444667cbe457c0d3d6e67bd9

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

@@ -929,7 +929,9 @@
                if (deviceNoArr.findIndex(item => item === i) === -1) {
                  no = i
                  node.getData().deviceNo = i
                  node.attr('text/text', node.attr('text/text') + '-' + i)
                  if (node.getData().basicUnitNum>1){
                    node.attr('text/text', node.attr('text/text') + '-' + i)
                  }
                  break
                }
              }