Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

# Conflicts:
#	nezha-fronted/src/components/page/alert/alertMessage.vue

nezha-fronted/src/components/page/alert/alertMessage.vue

@@ -39,6 +39,7 @@
           @del="del"
           @edit="edit"
           @orderBy="tableDataSort"
+          @queryMessage='queryMessage'
           @reload="getTableData"
           @selectionChange="selectionChange"
           @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"
@@ -268,6 +269,12 @@ export default {
         this.queryChartDate()
       })
     },
+    queryMessage (alertMessage) {
+      if (!this.hasButton('alertMessage_view')) {
+        return
+      }
+      this.$refs.dataList.showBottomBox(alertMessage, alertRule)
+    },
     queryChartDate () {
       const $temp = this
       const start = this.searchTime[0] ? this.searchTime[0] : getTime(-1, 'h')
@@ -398,7 +405,6 @@ export default {
         delete this.searchLabel.endAt
       }
       this.$get(this.url + '?state=' + ii, this.searchLabel).then(response => {
-        console.log(this.searchLabel)
         this.tools.loading = false
         if (response.code == 200) {
           this.nowTime = this.utcTimeToTimezoneStr(response.time)