This commit is contained in:
FLL
2025-09-09 18:34:45 +08:00
parent 337b0d1740
commit 24ef7391a7
4 changed files with 29 additions and 6 deletions

View File

@@ -21,6 +21,10 @@ export function getStatistics() {
export function getworkOrder() {
return requestClient.get<any>('/property/screen/typeWorkOrderHistogram');
}
// 会议室
export function getTodayMeetCount() {
return requestClient.get<any>('/property/screen/todayMeetCount');
}
// /**
// * 导出资产管理列表
// * @param params

View File

@@ -5,6 +5,7 @@ import type { PageResult } from '#/api/common';
import { commonExport } from '#/api/helper';
import { requestClient } from '#/api/request';
import type {AuthGroupQuery, AuthGroupVO} from "#/api/sis/authGroup/model";
/**
* 查询入驻单位列表
@@ -32,6 +33,12 @@ export function resident_unitExport(params?: Resident_unitQuery) {
export function resident_unitInfo(id: ID) {
return requestClient.get<Resident_unitVO>(`/property/resident_unit/${id}`);
}
/**
* 通行权限组
*/
export function authGroupList(params?: AuthGroupQuery) {
return requestClient.get<PageResult<AuthGroupVO>>('/sis/authGroup/list', { params });
}
/**
* 新增入驻单位

View File

@@ -1,7 +1,7 @@
<script setup lang="ts">
import type {Unit} from '#/api/property/resident/unit/model';
import {shallowRef} from 'vue';
import {shallowRef,ref} from 'vue';
import {useVbenModal} from '@vben/common-ui';
@@ -10,7 +10,7 @@ import dayjs from 'dayjs';
import duration from 'dayjs/plugin/duration';
import relativeTime from 'dayjs/plugin/relativeTime';
import {resident_unitInfo} from '#/api/property/resident/unit';
import {resident_unitInfo, authGroupList} from '#/api/property/resident/unit';
import {renderDict} from "#/utils/render";
dayjs.extend(duration);
@@ -24,7 +24,7 @@ const [BasicModal, modalApi] = useVbenModal({
});
const unitDetail = shallowRef<null | Unit>(null);
const authGroupName = ref('')
async function handleOpenChange(open: boolean) {
if (!open) {
return null;
@@ -33,13 +33,16 @@ async function handleOpenChange(open: boolean) {
const {id} = modalApi.getData() as { id: number | string };
const response = await resident_unitInfo(id);
const authGroupId = response.authGroupId;
const res = await authGroupList();
const authGroup = res.rows;
authGroupName.value = authGroup.find(item => item.id === authGroupId)?.name;
// 赋值
unitDetail.value = response;
modalApi.modalLoading(false);
}
</script>
<template>
@@ -80,7 +83,7 @@ async function handleOpenChange(open: boolean) {
/>
</DescriptionsItem>
<DescriptionsItem label="通行权限组">
{{ unitDetail.authGroupId ?? '-' }}
{{ authGroupName }}
</DescriptionsItem>
<DescriptionsItem label="备注">
{{ unitDetail.remark ?? '-' }}

View File

@@ -149,7 +149,7 @@
</template>
<script setup lang="ts">
import {getStatistics,getworkOrder} from '#/api/analytics';
import {getStatistics,getworkOrder,getTodayMeetCount} from '#/api/analytics';
import AnalyticsTrends from './analytics-trends.vue';
import { Radio } from 'ant-design-vue';
@@ -203,6 +203,13 @@ const handleDateChange = (date: any) => {
analyticsTrendsRef.value.getMeterRecordTrend(paramDate);
}
};
//会议室
const todayMeetCount = ref();
const handleTodayMeetCount = async () => {
todayMeetCount.value = await getTodayMeetCount();
console.log(todayMeetCount)
};
@@ -220,6 +227,7 @@ import {
} from '#/utils/echartsResize';
import { useFlexibleRem } from '#/utils/useFlexibleRem';
import {DatePicker} from "ant-design-vue";
import {getTodayMeetCount} from "#/api/analytics";
useFlexibleRem();
// 路由
const router = useRouter();
@@ -585,6 +593,7 @@ const changeToPersonnelDuty=()=>{
// 组件挂载时初始化
onMounted(() => {
getWarning()
handleTodayMeetCount()
updateTime();
timer = setInterval(updateTime, 1000);