diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 8cf3a1b..0000000 Binary files a/dist.zip 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/sy.vue b/src/view/sy.vue index 063faf4..7645521 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -569,16 +569,18 @@
{{ currentData.pxkssj.slice(0, 4) }}-{{ currentData.pxkssj.slice(4, 6) - }}-{{ currentData.pxkssj.slice(6, 8) }} + }}-{{ currentData.pxkssj.slice(6, 8) }}/{{ + currentData.pxjssj.slice(4, 6) + }}-{{ currentData.pxjssj.slice(6, 8) }}
-