diff --git a/src/api/device.ts b/src/api/device.ts index f2d4ccf..7590f48 100644 --- a/src/api/device.ts +++ b/src/api/device.ts @@ -1,5 +1,4 @@ import { request} from '@/utils/request' -import { update } from 'three/examples/jsm/libs/tween.module.js' export interface Device{ id:number, @@ -133,6 +132,7 @@ export interface DocumentEntity { name?:string, code?:string, fileId?:number, + type?:number } export const deviceApi = { diff --git a/src/views/biz/device/DeviceDispatchLog.vue b/src/views/biz/device/DeviceDispatchLog.vue index 7f5bafd..eee48ed 100644 --- a/src/views/biz/device/DeviceDispatchLog.vue +++ b/src/views/biz/device/DeviceDispatchLog.vue @@ -3,7 +3,7 @@ import {ArrowDown, ArrowUp, RefreshOutline, SearchOutline} from "@vicons/ionicons5"; import {NButton, NIcon, NSpace} from "naive-ui"; import {onMounted, reactive, ref} from "vue"; -import { issueRecordApi,IssueRecord } from '@/api/issuerecord.ts' +import { issueRecordApi } from '@/api/issuerecord.ts' const props = defineProps({ deviceId:Number @@ -72,7 +72,7 @@ const columns = [ { title: '下发类型', key: 'issueType', - render(row) { + render(row:any) { var opt = row.issueType if(opt == 0) return '图纸' if(opt == 1) return '文件' @@ -83,7 +83,7 @@ const columns = [ { title: '下发状态', key: 'status', - render(row) { + render(row:any) { var opt = row.status if(opt == 0) return '下发失败' if(opt == 1) return '下发成功' @@ -93,12 +93,6 @@ const columns = [ title: '下发时间', key: 'issueTime' }, - // { - // title: '下发文件', - // render(row) { - // return row. - // } - // }, { title: '备注', key: 'remark' diff --git a/src/views/biz/device/DeviceOperationLog.vue b/src/views/biz/device/DeviceOperationLog.vue index 0f05717..1420e03 100644 --- a/src/views/biz/device/DeviceOperationLog.vue +++ b/src/views/biz/device/DeviceOperationLog.vue @@ -6,7 +6,7 @@ import {onMounted, reactive, ref} from "vue"; import { deviceApi, Device} from '@/api/device.ts' import {dictDataApi} from "@/api/org.ts"; import {userApi,SysUser} from "@/api/system.ts"; -import { deviceOperationLogApi,type DeviceOperationLog } from '@/api/deviceOperationLog.ts' +import { deviceOperationLogApi } from '@/api/deviceOperationLog.ts' const pagination = reactive({ page: 1, @@ -121,7 +121,7 @@ const columns = [ { title: '数据来源', key: 'source', - render(row) { + render(row:any) { var opt = row.source if(opt == 1) return '终端' if(opt == 2) return '后台' diff --git a/src/views/biz/flowingAround/assingWork.vue b/src/views/biz/flowingAround/assingWork.vue index 4fe2e80..c958f53 100644 --- a/src/views/biz/flowingAround/assingWork.vue +++ b/src/views/biz/flowingAround/assingWork.vue @@ -17,7 +17,7 @@