From 6d4ec2d795e789fc4371e5f653f15fafe7627734 Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Mon, 21 Oct 2024 17:26:11 +0800
Subject: [PATCH] gx
---
src/view/dialog/dialogRW.vue | 12 ++-
src/view/dialog/dialogSf.vue | 5 +-
src/view/echarts_infabt/eP2.vue | 148 ++++++++++++++++----------------
src/view/echarts_infabt/eP3.vue | 2 +
src/view/echarts_infabt/eP4.vue | 89 ++++++++++---------
src/view/person/rwTable.vue | 6 +-
src/view/sy_details.vue | 7 +-
src/view/table_gk/gk_infant.vue | 67 +++++++++------
vite.config.js | 4 +-
9 files changed, 187 insertions(+), 153 deletions(-)
diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index 363dfe3..4f35b88 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -67,6 +67,7 @@
height="390px"
max-height="390"
:header-cell-style="{ background: 'rgba(0, 143, 205, 0.63)' }"
+ :row-style="rowState"
@row-click="handleRowClick"
stripe
>
@@ -185,7 +186,16 @@ const props = defineProps({
},
});
const emit = defineEmits(["close", "handle", "showList"]);
-
+const rowState = (row) => {
+ return {
+ fontSize: "22px",
+ lineHeight: "33px",
+ // letterSpacing: "1px",
+ // height: "36px",
+ // backgroundColor: "rgba(43, 74, 121, 1)",
+ // color: "#fff",
+ };
+};
const handleRowClick = (row, column, event) => {
emit("showList", row);
};
diff --git a/src/view/dialog/dialogSf.vue b/src/view/dialog/dialogSf.vue
index 2341b40..ffcd6e7 100644
--- a/src/view/dialog/dialogSf.vue
+++ b/src/view/dialog/dialogSf.vue
@@ -291,10 +291,11 @@ const handle = (current) => {
padding: 20px;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
- font-size: 16px;
+ // font-size: 16px;
+ font-size: 22px;
letter-spacing: 3px;
color: #ffffff;
- line-height: 22px;
+ line-height: 33px;
height: 144px;
overflow-y: auto;
.item_content_item {
diff --git a/src/view/echarts_infabt/eP2.vue b/src/view/echarts_infabt/eP2.vue
index c41f871..83a1664 100644
--- a/src/view/echarts_infabt/eP2.vue
+++ b/src/view/echarts_infabt/eP2.vue
@@ -11,13 +11,12 @@ const props = defineProps({
type: Array,
default: () => [],
},
- year: {
- type: Array,
- default: () => [],
- },
});
const data = reactive({
- list: [],
+ list: [
+ { name: "男", value: 0 },
+ { name: "女", value: 0 },
+ ],
year: [],
option: {},
bg: [],
@@ -98,88 +97,85 @@ const getOption = () => {
radius: ["20%", "50%"],
center: ["50%", "50%"],
- label: {
- // 显示标签
- show: true,
- // 标签位置
- position: "outside",
- // 标签对齐方式
- // alignTo: "labelLine",
- // 背景颜色
- backgroundColor: "transparent",
- // 高度
- height: 0,
- // 宽度
- width: 0,
- // 行高
- lineHeight: 0,
- // 标签距离标签线的距离
- distanceToLabelLine: 0,
- // 边框圆角
- borderRadius: 3,
- // 边框宽度
- borderWidth: 1,
- // 边框颜色
- borderColor: "auto",
- // 内边距
- padding: [3, -3, 3, -3],
- // 标签格式化
- formatter: function (params) {
- return `{a|${params.value}%}{a|${params.name}}`;
- },
- // 富文本样式
- rich: {
- // a样式
- a: {
- // 内边距
- padding: [10, 0, 30, -60],
- // 字体大小
- fontSize: "15px",
- // 字体
- fontFamily: "MicrosoftYaHei",
- // 字体颜色
- color: "#fff",
- },
- // b样式
- // b: {
- // // 内边距
- // padding: [0, 10, 55, -70],
- // // 字体大小
- // fontSize: "15px",
- // // 字体
- // fontFamily: "MicrosoftYaHei-Bold, MicrosoftYaHei",
- // // 字体粗细
- // fontWeight: "bold",
- // // 字体颜色
- // color: "#fff",
- // },
- },
- },
// label: {
- // textStyle: {
- // color: "white", // 改变标示文字的颜色
- // fontSize: 18, //文字大小
+ // // 显示标签
+ // show: true,
+ // // 标签位置
+ // position: "outside",
+ // // 标签对齐方式
+ // // alignTo: "labelLine",
+ // // 背景颜色
+ // backgroundColor: "transparent",
+ // // 高度
+ // height: 0,
+ // // 宽度
+ // width: 0,
+ // // 行高
+ // lineHeight: 0,
+ // // 标签距离标签线的距离
+ // distanceToLabelLine: 0,
+ // // 边框圆角
+ // borderRadius: 3,
+ // // 边框宽度
+ // borderWidth: 1,
+ // // 边框颜色
+ // borderColor: "auto",
+ // // 内边距
+ // padding: [3, -3, 3, -3],
+ // // 标签格式化
+ // formatter: function (params) {
+ // return `{a|${params.value}%}{a|${params.name}}`;
+ // },
+ // // 富文本样式
+ // rich: {
+ // // a样式
+ // a: {
+ // // 内边距
+ // padding: [10, 0, 30, -60],
+ // // 字体大小
+ // fontSize: "15px",
+ // // 字体
+ // fontFamily: "MicrosoftYaHei",
+ // // 字体颜色
+ // color: "#fff",
+ // },
+ // // b样式
+ // // b: {
+ // // // 内边距
+ // // padding: [0, 10, 55, -70],
+ // // // 字体大小
+ // // fontSize: "15px",
+ // // // 字体
+ // // fontFamily: "MicrosoftYaHei-Bold, MicrosoftYaHei",
+ // // // 字体粗细
+ // // fontWeight: "bold",
+ // // // 字体颜色
+ // // color: "#fff",
+ // // },
// },
- // formatter: "{b}:{c}" + "个\n\n",
- // borderWidth: 20,
- // borderRadius: 4,
- // padding: [0, -80],
// },
+ label: {
+ textStyle: {
+ color: "white", // 改变标示文字的颜色
+ fontSize: 18, //文字大小
+ },
+ formatter: "{b}:{c}" + "人\n\n",
+ borderWidth: 20,
+ borderRadius: 4,
+ padding: [0, -80],
+ },
labelLine: {
show: false,
normal: {
length: 40, // 改变标示线的长度
length2: 40,
- align: 'right',
+ align: "right",
// lineStyle: {
// color: "white", // 改变标示线的颜色
// },
},
},
- data: [
- { name: "男", value: 300 },
- { name: "女", value: 200 },
- ],
+ data: data.list,
},
{
name: "外边框",
@@ -224,8 +220,8 @@ const setChart = () => {
onBeforeMount(() => {
setTimeout(() => {
- data.list = props.list;
- data.year = props.year;
+ data.list[0].value = props.list.nan;
+ data.list[1].value = props.list.nv;
data.year.forEach(() => {
data.bg.push(0);
});
diff --git a/src/view/echarts_infabt/eP3.vue b/src/view/echarts_infabt/eP3.vue
index 8ec0554..f1743a6 100644
--- a/src/view/echarts_infabt/eP3.vue
+++ b/src/view/echarts_infabt/eP3.vue
@@ -602,6 +602,8 @@ const setChart1 = () => {
};
onBeforeMount(() => {
+ // data.xxname = props.list.year;
+ // data.valueList = props.list.data;
setTimeout(() => {
data.xxname.forEach((item, index) => {
props.list.forEach((itemm, indexx) => {
diff --git a/src/view/echarts_infabt/eP4.vue b/src/view/echarts_infabt/eP4.vue
index 0c722d2..793b6a9 100644
--- a/src/view/echarts_infabt/eP4.vue
+++ b/src/view/echarts_infabt/eP4.vue
@@ -12,16 +12,16 @@ const props = defineProps({
type: Array,
default: () => [],
},
- year: {
+ list2: {
type: Array,
default: () => [],
},
});
const data = reactive({
list: [],
+ list2: [],
zgffrc: [], //育龄妇女
cxffrc: [], //婴幼儿
- year: [],
option: {},
bg: [],
});
@@ -65,7 +65,8 @@ const getOption = () => {
data.option = {
tooltip: {
trigger: "axis",
- formatter: "{b}
{a1}:{c1}
{a}:{c} ",
+ // formatter: "{b}
{a1}:{c1}
{a}:{c} ",
+ formatter: "{b}
{a}:{c} ",
},
legend: {
data: ["育龄妇女", "婴幼儿"],
@@ -122,7 +123,7 @@ const getOption = () => {
fontSize: 16,
},
},
- data: data1,
+ data: data.list2,
},
{
type: "category",
@@ -156,14 +157,14 @@ const getOption = () => {
name: "育龄妇女",
type: "bar",
barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
- data: data.zgffrc,
+ data: data.list ,
barWidth: "18%",
label: {
show: true,
color: "#ffffff",
position: "right",
formatter: function (data) {
- return data.value + "万";
+ return data.value ;
},
},
itemStyle: {
@@ -180,35 +181,36 @@ const getOption = () => {
},
},
},
- {
- z: 2,
- name: "婴幼儿",
- type: "bar",
- barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
- data: data.cxffrc,
- barWidth: "18%",
- label: {
- show: true,
- color: "#ffffff",
- position: "right",
- formatter: function (data) {
- return data.value + "万";
- },
- },
- itemStyle: {
- color: {
- type: "linear",
- x: 0,
- x2: 1,
- y: 0,
- y2: 0,
- colorStops: [
- { offset: 0, color: "rgba(24, 234, 254, 0.2)" },
- { offset: 1, color: "rgba(24, 234, 254, 0.7)" },
- ],
- },
- },
- },
+ // {
+ // z: 2,
+ // name: "婴幼儿",
+ // type: "bar",
+ // barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
+ // data: data.cxffrc,
+ // barWidth: "18%",
+ // label: {
+ // show: true,
+ // color: "#ffffff",
+ // position: "right",
+ // formatter: function (data) {
+ // return data.value + "万";
+ // },
+ // },
+ // itemStyle: {
+ // color: {
+ // type: "linear",
+ // x: 0,
+ // x2: 1,
+ // y: 0,
+ // y2: 0,
+ // colorStops: [
+ // { offset: 0, color: "rgba(24, 234, 254, 0.2)" },
+ // { offset: 1, color: "rgba(24, 234, 254, 0.7)" },
+ // ],
+ // },
+ // },
+ // },
+
// {
// type: "bar",
// xAxisIndex: 1,
@@ -234,13 +236,16 @@ const setChart = () => {
onBeforeMount(() => {
setTimeout(() => {
data.list = props.list;
- data.year = props.year;
- data.list.forEach((item) => {
- data.zgffrc.push((item.zgffrc / 10000).toFixed(0));
- data.cxffrc.push((item.cxffrc / 10000).toFixed(0));
- data.bg.push("");
- });
- console.log(data.zgffrc,data.cxffrc);
+ data.list2 = props.list2;
+ // data.year = props.year;
+ console.log(1111,data.list, data.list2);
+
+ // data.list.forEach((item) => {
+ // data.zgffrc.push((item.zgffrc / 10000).toFixed(0));
+ // data.cxffrc.push((item.cxffrc / 10000).toFixed(0));
+ // data.bg.push("");
+ // });
+ console.log(data.zgffrc, data.cxffrc);
getOption();
setChart();
}, 600);
diff --git a/src/view/person/rwTable.vue b/src/view/person/rwTable.vue
index 8732a23..c361bbb 100644
--- a/src/view/person/rwTable.vue
+++ b/src/view/person/rwTable.vue
@@ -36,7 +36,7 @@
:pager-count="5"
class="mt-4"
background
- layout="prev, pager, next"
+ layout="total,prev, pager, next"
:page-size="data.pagination.pageSize"
:total="data.pagination.total"
:current-page="data.pagination.current"
@@ -120,7 +120,7 @@
size="small"
class="mt-4"
background
- layout="prev, pager, next"
+ layout="total,prev, pager, next"
:pager-count="5"
:page-size="data.pagination1.pageSize"
:total="data.pagination1.total"
@@ -178,7 +178,7 @@
size="small"
class="mt-4"
background
- layout="prev, pager, next"
+ layout="total,prev, pager, next"
:page-size="data.pagination.pageSize"
:total="data.pagination.total"
:current-page="data.pagination.current"
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index 6c281c6..e3f4b94 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -734,7 +734,7 @@ const rowState = (row) => {
if (row.rowIndex % 2 == 0) {
return {
letterSpacing: "1px",
- fontSize: "14px",
+ fontSize: "22px",
height: "36px",
backgroundColor: "rgba(31, 63, 113, 1)",
color: "#fff",
@@ -742,7 +742,7 @@ const rowState = (row) => {
} else if (row.rowIndex % 2 !== 0) {
return {
letterSpacing: "1px",
- fontSize: "14px",
+ fontSize: "22px",
height: "36px",
backgroundColor: "rgba(43, 74, 121, 1)",
color: "#fff",
@@ -963,6 +963,9 @@ onMounted(() => {
--el-table-header-text-color: none;
// border: 1px solid #7aceff;
}
+:deep(.el-table .cell) {
+ line-height: 30px;
+}
// .table {
// :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
// border: none !important;
diff --git a/src/view/table_gk/gk_infant.vue b/src/view/table_gk/gk_infant.vue
index 084873f..0bfac42 100644
--- a/src/view/table_gk/gk_infant.vue
+++ b/src/view/table_gk/gk_infant.vue
@@ -8,11 +8,7 @@
-