diff --git a/.vscode/settings.json b/.vscode/settings.json index 2d61fd8..aa408f0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,5 +6,8 @@ "i18n-ally.localesPaths": ["src/lang"], // 防止找到不路径 "i18n-ally.keystyle": "flat", "i18n-ally.sourceLanguage": "en-US", // 源文件 - "i18n-ally.displayLanguage": "zh-CN" // 显示文件 + "i18n-ally.displayLanguage": "zh-CN", + "[javascript]": { + "editor.defaultFormatter": "vscode.typescript-language-features" + } // 显示文件 } diff --git a/src/main.js b/src/main.js index 3c32218..2aa7083 100644 --- a/src/main.js +++ b/src/main.js @@ -127,3 +127,6 @@ Element.Table.props.border = { //设置点击所有弹窗的遮罩不会关闭弹窗 Element.Dialog.props.closeOnClickModal.default = false; + + + diff --git a/src/views/iot/device/.vue b/src/views/iot/device/.vue new file mode 100644 index 0000000..1bb8fc9 --- /dev/null +++ b/src/views/iot/device/.vue @@ -0,0 +1,1119 @@ + + + + + diff --git a/src/views/iot/device/device-edit.vue b/src/views/iot/device/device-edit.vue index 9a203a0..5a0ba72 100644 --- a/src/views/iot/device/device-edit.vue +++ b/src/views/iot/device/device-edit.vue @@ -69,7 +69,7 @@ + }} @@ -187,6 +187,8 @@ ref="gatewayRunningStatus" :device="form" @statusEvent="getDeviceStatusData($event)" /> + @@ -405,7 +407,7 @@
{{ $t('device.device-edit.148398-59') - }} + }} {{ $t('device.device-edit.148398-57') }}
@@ -450,6 +452,7 @@ import { clientOut } from '@/api/iot/netty'; import defaultSettings from '@/settings'; import gatewayRunningStatus from './gatewayrunning-status.vue'; import relay from './relay.vue' +import gatewaypre from './gatewaypre.vue' export default { name: 'DeviceEdit', dicts: ['iot_device_status', 'iot_location_way'], @@ -482,7 +485,8 @@ export default { deviceModbusTask, deviceInlineVideo, gatewayRunningStatus, - relay + relay, + gatewaypre }, watch: { activeName(val) { diff --git a/src/views/iot/device/gatewaypre.vue b/src/views/iot/device/gatewaypre.vue new file mode 100644 index 0000000..a8e8d83 --- /dev/null +++ b/src/views/iot/device/gatewaypre.vue @@ -0,0 +1,516 @@ + + + + + \ No newline at end of file diff --git a/src/views/iot/device/gatewayrunning-status.vue b/src/views/iot/device/gatewayrunning-status.vue index 28be35b..33577ae 100644 --- a/src/views/iot/device/gatewayrunning-status.vue +++ b/src/views/iot/device/gatewayrunning-status.vue @@ -21,10 +21,13 @@ {{ $t('device.running-status.866086-44') - }} + }} {{ $t('device.running-status.866086-44') - }} + }} + {{ + $t('device.running-status.866086-44') + }} @@ -428,17 +431,17 @@ - - - - - - - @@ -484,17 +487,17 @@ $t('device.running-status.866086-12') }} {{ firmware.firmwareName - }} + }} {{ firmware.productName - }} + }} Version {{ firmware.version - }} + }} {{ getDownloadUrl(firmware.filePath) }} {{ firmware.remark - }} + }}
{ + this.waitForIframeLoad(); + }); // 添加消息监听器 window.addEventListener('message', (event) => { // 确保消息来源是可信的 - if (event.origin === 'http://localhost:81') { - console.log('收到来自子页面的消息:', event.data); - // 找到 id 为 distribute 的模型 - const distributeModel = this.deviceInfo.thingsModels.find(model => model.id === 'distribute'); - if (distributeModel) { - // 更新模型的 shadow 值，直接使用内部数据 - distributeModel.shadow = event.data.data; - // 调用 mqttPublish 下发数据 - this.mqttPublish(this.deviceInfo, distributeModel); - } + + // 找到 id 为 distribute 的模型 + const distributeModel = this.deviceInfo.thingsModels.find(model => model.id === 'distribute'); + if (distributeModel) { + // 更新模型的 shadow 值，直接使用内部数据 + distributeModel.shadow = JSON.stringify(event.data.data); + console.log('收到来自子页面的消息:', JSON.stringify(event.data.data)); + + // 调用 mqttPublish 下发数据 + this.mqttPublish(this.deviceInfo, distributeModel); } + }); }, methods: { + // 新增方法：等待iframe加载完成 + waitForIframeLoad() { + const maxAttempts = 5; // 最大尝试次数 + let attempts = 0; + + const checkInterval = setInterval(() => { + const iframe = this.$refs.childFrame; + + // 1. 检查iframe是否存在且已加载 + if (iframe && iframe.contentWindow) { + // 2. 可选：检查子页面是否已准备好接收消息（需要子页面配合） + // iframe.contentWindow.postMessage({ type: 'ping' }, '*'); + + clearInterval(checkInterval); + this.sendProductParamOnce(); + return; + } + + // 3. 超过最大尝试次数则停止 + if (++attempts >= maxAttempts) { + clearInterval(checkInterval); + console.warn('Iframe not ready after multiple attempts'); + return; + } + }, 500); // 每500ms检查一次 + }, + // 发送productpram数据（保持不变） + sendProductParamOnce() { + const iframe = this.$refs.childFrame; + if (!iframe || !iframe.contentWindow) { + console.error('Iframe not ready'); + return; + } + + const productParamModel = this.deviceInfo.thingsModels.find(model => model.id === 'productpram'); + if (!productParamModel) { + console.warn('productpram model not found'); + return; + } + + let paramData = productParamModel.shadow; + if (typeof paramData === 'string' && paramData.startsWith('JSON=')) { + paramData = paramData.substring(5); + } + const paramDataString = typeof paramData === 'string' ? paramData : JSON.stringify(paramData); + + iframe.contentWindow.postMessage( + paramDataString, + 'https://iot-xcwl.cn/h5/gateway/index.html#/' + ); + console.log('Initial productpram data sent:', paramDataString); + }, //监听设备状态（设备联动） handleDeviceChange(device) { @@ -841,6 +900,7 @@ export default { isShadow: device.status != 3, type: model.type, }; + // console.log('下发指令:', JSON.stringify(data)); //设备在线状态判断 if (this.device.status !== 3 && this.device.isShadow !== 1) { if (this.device.status === 1) { @@ -1111,22 +1171,27 @@ export default { option && this.monitorChart[i].chart.setOption(option); } }, - // 向iframe发送数据的方法 - sendDataToIframe() { - const iframe = this.$refs.childFrame; - // console.log("thingsmodel",JSON.stringify(this.deviceInfo.thingsModels)); - if (iframe && iframe.contentWindow) { - // 找到 id 为 upload 的模型 - const uploadModel = this.deviceInfo.thingsModels.find(model => model.id === 'upload'); - const dataToSend = uploadModel ? { value: uploadModel.shadow } : null; - - // 打印要发送的数据（方便调试） - console.log('Sending data to iframe:', JSON.stringify(dataToSend)); - - // 发送数据到 iframe - iframe.contentWindow.postMessage(dataToSend, 'http://localhost:81/#/'); + // 保留原有方法（但不再用于productpram） + sendDataToIframe() { + const iframe = this.$refs.childFrame; + if (iframe && iframe.contentWindow) { + // 这里只处理upload数据（如果需要） + const uploadModel = this.deviceInfo.thingsModels.find(model => model.id === 'upload'); + if (uploadModel) { + let shadowData = uploadModel.shadow; + if (typeof shadowData === 'string' && shadowData.startsWith('JSON=')) { + shadowData = shadowData.substring(5); + } + const uploadDataString = typeof shadowData === 'string' ? shadowData : JSON.stringify(shadowData); + + iframe.contentWindow.postMessage( + uploadDataString, + 'https://iot-xcwl.cn/h5/gateway/index.html#/' + ); + console.log('Sent upload data:', uploadDataString); } - }, + } + } }, };