diff --git a/src/views/device/manager/DeviceManagerList.vue b/src/views/device/manager/DeviceManagerList.vue index ba4bbff..5dbae64 100644 --- a/src/views/device/manager/DeviceManagerList.vue +++ b/src/views/device/manager/DeviceManagerList.vue @@ -42,6 +42,7 @@ + @@ -54,13 +55,15 @@ import {list, save} from './manager.api'; import { columns, searchFormSchema } from './manager.data'; import {useModal} from "@/components/Modal"; - import DepartPreviewModal from "./components/DepartPreviewModal.vue"; - import DeviceIntegrationModal from "./components/DeviceIntegrationModal.vue"; + import DepartPreviewModal from "./components/preview/DepartPreviewModal.vue"; + import DeviceIntegrationModal from "./components/integration/DeviceIntegrationModal.vue"; + import DeviceLogModal from "./components/log/DeviceLogModal.vue"; import { defHttp } from '/@/utils/http/axios'; const formRef = ref(); const queryParam = reactive({}); const previewDrawer = ref(); const registerDrawer = ref(); + const logDrawer = ref(); const tipVisible = ref(false); //注册model const [registerModal, {openModal}] = useModal(); @@ -175,8 +178,8 @@ * 设备日志 */ function handleDeviceLog(record: Recordable) { - registerDrawer.value.disableSubmit = true; - registerDrawer.value.edit(record); + logDrawer.value.disableSubmit = true; + logDrawer.value.edit(record); } diff --git a/src/views/device/manager/components/CameraList.vue b/src/views/device/manager/components/integration/CameraList.vue similarity index 97% rename from src/views/device/manager/components/CameraList.vue rename to src/views/device/manager/components/integration/CameraList.vue index 6737535..9857af3 100644 --- a/src/views/device/manager/components/CameraList.vue +++ b/src/views/device/manager/components/integration/CameraList.vue @@ -77,7 +77,6 @@ function handleSuccess() { * 查询 */ function searchQuery() { - console.log('searchQuery', queryParam); reload(); } @@ -117,7 +116,6 @@ function getTableAction(record) { } function init(record) { - console.log("🚀 ~ init ~ record:", record) queryParam.departId = record.id; reload(); } diff --git a/src/views/device/manager/components/DeviceIntegrationModal.vue b/src/views/device/manager/components/integration/DeviceIntegrationModal.vue similarity index 100% rename from src/views/device/manager/components/DeviceIntegrationModal.vue rename to src/views/device/manager/components/integration/DeviceIntegrationModal.vue diff --git a/src/views/device/manager/components/ElectricityList.vue b/src/views/device/manager/components/integration/ElectricityList.vue similarity index 96% rename from src/views/device/manager/components/ElectricityList.vue rename to src/views/device/manager/components/integration/ElectricityList.vue index e4ebc7d..4a4f601 100644 --- a/src/views/device/manager/components/ElectricityList.vue +++ b/src/views/device/manager/components/integration/ElectricityList.vue @@ -75,7 +75,6 @@ function handleSuccess() { * 查询 */ function searchQuery() { - console.log('searchQuery', queryParam); reload(); } @@ -98,7 +97,6 @@ function getTableAction(record) { } function init(record) { - console.log("🚀 ~ init ~ record:", record) queryParam.departId = record.id; reload(); } diff --git a/src/views/device/manager/components/HumidList.vue b/src/views/device/manager/components/integration/HumidList.vue similarity index 96% rename from src/views/device/manager/components/HumidList.vue rename to src/views/device/manager/components/integration/HumidList.vue index 00c1007..180898b 100644 --- a/src/views/device/manager/components/HumidList.vue +++ b/src/views/device/manager/components/integration/HumidList.vue @@ -75,7 +75,6 @@ function handleSuccess() { * 查询 */ function searchQuery() { - console.log('searchQuery', queryParam); reload(); } @@ -98,7 +97,6 @@ function getTableAction(record) { } function init(record) { - console.log("🚀 ~ init ~ record:", record) queryParam.departId = record.id; reload(); } diff --git a/src/views/device/manager/components/NetworkList.vue b/src/views/device/manager/components/integration/NetworkList.vue similarity index 96% rename from src/views/device/manager/components/NetworkList.vue rename to src/views/device/manager/components/integration/NetworkList.vue index 79da17f..7964720 100644 --- a/src/views/device/manager/components/NetworkList.vue +++ b/src/views/device/manager/components/integration/NetworkList.vue @@ -75,7 +75,6 @@ function handleSuccess() { * 查询 */ function searchQuery() { - console.log('searchQuery', queryParam); reload(); } @@ -98,7 +97,6 @@ function getTableAction(record) { } function init(record) { - console.log("🚀 ~ init ~ record:", record) queryParam.departId = record.id; reload(); } diff --git a/src/views/device/manager/components/WaterList.vue b/src/views/device/manager/components/integration/WaterList.vue similarity index 96% rename from src/views/device/manager/components/WaterList.vue rename to src/views/device/manager/components/integration/WaterList.vue index bb8aae5..cfe4816 100644 --- a/src/views/device/manager/components/WaterList.vue +++ b/src/views/device/manager/components/integration/WaterList.vue @@ -75,7 +75,6 @@ function handleSuccess() { * 查询 */ function searchQuery() { - console.log('searchQuery', queryParam); reload(); } @@ -98,7 +97,6 @@ function getTableAction(record) { } function init(record) { - console.log("🚀 ~ init ~ record:", record) queryParam.departId = record.id; reload(); } diff --git a/src/views/device/manager/components/integration.api.ts b/src/views/device/manager/components/integration/integration.api.ts similarity index 100% rename from src/views/device/manager/components/integration.api.ts rename to src/views/device/manager/components/integration/integration.api.ts diff --git a/src/views/device/manager/components/integration.data.ts b/src/views/device/manager/components/integration/integration.data.ts similarity index 100% rename from src/views/device/manager/components/integration.data.ts rename to src/views/device/manager/components/integration/integration.data.ts diff --git a/src/views/device/manager/components/log/DeviceLogList.vue b/src/views/device/manager/components/log/DeviceLogList.vue new file mode 100644 index 0000000..433fa82 --- /dev/null +++ b/src/views/device/manager/components/log/DeviceLogList.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/views/device/manager/components/log/DeviceLogModal.vue b/src/views/device/manager/components/log/DeviceLogModal.vue new file mode 100644 index 0000000..1097a1c --- /dev/null +++ b/src/views/device/manager/components/log/DeviceLogModal.vue @@ -0,0 +1,82 @@ + + + + + + diff --git a/src/views/device/manager/components/log/log.api.ts b/src/views/device/manager/components/log/log.api.ts new file mode 100644 index 0000000..fe11b59 --- /dev/null +++ b/src/views/device/manager/components/log/log.api.ts @@ -0,0 +1,13 @@ +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/iot/device/manager/bingLogList', +} + +/** + * 列表 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + + diff --git a/src/views/device/manager/components/log/log.data.ts b/src/views/device/manager/components/log/log.data.ts new file mode 100644 index 0000000..5ff23f9 --- /dev/null +++ b/src/views/device/manager/components/log/log.data.ts @@ -0,0 +1,72 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; + +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '区域编码', + align: "center", + dataIndex: 'nuId', + customRender:({record})=>{ + if(record.nuId==null || record.nuId==''){ + return "-"; + }else{ + return record.nuId; + } + }, + width: 100 + }, + { + title: '区域名称', + align: "center", + dataIndex: 'nuName', + customRender:({record})=>{ + if(record.nuName==null || record.nuName==''){ + return "-"; + }else{ + return record.nuName; + } + }, + }, + { + title: '设备维度', + align: "center", + dataIndex: 'dimension', + width: 100 + }, + { + title: '设备类型', + align: "center", + dataIndex: 'deviceType_dictText', + width: 100 + }, + { + title: '设备型号', + align: "center", + dataIndex: 'deviceModel', + }, + { + title: '设备标识', + align: "center", + dataIndex: 'sn', + }, + { + title: '生产厂家', + align: "center", + dataIndex: 'factory', + }, + { + title: '操作时间', + align: "center", + dataIndex: 'optDate', + width: 150 + }, + { + title: '操作类型', + align: "center", + dataIndex: 'optType', + width: 100 + }, +]; + +export const searchFormSchema: FormSchema[] = []; diff --git a/src/views/device/manager/components/AddDepartPreviewForm.vue b/src/views/device/manager/components/preview/AddDepartPreviewForm.vue similarity index 93% rename from src/views/device/manager/components/AddDepartPreviewForm.vue rename to src/views/device/manager/components/preview/AddDepartPreviewForm.vue index 0bf6c2b..b440ff9 100644 --- a/src/views/device/manager/components/AddDepartPreviewForm.vue +++ b/src/views/device/manager/components/preview/AddDepartPreviewForm.vue @@ -6,8 +6,8 @@ - {{item.deviceModel}} @@ -49,7 +49,7 @@