Merge branch 'master' of https://git.zorkdata.com/cuiyixiong/event-analysis

templates/event_analysis/error_alarm.html

@@ -36,6 +36,7 @@
                                                 <el-date-picker
                                                         v-model="formLine.dateoutinfo"
                                                         type="daterange"
+                                                        value-format="yyyy-MM-dd"
                                                         style="width:80%;min-width:150px;"
                                                         start-placeholder="开始日期"
                                                         end-placeholder="结束日期">
@@ -100,12 +101,10 @@
                                   element-loading-text="拼命加载中"
                                   element-loading-spinner="el-icon-loading"
                                   element-loading-background="rgba(0, 0, 0, 0.8)"
-                                  ref="table" @select="handleSelectionChange"
-                                  @select-all="handleSelectionChange"
+                                  ref="table"
                                   stripe.2
                                   :header-cell-style="{background:'#409EFF',color:'white'}">
 
-                            <el-table-column type="selection" width="50"></el-table-column>
                             <el-table-column width="300" prop="alarm_number" label="预警编号" header-align="center"
                                              align="left"></el-table-column>
                             <el-table-column prop="alarm_summary" label="故障预警摘要" header-align="center" align="left"
@@ -231,7 +230,7 @@
                             <div style="line-height: 50px ;">
                                 <template>
                                     <el-table :data="gridData" style="width:100%"
-                                              @select="handleSelectionChange"
+                                              @selection-change="handleSelectionChange"
                                               max-height="300">
                                         <el-table-column type="selection" width="30"></el-table-column>
                                         <el-table-column fixed prop="alarm_title" label="告警标题" width="300"
@@ -395,10 +394,9 @@
                 })
             },
             handleSelectionChange(selection) {
-                    //this.selectData[this.currentPage] = [];
-                    selection.map((item, index) => {
-                        this.selectData.push(item.alarm_title)
-                    })
+
+                 this.selectData =selection
+
                 },
             createAlarmByIcube(){
                 let alarmList = [];
@@ -546,16 +544,7 @@
             window.location.href = "${SITE_URL}event_edit"
         })
     }
-    ,
 
-
-    handleSelectionChange(selection)
-    {
-        this.selectData[this.currentPage] = [];
-        selection.map((item, index) => {
-            this.selectData[this.currentPage].push(item.event_number)
-        })
-    }
     ,
 
     handleCurPageChange()