Authored by 王涛

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

cmdb数据同步页列表无数据时调整,ping详情页列表静态页面搭建 #1



See merge request !569
... ... @@ -3204,6 +3204,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>`;
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resName=${name} data-ip=${ip} data-resTypeName=${res.resTypeName} data-adminName=${res.adminName} lay-tips="查看资源ping详情" style="margin-left: 10px"> <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>`;
... ... @@ -3494,6 +3495,28 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}
common.viewResTopo($(this).data('id'));
});
//start 查看ping详情列表页 lsq 2022-04-24
$('a.res-view-ping').unbind('click').on('click', function () {
// if ($.inArray('back:details:viewtopo', checkList) === -1) {
// layer.msg('暂无权限!', {icon: 0});
// return;
// }
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;'],
type: 2,
area: ['80%', '90%'],
shadeClose: true,//开启遮罩层
id: 'res-ping',
// content: laytpl(res.body).render(JSON.stringify(params)),
content: ['/vue3/index.html#/ping'+paramStr, 'no'],
cancel: function () {
clearTimeout();
}
});
});
//end lsq 2022-04-24
// 查看资产配置信息
$('a.res-view-assets-details').unbind('click').on('click', function () {
... ...
... ... @@ -115,6 +115,12 @@ const routes = [{
name: 'cmdbdatasync',
component: () => myImport('views/cmdbdatasync/index'),
},
//ping详情列表
{
path: '/ping',
name: 'pingIndex',
component: () => myImport('views/ping/index'),
},
];
// hash模式: createWebHashHistory
... ...
... ... @@ -39,10 +39,13 @@ export default {
let data=editTbaleData.value;
let arr=[];
data.map(item=>{
item.proto.map(item=>{
item.paramValue=item.defaultValue;
item.protocol=item.protocolId;
})
if(item.proto && item.proto.length>0){
item.proto.map(item=>{
item.paramValue=item.defaultValue;
item.protocol=item.protocolId;
})
}
arr.push({
bean:item,
proto:item.proto
... ...
... ... @@ -55,7 +55,7 @@
</div>
</div>
<div class="search-table">
<cm-table-page v-if="tableData.dataList && tableData.dataList.length>0" :columns="tableData.columns" :dataList="tableData.dataList"
<cm-table-page v-if="tableData.dataList " :columns="tableData.columns" :dataList="tableData.dataList"
:showIndex="true"
:total="tableData.count"
@loaddata = "loaddata"
... ...
<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
<div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px'}">
<div class="ping-detail">
<el-descriptions
class=""
title=""
:column="2"
:size="size"
border
>
<el-descriptions-item>
<template #label>
<div class="cell-item">
资源名称
</div>
</template>
{{detail.resName}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
IP地址
</div>
</template>
{{detail.ip}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
资源类型
</div>
</template>
{{detail.resTypeName}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
责任人
</div>
</template>
{{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-form-item>
<el-form-item >
<el-select v-model="search.kpiId" class="m-2" placeholder="指标" clearable @change="kpiChange">
<el-option
v-for="item in kpiData"
:key="item.ddicCode"
:label="item.ddicName"
:value="item.ddicCode"
/>
</el-select>
</el-form-item>
<el-form-item >
<el-select v-model="search.flag" class="m-2" placeholder="flag" clearable>
<el-option
v-for="item in flagData"
:key="item.ddicCode"
:label="item.ddicName"
:value="item.ddicCode"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="search.dateTime"
type="date"
placeholder="日期"
end-placeholder="结束时间"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item >
<el-button @click="getDataList">查询</el-button>
</el-form-item>
</div>
</div>
<div class="search-table">
<cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
:showIndex="true"
:total="tableData.count"
@loaddata = "loaddata"
:showSelection="false"
:showBorder="true"
:loading="false"
:pageSize="search.pageSize"
:showPage="true"
:showTools="true"
:height="height - 110">
<template #default="{row,prop,column}">
<!--<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}">
<div class="list-handle">
<span class="icon-bg">
<i class="el-icon-view" title="查看" @click="handleView(scope.row)"></i>
</span>
</div>
</template>
</cm-table-page>
</div>
</div>
</div>
<!--弹框-->
<cm-dialog :title="dialog.title" width="60%" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false">
<template v-slot>
<pingDetail :detail="dialog.detail" />
</template>
</cm-dialog>
... ...
export default {
name: 'pingIndex',
template: '',
components: {
'pingDetail': Vue.defineAsyncComponent(
() => myImport('views/ping/pingDetail/index')
)
},
props: [],
setup(props, {attrs, slots, emit}) {
const {proxy} = Vue.getCurrentInstance();
let height = Vue.ref(window.innerHeight);
let resId=Vue.ref('');
let dateTime=Vue.ref([]);
let kpiIdent=Vue.ref('');
let search = Vue.ref({
kpiId:'',
sortBy:'dbTime',
scopeBy:'dbTimeStr.keyword',
keyword: '',
type:'syslog',
pageNum: 1,
pageSize: 20,
dateTime:[],
resType:'',
});
let dialog = Vue.ref({
title : "ping详情",
show:false,
esId : ''
});
//表格字段
let tableData = Vue.ref({
count:0,
dataList: [],
columns: [
{
prop: 'collTime',
label: '采集时间',
sortable: true,
align: 'center',
width: '250',
},
{
prop: 'dbTime',
label: '入库时间',
sortable: true,
align: 'center',
width: '250'
},
{
prop: 'kpiValue',
label: '采集值',
sortable: true,
align: 'center',
width: '200'
},
{
prop: 'taskName',
label: '采集任务',
sortable: true,
align: 'center',
width: '200'
},
{
prop: 'templateName',
label: '采集模板',
sortable: true,
align: 'center',
width: '200'
},
{
prop: 'directiveName',
label: '指令名称',
sortable: true,
align: 'center',
width: '200'
}, {
prop: 'ext',
label: '扩展信息',
sortable: true,
align: 'center',
width: '200',
render:function (row){
return `<pre>${row.ext}</pre>`
}
}, {
prop: 'message',
label: '异常信息',
sortable: true,
align: 'center',
render:function (row){
return `<pre>${row.message}</pre>`
}
}
]
})
let resTypeArr = Vue.ref([]);
let getResType = (arr) => {
var types = arr.map(function (v) {
return v.id;
});
resTypeArr.value = types;
search.value.resType=resTypeArr.value.join(',');
// getDataList();
}
//获取时间点 转年月日的方法
const getDateTime=(newDate)=>{
let dateTime='';
let year=newDate.getFullYear();//获取当前年
let month1=(newDate.getMonth()+1)+'';
let month=timeFormat(month1);//获取当前月
let day=timeFormat(newDate.getDate());//获取当前日
let hours=timeFormat(newDate.getHours()+'');//获取当前时
let minutes=timeFormat(newDate.getMinutes()+'');//获取当前分
let seconds=timeFormat(newDate.getSeconds()+'');//获取当前秒
dateTime= year+'-'+month+'-'+day;//' '+hours+':'+minutes+':'+seconds;
return dateTime;
}
//转换个位数为 00
let timeFormat =(number)=> {
return number.length == 1 ? ('0' + number) : number
}
// 获取列表
let getDataList = () => {
let nowDate=getDateTime(new Date());
let dateStr='';
if(kpiIdent.value==1){
dateStr='monitor-performance_';
}else{
dateStr='monitor-collector_';
}
if(search.value.dateTime){
dateStr+=search.value.dateTime;
}else {
dateStr+=nowDate;
}
let params={
resId:resId.value,
kpiId:search.value.kpiId,
flag:search.value.flag,
indexName:dateStr,
pageNum: search.value.pageNum,
pageSize: search.value.pageSize,
type:search.value.type,
sortBy:search.value.sortBy,
scopeBy:search.value.scopeBy,
resType:search.value.resType,
param:{}
}
if(search.value.keyword){
params.param={
'resName.keyword': search.value.keyword,
'host.keyword':search.value.keyword,
'message.keyword':search.value.keyword,
}
}
if(search.value.kpiId){
params['param']['kpiId.keyword']=search.value.kpiId;
}
proxy.$http.post(`/api-web/esData/list`, params, function (res) {
if (res && res.object) {
let dataList=res.object.content;
let arr=[];
dataList.map(item=>{
arr.push(item[0])
})
tableData.value.dataList = arr;
tableData.value.count = parseInt(res.object.total);
} else {
tableData.value.dataList = [];
tableData.value.count = 0;
}
});
}
let loaddata = ({page, limit}) => {
search.value.pageNum = page;
search.value.pageSize = limit;
getDataList();
}
let hideDialog = (flg) => {
dialog.value.show = flg;
}
// 处理弹框
let handle = (row) =>{
hideDialog(true);
dialog.value.detail = row;
}
//查看详情
let handleView = (row) =>{
handle(row);
}
//查看资源详情
let goResDetail=(resId,resName,resType)=>{
proxy.$global.openDetail(resId, resType, proxy);
}
//指标数据
let kpiData=Vue.ref([]);
let getKpiData=()=>{
proxy.$http.post(`/api-web/manage/ddic/findSucDdics/LOG_SOURCE_TYPE`, {}, function (res) {
if (res && res.data) {
kpiData.value = res.data;
}
});
}
//flag数据
let flagData=Vue.ref([]);
let getFlagData=()=>{
proxy.$http.post(`/api-web/manage/ddic/findSucDdics/LOG_SOURCE_TYPE?kpiId=`+search.kpiId+'&resId='+resId.value, {}, function (res) {
if (res && res.data) {
flagData.value = res.data;
}
});
}
//指标改变事件
let kpiChange=(val)=>{
getFlagData();
}
let detail=Vue.ref({})
//获取resId
let getResId=()=>{
detail.value=proxy.$route.query;
resId.value=proxy.$route.query.resId;
}
// 挂载完
Vue.onMounted(() => {
getResId();
getDataList();
getKpiData();
})
return {
resId,
getResId,
detail,
kpiData,
kpiIdent,
getKpiData,
flagData,
getFlagData,
kpiChange,
dateTime,
height,
search,
dialog,
hideDialog,
handle,
loaddata,
tableData,
getDataList,
resTypeArr,
getResType,
handleView,
goResDetail,
getDateTime
}
}
}
... ...
<div class="esData-detail-container">
<el-descriptions
class=""
title="日志信息"
:column="2"
:size="size"
border
>
<el-descriptions-item>
<template #label>
<div class="cell-item">
资源名称
</div>
</template>
{{detail.resName}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
IP地址
</div>
</template>
{{detail.host}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
资源类型
</div>
</template>
{{detail.resTypeName}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
日志来源
</div>
</template>
{{detail.type}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
日志类型
</div>
</template>
{{detail.program}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
采集时间
</div>
</template>
{{detail.dbTimeStr}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">
日志时间
</div>
</template>
{{detail.logDate}}
</el-descriptions-item>
</el-descriptions>
<div class="info-title">
<span style="font-weight:bold">日志内容</span>
</div>
<div class="esData-detail-info-content" v-html="detail.message">
</div>
</div>
\ No newline at end of file
... ...
export default {
name: 'esDataDetail',
template: '',
components: {
},
props: {
detail:{
type:Object,
default: {}
}
},
setup(props, {attrs, slots, emit}) {
const {proxy} = Vue.getCurrentInstance();
// 挂载完
Vue.onMounted(() => {
})
return {
}
}
}
... ...
... ... @@ -210,6 +210,12 @@ const routes = [{
name: 'cmdbdatasync',
component: () => myImport('views/cmdbdatasync/index'),
},
//ping详情列表
{
path: '/ping',
name: 'pingIndex',
component: () => myImport('views/ping/index'),
},
];
// hash模式: createWebHashHistory
... ...