26279e4f by zrj

大屏1.6修改

1 parent dbfda0b0
...@@ -131,6 +131,10 @@ const sBase = computed(() => props.sBase) ...@@ -131,6 +131,10 @@ const sBase = computed(() => props.sBase)
131 watch(() => props.historyDate,(newVal) => { 131 watch(() => props.historyDate,(newVal) => {
132 if (isMounted.value) { 132 if (isMounted.value) {
133 nowYear.value = parseInt(newVal.substring(0,4)) 133 nowYear.value = parseInt(newVal.substring(0,4))
134 Year1.value = parseInt(hDate.value.substring(0,4)) - 1
135 Year2.value = parseInt(hDate.value.substring(0,4))
136 legend1.value = [`${Year1.value}待收款`, `${Year1.value}收费单待签`, `预提占比`]
137 legend2.value = [`${Year2.value}待收款`, `${Year2.value}收费单待签`, `同期预提占比`]
134 init() 138 init()
135 } 139 }
136 }) 140 })
...@@ -1842,7 +1846,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => { ...@@ -1842,7 +1846,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
1842 focus: 'series' 1846 focus: 'series'
1843 }, 1847 },
1844 // data: [320, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390], 1848 // data: [320, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390],
1845 data: h1, 1849 data: h4,
1846 itemStyle: { 1850 itemStyle: {
1847 color: { 1851 color: {
1848 type: 'linear', 1852 type: 'linear',
...@@ -1864,7 +1868,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => { ...@@ -1864,7 +1868,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
1864 focus: 'series' 1868 focus: 'series'
1865 }, 1869 },
1866 // data: [120, 132, 101, 134, 90, 230, 210, 101, 134, 90, 230, 210], 1870 // data: [120, 132, 101, 134, 90, 230, 210, 101, 134, 90, 230, 210],
1867 data: h2, 1871 data: h5,
1868 itemStyle: { 1872 itemStyle: {
1869 color: { 1873 color: {
1870 type: 'linear', 1874 type: 'linear',
...@@ -1902,7 +1906,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => { ...@@ -1902,7 +1906,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
1902 { 1906 {
1903 name: `预提占比`, 1907 name: `预提占比`,
1904 type: 'line', 1908 type: 'line',
1905 data: h3, 1909 data: h6,
1906 symbol:'circle', 1910 symbol:'circle',
1907 symbolSize: 6, 1911 symbolSize: 6,
1908 yAxisIndex:1, 1912 yAxisIndex:1,
...@@ -1922,7 +1926,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => { ...@@ -1922,7 +1926,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
1922 focus: 'series' 1926 focus: 'series'
1923 }, 1927 },
1924 // data: [320, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390], 1928 // data: [320, 332, 301, 334, 390, 330, 320, 320, 332, 301, 334, 390],
1925 data: h4, 1929 data: h1,
1926 itemStyle: { 1930 itemStyle: {
1927 color: { 1931 color: {
1928 type: 'linear', 1932 type: 'linear',
...@@ -1944,7 +1948,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => { ...@@ -1944,7 +1948,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
1944 focus: 'series' 1948 focus: 'series'
1945 }, 1949 },
1946 // data: [120, 132, 101, 134, 90, 230, 210, 101, 134, 90, 230, 210], 1950 // data: [120, 132, 101, 134, 90, 230, 210, 101, 134, 90, 230, 210],
1947 data: h5, 1951 data: h2,
1948 itemStyle: { 1952 itemStyle: {
1949 color: { 1953 color: {
1950 type: 'linear', 1954 type: 'linear',
...@@ -1990,7 +1994,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => { ...@@ -1990,7 +1994,7 @@ const setC = (arr, h1, h2, h3, h4, h5, h6, l1, l2) => {
1990 { 1994 {
1991 name: `同期预提占比`, 1995 name: `同期预提占比`,
1992 type: 'line', 1996 type: 'line',
1993 data: h6, 1997 data: h3,
1994 symbol:'circle', 1998 symbol:'circle',
1995 symbolSize: 6, 1999 symbolSize: 6,
1996 yAxisIndex:1, 2000 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!