@@ -426,8 +412,6 @@
this.tabSave();
},
jumpTo(data, id) {
- this.$store.state.assetData.moduleData = data;
- this.$store.state.assetData.selectedData = id;
this.$router.push({
path: "/" + data,
query: {
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
new file mode 100644
index 000000000..876277d2d
--- /dev/null
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -0,0 +1,275 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.username}}
+
+
+ {{scope.row[item.prop]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index 939cd98a1..8bda88b87 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -2,22 +2,19 @@
.prom {
height: 100%;
}
-
- .top-tools .top-tool-btn-txt .nz-icon {
- display: inline-block;
- font-size: 12px;
- margin-right: 6px;
- }
-
+
@@ -513,8 +510,6 @@
this.rightBox.show = false;
},
jumpTo(data, id) {
- this.$store.state.assetData.moduleData = data
- this.$store.state.assetData.selectedData = id
this.$router.push({
path: "/" + data,
query: {
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 2dbfb2d86..6d720f309 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -675,12 +675,6 @@
margin-right: 1px;
}
- .top-tools .top-tool-btn-txt .nz-icon {
- display: inline-block;
- font-size: 12px;
- margin-right: 6px;
- }
-
.top-tools {
button {
background: $btn-light-background-color;
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 2a4934481..9435fd102 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -1339,11 +1339,6 @@
.content-right-option .el-icon-view:hover {
color: #409EFF;
}
- .top-tools .top-tool-btn-txt .nz-icon{
- display: inline-block;
- font-size: 12px;
- margin-right:6px;
- }
/* start--param*/
.param-btn {
float: right;
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index 613ded589..c89df02eb 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -32,6 +32,8 @@ import dcConfigBox from "./components/common/popBox/dcConfig"; //idc配置弹框
import panelBox from "./components/common/rightBox/panelBox"; //面板弹框组件
import moduleListPop from "./components/page/asset/moduleListPop"; //面板弹框组件
import cabinetConfigBox from "./components/common/popBox/cabinetConfig"; //面板弹框组件
+import dcBox from "./components/common/rightBox/dcBox"; //dc弹框
+
Vue.component("Pagination", Pagination);
Vue.component("searchInput", searchInput);
@@ -48,6 +50,7 @@ Vue.component("idc-config-box", dcConfigBox);
Vue.component("panel-box", panelBox);
Vue.component("module-list-pop", moduleListPop);
Vue.component("cabinet-config-box", cabinetConfigBox);
+Vue.component("dc-box", dcBox);
Vue.prototype.$axios = axios;
Vue.prototype.$post = post;
diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js
index ae2e751df..a81f935d2 100644
--- a/nezha-fronted/src/router/index.js
+++ b/nezha-fronted/src/router/index.js
@@ -56,6 +56,10 @@ export default new Router({
path: '/promServer',
component: resolve => require(['../components/page/config/promServer.vue'], resolve),
},
+ {
+ path: '/dc',
+ component: resolve => require(['../components/page/config/dc.vue'], resolve),
+ },
{
path: '/alertList',
component: resolve => require(['../components/page/alert/list.vue'], resolve),