Authored by 王涛

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

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



See merge request !58
... ... @@ -37,7 +37,7 @@
content="查看拓扑图"
placement="top"
>
<i class="el-icon-orange" @click="resTopo(item)" ></i>
<i class="el-icon-orange" @click="resTopo({resId:resId,resType:resType})" ></i>
</el-tooltip>
</el-col>
</el-row>
... ... @@ -370,34 +370,37 @@
const data = this.queryEchartsData(val);
data.then(res => {
console.log("1111",res)
if (res && res[0].code == 0)
this.informationDataAll = res[0].data;
if (this.informationDataAll && this.informationDataAll.length > 0) {
if (res && res[0].code == 0){
this.informationDataAll = res[0].data;
if (this.informationDataAll && this.informationDataAll.length > 0) {
this.informationDataAll.map(item => {
if (typeof (item.value) != 'string') {
item.value = item.value[0].state;
}
if (typeof (item.value) != 'string') {
item.value =item.value[0].state;
}
if(this.tableHeadInfos.length==0) {
item.isDisplay = '1';
}
})
}
this.setDisplay();
let addTableData=[];
this.informationDataAll.map((item,index)=>{
addTableData.push({
key:item.code,
name:item.name,
width:"50%",
isDisplay:item.isDisplay,
state:item.state,
value:item.value
}
this.setDisplay();
let addTableData=[];
this.informationDataAll.map((item,index)=>{
addTableData.push({
key:item.code,
name:item.name,
width:"50%",
isDisplay:item.isDisplay,
state:item.state,
value:item.value
})
})
})
this.$store.commit('CHANGW_HEAD_INFO', addTableData);
this.hackResetFun();
this.$store.commit('CHANGW_HEAD_INFO', addTableData);
this.hackResetFun();
}
});
},
// vue hack 之强制刷新组件
... ... @@ -477,7 +480,17 @@
this.titleName=this.$route.query.titleName;
this.resId=this.$route.query.resId;
this.resType=this.$route.query.resType;
}
if(this.resId){
this.handleInfoData();
}
},
//根据resId获取信息详情
handleInfoData() {
let optionsData = this.optionsData;
if (this.optionsData.dataType == "dynamicData") {
this.optionsData.dynamicData.contextData.resId = this.resId;
}
},
},
}
... ...
... ... @@ -507,7 +507,6 @@ export default {
const series = val.series;
if(series && series.length>0){
series.map((item,index)=>{
console.log("series",item)
if(item.name.indexOf('率')!=-1){
item.yAxisIndex= 1;
... ...
... ... @@ -97,7 +97,7 @@ export default {
let optionsData=this.optionsData;
if(this.optionsData.dataType=="dynamicData"){
//改变参数值-月季度年,重新加载动态数据--待测
this.optionsData.dynamicData.contextData.btnCode=val;
this.optionsData.dynamicData.contextData.dataScope=val;
this.editorOptions();
}
}
... ...
... ... @@ -35,7 +35,7 @@
<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>
<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>
<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>
<span v-else :class="{'spanLink':itemChild.key=='resTypeName'}" @click="goTrend(item,itemChild.key)">{{ item[itemChild.key] }}</span>
<span v-else :class="{'spanLink':itemChild.key=='resTypeName' || itemChild.key=='resName'}" @click="goTrend(item,itemChild.key)">{{ item[itemChild.key] }}</span>
</el-tooltip>
</div>
... ... @@ -91,7 +91,7 @@
<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>
<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>
<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>
<span v-else :class="{'spanLink':itemChild.key=='resTypeName'}" @click="goTrend(item,itemChild.key)">{{ item[itemChild.key] }}</span>
<span v-else :class="{'spanLink':itemChild.key=='resTypeName' || itemChild.key=='resName'}" @click="goTrend(item,itemChild.key)">{{ item[itemChild.key] }}</span>
</el-tooltip>
</div>
... ... @@ -447,7 +447,7 @@ export default {
},
//打开详情页
goTrend(item, itemChildKey) {
if (itemChildKey == 'resTypeName') {
if (itemChildKey == 'resTypeName' || itemChildKey == 'resName') {
let param = {
type:'detail',
data:{
... ...