Merge branch 'main' of git.zdool.com:xs/ggfwjsc
This commit is contained in:
commit
1acf0feb4a
|
@ -64,7 +64,12 @@ const router = createRouter({
|
||||||
name: '首页表格详情',
|
name: '首页表格详情',
|
||||||
path: '/home/index/table/details',
|
path: '/home/index/table/details',
|
||||||
component: () => import('../view/sy_details.vue'),
|
component: () => import('../view/sy_details.vue'),
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
name: '首页地图2',
|
||||||
|
path: '/home/index/map2',
|
||||||
|
component: () => import('../view/map_copy.vue'),
|
||||||
|
},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -255,9 +255,6 @@ const chooseCsList = ref([]);
|
||||||
const unChooseList = ref([]);
|
const unChooseList = ref([]);
|
||||||
const sqname = ref();
|
const sqname = ref();
|
||||||
const townName = ref();
|
const townName = ref();
|
||||||
//中心点坐标
|
|
||||||
const center_now = ref([]);
|
|
||||||
const center_center = ref([119.178783, 29.034583]);
|
|
||||||
//地图设置
|
//地图设置
|
||||||
const mapTownCount = reactive([
|
const mapTownCount = reactive([
|
||||||
{
|
{
|
||||||
|
@ -1373,7 +1370,6 @@ const removeAllPolygon = (e) => {
|
||||||
};
|
};
|
||||||
//选项设置
|
//选项设置
|
||||||
//选中
|
//选中
|
||||||
const chooseArr = ref([]);
|
|
||||||
|
|
||||||
const choose = ref({
|
const choose = ref({
|
||||||
person: "",
|
person: "",
|
||||||
|
|
|
@ -657,7 +657,7 @@ const getData = () => {
|
||||||
// 计划生育
|
// 计划生育
|
||||||
res.data.familyPlanning.familyPlanningData.forEach((element) => {
|
res.data.familyPlanning.familyPlanningData.forEach((element) => {
|
||||||
data.centerBottom1.push(element.jhsyrs); // 人次
|
data.centerBottom1.push(element.jhsyrs); // 人次
|
||||||
data.centerBottom2.push((element.jhsybtje / 10000).toFixed(0)); // 金额
|
data.centerBottom2.push((element.jhsybtje / 10000)); // 金额
|
||||||
// data.centerBottom2.push(element.jhsybtje); // 金额
|
// data.centerBottom2.push(element.jhsybtje); // 金额
|
||||||
});
|
});
|
||||||
// 年份
|
// 年份
|
||||||
|
|
Loading…
Reference in New Issue