|
8 | 8 | <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
|
9 | 9 | <title></title>
|
10 | 10 | </head>
|
11 |
| - |
12 |
| - <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;"> |
| 11 | + <body style="margin: 0; overflow: hidden; background: #fff; width: 100%; height: 100%; position: absolute; top: 0;"> |
13 | 12 | <div id="main">
|
14 | 13 | <sm-web-map :map-options="mapOptions" @load="mapLoaded" @click="mapClicked"></sm-web-map>
|
15 | 14 | <div id="group">
|
|
38 | 37 | <sm-image
|
39 | 38 | repeat="noRepeat"
|
40 | 39 | src="../img/online-qr.png"
|
41 |
| - style="position: absolute; bottom: 32px;right: 16px;z-index: 1000;height: 88px;width: 88px;" |
| 40 | + style="position: absolute; bottom: 32px; right: 16px; z-index: 1000; height: 88px; width: 88px;" |
42 | 41 | ></sm-image>
|
43 | 42 | </div>
|
44 | 43 | <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
|
|
82 | 81 | .ant-radio-button-wrapper-checked:first-child {
|
83 | 82 | color: #1890ff;
|
84 | 83 | }
|
85 |
| - .sm-component-indicator { |
86 |
| - padding-left: 0px; |
87 |
| - } |
88 |
| - .sm-component-text { |
89 |
| - margin-top: -16px; |
90 |
| - } |
91 |
| - .sm-component-count-to__numItem { |
92 |
| - letter-spacing: 0 !important; |
93 |
| - text-indent: 1px !important; |
94 |
| - } |
95 | 84 | @media screen and (max-width: 768px) {
|
96 | 85 | .sm-component-count-to__numItem {
|
97 | 86 | font-size: 32px !important;
|
|
105 | 94 | .sm-component-text {
|
106 | 95 | font-size: 16px !important;
|
107 | 96 | }
|
108 |
| - .sm-component-text { |
109 |
| - margin-top: -10px; |
110 |
| - } |
111 | 97 | #group {
|
112 | 98 | margin-top: 28px;
|
113 | 99 | }
|
|
122 | 108 | <script>
|
123 | 109 | var styles = {
|
124 | 110 | 'china-riskLevel': {
|
125 |
| - tooltip: function(properties) { |
| 111 | + tooltip: function (properties) { |
126 | 112 | if (properties.daysNoConfirmedAdd >= 3) {
|
127 | 113 | return resources.text_ncp_riskLevel_tooltip
|
128 | 114 | .replace('{name}', properties['省份'])
|
|
156 | 142 | 'line-color': '#5F5F5F'
|
157 | 143 | },
|
158 | 144 | 'china-incrementConfirmed': {
|
159 |
| - tooltip: function(properties) { |
| 145 | + tooltip: function (properties) { |
160 | 146 | if (isNaN(properties['confirmedAdd'])) {
|
161 | 147 | return resources.text_ncp_nodata_tooltip.replace('{name}', properties['省份']);
|
162 | 148 | }
|
|
192 | 178 | 'line-color': '#83838D'
|
193 | 179 | },
|
194 | 180 | 'china-nowConfirmed': {
|
195 |
| - tooltip: function(properties) { |
| 181 | + tooltip: function (properties) { |
196 | 182 | if (isNaN(properties['nowConfirmed'])) {
|
197 | 183 | return resources.text_ncp_nodata_tooltip.replace('{name}', properties['省份']);
|
198 | 184 | }
|
|
224 | 210 | 'line-color': '#83838D'
|
225 | 211 | },
|
226 | 212 | 'china-incidence': {
|
227 |
| - tooltip: function(properties) { |
| 213 | + tooltip: function (properties) { |
228 | 214 | return resources.text_ncp_incidence_tooltip
|
229 | 215 | .replace('{name}', properties['省份'])
|
230 | 216 | .replace('{incidence}', properties['incidence'])
|
|
260 | 246 |
|
261 | 247 | return {
|
262 | 248 | type: 'china-riskLevel',
|
263 |
| - time: '', |
| 249 | + time: '04/01 24:00', |
264 | 250 | nums: {
|
265 | 251 | 'china-incrementConfirmed': 0,
|
266 | 252 | 'china-nowConfirmed': 0,
|
|
331 | 317 | });
|
332 | 318 | $.get(
|
333 | 319 | 'https://ncpviz.oss-cn-beijing.aliyuncs.com/ncpviz/ui.json?time=' + new Date().getTime(),
|
334 |
| - function(response) { |
| 320 | + function (response) { |
335 | 321 | document.title = getTitle(response);
|
336 | 322 | }
|
337 | 323 | );
|
|
341 | 327 | this.map = e.map;
|
342 | 328 | $.get(
|
343 | 329 | 'https://ncpviz.oss-cn-beijing.aliyuncs.com/ncpviz/ncp.json?time=' + new Date().getTime(),
|
344 |
| - function(response) { |
345 |
| - this.time = resources.text_ncp_time.replace('{time}', response.time); |
| 330 | + function (response) { |
| 331 | + // this.time = resources.text_ncp_time.replace('{time}', response.time); |
346 | 332 | var latestProvinceData = this.getLatestProvinceData(response);
|
347 | 333 | this.map.addSource('china', {
|
348 | 334 | type: 'geojson',
|
|
447 | 433 | getLatestProvinceData(response) {
|
448 | 434 | var unit = 100000; //单位为10万
|
449 | 435 | var dataByName = {};
|
450 |
| - ProvincesCenterData.features.forEach(provinceData => { |
| 436 | + ProvincesCenterData.features.forEach((provinceData) => { |
451 | 437 | dataByName[provinceData.properties['省份']] = provinceData;
|
452 | 438 | });
|
453 | 439 | var dataExcludeNational = response.data.slice(1);
|
|
456 | 442 | var provinceLabelData = [];
|
457 | 443 | var provinceName = [];
|
458 | 444 | var daysNoConfirmedAdd = [];
|
459 |
| - dataExcludeNational.forEach(data => { |
460 |
| - if (data.provinces[0].provinceData && data.provinces[0].provinceData.properties) { |
461 |
| - var name = data.provinces[0].provinceData.provinceName; |
| 445 | + dataExcludeNational.forEach((data) => { |
| 446 | + if (data.provinces[1].provinceData && data.provinces[1].provinceData.properties) { |
| 447 | + var name = data.provinces[1].provinceData.provinceName; |
462 | 448 | provinceName.push(name);
|
463 |
| - daysNoConfirmedAdd.push(data.provinces[0].provinceData.properties.daysNoConfirmedAdd); |
| 449 | + daysNoConfirmedAdd.push(data.provinces[1].provinceData.properties.daysNoConfirmedAdd); |
464 | 450 | // 计算连续三日最高的新增确诊数
|
465 |
| - if (data.provinces[0].provinceData.properties.confirmedAdd != null) { |
| 451 | + if (data.provinces[1].provinceData.properties.confirmedAdd != null) { |
466 | 452 | var latest3DaysConfiredInrement = data.provinces
|
467 |
| - .slice(0, 3) |
468 |
| - .map(e => e.provinceData.properties.confirmedAdd); |
469 |
| - data.provinces[0].provinceData.properties.daysMaxConfirmedAdd = Math.max( |
| 453 | + .slice(1, 4) |
| 454 | + .map((e) => e.provinceData.properties.confirmedAdd); |
| 455 | + data.provinces[1].provinceData.properties.daysMaxConfirmedAdd = Math.max( |
470 | 456 | latest3DaysConfiredInrement[0],
|
471 | 457 | latest3DaysConfiredInrement[1],
|
472 | 458 | latest3DaysConfiredInrement[2]
|
473 | 459 | );
|
474 | 460 | } else {
|
475 |
| - delete data.provinces[0].provinceData.properties.daysNoConfirmedAdd; |
| 461 | + delete data.provinces[1].provinceData.properties.daysNoConfirmedAdd; |
476 | 462 | }
|
477 | 463 |
|
478 |
| - var confirmed = data.provinces[0].provinceData.properties.confirmed; |
| 464 | + var confirmed = data.provinces[1].provinceData.properties.confirmed; |
479 | 465 | var confirmedAbsent = false;
|
480 | 466 | if (confirmed == null) {
|
481 | 467 | confirmed = data.provinces[1].provinceData.properties.confirmed;
|
|
485 | 471 | var incidence = (confirmed / population) * unit;
|
486 | 472 | incidence = Number(incidence.toFixed(2));
|
487 | 473 | if (!confirmedAbsent) {
|
488 |
| - data.provinces[0].provinceData.properties.incidence = incidence; |
| 474 | + data.provinces[1].provinceData.properties.incidence = incidence; |
489 | 475 | }
|
490 |
| - data.provinces[0].provinceData.properties.population = population; |
| 476 | + data.provinces[1].provinceData.properties.population = population; |
491 | 477 | // provinceIncidence.push(incidence);
|
492 |
| - var toPush = Object.assign(data.provinces[0].provinceData); |
| 478 | + var toPush = Object.assign(data.provinces[1].provinceData); |
493 | 479 | // latestProvinceData.push(toPush);
|
494 |
| - var province = ProvinceData.features.find(function(item) { |
| 480 | + var province = ProvinceData.features.find(function (item) { |
495 | 481 | return item.properties.Name === name || item.properties.Name.indexOf(name) === 0;
|
496 | 482 | });
|
497 |
| - var provinceLabel = ProvincesCenterData.features.find(function(item) { |
| 483 | + var provinceLabel = ProvincesCenterData.features.find(function (item) { |
498 | 484 | return (
|
499 | 485 | item.properties['省份'] === name || item.properties['省份'].indexOf(name) === 0
|
500 | 486 | );
|
|
0 commit comments