Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

日志视图列表页搜索条件keword没有数据时param参数中不添加



See merge request !551

@@ -135,24 +135,23 @@ export default {
                 startTime:startTime,
                 startTime:startTime,
                 endTime: endTime,
                 endTime: endTime,
                 resType:search.value.resType,
                 resType:search.value.resType,
-                param:{
+                param:{}
+            }
+            if(search.value.keyword){
+                params.param={
                     'resName.keyword': search.value.keyword,
                     'resName.keyword': search.value.keyword,
                     'host.keyword':search.value.keyword,
                     'host.keyword':search.value.keyword,
                     'message.keyword':search.value.keyword,
                     'message.keyword':search.value.keyword,
-                    'program.keyword':search.value.program,
                 }
                 }
             }
             }
+            if(search.value.program){
+                    params['param']['program.keyword']=search.value.program;
+            }
              proxy.$http.post(`/api-web/esData/list`, params, function (res) {
              proxy.$http.post(`/api-web/esData/list`, params, function (res) {
                  if (res && res.object) {
                  if (res && res.object) {
                      let dataList=res.object.content;
                      let dataList=res.object.content;
                      let arr=[];
                      let arr=[];
                      dataList.map(item=>{
                      dataList.map(item=>{
-                       /*  for(let key in item[0]){
-                             if(key=='timestamp'){
-                                 console.log("item[0]['timestamp']",item[0]['timestamp'])
-                                 item[0]['timestampStr']=getDateTime(item[0]['timestamp'])
-                             }
-                         }*/
                          arr.push(item[0])
                          arr.push(item[0])
                      })
                      })
                      tableData.value.dataList = arr;
                      tableData.value.dataList = arr;