Commit 50782d4b authored by yanzhongrong's avatar yanzhongrong

bugfix

parent 243aafee
......@@ -24,7 +24,7 @@ export default {
},
props: {
type: {
type: Number,
type: [Number, String],
defualt: null,
},
curInfo: {
......
......@@ -40,7 +40,7 @@ export const DetailMixins = {
default: () => { },
},
type: {
type: Number,
type: [Number, String],
defualt: null,
},
curId: {
......
......@@ -67,7 +67,11 @@ export default {
},
computed:{
finalyText() {
return '趋势分析图形(' + this.curInfo.baseInfo.leakyCableDescribe + ')'
if(this.$route.query.name) {
return '趋势分析图形(' + this.$route.query.name + ')'
} else {
return '趋势分析图形(' + this.curInfo.baseInfo.leakyCableDescribe + ')'
}
},
isDisableYear() {
return this.year >= new Date().getFullYear()
......
......@@ -356,7 +356,7 @@ export default {
generateChart() {
this.curObj = []
this.curflag = 1
this.curObj.push(this.curId)
this.curObj.push(this.curInfo.baseInfo.leakyCableDescribe)
},
cancel() {
this.curflag = 0
......
......@@ -345,7 +345,7 @@ export default {
generateChart() {
this.curObj = []
this.curflag = 1
this.curObj.push(this.curId)
this.curObj.push(this.curInfo.baseInfo.leakyCableDescribe)
},
cancel() {
this.curflag = 0
......
......@@ -284,6 +284,7 @@ export default {
query: {
id: row.id,
type: 5,
name: row.leakyCableDescribe
},
});
},
......
......@@ -282,7 +282,8 @@ export default {
path: "/detail",
query: {
id: row.id,
type: 5,
type: 6,
name: row.feederDescribe
},
});
},
......
......@@ -24,24 +24,24 @@ export default {
let params = {
id: this.$route.query.id,
type: this.type,
name: this.$route.query.name
};
treeBaseInfo(params).then((res) => {
let controlLimit = res.controlLimit || []
if(controlLimit) {
let controlLimit = res.controlLimit || []
if (controlLimit) {
controlLimit.map(item => {
res[`type${item.type}`]= item.sum
res[`type${item.type}`] = item.sum
})
}
this.curInfo = res;
console.log(res);
});
},
},
created() {
this.getParams();
},
mounted() {},
mounted() { },
};
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment