diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 6c8d5873e..91fdde7bd 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1388,7 +1388,7 @@ li{ .right-box-form>.el-form-item.half-form-item:nth-child(odd){ display: inline-block; width: 395px; - margin-left: 0; + margin-left: 10px; } .right-box-form .one-third-form-item-left{ display: inline-block; @@ -2176,11 +2176,11 @@ li{ color: #0275b8; } .tag-edit-tag{ - width: 100px; + width: 180px; padding: 0 10px; } .tag-edit-value{ - width: calc(100% - 149px); + width: calc(100% - 235px); padding: 0 10px; } .tag-edit-action { @@ -2197,11 +2197,11 @@ li{ padding: 0 10px; } .tag-edit-tag{ - width: 100px; + width: 180px; padding: 0 10px; } .tag-edit-value{ - width: calc(100% - 149px); + width: calc(100% - 235px); padding: 0 10px; } .tag-edit-action { diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 4ebd6f629..78b1db293 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -265,85 +265,16 @@ - - + + + + + + + + +
- -
-
X(px)
-
- -
-
- -
-
Y(px)
-
- -
-
- -
-
{{$t('project.topology.width')}}(px)
-
- -
-
- -
-
{{$t('project.topology.height')}}(px)
-
- -
-
-
{{$t('project.topology.circularBead')}}(0 - 1)
@@ -382,87 +313,6 @@
-
-
{{$t('project.topology.pt')}}(px)
-
- -
-
- -
-
{{$t('project.topology.pb')}}(px)
-
- -
-
- -
-
{{$t('project.topology.pl')}}(px)
-
- -
-
- -
-
{{$t('project.topology.pr')}}(px)
-
- -
-
- -
-
- - -
{{$t('project.topology.bac')}}
diff --git a/nezha-fronted/src/components/common/rightBox/accountBox.vue b/nezha-fronted/src/components/common/rightBox/accountBox.vue index 9720ef1a2..0f8e5857c 100644 --- a/nezha-fronted/src/components/common/rightBox/accountBox.vue +++ b/nezha-fronted/src/components/common/rightBox/accountBox.vue @@ -64,10 +64,10 @@
- + - +
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue index 04bc63563..11488bd5f 100644 --- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue @@ -24,7 +24,7 @@ -
+
{{$t('asset.asset')}}
@@ -1256,7 +1256,7 @@ .endpoint-sub-table { padding-top: 13px; height: calc(100% - 83px); - width: 260px; + width: 320px; } .line-100 { margin-bottom: 3px; diff --git a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue index 8479ee06e..0707e4eb8 100644 --- a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue +++ b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue @@ -172,38 +172,34 @@
- - -
-
-
Tag
-
Value
-
Action
-
-
-
- - - - - - -
-
+ +
+
+
Tag
+
Value
+
Action
+
+
+
+ + + + + + +
+
- @@ -632,7 +628,6 @@ }, save(){ if(this.prevent_opt.save){ return } ; - this.prevent_opt.save=true; if(this.locationInfo){ if(this.locationInfo.idc){ this.editAsset.idcId=this.locationInfo.idc.id; @@ -664,6 +659,7 @@ this.assetSelList.forEach((item)=>{ this.editAsset.assetIds.push(item.id); }); + this.prevent_opt.save=true; this.$put('/asset/batch',this.editAsset).then(res=>{ this.prevent_opt.save=false; if(res.code===200){ @@ -674,6 +670,7 @@ } }); }else{ + console.log(213123123123); this.prevent_opt.save=false; return false; } diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index a0a450cc7..7f566e4fa 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -21,7 +21,7 @@ - + diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index f2f1d7b36..be8be6e95 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -1,6 +1,6 @@