|
@@ -68,13 +68,13 @@
|
|
|
<div class="space">
|
|
|
<div class="lt_box box">
|
|
|
<div class="text">
|
|
|
- <p>计划出让海域</p>
|
|
|
+ <p>计划供应</p>
|
|
|
<span>66.23</span>公顷
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="lb_box box">
|
|
|
<div class="text">
|
|
|
- <p>计划出让海域</p>
|
|
|
+ <p>完成供应</p>
|
|
|
<span>66.23</span>公顷
|
|
|
</div>
|
|
|
</div>
|
|
@@ -84,14 +84,14 @@
|
|
|
</div>
|
|
|
<div class="rt_box box">
|
|
|
<div class="text">
|
|
|
- <p>计划出让海域</p>
|
|
|
- <span>66.23</span>公顷
|
|
|
+ <p>计划供应项目</p>
|
|
|
+ <span>66.23</span>个
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="rb_box box">
|
|
|
<div class="text">
|
|
|
- <p>计划出让海域</p>
|
|
|
- <span>66.23</span>公顷
|
|
|
+ <p>完成供应项目</p>
|
|
|
+ <span>66.23</span>个
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -182,17 +182,14 @@ export default {
|
|
|
result: store.state.cockpit_tdgy.gy_jg.result
|
|
|
}
|
|
|
|
|
|
- console.log('mockData: ', mockData);
|
|
|
-
|
|
|
-
|
|
|
- const mockData1 = {
|
|
|
- xdata: ['居民用地', '公共管理用地', '商业商服用地', '工矿用地', '工矿用地仓储用地', "交通运输用地"],
|
|
|
- result: [
|
|
|
- { name: '计划收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 10) * 1000).toFixed(0)) },
|
|
|
- { name: '完成收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 0.5) * 1000).toFixed(0)) },
|
|
|
- ]
|
|
|
- }
|
|
|
- console.log('mockData1: ', mockData1);
|
|
|
+ // const mockData1 = {
|
|
|
+ // xdata: ['居民用地', '公共管理用地', '商业商服用地', '工矿用地', '工矿用地仓储用地', "交通运输用地"],
|
|
|
+ // result: [
|
|
|
+ // { name: '计划收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 10) * 1000).toFixed(0)) },
|
|
|
+ // { name: '完成收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 0.5) * 1000).toFixed(0)) },
|
|
|
+ // ]
|
|
|
+ // }
|
|
|
+ // console.log('mockData1: ', mockData1);
|
|
|
|
|
|
const color = [
|
|
|
[{ offset: 0, color: 'rgba(183, 117, 12, 0.8)' }, { offset: 0.5, color: 'rgba(183, 117, 12, 0.8)' }, { offset: 0.5, color: 'rgba(249, 180, 71, 0.8)' }, { offset: 1, color: 'rgba(249, 180, 71, 0.8)' }],
|
|
@@ -258,11 +255,9 @@ export default {
|
|
|
axisTick: { show: false },
|
|
|
}]
|
|
|
const diamondData = mockData.result.reduce((pre, cur, index) => {
|
|
|
- console.log('pre, cur, index: ', pre, cur, index);
|
|
|
pre[index] = cur.data.map((el, id) => el + (pre[index - 1] ? pre[index - 1][id] : 0))
|
|
|
return pre
|
|
|
}, [])
|
|
|
- console.log('diamondData: ', diamondData);
|
|
|
|
|
|
let series = mockData.result.reduce((p, c, i, array) => {
|
|
|
p.push({
|
|
@@ -750,7 +745,8 @@ export default {
|
|
|
store.state.cockpit_tdgy.gy_jg.result = result
|
|
|
that.init_gy_jg_echart();
|
|
|
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
},
|
|
|
mounted() {
|
|
|
const that = this;
|