diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index 7e14ba2e3..27164c408 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -103,7 +103,7 @@
-
+
@@ -481,9 +481,27 @@ export default {
},
blankLabelValue (label) {
if (label.type.toUpperCase() === this.assetConstants.labelTypeData.CHECKBOX) {
- return []
+ const arr = []
+ if (label.param && JSON.parse(label.param).items) {
+ JSON.parse(label.param).items.forEach(item => {
+ if (item.check) {
+ arr.push(item.name)
+ }
+ })
+ }
+ return arr
} else if (label.type.toUpperCase() === this.assetConstants.labelTypeData.MULTITEXT || label.type.toUpperCase() === assetConstants.labelTypeData.TEXT || label.type.toUpperCase() === assetConstants.labelTypeData.TEXTAREA) {
return ['']
+ } else if (label.type.toUpperCase() === this.assetConstants.labelTypeData.RADIO || label.type.toUpperCase() === assetConstants.labelTypeData.SELECT) {
+ const arr = ['']
+ if (label.param && JSON.parse(label.param).items) {
+ JSON.parse(label.param).items.forEach(item => {
+ if (item.check) {
+ arr[0] = item.name
+ }
+ })
+ }
+ return arr
} else {
return ['']
}
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
index c0a2e7522..ad2c0183e 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -279,6 +279,7 @@ export default {
t.disabled = false
})
}
+ this.selectType(this.editAssetMeta.type, false)
},
clickOutside () {
this.esc(false)
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 8f2e1fb0a..3f4abf167 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -60,7 +60,14 @@
{{scope.row.parent ? scope.row.parent.name : '-'}}
{{scope.row.brand ? scope.row.brand.name : '-'}}
{{scope.row.purchaseDate ? scope.row.purchaseDate : '--'}}
- {{scope.row[item.prop]}}
+
+
+ {{scope.row.fields.find(field => field.name === item.prop).value.join(',')}}
+
+
+ {{scope.row[item.prop]}}
+
+
{statusChange(scope.row)}"
+ @change="(val)=>{$emit('statusChange', scope.row)}"
/>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 117ca2a8e..e16442cdb 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -362,7 +362,7 @@ export default {
const data = []
const searchableData = response.data.list.filter(d => d.search === 1)
const showData = response.data.list.filter(d => d.display === 1).map(item => {
- return { label: item.name, prop: 'Label', show: false, allowed: true, type: 'label' }
+ return { label: item.name, prop: item.name, show: false, allowed: true, type: 'label' }
})
searchableData.forEach(m => {
if (m.param) {
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index e7b70fd68..65f3f72ff 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -29,6 +29,7 @@
@orderBy="tableDataSort"
@reload="getTableData"
@selectionChange="selectionChange"
+ @statusChange='statusChange'
@showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }">
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index a71429815..d5ace87c2 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -248,7 +248,7 @@