by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
All checks were successful
/ Explore-Gitea-Actions (push) Successful in 15m9s
Details

Browse Source
This commit is contained in:
FLL
2025-08-25 17:29:51 +08:00
parent f794f6a8a9 6cc969e56a
commit 90eceb508a
13 changed files with 136 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web-antd/src/api/property/resident/unit/model.d.ts vendored
View File

@@ -35,6 +35,7 @@ export interface Resident_unitVO {
* 入驻位置
*/
location: string;
locations: string[];
/**
* 入驻时间

14
apps/web-antd/src/layouts/basic.vue
View File

@@ -84,13 +84,13 @@ const menus = computed(() => {
// icon: CircleHelp,
// text: $t('ui.widgets.qa'),
// },
{
handler: () => {
router.push('/navigation');
},
// icon: TagOutlined,
text: '返回导航',
},
// {
// handler: () => {
// router.push('/navigation');
// },
// // icon: TagOutlined,
// text: '返回导航',
// },
];
/**
* 租户选中状态 不显示个人中心

4
apps/web-antd/src/store/auth.ts
View File

@@ -56,9 +56,7 @@ export const useAuthStore = defineStore('auth', () => {
if (accessStore.loginExpired) {
accessStore.setLoginExpired(false);
} else {
onSuccess
? await onSuccess?.()
: await router.push('/navigation');
onSuccess ? await onSuccess?.() : await router.push('/analytics');
}
if (userInfo?.realName) {

2
apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue
View File

@@ -26,7 +26,7 @@ onMounted(() => {
{ name: '搜索引擎', value: 1048 },
{ name: '直接访问', value: 735 },
{ name: '邮件营销', value: 580 },
{ name: '联盟广告', value: 484 },
// { name: '联盟广告', value: 484 },
],
emphasis: {
label: {

16
apps/web-antd/src/views/dashboard/analytics/index.vue
View File

@@ -25,29 +25,29 @@ const overviewItems: AnalysisOverviewItem[] = [
icon: SvgCardIcon,
title: '用户量',
totalTitle: '总用户量',
totalValue: 120_000,
value: 2000,
totalValue: 78,
value: 15,
},
{
icon: SvgCakeIcon,
title: '访问量',
totalTitle: '总访问量',
totalValue: 500_000,
value: 20_000,
totalValue: 2_278,
value: 461,
},
{
icon: SvgDownloadIcon,
title: '下载量',
totalTitle: '总下载量',
totalValue: 120_000,
value: 8000,
totalValue: 17,
value: 2,
},
{
icon: SvgBellIcon,
title: '使用量',
totalTitle: '总使用量',
totalValue: 50_000,
value: 5000,
totalValue: 6_652,
value: 3_739,
},
];

2
apps/web-antd/src/views/property/resident/unit/data.ts
View File

@@ -157,7 +157,7 @@ export const modalSchema: FormSchemaGetter = () => [
},
{
label: '入驻位置',
fieldName: 'location',
fieldName: 'locations',
component: 'TreeSelect',
rules: 'selectRequired',
formItemClass: 'col-span-2'

11
apps/web-antd/src/views/property/resident/unit/unit-modal.vue
View File

@@ -64,7 +64,11 @@ const [BasicModal, modalApi] = useVbenModal({
await initLocationOptions();
if (isUpdate.value && id) {
const record = await resident_unitInfo(id);
await formApi.setValues({...record,authTime:[record.authBegDate,record.authEndDate]});
let roomIds=record.location.split(',')
await formApi.setValues({...record,
authTime:[record.authBegDate,record.authEndDate],
locations:roomIds
});
}
await markInitialized();
@@ -84,7 +88,7 @@ async function handleConfirm() {
data.authBegDate = data.authTime[0];
data.authEndDate = data.authTime[1];
data.location=data.locations.join(',')
await (isUpdate.value ? resident_unitUpdate(data) : resident_unitAdd(data));
resetInitialized();
emit('reload');
@@ -125,8 +129,9 @@ async function initLocationOptions() {
treeNodeFilterProp: 'label',
// 选中后显示在输入框的值
treeNodeLabelProp: 'fullName',
multiple:true
}),
fieldName: 'location',
fieldName: 'locations',
},
]);
}

22
apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts
View File

@@ -43,16 +43,16 @@ export const columns: VxeGridProps['columns'] = [
field: 'unitName',
minWidth:'120'
},
{
title: '预定人',
field: 'personName',
minWidth:'120'
},
{
title: '联系方式',
field: 'phone',
minWidth:'120'
},
// {
// title: '预定人',
// field: 'personName',
// minWidth:'120'
// },
// {
// title: '联系方式',
// field: 'phone',
// minWidth:'120'
// },
// {
// title: '预定时间',
// field: 'scheduledStarttime',
@@ -64,7 +64,7 @@ export const columns: VxeGridProps['columns'] = [
{
title: '预定时间',
field: 'scheduledStarttime',
minWidth: '180',
minWidth: '200',
formatter: ({ row }) => {
const start = row.scheduledStarttime;
const end = row.scheduledEndtime;

10
apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue
View File

@@ -10,8 +10,8 @@
<Select
v-model:value="formState.meetingRoomType"
class="room-select"
placeholder="请选择会议室类型"
style="width: 180px;"
placeholder="请选择类型"
style="width: 150px;"
>
<SelectOption
v-for="item in getDictOptions('meeting_room_type')"
@@ -23,14 +23,14 @@
</Select>
</a-form-item>
<a-form-item label="会议日期">
<DatePicker v-model:value="formState.appointmentTime" style="width: 180px;"/>
<DatePicker v-model:value="formState.appointmentTime" style="width: 130px;"/>
</a-form-item>
<a-form-item label="会议时段">
<TimeRangePicker style="width: 200px;" format="HH:mm"
<TimeRangePicker style="width: 190px;" format="HH:mm"
v-model:value="formState.openHours"></TimeRangePicker>
</a-form-item>
<a-form-item label="参会人数">
<InputNumber style="width: 150px;" placeholder="请输入参会人数"
<InputNumber style="width: 120px;" placeholder="请输入人数"
v-model:value="formState.personNumber"/>
</a-form-item>
<a-form-item >

2
apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
View File

@@ -42,7 +42,7 @@ export const columns: VxeGridProps['columns'] = [
field: 'meetingRoomType',
slots: {
default: ({row}) => {
return renderDict(row.meetingRoomType, 'meeting_room_type');
return row.meetingRoomType!=null?renderDict(row.meetingRoomType, 'meeting_room_type'):'';
},
},
minWidth:100,