monitor_v3 / anji-plus-report · Commits

Go to a project

Authored by 王涛
Commit f168672bedca784dbd83352df8497954be5b2442 2 parents bc4e99d6 a682e92d

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

分页表格resName也加上下探详情，分页表格resName也加上下探详情



See merge request !58
Inline Side-by-side
Showing 4 changed files with 20 additions and 8 deletions
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 content="查看拓扑图" 37 content="查看拓扑图"
38 placement="top" 38 placement="top"
39 > 39 >
40 - <i class="el-icon-orange" @click="resTopo(item)" ></i> 40 + <i class="el-icon-orange" @click="resTopo({resId:resId,resType:resType})" ></i>
41 </el-tooltip> 41 </el-tooltip>
42 </el-col> 42 </el-col>
43 </el-row> 43 </el-row>
@@ -370,12 +370,12 @@ @@ -370,12 +370,12 @@
370 const data = this.queryEchartsData(val); 370 const data = this.queryEchartsData(val);
371 data.then(res => { 371 data.then(res => {
372 console.log("1111",res) 372 console.log("1111",res)
373 - if (res && res[0].code == 0) 373 + if (res && res[0].code == 0){
374 this.informationDataAll = res[0].data; 374 this.informationDataAll = res[0].data;
375 if (this.informationDataAll && this.informationDataAll.length > 0) { 375 if (this.informationDataAll && this.informationDataAll.length > 0) {
376 this.informationDataAll.map(item => { 376 this.informationDataAll.map(item => {
377 if (typeof (item.value) != 'string') { 377 if (typeof (item.value) != 'string') {
378 - item.value = item.value[0].state; 378 + item.value =item.value[0].state;
379 } 379 }
380 if(this.tableHeadInfos.length==0) { 380 if(this.tableHeadInfos.length==0) {
381 item.isDisplay = '1'; 381 item.isDisplay = '1';
@@ -398,6 +398,9 @@ @@ -398,6 +398,9 @@
398 398
399 this.$store.commit('CHANGW_HEAD_INFO', addTableData); 399 this.$store.commit('CHANGW_HEAD_INFO', addTableData);
400 this.hackResetFun(); 400 this.hackResetFun();
  401 + }
  402 +
  403 +
401 }); 404 });
402 }, 405 },
403 // vue hack 之强制刷新组件 406 // vue hack 之强制刷新组件
@@ -477,7 +480,17 @@ @@ -477,7 +480,17 @@
477 this.titleName=this.$route.query.titleName; 480 this.titleName=this.$route.query.titleName;
478 this.resId=this.$route.query.resId; 481 this.resId=this.$route.query.resId;
479 this.resType=this.$route.query.resType; 482 this.resType=this.$route.query.resType;
  483 + if(this.resId){
  484 + this.handleInfoData();
480 } 485 }
  486 + },
  487 + //根据resId获取信息详情
  488 + handleInfoData() {
  489 + let optionsData = this.optionsData;
  490 + if (this.optionsData.dataType == "dynamicData") {
  491 + this.optionsData.dynamicData.contextData.resId = this.resId;
  492 + }
  493 + },
481 494
482 }, 495 },
483 } 496 }
@@ -507,7 +507,6 @@ export default { @@ -507,7 +507,6 @@ export default {
507 const series = val.series; 507 const series = val.series;
508 if(series && series.length>0){ 508 if(series && series.length>0){
509 series.map((item,index)=>{ 509 series.map((item,index)=>{
510 - console.log("series",item)  
511 if(item.name.indexOf('率')!=-1){ 510 if(item.name.indexOf('率')!=-1){
512 item.yAxisIndex= 1; 511 item.yAxisIndex= 1;
513 512
@@ -97,7 +97,7 @@ export default { @@ -97,7 +97,7 @@ export default {
97 let optionsData=this.optionsData; 97 let optionsData=this.optionsData;
98 if(this.optionsData.dataType=="dynamicData"){ 98 if(this.optionsData.dataType=="dynamicData"){
99 //改变参数值-月季度年，重新加载动态数据--待测 99 //改变参数值-月季度年，重新加载动态数据--待测
100 - this.optionsData.dynamicData.contextData.btnCode=val; 100 + this.optionsData.dynamicData.contextData.dataScope=val;
101 this.editorOptions(); 101 this.editorOptions();
102 } 102 }
103 } 103 }
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <span v-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='1'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >一般</span> 35 <span v-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='1'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >一般</span>
36 <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='2'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >重要</span> 36 <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='2'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >重要</span>
37 <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='3'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >严重</span> 37 <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='3'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >严重</span>
38 - <span v-else :class="{'spanLink':itemChild.key=='resTypeName'}" @click="goTrend(item,itemChild.key)">{{ item[itemChild.key] }}</span> 38 + <span v-else :class="{'spanLink':itemChild.key=='resTypeName' || itemChild.key=='resName'}" @click="goTrend(item,itemChild.key)">{{ item[itemChild.key] }}</span>
39 </el-tooltip> 39 </el-tooltip>
40 40
41 </div> 41 </div>
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 <span v-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='1'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >一般</span> 91 <span v-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='1'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >一般</span>
92 <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='2'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >重要</span> 92 <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='2'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >重要</span>
93 <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='3'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >严重</span> 93 <span v-else-if="itemChild.key=='alarmLevel' && item[itemChild.key]=='3'" :class="['table-level-normal',{'table-level-worse':item[itemChild.key]=='2','table-level-worst':item[itemChild.key]=='3'}]" >严重</span>
94 - <span v-else :class="{'spanLink':itemChild.key=='resTypeName'}" @click="goTrend(item,itemChild.key)">{{ item[itemChild.key] }}</span> 94 + <span v-else :class="{'spanLink':itemChild.key=='resTypeName' || itemChild.key=='resName'}" @click="goTrend(item,itemChild.key)">{{ item[itemChild.key] }}</span>
95 </el-tooltip> 95 </el-tooltip>
96 96
97 </div> 97 </div>
@@ -447,7 +447,7 @@ export default { @@ -447,7 +447,7 @@ export default {
447 }, 447 },
448 //打开详情页 448 //打开详情页
449 goTrend(item, itemChildKey) { 449 goTrend(item, itemChildKey) {
450 - if (itemChildKey == 'resTypeName') { 450 + if (itemChildKey == 'resTypeName' || itemChildKey == 'resName') {
451 let param = { 451 let param = {
452 type:'detail', 452 type:'detail',
453 data:{ 453 data:{