diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index beee6313f..b3d4a4f02 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -370,7 +370,8 @@ const en = {
},
dc: {
dc: 'Datacenter',
-
+ area: "Area",
+ cabinetNum: "Cabinet number"
}
},
alert: {
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue
index b1f855dc6..d1aa3d465 100644
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -29,6 +29,25 @@
{{dc.location}}
+
+
+ {{dc.tel}}
+
+
+
+
+ {{item.username}}
+
+
+
+ {{dc.tel}}
+
+
+
+
+
@@ -51,7 +70,8 @@
export default {
name: "dcBox",
props: {
- dc: Object
+ dc: Object,
+ userData: Array
},
data() {
return {
@@ -66,7 +86,97 @@
{validator: noSpecialChar,trigger: "change"}
],
},
- projectList: [],
+ areaData: [],
+ data: {
+ code: 200,
+ msg: "success",
+ data: {
+ list: [{
+ id: 1,
+ pid: 0,
+ name: "astana",
+ longitude: 100.3,
+ latitude: 24.3,
+ i18n:{en:'astana',cn:'阿斯塔纳'},
+ children: [{
+ id: 2,
+ pid: 1,
+ name: "qu",
+ longitude: 100.3,
+ latitude: 24.3,
+ i18n:{en:'qu',cn:'阿斯塔纳一个区'},
+ children: [{
+ id: 3,
+ pid: 2,
+ name: "qu2",
+ longitude: 100.3,
+ latitude: 24.3,
+ i18n:{en:'qu2',cn:'阿斯塔纳二个区'}}
+ ]
+ }, {
+ id: 4,
+ pid: 0,
+ name: "alamutu",
+ longitude: 100.3,
+ latitude: 24.3,
+ i18n:{en:'alamutu',cn:'阿拉木图'},
+ children: [{
+ id: 5,
+ pid: 4,
+ name: "qu3",
+ longitude: 100.3,
+ latitude: 24.3,
+ i18n: {en: 'qu3', cn: '阿拉木图一个区'}
+ }]
+ }]
+ }]
+ }
+ },
+ data2: [{
+ id: 1,
+ label: '一级 1',
+ children: [{
+ id: 4,
+ label: '二级 1-1',
+ children: [{
+ id: 9,
+ label: '三级 1-1-1'
+ }, {
+ id: 10,
+ label: '三级 1-1-2'
+ }]
+ }]
+ }, {
+ id: 2,
+ label: '一级 2',
+ children: [{
+ id: 5,
+ label: '二级 2-1'
+ }, {
+ id: 6,
+ label: '二级 2-2'
+ }]
+ }, {
+ id: 3,
+ label: '一级 3',
+ children: [{
+ id: 7,
+ label: '二级 3-1'
+ }, {
+ id: 8,
+ label: '二级 3-2',
+ children: [{
+ id: 11,
+ label: '三级 3-2-1'
+ }, {
+ id: 12,
+ label: '三级 3-2-2'
+ }, {
+ id: 13,
+ label: '三级 3-2-3'
+ }]
+ }]
+ }],
}
},
methods: {
@@ -135,8 +245,24 @@
});
});
},
+ getAreaData() {
+ this.areaData = this.toTreeData(this.data);
+
+ /*this.$get('area', {}).then(response => {
+ if (response.code === 200) {
+ let rawData = response.data.list;
+ //将原始数据处理为el-tree格式
+
+ }
+ });*/
+ },
+ toTreeData(rawData) {
+
+ return rawData;
+ }
},
- created() {
+ mounted() {
+ this.getAreaData();
},
computed: {
},
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 8bf81e0c4..76d1deb0b 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -54,12 +54,17 @@
-
+
{{item.username}}
- {{scope.row[item.prop]}}
+
+ {{scope.row.area.name}}
+ -
+
+ {{scope.row[item.prop]}}
+ -
@@ -81,12 +86,12 @@
ref="elementset"
>
-
+