|
@@ -135,7 +135,7 @@
|
|
|
<div class="text">
|
|
|
<p>{{ bh.name }}</p>
|
|
|
<span class="cvalue">
|
|
|
- {{ (bhdata[bh.prop || bhprops[nowunit]] || 0).toFixed(2) }}
|
|
|
+ {{ (bhdata[bh.prop || uprops[nowunit]] || 0).toFixed(2) }}
|
|
|
</span>
|
|
|
<span class="unit">{{ unitList[nowunit].unit }}</span>
|
|
|
</div>
|
|
@@ -206,7 +206,7 @@ export default {
|
|
|
],
|
|
|
nowyear: "",
|
|
|
uprops: ["mj_qm", "mj", "mj_m"],
|
|
|
- bhprops: ["d1_mj_qm", "d1_mj", "mj_m"],
|
|
|
+ // bhprops: ["d1_mj_qm", "d1_mj", "mj_m"],
|
|
|
yearList: [],
|
|
|
typeList: [],
|
|
|
tab: "2023",
|
|
@@ -410,20 +410,17 @@ export default {
|
|
|
GetLnbhqk() {
|
|
|
this.eData.xData = [];
|
|
|
this.eData.yData = [[]];
|
|
|
+ let parms = { year: this.nowyear, xzqhdm: this.region, dlbm: this.dlbm };
|
|
|
if (!this.$props.pageType) {
|
|
|
- GetGdLnbhqk({ xzqhdm: this.region, year: this.nowyear }).then(
|
|
|
- ({ data }) => {
|
|
|
- this.lnbndata = data;
|
|
|
- this.setLnbh(data);
|
|
|
- }
|
|
|
- );
|
|
|
+ GetGdLnbhqk(parms).then(({ data }) => {
|
|
|
+ this.lnbndata = data;
|
|
|
+ this.setLnbh(data);
|
|
|
+ });
|
|
|
} else {
|
|
|
- GetYjjbntLnbhqk({ xzqhdm: this.region, year: this.nowyear }).then(
|
|
|
- ({ data }) => {
|
|
|
- this.lnbndata = data;
|
|
|
- this.setLnbh(data);
|
|
|
- }
|
|
|
- );
|
|
|
+ GetYjjbntLnbhqk(parms).then(({ data }) => {
|
|
|
+ this.lnbndata = data;
|
|
|
+ this.setLnbh(data);
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
setLnbh(data) {
|
|
@@ -432,7 +429,7 @@ export default {
|
|
|
this.eData.yData = [[]];
|
|
|
data.forEach((res) => {
|
|
|
this.eData.xData.push(res.year);
|
|
|
- this.eData.yData[0].push(res[this.bhprops[this.nowunit]]);
|
|
|
+ this.eData.yData[0].push(res[this.uprops[this.nowunit]]);
|
|
|
});
|
|
|
|
|
|
this.setEchart(this.eData, 0);
|