diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue
index 6b8c8d84a..05fdc5182 100644
--- a/nezha-fronted/src/components/common/project/addLine.vue
+++ b/nezha-fronted/src/components/common/project/addLine.vue
@@ -256,6 +256,7 @@
lineName:n.label,
name:[],
dashes:!n.dashes?n.dashes:JSON.stringify(n.dashes),
+ // dashes:!n.dashes?n.dashes:JSON.stringify([n.dashes[2],n.dashes[2]]),
};
if( n.expressions){
n.expressions.forEach((item,index)=>{
diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue
index 54fa06fba..e3f4ed903 100644
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -466,7 +466,10 @@
float: right;
}
/deep/ .top-tools>div{
- margin-top: 3px;
+ margin-top: 6px;
+ }
+ /deep/.el-tooltip{
+ display: inline-block;
}
/* end--table*/
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index 612fc298b..84fd12231 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -14,6 +14,21 @@
Asset
+
+
+
+
item.prop!=='pingStatus');
}
},
+ search(searchObj) {
+ let orderBy = '';
+ if(this.searchLabel.orderBy){
+ orderBy = this.searchLabel.orderBy
+ }
+ this.searchLabel = {};
+ this.pageObj.pageNo = 1;
+ for (let item in searchObj) {
+ if (searchObj[item]) {
+ this.$set(this.searchLabel, item, searchObj[item]);
+ }
+ }
+ if(orderBy){
+ this.$set(this.searchLabel, 'orderBy', orderBy);
+ }
+ this.getAssetList();
+ },
},
}
@@ -288,6 +354,12 @@
/deep/.resize-box .danger{
background-color: #f9f9f9 !important;
}
+ .top-tools{
+ float: right;
+ }
+ /deep/ .top-tools>div{
+ margin-top: 6px;
+ }
/* end--table*/
diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
index a907dfc59..42ec6e164 100644
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -14,6 +14,21 @@
Endpoint
+
+
+
+
div{
+ margin-top: 6px;
+ }
/* end--table*/
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index ad6f507ee..0dd4e7d25 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -265,14 +265,14 @@
item.from=item.source;
item.to=item.target;
item.label=item.name;
- item.dashes=(item.dashes?(new Array(100).fill(item.dashes[0])):item.dashes);
- if(index%2==0&&item.dashes){
- item.dataFlow='left';
- item.dashes[0]=0;
- item.dashes[1]=0;
- } else if(index%2==1&&item.dashes){
- item.dataFlow='right'
- }
+ // item.dashes=(item.dashes?(new Array(100).fill(item.dashes[0])):item.dashes);
+ // if(index%2==0&&item.dashes){
+ // item.dataFlow='left';
+ // item.dashes[0]=0;
+ // item.dashes[1]=0;
+ // } else if(index%2==1&&item.dashes){
+ // item.dataFlow='right'
+ // }
});
return arr
},