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 418 additions and 72 deletions
@@ -13,6 +13,20 @@ export default { @@ -13,6 +13,20 @@ export default {
13 targetType: { 13 targetType: {
14 type: String, 14 type: String,
15 default: '' 15 default: ''
  16 + },
  17 + //lsq 更多列表增加分页当前页及每页显示条数 2022-08-09
  18 + limit:{
  19 + type:String,
  20 + default:'50'
  21 + },
  22 + page:{
  23 + type:String,
  24 + default:'1'
  25 + },
  26 + //lsq 弹框关闭的状态 2022-08-10
  27 + dialogFlg:{
  28 + type:String,
  29 + default:''
16 } 30 }
17 }, 31 },
18 data() { 32 data() {
@@ -25,6 +39,7 @@ export default { @@ -25,6 +39,7 @@ export default {
25 let dialTest = Vue.ref(); 39 let dialTest = Vue.ref();
26 let cardName = Vue.ref('展开'); 40 let cardName = Vue.ref('展开');
27 let card = Vue.ref({}); 41 let card = Vue.ref({});
  42 + let count = Vue.ref(0);
28 let cardData = Vue.ref([]); 43 let cardData = Vue.ref([]);
29 let cardOpen = Vue.ref(false); 44 let cardOpen = Vue.ref(false);
30 let openOrCloseApm = () => { 45 let openOrCloseApm = () => {
@@ -44,13 +59,18 @@ export default { @@ -44,13 +59,18 @@ export default {
44 let getNpmList = () => { 59 let getNpmList = () => {
45 let params = { 60 let params = {
46 faultNo: props.faultNo, 61 faultNo: props.faultNo,
47 - targetType: props.targetType.toLocaleLowerCase() 62 + targetType: props.targetType.toLocaleLowerCase(),
  63 + //lsq 更多列表 增加分页 2022-08-09
  64 + page:props.page,
  65 + limit:props.limit
48 } 66 }
49 67
50 store.dispatch('getFaultList', params).then((res) => { 68 store.dispatch('getFaultList', params).then((res) => {
51 if (res.data && res.success) { 69 if (res.data && res.success) {
52 dialTest.value = res.data[0]; 70 dialTest.value = res.data[0];
53 card.value = dialTest.value.faultFixInfoList; 71 card.value = dialTest.value.faultFixInfoList;
  72 + //lsq 更多列表增加分页总条数 2022-08-09
  73 + count.value = res.count;
54 } 74 }
55 }).catch(e => { 75 }).catch(e => {
56 console.log(e); 76 console.log(e);
@@ -95,10 +115,14 @@ export default { @@ -95,10 +115,14 @@ export default {
95 }); 115 });
96 } 116 }
97 const openMoreDialog = () => { 117 const openMoreDialog = () => {
98 - service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined,props.faultNo, props.targetType.toLocaleLowerCase()); 118 + service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined,props.faultNo, props.targetType.toLocaleLowerCase(),count.value,props.limit);
99 } 119 }
  120 + //lsq 汇总信息中点击事件类型 2022-08-09
  121 + let clickType=Vue.ref('');
  122 + let diagnosticItem=Vue.ref('');
100 //诊断应用 123 //诊断应用
101 const openBusScenarios = (resClass,title) => { 124 const openBusScenarios = (resClass,title) => {
  125 + clickType.value='BusScenarios';
102 let param = [{ 126 let param = [{
103 prop: 'extendCol3', 127 prop: 'extendCol3',
104 label: '名称', 128 label: '名称',
@@ -115,23 +139,45 @@ export default { @@ -115,23 +139,45 @@ export default {
115 prop: 'os', 139 prop: 'os',
116 label: '操作系统', 140 label: '操作系统',
117 }] 141 }]
118 - service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,resClass,title); 142 + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,resClass,title,props.page,props.limit);
119 } 143 }
120 const openKpiList = () => { 144 const openKpiList = () => {
121 - service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); 145 + clickType.value='KpiList';
  146 + service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase(),'',props.page,props.limit);
122 } 147 }
123 //诊断项（正常、异常） 148 //诊断项（正常、异常）
124 const openDiagnosticItem = (type) => { 149 const openDiagnosticItem = (type) => {
125 - service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type); 150 + clickType.value='DiagnosticItem';
  151 + diagnosticItem.value=type;
  152 + service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type,props.page,props.limit);
126 } 153 }
127 // 挂载完 154 // 挂载完
128 Vue.onMounted(() => { 155 Vue.onMounted(() => {
129 getNpmList(); 156 getNpmList();
130 }) 157 })
131 158
  159 + //lsq 更多列表切换页码 2022-08-09
  160 + Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
  161 + //lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码 2022-08-09
  162 + if(!props.dialogFlg){
  163 + if(clickType.value=='BusScenarios'){
  164 + openBusScenarios();
  165 + }else if(clickType.value=='KpiList'){
  166 + openKpiList();
  167 + }else if(clickType.value=='DiagnosticItem'){
  168 + openDiagnosticItem(diagnosticItem.value);
  169 + }else{
  170 + getNpmList();
  171 + setTimeout(function(){
  172 + openMoreDialog();
  173 + },400)
  174 + }
  175 + }
  176 + })
132 177
133 return { 178 return {
134 card, 179 card,
  180 + count,
135 openOrCloseApm, 181 openOrCloseApm,
136 cardName, 182 cardName,
137 cardOpen, 183 cardOpen,
@@ -13,6 +13,20 @@ export default { @@ -13,6 +13,20 @@ export default {
13 targetType: { 13 targetType: {
14 type: String, 14 type: String,
15 default: '' 15 default: ''
  16 + },
  17 + //lsq 更多列表增加分页当前页及每页显示条数 2022-08-09
  18 + limit:{
  19 + type:String,
  20 + default:'50'
  21 + },
  22 + page:{
  23 + type:String,
  24 + default:'1'
  25 + },
  26 + //lsq 弹框关闭的状态 2022-08-10
  27 + dialogFlg:{
  28 + type:String,
  29 + default:''
16 } 30 }
17 }, 31 },
18 data() { 32 data() {
@@ -23,11 +37,11 @@ export default { @@ -23,11 +37,11 @@ export default {
23 37
24 let dialTest = Vue.ref(); 38 let dialTest = Vue.ref();
25 let cardData = Vue.ref([]); 39 let cardData = Vue.ref([]);
26 - let card = Vue.ref({}) 40 + let card = Vue.ref({});
  41 + let count = Vue.ref(0);
27 let cardOpen = Vue.ref(false); 42 let cardOpen = Vue.ref(false);
28 let cardName = Vue.ref('展开'); 43 let cardName = Vue.ref('展开');
29 44
30 -  
31 let openOrCloseDialtest = () => { 45 let openOrCloseDialtest = () => {
32 cardOpen.value = !cardOpen.value; 46 cardOpen.value = !cardOpen.value;
33 if (cardOpen.value){ 47 if (cardOpen.value){
@@ -41,17 +55,21 @@ export default { @@ -41,17 +55,21 @@ export default {
41 } 55 }
42 } 56 }
43 57
44 -  
45 let getDialtestList = () => { 58 let getDialtestList = () => {
46 let params = { 59 let params = {
47 faultNo: props.faultNo, 60 faultNo: props.faultNo,
48 - targetType: props.targetType.toLocaleLowerCase() 61 + targetType: props.targetType.toLocaleLowerCase(),
  62 + //lsq 更多列表 增加分页 2022-08-09
  63 + page:props.page,
  64 + limit:props.limit
49 } 65 }
50 66
51 store.dispatch('getFaultList', params).then((res) => { 67 store.dispatch('getFaultList', params).then((res) => {
52 if (res.data && res.success) { 68 if (res.data && res.success) {
53 dialTest.value = res.data[0]; 69 dialTest.value = res.data[0];
54 card.value = res.data[0].faultFixInfoList; 70 card.value = res.data[0].faultFixInfoList;
  71 + //lsq 更多列表增加分页总条数 2022-08-09
  72 + count.value = res.count;
55 } 73 }
56 }).catch(e => { 74 }).catch(e => {
57 console.log(e); 75 console.log(e);
@@ -75,9 +93,11 @@ export default { @@ -75,9 +93,11 @@ export default {
75 } 93 }
76 } 94 }
77 95
78 -  
79 - 96 + //lsq 汇总信息中点击事件类型 2022-08-09
  97 + let clickType=Vue.ref('');
  98 + let diagnosticItem=Vue.ref('');
80 const openBusScenarios = () => { 99 const openBusScenarios = () => {
  100 + clickType.value='BusScenarios';
81 let param = [{ 101 let param = [{
82 prop: 'taskName', 102 prop: 'taskName',
83 label: '名称', 103 label: '名称',
@@ -92,18 +112,21 @@ export default { @@ -92,18 +112,21 @@ export default {
92 } 112 }
93 } 113 }
94 }] 114 }]
95 - service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断业务场景'); 115 + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断业务场景',props.page,props.limit);
96 } 116 }
97 const openKpiList = () => { 117 const openKpiList = () => {
98 - service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); 118 + clickType.value='KpiList';
  119 + service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase(),'',props.page,props.limit);
99 } 120 }
100 121
101 const openMoreDialog = () => { 122 const openMoreDialog = () => {
102 - service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined, props.faultNo, props.targetType.toLocaleLowerCase()); 123 + service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined, props.faultNo, props.targetType.toLocaleLowerCase(),count.value,props.limit);
103 } 124 }
104 //诊断项（正常、异常） 125 //诊断项（正常、异常）
105 const openDiagnosticItem = (type) => { 126 const openDiagnosticItem = (type) => {
106 - service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type); 127 + clickType.value='DiagnosticItem';
  128 + diagnosticItem.value=type;
  129 + service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type,props.page,props.limit);
107 } 130 }
108 131
109 const visibilityChange = (e, item) => { 132 const visibilityChange = (e, item) => {
@@ -122,9 +145,27 @@ export default { @@ -122,9 +145,27 @@ export default {
122 Vue.onMounted(() => { 145 Vue.onMounted(() => {
123 getDialtestList(); 146 getDialtestList();
124 }) 147 })
125 - 148 + //lsq 更多列表切换页码 2022-08-09
  149 + Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
  150 + //lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码 2022-08-09
  151 + if(!props.dialogFlg){
  152 + if(clickType.value=='BusScenarios'){
  153 + openBusScenarios();
  154 + }else if(clickType.value=='KpiList'){
  155 + openKpiList();
  156 + }else if(clickType.value=='DiagnosticItem'){
  157 + openDiagnosticItem(diagnosticItem.value);
  158 + }else{
  159 + getDialtestList();
  160 + setTimeout(function(){
  161 + openMoreDialog();
  162 + },400)
  163 + }
  164 + }
  165 + })
126 return { 166 return {
127 card, 167 card,
  168 + count,
128 openOrCloseDialtest, 169 openOrCloseDialtest,
129 cardName, 170 cardName,
130 cardOpen, 171 cardOpen,
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <el-empty :image-size="50" /> 68 <el-empty :image-size="50" />
69 </div> 69 </div>
70 <div v-else> 70 <div v-else>
71 - <res-item v-for="item in card" v-if="cardOpen" :parentEmit="parentEmit" :cardList="item" :faultNo="faultNo" :targetType="targetType"/> 71 + <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"/>
72 </div> 72 </div>
73 73
74 74
@@ -18,6 +18,20 @@ export default { @@ -18,6 +18,20 @@ export default {
18 targetType: { 18 targetType: {
19 type: String, 19 type: String,
20 default: '' 20 default: ''
  21 + },
  22 + //lsq 更多列表增加分页当前页及每页显示条数 2022-08-09
  23 + limit:{
  24 + type:String,
  25 + default:'50'
  26 + },
  27 + page:{
  28 + type:String,
  29 + default:'1'
  30 + },
  31 + //lsq 弹框关闭的状态 2022-08-10
  32 + dialogFlg:{
  33 + type:String,
  34 + default:''
21 } 35 }
22 }, 36 },
23 data() { 37 data() {
@@ -40,10 +54,13 @@ export default { @@ -40,10 +54,13 @@ export default {
40 } 54 }
41 let faultNo = props.faultNo; 55 let faultNo = props.faultNo;
42 let targetType = props.targetType.toLocaleLowerCase(); 56 let targetType = props.targetType.toLocaleLowerCase();
43 - let getDialtestList = () => { 57 + let getDialtestList = (flg) => {
44 let params = { 58 let params = {
45 faultNo: props.faultNo, 59 faultNo: props.faultNo,
46 - targetType: props.targetType.toLocaleLowerCase() 60 + targetType: props.targetType.toLocaleLowerCase(),
  61 + //lsq 更多列表 增加分页 2022-08-10
  62 + page:props.page,
  63 + limit:props.limit
47 } 64 }
48 65
49 store.dispatch('getFaultList', params).then((res) => { 66 store.dispatch('getFaultList', params).then((res) => {
@@ -56,7 +73,9 @@ export default { @@ -56,7 +73,9 @@ export default {
56 } 73 }
57 card.value = arr; 74 card.value = arr;
58 } 75 }
59 - openOrCloseBase(); 76 + if(!flg){
  77 + openOrCloseBase();
  78 + }
60 } 79 }
61 }).catch(e => { 80 }).catch(e => {
62 console.log(e); 81 console.log(e);
@@ -68,9 +87,13 @@ export default { @@ -68,9 +87,13 @@ export default {
68 targetType: props.targetType.toLocaleLowerCase() 87 targetType: props.targetType.toLocaleLowerCase()
69 }); 88 });
70 } 89 }
71 - 90 + //lsq 汇总信息中点击事件类型 2022-08-09
  91 + let clickType=Vue.ref('');
  92 + let diagnosticItem=Vue.ref('');
72 //诊断资源 93 //诊断资源
73 const openBusScenarios = () => { 94 const openBusScenarios = () => {
  95 + itemresClass.value='';
  96 + clickType.value='BusScenarios';
74 let param = [{ 97 let param = [{
75 prop: 'resName', 98 prop: 'resName',
76 label: '资源名称', 99 label: '资源名称',
@@ -88,23 +111,53 @@ export default { @@ -88,23 +111,53 @@ export default {
88 prop: 'adminName', 111 prop: 'adminName',
89 label: '资源负责人', 112 label: '资源负责人',
90 }] 113 }]
91 - service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo, props.targetType.toLocaleLowerCase(), param, '', '诊断资源'); 114 + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo, props.targetType.toLocaleLowerCase(), param, '', '诊断资源',props.page,props.limit);
92 } 115 }
93 //诊断指标 116 //诊断指标
94 const openKpiList = () => { 117 const openKpiList = () => {
95 - service.sendEventDiagnoseKpiList(emit, props.faultNo, props.targetType.toLocaleLowerCase()); 118 + itemresClass.value='';
  119 + clickType.value='KpiList';
  120 + service.sendEventDiagnoseKpiList(emit, props.faultNo, props.targetType.toLocaleLowerCase(),'',props.page,props.limit);
96 } 121 }
97 122
98 //诊断项（正常、异常） 123 //诊断项（正常、异常）
99 const openDiagnosticItem = (type) => { 124 const openDiagnosticItem = (type) => {
100 - service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '', type); 125 + itemresClass.value='';
  126 + clickType.value='DiagnosticItem';
  127 + diagnosticItem.value=type;
  128 + service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '', type,props.page,props.limit);
  129 + }
  130 + //lsq 接受子组件传过来的类型 2022-08-10
  131 + let itemresClass=Vue.ref('');
  132 + let itemresClassMessage=(obj)=>{
  133 + itemresClass.value=obj.resClass;
  134 + clickType.value=obj.clickType;
101 } 135 }
102 -  
103 // 挂载完 136 // 挂载完
104 Vue.onMounted(() => { 137 Vue.onMounted(() => {
105 getDialtestList(); 138 getDialtestList();
106 }) 139 })
107 - 140 + //lsq 更多列表切换页码 2022-08-09
  141 + Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
  142 + //lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码，props.dialogFlg弹框关闭时不刷新 2022-08-09
  143 + if(!props.dialogFlg){
  144 + if(itemresClass.value){
  145 + if(clickType.value=='MoreDialog'){
  146 + getDialtestList(1);
  147 + }
  148 + }else{
  149 + if(clickType.value=='BusScenarios'){
  150 + openBusScenarios();
  151 + }else if(clickType.value=='KpiList'){
  152 + openKpiList();
  153 + }else if(clickType.value=='DiagnosticItem'){
  154 + openDiagnosticItem(diagnosticItem.value);
  155 + }
  156 + }
  157 + }else{
  158 + clickType.value='';
  159 + }
  160 + })
108 return { 161 return {
109 card, 162 card,
110 cardOpen, 163 cardOpen,
@@ -118,7 +171,9 @@ export default { @@ -118,7 +171,9 @@ export default {
118 faultNo, 171 faultNo,
119 targetType, 172 targetType,
120 parentEmit: emit, 173 parentEmit: emit,
121 - openDiagnosticItem 174 + openDiagnosticItem,
  175 + itemresClassMessage,
  176 + itemresClass,
122 } 177 }
123 } 178 }
124 } 179 }
@@ -21,6 +21,25 @@ export default { @@ -21,6 +21,25 @@ export default {
21 parentEmit:{ 21 parentEmit:{
22 type: Object, 22 type: Object,
23 default: {} 23 default: {}
  24 + },
  25 + //lsq 更多列表增加分页当前页及每页显示条数 2022-08-09
  26 + limit:{
  27 + type:String,
  28 + default:'50'
  29 + },
  30 + page:{
  31 + type:String,
  32 + default:'1'
  33 + },
  34 + //lsq 弹框关闭的状态 2022-08-10
  35 + dialogFlg:{
  36 + type:String,
  37 + default:''
  38 + },
  39 + //lsq 父组件汇总信息点击事件类型 2022-08-10
  40 + itemresClass:{
  41 + type:String,
  42 + default:''
24 } 43 }
25 }, 44 },
26 data() { 45 data() {
@@ -31,6 +50,8 @@ export default { @@ -31,6 +50,8 @@ export default {
31 50
32 let dialTest = Vue.ref([]); 51 let dialTest = Vue.ref([]);
33 let card = Vue.ref({}) 52 let card = Vue.ref({})
  53 + //lsq 数据count 2022-08-09
  54 + let count = Vue.ref(props.cardList?props.cardList.count?props.cardList.count:'0':'0');
34 let cardOpen = Vue.ref(false); 55 let cardOpen = Vue.ref(false);
35 let cardName = Vue.ref('展开'); 56 let cardName = Vue.ref('展开');
36 let alarmColor = Vue.ref(); 57 let alarmColor = Vue.ref();
@@ -110,21 +131,38 @@ export default { @@ -110,21 +131,38 @@ export default {
110 alarmColor.value = '#ff0000'; 131 alarmColor.value = '#ff0000';
111 } 132 }
112 } 133 }
  134 + //lsq 告警点击事件的resId
  135 + let AlarmResId=Vue.ref('');
113 const openAlarm = (resId) => { 136 const openAlarm = (resId) => {
  137 + //lsq 向父组件传递数据 2022-08-10
  138 + emit('itemresClass',{resClass:resClass})
  139 + clickType.value='Alarm';
  140 + AlarmResId.value=resId;
114 service.sendEventAlarmDialog(props.parentEmit, { 141 service.sendEventAlarmDialog(props.parentEmit, {
115 cardList: props.cardList, 142 cardList: props.cardList,
116 targetType: targetType, 143 targetType: targetType,
117 faultNo: faultNo, 144 faultNo: faultNo,
118 resClass:resClass, 145 resClass:resClass,
119 - resId:resId 146 + resId:resId,
  147 + page:props.page,
  148 + limit:props.limit
120 }); 149 });
121 } 150 }
  151 + //lsq 当前点击的resClass 2022-08-10
  152 + let currResClass=Vue.ref('');
122 const openMoreDialog = () => { 153 const openMoreDialog = () => {
123 - service.sendEventMoreDialog(props.parentEmit, proxy.$global, props.cardList.faultFixInfoList,undefined,faultNo, targetType); 154 + emit('itemresClass',{resClass:resClass,clickType:'MoreDialog'})
  155 + clickType.value='MoreDialog';
  156 + currResClass.value=resClass;
  157 + service.sendEventMoreDialog(props.parentEmit, proxy.$global, props.cardList.faultFixInfoList,undefined,faultNo, targetType,count.value,props.limit);
124 } 158 }
125 - 159 + //lsq 汇总信息中点击事件类型 2022-08-09
  160 + let clickType=Vue.ref('');
  161 + let diagnosticItem=Vue.ref('');
126 //诊断资源 162 //诊断资源
127 const openBusScenarios = () => { 163 const openBusScenarios = () => {
  164 + emit('itemresClass',{resClass:resClass})
  165 + clickType.value='BusScenarios';
128 let param = [{ 166 let param = [{
129 prop: 'resName', 167 prop: 'resName',
130 label: '资源名称', 168 label: '资源名称',
@@ -141,16 +179,21 @@ export default { @@ -141,16 +179,21 @@ export default {
141 prop: 'adminName', 179 prop: 'adminName',
142 label: '资源负责人', 180 label: '资源负责人',
143 }] 181 }]
144 - service.sendEventDiagnoseBusinessScenarios(props.parentEmit, faultNo,targetType,param,resClass,'诊断资源'); 182 + service.sendEventDiagnoseBusinessScenarios(props.parentEmit, faultNo,targetType,param,resClass,'诊断资源',props.page,props.limit);
145 } 183 }
146 //诊断指标 184 //诊断指标
147 const openKpiList = () => { 185 const openKpiList = () => {
148 - service.sendEventDiagnoseKpiList(props.parentEmit, faultNo,targetType,resClass); 186 + emit('itemresClass',{resClass:resClass})
  187 + clickType.value='KpiList';
  188 + service.sendEventDiagnoseKpiList(props.parentEmit, faultNo,targetType,resClass,props.page,props.limit);
149 } 189 }
150 190
151 //诊断项（正常、异常） 191 //诊断项（正常、异常）
152 const openDiagnosticItem = (type) => { 192 const openDiagnosticItem = (type) => {
153 - service.sendEventNormalDialog(props.parentEmit, proxy.$global, faultNo, targetType, resClass,type); 193 + emit('itemresClass',{resClass:resClass})
  194 + clickType.value='DiagnosticItem';
  195 + diagnosticItem.value=type;
  196 + service.sendEventNormalDialog(props.parentEmit, proxy.$global, faultNo, targetType, resClass,type,props.page,props.limit);
154 } 197 }
155 198
156 let openResPonse = (kpiId,redId,title) =>{ 199 let openResPonse = (kpiId,redId,title) =>{
@@ -170,8 +213,32 @@ export default { @@ -170,8 +213,32 @@ export default {
170 getAlarmColor(cardList); 213 getAlarmColor(cardList);
171 }) 214 })
172 215
  216 + //lsq 更多列表切换页码 2022-08-09
  217 + Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
  218 + //lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码 2022-08-09
  219 + if(!props.dialogFlg){
  220 + if(clickType.value=='BusScenarios'){
  221 + openBusScenarios();
  222 + }else if(clickType.value=='KpiList'){
  223 + openKpiList();
  224 + }else if(clickType.value=='DiagnosticItem'){
  225 + openDiagnosticItem(diagnosticItem.value);
  226 + }else if(clickType.value=='Alarm'){
  227 + openAlarm(AlarmResId.value)
  228 + }else if(clickType.value=='MoreDialog'){
  229 + setTimeout(function (){
  230 + if(props.itemresClass==props.cardList.resClass){
  231 + openMoreDialog();
  232 + }
  233 + },400)
  234 + }
  235 + }else{
  236 + clickType.value='';
  237 + }
  238 + })
173 return { 239 return {
174 card, 240 card,
  241 + count,
175 openOrCloseCard, 242 openOrCloseCard,
176 cardName, 243 cardName,
177 cardOpen, 244 cardOpen,
@@ -186,7 +253,7 @@ export default { @@ -186,7 +253,7 @@ export default {
186 openKpiList, 253 openKpiList,
187 resClass, 254 resClass,
188 openDiagnosticItem, 255 openDiagnosticItem,
189 - openResPonse 256 + openResPonse,
190 } 257 }
191 } 258 }
192 } 259 }
@@ -13,6 +13,20 @@ export default { @@ -13,6 +13,20 @@ export default {
13 targetType: { 13 targetType: {
14 type: String, 14 type: String,
15 default: '' 15 default: ''
  16 + },
  17 + //lsq 更多列表增加分页当前页每页显示条数 2022-08-09
  18 + limit:{
  19 + type:String,
  20 + default:'50'
  21 + },
  22 + page:{
  23 + type:String,
  24 + default:'1'
  25 + },
  26 + //lsq 弹框关闭的状态 2022-08-10
  27 + dialogFlg:{
  28 + type:String,
  29 + default:''
16 } 30 }
17 }, 31 },
18 data() { 32 data() {
@@ -24,6 +38,7 @@ export default { @@ -24,6 +38,7 @@ export default {
24 38
25 let dialTest = Vue.ref(); 39 let dialTest = Vue.ref();
26 let card = Vue.ref({}) 40 let card = Vue.ref({})
  41 + let count = Vue.ref(0);
27 let cardOpen = Vue.ref(false); 42 let cardOpen = Vue.ref(false);
28 let cardData = Vue.ref([]); 43 let cardData = Vue.ref([]);
29 let cardName = Vue.ref('展开'); 44 let cardName = Vue.ref('展开');
@@ -72,23 +87,32 @@ export default { @@ -72,23 +87,32 @@ export default {
72 let getNpmList = () => { 87 let getNpmList = () => {
73 let params = { 88 let params = {
74 faultNo: props.faultNo, 89 faultNo: props.faultNo,
75 - targetType: props.targetType.toLocaleLowerCase() 90 + targetType: props.targetType.toLocaleLowerCase(),
  91 + //lsq 更多列表 增加分页 2022-08-09
  92 + page:props.page,
  93 + limit:props.limit
76 } 94 }
77 95
78 store.dispatch('getFaultList', params).then((res) => { 96 store.dispatch('getFaultList', params).then((res) => {
79 if (res.data && res.success) { 97 if (res.data && res.success) {
80 dialTest.value = res.data[0]; 98 dialTest.value = res.data[0];
81 card.value = dialTest.value.faultFixInfoList; 99 card.value = dialTest.value.faultFixInfoList;
  100 + //lsq 更多列表增加分页总条数 2022-08-09
  101 + count.value = res.count;
82 } 102 }
83 }).catch(e => { 103 }).catch(e => {
84 console.log(e); 104 console.log(e);
85 }) 105 })
86 } 106 }
87 const openMoreDialog = () => { 107 const openMoreDialog = () => {
88 - service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined, props.faultNo, props.targetType.toLocaleLowerCase()); 108 + service.sendEventMoreDialog(emit, proxy.$global, card.value,undefined, props.faultNo, props.targetType.toLocaleLowerCase(),count.value,props.limit);
89 } 109 }
  110 + //lsq 汇总信息中点击事件类型 2022-08-09
  111 + let clickType=Vue.ref('');
  112 + let diagnosticItem=Vue.ref('');
90 //诊断链路场景 113 //诊断链路场景
91 const openBusScenarios = () => { 114 const openBusScenarios = () => {
  115 + clickType.value='BusScenarios';
92 let param = [{ 116 let param = [{
93 prop: 'streamName', 117 prop: 'streamName',
94 label: '名称', 118 label: '名称',
@@ -96,7 +120,7 @@ export default { @@ -96,7 +120,7 @@ export default {
96 prop: 'createBy', 120 prop: 'createBy',
97 label: '创建用户', 121 label: '创建用户',
98 }] 122 }]
99 - service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断链路场景'); 123 + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断链路场景',props.page,props.limit);
100 } 124 }
101 125
102 let openResPonse = (kpiId,redId,title) =>{ 126 let openResPonse = (kpiId,redId,title) =>{
@@ -112,11 +136,14 @@ export default { @@ -112,11 +136,14 @@ export default {
112 136
113 //诊断指标 137 //诊断指标
114 const openKpiList = () => { 138 const openKpiList = () => {
115 - service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); 139 + clickType.value='KpiList';
  140 + service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase(),'',props.page,props.limit);
116 } 141 }
117 //诊断项（正常、异常） 142 //诊断项（正常、异常）
118 const openDiagnosticItem = (type) => { 143 const openDiagnosticItem = (type) => {
119 - service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type); 144 + clickType.value='DiagnosticItem';
  145 + diagnosticItem.value=type;
  146 + service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type,props.page,props.limit);
120 } 147 }
121 const visibilityChange = (e, item) => { 148 const visibilityChange = (e, item) => {
122 const ev = e.target; 149 const ev = e.target;
@@ -135,10 +162,28 @@ export default { @@ -135,10 +162,28 @@ export default {
135 Vue.onMounted(() => { 162 Vue.onMounted(() => {
136 getNpmList(); 163 getNpmList();
137 }) 164 })
138 - 165 + //lsq 更多列表切换页码 2022-08-09
  166 + Vue.watch(() => [props.page, props.limit], ([newValue, newValue1],[oldVlaue, oldVlaue1]) => {
  167 + //lsq 诊断业务场景,诊断指标，诊断项（正常，异常）切换页码 2022-08-09
  168 + if(!props.dialogFlg){
  169 + if(clickType.value=='BusScenarios'){
  170 + openBusScenarios();
  171 + }else if(clickType.value=='KpiList'){
  172 + openKpiList();
  173 + }else if(clickType.value=='DiagnosticItem'){
  174 + openDiagnosticItem(diagnosticItem.value);
  175 + }else{
  176 + getNpmList();
  177 + setTimeout(function(){
  178 + openMoreDialog();
  179 + },400)
  180 + }
  181 + }
  182 + })
139 183
140 return { 184 return {
141 card, 185 card,
  186 + count,
142 cardName, 187 cardName,
143 openOrCloseNpm, 188 openOrCloseNpm,
144 cardOpen, 189 cardOpen,
@@ -22,6 +22,9 @@ @@ -22,6 +22,9 @@
22 :colType="item.colType" 22 :colType="item.colType"
23 :itemName="item.itemName" 23 :itemName="item.itemName"
24 :showDetail="item.detail" 24 :showDetail="item.detail"
  25 + :limit="item.limit"
  26 + :page="item.page"
  27 + :dialogFlg="item.dialogFlg?item.dialogFlg:''"
25 @openDialog="openDialog" 28 @openDialog="openDialog"
26 @getResList=""/> 29 @getResList=""/>
27 </el-card> 30 </el-card>
@@ -52,14 +55,17 @@ @@ -52,14 +55,17 @@
52 <cm-dialog top="3vh" title="告警列表" width="90%" :showDialogVisible="alarmFlg" 55 <cm-dialog top="3vh" title="告警列表" width="90%" :showDialogVisible="alarmFlg"
53 @hidedialog="showAlarmDialog" :showFooter="false"> 56 @hidedialog="showAlarmDialog" :showFooter="false">
54 <template v-slot> 57 <template v-slot>
55 - <div style="height:720px;max-height:720px;overflow-y: auto;"> 58 + <div >
  59 + <!--lsq 列表更改为分页列表 2022-08-10-->
56 <cm-table-page v-if="alarmList.columns.length > 0" :columns="alarmList.columns" 60 <cm-table-page v-if="alarmList.columns.length > 0" :columns="alarmList.columns"
57 :dataList="alarmList.dataList" 61 :dataList="alarmList.dataList"
58 :showIndex="true" 62 :showIndex="true"
59 :showBorder="true" 63 :showBorder="true"
60 @loaddata="loadPage" 64 @loaddata="loadPage"
61 - :showPage="false"  
62 - :height="720" 65 + :showPage="true"
  66 + :total="alarmList.count"
  67 + :pageSize="alarmList.limit"
  68 + :height="500"
63 :showTools="false"> 69 :showTools="false">
64 </cm-table-page> 70 </cm-table-page>
65 </div> 71 </div>
@@ -82,11 +88,15 @@ @@ -82,11 +88,15 @@
82 @hidedialog="showMoreDialog" :showFooter="false"> 88 @hidedialog="showMoreDialog" :showFooter="false">
83 <template v-slot> 89 <template v-slot>
84 <div> 90 <div>
  91 + <!--lsq 列表更改为分页列表 2022-08-09-->
85 <cm-table-page v-if="moreObj.columns.length > 0" :columns="moreObj.columns" 92 <cm-table-page v-if="moreObj.columns.length > 0" :columns="moreObj.columns"
86 :dataList="moreObj.data" 93 :dataList="moreObj.data"
87 :showIndex="true" 94 :showIndex="true"
88 :showBorder="true" 95 :showBorder="true"
89 - :showPage="false" 96 + :showPage="true"
  97 + :total="moreObj.count"
  98 + :pageSize="moreObj.limit"
  99 + @loaddata="loadTableDataList"
90 :height="500" 100 :height="500"
91 :showTools="false"> 101 :showTools="false">
92 </cm-table-page> 102 </cm-table-page>
@@ -43,7 +43,9 @@ export default { @@ -43,7 +43,9 @@ export default {
43 itemName: '场景名称', 43 itemName: '场景名称',
44 detail: false, 44 detail: false,
45 colType: 'kpi', 45 colType: 'kpi',
46 - state: '0' 46 + state: '0',
  47 + limit:50,
  48 + page:1,
47 }, { 49 }, {
48 faultType: 'NETLINK', 50 faultType: 'NETLINK',
49 faultTypeName: '网络链路', 51 faultTypeName: '网络链路',
@@ -59,7 +61,9 @@ export default { @@ -59,7 +61,9 @@ export default {
59 itemName: '链路（流名称）', 61 itemName: '链路（流名称）',
60 detail: false, 62 detail: false,
61 colType: 'kpi', 63 colType: 'kpi',
62 - state: '0' 64 + state: '0',
  65 + limit:50,
  66 + page:1,
63 }, { 67 }, {
64 faultType: 'APM', 68 faultType: 'APM',
65 faultTypeName: 'APM', 69 faultTypeName: 'APM',
@@ -68,7 +72,9 @@ export default { @@ -68,7 +72,9 @@ export default {
68 itemName: '检测指标', 72 itemName: '检测指标',
69 detail: true, 73 detail: true,
70 colType: 'flag', 74 colType: 'flag',
71 - state: '0' 75 + state: '0',
  76 + limit:50,
  77 + page:1,
72 }, { 78 }, {
73 faultType: 'BASE', 79 faultType: 'BASE',
74 faultTypeName: '基础', 80 faultTypeName: '基础',
@@ -77,7 +83,9 @@ export default { @@ -77,7 +83,9 @@ export default {
77 itemName: '检测指标', 83 itemName: '检测指标',
78 detail: true, 84 detail: true,
79 colType: 'flag', 85 colType: 'flag',
80 - state: '0' 86 + state: '0',
  87 + limit:50,
  88 + page:1,
81 }, { 89 }, {
82 faultType: 'faultHis', 90 faultType: 'faultHis',
83 faultTypeName: '知识库', 91 faultTypeName: '知识库',
@@ -86,7 +94,9 @@ export default { @@ -86,7 +94,9 @@ export default {
86 itemName: '知识库', 94 itemName: '知识库',
87 detail: true, 95 detail: true,
88 colType: 'flag', 96 colType: 'flag',
89 - state: '1' 97 + state: '1',
  98 + limit:50,
  99 + page:1,
90 }] 100 }]
91 }); 101 });
92 102
@@ -97,6 +107,7 @@ export default { @@ -97,6 +107,7 @@ export default {
97 107
98 let moreDialog = Vue.ref(false); 108 let moreDialog = Vue.ref(false);
99 let moreDialogTitle = Vue.ref('更多'); 109 let moreDialogTitle = Vue.ref('更多');
  110 + let moreTargetType = Vue.ref();
100 let moreObj = Vue.ref({ 111 let moreObj = Vue.ref({
101 columns: [], 112 columns: [],
102 data: [] 113 data: []
@@ -104,8 +115,23 @@ export default { @@ -104,8 +115,23 @@ export default {
104 115
105 const showMoreDialog = (flg, obj) => { 116 const showMoreDialog = (flg, obj) => {
106 moreDialog.value = flg; 117 moreDialog.value = flg;
107 -  
108 moreObj.value = obj; 118 moreObj.value = obj;
  119 +
  120 + //lsq 弹框关闭时page默认为1 2022-08-10
  121 + setDialogFlg(flg);
  122 + }
  123 + let setDialogFlg=(flg)=>{
  124 + if(!flg){
  125 + faultDetailDetailInfo.value.items.map(item=>{
  126 + item.page=1;
  127 + item.limit=50;
  128 + item.dialogFlg=true;
  129 + })
  130 + }else{
  131 + faultDetailDetailInfo.value.items.map(item=>{
  132 + item.dialogFlg='';
  133 + })
  134 + }
109 } 135 }
110 136
111 /** 137 /**
@@ -154,7 +180,10 @@ export default { @@ -154,7 +180,10 @@ export default {
154 // 展示弹框 180 // 展示弹框
155 const openDialog = (type, {faultNo, targetType, resId, kpiId, flag, resClass,title}, obj) => { 181 const openDialog = (type, {faultNo, targetType, resId, kpiId, flag, resClass,title}, obj) => {
156 if (type === 'alarm') { 182 if (type === 'alarm') {
157 - service.openAlarmDialog(proxy, faultNo, targetType, resId, kpiId, flag, resClass); 183 + //lsq 更多列表的类型 2022-08-10
  184 + moreTargetType.value= targetType;
  185 + service.openAlarmDialog(proxy, faultNo, targetType, resId, kpiId, flag, resClass,obj.page,obj.limit);
  186 + showAlarmDialog(true)
158 } else /*if (type === 'resList') { 187 } else /*if (type === 'resList') {
159 service.handleClick(proxy, faultNo, targetType, resId, kpiId, flag); 188 service.handleClick(proxy, faultNo, targetType, resId, kpiId, flag);
160 } else*/ if (type === 'line') { 189 } else*/ if (type === 'line') {
@@ -162,11 +191,17 @@ export default { @@ -162,11 +191,17 @@ export default {
162 } else if (type === 'more') { 191 } else if (type === 'more') {
163 // 展示更多 192 // 展示更多
164 moreDialogTitle.value = obj.title; 193 moreDialogTitle.value = obj.title;
  194 + //lsq 更多列表的类型 2022-08-09
  195 + moreTargetType.value= targetType;
165 showMoreDialog(true, obj); 196 showMoreDialog(true, obj);
166 } 197 }
167 } 198 }
168 -  
169 - 199 + //lsq 告警列表弹框 2022-08-10
  200 + let alarmFlg=Vue.ref(false);
  201 + let showAlarmDialog=(flg)=>{
  202 + alarmFlg.value=flg;
  203 + setDialogFlg(flg)
  204 + }
170 const openFaultReport = () => { 205 const openFaultReport = () => {
171 206
172 var domain = proxy.$http.getGateWay() 207 var domain = proxy.$http.getGateWay()
@@ -180,13 +215,33 @@ export default { @@ -180,13 +215,33 @@ export default {
180 } 215 }
181 }); 216 });
182 } 217 }
183 - 218 + //lsq 重新加载表格数据 2022-08-09
  219 + // let childRef=Vue.ref()
  220 + let loadTableDataList = ({page, limit}) => {
  221 + faultDetailDetailInfo.value.items.map(item=>{
  222 + if(item.faultType.toLocaleLowerCase()==moreTargetType.value){
  223 + item.page=page;
  224 + item.limit=limit;
  225 + }
  226 + })
  227 + }
  228 + //lsq 重新加载表格数据 告警列表 2022-08-10
  229 + let loadPage = ({page, limit}) => {
  230 + faultDetailDetailInfo.value.items.map(item=>{
  231 + if(item.faultType.toLocaleLowerCase()==moreTargetType.value){
  232 + item.page=page;
  233 + item.limit=limit;
  234 + }
  235 + })
  236 + }
184 237
185 Vue.onMounted(() => { 238 Vue.onMounted(() => {
186 settingDetail(); 239 settingDetail();
187 }); 240 });
188 241
189 return { 242 return {
  243 + loadTableDataList,
  244 + loadPage,
190 faultDetailDialogTitle, 245 faultDetailDialogTitle,
191 faultDetailDetailInfo, 246 faultDetailDetailInfo,
192 openDialog, 247 openDialog,
@@ -194,8 +249,11 @@ export default { @@ -194,8 +249,11 @@ export default {
194 moreDialog, 249 moreDialog,
195 showMoreDialog, 250 showMoreDialog,
196 moreDialogTitle, 251 moreDialogTitle,
  252 + moreTargetType,
197 openFaultReport, 253 openFaultReport,
198 - ...service 254 + ...service,
  255 + showAlarmDialog,
  256 + alarmFlg
199 } 257 }
200 } 258 }
201 } 259 }
@@ -79,14 +79,16 @@ const alarmService = () => { @@ -79,14 +79,16 @@ const alarmService = () => {
79 let alarmList = Vue.ref({ 79 let alarmList = Vue.ref({
80 columns: [], 80 columns: [],
81 dataList: [], 81 dataList: [],
82 - total: 0 82 + total: 0,
  83 + page:1,
  84 + limit:50
83 }); 85 });
84 86
85 let showAlarmDialog = (flg) => { 87 let showAlarmDialog = (flg) => {
86 alarmFlg.value = flg; 88 alarmFlg.value = flg;
87 } 89 }
88 90
89 - let openAlarmDialog = (proxy, faultNo, targetType, resId, kpiId, flag, resClass) => { 91 + let openAlarmDialog = (proxy, faultNo, targetType, resId, kpiId, flag, resClass,page,limit) => {
90 showAlarmDialog(true); 92 showAlarmDialog(true);
91 // 获取告警列表 93 // 获取告警列表
92 let params = { 94 let params = {
@@ -96,9 +98,12 @@ const alarmService = () => { @@ -96,9 +98,12 @@ const alarmService = () => {
96 targetType: targetType, 98 targetType: targetType,
97 resId: resId, 99 resId: resId,
98 kpiId: kpiId, 100 kpiId: kpiId,
99 - flag: flag 101 + flag: flag,
  102 + page:page?page:1,
  103 + limit:limit?limit:50
100 } 104 }
101 - 105 + //lsq 设置分页显示条数 2022-08-10
  106 + alarmList.value.limit=limit;
102 // 设置表头内容 107 // 设置表头内容
103 alarmList.value.columns = [{ 108 alarmList.value.columns = [{
104 prop: "resId", 109 prop: "resId",
@@ -154,6 +159,8 @@ const alarmService = () => { @@ -154,6 +159,8 @@ const alarmService = () => {
154 if (res.data) { 159 if (res.data) {
155 alarmList.value.dataList = res.data; 160 alarmList.value.dataList = res.data;
156 } 161 }
  162 + //lsq 设置总条数 2022-08-10
  163 + alarmList.value.count=res.count;
157 } else { 164 } else {
158 proxy.$global.showMsg(res.msg ? res.msg : '暂无告警数据！', "warning"); 165 proxy.$global.showMsg(res.msg ? res.msg : '暂无告警数据！', "warning");
159 } 166 }
@@ -264,7 +271,7 @@ const faultEvent = () => { @@ -264,7 +271,7 @@ const faultEvent = () => {
264 * @param params 271 * @param params
265 */ 272 */
266 const sendEventAlarmDialog = (emit, params) => { 273 const sendEventAlarmDialog = (emit, params) => {
267 - emit('openDialog', 'alarm', getParams(params)); 274 + emit('openDialog', 'alarm', getParams(params),{page:params.page,limit:params.limit});
268 } 275 }
269 276
270 // /** 277 // /**
@@ -291,7 +298,7 @@ const faultEvent = () => { @@ -291,7 +298,7 @@ const faultEvent = () => {
291 * @param global 298 * @param global
292 * @param arr [[{指标对象},{指标对象},....].[{指标对象},{指标对象},....]] 299 * @param arr [[{指标对象},{指标对象},....].[{指标对象},{指标对象},....]]
293 */ 300 */
294 - const sendEventMoreDialog = (emit, global, arr, title, faultNo, targetType) => { 301 + const sendEventMoreDialog = (emit, global, arr, title, faultNo, targetType,count,limit) => {
295 if (!arr || arr.length == 0) { 302 if (!arr || arr.length == 0) {
296 global.showMsg("暂无数据！", "warning"); 303 global.showMsg("暂无数据！", "warning");
297 return; 304 return;
@@ -307,7 +314,11 @@ const faultEvent = () => { @@ -307,7 +314,11 @@ const faultEvent = () => {
307 prop: 'taskName', 314 prop: 'taskName',
308 label: '名称', 315 label: '名称',
309 }], 316 }],
310 - data: [] 317 + data: [],
  318 + //lsq 更多列表增加分页总条数,每页显示条数 2022-08-09
  319 + count:count?count:0,
  320 + limit:limit?limit:50,
  321 + type:'more'
311 } 322 }
312 if (arr.length == undefined) { 323 if (arr.length == undefined) {
313 arr = []; 324 arr = [];
@@ -372,7 +383,7 @@ const faultEvent = () => { @@ -372,7 +383,7 @@ const faultEvent = () => {
372 obj.data.push(dataItem); 383 obj.data.push(dataItem);
373 }) 384 })
374 385
375 - emit('openDialog', 'more', {}, obj); 386 + emit('openDialog', 'more', {faultNo,targetType}, obj);
376 } 387 }
377 388
378 /** 389 /**
@@ -381,7 +392,7 @@ const faultEvent = () => { @@ -381,7 +392,7 @@ const faultEvent = () => {
381 * @param global 392 * @param global
382 * @param arr [[{指标对象},{指标对象},....].[{指标对象},{指标对象},....]] 393 * @param arr [[{指标对象},{指标对象},....].[{指标对象},{指标对象},....]]
383 */ 394 */
384 - const sendEventNormalDialog = (emit, global, faultNo, targetType, resClass, type) => { 395 + const sendEventNormalDialog = (emit, global, faultNo, targetType, resClass, type,page,limit) => {
385 // if (!arr || arr.length == 0) { 396 // if (!arr || arr.length == 0) {
386 // global.showMsg("暂无数据！", "warning"); 397 // global.showMsg("暂无数据！", "warning");
387 // return; 398 // return;
@@ -462,11 +473,15 @@ const faultEvent = () => { @@ -462,11 +473,15 @@ const faultEvent = () => {
462 isAbnormal: isAbnormal, 473 isAbnormal: isAbnormal,
463 resClass: resClass, 474 resClass: resClass,
464 targetType: targetType, 475 targetType: targetType,
465 - faultNo: faultNo 476 + faultNo: faultNo,
  477 + page:page?page:1,
  478 + limit:limit?limit:50
466 }).then((res) => { 479 }).then((res) => {
467 if (res && res.success) { 480 if (res && res.success) {
468 obj.data = res.data; 481 obj.data = res.data;
469 - emit('openDialog', 'more', {}, obj); 482 + obj.count = res.count;
  483 + obj.limit = limit;
  484 + emit('openDialog', 'more', {faultNo,targetType}, obj);
470 } else { 485 } else {
471 global.showMsg(res.msg, "warning"); 486 global.showMsg(res.msg, "warning");
472 } 487 }
@@ -481,7 +496,7 @@ const faultEvent = () => { @@ -481,7 +496,7 @@ const faultEvent = () => {
481 * @param targetType 诊断类型 496 * @param targetType 诊断类型
482 * @param columns 数组，表格列对象 497 * @param columns 数组，表格列对象
483 */ 498 */
484 - const sendEventDiagnoseBusinessScenarios = (emit, faultNo, targetType, columns, resClass, title) => { 499 + const sendEventDiagnoseBusinessScenarios = (emit, faultNo, targetType, columns, resClass, title,page,limit) => {
485 500
486 var obj = { 501 var obj = {
487 title: title, 502 title: title,
@@ -490,7 +505,10 @@ const faultEvent = () => { @@ -490,7 +505,10 @@ const faultEvent = () => {
490 } 505 }
491 var param = { 506 var param = {
492 faultNo: faultNo, 507 faultNo: faultNo,
493 - targetType: targetType 508 + targetType: targetType,
  509 + //lsq 更多列表增加分页总条数,每页显示条数 2022-08-09
  510 + page:page?page:1,
  511 + limit:limit?limit:50
494 } 512 }
495 if (resClass && resClass != '') { 513 if (resClass && resClass != '') {
496 param.resClass = resClass; 514 param.resClass = resClass;
@@ -499,7 +517,9 @@ const faultEvent = () => { @@ -499,7 +517,9 @@ const faultEvent = () => {
499 store.dispatch('getFaultBusinessList', param).then((res) => { 517 store.dispatch('getFaultBusinessList', param).then((res) => {
500 if (res && res.success) { 518 if (res && res.success) {
501 obj.data = res.data; 519 obj.data = res.data;
502 - emit('openDialog', 'more', {}, obj); 520 + obj.count = res.count;
  521 + obj.limit = limit;
  522 + emit('openDialog', 'more', {faultNo,targetType}, obj);
503 } 523 }
504 }); 524 });
505 } 525 }
@@ -512,7 +532,7 @@ const faultEvent = () => { @@ -512,7 +532,7 @@ const faultEvent = () => {
512 * @param targetType 诊断类型 532 * @param targetType 诊断类型
513 * @param columns 数组，表格列对象 533 * @param columns 数组，表格列对象
514 */ 534 */
515 - const sendEventDiagnoseKpiList = (emit, faultNo, targetType, resClass) => { 535 + const sendEventDiagnoseKpiList = (emit, faultNo, targetType, resClass,page,limit) => {
516 536
517 var obj = { 537 var obj = {
518 title: '诊断指标', 538 title: '诊断指标',
@@ -543,11 +563,15 @@ const faultEvent = () => { @@ -543,11 +563,15 @@ const faultEvent = () => {
543 store.dispatch('getFaultKpiList', { 563 store.dispatch('getFaultKpiList', {
544 faultNo: faultNo, 564 faultNo: faultNo,
545 targetType: targetType, 565 targetType: targetType,
546 - resClass: resClass 566 + resClass: resClass,
  567 + page:page?page:1,
  568 + limit:limit?limit:50
547 }).then((res) => { 569 }).then((res) => {
548 if (res && res.success) { 570 if (res && res.success) {
549 obj.data = res.data; 571 obj.data = res.data;
550 - emit('openDialog', 'more', {}, obj); 572 + obj.count = res.count;
  573 + obj.limit = limit;
  574 + emit('openDialog', 'more', {faultNo,targetType}, obj);
551 } 575 }
552 }); 576 });
553 577