Просмотр исходного кода

feat: 文案修改门禁车辆接口修改

wyf 6 месяцев назад
Родитель
Сommit
51c06ea701

+ 3 - 3
src/api/security-confidentiality-access/index.ts

@@ -47,15 +47,15 @@ export function createAccessRecord(data: CreateAccessQuery) {
 
 export function getAccessRecordDetail(id: number) {
   return http.request<AccessDetailResponse>({
-    url: `/accessControlAbnormalRecord/exportAccessControlAbnormalRecord?recordId=${id}`,
+    url: `/accessControlAbnormalRecord/queryAccessControlAbnormalRecordById?recordId=${id}`,
     method: 'GET',
   });
 }
 
 export function updateAccessRecord(data: UpdateAccessQuery) {
   return http.request({
-    url: '/accessControlAbnormalRecord/saveAccessControlAbnormalRecord',
-    method: 'POST',
+    url: '/accessControlAbnormalRecord/updateAccessControlAbnormalRecord',
+    method: 'PUT',
     data,
   });
 }

+ 1 - 2
src/components/formItems/selectableInput/SelectableInput.vue

@@ -3,7 +3,7 @@
     <el-input
       v-model="modelValue"
       style="width: 360px"
-      :placeholder="placeholder || '请输入' + selectValue.label"
+      :placeholder="selectValue.placeholder || '请输入' + selectValue.label"
       clearable
     >
       <template #prepend>
@@ -31,7 +31,6 @@
   import { ref } from 'vue';
 
   const props = defineProps<{
-    placeholder?: string;
     options: SelectOption[]; // options.value为选择的键
   }>();
 

+ 2 - 2
src/views/security-confidentiality/access-control/components/AccessEdit.vue

@@ -26,7 +26,7 @@
   import UploadLoading from '@/components/UploadLoading.vue';
   import UploadImages from '@/views/disaster/disaster-control/src/components/UploadImages.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
-  import { createAccessRecord, getAccessRecordDetail } from '@/api/security-confidentiality-access';
+  import { updateAccessRecord, getAccessRecordDetail } from '@/api/security-confidentiality-access';
   import type { AccessDetailResponse, CreateAccessRuleForm, UpdateAccessQuery } from '../types';
   import { ACCESS_FORM_CONFIG, ACCESS_FORM_DATA, ACCESS_FORM_RULES } from '../configs/form';
   import { formatImageList, unformatImage } from '../utils';
@@ -82,7 +82,7 @@
     try {
       formLoading.value = true;
       const params = await getFormData();
-      await createAccessRecord(params);
+      await updateAccessRecord(params);
       ElMessage.success('创建成功');
       router.back();
     } catch (e) {

+ 2 - 0
src/views/security-confidentiality/access-control/constants.ts

@@ -3,11 +3,13 @@ export const ACCESS_MANAGEMENT_PERMISSION = 'security_business_module:access_man
 export const ACCESS_TABLE_SEARCH_OPTIONS: SelectOption[] = [
   {
     label: '事件',
+    placeholder: '请输入事件的具体描述',
     value: 1,
     disabled: false,
   },
   {
     label: '地点',
+    placeholder: '请输入事件发生地点',
     value: 2,
     disabled: false,
   },

+ 9 - 5
src/views/security-confidentiality/vehicle-management/VehicleManagement.vue

@@ -36,19 +36,22 @@
           @update:pageNumber="handleCurrentChange"
         >
           <template #carNum="scope">
-            <span>{{ scope.row.carNum ? scope.row.carNum : '-' }}</span>
+            <span>{{ scope.row.carNum ? scope.row.carNum : '--' }}</span>
           </template>
           <template #carOwnerName="scope">
-            <span>{{ scope.row.carOwnerName || '-' }}</span>
+            <span>{{ scope.row.carOwnerName || '--' }}</span>
           </template>
           <template #deptName="scope">
-            <span>{{ scope.row.deptName || '-' }}</span>
+            <span>{{ scope.row.deptName || '--' }}</span>
           </template>
           <template #entryLocation="scope">
-            <span>{{ scope.row.entryLocation || '-' }}</span>
+            <span>{{ scope.row.entryLocation || '--' }}</span>
           </template>
           <template #eventTime="scope">
-            <span>{{ scope.row.eventTime || '-' }}</span>
+            <span>{{ scope.row.eventTime || '--' }}</span>
+          </template>
+          <template #images="scope">
+            <ImageViewer :file-list="scope.row.images" />
           </template>
         </BasicTable>
       </div>
@@ -61,6 +64,7 @@
   import useTableConfig from '@/hooks/useTableConfigHook';
   import ActionButton from '@/components/ActionButton.vue';
   import SelectableInput from '@/components/formItems/selectableInput/SelectableInput.vue';
+  import ImageViewer from '@/views/traffic/violation/act/components/ImageViewer.vue';
   import { downloadFile } from '@/views/disaster/utils';
   import dayjs from 'dayjs';
   import { ElMessage } from 'element-plus';

+ 1 - 0
types/global.d.ts

@@ -80,6 +80,7 @@ declare global {
   declare interface SelectOption {
     value: string | number | boolean | object;
     label: string | number;
+    placeholder?: string;
     disabled: boolean;
   }
 

+ 1 - 1
utils/devProxy/staff/proxy.ts

@@ -5,7 +5,7 @@ import path from 'path';
 const proxyStaff: PROXY_TYPE = {
   serverHost: 'http://192.168.13.68:8802/',
   // serverHost: 'http://192.168.22.121:8802/',
-  // serverHost: 'http://192.168.22.146:8802/',
+  // serverHost: 'http://192.168.21.223:8802/',
   loginHost: 'http://192.168.13.68:7200/login/#/',
   fileUploadHost: 'http://192.168.13.102:9000/',
   violation_src: 'http://192.168.13.102:62/violation_src',