diff --git a/src/views/biz/nuBaseInfo/QyxxList.vue b/src/views/biz/nuBaseInfo/QyxxList.vue index e6f52fd..00e36a0 100644 --- a/src/views/biz/nuBaseInfo/QyxxList.vue +++ b/src/views/biz/nuBaseInfo/QyxxList.vue @@ -107,14 +107,16 @@ + - + + @@ -126,6 +128,7 @@ import BaseWlsbListModal from './components/BaseWlsbListModal.vue' import CameraPreviewModal from '/@/views/iot/tplink/camera/components/CameraPreviewModal.vue' import IotDevicesModall from '/@/views/biz/nuBaseInfo/iotDevices/IotDevicesModal.vue' + import IotDevicesTyModall from '/@/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue' import { useUserStore } from '/@/store/modules/user'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { useMessage } from '/@/hooks/web/useMessage'; @@ -144,8 +147,8 @@ const logoUrl = 'https://www.focusnu.com/devops/resource/img/logo.png'; // 替 const { createMessage } = useMessage(); const formRef = ref(); - const previewModal = ref(); const iotDevicesModal = ref(); + const iotDevicesTyModal = ref(); const wlsbModal = ref(); const registerCkfzrModal = ref(); const registerCrkModal = ref(); @@ -194,7 +197,9 @@ function handleChangeValidateStatus(record,checked) { if (checked) { handleQiyong(record); } else { - handleTingyong(record); + iotDevicesTyModal.value.disableSubmit = false; + iotDevicesTyModal.value.init(record); + // handleTingyong(record); } } @@ -251,6 +256,7 @@ function handleChangeValidateStatus(record,checked) { * 停用 */ async function handleTingyong(record) { + console.log("🚀 ~ handleTingyong ~ record:", record) record.status = 5; await hldyQyty(record, true).then((res) => { if (res.success) { @@ -261,13 +267,6 @@ function handleChangeValidateStatus(record,checked) { reload(); }); } - /** - * 预览 - */ - function handlePreview(record: Recordable) { - previewModal.value.disableSubmit = true; - previewModal.value.edit(record); - } /** * 查询 @@ -295,7 +294,6 @@ function handleChangeValidateStatus(record,checked) { function reload() { defHttp.get({url: '/nuBaseInfo/nuBaseInfo/qyList',params:queryParam}).then(res => { - console.log("🌊 ~ reload ~ res1111111:", res) tableData.value = res.records; }); } diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts b/src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts index 7a18014..c57800e 100644 --- a/src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts +++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts @@ -41,7 +41,33 @@ export const columns: BasicColumn[] = [ dataIndex: 'deviceStatus_dictText' }, ]; - +export const columnsTy: BasicColumn[] = [ + { + title: '设备标识', + align: "center", + dataIndex: 'deviceIndex' + }, + { + title: '设备型号', + align: "center", + dataIndex: 'deviceModel' + }, + { + title: '设备维度', + align: "center", + dataIndex: 'dimension' + }, + { + title: '设备类型', + align: "center", + dataIndex: 'deviceType_dictText' + }, + { + title: '在线状态', + align: "center", + dataIndex: 'deviceStatus_dictText' + }, +]; // 高级查询数据 export const superQuerySchema = { deviceType: {title: '设备类型',order: 0,view: 'text', type: 'string',}, diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue index f7515c1..d22c35c 100644 --- a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue +++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue @@ -83,6 +83,7 @@ import CameraPreviewModal from '/@/views/iot/tplink/camera/components/CameraPrev canResize:false, useSearchForm: false, showIndexColumn: true, + immediate: false, actionColumn: { width: 120, fixed: 'right', @@ -213,6 +214,7 @@ function handlePreview(record: Recordable) { function init() { //初始化 + reload(); } defineExpose({ diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue new file mode 100644 index 0000000..dce7616 --- /dev/null +++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue @@ -0,0 +1,211 @@ + + + + + + + + + 区域编码 + + + + + + 区域名称 + + + + + + + + + + + + + + + + + + + + + + + 提示:您停用区域【{{queryParam.nuName}}】,将释放所有设备,请慎重操作! + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue new file mode 100644 index 0000000..4b83fd8 --- /dev/null +++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue @@ -0,0 +1,69 @@ + + + + + 关闭 + 停用 + + + + + + + +