diff --git a/src/main/webapp/pages/predict/IndRNN.jsp b/src/main/webapp/pages/predict/IndRNN.jsp index d827b75..1bc7412 100644 --- a/src/main/webapp/pages/predict/IndRNN.jsp +++ b/src/main/webapp/pages/predict/IndRNN.jsp @@ -10,7 +10,7 @@ - IndRNN模型 + Fine-tuned IndRNN model @@ -22,27 +22,27 @@
-

疫情状况预测

+

The prediction of COVID-19 epidemic situation

-

IndRNN模型

+

Fine-tuned IndRNN model





@@ -54,9 +54,9 @@





-
-


+


+
@@ -231,18 +231,25 @@ option_brazil = { title: { - text: '巴西疫情状况' + text: 'Brazil' }, tooltip: { trigger: 'axis' }, - legend: { - data: ['确诊人数', '预测确诊人数','死亡人数','预测死亡人数'], - selected:{ - '死亡人数':false, - '预测死亡人数':false, + legend: [ + { + top: '20', + data: ['Cumulative confirmed cases', 'Predicted cumulative confirmed cases'], + }, + { + top: '40', + data: ['Cumulative death cases','Predicted cumulative death cases'], + selected:{ + 'Cumulative death cases':false, + 'Predicted cumulative death cases':false, + } } - }, + ], grid: { left: '3%', right: '4%', @@ -264,13 +271,13 @@ }, series: [ { - name: '确诊人数', + name: 'Cumulative confirmed cases', type: 'line', stack: '1', data: Brazil_origin }, { - name: '预测确诊人数', + name: 'Predicted cumulative confirmed cases', type: 'line', stack: '2', itemStyle: { @@ -284,7 +291,7 @@ data: Brazil_predict }, { - name: '死亡人数', + name: 'Cumulative death cases', type: 'line', stack: '3', itemStyle: { @@ -298,7 +305,7 @@ data: Brazil_death_origin }, { - name: '预测死亡人数', + name: 'Predicted cumulative death cases', type: 'line', stack: '4', itemStyle: { @@ -316,18 +323,25 @@ myChart_Brazil.setOption(option_brazil); option_china = { title: { - text: '中国疫情状况' + text: 'China' }, tooltip: { trigger: 'axis' }, - legend: { - data: ['确诊人数', '预测确诊人数','死亡人数','预测死亡人数'], - selected:{ - '死亡人数':false, - '预测死亡人数':false, + legend: [ + { + top: '20', + data: ['Cumulative confirmed cases', 'Predicted cumulative confirmed cases'], + }, + { + top: '40', + data: ['Cumulative death cases','Predicted cumulative death cases'], + selected:{ + 'Cumulative death cases':false, + 'Predicted cumulative death cases':false, + } } - }, + ], grid: { left: '3%', right: '4%', @@ -349,13 +363,13 @@ }, series: [ { - name: '确诊人数', + name: 'Cumulative confirmed cases', type: 'line', stack: '1', data: China_origin }, { - name: '预测确诊人数', + name: 'Predicted cumulative confirmed cases', type: 'line', stack: '2', itemStyle: { @@ -369,7 +383,7 @@ data: China_predict }, { - name: '死亡人数', + name: 'Cumulative death cases', type: 'line', stack: '3', itemStyle: { @@ -383,7 +397,7 @@ data: China_death_origin }, { - name: '预测死亡人数', + name: 'Predicted cumulative death cases', type: 'line', stack: '4', itemStyle: { @@ -401,18 +415,25 @@ myChart_China.setOption(option_china); option_france = { title: { - text: '法国疫情状况' + text: 'France' }, tooltip: { trigger: 'axis' }, - legend: { - data: ['确诊人数', '预测确诊人数','死亡人数','预测死亡人数'], - selected:{ - '死亡人数':false, - '预测死亡人数':false, + legend: [ + { + top: '20', + data: ['Cumulative confirmed cases', 'Predicted cumulative confirmed cases'], + }, + { + top: '40', + data: ['Cumulative death cases','Predicted cumulative death cases'], + selected:{ + 'Cumulative death cases':false, + 'Predicted cumulative death cases':false, + } } - }, + ], grid: { left: '3%', right: '4%', @@ -434,13 +455,13 @@ }, series: [ { - name: '确诊人数', + name: 'Cumulative confirmed cases', type: 'line', stack: '1', data: France_origin }, { - name: '预测确诊人数', + name: 'Predicted cumulative confirmed cases', type: 'line', stack: '2', itemStyle: { @@ -454,7 +475,7 @@ data: France_predict }, { - name: '死亡人数', + name: 'Cumulative death cases', type: 'line', stack: '3', itemStyle: { @@ -468,7 +489,7 @@ data: France_death_origin }, { - name: '预测死亡人数', + name: 'Predicted cumulative death cases', type: 'line', stack: '4', itemStyle: { @@ -486,18 +507,25 @@ myChart_france.setOption(option_france); option_global = { title: { - text: '世界疫情状况' + text: 'World' }, tooltip: { trigger: 'axis' }, - legend: { - data: ['确诊人数', '预测确诊人数','死亡人数','预测死亡人数'], - selected:{ - '死亡人数':false, - '预测死亡人数':false, + legend: [ + { + top: '20', + data: ['Cumulative confirmed cases', 'Predicted cumulative confirmed cases'], + }, + { + top: '40', + data: ['Cumulative death cases','Predicted cumulative death cases'], + selected:{ + 'Cumulative death cases':false, + 'Predicted cumulative death cases':false, + } } - }, + ], grid: { left: '3%', right: '4%', @@ -519,13 +547,13 @@ }, series: [ { - name: '确诊人数', + name: 'Cumulative confirmed cases', type: 'line', stack: '1', data: Global_origin }, { - name: '预测确诊人数', + name: 'Predicted cumulative confirmed cases', type: 'line', stack: '2', itemStyle: { @@ -539,7 +567,7 @@ data: Global_predict }, { - name: '死亡人数', + name: 'Cumulative death cases', type: 'line', stack: '3', itemStyle: { @@ -553,7 +581,7 @@ data: Global_death_origin }, { - name: '预测死亡人数', + name: 'Predicted cumulative death cases', type: 'line', stack: '4', itemStyle: { @@ -571,18 +599,25 @@ myChart_global.setOption(option_global); option_india = { title: { - text: '印度疫情状况' + text: 'India' }, tooltip: { trigger: 'axis' }, - legend: { - data: ['确诊人数', '预测确诊人数','死亡人数','预测死亡人数'], - selected:{ - '死亡人数':false, - '预测死亡人数':false, + legend: [ + { + top: '20', + data: ['Cumulative confirmed cases', 'Predicted cumulative confirmed cases'], + }, + { + top: '40', + data: ['Cumulative death cases','Predicted cumulative death cases'], + selected:{ + 'Cumulative death cases':false, + 'Predicted cumulative death cases':false, + } } - }, + ], grid: { left: '3%', right: '4%', @@ -604,13 +639,13 @@ }, series: [ { - name: '确诊人数', + name: 'Cumulative confirmed cases', type: 'line', stack: '1', data: India_origin }, { - name: '预测确诊人数', + name: 'Predicted cumulative confirmed cases', type: 'line', stack: '2', itemStyle: { @@ -624,7 +659,7 @@ data: India_predict }, { - name: '死亡人数', + name: 'Cumulative death cases', type: 'line', stack: '3', itemStyle: { @@ -638,7 +673,7 @@ data: India_death_origin }, { - name: '预测死亡人数', + name: 'Predicted cumulative death cases', type: 'line', stack: '4', itemStyle: { @@ -656,18 +691,25 @@ myChart_india.setOption(option_india); option_russia = { title: { - text: '俄罗斯疫情状况' + text: 'Russia' }, tooltip: { trigger: 'axis' }, - legend: { - data: ['确诊人数', '预测确诊人数','死亡人数','预测死亡人数'], - selected:{ - '死亡人数':false, - '预测死亡人数':false, + legend: [ + { + top: '20', + data: ['Cumulative confirmed cases', 'Predicted cumulative confirmed cases'], + }, + { + top: '40', + data: ['Cumulative death cases','Predicted cumulative death cases'], + selected:{ + 'Cumulative death cases':false, + 'Predicted cumulative death cases':false, + } } - }, + ], grid: { left: '3%', right: '4%', @@ -689,13 +731,13 @@ }, series: [ { - name: '确诊人数', + name: 'Cumulative confirmed cases', type: 'line', stack: '1', data: Russia_origin }, { - name: '预测确诊人数', + name: 'Predicted cumulative confirmed cases', type: 'line', stack: '2', itemStyle: { @@ -709,7 +751,7 @@ data: Russia_predict }, { - name: '死亡人数', + name: 'Cumulative death cases', type: 'line', stack: '3', itemStyle: { @@ -723,7 +765,7 @@ data: Russia_death_origin }, { - name: '预测死亡人数', + name: 'Predicted cumulative death cases', type: 'line', stack: '4', itemStyle: { @@ -741,18 +783,25 @@ myChart_russia.setOption(option_russia); option_us = { title: { - text: '美国疫情状况' + text: 'the United Stated' }, tooltip: { trigger: 'axis' }, - legend: { - data: ['确诊人数', '预测确诊人数','死亡人数','预测死亡人数'], - selected:{ - '死亡人数':false, - '预测死亡人数':false, + legend: [ + { + top: '20', + data: ['Cumulative confirmed cases', 'Predicted cumulative confirmed cases'], + }, + { + top: '40', + data: ['Cumulative death cases','Predicted cumulative death cases'], + selected:{ + 'Cumulative death cases':false, + 'Predicted cumulative death cases':false, + } } - }, + ], grid: { left: '3%', right: '4%', @@ -774,13 +823,13 @@ }, series: [ { - name: '确诊人数', + name: 'Cumulative confirmed cases', type: 'line', stack: '1', data: US_origin }, { - name: '预测确诊人数', + name: 'Predicted cumulative confirmed cases', type: 'line', stack: '2', itemStyle: { @@ -794,7 +843,7 @@ data: US_predict }, { - name: '死亡人数', + name: 'Cumulative death cases', type: 'line', stack: '3', itemStyle: { @@ -808,7 +857,7 @@ data: US_death_origin }, { - name: '预测死亡人数', + name: 'Predicted cumulative death cases', type: 'line', stack: '4', itemStyle: { diff --git a/src/main/webapp/pages/predict/china_confirmed.jsp b/src/main/webapp/pages/predict/china_confirmed.jsp index 16f96ee..3f9cb3d 100644 --- a/src/main/webapp/pages/predict/china_confirmed.jsp +++ b/src/main/webapp/pages/predict/china_confirmed.jsp @@ -157,9 +157,9 @@ stack: '3', itemStyle: { normal: { - color: "#6c58db",//折线点的颜色 + color: "#fadb14",//折线点的颜色 lineStyle: { - color: "#5869db"//折线的颜色 + color: "#fadb14"//折线的颜色 } } }, diff --git a/src/main/webapp/pages/predict/global_confirmed.jsp b/src/main/webapp/pages/predict/global_confirmed.jsp index 44ef1a8..e0ef84b 100644 --- a/src/main/webapp/pages/predict/global_confirmed.jsp +++ b/src/main/webapp/pages/predict/global_confirmed.jsp @@ -157,9 +157,9 @@ stack: '3', itemStyle: { normal: { - color: "#6c58db",//折线点的颜色 + color: "#fadb14",//折线点的颜色 lineStyle: { - color: "#5869db"//折线的颜色 + color: "#fadb14"//折线的颜色 } } }, diff --git a/src/main/webapp/pages/predict/global_death.jsp b/src/main/webapp/pages/predict/global_death.jsp index 41c36ef..06ebf33 100644 --- a/src/main/webapp/pages/predict/global_death.jsp +++ b/src/main/webapp/pages/predict/global_death.jsp @@ -157,9 +157,9 @@ stack: '3', itemStyle: { normal: { - color: "#6c58db",//折线点的颜色 + color: "#fadb14",//折线点的颜色 lineStyle: { - color: "#5869db"//折线的颜色 + color: "#fadb14"//折线的颜色 } } }, diff --git a/src/main/webapp/pages/predict/usa_confirmed.jsp b/src/main/webapp/pages/predict/usa_confirmed.jsp index a71af5a..67b3a50 100644 --- a/src/main/webapp/pages/predict/usa_confirmed.jsp +++ b/src/main/webapp/pages/predict/usa_confirmed.jsp @@ -157,9 +157,9 @@ stack: '3', itemStyle: { normal: { - color: "#6c58db",//折线点的颜色 + color: "#fadb14",//折线点的颜色 lineStyle: { - color: "#5869db"//折线的颜色 + color: "#fadb14"//折线的颜色 } } },