接口更新

event_analysis/views.py

@@ -2150,15 +2150,26 @@ def search_user_group(request):
         group_user_list = []
         group_system_list = []
         for i in gruop_data:
-            newdic = {}
-            newdic['label'] = i[u'名称']
-            newdic['value'] = i[u'名称']
-            group_list.append(newdic)
+            groupDic = {}
+            groupDic['label'] = i[u'名称']
+            groupDic['value'] = i[u'名称']
+            group_list.append(groupDic)
+            for j in i['relationshipInstance']:
+                if j['ralationshipModule'] == u'支持人员':
+                    userDic = {'group_name': i[u'名称'],'group_user': []}
+                    for user in j['relationshipInstance']:
+                        userDic['group_user'].append(user[u'名称'])
+                    group_user_list.append(userDic)
+                elif j['ralationshipModule'] == u'应用子系统':
+                    systemDic = {'group_name': i[u'名称'],'group_system': []}
+                    for system in j['relationshipInstance']:
+                        systemDic['group_system'].append(system[u'名称'])
+                    group_system_list.append(systemDic)
         return render_json({
             "result": True,
             "code": 0,
             "message": u"搜索成功",
-            "data": {'group_list':group_list}
+            "data": {'group_list':group_list, 'group_user_list':group_user_list,'group_system_list':group_system_list}
         })
     except Exception as e:
         return render_json(

templates/event_analysis/error_alarm.html

@@ -58,7 +58,7 @@
                                         <el-col :span="8">
                                             <el-form-item label="预警系统:" label-width="100px"
                                                           style="display:inline-block;width:100%;">
-                                                <el-select style="min-width:150px;width:80%;" clearable
+                                                <el-select style="min-width:150px;width:80%;" clearable filterable
                                                            v-model="formLine.alarm_system">
                                                     <el-option v-for="item in systemList"
                                                                :key="item.value"