From 9b7067e6858e81c276d85244885a34c915ef295c Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 21 Dec 2023 15:29:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]CMDB-=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=91=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=20=20-=20[=E5=85=B3=E8=81=94]#[1040591163457536]CMDB-?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=91?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=20http://192.168.0.96:8090/demo/rdm.html#/st?=
 =?UTF-8?q?ory-detail/939050947543040/939050947543042/1040591163457536?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/ci/ci-manage.vue       | 2 +-
 src/views/pages/cmdb/citype/citype-edit.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/cmdb/ci/ci-manage.vue b/src/views/pages/cmdb/ci/ci-manage.vue
index 945fda9a..e39c2290 100644
--- a/src/views/pages/cmdb/ci/ci-manage.vue
+++ b/src/views/pages/cmdb/ci/ci-manage.vue
@@ -5,9 +5,9 @@
       <template slot="topLeft">
         <div class="action-group">
           <div class="action-item tsfont-plus" @click="addCi()">{{ $t('term.cmdb.ci') }}</div>
-          <div class="action-item tsfont-plus" @click="addCiType()">{{ $t('page.type') }}</div>
           <div class="action-item tsfont-upload" @click="importCi()">{{ $t('term.cmdb.importci') }}</div>
           <div class="action-item tsfont-export" @click="exportCi()">{{ $t('term.cmdb.exportci') }}</div>
+          <div class="action-item tsfont-plus" @click="addCiType()">{{ $t('page.hierarchy') }}</div>
           <div class="action-item tsfont-edit" @click="editCiType()">{{ $t('term.cmdb.cilevel') }}</div>
           <div class="action-item tsfont-edit" @click="editCiCatalog()">{{ $t('term.cmdb.cidirectory') }}</div>
           <div class="action-item">
diff --git a/src/views/pages/cmdb/citype/citype-edit.vue b/src/views/pages/cmdb/citype/citype-edit.vue
index 6e6fb896..ef6f9784 100644
--- a/src/views/pages/cmdb/citype/citype-edit.vue
+++ b/src/views/pages/cmdb/citype/citype-edit.vue
@@ -45,7 +45,7 @@ export default {
     const _this = this;
     return {
       ciTypeDialogConfig: {
-        title: this.id ? this.$t('dialog.title.edittarget', {target: this.$t('page.type')}) : this.$t('dialog.title.addtarget', {target: this.$t('page.type')}),
+        title: this.id ? this.$t('dialog.title.edittarget', {target: this.$t('page.hierarchy')}) : this.$t('dialog.title.addtarget', {target: this.$t('page.hierarchy')}),
         type: 'modal',
         maskClose: false,
         isShow: true,
-- 
Gitee


From 209a35b9d653f529d8c9924009f60c82cfcf8cf9 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 21 Dec 2023 15:41:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]CMDB-=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=91=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=20=20-=20[=E5=85=B3=E8=81=94]#[1040591163457536]CMDB-?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=91?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=20http://192.168.0.96:8090/demo/rdm.html#/st?=
 =?UTF-8?q?ory-detail/939050947543040/939050947543042/1040591163457536?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/citype/citype-manage.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/pages/cmdb/citype/citype-manage.vue b/src/views/pages/cmdb/citype/citype-manage.vue
index 89a8ff46..802991bd 100644
--- a/src/views/pages/cmdb/citype/citype-manage.vue
+++ b/src/views/pages/cmdb/citype/citype-manage.vue
@@ -92,10 +92,9 @@ export default {
     isShow: { type: Boolean }
   },
   data() {
-    const _this = this;
     return {
       dialogConfig: {
-        title: this.$t('dialog.title.edittarget', { target: this.$t('page.type') }),
+        title: this.$t('dialog.title.edittarget', { target: this.$t('term.cmdb.cilevel') }),
         type: 'modal',
         maskClose: false,
         isShow: true,
-- 
Gitee