Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

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

@@ -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 || [],

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

@@ -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;
       }

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

@@ -25,22 +25,10 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
+    modalApi.modalLoading(true);
     const {data} = modalApi.getData() as { data:any };
     picture1.value = data.voucherUrl;
     picture2.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);
-
     modalApi.modalLoading(false);
   },
 });
@@ -56,7 +44,9 @@ async function handleConfirm() {
     modalApi.lock(false);
   }
 }
-async function handleClosed() {}
+async function handleClosed() {
+ 
+}
 </script>
 
 <template>
@@ -96,10 +86,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 {