From 6c61a8b2108fb4ee0fc1a3d2fa6a81841187bfd8 Mon Sep 17 00:00:00 2001 From: yaojn Date: Wed, 21 May 2025 16:02:20 +0800 Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=87=8C=E8=BF=BD=E5=8A=A0=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E4=BC=9A=E9=A2=9D=E5=A4=96?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E7=A9=BA=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=20=20-=20[=E5=85=B3=E8=81=94]#[1425239844552704]?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=87=8C=E8=BF=BD=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E4=BC=9A?= =?UTF-8?q?=E9=A2=9D=E5=A4=96=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=20http://192.168.0.96:8090/demo/rdm?= =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1425239844552?= =?UTF-8?q?704?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/cmdb/cientity/cientity-edit.vue | 1 + .../pages/cmdb/form/component/formcientitymodify/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/pages/cmdb/cientity/cientity-edit.vue b/src/views/pages/cmdb/cientity/cientity-edit.vue index 59140e78..7d639113 100644 --- a/src/views/pages/cmdb/cientity/cientity-edit.vue +++ b/src/views/pages/cmdb/cientity/cientity-edit.vue @@ -153,6 +153,7 @@ export default { uuid: this.$utils.setUuid(), _relId: relId, //记录来自哪个关系，自动填上配置项 _direction: rel.direction, //记录关系方向 + flagRelId: relId, // 标识关系id，用于ITSM判断是否是关系，关系不需要直接显示在列表中。 ciId: ciId, rootCiId: this.propRootCiId, ciName: ci.name, diff --git a/src/views/pages/cmdb/form/component/formcientitymodify/index.vue b/src/views/pages/cmdb/form/component/formcientitymodify/index.vue index 0caf6fbe..1df3a84f 100644 --- a/src/views/pages/cmdb/form/component/formcientitymodify/index.vue +++ b/src/views/pages/cmdb/form/component/formcientitymodify/index.vue @@ -301,7 +301,7 @@ export default { if (index > -1) { this.$set(this.entityList, index, cientity); } else { - // this.entityList.push(cientity); // 编辑配置项时，追加自动采集里的数据，提交时，会额外新增一条数据 + this.entityList.push(cientity); } }); } @@ -482,7 +482,7 @@ export default { if (this.entityList && this.entityList.length > 0) { const returnList = []; this.entityList.forEach(cientity => { - if (cientity.rootCiId === ciId && !cientity._isnew) { + if (cientity.rootCiId === ciId && !cientity._isnew && !cientity.flagRelId) { returnList.push(cientity); } }); -- Gitee