Browse Source

2025/6/19 14:25提交锁柜 锁仓 硬件 硬件类型等接口调整

pm 4 tháng trước cách đây
mục cha
commit
5d430d4732

+ 6 - 6
src/api/hw/hardware/information/index.ts

@@ -34,7 +34,7 @@ export interface PageParam {
 
 // 查询硬件-列表
 export const listHardware = async (params: PageParam) => {
-  return await request.get({ url: '/iscs/hardware/getIsHardwarePage', params })
+  return await request.get({ url: '/iscs/hardware/getHardwarePage', params })
 }
 
 // 获取所有车间
@@ -45,25 +45,25 @@ export const listAllWorkshop = async () => {
 // 获取硬件详细信息
 export const getHardwareInfo = async (id: number) => {
   return await request.get<HardwareVO>({
-    url: '/iscs/hardware/selectIsHardwareById',
+    url: '/iscs/hardware/selectHardwareById',
     params: { id }
   })
 }
 
 // 新增硬件信息
 export const addHardware = async (data: HardwareVO) => {
-  return await request.post({ url: '/iscs/hardware/insertIsHardware', data })
+  return await request.post({ url: '/iscs/hardware/insertHardware', data })
 }
 
 // 修改硬件
 export const updateHardware = async (data: HardwareVO) => {
-  return await request.post({ url: '/iscs/hardware/updateIsHardware', data })
+  return await request.put({ url: '/iscs/hardware/updateHardware', data })
 }
 
 // 删除硬件
 export const delHardware = async (id: number) => {
-  return await request.post({
-    url: '/iscs/hardware/deleteIsHardwareByIds',
+  return await request.delete({
+    url: '/iscs/hardware/deleteHardwareList',
     params: { ids: id }
   })
 }

+ 10 - 10
src/api/hw/hardware/keys/index.ts

@@ -22,31 +22,31 @@ export interface PageParam {
 
 // 查询钥匙-列表
 export const listKeyAPI = async (params: PageParam) => {
-  return await request.get({ url: '/iscs/key/getIsKeyPage', params })
+  return await request.get({ url: '/iscs/key/getKeyPage', params })
 }
 
 // 获取钥匙详细信息
-export const getKeyInfoAPI = async (keyId: number) => {
+export const getKeyInfoAPI = async (id: number) => {
   return await request.get({
-    url: '/iscs/key/selectIsKeyById',
-    params: { keyId }
+    url: '/iscs/key/selectKeyById',
+    params: { id }
   })
 }
 
 // 新增钥匙
 export const addKeyAPI = async (data: KeyVO) => {
-  return await request.post({ url: '/iscs/key/insertIsKey', data })
+  return await request.post({ url: '/iscs/key/insertKey', data })
 }
 
 // 修改钥匙
 export const updateKeyAPI = async (data: KeyVO) => {
-  return await request.post({ url: '/iscs/key/updateIsKey', data })
+  return await request.put({ url: '/iscs/key/updateKey', data })
 }
 
 // 删除钥匙
-export const delKeyAPI = async (keyId: number) => {
-  return await request.post({
-    url: '/iscs/key/deleteIsKeyByKeyIds',
-    params: { keyIds: keyId }
+export const delKeyAPI = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/key/deleteKeyList',
+    params: { ids: ids }
   })
 }

+ 10 - 10
src/api/hw/hardware/lockCabinet/index.ts

@@ -22,31 +22,31 @@ export interface PageParam {
 
 // 查询锁控机柜-列表
 export const getIsLockCabinetPage = async (params: PageParam) => {
-  return await request.get({ url: '/iscs/cabinet/getIsLockCabinetPage', params })
+  return await request.get({ url: '/iscs/lock-cabinet/getLockCabinetPage', params })
 }
 
 // 获取锁控机柜详细信息
-export const selectIsLockCabinetById = async (cabinetId: number) => {
+export const selectIsLockCabinetById = async (id: number) => {
   return await request.get({
-    url: '/iscs/cabinet/selectIsLockCabinetById',
-    params: { cabinetId }
+    url: '/iscs/lock-cabinet/selectLockCabinetById',
+    params: { id }
   })
 }
 
 // 新增锁控机柜
 export const insertIsLockCabinet = async (data: LockCabinetVO) => {
-  return await request.post({ url: '/iscs/cabinet/insertIsLockCabinet', data })
+  return await request.post({ url: '/iscs/lock-cabinet/insertLockCabinet', data })
 }
 
 // 修改锁控机柜信息
 export const updateIsLockCabinet = async (data: LockCabinetVO) => {
-  return await request.post({ url: '/iscs/cabinet/updateIsLockCabinet', data })
+  return await request.put({ url: '/iscs/lock-cabinet/updateLockCabinet', data })
 }
 
 // 删除锁控机柜信息
-export const deleteIsLockCabinetByCabinetIds = async (cabinetId: number) => {
-  return await request.post({
-    url: '/iscs/cabinet/deleteIsLockCabinetByCabinetIds',
-    params: { cabinetIds: cabinetId }
+export const deleteIsLockCabinetByCabinetIds = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/lock-cabinet/deleteLockCabinetList',
+    params: { ids: ids }
   })
 }

+ 10 - 10
src/api/hw/hardware/lockCabinet/slots.ts

@@ -24,31 +24,31 @@ export interface PageParam {
 
 // 查询锁控机柜-仓位-列表
 export const getIsLockCabinetSlotsPage = async (params: PageParam) => {
-  return await request.get({ url: '/iscs/slots/getIsLockCabinetSlotsPage', params })
+  return await request.get({ url: '/iscs/lock-cabinet-slots/getLockCabinetSlotsPage', params })
 }
 
 // 获取锁控机柜-仓位详细信息
-export const selectIsLockCabinetSlotsById = async (slotId: number) => {
+export const selectIsLockCabinetSlotsById = async (id: number) => {
   return await request.get({
-    url: '/iscs/slots/selectIsLockCabinetSlotsById',
-    params: { slotId }
+    url: '/iscs/lock-cabinet-slots/selectLockCabinetSlotsById',
+    params: { id }
   })
 }
 
 // 新增锁控机柜-仓位
 export const insertIsLockCabinetSlots = async (data: LockCabinetSlotVO) => {
-  return await request.post({ url: '/iscs/slots/insertIsLockCabinetSlots', data })
+  return await request.post({ url: '/iscs/lock-cabinet-slots/insertLockCabinetSlots', data })
 }
 
 // 修改锁控机柜-仓位信息
 export const updateIsLockCabinetSlots = async (data: LockCabinetSlotVO) => {
-  return await request.post({ url: '/iscs/slots/updateIsLockCabinetSlots', data })
+  return await request.put({ url: '/iscs/lock-cabinet-slots/updateLockCabinetSlots', data })
 }
 
 // 删除锁控机柜-仓位信息
-export const deleteIsLockCabinetSlotsBySlotIds = async (slotId: number) => {
-  return await request.post({
-    url: '/iscs/slots/deleteIsLockCabinetSlotsBySlotIds',
-    params: { slotIds: slotId }
+export const deleteIsLockCabinetSlotsBySlotIds = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/lock-cabinet-slots/deleteLockCabinetSlotsList',
+    params: { ids: ids }
   })
 }

+ 10 - 10
src/api/hw/hardware/padLock/index.ts

@@ -22,31 +22,31 @@ export interface PageParam {
 
 // 查询挂锁-列表
 export const listPadLockAPI = async (params: PageParam) => {
-  return await request.get({ url: '/iscs/lock/getIsLockPage', params })
+  return await request.get({ url: '/iscs/lock/getLockPage', params })
 }
 
 // 获取挂锁详细信息
-export const getPadLockInfoAPI = async (lockId: number) => {
+export const getPadLockInfoAPI = async (id: number) => {
   return await request.get({
-    url: '/iscs/lock/selectIsLockById',
-    params: { lockId }
+    url: '/iscs/lock/selectLockById',
+    params: { id }
   })
 }
 
 // 新增挂锁
 export const addPadLockAPI = async (data: PadLockVO) => {
-  return await request.post({ url: '/iscs/lock/insertIsLock', data })
+  return await request.post({ url: '/iscs/lock/insertLock', data })
 }
 
 // 修改挂锁信息
 export const updatePadLockAPI = async (data: PadLockVO) => {
-  return await request.post({ url: '/iscs/lock/updateIsLock', data })
+  return await request.put({ url: '/iscs/lock/updateLock', data })
 }
 
 // 删除挂锁信息
-export const delPadLockAPI = async (lockId: number) => {
-  return await request.post({
-    url: '/iscs/lock/deleteIsLockByLockIds',
-    params: { lockIds: lockId }
+export const delPadLockAPI = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/lock/deleteLockList',
+    params: { ids: ids }
   })
 }

+ 9 - 9
src/api/hw/hardware/rfid/index.ts

@@ -22,31 +22,31 @@ export interface PageParam {
 
 // 查询锁控机柜-列表
 export const getIsRfidTokenPage = async (params: PageParam) => {
-  return await request.get({ url: '/iscs/token/getIsRfidTokenPage', params })
+  return await request.get({ url: '/iscs/rfid-token/getRfidTokenPage', params })
 }
 
 // 获取锁控机柜详细信息
-export const selectIsRfidTokenById = async (rfidId: number) => {
+export const selectIsRfidTokenById = async (id: number) => {
   return await request.get({
-    url: '/iscs/token/selectIsRfidTokenById',
-    params: { rfidId }
+    url: '/iscs/rfid-token/selectRfidTokenById',
+    params: { id }
   })
 }
 
 // 新增锁控机柜
 export const insertIsRfidToken = async (data: RfidTokenVO) => {
-  return await request.post({ url: '/iscs/token/insertIsRfidToken', data })
+  return await request.post({ url: '/iscs/rfid-token/insertRfidToken', data })
 }
 
 // 修改锁控机柜信息
 export const updateIsRfidToken = async (data: RfidTokenVO) => {
-  return await request.post({ url: '/iscs/token/updateIsRfidToken', data })
+  return await request.put({ url: '/iscs/rfid-token/updateRfidToken', data })
 }
 
 // 删除锁控机柜信息
-export const deleteIsRfidTokenByRfidIds = async (rfidId: number) => {
+export const deleteIsRfidTokenByRfidIds = async (ids: number) => {
   return await request.post({
-    url: '/iscs/token/deleteIsRfidTokenByRfidIds',
-    params: { rfidIds: rfidId }
+    url: '/iscs/rfid-token/deleteRfidTokenList',
+    params: { ids: ids }
   })
 }

+ 1 - 1
src/api/hw/type/hardwaretype/index.ts

@@ -44,7 +44,7 @@ export const updateHardwareType = async (data: HardwareTypeVO) => {
 
 // 删除硬件类型
 export const delHardwareType = async (id: number) => {
-  return await request.post({
+  return await request.delete({
     url: '/iscs/hardware-type/deleteHardwareTypeList',
     params: { ids: id }
   })

+ 1 - 1
src/api/hw/type/locksettype/index.ts

@@ -47,7 +47,7 @@ export const updateLocksetType = async (data: LockTypeVO) => {
 
 // 删除锁具机构信息
 export const delLocksetType = async (ids: number) => {
-  return await request.post({
+  return await request.delete({
     url: '/iscs/lockset-type/deleteLocksetTypeList',
     params: { ids: ids }
   })

+ 10 - 10
src/api/hw/type/padLockType/index.ts

@@ -24,31 +24,31 @@ export interface PageParam {
 
 // 查询挂锁类型-列表
 export const listpadLockTypeApi = async (params: PageParam) => {
-  return await request.get({ url: '/iscs/lockType/getIsLockTypePage', params })
+  return await request.get({ url: '/iscs/lock-type/getLockTypePage', params })
 }
 
 // 获取挂锁类型详细信息
-export const getpadLockTypeInfoAPI = async (lockTypeId: number) => {
+export const getpadLockTypeInfoAPI = async (id: number) => {
   return await request.get({
-    url: '/iscs/lockType/selectIsLockTypeById',
-    params: { lockTypeId }
+    url: '/iscs/lock-type/selectLockTypeById',
+    params: { id }
   })
 }
 
 // 新增挂锁类型
 export const addpadLockTypeApi = async (data: PadLockTypeVO) => {
-  return await request.post({ url: '/iscs/lockType/insertIsLockType', data })
+  return await request.post({ url: '/iscs/lock-type/insertLockType', data })
 }
 
 // 修改挂锁类型信息
 export const updatepadLockTypeApi = async (data: PadLockTypeVO) => {
-  return await request.post({ url: '/iscs/lockType/updateIsLockType', data })
+  return await request.put({ url: '/iscs/lock-type/updateLockType', data })
 }
 
 // 删除挂锁类型信息
-export const delpadLockTypeApi = async (lockTypeId: number) => {
-  return await request.post({
-    url: '/iscs/lockType/deleteIsLockTypeByLockTypeIds',
-    params: { lockTypeIds: lockTypeId }
+export const delpadLockTypeApi = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/lock-type/deleteLockTypeList',
+    params: { ids: ids }
   })
 }

+ 1 - 11
src/views/Basicdata/mapconfig/MapConfigForm.vue

@@ -13,10 +13,8 @@
       <el-form-item label="地图图片" prop="imageUrl">
         <UploadImg
           :limit="1"
-          :value="formData.imageUrl"
+          v-model="formData.imageUrl"
           :fileSize="5"
-          @onUploaded="handleImgUploaded"
-          @onRemoved="handleImgRemoved"
         />
       </el-form-item>
       <el-form-item label="图片宽度" prop="width">
@@ -126,13 +124,5 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
-/** 处理图片上传 */
-const handleImgUploaded = (imgUrl: any[]) => {
-  formData.value.imageUrl = imgUrl[0].url
-}
 
-/** 处理图片移除 */
-const handleImgRemoved = () => {
-  formData.value.imageUrl = ''
-}
 </script>

+ 2 - 3
src/views/Basicdata/mapconfig/index.vue

@@ -113,8 +113,7 @@
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import * as MapConfigApi from '@/api/basic/mapconfig'
-import {deleteIsMapByIds, getIsMapPage} from "@/api/basic/mapconfig";
-
+import MapConfigForm from './MapConfigForm.vue'
 
 
 defineOptions({ name: 'SystemMap' })
@@ -161,7 +160,7 @@ const resetQuery = () => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+  formRef.value?.open(type, id)
 }
 
 /** 删除按钮操作 */