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

日志视图列表页内容列添加tooltip，提示超出5行省略，时间排序字段scopeBy的值更改为dbTimeStr.keyword #5



See merge request !550

@@ -55,7 +55,14 @@
               <span class="resName-span" style="cursor: pointer;color:#1e9fff" @click="goResDetail(row.resId,row.resName,row.resType)">{{row.resName}}</span>
           </div>
           <div v-if="prop == 'message'" >
+            <el-tooltip >
+              <template #content>
+                <div style="max-width:400px;overflow: hidden;	text-overflow: ellipsis;display: -webkit-box;	-webkit-line-clamp: 5;	-webkit-box-orient: vertical;">
+                  {{row.message}}
+                </div>
+              </template>
               <div v-html="row.message" style="overflow: hidden;	text-overflow: ellipsis;display: -webkit-box;	-webkit-line-clamp: 1;	-webkit-box-orient: vertical;"></div>
+            </el-tooltip>
           </div>
         </template>
         <template #tools="{scope}">

@@ -14,7 +14,7 @@ export default {
         let search = Vue.ref({
             program:'',
             sortBy:'dbTime',
-            scopeBy:'dbTime',
+            scopeBy:'dbTimeStr.keyword',
             keyword: '',
             type:'syslog',
             pageNum: 1,
@@ -109,12 +109,12 @@ export default {
         // 获取列表
         let getDataList = () => {
             let nowDate=getDateTime(new Date());
-            let startTime=search.value.dateTime[0]?search.value.dateTime[0]:'';
-            let endTime=search.value.dateTime[1]?search.value.dateTime[1]:'';
+            let startTime=(search.value.dateTime && search.value.dateTime[0])?search.value.dateTime[0]:'';
+            let endTime=(search.value.dateTime && search.value.dateTime[1])?search.value.dateTime[1]:'';
             let startDateStr=startTime?startTime.split(' ')[0]:'';
             let endDateStr=endTime?endTime.split(' ')[0]:'';
             let dateStr='';
-            if(search.value.dateTime.length>0){
+            if(search.value.dateTime && search.value.dateTime.length>0){
                 if(startDateStr!=endDateStr){
                     dateStr='log-syslog-search';
                 }else{
@@ -135,11 +135,11 @@ export default {
                 startTime:startTime,
                 endTime: endTime,
                 resType:search.value.resType,
-                program:search.value.program,
                 param:{
                     'resName.keyword': search.value.keyword,
                     'host.keyword':search.value.keyword,
                     'message.keyword':search.value.keyword,
+                    'program.keyword':search.value.program,
                 }
             }
              proxy.$http.post(`/api-web/esData/list`, params, function (res) {