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

style: 格式化代码、修改弹窗样式

Browse Source
This commit is contained in:
fyy
2025-08-28 14:29:58 +08:00
parent d2102ac20a
commit f230decc38
3 changed files with 37 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/web-antd/src/views/property/resident/carPassRecordManagement/index.vue
View File

@@ -1,8 +1,8 @@
<script setup lang="ts">
import { ref } from 'vue';
import { ref } from 'vue';
import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
import { Space } from 'ant-design-vue';
import { Space } from 'ant-design-vue';
import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table';
@@ -57,10 +57,6 @@ async function externalLoginOnLoad() {
if (!response.ok) {
throw new Error(`Request failed: ${response.status}`);
}
const result2 = await response.json();
console.log(result2);
// }
}
} catch (error) {
console.error('External login error:', error);
@@ -94,12 +90,8 @@ const gridOptions: VxeGridProps = {
proxyConfig: {
ajax: {
query: async ({ page }, formValues = {}) => {
// 修改：添加对token的使用，如果token存在则请求外部接口，否则使用原接口
console.log(1243);
sessionStorage.removeItem('token');
await externalLoginOnLoad();
console.log(23423310248);
if (token.value) {
try {
const response = await fetch(
@@ -113,17 +105,6 @@ const gridOptions: VxeGridProps = {
Accept: 'application/json, text/plain, */*',
},
body: JSON.stringify({
// pageReq: {
// pageNum: page.currentPage,
// pageSize: page.pageSize,
// },
// parkStates: parkStates.value,
// parkOrderTypes: [100, 200, 201, 300, 500],
// plNos: ['PFN000000022', 'PFN000000012', 'PFN000000025'],
// terminalSource: 50,
// orderStates: [],
// orgId: 10012,
// ...formValues,
pageReq: {
pageNum: page.currentPage,
pageSize: page.pageSize,
@@ -135,19 +116,12 @@ const gridOptions: VxeGridProps = {
orderStates: [],
parkOrderTypes: [100, 200, 201, 300, 500],
terminalSource: 50,
// plNos、carNumber、orgId、orderStates、parkOrderTypes、terminalSource为接口参数固定需求
// parkStates：10-在场、20-离场
}),
},
);
// if (!response.ok) {
// throw new Error(
// `External API request failed: ${response.status}`,
// );
// }
const result = await response.json();
console.log(result);
// 根据返回数据结构调整
return {
rows: result.data.dataList || [],

1
apps/web-antd/src/views/property/resident/carPassRecordManagement/record-detail-modal.vue
View File

@@ -76,7 +76,6 @@ const [BasicModal, modalApi] = useVbenModal({
for (const item of result.data) {
if (item.fileName.includes('进场图片')) {
data.parkInImgPath = item.filePath;
console.log('图片路径:', data.parkInImgPath);
} else {
data.parkOutImgPath = item.filePath;
}

75
apps/web-antd/src/views/property/resident/personPassRecordManagement/record-detail-modal.vue
View File

@@ -5,13 +5,9 @@ import { useVbenModal } from '@vben/common-ui';
const emit = defineEmits<{ reload: [] }>();
const picture1 = ref('')
// const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
// {
// initializedGetter: defaultFormValueGetter(formApi),
// currentGetter: defaultFormValueGetter(formApi),
// },
// );
const pictureUrl = ref('');
const monitorPictureUrl = ref('');
const voucherUrl = ref('');
const [BasicModal, modalApi] = useVbenModal({
// 在这里更改宽度
@@ -23,22 +19,11 @@ const [BasicModal, modalApi] = useVbenModal({
if (!isOpen) {
return null;
}
const {data} = modalApi.getData() as { data:any };
console.log(data)
picture1.value = data.pictureUrl;
// detail.value = await meetInfo(id);
// if (detail.value?.picture) {
// const res = await ossInfo([conferenceSettingsDetail.value?.picture]);
// if (res) {
// let imgArr = [] as string[];
// res.forEach(item => {
// imgArr.push(item.url)
// })
// conferenceSettingsDetail.value.pictureArr = imgArr;
// }
// }
modalApi.modalLoading(true);
const { data } = modalApi.getData() as { data: any };
pictureUrl.value = data.pictureUrl;
monitorPictureUrl.value = data.monitorPictureUrl;
voucherUrl.value = data.voucherUrl;
modalApi.modalLoading(false);
},
});
@@ -54,28 +39,38 @@ async function handleConfirm() {
modalApi.lock(false);
}
}
async function handleClosed() {}
async function handleClosed() {
pictureUrl.value = '';
monitorPictureUrl.value = '';
voucherUrl.value = '';
}
</script>
<template>
<BasicModal title="抓拍图片">
<div class="detail-wrapper">
<div class="detail-grid">
<div class="detail-card">
<img class="detail-thumb" :src="picture1"></img>
<div class="detail-caption">人脸凭证照片</div>
<div class="detail-grid">
<div class="detail-card">
<div class="detail-thumb">
<img v-if="voucherUrl" :src="voucherUrl" />
</div>
<div class="detail-caption">人脸凭证照片</div>
</div>
<div class="detail-card">
<div class="detail-thumb">
<img v-if="monitorPictureUrl" :src="monitorPictureUrl" />
</div>
<div class="detail-caption">监控设备抓拍</div>
</div>
<div class="detail-card">
<div class="detail-thumb">
<img v-if="pictureUrl" :src="pictureUrl" />
</div>
<div class="detail-caption">人脸门禁抓拍</div>
</div>
</div>
</div>
<div class="detail-card">
<img class="detail-thumb" :src="picture1"></img>
<div class="detail-caption">监控设备抓拍</div>
</div>
<div class="detail-card">
<img class="detail-thumb" :src="picture1"></img>
<div class="detail-caption">人脸门禁抓拍</div>
</div>
</div>
</div>
</BasicModal>
</BasicModal>
</template>
<style scoped>
@@ -93,10 +88,6 @@ async function handleClosed() {}
display: flex;
flex-direction: column;
align-items: center;
background-color: #fff;
border-radius: 8px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.08);
padding: 16px;
}
.detail-thumb {