From 85176991f992810c624558c29a0dd6044bc56c0b Mon Sep 17 00:00:00 2001 From: wanghx Date: Mon, 8 Jan 2024 17:47:11 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E7=BB=9F=E4=B8=80=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/icon-download-list.png | Bin 0 -> 4946 bytes src/components/layout/Header/downloadModal.jsx | 179 ++++++++++++++++++++- src/components/layout/Header/index.jsx | 4 +- src/components/layout/Header/index.scss | 71 +++++++- .../SystemMgm/MessageMgm/ConfMes/loadable.jsx | 8 +- .../MessageMgm/DeviceAlarmMes/loadable.jsx | 8 +- .../MessageMgm/MonitorCarAlarmMes/loadable.jsx | 8 +- .../MessageMgm/NotificationMes/loadable.jsx | 8 +- src/services/common.js | 18 +++ 9 files changed, 287 insertions(+), 17 deletions(-) create mode 100644 src/assets/images/icon-download-list.png diff --git a/src/assets/images/icon-download-list.png b/src/assets/images/icon-download-list.png new file mode 100644 index 0000000000000000000000000000000000000000..53b764886f5ec5a4c4f90062326d5186e03d588c GIT binary patch literal 4946 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 (pageInfo.pn - 1) * pageInfo.length + index + 1 + dataIndex: 'name' + }, + { + title: '进度', + width: 200, + align: 'center', + dataIndex: 'progress', + render: (progress) => ((progress || 0) * 100) + '%' + }, + { + title: '文件大小', + width: 200, + align: 'center', + dataIndex: 'size' + }, + { + title: '排队位置', + width: 150, + align: 'center', + dataIndex: 'queue' + }, + { + title: '状态', + width: 100, + align: 'center', + dataIndex: 'status', + render: (status) => { + if (status == 1) { + return ( +
导出中
+ ) + } else if (status == 2) { + return ( +
已完成
+ ) + } else if (status == 3) { + return ( +
等待中
+ ) + } + } + }, + { + title: '创建时间', + width: 200, + align: 'center', + dataIndex: 'create_time' + }, + { + title: "操作", + // width: 60, + align: 'center', + render: (text, record, index) => { + return ( +
+ { + record.status == 2 ? ( +
handleDownload(record.url)}>下载
+ ) : null + } +
handleDel(record)}>删除
+
+ ) + } }, ] + const paginationProps = { + className: "pagination-common", + showQuickJumper: true, + showSizeChanger: true, + current: formData.pn, + total: resultData?.total, + pageSize: formData.length, + pageSizeOptions: dictionary.pageSizeOptions, + onChange: (current, size) => { + setFormData({ + ...formData, + ...{ pn: current == formData.pn ? 1 : current, length: size } + }) + ajaxGetDownloadList({ + ...formData, + ...{ pn: current == formData.pn ? 1 : current, length: size } + }) + }, + onShowSizeChange: (current, size) => { + setFormData({ + ...formData, + ...{ pn: current == formData.pn ? 1 : current, length: size } + }) + ajaxGetDownloadList({ + ...formData, + ...{ pn: current == formData.pn ? 1 : current, length: size } + }) + } + } + + const handleDownload = (url) => { + window.open(url) + } + + const ajaxGetDownloadList = (params=formData) => { + ajax.getDownloadList(params).then(e => { + if (e.status == 20000 && e.data.list.length) { + setResultDate({ + list: [...e.data.list], + total: e.data.total + }) + } else { + setResultDate({ + list: [], + total: 0 + }) + } + }) + } + + const ajaxDownloadDel = (id) => { + return new Promise((resolved, rejected) => { + ajax.delDownload({id: id}).then(e => { + if (e.status == 20000) { + resolved(e.message) + } else { + message.error(e.message) + } + }).catch(err => { + message.error(err) + rejected(err) + }) + }) + } + + const handleDel = (data) => { + Modal.confirm({ + title: `确认删除`, + content: `是否确认删除文件 ${data.name}？`, + onOk: () => { + ajaxDownloadDel(data.id).then(msg => { + ajaxGetDownloadList() + message.success('下载任务删除成功') + }) + } + }) + } + const handleTabChange = (v) => { setFormData({ ...formData, type: v, pn: 1 }) + ajaxGetDownloadList({ + ...formData, + type: v, + pn: 1 + }) } + useEffect(() => { + if (visible) { + setFormData({ + type: '0', + pn: 1, + length: 20 + }) + ajaxGetDownloadList({ + type: '0', + pn: 1, + length: 20 + }) + } + }, [visible]) + return (
-
+
+ +
diff --git a/src/components/layout/Header/index.jsx b/src/components/layout/Header/index.jsx index 7abb5cd..386f532 100644 --- a/src/components/layout/Header/index.jsx +++ b/src/components/layout/Header/index.jsx @@ -243,8 +243,8 @@ export default function Header(props) { -
  • setDownloadVisible(true)}> - {/* */} +
  • setDownloadVisible(true)}> +
    • {/*
  • diff --git a/src/components/layout/Header/index.scss b/src/components/layout/Header/index.scss index c754977..d461162 100644 --- a/src/components/layout/Header/index.scss +++ b/src/components/layout/Header/index.scss @@ -1,3 +1,19 @@ +$color-user-list-bg : var(--color-user-list-bg); +@mixin scrollBar($back, $item) { + &::-webkit-scrollbar-track-piece, + &::-webkit-scrollbar-corner, + &::-webkit-scrollbar-track { + background: #000; + } + &::-webkit-scrollbar { + width: 4px; + height: 4px; + } + &::-webkit-scrollbar-thumb { + background: #9da2ab; + border-radius: 2px; + } +} .cc-header-actions { > ul { display: flex; @@ -296,11 +312,36 @@ } .modal-export { .ant-modal-body { - max-height: 860px; - min-height: 400px; + height: 700px; + min-height: 0; border-radius: 4px; - box-shadow: 0px 3px 8px 0px rgba(0,0,0,0.16); + box-shadow: 0px 3px 8px 0px rgba(0,0,0,0.16); + .ant-table-body { + // @include scrollBar(var(--color-user-list-bg), #3B97FF); + } + .export-table-wrapper { + &::before { + content: ""; + width: 4px; + height: 56px; + background: #616b83; + position: absolute; + right: 19px; + top: 100px; + z-index: 2; + } + } .modal-export-container { + display: flex; + flex-direction: column; + min-height: 0; + height: 100%; + .modal-export-content { + flex: 1; + min-height: 0; + display: flex; + flex-direction: column; + } .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list .ant-tabs-tab { width: unset; padding: 12px 5px; @@ -325,5 +366,27 @@ } } } - + .export-table-wrapper { + flex: 1; + min-height: 0; + overflow-y: auto; + @include scrollBar(var(--color-user-list-bg), #3B97FF); + } + .download-list-action { + display: flex; + justify-content: center; + > div { + margin: 0 10px; + &:hover { + cursor: pointer; + } + } + } +} + +.icon-download { + .icon { + background: url('../../../assets/images/icon-download-list.png') no-repeat 100% 100%; + background-size: 100% 100%; + } } \ No newline at end of file diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx index c16d562..53d5ff8 100644 --- a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx @@ -133,8 +133,14 @@ function ConfMes(props) { onChange: (current, size) => { setPageInfo({ ...pageInfo, - ...{ pn: current, length: size } + ...{ pn: current == pageInfo.pn ? 1 : current, length: size } }); + }, + onShowSizeChange: (current, size) => { + setPageInfo({ + ...pageInfo, + ...{ pn: current == pageInfo.pn ? 1 : current, length: size } + }); } } const toDeftime = (v) => { diff --git a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx index b4b0125..2e0175f 100644 --- a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx @@ -105,8 +105,14 @@ function NotificationMes(props) { onChange: (current, size) => { setPageInfo({ ...pageInfo, - ...{ pn: current, length: size } + ...{ pn: current == pageInfo.pn ? 1 : current, length: size } }); + }, + onShowSizeChange: (current, size) => { + setPageInfo({ + ...pageInfo, + ...{ pn: current == pageInfo.pn ? 1 : current, length: size } + }); } } const toDeftime = (v) => { diff --git a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx index fd5bf4a..9892d58 100644 --- a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx @@ -104,8 +104,14 @@ function MonitorCarAlarmMes(props) { onChange: (current, size) => { setPageInfo({ ...pageInfo, - ...{ pn: current, length: size } + ...{ pn: current == pageInfo.pn ? 1 : current, length: size } }); + }, + onShowSizeChange: (current, size) => { + setPageInfo({ + ...pageInfo, + ...{ pn: current == pageInfo.pn ? 1 : current, length: size } + }); } } const toDeftime = (v) => { diff --git a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx index 61b44a6..011f11b 100644 --- a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx @@ -146,8 +146,14 @@ function NotificationMes(props) { onChange: (current, size) => { setPageInfo({ ...pageInfo, - ...{ pn: current, length: size } + ...{ pn: current == pageInfo.pn ? 1 : current, length: size } }); + }, + onShowSizeChange: (current, size) => { + setPageInfo({ + ...pageInfo, + ...{ pn: current == pageInfo.pn ? 1 : current, length: size } + }); } } const toDeftime = (v) => { diff --git a/src/services/common.js b/src/services/common.js index c1c517f..12c97f4 100644 --- a/src/services/common.js +++ b/src/services/common.js @@ -129,6 +129,22 @@ const getPlateSearch = (params) => { data: params, }); }; +//下载列表 +const getDownloadList = (params) => { + return ajax({ + url: "/api/com/common/download_list", + type: 'get', + data: params + }) +} +//下载列表 - 删除 +const delDownload = (params) => { + return ajax({ + url: "/api/com/common/download_del", + type: 'post', + data: params + }) +} export default { getSysConfig, getRoadSearch, @@ -146,4 +162,6 @@ export default { updateCache, getAreaTree, getLocationNameByLngLat, + getDownloadList, + delDownload };