Compare commits

..

No commits in common. "7c54611efe236d54ee0afbffb60e4cac57ecea23" and "a405e3365cd425cdbd8d62c5601a59a886bb93e1" have entirely different histories.

12 changed files with 63 additions and 123 deletions

View File

@ -125,9 +125,8 @@ import { reactive, computed, h, onMounted, render } from "vue";
import { NSelect, NDataTable, NPagination, NButton, NIcon } from "naive-ui"; import { NSelect, NDataTable, NPagination, NButton, NIcon } from "naive-ui";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import dayjs from "dayjs";
const { t, locale } = useI18n(); const { t } = useI18n();
const router = useRouter(); const router = useRouter();
import pdfFile from "@/assets/image/icon/icon-pdf.png"; import pdfFile from "@/assets/image/icon/icon-pdf.png";
import wordFile from "@/assets/image/icon/icon-word.png"; import wordFile from "@/assets/image/icon/icon-word.png";
@ -302,18 +301,9 @@ const columns = [
key: "filing_date", key: "filing_date",
sorter: "default", sorter: "default",
width: 150, width: 150,
// render: (row) => ( render: (row) => (
// <div style={{ borderRight: "1px dashed #E7E7E7" }}>{row.filing_date}</div> <div style={{ borderRight: "1px dashed #E7E7E7" }}>{row.filing_date}</div>
// ), ),
render: (row) => {
return (
<div style={{ borderRight: "1px dashed #E7E7E7" }}>
{locale.value === 'zh' || locale.value === 'zh-TW'
? dayjs(row.filing_date).format('YYYY年M月D日')
: dayjs(row.filing_date).format('MMMM D, YYYY')}
</div>
);
},
}, },
{ {
// title: "Form", // title: "Form",

View File

@ -125,9 +125,8 @@ import { reactive, computed, h, onMounted, render } from "vue";
import { NSelect, NDataTable, NPagination, NButton, NIcon } from "naive-ui"; import { NSelect, NDataTable, NPagination, NButton, NIcon } from "naive-ui";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import dayjs from "dayjs";
const { t, locale } = useI18n(); const { t } = useI18n();
const router = useRouter(); const router = useRouter();
import pdfFile from "@/assets/image/icon/icon-pdf.png"; import pdfFile from "@/assets/image/icon/icon-pdf.png";
import wordFile from "@/assets/image/icon/icon-word.png"; import wordFile from "@/assets/image/icon/icon-word.png";
@ -302,18 +301,9 @@ const columns = [
key: "filing_date", key: "filing_date",
sorter: "default", sorter: "default",
width: 150, width: 150,
// render: (row) => ( render: (row) => (
// <div style={{ borderRight: "1px dashed #E7E7E7" }}>{row.filing_date}</div> <div style={{ borderRight: "1px dashed #E7E7E7" }}>{row.filing_date}</div>
// ), ),
render: (row) => {
return (
<div style={{ borderRight: "1px dashed #E7E7E7" }}>
{locale.value === 'zh' || locale.value === 'zh-TW'
? dayjs(row.filing_date).format('YYYY年M月D日')
: dayjs(row.filing_date).format('MMMM D, YYYY')}
</div>
);
},
}, },
{ {
// title: "Form", // title: "Form",

View File

@ -126,9 +126,8 @@ import { reactive, computed, h, onMounted, render } from "vue";
import { NSelect, NDataTable, NPagination, NButton, NIcon } from "naive-ui"; import { NSelect, NDataTable, NPagination, NButton, NIcon } from "naive-ui";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import dayjs from "dayjs";
const { t, locale } = useI18n(); const { t } = useI18n();
const router = useRouter(); const router = useRouter();
import pdfFile from "@/assets/image/icon/icon-pdf.png"; import pdfFile from "@/assets/image/icon/icon-pdf.png";
import wordFile from "@/assets/image/icon/icon-word.png"; import wordFile from "@/assets/image/icon/icon-word.png";
@ -303,18 +302,9 @@ const columns = [
key: "filing_date", key: "filing_date",
sorter: "default", sorter: "default",
width: 150, width: 150,
// render: (row) => ( render: (row) => (
// <div style={{ borderRight: "1px dashed #E7E7E7" }}>{row.filing_date}</div> <div style={{ borderRight: "1px dashed #E7E7E7" }}>{row.filing_date}</div>
// ), ),
render: (row) => {
return (
<div style={{ borderRight: "1px dashed #E7E7E7" }}>
{locale.value === 'zh' || locale.value === 'zh-TW'
? dayjs(row.filing_date).format('YYYY年M月D日')
: dayjs(row.filing_date).format('MMMM D, YYYY')}
</div>
);
},
}, },
{ {
// title: "Form", // title: "Form",

View File

@ -125,9 +125,8 @@ import { reactive, computed, h, onMounted, render } from "vue";
import { NSelect, NDataTable, NPagination, NButton, NIcon } from "naive-ui"; import { NSelect, NDataTable, NPagination, NButton, NIcon } from "naive-ui";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import dayjs from "dayjs";
const { t, locale } = useI18n(); const { t } = useI18n();
const router = useRouter(); const router = useRouter();
import pdfFile from "@/assets/image/icon/icon-pdf.png"; import pdfFile from "@/assets/image/icon/icon-pdf.png";
import wordFile from "@/assets/image/icon/icon-word.png"; import wordFile from "@/assets/image/icon/icon-word.png";
@ -302,18 +301,9 @@ const columns = [
key: "filing_date", key: "filing_date",
sorter: "default", sorter: "default",
width: 150, width: 150,
// render: (row) => ( render: (row) => (
// <div style={{ borderRight: "1px dashed #E7E7E7" }}>{row.filing_date}</div> <div style={{ borderRight: "1px dashed #E7E7E7" }}>{row.filing_date}</div>
// ), ),
render: (row) => {
return (
<div style={{ borderRight: "1px dashed #E7E7E7" }}>
{locale.value === 'zh' || locale.value === 'zh-TW'
? dayjs(row.filing_date).format('YYYY年M月D日')
: dayjs(row.filing_date).format('MMMM D, YYYY')}
</div>
);
},
}, },
{ {
// title: "Form", // title: "Form",

View File

@ -243,9 +243,7 @@
pages.length % 2 !== 0 && index === pages.length - 1, pages.length % 2 !== 0 && index === pages.length - 1,
}" }"
> >
<div class="text-[24px] font-600">{{ locale === 'zh' || locale === 'zh-TW' <div class="text-[24px] font-600">{{ item.time }}</div>
? dayjs(item.date).format('YYYY年M月D日')
: dayjs(item.date).format('MMMM D, YYYY') }}</div>
<n-tooltip <n-tooltip
trigger="hover" trigger="hover"
:disabled="!item.showTooltip" :disabled="!item.showTooltip"

View File

@ -242,9 +242,7 @@
pages.length % 2 !== 0 && index === pages.length - 1, pages.length % 2 !== 0 && index === pages.length - 1,
}" }"
> >
<div class="text-[24px] font-600">{{ locale === 'zh' || locale === 'zh-TW' <div class="text-[24px] font-600">{{ item.time }}</div>
? dayjs(item.date).format('YYYY年M月D日')
: dayjs(item.date).format('MMMM D, YYYY') }}</div>
<n-tooltip <n-tooltip
trigger="hover" trigger="hover"
:disabled="!item.showTooltip" :disabled="!item.showTooltip"

View File

@ -182,12 +182,10 @@
<div class="grid grid-cols-1 gap-4"> <div class="grid grid-cols-1 gap-4">
<template v-for="(item, index) in pages" :key="index"> <template v-for="(item, index) in pages" :key="index">
<div <div
style="height: 182px" style="height: 232px"
class="news-card flex flex-col justify-between" class="news-card flex flex-col justify-between"
> >
<div class="text-[24PX] font-600">{{ locale === 'zh' || locale === 'zh-TW' <div class="text-[24PX] font-600">{{ item.time }}</div>
? dayjs(item.date).format('YYYY年M月D日')
: dayjs(item.date).format('MMMM D, YYYY') }}</div>
<n-tooltip <n-tooltip
trigger="hover" trigger="hover"
:disabled="!item.showTooltip" :disabled="!item.showTooltip"
@ -629,7 +627,7 @@ const handleLink = (item) => {
color: #ff7bac; color: #ff7bac;
} }
.section-titles { .section-titles {
// font-size: 22px; font-size: 22px;
margin-bottom: 15px; margin-bottom: 15px;
margin-top: 0; margin-top: 0;
color: black; color: black;
@ -639,8 +637,8 @@ const handleLink = (item) => {
content: ""; content: "";
position: absolute; position: absolute;
left: 0; left: 0;
width: 2rem; width: 60px;
height: 0.25rem; height: 4px;
background: #ff7bac; background: #ff7bac;
transform: translateY(-20px); transform: translateY(-20px);
} }
@ -734,8 +732,8 @@ const handleLink = (item) => {
content: ""; content: "";
position: absolute; position: absolute;
left: 0; left: 0;
width: 2rem; width: 60px;
height: 0.25rem; height: 4px;
background: #ff7bac; background: #ff7bac;
transform: translateY(-20px); transform: translateY(-20px);
} }
@ -752,8 +750,8 @@ const handleLink = (item) => {
content: ""; content: "";
position: absolute; position: absolute;
left: 0; left: 0;
width: 2rem; width: 60px;
height: 0.25rem; height: 4px;
background: #ff7bac; background: #ff7bac;
transform: translateY(-20px); transform: translateY(-20px);
} }
@ -774,14 +772,14 @@ const handleLink = (item) => {
border-left: 2px solid #ff7bac; border-left: 2px solid #ff7bac;
transform: translateX(-10px); transform: translateX(-10px);
padding-left: 10px; padding-left: 10px;
// font-size: 12px;
font-size: 12px;
color: #000; color: #000;
} }
.data-label { .data-label {
// font-weight: 500; // font-weight: 500;
// width: 150px; width: 150px;
width: 5rem;
} }
.data-value { .data-value {

View File

@ -219,9 +219,7 @@
pages.length % 2 !== 0 && index === pages.length - 1, pages.length % 2 !== 0 && index === pages.length - 1,
}" }"
> >
<div class="text-[24PX] font-600">{{ locale === 'zh' || locale === 'zh-TW' <div class="text-[24PX] font-600">{{ item.time }}</div>
? dayjs(item.date).format('YYYY年M月D日')
: dayjs(item.date).format('MMMM D, YYYY') }}</div>
<n-tooltip <n-tooltip
trigger="hover" trigger="hover"
:disabled="!item.showTooltip" :disabled="!item.showTooltip"

View File

@ -89,9 +89,7 @@
</div> </div>
</n-tooltip> </n-tooltip>
<div class="download-section"> <div class="download-section">
<div class="news-item-date">{{ locale === 'zh' || locale === 'zh-TW' <div class="news-item-date">{{ item.date }}</div>
? dayjs(item.date).format('YYYY年M月D日')
: dayjs(item.date).format('MMMM D, YYYY') }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -153,7 +151,6 @@ import {
import { NTooltip, NPagination } from "naive-ui"; import { NTooltip, NPagination } from "naive-ui";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import axios from "axios"; import axios from "axios";
import dayjs from "dayjs";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
const router = useRouter(); const router = useRouter();
@ -242,13 +239,13 @@ const getPressReleasesDisplay = () => {
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
if (res.data.status === 0) { if (res.data.status === 0) {
// res.data.data?.data?.forEach((item) => { res.data.data?.data?.forEach((item) => {
// item.date = new Date(item.date).toLocaleDateString("en-US", { item.date = new Date(item.date).toLocaleDateString("en-US", {
// month: "short", month: "short",
// day: "numeric", day: "numeric",
// year: "numeric", year: "numeric",
// }); });
// }); });
state.filterNewsData = res.data.data?.data || []; state.filterNewsData = res.data.data?.data || [];
state.total = res.data.data?.total || 0; state.total = res.data.data?.total || 0;
} }

View File

@ -89,9 +89,7 @@
</div> </div>
</n-tooltip> </n-tooltip>
<div class="download-section"> <div class="download-section">
<div class="news-item-date">{{ locale === 'zh' || locale === 'zh-TW' <div class="news-item-date">{{ item.date }}</div>
? dayjs(item.date).format('YYYY年M月D日')
: dayjs(item.date).format('MMMM D, YYYY') }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -155,7 +153,6 @@ import {
import { NTooltip, NPagination } from "naive-ui"; import { NTooltip, NPagination } from "naive-ui";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import axios from "axios"; import axios from "axios";
import dayjs from "dayjs";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
const router = useRouter(); const router = useRouter();
@ -244,13 +241,13 @@ const getPressReleasesDisplay = () => {
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
if (res.data.status === 0) { if (res.data.status === 0) {
// res.data.data?.data?.forEach((item) => { res.data.data?.data?.forEach((item) => {
// item.date = new Date(item.date).toLocaleDateString("en-US", { item.date = new Date(item.date).toLocaleDateString("en-US", {
// month: "short", month: "short",
// day: "numeric", day: "numeric",
// year: "numeric", year: "numeric",
// }); });
// }); });
state.filterNewsData = res.data.data?.data || []; state.filterNewsData = res.data.data?.data || [];
state.total = res.data.data?.total || 0; state.total = res.data.data?.total || 0;
} }

View File

@ -89,9 +89,7 @@
</div> </div>
</n-tooltip> </n-tooltip>
<div class="download-section"> <div class="download-section">
<div class="news-item-date">{{ locale === 'zh' || locale === 'zh-TW' <div class="news-item-date">{{ item.date }}</div>
? dayjs(item.date).format('YYYY年M月D日')
: dayjs(item.date).format('MMMM D, YYYY') }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -154,7 +152,6 @@ import {
import { NTooltip, NPagination } from "naive-ui"; import { NTooltip, NPagination } from "naive-ui";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import axios from "axios"; import axios from "axios";
import dayjs from "dayjs";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
const router = useRouter(); const router = useRouter();
@ -264,13 +261,13 @@ const getPressReleasesDisplay = () => {
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
if (res.data.status === 0) { if (res.data.status === 0) {
// res.data.data?.data?.forEach((item) => { res.data.data?.data?.forEach((item) => {
// item.date = new Date(item.createdAt).toLocaleDateString("en-US", { item.date = new Date(item.createdAt).toLocaleDateString("en-US", {
// month: "short", month: "short",
// day: "numeric", day: "numeric",
// year: "numeric", year: "numeric",
// }); });
// }); });
state.filterNewsData = res.data.data?.data || []; state.filterNewsData = res.data.data?.data || [];
state.total = res.data.data?.total || 0; state.total = res.data.data?.total || 0;
} }

View File

@ -89,9 +89,7 @@
</div> </div>
</n-tooltip> </n-tooltip>
<div class="download-section"> <div class="download-section">
<div class="news-item-date">{{ locale === 'zh' || locale === 'zh-TW' <div class="news-item-date">{{ item.date }}</div>
? dayjs(item.date).format('YYYY年M月D日')
: dayjs(item.date).format('MMMM D, YYYY') }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -154,7 +152,6 @@ import {
import { NTooltip, NPagination } from "naive-ui"; import { NTooltip, NPagination } from "naive-ui";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import axios from "axios"; import axios from "axios";
import dayjs from "dayjs";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
const router = useRouter(); const router = useRouter();
@ -264,13 +261,13 @@ const getPressReleasesDisplay = () => {
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
if (res.data.status === 0) { if (res.data.status === 0) {
// res.data.data?.data?.forEach((item) => { res.data.data?.data?.forEach((item) => {
// item.date = new Date(item.createdAt).toLocaleDateString("en-US", { item.date = new Date(item.createdAt).toLocaleDateString("en-US", {
// month: "short", month: "short",
// day: "numeric", day: "numeric",
// year: "numeric", year: "numeric",
// }); });
// }); });
state.filterNewsData = res.data.data?.data || []; state.filterNewsData = res.data.data?.data || [];
state.total = res.data.data?.total || 0; state.total = res.data.data?.total || 0;
} }