From de25003e02aef9c22203043ddb37b4e516a72158 Mon Sep 17 00:00:00 2001 From: donghao Date: Fri, 13 Jun 2025 09:24:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=9F=B3=E9=A2=91=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=86=E9=A1=B5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomTable/src/basePagination.tsx | 1 + src/components/CustomTable/src/baseTable.tsx | 6 +- src/plugins/zhCnElement.ts | 8 +- src/views/dataView/DataOverview.vue | 1 + .../components/Type2LicensePlateRecog.vue | 7 +- .../components/Type4AudioDetection.vue | 346 ++++++++++-------- 6 files changed, 202 insertions(+), 167 deletions(-) diff --git a/src/components/CustomTable/src/basePagination.tsx b/src/components/CustomTable/src/basePagination.tsx index e415556..183ccfd 100644 --- a/src/components/CustomTable/src/basePagination.tsx +++ b/src/components/CustomTable/src/basePagination.tsx @@ -276,6 +276,7 @@ export default defineComponent({ ]} > + /{Math.ceil(props.total / props.pageSize)}页 ); } diff --git a/src/components/CustomTable/src/baseTable.tsx b/src/components/CustomTable/src/baseTable.tsx index 4da84b5..48f04dc 100644 --- a/src/components/CustomTable/src/baseTable.tsx +++ b/src/components/CustomTable/src/baseTable.tsx @@ -28,6 +28,10 @@ export default defineComponent({ type: Array as PropType, required: true }, + isHaddenPagination: { + type: Boolean, + default: false + }, /** * 表格的数据 @@ -479,7 +483,7 @@ export default defineComponent({ */} - {showPagination.value && renderPagination()} + {!props.isHaddenPagination && showPagination.value && renderPagination()} {!isUndefined(props.visibleColumn) && renderCustomColumn()} ); diff --git a/src/plugins/zhCnElement.ts b/src/plugins/zhCnElement.ts index f86f511..b9e3324 100644 --- a/src/plugins/zhCnElement.ts +++ b/src/plugins/zhCnElement.ts @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2025-03-11 11:09:39 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2025-06-12 17:16:05 + * @LastEditTime: 2025-06-12 17:54:08 * @FilePath: \5G-Loading-Bay-Web\src\plugins\zhCn.ts * @Description: element-plus 中文 */ @@ -11,10 +11,10 @@ import zhCn from "element-plus/es/locale/lang/zh-cn"; // 自定义分页器文案 zhCn.el.pagination = { goto: "跳至", - pageClassifier: "页", + pageClassifier: "", pagesize: "条/页", - // total: "" - total: "共 {total} 条" + total: "" + // total: "共 {total} 条" }; export default zhCn; diff --git a/src/views/dataView/DataOverview.vue b/src/views/dataView/DataOverview.vue index 83fdbff..f7ca277 100644 --- a/src/views/dataView/DataOverview.vue +++ b/src/views/dataView/DataOverview.vue @@ -73,6 +73,7 @@ const stopPolling = () => { /**跳转页面 */ const tabDetails = (title: string) => { currentTilte.value = title; + // detailInfo.value = dataList.value; detailInfo.value = filterDetailsByData(toRaw(dataList.value), title); currentType.value = fetchTypeByTitle(title); isHomePage.value = false; diff --git a/src/views/dataView/components/Type2LicensePlateRecog.vue b/src/views/dataView/components/Type2LicensePlateRecog.vue index 3e532c9..971e24b 100644 --- a/src/views/dataView/components/Type2LicensePlateRecog.vue +++ b/src/views/dataView/components/Type2LicensePlateRecog.vue @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2025-06-12 10:27:06 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2025-06-12 17:21:17 + * @LastEditTime: 2025-06-12 17:37:33 * @FilePath: \Web-Traffic-Police\src\views\dataView\components\Type2LicensePlateRecog.vue * @Description: 车牌识别 --> @@ -95,12 +95,7 @@ function convertLPRArrToObjects() { // 分页 function changePage({ page, pageSize }) { - // console.log(record, "changePage_record"); pagination.value = { page, pageSize }; - // currentInfoList.value = convertLPRArrToObjects().slice( - // (page - 1) * pagination.value.pageSize, - // page * pagination.value.pageSize - // ); } watch( diff --git a/src/views/dataView/components/Type4AudioDetection.vue b/src/views/dataView/components/Type4AudioDetection.vue index e86eb31..3942c15 100644 --- a/src/views/dataView/components/Type4AudioDetection.vue +++ b/src/views/dataView/components/Type4AudioDetection.vue @@ -2,191 +2,225 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2025-06-12 10:37:10 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2025-06-12 14:44:33 + * @LastEditTime: 2025-06-13 09:22:29 * @FilePath: \Web-Traffic-Police\src\views\dataView\components\Type4AudioDetection.vue * @Description: 音频检测 --> \ No newline at end of file +