26279e4f by zrj

大屏1.6修改

1 parent dbfda0b0
......@@ -131,6 +131,10 @@ const sBase = computed(() => props.sBase)
watch(() => props.historyDate,(newVal) => {
if (isMounted.value) {
nowYear.value = parseInt(newVal.substring(0,4))
Year1.value = parseInt(hDate.value.substring(0,4)) - 1
Year2.value = parseInt(hDate.value.substring(0,4))
legend1.value = [`${Year1.value}待收款`, `${Year1.value}收费单待签`, `预提占比`]
legend2.value = [`${Year2.value}待收款`, `${Year2.value}收费单待签`, `同期预提占比`]
init()
}
})
......@@ -1842,7 +1846,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
focus: 'series'
},
// data: [320, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390],
data: h1,
data: h4,
itemStyle: {
color: {
type: 'linear',
......@@ -1864,7 +1868,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
focus: 'series'
},
// data: [120, 132, 101, 134, 90, 230, 210, 101, 134, 90, 230, 210],
data: h2,
data: h5,
itemStyle: {
color: {
type: 'linear',
......@@ -1902,7 +1906,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
{
name: `预提占比`,
type: 'line',
data: h3,
data: h6,
symbol:'circle',
symbolSize: 6,
yAxisIndex:1,
......@@ -1922,7 +1926,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
focus: 'series'
},
// data: [320, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390],
data: h4,
data: h1,
itemStyle: {
color: {
type: 'linear',
......@@ -1944,7 +1948,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
focus: 'series'
},
// data: [120, 132, 101, 134, 90, 230, 210, 101, 134, 90, 230, 210],
data: h5,
data: h2,
itemStyle: {
color: {
type: 'linear',
......@@ -1990,7 +1994,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
{
name: `同期预提占比`,
type: 'line',
data: h6,
data: h3,
symbol:'circle',
symbolSize: 6,
yAxisIndex:1,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!