|
@@ -20,13 +20,13 @@
|
|
<br>
|
|
<br>
|
|
出让项目</span>
|
|
出让项目</span>
|
|
<div class="text_item">
|
|
<div class="text_item">
|
|
- <span class="count1">{{ label_text.xzqhdm_number }}</span>
|
|
|
|
|
|
+ <span class="count1">{{ store.state.cockpit_hysy.text.xzqhdm_number }}</span>
|
|
<span class="unit">个</span>
|
|
<span class="unit">个</span>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div class="text_item1">
|
|
<div class="text_item1">
|
|
<span>用海总面积</span>
|
|
<span>用海总面积</span>
|
|
- <span class="count2">{{ label_text.zhmj }}</span>
|
|
|
|
|
|
+ <span class="count2">{{ store.state.cockpit_hysy.text.zhmj }}</span>
|
|
<span class="unit">公顷</span>
|
|
<span class="unit">公顷</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -168,8 +168,9 @@ export default {
|
|
echarts.graphic.registerShape('CubeRight', CubeRight)
|
|
echarts.graphic.registerShape('CubeRight', CubeRight)
|
|
echarts.graphic.registerShape('CubeTop', CubeTop)
|
|
echarts.graphic.registerShape('CubeTop', CubeTop)
|
|
echarts.graphic.registerShape('CubeBottom', CubeBottom)
|
|
echarts.graphic.registerShape('CubeBottom', CubeBottom)
|
|
- const dataX = that.label_echart.x;
|
|
|
|
- const barData = that.label_echart.bar;
|
|
|
|
|
|
+ const dataX = store.state.cockpit_hysy.echart.x;
|
|
|
|
+ const barData = store.state.cockpit_hysy.echart.bar;
|
|
|
|
+
|
|
let option = {
|
|
let option = {
|
|
//你的代码
|
|
//你的代码
|
|
backgroundColor: 'rgba(0,0,0,0)',
|
|
backgroundColor: 'rgba(0,0,0,0)',
|
|
@@ -344,11 +345,15 @@ export default {
|
|
beginTime: '20240101',
|
|
beginTime: '20240101',
|
|
endTime: '20240501',
|
|
endTime: '20240501',
|
|
jscType: 'jsc_hysyq_ztsh',
|
|
jscType: 'jsc_hysyq_ztsh',
|
|
- id: '460204'
|
|
|
|
|
|
+ id: '4602'
|
|
};
|
|
};
|
|
let data = await cockpitInfo(obj);
|
|
let data = await cockpitInfo(obj);
|
|
|
|
+
|
|
|
|
+
|
|
that.label_text.xzqhdm_number = data.data[0].xzqhdm_number
|
|
that.label_text.xzqhdm_number = data.data[0].xzqhdm_number
|
|
that.label_text.zhmj = data.data[0].zhmj
|
|
that.label_text.zhmj = data.data[0].zhmj
|
|
|
|
+ store.setCockpitHysyText(that.label_text);
|
|
|
|
+console.log(store.state.cockpit_hysy.text);
|
|
|
|
|
|
},
|
|
},
|
|
async echart_data() {
|
|
async echart_data() {
|
|
@@ -357,7 +362,7 @@ export default {
|
|
beginTime: '20240101',
|
|
beginTime: '20240101',
|
|
endTime: '20240601',
|
|
endTime: '20240601',
|
|
jscType: 'jsc_hysyq_yelx',
|
|
jscType: 'jsc_hysyq_yelx',
|
|
- id: '46'
|
|
|
|
|
|
+ id: '4602'
|
|
}
|
|
}
|
|
|
|
|
|
let data = await cockpitInfo(obj);
|
|
let data = await cockpitInfo(obj);
|
|
@@ -370,12 +375,11 @@ export default {
|
|
x: xArray,
|
|
x: xArray,
|
|
bar: barArray
|
|
bar: barArray
|
|
}
|
|
}
|
|
- console.log(that.label_echart, "label_echartlabel_echart");
|
|
|
|
- this.getRenKou();
|
|
|
|
|
|
|
|
- // that.label_text.xzqhdm_number = data.data[0].xzqhdm_number
|
|
|
|
- // that.label_text.zhmj = data.data[0].zhmj
|
|
|
|
|
|
+ store.setCockpitHysyEchart(that.label_echart);
|
|
|
|
|
|
|
|
+ // console.log(that.label_echart, "label_echartlabel_echart");
|
|
|
|
+ this.getRenKou();
|
|
}
|
|
}
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|