异常管理模块物资异常和柜门异常问题修复

src/api/material/information/index.ts

@@ -90,7 +90,7 @@ export const deleteMaterials = async (ids: number) => {
 
 // 查询物资所属柜
 export const getMaterialsCabinets = async (params: MaterialsQuery) => {
-  return await request.get({ url: '/iscs/cabinet/getIsMaterialsCabinetPage', params })
+  return await request.get({ url: '/iscs/materials-cabinet/getMaterialsCabinetPage', params })
 }
 
 // 绑定物资

src/views/Exceptions/Exception/index.vue

@@ -108,8 +108,8 @@
     </el-table>
     <Pagination
       v-model:total="total"
-      v-model:page="queryParams.current"
-      v-model:limit="queryParams.size"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
   </ContentWrap>
@@ -120,6 +120,7 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as ExceptionApi from '@/api/material/exception'
 import * as CabinetApi from '@/api/material/information'
+import {returnExceptionPage} from "@/api/material/exception";
 
 defineOptions({ name: 'MaterialException' })
 
@@ -135,8 +136,8 @@ const handleTime = ref<[Date, Date] | null>(null) // 异常解除时间
 
 // 查询参数
 const queryParams = reactive({
-  current: 1,
-  size: 10,
+  pageNo: 1,
+  pageSize: 10,
   exceptionType: '0',
   loanFromId: undefined,
   materialsName: undefined,
@@ -163,8 +164,8 @@ const getList = async () => {
       queryParams.handleStartTime = dateFormatter(handleTime.value[0])
       queryParams.handleEndTime = dateFormatter(handleTime.value[1])
     }
-    const data = await ExceptionApi.listException(queryParams)
-    exceptionList.value = data.records
+    const data = await ExceptionApi.returnExceptionPage(queryParams)
+    exceptionList.value = data.list
     total.value = data.total
   } finally {
     loading.value = false
@@ -184,7 +185,7 @@ const getCabinetList = async () => {
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.current = 1
+  queryParams.pageNo = 1
   getList()
 }
 

src/views/Exceptions/doorException/index.vue

@@ -89,8 +89,8 @@
     </el-table>
     <Pagination
       v-model:total="total"
-      v-model:page="queryParams.current"
-      v-model:limit="queryParams.size"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
   </ContentWrap>
@@ -148,8 +148,8 @@ const dateShortcuts = [
 
 // 查询参数
 const queryParams = reactive({
-  current: 1,
-  size: 10,
+  pageNo: 1,
+  pageSize: 10,
   exceptionType: '1',
   loanFromId: undefined,
   status: undefined,
@@ -175,7 +175,7 @@ const getList = async () => {
       queryParams.handleEndTime = dateFormatter(handleTime.value[1])
     }
     const data = await doorExceptionApi.doorExceptionPage(queryParams)
-    exceptionList.value = data.records
+    exceptionList.value = data.list
     total.value = data.total
   } finally {
     loading.value = false
@@ -195,7 +195,7 @@ const getCabinetList = async () => {
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.current = 1
+  queryParams.pageNo = 1
   getList()
 }
 

src/views/dv/technology/technologyDetail/DeviceDetail.vue

@@ -109,7 +109,7 @@ import * as TechnologyApi from '@/api/dv/technology'
 import * as LotoApi from '@/api/dv/lotoStation'
 import { genCode } from '@/api/system/autocode/rule'
 import MapData from './MapData.vue'
-import Tinymce from '@/components/tinymce/example/Index.vue'
+import Tinymce from '@/components/TinyMCE/index.vue'
 
 defineOptions({ name: 'DeviceDetail' })