diff --git a/apps/web-antd/src/api/ops/inspection-template/index.ts b/apps/web-antd/src/api/ops/inspection-template/index.ts index 0a90da910..b4e18257a 100644 --- a/apps/web-antd/src/api/ops/inspection-template/index.ts +++ b/apps/web-antd/src/api/ops/inspection-template/index.ts @@ -1,7 +1,7 @@ -import { requestClient } from '#/api/request'; - import type { FunctionType } from '#/api/ops/area'; +import { requestClient } from '#/api/request'; + export namespace InspectionTemplateApi { /** 巡检检查项模板 */ export interface Template { @@ -41,7 +41,9 @@ export namespace InspectionTemplateApi { // ========== 巡检检查项模板 API ========== /** 获取模板分页 */ -export function getTemplatePage(params: InspectionTemplateApi.TemplatePageQuery) { +export function getTemplatePage( + params: InspectionTemplateApi.TemplatePageQuery, +) { return requestClient.get( '/ops/inspection/template/page', { params }, diff --git a/apps/web-antd/src/router/routes/modules/ops.ts b/apps/web-antd/src/router/routes/modules/ops.ts index 64eb6d195..46cad717e 100644 --- a/apps/web-antd/src/router/routes/modules/ops.ts +++ b/apps/web-antd/src/router/routes/modules/ops.ts @@ -101,8 +101,7 @@ const routes: RouteRecordRaw[] = [ title: '巡检记录', activePath: '/ops/inspection-record', }, - component: () => - import('#/views/ops/inspection-record/index.vue'), + component: () => import('#/views/ops/inspection-record/index.vue'), }, // 巡检模板管理 { @@ -112,8 +111,7 @@ const routes: RouteRecordRaw[] = [ title: '巡检模板管理', activePath: '/ops/inspection-template', }, - component: () => - import('#/views/ops/inspection-template/index.vue'), + component: () => import('#/views/ops/inspection-template/index.vue'), }, ], }, diff --git a/apps/web-antd/src/views/ops/area/data.ts b/apps/web-antd/src/views/ops/area/data.ts index 2ed125634..f5bf3fd1b 100644 --- a/apps/web-antd/src/views/ops/area/data.ts +++ b/apps/web-antd/src/views/ops/area/data.ts @@ -312,4 +312,3 @@ export function useGridColumns(): VxeTableGridOptions['colum }, ]; } - diff --git a/apps/web-antd/src/views/ops/area/index.vue b/apps/web-antd/src/views/ops/area/index.vue index 48ea565ab..6a2f9c2f3 100644 --- a/apps/web-antd/src/views/ops/area/index.vue +++ b/apps/web-antd/src/views/ops/area/index.vue @@ -73,8 +73,7 @@ function handleEdit(row: OpsAreaApi.BusArea) { function buildFullNameMap(list: OpsAreaApi.BusArea[]): Map { const nodeMap = new Map(); for (const item of list) { - if (item.id !== null && item.id !== undefined) - nodeMap.set(item.id, item); + if (item.id !== null && item.id !== undefined) nodeMap.set(item.id, item); } const cache = new Map(); diff --git a/apps/web-antd/src/views/ops/inspection-record/index.vue b/apps/web-antd/src/views/ops/inspection-record/index.vue index 7057ca44e..9b1e52b55 100644 --- a/apps/web-antd/src/views/ops/inspection-record/index.vue +++ b/apps/web-antd/src/views/ops/inspection-record/index.vue @@ -6,13 +6,7 @@ import { onActivated, onMounted, ref } from 'vue'; import { Page, useVbenDrawer } from '@vben/common-ui'; import { IconifyIcon } from '@vben/icons'; -import { - Button, - Card, - DatePicker, - Input, - Tabs, -} from 'ant-design-vue'; +import { Button, Card, DatePicker, Input, Tabs } from 'ant-design-vue'; import { STATUS_TAB_OPTIONS } from './data'; import CardView from './modules/card-view.vue'; @@ -84,11 +78,8 @@ function handleDetail(record: InspectionRecordApi.InspectionRecord) { /** 日期范围变化 */ function handleDateChange(_dates: any, dateStrings: [string, string]) { - if (dateStrings && dateStrings[0]) { - queryParams.value.createTime = dateStrings; - } else { - queryParams.value.createTime = undefined; - } + queryParams.value.createTime = + dateStrings && dateStrings[0] ? dateStrings : undefined; } let isFirstActivate = true; diff --git a/apps/web-antd/src/views/ops/inspection-record/modules/card-view.vue b/apps/web-antd/src/views/ops/inspection-record/modules/card-view.vue index 416c4a57a..3d86ccb47 100644 --- a/apps/web-antd/src/views/ops/inspection-record/modules/card-view.vue +++ b/apps/web-antd/src/views/ops/inspection-record/modules/card-view.vue @@ -103,7 +103,7 @@ defineExpose({ @click="emit('detail', item)" > -
+
@@ -160,10 +160,7 @@ defineExpose({ > {{ ATTRIBUTION_MAP[item.attributionResult] }} - + 已生成工单 @@ -230,10 +227,10 @@ defineExpose({ .card-inner { position: relative; + z-index: 1; display: flex; flex: 1; flex-direction: column; - z-index: 1; padding: 14px; } @@ -273,11 +270,11 @@ defineExpose({ display: -webkit-box; margin: 0 0 10px; overflow: hidden; + -webkit-line-clamp: 2; font-size: 15px; font-weight: 600; line-height: 1.4; color: #262626; - -webkit-line-clamp: 2; -webkit-box-orient: vertical; } @@ -305,9 +302,9 @@ defineExpose({ flex: 1; min-width: 0; overflow: hidden; + text-overflow: ellipsis; font-size: 13px; color: #595959; - text-overflow: ellipsis; white-space: nowrap; } diff --git a/apps/web-antd/src/views/ops/inspection-record/modules/detail-drawer.vue b/apps/web-antd/src/views/ops/inspection-record/modules/detail-drawer.vue index 6311a575d..04e3ea446 100644 --- a/apps/web-antd/src/views/ops/inspection-record/modules/detail-drawer.vue +++ b/apps/web-antd/src/views/ops/inspection-record/modules/detail-drawer.vue @@ -21,13 +21,7 @@ import dayjs from 'dayjs'; import { getRecordDetail } from '#/api/ops/inspection-record'; -import { - ATTRIBUTION_MAP, - ATTRIBUTION_TAG_COLOR_MAP, - RESULT_COLOR_MAP, - RESULT_ICON_MAP, - RESULT_STATUS_MAP, -} from '../data'; +import { RESULT_ICON_MAP, RESULT_STATUS_MAP } from '../data'; const router = useRouter(); const record = ref(null); @@ -36,8 +30,7 @@ const loading = ref(false); const [Drawer, drawerApi] = useVbenDrawer({ onOpenChange(isOpen: boolean) { if (isOpen) { - const data = - drawerApi.getData(); + const data = drawerApi.getData(); if (data?.id) { loadDetail(data.id); } @@ -69,7 +62,12 @@ const itemStats = computed(() => { if (!record.value?.items?.length) return null; const total = record.value.items.length; const passed = record.value.items.filter((i) => i.isPassed).length; - return { total, passed, failed: total - passed, rate: Math.round((passed / total) * 100) }; + return { + total, + passed, + failed: total - passed, + rate: Math.round((passed / total) * 100), + }; }); @@ -80,7 +78,11 @@ const itemStats = computed(() => {
{
检查项
- + {{ itemStats.passed }} - + {{ itemStats.failed }} @@ -188,7 +196,11 @@ const itemStats = computed(() => {
@@ -245,14 +257,15 @@ const itemStats = computed(() => { - +
{ &__photo { overflow: hidden; - border-radius: 6px; cursor: pointer; + border-radius: 6px; :deep(.ant-image-img) { - border-radius: 6px; object-fit: cover; + border-radius: 6px; } } } diff --git a/apps/web-antd/src/views/ops/inspection-record/modules/stats-bar.vue b/apps/web-antd/src/views/ops/inspection-record/modules/stats-bar.vue index 5c41b5e10..796fa0223 100644 --- a/apps/web-antd/src/views/ops/inspection-record/modules/stats-bar.vue +++ b/apps/web-antd/src/views/ops/inspection-record/modules/stats-bar.vue @@ -64,14 +64,13 @@ defineExpose({ refresh: loadStats }); - +
@@ -85,14 +84,13 @@ defineExpose({ refresh: loadStats }); - +
@@ -106,14 +104,13 @@ defineExpose({ refresh: loadStats }); - +
@@ -127,21 +124,24 @@ defineExpose({ refresh: loadStats }); - +
合格率
- {{ statsData.passRate ? `${statsData.passRate.toFixed(1)}%` : '-' }} + {{ + statsData.passRate + ? `${statsData.passRate.toFixed(1)}%` + : '-' + }}
diff --git a/apps/web-antd/src/views/ops/inspection-template/data.ts b/apps/web-antd/src/views/ops/inspection-template/data.ts index 642ce529b..fa2645e6d 100644 --- a/apps/web-antd/src/views/ops/inspection-template/data.ts +++ b/apps/web-antd/src/views/ops/inspection-template/data.ts @@ -4,13 +4,6 @@ import type { InspectionTemplateApi } from '#/api/ops/inspection-template'; import { z } from '#/adapter/form'; -import { - FUNCTION_TYPE_OPTIONS, - FUNCTION_TYPE_TAG_COLORS, -} from '../area/data'; - -export { FUNCTION_TYPE_OPTIONS, FUNCTION_TYPE_TAG_COLORS }; - /** 检查项列表列 */ export function useGridColumns(): VxeTableGridOptions['columns'] { return [ @@ -109,3 +102,5 @@ export function useTemplateFormSchema(): VbenFormSchema[] { }, ]; } + +export { FUNCTION_TYPE_OPTIONS, FUNCTION_TYPE_TAG_COLORS } from '../area/data'; diff --git a/apps/web-antd/src/views/ops/inspection-template/index.vue b/apps/web-antd/src/views/ops/inspection-template/index.vue index abc3ac9a2..8e18e9622 100644 --- a/apps/web-antd/src/views/ops/inspection-template/index.vue +++ b/apps/web-antd/src/views/ops/inspection-template/index.vue @@ -239,7 +239,10 @@ onMounted(() => {
- +
功能类型
{
@@ -281,10 +291,7 @@ onMounted(() => {