monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit a363894149524315175265a9545416990b5de168 2 parents 64888413 97a03d2c

Merge branch 'master-v32-lushangqing' into 'master' 

【下探】下探/更多列表分页（接口请求太慢，每页50条）



See merge request !846
Inline Side-by-side
Showing 9 changed files with 417 additions and 71 deletions
... ... @@ -13,6 +13,20 @@ export default {
targetType: {
type: String,
default: ''
},
//lsq 更多列表增加分页当前页及每页显示条数 2022-08-09
limit:{
type:String,
default:'50'
},
page:{
type:String,
default:'1'
},
//lsq 弹框关闭的状态 2022-08-10
dialogFlg:{
type:String,
default:''
}
},
data() {
... ... @@ -25,6 +39,7 @@ export default {
let dialTest = Vue.ref();
let cardName = Vue.ref('展开');
let card = Vue.ref({});
let count = Vue.ref(0);
let cardData = Vue.ref([]);
let cardOpen = Vue.ref(false);
let openOrCloseApm = () => {
... ... @@ -44,13 +59,18 @@ export default {
let getNpmList = () => {
let params = {
faultNo: props.faultNo,
targetType: props.targetType.toLocaleLowerCase()
targetType: props.targetType.toLocaleLowerCase(),
//lsq 更多列表 增加分页 2022-08-09
page:props.page,
limit:props.limit
}
store.dispatch('getFaultList', params).then((res) => {
if (res.data && res.success) {
dialTest.value = res.data[0];
card.value = dialTest.value.faultFixInfoList;
//lsq 更多列表增加分页总条数 2022-08-09
count.value = res.count;
}
}).catch(e => {
console.log(e);
... ... @@ -95,10 +115,14 @@ export default {
});
}
const openMoreDialog = () => {
service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined,props.faultNo, props.targetType.toLocaleLowerCase());
service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined,props.faultNo, props.targetType.toLocaleLowerCase(),count.value,props.limit);
}
//lsq 汇总信息中点击事件类型 2022-08-09
let clickType=Vue.ref('');
let diagnosticItem=Vue.ref('');
//诊断应用
const openBusScenarios = (resClass,title) => {
clickType.value='BusScenarios';
let param = [{
prop: 'extendCol3',
label: '名称',
... ... @@ -115,23 +139,45 @@ export default {
prop: 'os',
label: '操作系统',
}]
service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,resClass,title);
service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,resClass,title,props.page,props.limit);
}
const openKpiList = () => {
service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
clickType.value='KpiList';
service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase(),'',props.page,props.limit);
}
//诊断项（正常、异常）
const openDiagnosticItem = (type) => {
service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
clickType.value='DiagnosticItem';
diagnosticItem.value=type;
service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type,props.page,props.limit);
}
// 挂载完
Vue.onMounted(() => {
getNpmList();
})
//lsq 更多列表切换页码 2022-08-09
Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
//lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码 2022-08-09
if(!props.dialogFlg){
if(clickType.value=='BusScenarios'){
openBusScenarios();
}else if(clickType.value=='KpiList'){
openKpiList();
}else if(clickType.value=='DiagnosticItem'){
openDiagnosticItem(diagnosticItem.value);
}else{
getNpmList();
setTimeout(function(){
openMoreDialog();
},400)
}
}
})
return {
card,
count,
openOrCloseApm,
cardName,
cardOpen,
... ...
... ... @@ -13,6 +13,20 @@ export default {
targetType: {
type: String,
default: ''
},
//lsq 更多列表增加分页当前页及每页显示条数 2022-08-09
limit:{
type:String,
default:'50'
},
page:{
type:String,
default:'1'
},
//lsq 弹框关闭的状态 2022-08-10
dialogFlg:{
type:String,
default:''
}
},
data() {
... ... @@ -23,11 +37,11 @@ export default {
let dialTest = Vue.ref();
let cardData = Vue.ref([]);
let card = Vue.ref({})
let card = Vue.ref({});
let count = Vue.ref(0);
let cardOpen = Vue.ref(false);
let cardName = Vue.ref('展开');
let openOrCloseDialtest = () => {
cardOpen.value = !cardOpen.value;
if (cardOpen.value){
... ... @@ -41,17 +55,21 @@ export default {
}
}
let getDialtestList = () => {
let params = {
faultNo: props.faultNo,
targetType: props.targetType.toLocaleLowerCase()
targetType: props.targetType.toLocaleLowerCase(),
//lsq 更多列表 增加分页 2022-08-09
page:props.page,
limit:props.limit
}
store.dispatch('getFaultList', params).then((res) => {
if (res.data && res.success) {
dialTest.value = res.data[0];
card.value = res.data[0].faultFixInfoList;
//lsq 更多列表增加分页总条数 2022-08-09
count.value = res.count;
}
}).catch(e => {
console.log(e);
... ... @@ -75,9 +93,11 @@ export default {
}
}
//lsq 汇总信息中点击事件类型 2022-08-09
let clickType=Vue.ref('');
let diagnosticItem=Vue.ref('');
const openBusScenarios = () => {
clickType.value='BusScenarios';
let param = [{
prop: 'taskName',
label: '名称',
... ... @@ -92,18 +112,21 @@ export default {
}
}
}]
service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断业务场景');
service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断业务场景',props.page,props.limit);
}
const openKpiList = () => {
service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
clickType.value='KpiList';
service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase(),'',props.page,props.limit);
}
const openMoreDialog = () => {
service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined, props.faultNo, props.targetType.toLocaleLowerCase());
service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined, props.faultNo, props.targetType.toLocaleLowerCase(),count.value,props.limit);
}
//诊断项（正常、异常）
const openDiagnosticItem = (type) => {
service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
clickType.value='DiagnosticItem';
diagnosticItem.value=type;
service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type,props.page,props.limit);
}
const visibilityChange = (e, item) => {
... ... @@ -122,9 +145,27 @@ export default {
Vue.onMounted(() => {
getDialtestList();
})
//lsq 更多列表切换页码 2022-08-09
Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
//lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码 2022-08-09
if(!props.dialogFlg){
if(clickType.value=='BusScenarios'){
openBusScenarios();
}else if(clickType.value=='KpiList'){
openKpiList();
}else if(clickType.value=='DiagnosticItem'){
openDiagnosticItem(diagnosticItem.value);
}else{
getDialtestList();
setTimeout(function(){
openMoreDialog();
},400)
}
}
})
return {
card,
count,
openOrCloseDialtest,
cardName,
cardOpen,
... ...
... ... @@ -68,7 +68,7 @@
<el-empty :image-size="50" />
</div>
<div v-else>
<res-item v-for="item in card" v-if="cardOpen" :parentEmit="parentEmit" :cardList="item" :faultNo="faultNo" :targetType="targetType"/>
<res-item v-for="item in card" v-if="cardOpen" :parentEmit="parentEmit" :cardList="item" :itemresClass="itemresClass" @itemresClass="itemresClassMessage" :faultNo="faultNo" :targetType="targetType" :page="page" :limit="limit" :dialogFlg="dialogFlg"/>
</div>
... ...
... ... @@ -18,6 +18,20 @@ export default {
targetType: {
type: String,
default: ''
},
//lsq 更多列表增加分页当前页及每页显示条数 2022-08-09
limit:{
type:String,
default:'50'
},
page:{
type:String,
default:'1'
},
//lsq 弹框关闭的状态 2022-08-10
dialogFlg:{
type:String,
default:''
}
},
data() {
... ... @@ -40,10 +54,13 @@ export default {
}
let faultNo = props.faultNo;
let targetType = props.targetType.toLocaleLowerCase();
let getDialtestList = () => {
let getDialtestList = (flg) => {
let params = {
faultNo: props.faultNo,
targetType: props.targetType.toLocaleLowerCase()
targetType: props.targetType.toLocaleLowerCase(),
//lsq 更多列表 增加分页 2022-08-10
page:props.page,
limit:props.limit
}
store.dispatch('getFaultList', params).then((res) => {
... ... @@ -56,8 +73,10 @@ export default {
}
card.value = arr;
}
if(!flg){
openOrCloseBase();
}
}
}).catch(e => {
console.log(e);
})
... ... @@ -68,9 +87,13 @@ export default {
targetType: props.targetType.toLocaleLowerCase()
});
}
//lsq 汇总信息中点击事件类型 2022-08-09
let clickType=Vue.ref('');
let diagnosticItem=Vue.ref('');
//诊断资源
const openBusScenarios = () => {
itemresClass.value='';
clickType.value='BusScenarios';
let param = [{
prop: 'resName',
label: '资源名称',
... ... @@ -88,23 +111,53 @@ export default {
prop: 'adminName',
label: '资源负责人',
}]
service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo, props.targetType.toLocaleLowerCase(), param, '', '诊断资源');
service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo, props.targetType.toLocaleLowerCase(), param, '', '诊断资源',props.page,props.limit);
}
//诊断指标
const openKpiList = () => {
service.sendEventDiagnoseKpiList(emit, props.faultNo, props.targetType.toLocaleLowerCase());
itemresClass.value='';
clickType.value='KpiList';
service.sendEventDiagnoseKpiList(emit, props.faultNo, props.targetType.toLocaleLowerCase(),'',props.page,props.limit);
}
//诊断项（正常、异常）
const openDiagnosticItem = (type) => {
service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '', type);
itemresClass.value='';
clickType.value='DiagnosticItem';
diagnosticItem.value=type;
service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '', type,props.page,props.limit);
}
//lsq 接受子组件传过来的类型 2022-08-10
let itemresClass=Vue.ref('');
let itemresClassMessage=(obj)=>{
itemresClass.value=obj.resClass;
clickType.value=obj.clickType;
}
// 挂载完
Vue.onMounted(() => {
getDialtestList();
})
//lsq 更多列表切换页码 2022-08-09
Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
//lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码，props.dialogFlg弹框关闭时不刷新 2022-08-09
if(!props.dialogFlg){
if(itemresClass.value){
if(clickType.value=='MoreDialog'){
getDialtestList(1);
}
}else{
if(clickType.value=='BusScenarios'){
openBusScenarios();
}else if(clickType.value=='KpiList'){
openKpiList();
}else if(clickType.value=='DiagnosticItem'){
openDiagnosticItem(diagnosticItem.value);
}
}
}else{
clickType.value='';
}
})
return {
card,
cardOpen,
... ... @@ -118,7 +171,9 @@ export default {
faultNo,
targetType,
parentEmit: emit,
openDiagnosticItem
openDiagnosticItem,
itemresClassMessage,
itemresClass,
}
}
}
... ...
... ... @@ -21,6 +21,25 @@ export default {
parentEmit:{
type: Object,
default: {}
},
//lsq 更多列表增加分页当前页及每页显示条数 2022-08-09
limit:{
type:String,
default:'50'
},
page:{
type:String,
default:'1'
},
//lsq 弹框关闭的状态 2022-08-10
dialogFlg:{
type:String,
default:''
},
//lsq 父组件汇总信息点击事件类型 2022-08-10
itemresClass:{
type:String,
default:''
}
},
data() {
... ... @@ -31,6 +50,8 @@ export default {
let dialTest = Vue.ref([]);
let card = Vue.ref({})
//lsq 数据count 2022-08-09
let count = Vue.ref(props.cardList?props.cardList.count?props.cardList.count:'0':'0');
let cardOpen = Vue.ref(false);
let cardName = Vue.ref('展开');
let alarmColor = Vue.ref();
... ... @@ -110,21 +131,38 @@ export default {
alarmColor.value = '#ff0000';
}
}
//lsq 告警点击事件的resId
let AlarmResId=Vue.ref('');
const openAlarm = (resId) => {
//lsq 向父组件传递数据 2022-08-10
emit('itemresClass',{resClass:resClass})
clickType.value='Alarm';
AlarmResId.value=resId;
service.sendEventAlarmDialog(props.parentEmit, {
cardList: props.cardList,
targetType: targetType,
faultNo: faultNo,
resClass:resClass,
resId:resId
resId:resId,
page:props.page,
limit:props.limit
});
}
//lsq 当前点击的resClass 2022-08-10
let currResClass=Vue.ref('');
const openMoreDialog = () => {
service.sendEventMoreDialog(props.parentEmit, proxy.$global, props.cardList.faultFixInfoList,undefined,faultNo, targetType);
emit('itemresClass',{resClass:resClass,clickType:'MoreDialog'})
clickType.value='MoreDialog';
currResClass.value=resClass;
service.sendEventMoreDialog(props.parentEmit, proxy.$global, props.cardList.faultFixInfoList,undefined,faultNo, targetType,count.value,props.limit);
}
//lsq 汇总信息中点击事件类型 2022-08-09
let clickType=Vue.ref('');
let diagnosticItem=Vue.ref('');
//诊断资源
const openBusScenarios = () => {
emit('itemresClass',{resClass:resClass})
clickType.value='BusScenarios';
let param = [{
prop: 'resName',
label: '资源名称',
... ... @@ -141,16 +179,21 @@ export default {
prop: 'adminName',
label: '资源负责人',
}]
service.sendEventDiagnoseBusinessScenarios(props.parentEmit, faultNo,targetType,param,resClass,'诊断资源');
service.sendEventDiagnoseBusinessScenarios(props.parentEmit, faultNo,targetType,param,resClass,'诊断资源',props.page,props.limit);
}
//诊断指标
const openKpiList = () => {
service.sendEventDiagnoseKpiList(props.parentEmit, faultNo,targetType,resClass);
emit('itemresClass',{resClass:resClass})
clickType.value='KpiList';
service.sendEventDiagnoseKpiList(props.parentEmit, faultNo,targetType,resClass,props.page,props.limit);
}
//诊断项（正常、异常）
const openDiagnosticItem = (type) => {
service.sendEventNormalDialog(props.parentEmit, proxy.$global, faultNo, targetType, resClass,type);
emit('itemresClass',{resClass:resClass})
clickType.value='DiagnosticItem';
diagnosticItem.value=type;
service.sendEventNormalDialog(props.parentEmit, proxy.$global, faultNo, targetType, resClass,type,props.page,props.limit);
}
let openResPonse = (kpiId,redId,title) =>{
... ... @@ -170,8 +213,32 @@ export default {
getAlarmColor(cardList);
})
//lsq 更多列表切换页码 2022-08-09
Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
//lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码 2022-08-09
if(!props.dialogFlg){
if(clickType.value=='BusScenarios'){
openBusScenarios();
}else if(clickType.value=='KpiList'){
openKpiList();
}else if(clickType.value=='DiagnosticItem'){
openDiagnosticItem(diagnosticItem.value);
}else if(clickType.value=='Alarm'){
openAlarm(AlarmResId.value)
}else if(clickType.value=='MoreDialog'){
setTimeout(function (){
if(props.itemresClass==props.cardList.resClass){
openMoreDialog();
}
},400)
}
}else{
clickType.value='';
}
})
return {
card,
count,
openOrCloseCard,
cardName,
cardOpen,
... ... @@ -186,7 +253,7 @@ export default {
openKpiList,
resClass,
openDiagnosticItem,
openResPonse
openResPonse,
}
}
}
... ...
... ... @@ -13,6 +13,20 @@ export default {
targetType: {
type: String,
default: ''
},
//lsq 更多列表增加分页当前页每页显示条数 2022-08-09
limit:{
type:String,
default:'50'
},
page:{
type:String,
default:'1'
},
//lsq 弹框关闭的状态 2022-08-10
dialogFlg:{
type:String,
default:''
}
},
data() {
... ... @@ -24,6 +38,7 @@ export default {
let dialTest = Vue.ref();
let card = Vue.ref({})
let count = Vue.ref(0);
let cardOpen = Vue.ref(false);
let cardData = Vue.ref([]);
let cardName = Vue.ref('展开');
... ... @@ -72,23 +87,32 @@ export default {
let getNpmList = () => {
let params = {
faultNo: props.faultNo,
targetType: props.targetType.toLocaleLowerCase()
targetType: props.targetType.toLocaleLowerCase(),
//lsq 更多列表 增加分页 2022-08-09
page:props.page,
limit:props.limit
}
store.dispatch('getFaultList', params).then((res) => {
if (res.data && res.success) {
dialTest.value = res.data[0];
card.value = dialTest.value.faultFixInfoList;
//lsq 更多列表增加分页总条数 2022-08-09
count.value = res.count;
}
}).catch(e => {
console.log(e);
})
}
const openMoreDialog = () => {
service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined, props.faultNo, props.targetType.toLocaleLowerCase());
service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined, props.faultNo, props.targetType.toLocaleLowerCase(),count.value,props.limit);
}
//lsq 汇总信息中点击事件类型 2022-08-09
let clickType=Vue.ref('');
let diagnosticItem=Vue.ref('');
//诊断链路场景
const openBusScenarios = () => {
clickType.value='BusScenarios';
let param = [{
prop: 'streamName',
label: '名称',
... ... @@ -96,7 +120,7 @@ export default {
prop: 'createBy',
label: '创建用户',
}]
service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断链路场景');
service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断链路场景',props.page,props.limit);
}
let openResPonse = (kpiId,redId,title) =>{
... ... @@ -112,11 +136,14 @@ export default {
//诊断指标
const openKpiList = () => {
service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
clickType.value='KpiList';
service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase(),'',props.page,props.limit);
}
//诊断项（正常、异常）
const openDiagnosticItem = (type) => {
service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
clickType.value='DiagnosticItem';
diagnosticItem.value=type;
service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type,props.page,props.limit);
}
const visibilityChange = (e, item) => {
const ev = e.target;
... ... @@ -135,10 +162,28 @@ export default {
Vue.onMounted(() => {
getNpmList();
})
//lsq 更多列表切换页码 2022-08-09
Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
//lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码 2022-08-09
if(!props.dialogFlg){
if(clickType.value=='BusScenarios'){
openBusScenarios();
}else if(clickType.value=='KpiList'){
openKpiList();
}else if(clickType.value=='DiagnosticItem'){
openDiagnosticItem(diagnosticItem.value);
}else{
getNpmList();
setTimeout(function(){
openMoreDialog();
},400)
}
}
})
return {
card,
count,
cardName,
openOrCloseNpm,
cardOpen,
... ...
... ... @@ -22,6 +22,9 @@
:colType="item.colType"
:itemName="item.itemName"
:showDetail="item.detail"
:limit="item.limit"
:page="item.page"
:dialogFlg="item.dialogFlg?item.dialogFlg:''"
@openDialog="openDialog"
@getResList=""/>
</el-card>
... ... @@ -52,14 +55,17 @@
<cm-dialog top="3vh" title="告警列表" width="90%" :showDialogVisible="alarmFlg"
@hidedialog="showAlarmDialog" :showFooter="false">
<template v-slot>
<div style="height:720px;max-height:720px;overflow-y: auto;">
<div >
<!--lsq 列表更改为分页列表 2022-08-10-->
<cm-table-page v-if="alarmList.columns.length > 0" :columns="alarmList.columns"
:dataList="alarmList.dataList"
:showIndex="true"
:showBorder="true"
@loaddata="loadPage"
:showPage="false"
:height="720"
:showPage="true"
:total="alarmList.count"
:pageSize="alarmList.limit"
:height="500"
:showTools="false">
</cm-table-page>
</div>
... ... @@ -82,11 +88,15 @@
@hidedialog="showMoreDialog" :showFooter="false">
<template v-slot>
<div>
<!--lsq 列表更改为分页列表 2022-08-09-->
<cm-table-page v-if="moreObj.columns.length > 0" :columns="moreObj.columns"
:dataList="moreObj.data"
:showIndex="true"
:showBorder="true"
:showPage="false"
:showPage="true"
:total="moreObj.count"
:pageSize="moreObj.limit"
@loaddata="loadTableDataList"
:height="500"
:showTools="false">
</cm-table-page>
... ...
... ... @@ -43,7 +43,9 @@ export default {
itemName: '场景名称',
detail: false,
colType: 'kpi',
state: '0'
state: '0',
limit:50,
page:1,
}, {
faultType: 'NETLINK',
faultTypeName: '网络链路',
... ... @@ -59,7 +61,9 @@ export default {
itemName: '链路（流名称）',
detail: false,
colType: 'kpi',
state: '0'
state: '0',
limit:50,
page:1,
}, {
faultType: 'APM',
faultTypeName: 'APM',
... ... @@ -68,7 +72,9 @@ export default {
itemName: '检测指标',
detail: true,
colType: 'flag',
state: '0'
state: '0',
limit:50,
page:1,
}, {
faultType: 'BASE',
faultTypeName: '基础',
... ... @@ -77,7 +83,9 @@ export default {
itemName: '检测指标',
detail: true,
colType: 'flag',
state: '0'
state: '0',
limit:50,
page:1,
}, {
faultType: 'faultHis',
faultTypeName: '知识库',
... ... @@ -86,7 +94,9 @@ export default {
itemName: '知识库',
detail: true,
colType: 'flag',
state: '1'
state: '1',
limit:50,
page:1,
}]
});
... ... @@ -97,6 +107,7 @@ export default {
let moreDialog = Vue.ref(false);
let moreDialogTitle = Vue.ref('更多');
let moreTargetType = Vue.ref();
let moreObj = Vue.ref({
columns: [],
data: []
... ... @@ -104,8 +115,23 @@ export default {
const showMoreDialog = (flg, obj) => {
moreDialog.value = flg;
moreObj.value = obj;
//lsq 弹框关闭时page默认为1 2022-08-10
setDialogFlg(flg);
}
let setDialogFlg=(flg)=>{
if(!flg){
faultDetailDetailInfo.value.items.map(item=>{
item.page=1;
item.limit=50;
item.dialogFlg=true;
})
}else{
faultDetailDetailInfo.value.items.map(item=>{
item.dialogFlg='';
})
}
}
/**
... ... @@ -154,7 +180,10 @@ export default {
// 展示弹框
const openDialog = (type, {faultNo, targetType, resId, kpiId, flag, resClass,title}, obj) => {
if (type === 'alarm') {
service.openAlarmDialog(proxy, faultNo, targetType, resId, kpiId, flag, resClass);
//lsq 更多列表的类型 2022-08-10
moreTargetType.value= targetType;
service.openAlarmDialog(proxy, faultNo, targetType, resId, kpiId, flag, resClass,obj.page,obj.limit);
showAlarmDialog(true)
} else /*if (type === 'resList') {
service.handleClick(proxy, faultNo, targetType, resId, kpiId, flag);
} else*/ if (type === 'line') {
... ... @@ -162,11 +191,17 @@ export default {
} else if (type === 'more') {
// 展示更多
moreDialogTitle.value = obj.title;
//lsq 更多列表的类型 2022-08-09
moreTargetType.value= targetType;
showMoreDialog(true, obj);
}
}
//lsq 告警列表弹框 2022-08-10
let alarmFlg=Vue.ref(false);
let showAlarmDialog=(flg)=>{
alarmFlg.value=flg;
setDialogFlg(flg)
}
const openFaultReport = () => {
var domain = proxy.$http.getGateWay()
... ... @@ -180,13 +215,33 @@ export default {
}
});
}
//lsq 重新加载表格数据 2022-08-09
// let childRef=Vue.ref()
let loadTableDataList = ({page, limit}) => {
faultDetailDetailInfo.value.items.map(item=>{
if(item.faultType.toLocaleLowerCase()==moreTargetType.value){
item.page=page;
item.limit=limit;
}
})
}
//lsq 重新加载表格数据 告警列表 2022-08-10
let loadPage = ({page, limit}) => {
faultDetailDetailInfo.value.items.map(item=>{
if(item.faultType.toLocaleLowerCase()==moreTargetType.value){
item.page=page;
item.limit=limit;
}
})
}
Vue.onMounted(() => {
settingDetail();
});
return {
loadTableDataList,
loadPage,
faultDetailDialogTitle,
faultDetailDetailInfo,
openDialog,
... ... @@ -194,8 +249,11 @@ export default {
moreDialog,
showMoreDialog,
moreDialogTitle,
moreTargetType,
openFaultReport,
...service
...service,
showAlarmDialog,
alarmFlg
}
}
}
... ...
... ... @@ -79,14 +79,16 @@ const alarmService = () => {
let alarmList = Vue.ref({
columns: [],
dataList: [],
total: 0
total: 0,
page:1,
limit:50
});
let showAlarmDialog = (flg) => {
alarmFlg.value = flg;
}
let openAlarmDialog = (proxy, faultNo, targetType, resId, kpiId, flag, resClass) => {
let openAlarmDialog = (proxy, faultNo, targetType, resId, kpiId, flag, resClass,page,limit) => {
showAlarmDialog(true);
// 获取告警列表
let params = {
... ... @@ -96,9 +98,12 @@ const alarmService = () => {
targetType: targetType,
resId: resId,
kpiId: kpiId,
flag: flag
flag: flag,
page:page?page:1,
limit:limit?limit:50
}
//lsq 设置分页显示条数 2022-08-10
alarmList.value.limit=limit;
// 设置表头内容
alarmList.value.columns = [{
prop: "resId",
... ... @@ -154,6 +159,8 @@ const alarmService = () => {
if (res.data) {
alarmList.value.dataList = res.data;
}
//lsq 设置总条数 2022-08-10
alarmList.value.count=res.count;
} else {
proxy.$global.showMsg(res.msg ? res.msg : '暂无告警数据！', "warning");
}
... ... @@ -264,7 +271,7 @@ const faultEvent = () => {
* @param params
*/
const sendEventAlarmDialog = (emit, params) => {
emit('openDialog', 'alarm', getParams(params));
emit('openDialog', 'alarm', getParams(params),{page:params.page,limit:params.limit});
}
// /**
... ... @@ -291,7 +298,7 @@ const faultEvent = () => {
* @param global
* @param arr [[{指标对象},{指标对象},....].[{指标对象},{指标对象},....]]
*/
const sendEventMoreDialog = (emit, global, arr, title, faultNo, targetType) => {
const sendEventMoreDialog = (emit, global, arr, title, faultNo, targetType,count,limit) => {
if (!arr || arr.length == 0) {
global.showMsg("暂无数据！", "warning");
return;
... ... @@ -307,7 +314,11 @@ const faultEvent = () => {
prop: 'taskName',
label: '名称',
}],
data: []
data: [],
//lsq 更多列表增加分页总条数,每页显示条数 2022-08-09
count:count?count:0,
limit:limit?limit:50,
type:'more'
}
if (arr.length == undefined) {
arr = [];
... ... @@ -372,7 +383,7 @@ const faultEvent = () => {
obj.data.push(dataItem);
})
emit('openDialog', 'more', {}, obj);
emit('openDialog', 'more', {faultNo,targetType}, obj);
}
/**
... ... @@ -381,7 +392,7 @@ const faultEvent = () => {
* @param global
* @param arr [[{指标对象},{指标对象},....].[{指标对象},{指标对象},....]]
*/
const sendEventNormalDialog = (emit, global, faultNo, targetType, resClass, type) => {
const sendEventNormalDialog = (emit, global, faultNo, targetType, resClass, type,page,limit) => {
// if (!arr || arr.length == 0) {
// global.showMsg("暂无数据！", "warning");
// return;
... ... @@ -462,11 +473,15 @@ const faultEvent = () => {
isAbnormal: isAbnormal,
resClass: resClass,
targetType: targetType,
faultNo: faultNo
faultNo: faultNo,
page:page?page:1,
limit:limit?limit:50
}).then((res) => {
if (res && res.success) {
obj.data = res.data;
emit('openDialog', 'more', {}, obj);
obj.count = res.count;
obj.limit = limit;
emit('openDialog', 'more', {faultNo,targetType}, obj);
} else {
global.showMsg(res.msg, "warning");
}
... ... @@ -481,7 +496,7 @@ const faultEvent = () => {
* @param targetType 诊断类型
* @param columns 数组，表格列对象
*/
const sendEventDiagnoseBusinessScenarios = (emit, faultNo, targetType, columns, resClass, title) => {
const sendEventDiagnoseBusinessScenarios = (emit, faultNo, targetType, columns, resClass, title,page,limit) => {
var obj = {
title: title,
... ... @@ -490,7 +505,10 @@ const faultEvent = () => {
}
var param = {
faultNo: faultNo,
targetType: targetType
targetType: targetType,
//lsq 更多列表增加分页总条数,每页显示条数 2022-08-09
page:page?page:1,
limit:limit?limit:50
}
if (resClass && resClass != '') {
param.resClass = resClass;
... ... @@ -499,7 +517,9 @@ const faultEvent = () => {
store.dispatch('getFaultBusinessList', param).then((res) => {
if (res && res.success) {
obj.data = res.data;
emit('openDialog', 'more', {}, obj);
obj.count = res.count;
obj.limit = limit;
emit('openDialog', 'more', {faultNo,targetType}, obj);
}
});
}
... ... @@ -512,7 +532,7 @@ const faultEvent = () => {
* @param targetType 诊断类型
* @param columns 数组，表格列对象
*/
const sendEventDiagnoseKpiList = (emit, faultNo, targetType, resClass) => {
const sendEventDiagnoseKpiList = (emit, faultNo, targetType, resClass,page,limit) => {
var obj = {
title: '诊断指标',
... ... @@ -543,11 +563,15 @@ const faultEvent = () => {
store.dispatch('getFaultKpiList', {
faultNo: faultNo,
targetType: targetType,
resClass: resClass
resClass: resClass,
page:page?page:1,
limit:limit?limit:50
}).then((res) => {
if (res && res.success) {
obj.data = res.data;
emit('openDialog', 'more', {}, obj);
obj.count = res.count;
obj.limit = limit;
emit('openDialog', 'more', {faultNo,targetType}, obj);
}
});
... ...