fix ： 修改自定义对表头的影响

nezha-fronted/src/components/common/alert/alertMessageTable.vue

@@ -84,7 +84,7 @@
               </span>
           <template v-else-if="item.prop == 'labels'" class="labels">
             <el-tooltip
-              v-for="item in labelsSort(scope.row.labels)"
+              v-for="(item,i) in labelsSort(scope.row.labels)"
               :placement="scope.$index==0?'right-start':(scope.$index==tableData.length-1?'right-end':'right')"
               effect="light"
               :disabled="!(item.label === 'asset' ||item.label === 'module' || item.label === 'project')"
@@ -107,6 +107,7 @@
                        {{item.value}}
                      </nz-alert-tag>
               </span>
+              <p v-if="i%3 == 2" ></p>
             </el-tooltip>
           </template>
           <div v-else-if="item.prop == 'state'">
@@ -274,7 +275,7 @@
             label: this.$t("alert.list.labels"),
             prop: 'labels',
             show: true,
-            width:350,
+            NotSet:true,
           }, {
             label: this.$t("alert.severity"),
             prop: 'severity',

nezha-fronted/src/components/common/elementSet.vue

@@ -3,11 +3,12 @@
     <div class="pop-title">{{$t('overall.select')}}</div>
     <div class="pop-box custom-labels">
       <el-scrollbar style="height: 100%;">
+        <!--NotSet 为true不可设置-->
         <div
           v-for="(item,index) in custom"
           :key="index"
           class="custom-label"
-          :class="!allowedAll && (index==0 || index == 1) ? 'custom-label-disabled' : ''"
+          :class="!allowedAll && (index==0 || index == 1 || item.NotSet) ? 'custom-label-disabled' : ''"
           @click="handler(item,index)"
           :id="'element-set-el-'+index"
         >
@@ -80,7 +81,7 @@ export default {
     //全选all true 或者全取消cancel false按钮
     batchHandler(state) {
       for (let index = 0; index < this.custom.length; index++) {
-        if (index == 0 || index == 1) {
+        if (index == 0 || index == 1 || this.custom[index].NotSet) {
           this.custom[index].show = true;
         } else {
           this.custom[index].show = state;
@@ -89,7 +90,7 @@ export default {
     },
     //单选
     handler(val, index) {
-      if (!this.allowedAll && (index == 0 || index == 1)) {
+      if (!this.allowedAll && (index == 0 || index == 1 || val.NotSet)) {
         this.custom[index].show = true;
       } else {
         this.custom[index].show = !this.custom[index].show;