diff --git a/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue b/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
index 17441a861..e2dfbd793 100644
--- a/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
+++ b/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
@@ -54,8 +54,8 @@
{searchStrChange(val,key)}" suffix-icon="el-icon-search"/>
- {{item3.name}}
- {{item4.name}}
+
+ {{item3.name+'/'+item4.name}}
@@ -128,7 +128,7 @@ export default {
const arr = label.split('-')
const obj = oldChildren.find(item => item.id == arr[0])
const children = obj.children.find(item => item.id == arr[1])
- return children.name
+ return obj.name + '/' + children.name
},
showDropDown (val, key) {
this.searchStr = this.detailSearchListCopy[key].searchStr
@@ -166,24 +166,24 @@ export default {
border-radius: 2px;
}
.search-detail-box:hover{
- background-color: rgba(9,30,66,.13);
+ background: #F9F9F9;
}
.search-detail-box.select-dropdown{
- background-color: rgba(9,30,66,.13);
- }
- .search-detail-box.show-my-dropdpwn{
- background-color: #344563;
- color: #fff;
- .search-detail-title{
- color: #fff;
- }
- .detail-top-search{
- color: #fff;
- }
- .search-value{
- color: #fff;
- }
+ background: #F9F9F9;
}
+ /*.search-detail-box.show-my-dropdpwn{*/
+ /* background-color: #344563;*/
+ /* color: #fff;*/
+ /* .search-detail-title{*/
+ /* color: #fff;*/
+ /* }*/
+ /* .detail-top-search{*/
+ /* color: #fff;*/
+ /* }*/
+ /* .search-value{*/
+ /* color: #fff;*/
+ /* }*/
+ /*}*/
.detail-dropdown{
padding: 0 10px;
height: 30px;
diff --git a/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue b/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
index 4fd1e8568..d30c41cda 100644
--- a/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
@@ -11,10 +11,10 @@
{{item.label}}
-
+
+
-
@@ -157,44 +157,44 @@ export default {
padding: 0 15px;
line-height: 40px;
align-items: center;
- .detail-select{
- height: 30px;
- line-height: 30px;
- flex: 1;
- /deep/ .el-input--small{
- height: 30px;
- line-height: 30px;
- background-color: rgba(9,30,66,0.08);
- border: none;
- color: #344563;
- input{
- height: 30px;
- line-height: 30px;
- background-color: rgba(9,30,66,0.08);
- border: none;
- color: #344563;
- }
- }
- }
- .detail-select:hover{
- /deep/ .el-input--small{
- input{
- background-color: rgba(9,30,66,0.13);
- }
- }
- }
- .detail-button{
- height: 28px;
- line-height: 28px;
- background-color: rgba(9,30,66,0.08);
- border: none;
- .nz-icon{
- color: #344563;
- }
- }
- .detail-button:hover{
- background-color: rgba(9,30,66,0.13);
- }
+ /*.detail-select{*/
+ /* height: 30px;*/
+ /* line-height: 30px;*/
+ /* flex: 1;*/
+ /* /deep/ .el-input--small{*/
+ /* height: 30px;*/
+ /* line-height: 30px;*/
+ /* background-color: rgba(9,30,66,0.08);*/
+ /* border: none;*/
+ /* color: #344563;*/
+ /* input{*/
+ /* height: 30px;*/
+ /* line-height: 30px;*/
+ /* background-color: rgba(9,30,66,0.08);*/
+ /* border: none;*/
+ /* color: #344563;*/
+ /* }*/
+ /* }*/
+ /*}*/
+ /*.detail-select:hover{*/
+ /* /deep/ .el-input--small{*/
+ /* input{*/
+ /* background-color: rgba(9,30,66,0.13);*/
+ /* }*/
+ /* }*/
+ /*}*/
+ /*.detail-button{*/
+ /* height: 28px;*/
+ /* line-height: 28px;*/
+ /* background-color: rgba(9,30,66,0.08);*/
+ /* border: none;*/
+ /* .nz-icon{*/
+ /* color: #344563;*/
+ /* }*/
+ /*}*/
+ /*.detail-button:hover{*/
+ /* background-color: rgba(9,30,66,0.13);*/
+ /*}*/
}
.detail-row-box{
height: calc(100% - 40px);
diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
index cd1b9af5b..bdef24de8 100644
--- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
+++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
@@ -1,7 +1,7 @@
-
+
{{data.label}}:
@@ -365,7 +365,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
- padding: 15px 0 15px 17px;
+ /*padding: 15px 0 15px 17px;*/
box-sizing: border-box;
border: 1px solid $--right-box-border-color;
background-color: #FFFFFF;
@@ -373,16 +373,17 @@ export default {
overflow-y: auto;
}
.search-title {
- position: absolute;
width: 130px;
- top: 7px;
- left: 0;
- line-height: 18px;
font-size: 14px;
color: #666666;
letter-spacing: 0;
- font-weight: 500;
+ font-weight: 600;
overflow: hidden;
+ height: 100%;
+ line-height: 40px;
+ padding-left: 20px;
+ box-sizing: border-box;
+ background: #F9F9F9;
}
.search-content-box--copy {
position: fixed;
@@ -392,13 +393,16 @@ export default {
min-height: 31px;
}
.search-content-box,.search-content-box-height {
+ border-bottom: 1px solid $--primary-border-color;
+ flex: 1;
display: flex;
align-items: center;
flex-wrap: wrap;
position: relative;
- padding: 5px 80px 5px 130px;
- width: calc(100vw - 333px);
+ padding: 0px 80px 0px 0px;
box-sizing: border-box;
+ height: 100%;
+ /*line-height: 40px;*/
/deep/ .el-checkbox__label {
max-width: 150px;
@@ -408,11 +412,15 @@ export default {
vertical-align: text-bottom;
}
}
+.search-content-box:last-of-type{
+ border-bottom: none;
+}
.search-items {
display: flex;
- width: 100%;
+ flex: 1;
flex-wrap: wrap;
-
+ box-sizing: border-box;
+ line-height: 40px;
&.search-items--checkbox .el-skeleton {
height: 21px;
}
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index e76029822..9694daa7b 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -719,7 +719,7 @@ const en = {
pingInfo: 'Ping',
detail: {
list: 'List',
- detail: 'Detail',
+ detail: 'View',
orderBy: 'OrderBy',
orderByLabel: 'Order by {label}'
}
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index f21d3b482..e80de69d7 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -78,7 +78,7 @@