xiangshan
/
ggfwjsc
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

This commit is contained in:
duanxiaohai 2024-08-02 10:44:07 +08:00
parent 16145195d1 aea2e1eb3b
commit 3e9df64a4c
5 changed files with 74 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/view/analyze.vue
View File

@ -700,9 +700,9 @@ const minData = reactive({
zq: "1610",
},
minPieData2: {
wfgz: "1500",
xstp: "1610",
skym: "1610",
wfgz: "4754",
xstp: "31145",
skym: "13255",
},
});
// 数据查看

10
src/view/dialog/dialogMapDp.vue
View File

@ -293,9 +293,9 @@ const handle = (current) => {
.name {
font-family: PangMenZhengDao, PangMenZhengDao;
font-weight: 600;
font-size: 20px;
font-size: 22px;
color: #ffffff;
line-height: 38px;
line-height: 27px;
text-align: center;
font-style: normal;
letter-spacing: 2px;
@ -316,4 +316,10 @@ const handle = (current) => {
.custom-table-font {
font-size: 10px;
}
:deep(.el-table:not(.el-table--border) .el-table__cell){
padding: 3px 0px;
}
:deep(.el-pagination ){
transform: scale(0.8);
}
</style>

6
src/view/echart_analyze/pie3dMt2.vue
View File

@ -70,17 +70,17 @@ const pieData = reactive([
{
name: "0-18岁", //名称
value: 0, //值
per: 2,
per: 9.67,
},
{
name: "19-60岁",
value: 0,
per: 8,
per: 63.37,
},
{
name: "60岁以上",
value: 0,
per: 10,
per: 26.97,
},
]);

35
src/view/person/index.vue
View File

@ -10,7 +10,7 @@
<div class="my-info">
<div class="my-info-item">
<div class="my-info-label ">姓名</div>
<div class="my-info-label ">姓&emsp;&emsp;名</div>
<div class="my-info-content">
<p>王一</p>
</div>
@ -40,13 +40,13 @@
</div>
</div>
<div class="my-info-item">
<div class="my-info-label ">民族</div>
<div class="my-info-label ">民&emsp;&emsp;族</div>
<div class="my-info-content">
<p>汉</p>
</div>
</div>
<div class="my-info-item">
<div class="my-info-label ">性别</div>
<div class="my-info-label ">性&emsp;&emsp;别</div>
<div class="my-info-content">
<p>男</p>
</div>
@ -73,10 +73,11 @@
<div class="main-tag-item">出生</div>
<div class="main-tag-item">学习</div>
<div class="main-tag-item">工作</div>
<div class="main-tag-item">婚育</div>
<div class="main-tag-item">置业</div>
<div class="main-tag-item">婚育</div>
<div class="main-tag-item">退休<br />养老</div>
<div class="main-tag-item">身后事</div>
<div class="main-tag-item">综合</div>
<div class="person-main-person">
</div>
</div>
@ -131,9 +132,9 @@
<el-table-column prop="sum" label="使用金额" width="115" align="center" />
<el-table-column prop="sum" label="详情" width="135" align="center" />
</el-table>
<el-pagination background layout="prev, pager, next" :page-size="pagination.pageSize"
:total="pagination.total" prev-text="上一页" next-text="下一页"
v-model:current-page="pagination.currentPage" @current-change="handlePagination" />
<el-pagination background layout="prev, pager, next" :page-size="pagination1.pageSize"
:total="pagination1.total" prev-text="上一页" next-text="下一页"
v-model:current-page="pagination1.currentPage" @current-change="handlePagination" />
</div>
</div>
@ -205,7 +206,12 @@ const data1 = ref([
info: '人民医院******'
},
])
const pagination1 = reactive({
current: 1,
pageSize: 5,
total: 50,
showTotal: 0
})
const dialogShow = ref(false)
const tableType = reactive({
title: '基础养老金',
@ -234,10 +240,10 @@ const paginationDialog = reactive({
showTotal: 0
})
const close = (pagination) => {
console.log
dialogShow.value = false
}
const handlePagination = (pagination) => {
console.log
dialogShow.value = false
}
</script>
@ -305,8 +311,8 @@ const handlePagination = (pagination) => {
}
&:nth-of-type(4) {
top: 30px;
right: 220px;
top: 420px;
left: 110px;
}
&:nth-of-type(5) {
@ -324,6 +330,11 @@ const handlePagination = (pagination) => {
right: 80px;
}
&:nth-of-type(8) {
top: 420px;
right: 110px;
}
&:hover {
background: url('../../assets/person/tag-active.png') no-repeat;
background-size: 100% 100%;

62
src/view/sy_mapcopy.vue
View File

@ -1237,7 +1237,7 @@ const getDatas = async (e, i) => {
}
if (cfJd.value != "") {
xkzCenter.map((item) => {
// item.number = 0;
item.swrs = 0;
res.data.committeeSwrs.map((items) => {
if (items.csq == item.name) {
item.swrs = items.swrs;
@ -1400,6 +1400,15 @@ const getDatas2 = async (e, i, cs) => {
}
}
});
if (choose.value.person == "") {
cs_dd_arr.value.map((item, index) => {
DGcreateCs(item, index);
});
} else {
cs_dd_arr.value.map((item, index) => {
DGcreateCs2(item, index);
});
}
};
//特殊标签
//获取特殊标签
@ -1599,7 +1608,6 @@ const to_jd = (item_name) => {
// } else {
// console.log(111, choose.value.person);
cfJd.value = item_name;
//存放街道中心点
let jdCenter = [];
BMAP();
loadCs(item_name);
@ -2016,7 +2024,7 @@ const createCustomOverlayJd = (polygon, indexx) => {
div.setAttribute("name", this.properties.title);
var title = document.createElement("div");
title.style.fontSize = "10px";
title.style.fontSize = "12px";
title.style.fontWeight = "600";
title.style.color = "#000000";
div.appendChild(title);
@ -2057,14 +2065,14 @@ const createCustomOverlayJd2 = (polygon, indexx) => {
div.setAttribute("name", this.properties.title);
var title = document.createElement("div");
title.style.fontSize = "10px";
title.style.fontSize = "12px";
title.style.fontWeight = "600";
title.style.color = "#000000";
div.appendChild(title);
title.appendChild(document.createTextNode(this.properties.title));
content.appendChild(div);
var number = document.createElement("div");
number.style.fontSize = "12px";
number.style.fontSize = "13px";
number.style.fontWeight = "600";
number.style.color = "#FEFF6C";
number.style.textShadow = "0px 2px 4px rgba(0,0,0,0.5)";
@ -2221,15 +2229,15 @@ const addPolygonCountyCs = () => {
getDatas2(cfJd.value, choose.value.person, cfCs.value);
addCsChoose();
addCsUnChoose();
if (choose.value.person == "") {
cs_dd_arr.value.map((item, index) => {
DGcreateCs(item, index);
});
} else {
cs_dd_arr.value.map((item, index) => {
DGcreateCs2(item, index);
});
}
// if (choose.value.person == "") {
// cs_dd_arr.value.map((item, index) => {
// DGcreateCs(item, index);
// });
// } else {
// cs_dd_arr.value.map((item, index) => {
// DGcreateCs2(item, index);
// });
// }
});
}
});
@ -2323,11 +2331,12 @@ const addCsUnChoose = () => {
// ) {
// getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
// }
if (choose.value.person == "") {
cs_dd_arr.value.map((item, index) => {
DGcreateCs(item, index);
});
} else if (
// if (choose.value.person == "") {
// cs_dd_arr.value.map((item, index) => {
// DGcreateCs(item, index);
// });
// } else
if (
choose.value.person == "cjr" ||
choose.value.person == "dibian" ||
choose.value.person == "db" ||
@ -2337,13 +2346,16 @@ const addCsUnChoose = () => {
choose.value.person == "kjer"
) {
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
} else {
setTimeout(() => {
cs_dd_arr.value.map((item, index) => {
DGcreateCs2(item, index);
});
}, 600);
}
// if (choose.value.person == "") {
// cs_dd_arr.value.map((item, index) => {
// DGcreateCs(item, index);
// });
// } else {
// cs_dd_arr.value.map((item, index) => {
// DGcreateCs2(item, index);
// });
// }
addCsChoose();
addCsUnChoose();
});