From b072ce98793bf18513b75f8ea092f498b99d3335 Mon Sep 17 00:00:00 2001 From: sankeyangshu <1260323835@qq.com> Date: Tue, 10 Dec 2024 15:48:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=88=B9=E8=B4=A7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImpordFile/index.vue | 7 +- src/components/RemoteSelect/select.vue | 75 +++ src/types/boatInfo.ts | 12 + src/views/Boat/components/BoatDialog.vue | 13 +- src/views/Boat/components/LoadMap.vue | 125 ++++- src/views/Home/components/HomeChart.vue | 2 +- src/views/Home/index.vue | 27 +- src/views/Notice/index.vue | 17 +- src/views/Send/components/BoatInfoDialog.vue | 485 ++++++++++++++++++ src/views/Send/components/BoatInfoSend.vue | 15 +- src/views/Send/components/HistoryTable.vue | 66 ++- .../Send/components/ManifestDetailDialog.vue | 29 +- .../Send/components/ManifestDetailSend.vue | 25 +- src/views/Send/components/ManifestDialog.vue | 29 +- src/views/Send/components/ManifestSend.vue | 23 +- src/views/Send/components/Send.vue | 7 +- src/views/Send/index.vue | 1 + 17 files changed, 899 insertions(+), 59 deletions(-) create mode 100644 src/components/RemoteSelect/select.vue create mode 100644 src/views/Send/components/BoatInfoDialog.vue diff --git a/src/components/ImpordFile/index.vue b/src/components/ImpordFile/index.vue index 4a6b854..95f4fb6 100644 --- a/src/components/ImpordFile/index.vue +++ b/src/components/ImpordFile/index.vue @@ -37,9 +37,9 @@ - + @@ -79,6 +79,8 @@ const acceptParams = (params: ExcelParameterProps) => { dialogVisible.value = true; }; +const emits = defineEmits(['endFileUpload']); + // 文件上传 const uploadExcel = async (param: UploadRequestOptions) => { let excelFormData = new FormData(); @@ -87,6 +89,7 @@ const uploadExcel = async (param: UploadRequestOptions) => { await parameter.value.importApi!(excelFormData); parameter.value.getTableList && parameter.value.getTableList(); dialogVisible.value = false; + emits('endFileUpload'); }; /** diff --git a/src/components/RemoteSelect/select.vue b/src/components/RemoteSelect/select.vue new file mode 100644 index 0000000..fc4b429 --- /dev/null +++ b/src/components/RemoteSelect/select.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/types/boatInfo.ts b/src/types/boatInfo.ts index e664a05..7121788 100644 --- a/src/types/boatInfo.ts +++ b/src/types/boatInfo.ts @@ -1,5 +1,14 @@ import { PageRowsType } from '.'; +/** + * 发布人 + */ +export interface CreateUserType { + id: number; + name: string; + phone: string; +} + /** * 船舶信息类型 */ @@ -7,6 +16,7 @@ export interface BoatInfoType { id: number; createBy: number; createDate: string; + createUser: CreateUserType; updateBy: number; updateDate: string; version: number; @@ -201,6 +211,8 @@ export interface ShipType { seaworthiness: string; regular: string; status: string; + layer: number; + fragment: number; } /** diff --git a/src/views/Boat/components/BoatDialog.vue b/src/views/Boat/components/BoatDialog.vue index 494e2e3..3e05ed0 100644 --- a/src/views/Boat/components/BoatDialog.vue +++ b/src/views/Boat/components/BoatDialog.vue @@ -48,11 +48,11 @@
发布单位：
-
{{ userInfo.enterpriseName }}
+
{{ dialogProps.enterprise?.name }}
发布人：
-
{{ userInfo.username }}
+
{{ dialogProps.createUser?.name }}
发布时间：
@@ -64,7 +64,7 @@
联系电话：
-
暂无
+
{{ dialogProps.createUser?.phone }}
@@ -76,9 +76,7 @@ diff --git a/src/views/Home/components/HomeChart.vue b/src/views/Home/components/HomeChart.vue index 02c7300..e7e3891 100644 --- a/src/views/Home/components/HomeChart.vue +++ b/src/views/Home/components/HomeChart.vue @@ -21,7 +21,7 @@ defineProps({ diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index bb9f1ca..54afe89 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -154,6 +154,9 @@ const outImportVoyages = ref({ textStyle: { color: '#fff', }, + formatter: function (name: string) { + return name.length > 3 ? name.substr(0, 3) + '...' : name; + }, }, series: [ { @@ -198,6 +201,9 @@ const outExportVoyages = ref({ textStyle: { color: '#fff', }, + formatter: function (name: string) { + return name.length > 3 ? name.substr(0, 3) + '...' : name; + }, }, series: [ { @@ -242,6 +248,9 @@ const inTotalVoyages = ref({ textStyle: { color: '#fff', }, + formatter: function (name: string) { + return name.length > 3 ? name.substr(0, 3) + '...' : name; + }, }, series: [ { @@ -286,6 +295,9 @@ const inYearVoyages = ref({ textStyle: { color: '#fff', }, + formatter: function (name: string) { + return name.length > 3 ? name.substr(0, 3) + '...' : name; + }, }, series: [ { @@ -330,6 +342,9 @@ const outImportCargos = ref({ textStyle: { color: '#fff', }, + formatter: function (name: string) { + return name.length > 3 ? name.substr(0, 3) + '...' : name; + }, }, series: [ { @@ -371,6 +386,10 @@ const outExportCargos = ref({ orient: 'vertical', left: 'left', top: 'middle', + itemWidth: 20, + formatter: function (name: string) { + return name.length > 3 ? name.substr(0, 3) + '...' : name; + }, textStyle: { color: '#fff', }, @@ -418,6 +437,9 @@ const inTotalCargos = ref({ textStyle: { color: '#fff', }, + formatter: function (name: string) { + return name.length > 3 ? name.substr(0, 3) + '...' : name; + }, }, series: [ { @@ -462,6 +484,9 @@ const inYearCargos = ref({ textStyle: { color: '#fff', }, + formatter: function (name: string) { + return name.length > 3 ? name.substr(0, 3) + '...' : name; + }, }, series: [ { @@ -588,7 +613,7 @@ onMounted(async () => { .charts { display: flex; flex-direction: column; - margin-right: 50px; + margin-right: 10px; } } .home-footer { diff --git a/src/views/Notice/index.vue b/src/views/Notice/index.vue index 1c07aaa..c15ad5d 100644 --- a/src/views/Notice/index.vue +++ b/src/views/Notice/index.vue @@ -15,6 +15,7 @@ v-for="item in noticeList" :key="item.id" class="list-item" + :class="{ 'list-item-active': currentNotice === item.id }" @click="onClickOpenDialog(item)" >
@@ -51,9 +52,6 @@ const onClickReturn = () => { const noticeList = ref([]); const noticeViewData = ref(); -// 是否显示公告 -const isShowNotice = ref(false); - // 分页参数-当前页数 const currentPage = ref(1); @@ -82,10 +80,13 @@ const noticeListLoad = async () => { await getNoticeList(); }; +// 当前选中的公告 +const currentNotice = ref(0); + const onClickOpenDialog = async (row: NoticeType) => { + currentNotice.value = row.id; const { data } = await noticeGetAPI({ id: row.id }); noticeViewData.value = data; - isShowNotice.value = true; }; @@ -154,6 +155,14 @@ const onClickOpenDialog = async (row: NoticeType) => { font-size: 14px; } } + .list-item:hover { + color: #333; + background-color: #ffffc9; + } + .list-item-active { + color: #333; + background-color: #ffffc9; + } } .content { position: relative; diff --git a/src/views/Send/components/BoatInfoDialog.vue b/src/views/Send/components/BoatInfoDialog.vue new file mode 100644 index 0000000..2caf30d --- /dev/null +++ b/src/views/Send/components/BoatInfoDialog.vue @@ -0,0 +1,485 @@ + + + + + diff --git a/src/views/Send/components/BoatInfoSend.vue b/src/views/Send/components/BoatInfoSend.vue index a97c83f..c46965e 100644 --- a/src/views/Send/components/BoatInfoSend.vue +++ b/src/views/Send/components/BoatInfoSend.vue @@ -1,5 +1,11 @@ diff --git a/src/views/Send/components/ManifestDetailSend.vue b/src/views/Send/components/ManifestDetailSend.vue index c5a6257..eb53910 100644 --- a/src/views/Send/components/ManifestDetailSend.vue +++ b/src/views/Send/components/ManifestDetailSend.vue @@ -1,5 +1,11 @@ diff --git a/src/views/Send/components/ManifestSend.vue b/src/views/Send/components/ManifestSend.vue index 3d8d6ad..9301870 100644 --- a/src/views/Send/components/ManifestSend.vue +++ b/src/views/Send/components/ManifestSend.vue @@ -1,5 +1,11 @@