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

templates/event_analysis/alarm_count.html

@@ -49,7 +49,8 @@
                             <el-table-column prop="normal_work" label="次要故障预警数（交易日）" align="center"></el-table-column>
                             <el-table-column prop="bad_weekend" label="严重故障预警数（非交易日）" align="center"></el-table-column>
                             <el-table-column prop="main_weekend" label="主要故障预警数（非交易日）" align="center"></el-table-column>
-                            <el-table-column prop="normal_weekend" label="次要故障预警数（非交易日）" align="center"></el-table-column>
+                            <el-table-column prop="normal_weekend" label="次要故障预警数（非交易日）"
+                                             align="center"></el-table-column>
                         </el-table>
                     </div>
                     <div class="block" style="height: 50px; margin-top: 15px">
@@ -79,8 +80,8 @@
                 currentPage: 1,
                 pageSize: 10,
                 time: '',
-                total:0,
-                sysGroup:{}
+                total: 0,
+                sysGroup: {}
             }
         },
         mounted() {
@@ -90,16 +91,22 @@
 
 
         methods: {
-            searchList(){
+            searchList() {
                 console.log(this.Group)
                 console.log(this.sysGroup)
                 console.log(this.sysGroup[this.Group])
+                let finallist = []
+                for (let temp of this.sysGroup) {
+                    if (temp.group_name == this.Group) {
+                        finallist = temp.group_system
+                    }
+                }
                 let newdata = {
                     currentPage: this.currentPage,
                     pageSize: this.pageSize,
-                    syslist: this.sysGroup[this.Group]
+                    syslist: finallist
                 };
-                axios.post('${SITE_URL}alarm_count_info/',newdata).then(res => {
+                axios.post('${SITE_URL}alarm_count_info/', newdata).then(res => {
                     this.AlarmCountData = res.data.results;
                     this.total = res.data.count
                 })