Этот коммит содержится в:
Maarten 2024-10-11 09:16:06 +02:00
родитель ebebc3058b
Коммит 29725ef38b
2 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -35,6 +35,10 @@
.domain([0, max(cases.map(d => d.attribution_total_score))]) .domain([0, max(cases.map(d => d.attribution_total_score))])
.range([0.2, 1]) .range([0.2, 1])
$: ticks = xScale.ticks(5); $: ticks = xScale.ticks(5);
$: timeRangeDays = (xScale.domain()[1] - xScale.domain()[0])/86400000
$: dateFormat = timeRangeDays > 100
? utcFormat('%b')
: utcFormat('%b %-d')
const actorNations = ['Other', 'China', 'Iran', 'North Korea', 'Russia']; const actorNations = ['Other', 'China', 'Iran', 'North Korea', 'Russia'];
const colors = ['#555555', '#bf0a0a', '#0f8a0f', '#8a4d0f', '#0f4c8a']; const colors = ['#555555', '#bf0a0a', '#0f8a0f', '#8a4d0f', '#0f4c8a'];
@ -203,7 +207,7 @@
class="time-axis-tick-label" class="time-axis-tick-label"
x={xScale(tick)} x={xScale(tick)}
y={height/2 - marginsKeyEvents.bottom + 24} y={height/2 - marginsKeyEvents.bottom + 24}
text-anchor={'middle'}>{utcFormat('%b')(tick)}</text text-anchor={'middle'}>{dateFormat(tick)}</text
> >
{/each} {/each}
{#if xScale} {#if xScale}

Просмотреть файл

@ -29,7 +29,8 @@
fullTimeRange fullTimeRange
} from '../stores/filters'; } from '../stores/filters';
//$: console.log($timeRangeFilter) $: console.log($timeRangeFilter)
//$: console.log($fullTimeRange)
$: innerWidth = 0; $: innerWidth = 0;
$: isMobile = innerWidth < 520; $: isMobile = innerWidth < 520;
@ -46,7 +47,6 @@
); );
cases = response; cases = response;
cases = cases.filter((d) => d.attribution_id != ''); cases = cases.filter((d) => d.attribution_id != '');
console.log(cases)
cases.forEach((d) => { cases.forEach((d) => {
d.platform = splitString(d.platforms); d.platform = splitString(d.platforms);
d.medium = splitString(d.medium) d.medium = splitString(d.medium)