Authored by 鲁尚清

#872 ping详情页调整-表格字段顺序,title名称,图标更换 #2

... ... @@ -3211,7 +3211,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"><i class="iconfont">&#XE515;</i></a>`;
//lsq 2022-04-25 增加ping详情提交按钮
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${resName} data-ip=${ip} data-restypename=${resTypeName} data-adminname=${adminName} lay-tips="原始数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${resName} data-ip=${ip} data-restypename=${resTypeName} data-adminname=${adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
/*
title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
... ... @@ -3236,7 +3236,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"><i class="iconfont">&#XE515;</i></a>`;
//lsq 2022-04-25 增加ping详情提交按钮
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="查看资源ping详情" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
/*
title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
... ... @@ -3513,7 +3513,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
let paramStr='?resId='+$(this).data('id')+'&resName='+$(this).data('resname')+'&resTypeName='+$(this).data('restypename')+'&adminName='+$(this).data('adminname')+'&ip='+$(this).data('ip')
layer.open({
title: ['ping详情', 'font-size:18px;'],
title: ['历史数据', 'font-size:18px;'],
type: 2,
area: ['80%', '90%'],
shadeClose: true,//开启遮罩层
... ...
... ... @@ -38,14 +38,14 @@
责任人
</div>
</template>
{{detail.adminName}}
{{detail.adminName?detail.adminName:''}}
</el-descriptions-item>
</el-descriptions>
</div>
<div class="search">
<div class="condition">
<el-form-item >
<el-input v-model="search.keyword" placeholder="=资源名称、日志内容="></el-input>
<el-input v-model="search.keyword" placeholder="=关键字="></el-input>
</el-form-item>
<el-form-item >
<el-select v-model="search.kpiId" class="m-2" placeholder="指标" clearable @change="kpiChange">
... ... @@ -72,10 +72,10 @@
<el-form-item>
<el-date-picker
v-model="search.dateTime"
type="date"
type="datetime"
placeholder="日期"
end-placeholder="结束时间"
value-format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
... ...
... ... @@ -16,7 +16,7 @@ export default {
let search = Vue.ref({
kpiId:'',
sortBy:'dbTime',
scopeBy:'dbTimeStr.keyword',
scopeBy:'collTime.keyword',
keyword: '',
pageNum: 1,
pageSize: 20,
... ... @@ -41,7 +41,7 @@ export default {
width: '150',
},
{
prop: 'dbTimeStr',
prop: 'dbTime',
label: '入库时间',
sortable: true,
align: 'center',
... ... @@ -54,6 +54,26 @@ export default {
align: 'center',
width: '100'
},
{
prop: 'ext',
label: '扩展信息',
sortable: true,
align: 'center',
width: '260',
render:function (row){
return `<pre>${row.ext}</pre>`
}
}, {
prop: 'message',
label: '备注',
sortable: true,
align: 'center',
width:'500',
render:function (row){
let str=JSON.stringify(JSON.parse(row.message))
return `<pre>${str}</pre>`
}
},
{
prop: 'taskName',
label: '采集任务',
... ... @@ -74,27 +94,7 @@ export default {
sortable: true,
align: 'center',
width: '200'
}, {
prop: 'ext',
label: '扩展信息',
sortable: true,
align: 'center',
width: '260',
render:function (row){
return `<pre>${row.ext}</pre>`
}
}, {
prop: 'message',
label: '异常信息',
sortable: true,
align: 'center',
width:'500',
render:function (row){
let str=JSON.stringify(JSON.parse(row.message))
return `<pre>${str}</pre>`
}
}
},
]
})
let resTypeArr = Vue.ref([]);
... ... @@ -107,7 +107,7 @@ export default {
// getDataList();
}
//获取时间点 转年月日的方法
const getDateTime=(newDate)=>{
const getDateTime=(newDate,flag)=>{
let dateTime='';
let year=newDate.getFullYear();//获取当前年
let month1=(newDate.getMonth()+1)+'';
... ... @@ -116,7 +116,11 @@ export default {
let hours=timeFormat(newDate.getHours()+'');//获取当前时
let minutes=timeFormat(newDate.getMinutes()+'');//获取当前分
let seconds=timeFormat(newDate.getSeconds()+'');//获取当前秒
dateTime= year+'-'+month+'-'+day;//' '+hours+':'+minutes+':'+seconds;
if(flag){
dateTime= year+'-'+month+'-'+day+' '+hours+':'+minutes+':'+seconds;
}else{
dateTime= year+'-'+month+'-'+day;
}
return dateTime;
}
//转换个位数为 00
... ... @@ -126,17 +130,18 @@ export default {
// 获取列表
let getDataList = () => {
let nowDate=getDateTime(new Date());
let dateStr='';
let dateStr='monitor-collector_';
let type='collector';
if(kpiIdent.value==1){
dateStr='monitor-performance_';
type='performance';
// dateStr='monitor-performance_';
// type='performance';
}else{
dateStr='monitor-collector_';
type='collector';
// dateStr='monitor-collector_';
// type='collector';
}
let date=search.value.dateTime?search.value.dateTime.split(" ")[0]:'';
if(search.value.dateTime){
dateStr+=search.value.dateTime;
dateStr+=date;
}else {
dateStr+=nowDate;
}
... ... @@ -148,23 +153,29 @@ export default {
type:type,
sortBy:search.value.sortBy,
scopeBy:search.value.scopeBy,
param:{}
param:{
keyword:{},
condition:{}
}
}
if(search.value.dateTime){
params.startTime=search.value.dateTime
}
if(search.value.keyword){
params.param={
'resName.keyword': search.value.keyword,
'host.keyword':search.value.keyword,
params.param.keyword={
'ext.keyword': search.value.keyword,
'kpiValue.keyword':search.value.keyword,
'message.keyword':search.value.keyword,
}
}
if(resId.value){
params['param']['resId.keyword']=resId.value;
params['param']['condition']['resId.keyword']=resId.value;
}
if(search.value.kpiId){
params['param']['kpiId.keyword']=search.value.kpiId;
params['param']['condition']['kpiId.keyword']=search.value.kpiId;
}
if(search.value.flag){
params['param']['flag.keyword']=search.value.flag;
params['param']['condition']['flag.keyword']=search.value.flag;
}
proxy.$http.post(`/api-web/esData/list`, params, function (res) {
if (res && res.object) {
... ... @@ -173,15 +184,15 @@ export default {
dataList.map(item=>{
arr.push(item[0])
})
arr.map(item=>{
item.dbTime=getDateTime(new Date(item.dbTime),1)
})
tableData.value.dataList = arr;
tableData.value.count = parseInt(res.object.total);
} else {
tableData.value.dataList = [];
tableData.value.count = 0;
}
/* tableData.value.dataList=[{
message:dataJSON('{"resId":"4044b7e0f1344aefb80c89018b2a52a5","kpiId":"","indexName":"monitor-collector_2022-04-19","pageNum":1,"pageSize":20,"type":"syslog","sortBy":"dbTime","scopeBy":"dbTimeStr.keyword","resType":"","param":{"resId":"4044b7e0f1344aefb80c89018b2a52a5","kpiId":""}}')
}]*/
});
}
... ... @@ -242,6 +253,7 @@ export default {
kpiIdent.value=item.kpiIdent;
}
})
search.value.flag='';
getFlagData();
}
let detail=Vue.ref({})
... ...