diff --git a/.gitignore b/.gitignore
index 0c8b97f4b..5b014fbc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ nezha-fronted/src/components/page/dashboard/testData.js
nezha-fronted/src/components/common/rightBox/tempRoghtBox.vue
nezha-fronted/exportHtml/
nezha-fronted/src/a.txt
+nezha-fronted/src/components/common/testTopology.vue
diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 71cf0b754..78d2ab60c 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -504,7 +504,9 @@ textarea {
display: none !important;
}
.alert-rule-info-two{
+ padding: 10px 10px 10px 5px;
.alert-label-box{
+ margin-bottom: 25px;
.alert-label-title{
margin-right: 30px;
}
diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
index ed831067e..9414acb42 100644
--- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
@@ -291,6 +291,9 @@
#alert .name-labe {
display: none;
}
+ #alert .asset-manage-ip{
+ visibility: hidden !important;
+ }
.el-timeline {
.el-timeline-item {
.el-timeline-item__wrapper {
diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertStateInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertStateInfo.scss
index 6f22fac22..32148b942 100644
--- a/nezha-fronted/src/assets/css/components/common/alert/alertStateInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/alert/alertStateInfo.scss
@@ -25,6 +25,7 @@
display: flex;
flex-direction: row;
align-items: center;
+ margin-left: 5px;
}
.alert-label-value{
height: 26px;
diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss
index fa9a5445b..c7eea435c 100644
--- a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss
@@ -179,6 +179,10 @@
.form-row-item .nz-icon-minus-position {
right: 6px;
+ .nz-icon-copy{
+ text-align: center;
+ padding-top: 1.5px;
+ }
}
}
diff --git a/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss b/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss
index 13460d62a..39d86756c 100644
--- a/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss
+++ b/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss
@@ -34,7 +34,7 @@
margin-right: 12px;
}
.schedEnableTitle .week-item {
- width: 32px;
+ width: 35px;
height: 22px;
line-height: 22px;
opacity: 0.9;
@@ -50,3 +50,6 @@
margin-bottom: 6px;
text-align: center;
}
+.schedEnableTitle .week-item:nth-of-type(4){
+ margin-right: 0px !important;
+}
diff --git a/nezha-fronted/src/assets/css/components/layout/home.scss b/nezha-fronted/src/assets/css/components/layout/home.scss
index e814d7908..4e87f0af1 100644
--- a/nezha-fronted/src/assets/css/components/layout/home.scss
+++ b/nezha-fronted/src/assets/css/components/layout/home.scss
@@ -21,6 +21,11 @@
font-size: 12px;
position: fixed;
}
+.temp-dom--16 {
+ visibility: hidden;
+ font-size: 16px;
+ position: fixed;
+}
.home.tv,.home.se{
.left-menu{
diff --git a/nezha-fronted/src/assets/css/font/iconfont.js b/nezha-fronted/src/assets/css/font/iconfont.js
index 3d1f9837d..c9e12976f 100644
--- a/nezha-fronted/src/assets/css/font/iconfont.js
+++ b/nezha-fronted/src/assets/css/font/iconfont.js
@@ -1 +1 @@
-!function(a){var h,c,l,z,o,i='',v=(v=document.getElementsByTagName("script"))[v.length-1].getAttribute("data-injectcss"),t=function(a,h){h.parentNode.insertBefore(a,h)};if(v&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){o||(o=!0,l())}function p(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}m()}h=function(){var a,h=document.createElement("div");h.innerHTML=i,i=null,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?t(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),h()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(l=h,z=a.document,o=!1,p(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}(window);
\ No newline at end of file
+!function(a){var h,c,l,z,o,i='',v=(v=document.getElementsByTagName("script"))[v.length-1].getAttribute("data-injectcss"),t=function(a,h){h.parentNode.insertBefore(a,h)};if(v&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){o||(o=!0,l())}function p(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}m()}h=function(){var a,h=document.createElement("div");h.innerHTML=i,i=null,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?t(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),h()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(l=h,z=a.document,o=!1,p(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}(window)
diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
index 0b96e814e..703024b07 100644
--- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
+++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
@@ -46,7 +46,7 @@ export default {
this.isInit = false
this.$get('monitor/project', { pageSize: -1 }).then(res => {
this.topologyLoading = true
- const axiosAll = []
+ let axiosAll = []
let temp = []
if (res.data.list.length === 0) {
this.topologyLoading = false
@@ -65,8 +65,10 @@ export default {
res2.forEach(item => {
temp.push(item)
})
+ // temp.push(res2[2])
this.allProject = JSON.parse(JSON.stringify(temp))
temp = null
+ axiosAll = null
this.topologyLoading = false
})
})
@@ -100,7 +102,10 @@ export default {
}
},
mounted () {
-
+ this.queryAllProjectData()
+ },
+ beforeDestroy () {
+ this.allProject = []
}
}
diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index 6ef5c3a24..c791787b5 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -211,6 +211,25 @@ export default {
if (label.indexOf('$value') !== -1) {
value = chartDataFormat.getUnit(column.unit ? column.unit : 2).compute(value, null, -1, 2)
}
+ if (!((typeof value) == 'string' && value.constructor == String)) {
+ let legend = ''
+ if (value.__name__) {
+ legend += `${value.__name__}{`
+ } else {
+ legend += '{'
+ }
+ const tagKeysArr = Object.keys(value)
+ tagKeysArr.forEach(tagKey => {
+ if (tagKey !== '__name__') {
+ legend += `${tagKey}="${value[tagKey]}",`
+ }
+ })
+ if (legend.endsWith(',')) {
+ legend = legend.substr(0, legend.length - 1)
+ }
+ legend += '}'
+ value = legend
+ }
}
return value || ''
})
@@ -238,6 +257,25 @@ export default {
let value = null
if (lodash.get(params, label)) {
value = lodash.get(params, label)
+ if (!((typeof value) == 'string' && value.constructor == String)) {
+ let legend = ''
+ if (value.__name__) {
+ legend += `${value.__name__}{`
+ } else {
+ legend += '{'
+ }
+ const tagKeysArr = Object.keys(value)
+ tagKeysArr.forEach(tagKey => {
+ if (tagKey !== '__name__') {
+ legend += `${tagKey}="${value[tagKey]}",`
+ }
+ })
+ if (legend.endsWith(',')) {
+ legend = legend.substr(0, legend.length - 1)
+ }
+ legend += '}'
+ value = legend
+ }
}
return value || label
})
diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue
index 8c8f665fd..89032338d 100644
--- a/nezha-fronted/src/components/chart/chartHeader.vue
+++ b/nezha-fronted/src/components/chart/chartHeader.vue
@@ -43,9 +43,9 @@