diff --git a/dist.zip b/dist.zip index 8cf3a1b..8e281cb 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/assets/images/hygiene/choose.png b/src/assets/images/hygiene/choose.png new file mode 100644 index 0000000..d0cd76d Binary files /dev/null and b/src/assets/images/hygiene/choose.png differ diff --git a/src/assets/images/hygiene/gxy_new.png b/src/assets/images/hygiene/gxy_new.png deleted file mode 100644 index 910c27b..0000000 Binary files a/src/assets/images/hygiene/gxy_new.png and /dev/null differ diff --git a/src/assets/images/hygiene/gxyrs.png b/src/assets/images/hygiene/gxyrs.png deleted file mode 100644 index ca285f2..0000000 Binary files a/src/assets/images/hygiene/gxyrs.png and /dev/null differ diff --git a/src/assets/images/hygiene/lmb.png b/src/assets/images/hygiene/lmb.png new file mode 100644 index 0000000..52db00f Binary files /dev/null and b/src/assets/images/hygiene/lmb.png differ diff --git a/src/assets/images/hygiene/mfyyqk.png b/src/assets/images/hygiene/mfyyqk.png new file mode 100644 index 0000000..07f559f Binary files /dev/null and b/src/assets/images/hygiene/mfyyqk.png differ diff --git a/src/assets/images/hygiene/new_lmb.png b/src/assets/images/hygiene/new_lmb.png deleted file mode 100644 index 9d65a9c..0000000 Binary files a/src/assets/images/hygiene/new_lmb.png and /dev/null differ diff --git a/src/assets/images/hygiene/noChoose.png b/src/assets/images/hygiene/noChoose.png new file mode 100644 index 0000000..63218ff Binary files /dev/null and b/src/assets/images/hygiene/noChoose.png differ diff --git a/src/assets/images/hygiene/tnb_new.png b/src/assets/images/hygiene/tnb_new.png deleted file mode 100644 index 374bcb0..0000000 Binary files a/src/assets/images/hygiene/tnb_new.png and /dev/null differ diff --git a/src/assets/images/hygiene/tnbrs.png b/src/assets/images/hygiene/tnbrs.png deleted file mode 100644 index 6a239ff..0000000 Binary files a/src/assets/images/hygiene/tnbrs.png and /dev/null differ diff --git a/src/view/dialog/diaLogTab.vue b/src/view/dialog/diaLogTab.vue index 1081880..b9670f8 100644 --- a/src/view/dialog/diaLogTab.vue +++ b/src/view/dialog/diaLogTab.vue @@ -100,25 +100,21 @@
- +
+ +
-
- +
+
diff --git a/src/view/dialog/echarts/echartLine.vue b/src/view/dialog/echarts/echartLine.vue index 72251f4..b839dbb 100644 --- a/src/view/dialog/echarts/echartLine.vue +++ b/src/view/dialog/echarts/echartLine.vue @@ -92,7 +92,7 @@ const getOption = () => { }, nameTextStyle: { // 设置Y轴名称的样式 - fontSize: 14, // 这里设置字体大小为20 + fontSize: 16, // 这里设置字体大小为20 }, axisLabel: { //坐标轴刻度标签的相关设置 @@ -177,6 +177,7 @@ const getOption = () => { label: { show: true, color: "#ffffff", + fontSize: 16, formatter: function (data) { return data.value; }, @@ -199,6 +200,7 @@ const getOption = () => { label: { show: true, color: "#ffffff", + fontSize: 16, formatter: function (data) { return data.value; }, @@ -251,6 +253,7 @@ onBeforeMount(() => { data.list1 = props.list1; data.list2 = props.list2; data.year = props.year; + console.log(data.list1,data.list2,666); data.bg = []; data.year.forEach(() => { data.bg.push(0); diff --git a/src/view/dialog/echarts/tabLine.vue b/src/view/dialog/echarts/tabLine.vue index 9665ac9..59aa20f 100644 --- a/src/view/dialog/echarts/tabLine.vue +++ b/src/view/dialog/echarts/tabLine.vue @@ -133,6 +133,7 @@ const getOption = () => { label: { show: true, color: "#ffffff", + fontSize: 16, formatter: function (data) { return data.value; }, diff --git a/src/view/echarts_hygiene/eP5.vue b/src/view/echarts_hygiene/eP5.vue index 04c2d75..d917ebc 100644 --- a/src/view/echarts_hygiene/eP5.vue +++ b/src/view/echarts_hygiene/eP5.vue @@ -29,7 +29,7 @@ const getOption = () => { data.option = { tooltip: { trigger: "axis", - // formatter: "{b0}
{a0}:{c0}
{a1}:{c1} ", + formatter: "{b0}
{a0}:{c0}", }, grid: { diff --git a/src/view/echarts_hygiene/mfyyqk.vue b/src/view/echarts_hygiene/mfyyqk.vue new file mode 100644 index 0000000..71d27d2 --- /dev/null +++ b/src/view/echarts_hygiene/mfyyqk.vue @@ -0,0 +1,468 @@ + + + + + diff --git a/src/view/echarts_hygiene/pie3.vue b/src/view/echarts_hygiene/pie3.vue index a967e8e..5965591 100644 --- a/src/view/echarts_hygiene/pie3.vue +++ b/src/view/echarts_hygiene/pie3.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/src/view/echarts_hygiene/pie4.vue b/src/view/echarts_hygiene/pie4.vue index 000b1a8..c0b2f93 100644 --- a/src/view/echarts_hygiene/pie4.vue +++ b/src/view/echarts_hygiene/pie4.vue @@ -19,22 +19,21 @@ const props = defineProps({ }); const chart = ref(); // 创建DOM引用 const data = reactive({ - list: [6280,5924,1824], - year: [2022,2023,2024], - bg:[0,0,0], + list: [6280, 5924, 1824], + year: [2022, 2023, 2024], + bg: [0, 0, 0], option: {}, }); const getOption = () => { data.option = { - tooltip: { trigger: "axis", padding: [20, 10, 20, 10], formatter: "{b0}
{a0}:{c0} ", }, grid: { - top: "5%", + top: "15%", left: "1%", right: "10%", bottom: "3%", @@ -62,7 +61,12 @@ const getOption = () => { }, }, yAxis: { + name: "人数/次", type: "value", + nameTextStyle: { + // 设置Y轴名称的样式 + fontSize: 14, // 这里设置字体大小为20 + }, splitLine: { show: true, lineStyle: { @@ -77,6 +81,16 @@ const getOption = () => { fontSize: 16, }, }, + axisLine: { + //y轴线的颜色以及宽度 + show: false, + lineStyle: { + color: "#ffffff", + fontSize: 16, + width: 1, + type: "solid", + }, + }, }, series: [ { @@ -84,12 +98,13 @@ const getOption = () => { type: "line", stack: "Total", symbol: "emptyCircle", - + smooth: true, symbolSize: 10, - label: { + label: { show: true, color: "#ffffff", - position:'top', + position: "top", + fontSize: 14, formatter: function (data) { return data.value; }, @@ -127,7 +142,7 @@ const getOption = () => { data: data.list, }, - { + { name: "背景", type: "bar", data: data.bg, diff --git a/src/view/echarts_hygiene/tnb.vue b/src/view/echarts_hygiene/tnb.vue index 8e8bfb3..57673fc 100644 --- a/src/view/echarts_hygiene/tnb.vue +++ b/src/view/echarts_hygiene/tnb.vue @@ -1,5 +1,5 @@