硬件和锁柜部分内容测试

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

@@ -46,7 +46,7 @@ export const updateIsLockCabinet = async (data: LockCabinetVO) => {
 // 删除锁控机柜信息
 export const deleteIsLockCabinetByCabinetIds = async (ids: number) => {
   return await request.delete({
-    url: '/iscs/lock-cabinet/deleteLockCabinetList',
-    params: { ids: ids }
+    url: '/iscs/lock-cabinet/deleteLockCabinetList?ids='+ids,
+
   })
 }

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

@@ -45,8 +45,8 @@ export const updateIsRfidToken = async (data: RfidTokenVO) => {
 
 // 删除锁控机柜信息
 export const deleteIsRfidTokenByRfidIds = async (ids: number) => {
-  return await request.post({
-    url: '/iscs/rfid-token/deleteRfidTokenList',
-    params: { ids: ids }
+  return await request.delete({
+    url: '/iscs/rfid-token/deleteRfidTokenList?ids='+ids,
+
   })
 }

src/views/hw/lockCabinet/LockCabinetForm.vue

@@ -40,7 +40,7 @@
         <el-tree-select
           v-model="formData.workstationId"
           :data="workstationOptions"
-          :props="{ label: 'workstationName', value: 'workstationId', children: 'children' }"
+          :props="{ label: 'workstationName', value: 'id', children: 'children' }"
           placeholder="请选择岗位"
           class="!w-240px"
         />
@@ -126,7 +126,7 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { handleTree } from '@/utils/tree'
 import * as LockCabinetApi from '@/api/hw/hardware/lockCabinet/index'
 import * as HardwareApi from '@/api/hw/hardware/information/index'
-// import * as MarsDeptApi from '@/api/system/marsdept'
+import * as MarsDeptApi from '@/api/system/marsdept/index'
 // import * as AutocodeApi from '@/api/system/autocode/rule'
 
 defineOptions({ name: 'LockCabinetForm' })
@@ -244,7 +244,8 @@ const handleSelectHardware = (value: string) => {
 const getHardwareList = async () => {
   const data = { pageNo: 1, pageSize: -1 }
   const response = await HardwareApi.listHardware(data)
-  hardwareOptions.value = response.records.map(item => ({
+  console.log(response,'aa')
+  hardwareOptions.value = response.list.map(item => ({
     value: item.id,
     label: item.hardwareName
   }))
@@ -254,7 +255,7 @@ const getHardwareList = async () => {
 const getWorkstationList = async () => {
   const data = { pageNo: 1, pageSize: -1 }
   const response = await MarsDeptApi.listMarsDept(data)
-  workstationOptions.value = handleTree(response.records, 'workstationId', 'parentId')
+  workstationOptions.value = handleTree(response.list, 'id', 'parentId')
 }
 
 /** 初始化 **/

src/views/hw/lockCabinet/index.vue

@@ -25,7 +25,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.IS_ONLINE_STATUS)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.ISONLINE_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -40,7 +40,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.CABINET_STATUS)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.CABINET_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -122,7 +122,7 @@
       </el-table-column>
       <el-table-column label="是否在线" prop="isOnline">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.IS_ONLINE_STATUS" :value="scope.row.isOnline" />
+          <dict-tag :type="DICT_TYPE.ISONLINE_STATUS" :value="scope.row.isOnline" />
         </template>
       </el-table-column>
       <el-table-column label="状态" prop="status">
@@ -151,7 +151,7 @@
           <el-button
             link
             type="primary"
-            @click="openForm('update', scope.row.cabinetId)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:hw:work:update']"
           >
             编辑
@@ -159,7 +159,7 @@
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.cabinetId)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:hw:work:delete']"
           >
             删除
@@ -181,7 +181,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 LockCabinetApi from '@/api/hw/hardware/lockCabinet/index'
 import LockCabinetForm from './LockCabinetForm.vue'
@@ -234,7 +234,7 @@ const resetQuery = () => {
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: any[]) => {
-  selectedIds.value = selection.map(item => item.cabinetId)
+  selectedIds.value = selection.map(item => item.id)
 }
 
 /** 添加/修改操作 */

src/views/hw/rfid/RfidForm.vue

@@ -43,7 +43,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.RFID_TOKEN_TYPE)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.RFID_TOKEN_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -53,7 +53,7 @@
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.RFID_TOKEN_STATUS)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.RFID_TOKEN_STATUS)"
             :key="dict.value"
             :label="dict.value"
           >
@@ -78,7 +78,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 RfidApi from '@/api/hw/hardware/rfid/index'
 // import * as AutocodeApi from '@/api/system/autocode/rule'
 

src/views/hw/rfid/index.vue

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