挂锁和钥匙信息接口对接完成

src/api/hw/hardware/keys/index.ts

@@ -46,7 +46,6 @@ export const updateKeyAPI = async (data: KeyVO) => {
 // 删除钥匙
 export const delKeyAPI = async (ids: number) => {
   return await request.delete({
-    url: '/iscs/key/deleteKeyList',
-    params: { ids: ids }
+    url: '/iscs/key/deleteKeyList?ids='+ids,
   })
 }

src/api/hw/hardware/padLock/index.ts

@@ -46,7 +46,7 @@ export const updatePadLockAPI = async (data: PadLockVO) => {
 // 删除挂锁信息
 export const delPadLockAPI = async (ids: number) => {
   return await request.delete({
-    url: '/iscs/lock/deleteLockList',
-    params: { ids: ids }
+    url: '/iscs/lock/deleteLockList?ids='+ids,
+
   })
 }

src/views/hw/hardware/keys/KeyForm.vue

@@ -76,7 +76,7 @@
       <el-form-item label="状态" prop="exStatus">
         <el-radio-group v-model="formData.exStatus">
           <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.KEY_STATUS)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.KEY_STATUS)"
             :key="dict.value"
             :label="dict.value"
           >
@@ -101,7 +101,7 @@
 
 <script lang="ts" setup>
 import { ref, reactive } from 'vue'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as KeyApi from '@/api/hw/hardware/keys/index'
 import * as HardwareApi from '@/api/hw/hardware/information/index'
 // import * as AutocodeApi from '@/api/system/autocode/rule'
@@ -213,7 +213,7 @@ const resetForm = () => {
 const getHardwareList = async () => {
   const data = { pageNo: 1, pageSize: -1 }
   const response = await HardwareApi.listHardware(data)
-  hardwareOptions.value = response.records.map(item => ({
+  hardwareOptions.value = response.list.map(item => ({
     value: item.id,
     label: item.hardwareName
   }))

src/views/hw/hardware/keys/index.vue

@@ -85,7 +85,7 @@
           <el-button
             link
             type="primary"
-            @click="openForm('update', scope.row.keyId)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:hw:key:update']"
           >
             编辑
@@ -93,7 +93,7 @@
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.keyId)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:hw:key:delete']"
           >
             删除
@@ -146,7 +146,7 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await KeyApi.listKeyAPI(queryParams)
-    list.value = data.records
+    list.value = data.list
     total.value = data.total
   } finally {
     loading.value = false
@@ -167,7 +167,7 @@ const resetQuery = () => {
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: any[]) => {
-  selectedIds.value = selection.map(item => item.keyId)
+  selectedIds.value = selection.map(item => item.id)
 }
 
 /** 添加/修改操作 */

src/views/hw/hardware/padLocks/PadLockForm.vue

@@ -26,7 +26,7 @@
         <el-tree-select
           v-model="formData.lockTypeId"
           :data="lockTypeOptions"
-          :props="{ label: 'lockTypeName', value: 'lockTypeId', children: 'children' }"
+          :props="{ label: 'lockTypeName', value: 'id', children: 'children' }"
           placeholder="请选择挂锁类型"
           class="!w-240px"
         />
@@ -216,7 +216,8 @@ const resetForm = () => {
 const getHardwareList = async () => {
   const data = { pageNo: 1, pageSize: -1 }
   const response = await HardwareApi.listHardware(data)
-  hardwareOptions.value = response.records.map(item => ({
+  console.log(response,'yinglia')
+  hardwareOptions.value = response.list.map(item => ({
     value: item.id,
     label: item.hardwareName
   }))
@@ -226,7 +227,7 @@ const getHardwareList = async () => {
 const getLockTypeList = async () => {
   const data = { pageNo: 1, pageSize: -1 }
   const response = await PadLockTypeApi.listpadLockTypeApi(data)
-  lockTypeOptions.value = handleTree(response.records, 'lockTypeId', 'parentTypeId', 'children')
+  lockTypeOptions.value = handleTree(response.list, 'id', 'parentTypeId', )
 }
 
 /** 初始化 **/

src/views/hw/hardware/padLocks/index.vue

@@ -15,6 +15,7 @@
 <!--          clearable-->
 <!--          @keyup.enter="handleQuery"-->
 <!--          class="!w-240px"-->
+<!--          class="!w-240px"-->
 <!--        />-->
 <!--      </el-form-item>-->
       <el-form-item label="挂锁名称" prop="lockName">
@@ -85,7 +86,7 @@
           <el-button
             link
             type="primary"
-            @click="openForm('update', scope.row.lockId)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:hw:plk:update']"
           >
             编辑
@@ -93,7 +94,7 @@
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.lockId)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:hw:plk:delete']"
           >
             删除
@@ -115,7 +116,7 @@
 </template>
 
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as PadLockApi from '@/api/hw/hardware/padLock/index'
 import PadLockForm from './PadLockForm.vue'
@@ -147,7 +148,7 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await PadLockApi.listPadLockAPI(queryParams)
-    list.value = data.records
+    list.value = data.list
     total.value = data.total
   } finally {
     loading.value = false
@@ -168,7 +169,7 @@ const resetQuery = () => {
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: any[]) => {
-  selectedIds.value = selection.map(item => item.lockId)
+  selectedIds.value = selection.map(item => item.id)
 }
 
 /** 添加/修改操作 */