diff --git a/cmdb-ui/src/modules/cmdb/api/history.js b/cmdb-ui/src/modules/cmdb/api/history.js
index ae8a099..dcadc65 100644
--- a/cmdb-ui/src/modules/cmdb/api/history.js
+++ b/cmdb-ui/src/modules/cmdb/api/history.js
@@ -54,3 +54,20 @@ export function getCiTriggersByCiId(ci_id, params) {
params
})
}
+
+export function getCiRelatedTickets(params) {
+ return axios({
+ url: `/itsm/v1/process_ticket/get_tickets_by`,
+ method: 'POST',
+ data: params,
+ isShowMessage: false
+ })
+}
+
+export function judgeItsmInstalled() {
+ return axios({
+ url: `/itsm/v1/process_ticket/itsm_existed`,
+ method: 'GET',
+ isShowMessage: false
+ })
+}
diff --git a/cmdb-ui/src/modules/cmdb/assets/itsm_uninstalled.png b/cmdb-ui/src/modules/cmdb/assets/itsm_uninstalled.png
new file mode 100644
index 0000000..273716e
Binary files /dev/null and b/cmdb-ui/src/modules/cmdb/assets/itsm_uninstalled.png differ
diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js
index 3d8e102..02d9aa2 100644
--- a/cmdb-ui/src/modules/cmdb/lang/en.js
+++ b/cmdb-ui/src/modules/cmdb/lang/en.js
@@ -402,7 +402,15 @@ const cmdb_en = {
noModifications: 'No Modifications',
attr: 'attribute',
attrId: 'attribute id',
- changeDescription: 'attribute id: {attr_id}, {before_days} day(s) in advance, Subject: {subject}\nContent: {body}\nNotify At: {notify_at}'
+ changeDescription: 'attribute id: {attr_id}, {before_days} day(s) in advance, Subject: {subject}\nContent: {body}\nNotify At: {notify_at}',
+ ticketStartTime: 'Start Time',
+ ticketCreator: 'Creator',
+ ticketTitle: 'Title',
+ ticketFinishTime: 'Finish Time',
+ ticketNodeName: 'Node Name',
+ itsmUninstalled: 'Please use it in combination with VE ITSM',
+ applyItsm: 'Free Apply ITSM',
+ ticketId: 'Ticket ID',
},
relation_type: {
addRelationType: 'New',
diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js
index 762bcbb..1c1d524 100644
--- a/cmdb-ui/src/modules/cmdb/lang/zh.js
+++ b/cmdb-ui/src/modules/cmdb/lang/zh.js
@@ -402,7 +402,15 @@ const cmdb_zh = {
noModifications: '没有修改',
attr: '属性名',
attrId: '属性ID',
- changeDescription: '属性ID:{attr_id},提前:{before_days}天,主题:{subject}\n内容:{body}\n通知时间:{notify_at}'
+ changeDescription: '属性ID:{attr_id},提前:{before_days}天,主题:{subject}\n内容:{body}\n通知时间:{notify_at}',
+ ticketStartTime: '工单发起时间',
+ ticketCreator: '发起人',
+ ticketTitle: '工单名称',
+ ticketFinishTime: '节点完成时间',
+ ticketNodeName: '节点名称',
+ itsmUninstalled: '请结合维易ITSM使用',
+ applyItsm: '免费申请',
+ ticketId: '工单ID',
},
relation_type: {
addRelationType: '新增关系类型',
diff --git a/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailRelatedItsmTable.vue b/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailRelatedItsmTable.vue
new file mode 100644
index 0000000..4bb10f9
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailRelatedItsmTable.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+ {{ $t('noData') }}
+
+
+
+
+
+
+
+ {{ row.ticket.title }}
+
+
+
+
+
+
+
+ {{ operateTypeMap[row.operate_type] }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cmdb.history.itsmUninstalled') }}
+
+ {{ $t('cmdb.history.applyItsm') }}
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailTab.vue b/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailTab.vue
index 11491e1..a2ff1b2 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailTab.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailTab.vue
@@ -41,9 +41,16 @@
height="auto"
:span-method="mergeRowMethod"
border
+ resizable
:scroll-y="{ enabled: false }"
class="ops-stripe-table"
>
+
+
+
+ {{ $t('noData') }}
+
+
+
+ {{ $t('cmdb.ci.relITSM') }}
+
+
+
+
{})
+ .catch((e) => {
+ if (e.response.status === 404) {
+ this.itsmInstalled = false
+ }
+ })
+ },
+ async judgeItsmInstalled() {
+ await judgeItsmInstalled()
+ .catch((e) => { this.itsmInstalled = false })
},
getCIHistory() {
diff --git a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/triggerTable.vue b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/triggerTable.vue
index 2d95c29..b084d4e 100644
--- a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/triggerTable.vue
+++ b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/triggerTable.vue
@@ -9,6 +9,12 @@
:data="tableData"
v-bind="ci_id ? { height: 'auto' } : { height: `${windowHeight - 225}px` }"
>
+
+
+
+ {{ $t('noData') }}
+
+