diff --git a/cmdb-ui/package.json b/cmdb-ui/package.json
index 2c0115d..603129a 100644
--- a/cmdb-ui/package.json
+++ b/cmdb-ui/package.json
@@ -59,7 +59,7 @@
"vue-template-compiler": "2.6.11",
"vuedraggable": "^2.23.0",
"vuex": "^3.1.1",
- "vxe-table": "3.6.9",
+ "vxe-table": "3.7.10",
"vxe-table-plugin-export-xlsx": "2.0.0",
"xe-utils": "3",
"xlsx": "0.15.0",
diff --git a/cmdb-ui/src/modules/cmdb/components/httpSnmpAD/httpADCategory.vue b/cmdb-ui/src/modules/cmdb/components/httpSnmpAD/httpADCategory.vue
index 1819461..553b0f7 100644
--- a/cmdb-ui/src/modules/cmdb/components/httpSnmpAD/httpADCategory.vue
+++ b/cmdb-ui/src/modules/cmdb/components/httpSnmpAD/httpADCategory.vue
@@ -214,10 +214,10 @@ export default {
}
}
}
+ }
- .corporate-tip {
- margin-top: 20px;
- }
+ .corporate-tip {
+ margin-top: 20px;
}
}
diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js
index 17bfcd1..54d54d3 100644
--- a/cmdb-ui/src/modules/cmdb/lang/en.js
+++ b/cmdb-ui/src/modules/cmdb/lang/en.js
@@ -243,6 +243,7 @@ const cmdb_en = {
relationADTip2: 'When an auto-discovered attribute matches an associated model attribute, the two instance models are automatically associated',
relationADTip3: 'If the value of the auto-discovered attribute is a list, multiple relationships are established with the association model',
deleteRelationAdTip: 'Cannot be deleted again',
+ cronTips: 'The format is the same as crontab, for example: 0 15 * * 1-5',
},
components: {
unselectAttributes: 'Unselected',
diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js
index c0c26c3..db45822 100644
--- a/cmdb-ui/src/modules/cmdb/lang/zh.js
+++ b/cmdb-ui/src/modules/cmdb/lang/zh.js
@@ -243,6 +243,7 @@ const cmdb_zh = {
relationADTip2: '当自动发现属性与关联模型属性一致时,两实例模型则自动关联',
relationADTip3: '如果自动发现的属性值是列表,则会和关联模型建立多个关系',
deleteRelationAdTip: '不可再删除',
+ cronTips: '格式同crontab, 例如:0 15 * * 1-5',
},
components: {
unselectAttributes: '未选属性',
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
index 0c1b790..ca278c6 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
@@ -98,7 +98,7 @@
diff --git a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue
index e2a1c7e..9b83600 100644
--- a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue
@@ -339,6 +339,10 @@ export default {
&-text {
margin-top: 20px;
}
+
+ &-img {
+ width: 100px;
+ }
}
}
diff --git a/cmdb-ui/src/modules/cmdb/views/topology_view/index.vue b/cmdb-ui/src/modules/cmdb/views/topology_view/index.vue
index 47fd3f9..085e62f 100644
--- a/cmdb-ui/src/modules/cmdb/views/topology_view/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/topology_view/index.vue
@@ -32,8 +32,11 @@
ghost
@click="handleClickAddGroup"
class="ops-button-ghost"
- >{{ $t('cmdb.ciType.group') }}
+
+ {{ $t('cmdb.ciType.group') }}
+
@@ -56,16 +59,16 @@
{{ $t('cmdb.topo.addTopoViewInGroup') }}
-
+
{{ $t('cmdb.ciType.editGroup') }}
-
+
{{ $t('cmdb.ciType.deleteGroup') }}
-
+