diff --git a/apps/web-antd/src/api/analytics/index.ts b/apps/web-antd/src/api/analytics/index.ts index b853977d..fdfe5a8d 100644 --- a/apps/web-antd/src/api/analytics/index.ts +++ b/apps/web-antd/src/api/analytics/index.ts @@ -37,6 +37,24 @@ export function getAccessControl() { export function getCamera() { return requestClient.get('/sis/deviceManage/online'); } +//车流 +export async function queryTwentyfourRunningDatasByPlNos() { + let params = { + "orgId": "10012", + "plNos": [ + "PFN000000012", + "PFN000000025" + ] + }; + const response = await fetch('https://server.cqnctc.com:6081/web/thirdParty/queryTwentyfourRunningDatasByPlNos', { + method: 'POST', // 指定请求方法为POST + headers: { + 'Content-Type': 'application/json', // 设置内容类型为JSON + }, + body: JSON.stringify(params), // 将参数对象转换为JSON字符串并作为请求体发送 + }); + return response.json(); +} // /** // * 导出资产管理列表 // * @param params diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue index 087bbf75..2380a40d 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue @@ -8,6 +8,7 @@ import relativeTime from 'dayjs/plugin/relativeTime'; import {renderDict} from "#/utils/render"; import {workOrdersInfo} from "#/api/property/businessManagement/workOrders"; import type {WorkOrdersVO} from "#/api/property/businessManagement/workOrders/model"; +import {ossInfo} from "#/api/system/oss"; dayjs.extend(duration); dayjs.extend(relativeTime); @@ -35,6 +36,25 @@ async function handleOpenChange(open: boolean) { handlerName: index === 0 ? item.initiatorPeople : item.handlerName })) } + try { + if (orderDetail.value.orderImgUrl) { + const res = await ossInfo([orderDetail.value.orderImgUrl]); + let imgUrls = [] as string[]; + res.forEach(item => { + imgUrls.push(item.url) + }) + orderDetail.value.orderImgPath = imgUrls; + } + if (orderDetail.value.imgUrl) { + const res = await ossInfo([orderDetail.value.imgUrl]); + let imgUrls = [] as string[]; + res.forEach(item => { + imgUrls.push(item.url) + }) + orderDetail.value.evaluateImgPath = imgUrls + } + } catch (e) { + } modalApi.modalLoading(false); } @@ -61,6 +81,10 @@ async function handleOpenChange(open: boolean) { {{ orderDetail.createTime }} + + 图片加载失败 + diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue index 20c065b1..aa2c5730 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue @@ -8,6 +8,7 @@ import relativeTime from 'dayjs/plugin/relativeTime'; import {renderDict} from "#/utils/render"; import {workOrdersInfo} from "#/api/property/businessManagement/workOrders"; import type {WorkOrdersVO} from "#/api/property/businessManagement/workOrders/model"; +import {ossInfo} from "#/api/system/oss"; dayjs.extend(duration); dayjs.extend(relativeTime); @@ -35,6 +36,25 @@ async function handleOpenChange(open: boolean) { handlerName: index === 0 ? item.initiatorPeople : item.handlerName })) } + try { + if (orderDetail.value.orderImgUrl) { + const res = await ossInfo([orderDetail.value.orderImgUrl]); + let imgUrls = [] as string[]; + res.forEach(item => { + imgUrls.push(item.url) + }) + orderDetail.value.orderImgPath = imgUrls; + } + if (orderDetail.value.imgUrl) { + const res = await ossInfo([orderDetail.value.imgUrl]); + let imgUrls = [] as string[]; + res.forEach(item => { + imgUrls.push(item.url) + }) + orderDetail.value.evaluateImgPath = imgUrls + } + } catch (e) { + } modalApi.modalLoading(false); } @@ -85,6 +105,10 @@ async function handleOpenChange(open: boolean) { 图片加载失败 + + 图片加载失败 + {{ orderDetail.remark }} diff --git a/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue b/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue index 77e73d5d..f547a32c 100644 --- a/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue +++ b/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue @@ -11,7 +11,6 @@ import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; import { modalSchema } from './data'; import {personList} from "#/api/property/resident/person"; -import {renderDictValue} from "#/utils/render"; import {userList} from "#/api/system/user"; const emit = defineEmits<{ reload: [] }>(); @@ -105,11 +104,23 @@ async function queryPersonData() { pageSize: 1000, pageNum: 1, } - const res = await userList(params); - const options = res.rows.map((user) => ({ - label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex') - + '-' + user.phonenumber, - value: user.userId.toString(), + const user = await userList(params); + const resident = await personList(params); + + const residentPerson = user.rows.map(item => ({ + name: item.nickName, + phone: item.phonenumber, + id: item.userId + })); + const userPerson = resident.rows.map(item => ({ + name: item.userName, + phone: item.phone, + id: item.id + })); + const person = residentPerson.concat(userPerson); + const options = person.map((user) => ({ + label: user.name + '-' + user.phone, + value: user.id.toString(), })); formApi.updateSchema([{ componentProps: () => ({ diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/data.ts index d210c607..96c9044e 100644 --- a/apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/data.ts +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/data.ts @@ -34,22 +34,22 @@ export const columns: VxeGridProps['columns'] = [ { type: 'checkbox', width: 60 }, { title: '巡检计划', - field: 'planId', + field: 'planText', minWidth:200 }, { title: '巡检任务', - field: 'taskId', + field: 'taskText', width:150 }, { title: '巡检路线', - field: 'routeId', + field: 'routeText', width:150 }, { title: '巡检点', - field: 'pointId', + field: 'pointText', width:150 }, { diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts index 79c90c9b..49699c8e 100644 --- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts @@ -42,6 +42,10 @@ export const columns: VxeGridProps['columns'] = [ title: '巡检项目', field: 'itemName', }, + { + title: '巡检位置', + field: 'inspectionLocation', + }, { title: 'nfc编码', field: 'nfcCode', diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue index 7b9fe199..3a3ca3d6 100644 --- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue @@ -47,6 +47,9 @@ async function handleOpenChange(open: boolean) { {{pointDetail.itemName}} + + {{pointDetail.inspectionLocation}} + {{ pointDetail.nfcCode}} diff --git a/apps/web-antd/src/views/screen/property/index.vue b/apps/web-antd/src/views/screen/property/index.vue index 4d49fb35..1a91c5a2 100644 --- a/apps/web-antd/src/views/screen/property/index.vue +++ b/apps/web-antd/src/views/screen/property/index.vue @@ -177,7 +177,7 @@