cd08c1a0 by zrj

大屏1.6修改

1 parent 5e47f98e
...@@ -16,10 +16,10 @@ const isLoading = ref(false) ...@@ -16,10 +16,10 @@ const isLoading = ref(false)
16 16
17 function handleChangeTheme(type) { 17 function handleChangeTheme(type) {
18 styleTheme.value = type 18 styleTheme.value = type
19 isLoading.value = true 19 // isLoading.value = true
20 setTimeout(() => { 20 // setTimeout(() => {
21 isLoading.value = false 21 // isLoading.value = false
22 }, 3000) 22 // }, 3000)
23 } 23 }
24 24
25 </script> 25 </script>
......
...@@ -60,7 +60,7 @@ const nowDate = ref(`${year}-${formatMonth(month)}`) ...@@ -60,7 +60,7 @@ const nowDate = ref(`${year}-${formatMonth(month)}`)
60 let selectBase = ref() 60 let selectBase = ref()
61 let baseList = ref() 61 let baseList = ref()
62 let isLeader = ref(false) 62 let isLeader = ref(false)
63 // url.value = 'http://192.168.1.152:8899/login/sid=9cdeffd3-0a59-414c-944c-8e71a11b05cc#/' 63 // url.value = 'http://192.168.1.152:8899/login/sid=99afabdd-240a-4486-9b65-a9af641d6b51#/'
64 url.value = window.location.href 64 url.value = window.location.href
65 result.value = url.value?.split('=')[1]?.split('#')[0]; 65 result.value = url.value?.split('=')[1]?.split('#')[0];
66 66
......
...@@ -538,14 +538,14 @@ async function handelGetYS0010() { ...@@ -538,14 +538,14 @@ async function handelGetYS0010() {
538 const res = await getYS0010(url.value, {"yeargroup": resYear1.value}) 538 const res = await getYS0010(url.value, {"yeargroup": resYear1.value})
539 const TBdata = res.data.list.map(n => n.TBRATIO) 539 const TBdata = res.data.list.map(n => n.TBRATIO)
540 const HBdata = res.data.list.map(n => n.HBRATIO) 540 const HBdata = res.data.list.map(n => n.HBRATIO)
541 handelContrast(resYear1.value[0], resYear1.value[1], TBdata, HBdata, true) 541 handelContrast(resYear1.value[0], resYear1.value[1], TBdata, HBdata, true, 'SRJE')
542 } 542 }
543 543
544 async function handelGetYS0011() { 544 async function handelGetYS0011() {
545 const res = await getYS0011(url.value, {"yeargroup": resYear2.value}) 545 const res = await getYS0011(url.value, {"yeargroup": resYear2.value})
546 const TBdata = res.data.list.map(n => n.TBRATIO) 546 const TBdata = res.data.list.map(n => n.TBRATIO)
547 const HBdata = res.data.list.map(n => n.HBRATIO) 547 const HBdata = res.data.list.map(n => n.HBRATIO)
548 handelContrast(resYear1.value[0], resYear1.value[1], TBdata, HBdata, false) 548 handelContrast(resYear2.value[0], resYear2.value[1], TBdata, HBdata, false, 'YSCOST')
549 } 549 }
550 550
551 function contrastDialogShow(type) { 551 function contrastDialogShow(type) {
...@@ -2165,7 +2165,7 @@ const handelZhu4_2 = (listX1, dataList1,dataList2, arr1) => { ...@@ -2165,7 +2165,7 @@ const handelZhu4_2 = (listX1, dataList1,dataList2, arr1) => {
2165 // autoHover(chart44, option, 0, 2000) 2165 // autoHover(chart44, option, 0, 2000)
2166 } 2166 }
2167 2167
2168 const handelContrast = (row1, row2, TBdata, HBdata, flag) => { 2168 const handelContrast = (row1, row2, TBdata, HBdata, flag, type) => {
2169 chartContrast = echarts.init(contrastRef.value) 2169 chartContrast = echarts.init(contrastRef.value)
2170 let monthData = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'] 2170 let monthData = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
2171 2171
...@@ -2371,7 +2371,7 @@ const handelContrast = (row1, row2, TBdata, HBdata, flag) => { ...@@ -2371,7 +2371,7 @@ const handelContrast = (row1, row2, TBdata, HBdata, flag) => {
2371 focus: 'series' 2371 focus: 'series'
2372 }, 2372 },
2373 data: row1.list.map(val => { 2373 data: row1.list.map(val => {
2374 return (val.SRJE / 10000).toFixed() 2374 return (val[type] / 10000).toFixed()
2375 }), 2375 }),
2376 itemStyle: { 2376 itemStyle: {
2377 color: { 2377 color: {
...@@ -2397,7 +2397,7 @@ const handelContrast = (row1, row2, TBdata, HBdata, flag) => { ...@@ -2397,7 +2397,7 @@ const handelContrast = (row1, row2, TBdata, HBdata, flag) => {
2397 focus: 'series' 2397 focus: 'series'
2398 }, 2398 },
2399 data: row2.list.map(val => { 2399 data: row2.list.map(val => {
2400 return (val.SRJE / 10000).toFixed() 2400 return (val[type] / 10000).toFixed()
2401 }), 2401 }),
2402 itemStyle: { 2402 itemStyle: {
2403 color: { 2403 color: {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!