diff --git a/src/assets/images/infant/yysy_3.png b/src/assets/images/infant/yysy_3.png
index a981be5..39d7818 100644
Binary files a/src/assets/images/infant/yysy_3.png and b/src/assets/images/infant/yysy_3.png differ
diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index 5bd239e..9ea9e10 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -66,7 +66,10 @@
:data="data.tableData"
height="390px"
max-height="390"
- :header-cell-style="{ background: 'rgba(0, 143, 205, 0.63)', fontSize:' 22px' }"
+ :header-cell-style="{
+ background: 'rgba(0, 143, 205, 0.63)',
+ fontSize: ' 22px',
+ }"
:row-style="rowState"
@row-click="handleRowClick"
stripe
@@ -298,6 +301,17 @@ watch(
(match, name) => `:${maskName(name.trim())}`
);
}
+ // 手机号脱敏
+ function maskPhoneNumber(phone) {
+ return phone.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2");
+ }
+
+ function maskYwfzrsj(ywfzrsj) {
+ return ywfzrsj
+ .split(",")
+ .map((phone) => maskPhoneNumber(phone.trim()))
+ .join(",");
+ }
if (props.tableData.data.wxs.length > 0) {
props.tableData.data.wxs.forEach((item, index) => {
let obj = {
@@ -308,7 +322,8 @@ watch(
qtbm: item.qtbm,
zrks: item.zrks,
ywfzr: maskName(item.ywfzr),
- fgldsj: item.fgldsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
+ ywfzrsj: maskYwfzrsj(item.ywfzrsj),
+ // ywfzrsj: item.ywfzrsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
};
data.tableData.push(obj);
});
@@ -324,8 +339,8 @@ watch(
qtbm: item.qtbm,
zrks: item.zrks,
ywfzr: maskName(item.ywfzr),
- // fgldsj: item.fgldsj,
- fgldsj: item.fgldsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
+ // ywfzrsj: item.ywfzrsj,
+ ywfzrsj: maskYwfzrsj(item.ywfzrsj),
};
data.tableData.push(obj);
});
@@ -410,7 +425,7 @@ const closeDialog = () => {
justify-content: space-between;
margin-bottom: 10px;
margin-top: 46px;
- span{
+ span {
font-size: 22px;
}
img {
diff --git a/src/view/echarts_infabt/eP3.vue b/src/view/echarts_infabt/eP3.vue
index 473e29f..d3f4d04 100644
--- a/src/view/echarts_infabt/eP3.vue
+++ b/src/view/echarts_infabt/eP3.vue
@@ -19,13 +19,13 @@ const props = defineProps({
const chart = ref(); // 创建DOM引用
const colors = [
- // {
- // left: "rgba(234, 162, 57, .16)",
- // right: "rgba(234, 162, 57, .6)",
- // top: "rgba(234, 162, 57, 1)",
- // bottom: "rgba(234, 162, 57, .46)",
- // front: "rgba(234, 162, 57, .66)",
- // },
+ {
+ left: "rgba(234, 162, 57, .16)",
+ right: "rgba(234, 162, 57, .6)",
+ top: "rgba(234, 162, 57, 1)",
+ bottom: "rgba(234, 162, 57, .46)",
+ front: "rgba(234, 162, 57, .66)",
+ },
{
left: "rgba(14, 252, 255, .16)",
right: "rgba(14, 252, 255, .6)",
@@ -38,7 +38,7 @@ const colors = [
const data = reactive({
list: [],
option: {},
- Max: 20000,
+ Max: 100000,
valueList: [4504, 16086, 6130, 2844, 4967, 179, 1685, 5010],
valueList2: [1181, 2177, 3720, 3711, 4642, 1654, 3395, 5552],
xxname: ["2020", "2021", "2022", "2023"],
@@ -267,7 +267,7 @@ const getOption = () => {
"育龄妇女",
],
top: "0%",
- right: "30%",
+ // right: "0%",
textStyle: {
fontSize: 16,
color: "#ffffff",
@@ -279,10 +279,10 @@ const getOption = () => {
formatter: "{b0}:{a0}:{c0}",
},
grid: {
- left: 0,
- right: 0,
+ left: 20,
+ right: 40,
bottom: 10,
- top: 40,
+ top: 60,
containLabel: true,
},
xAxis: [
@@ -326,7 +326,6 @@ const getOption = () => {
],
yAxis: {
min: 0,
- max: data.Max,
// interval: 100,
type: "value",
axisLine: {
@@ -538,45 +537,6 @@ const getOption = () => {
},
data: data.valueList2,
},
- //顶部字体
- {
- type: "bar",
- xAxisIndex: 1,
- label: {
- show: true,
- fontSize: 18,
- position: "top",
- color: "#ffffff",
- formatter: function (data) {
- return data.value - 5;
- },
- },
- itemStyle: {
- color: "rgba(221, 242, 255, 0)",
- },
-
- data: data.valueList.map((item) => parseInt(item) + 5),
- barWidth: 30,
- },
- {
- type: "bar",
- xAxisIndex: 1,
- label: {
- show: true,
- fontSize: 18,
- position: "top",
- color: "#ffffff",
- formatter: function (data) {
- return data.value - 5;
- },
- },
- itemStyle: {
- color: "rgba(221, 242, 255, 0)",
- },
-
- data: data.valueList2.map((item) => parseInt(item) + 5),
- barWidth: 20,
- },
],
};
};
@@ -603,9 +563,9 @@ const setChart1 = () => {
};
onBeforeMount(() => {
- data.xxname = props.list.year;
- data.valueList2 = props.list.data;
setTimeout(() => {
+ data.xxname = props.list.year;
+ data.valueList2 = props.list.data;
// data.valueList2.forEach((item, index) => {
// props.list.forEach((itemm, indexx) => {
// if (item == itemm.xzjd) {
@@ -614,8 +574,8 @@ onBeforeMount(() => {
// }
// });
// });
- console.log(6666,props.list);
-
+ // console.log(6666, props.list);
+
getOption();
setChart();
}, 800);
diff --git a/src/view/echarts_lysd/eP1.vue b/src/view/echarts_lysd/eP1.vue
index 76d1b96..3b3a67f 100644
--- a/src/view/echarts_lysd/eP1.vue
+++ b/src/view/echarts_lysd/eP1.vue
@@ -1,245 +1,225 @@
-
+