Commit 50782d4b authored by yanzhongrong's avatar yanzhongrong

bugfix

parent 243aafee
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
}, },
props: { props: {
type: { type: {
type: Number, type: [Number, String],
defualt: null, defualt: null,
}, },
curInfo: { curInfo: {
......
...@@ -40,7 +40,7 @@ export const DetailMixins = { ...@@ -40,7 +40,7 @@ export const DetailMixins = {
default: () => { }, default: () => { },
}, },
type: { type: {
type: Number, type: [Number, String],
defualt: null, defualt: null,
}, },
curId: { curId: {
......
...@@ -67,7 +67,11 @@ export default { ...@@ -67,7 +67,11 @@ export default {
}, },
computed:{ computed:{
finalyText() { finalyText() {
if(this.$route.query.name) {
return '趋势分析图形(' + this.$route.query.name + ')'
} else {
return '趋势分析图形(' + this.curInfo.baseInfo.leakyCableDescribe + ')' return '趋势分析图形(' + this.curInfo.baseInfo.leakyCableDescribe + ')'
}
}, },
isDisableYear() { isDisableYear() {
return this.year >= new Date().getFullYear() return this.year >= new Date().getFullYear()
......
...@@ -356,7 +356,7 @@ export default { ...@@ -356,7 +356,7 @@ export default {
generateChart() { generateChart() {
this.curObj = [] this.curObj = []
this.curflag = 1 this.curflag = 1
this.curObj.push(this.curId) this.curObj.push(this.curInfo.baseInfo.leakyCableDescribe)
}, },
cancel() { cancel() {
this.curflag = 0 this.curflag = 0
......
...@@ -345,7 +345,7 @@ export default { ...@@ -345,7 +345,7 @@ export default {
generateChart() { generateChart() {
this.curObj = [] this.curObj = []
this.curflag = 1 this.curflag = 1
this.curObj.push(this.curId) this.curObj.push(this.curInfo.baseInfo.leakyCableDescribe)
}, },
cancel() { cancel() {
this.curflag = 0 this.curflag = 0
......
...@@ -284,6 +284,7 @@ export default { ...@@ -284,6 +284,7 @@ export default {
query: { query: {
id: row.id, id: row.id,
type: 5, type: 5,
name: row.leakyCableDescribe
}, },
}); });
}, },
......
...@@ -282,7 +282,8 @@ export default { ...@@ -282,7 +282,8 @@ export default {
path: "/detail", path: "/detail",
query: { query: {
id: row.id, id: row.id,
type: 5, type: 6,
name: row.feederDescribe
}, },
}); });
}, },
......
...@@ -24,17 +24,17 @@ export default { ...@@ -24,17 +24,17 @@ export default {
let params = { let params = {
id: this.$route.query.id, id: this.$route.query.id,
type: this.type, type: this.type,
name: this.$route.query.name
}; };
treeBaseInfo(params).then((res) => { treeBaseInfo(params).then((res) => {
let controlLimit = res.controlLimit || [] let controlLimit = res.controlLimit || []
if(controlLimit) { if (controlLimit) {
controlLimit.map(item => { controlLimit.map(item => {
res[`type${item.type}`]= item.sum res[`type${item.type}`] = item.sum
}) })
} }
this.curInfo = res; this.curInfo = res;
console.log(res);
}); });
}, },
}, },
...@@ -42,6 +42,6 @@ export default { ...@@ -42,6 +42,6 @@ export default {
this.getParams(); this.getParams();
}, },
mounted() {}, mounted() { },
}; };
</script> </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