diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue
index ca1a5b495..e8f10b43c 100644
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -232,52 +232,52 @@ export default {
           label: 'ID',
           prop: 'id',
           show: true,
-          width: 80
-        }, {
+          width: 160,
+          sortable: 'custom'
+        },{
           label: this.$t('alert.alertName'),
           prop: 'alertRule',
           show: true,
-        }, /* {
-          label: this.$t("alert.list.type"),
-          prop: 'type',
-          show: true,
-          width: 100
         }, {
-          label: this.$t("alert.list.linked"),
-          prop: 'linkObject',
-          show: true,
-          width: 140
-        }, */{
           label: this.$t('alert.list.labels'),
           prop: 'labels',
           show: true,
-          width: 300
+          NotSet: true,
+          minWidth: 250,
+          sortable: 'custom'
         }, {
           label: this.$t('alert.severity'),
-          prop: 'severity',
+          prop: 'severityId',
           show: true,
-          width: 100
+          width: 110,
+          sortable: 'custom'
         }, {
           label: this.$t('alert.summary'),
           prop: 'summary',
           show: true,
-          width: 200
+          minWidth: 200
         }, {
           label: this.$t('overall.remark'),
           prop: 'description',
           show: true,
-          width: 200
+          minWidth: 200
         }, {
           label: this.$t('alert.list.state'),
           prop: 'state',
           show: true,
           width: 100
-        }, {
+        },{
           label: this.$t('alert.startAt'),
           prop: 'startAt',
           show: true,
-          width: 160
+          width: 150,
+          sortable: 'custom'
         }, {
+          label: this.$t('config.terminallog.duration'),
+          prop: 'duration',
+          show: true,
+          width: 150
+        },{
           label: this.$t('alert.endAt'),
           prop: 'endAt',
           show: true,
@@ -328,6 +328,14 @@ export default {
       deep: true,
       immediate: true,
       handler (n, o) {
+        if (n.id) {
+          if (!n.param.state && n.param.state != Number) {
+            n.param.state = "1"
+          }
+          if (n.param.severity && n.param.severity != Number) {
+            n.param.severity = 1
+          }
+        }
         this.data = Object.assign({}, n)
       }
     },
@@ -700,7 +708,7 @@ export default {
       this.getAlerScreetList()
     },
     promQueryParamConvert (obj) {
-      let r = '(' + obj.alertRule.expr + ')'
+      let r = '(' + obj.alertRule.expr.replace(/\"/g, '\'') + ')'
       let intoLabels = false
       obj.labels = JSON.parse(obj.labels)
       if (Object.keys(obj.labels).length > 0) {
diff --git a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue
index 43460c3ac..36e3fe39f 100644
--- a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue
+++ b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue
@@ -130,6 +130,12 @@ export default {
   justify-content: space-between;
   width: calc(100% - 28px);
 }
+.tree--node span:nth-of-type(1) {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  word-break: break-word;
+}
 .tree--operation {
   opacity: 0;
 }
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index c1e2e7322..1daca168a 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -64,7 +64,7 @@
                 </span>
               </el-option>
             </el-select>
-            <i v-if="editAlertRule.severityId" :style="{color:severityData.find(severity => severity.id ===  editAlertRule.severityId).color,'font-size':'12px'}" class="nz-icon nz-icon-circle severity-circle"></i>
+            <i v-if="editAlertRule.severityId" :style="{color:severityData.length > 0 && severityData.find(severity => severity.id ===  editAlertRule.severityId).color,'font-size':'12px'}" class="nz-icon nz-icon-circle severity-circle"></i>
           </el-form-item>
           <!--receiver-->
           <el-form-item :label="$t('config.user.receiver')" prop="receiver">
diff --git a/nezha-fronted/src/components/page/dashboard/alertChartParam.vue b/nezha-fronted/src/components/page/dashboard/alertChartParam.vue
index 78b407845..a8d6600d0 100644
--- a/nezha-fronted/src/components/page/dashboard/alertChartParam.vue
+++ b/nezha-fronted/src/components/page/dashboard/alertChartParam.vue
@@ -23,7 +23,7 @@
               </span>
           </el-option>
         </el-select>
-        <i class="nz-icon nz-icon-circle severity-circle" v-if="parameters.level" :style="{color:alertPriority.find(severity => severity.id ===  parameters.level).color,'font-size':'12px'}"></i>
+        <i class="nz-icon nz-icon-circle severity-circle" v-if="parameters.level" :style="{color: alertPriority.length > 0 && alertPriority.find(severity => severity.id ===  parameters.level).color,'font-size':'12px'}"></i>
       </el-form-item>
       <el-form-item :label="$t('dashboard.panel.chartForm.alertParam.state')">
         <el-select class="form-item" size="small" popper-class="alert-form-pop no-style-class" v-model="parameters.state" clearable id="alert-param-state">
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 4091fcc6b..b663fa504 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -1761,7 +1761,13 @@ export default {
       immediate: true,
       handler (n) {
         if (n.id) {
-          this.isEdit = true
+          this.isEdit = true;
+          if (!n.param.state && n.param.state != Number) {
+            n.param.state = "1"
+          }
+          if (n.param.severity && n.param.severity != Number) {
+            n.param.severity = 1
+          }
         }
         if ((n.param && n.param.valueMapping) && (n.type === 'singleStat' || n.type === 'table')) {
           n.param.valueMapping.mapping.forEach(item => {