diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 5e3dd593a..4fa310488 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -178,7 +178,7 @@
     </div>
     <!--删除弹窗-->
     <div class="export-xlsx">
-      <el-dialog :visible.sync="deleteBox.show" :title="$t('alert.list.remark')" :modal-append-to-body='false' :show-close="true" width="450px"  @close="closeDialog" class="nz-message">
+      <el-dialog :visible.sync="deleteBox.show" :title="$t('alert.list.remark')" :modal-append-to-body='false' :show-close="true" width="450px"  @close="closeDialog" class="nz-message" @opened="openedDialog">
         <div class="upload-body">
           <el-form ref="remarkForm" :model="deleteBox">
             <el-form-item prop="remark" :rules="[{required:true,message: $t('validate.required'), trigger: 'change'}]">
@@ -656,6 +656,9 @@
       showExportDialog() {
         this.importBox.show = true;
       },
+      openedDialog(){
+        this.$refs.remarkForm.clearValidate()
+      },
       closeDialog() {
         this.importBox.show = false;
         this.deleteBox.show = false;
diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index 7c7ca221f..065f2c81b 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -219,7 +219,7 @@
           id: '',
           sn: '',
           host: '',
-          state: '',
+          state: 1,
           purchaseDate: '',
           idcId: '',
           cabinetId: '',
@@ -234,15 +234,16 @@
           accounts: [],
         },
         editAlertRule: {
-          id: "",
+          id: '',
           alertName: '',
-          type: '',
+          linkObject: {id: '', name: ''},
           expr: '',
-          last: '',
-          severity: '',
+          unit:2,
+          operator: '>',
+          last: 60,
+          severity: 'P2',
           summary: '',
           description: '',
-          receiver: '',
         },
         createMenu: [ //新增按钮内容
           {
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue
index 626d70253..f5f54a6ba 100644
--- a/nezha-fronted/src/components/common/rightBox/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue
@@ -468,7 +468,7 @@
       },
       getDcData() {
         return new Promise(resolve => {
-          this.$get('idc').then(response => {
+          this.$get('idc?pageSize=-1').then(response => {
             if (response.code === 200) {
               this.dcData = response.data.list;
             }
@@ -504,6 +504,9 @@
           this.$get('sys/dict/all?type=assetType&pageSize=-1').then(response => {
             if (response.code === 200) {
               this.assetTypeData = response.data;
+              if(this.editAsset.model&&!this.editAsset.model.type.code){
+                this.editAsset.model.type.code=response.data[0].value;
+              }
             }
             resolve(this.assetTypeData);
           });
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 63a7d974f..83fe985e4 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -243,7 +243,7 @@
           id: '',
           sn: '',
           host: '',
-          state: '',
+          state: 1,
           purchaseDate: '',
           idcId: '',
           cabinetId: '',
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 6d18cfc00..b28ae0c21 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -1342,11 +1342,12 @@
         }else {
           this.setIsOtherChart();
           if(chartType === 'bar'||chartType === 'line'||chartType === 'stackArea'){
-            this.editChart.param={nullType:this.editChart.param.nullType,threshold:'',legendValue:{min:'off',max:'off',avg:'off',last:'off',total:'off'}}
+            this.editChart.param={nullType:'connected',threshold:'',legendValue:{min:'off',max:'off',avg:'off',last:'off',total:'off'}}
           }else if(chartType == 'table'){
             this.$set(this.editChart.param,'last',0)
             this.editChart.param={
               statistics:'',
+              nullType:'connected',
               valueMapping:{
                 type:'value',
                 mapping:[{text:'',value:'',color:{bac:'#fff',text:'#000'}}]