diff --git a/.env.development b/.env.development index 07fc129..ff83b16 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 芯程物联网系统 +VUE_APP_TITLE = 信安智能 # 开发环境配置 ENV = 'development' diff --git a/.env.production b/.env.production index 2e84109..286f7ca 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 芯程物联云系统 +VUE_APP_TITLE = 信安智能 # 生产环境配置 ENV = 'production' diff --git a/.env.staging b/.env.staging index dd9f082..fad5015 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 芯程物联 +VUE_APP_TITLE = 信安智能 NODE_ENV = production diff --git a/dist.zip b/dist.zip index aa08c45..00b1811 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index 0f73a11..bd0853b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fastbee", "version": "2.5.2", - "description": "芯程物联", + "description": "信安智能", "author": "kerwincui", "license": "AGPL3.0", "scripts": { diff --git a/src/assets/traffic/上箭头.png b/src/assets/traffic/上箭头.png new file mode 100644 index 0000000..8b6a9f8 Binary files /dev/null and b/src/assets/traffic/上箭头.png differ diff --git a/src/assets/traffic/两侧道路变窄.png b/src/assets/traffic/两侧道路变窄.png new file mode 100644 index 0000000..e7cc7de Binary files /dev/null and b/src/assets/traffic/两侧道路变窄.png differ diff --git a/src/assets/traffic/停车.png b/src/assets/traffic/停车.png new file mode 100644 index 0000000..d99c781 Binary files /dev/null and b/src/assets/traffic/停车.png differ diff --git a/src/assets/traffic/减速慢行.png b/src/assets/traffic/减速慢行.png new file mode 100644 index 0000000..97cbbdd Binary files /dev/null and b/src/assets/traffic/减速慢行.png differ diff --git a/src/assets/traffic/减速让行.png b/src/assets/traffic/减速让行.png new file mode 100644 index 0000000..c5fb661 Binary files /dev/null and b/src/assets/traffic/减速让行.png differ diff --git a/src/assets/traffic/前方事故.png b/src/assets/traffic/前方事故.png new file mode 100644 index 0000000..0888517 Binary files /dev/null and b/src/assets/traffic/前方事故.png differ diff --git a/src/assets/traffic/前方施工.png b/src/assets/traffic/前方施工.png new file mode 100644 index 0000000..0c99376 Binary files /dev/null and b/src/assets/traffic/前方施工.png differ diff --git a/src/assets/traffic/右下箭头.png b/src/assets/traffic/右下箭头.png new file mode 100644 index 0000000..f3e27c1 Binary files /dev/null and b/src/assets/traffic/右下箭头.png differ diff --git a/src/assets/traffic/右侧道路变窄.png b/src/assets/traffic/右侧道路变窄.png new file mode 100644 index 0000000..d31d82f Binary files /dev/null and b/src/assets/traffic/右侧道路变窄.png differ diff --git a/src/assets/traffic/右箭头.png b/src/assets/traffic/右箭头.png new file mode 100644 index 0000000..7c1a1d0 Binary files /dev/null and b/src/assets/traffic/右箭头.png differ diff --git a/src/assets/traffic/向右.png b/src/assets/traffic/向右.png new file mode 100644 index 0000000..98c6633 Binary files /dev/null and b/src/assets/traffic/向右.png differ diff --git a/src/assets/traffic/向右转弯.png b/src/assets/traffic/向右转弯.png new file mode 100644 index 0000000..8886e0d Binary files /dev/null and b/src/assets/traffic/向右转弯.png differ diff --git a/src/assets/traffic/向左.png b/src/assets/traffic/向左.png new file mode 100644 index 0000000..11447e4 Binary files /dev/null and b/src/assets/traffic/向左.png differ diff --git a/src/assets/traffic/向左向右转弯.png b/src/assets/traffic/向左向右转弯.png new file mode 100644 index 0000000..4e3fe86 Binary files /dev/null and b/src/assets/traffic/向左向右转弯.png differ diff --git a/src/assets/traffic/向左转弯.png b/src/assets/traffic/向左转弯.png new file mode 100644 index 0000000..f1e8652 Binary files /dev/null and b/src/assets/traffic/向左转弯.png differ diff --git a/src/assets/traffic/左下箭头.png b/src/assets/traffic/左下箭头.png new file mode 100644 index 0000000..a0bc3d2 Binary files /dev/null and b/src/assets/traffic/左下箭头.png differ diff --git a/src/assets/traffic/左侧道路变窄.png b/src/assets/traffic/左侧道路变窄.png new file mode 100644 index 0000000..790320a Binary files /dev/null and b/src/assets/traffic/左侧道路变窄.png differ diff --git a/src/assets/traffic/左右两侧绕行.png b/src/assets/traffic/左右两侧绕行.png new file mode 100644 index 0000000..79a512d Binary files /dev/null and b/src/assets/traffic/左右两侧绕行.png differ diff --git a/src/assets/traffic/左箭头.png b/src/assets/traffic/左箭头.png new file mode 100644 index 0000000..acbf755 Binary files /dev/null and b/src/assets/traffic/左箭头.png differ diff --git a/src/assets/traffic/掉头.png b/src/assets/traffic/掉头.png new file mode 100644 index 0000000..ce5f008 Binary files /dev/null and b/src/assets/traffic/掉头.png differ diff --git a/src/assets/traffic/检查.png b/src/assets/traffic/检查.png new file mode 100644 index 0000000..838c46e Binary files /dev/null and b/src/assets/traffic/检查.png differ diff --git a/src/assets/traffic/注意安全.png b/src/assets/traffic/注意安全.png new file mode 100644 index 0000000..eeedc7c Binary files /dev/null and b/src/assets/traffic/注意安全.png differ diff --git a/src/assets/traffic/禁止临时停车.png b/src/assets/traffic/禁止临时停车.png new file mode 100644 index 0000000..69e3c54 Binary files /dev/null and b/src/assets/traffic/禁止临时停车.png differ diff --git a/src/assets/traffic/禁止停车(P).png b/src/assets/traffic/禁止停车(P).png new file mode 100644 index 0000000..4bfe1a8 Binary files /dev/null and b/src/assets/traffic/禁止停车(P).png differ diff --git a/src/assets/traffic/禁止停车(停).png b/src/assets/traffic/禁止停车(停).png new file mode 100644 index 0000000..f0c1af1 Binary files /dev/null and b/src/assets/traffic/禁止停车(停).png differ diff --git a/src/assets/traffic/禁止右转.png b/src/assets/traffic/禁止右转.png new file mode 100644 index 0000000..9cfabfc Binary files /dev/null and b/src/assets/traffic/禁止右转.png differ diff --git a/src/assets/traffic/禁止左转.png b/src/assets/traffic/禁止左转.png new file mode 100644 index 0000000..142af06 Binary files /dev/null and b/src/assets/traffic/禁止左转.png differ diff --git a/src/assets/traffic/禁止掉头.png b/src/assets/traffic/禁止掉头.png new file mode 100644 index 0000000..929654a Binary files /dev/null and b/src/assets/traffic/禁止掉头.png differ diff --git a/src/assets/traffic/禁止驶入.png b/src/assets/traffic/禁止驶入.png new file mode 100644 index 0000000..984e417 Binary files /dev/null and b/src/assets/traffic/禁止驶入.png differ diff --git a/src/assets/traffic/禁止鸣笛.png b/src/assets/traffic/禁止鸣笛.png new file mode 100644 index 0000000..d454b6f Binary files /dev/null and b/src/assets/traffic/禁止鸣笛.png differ diff --git a/src/assets/traffic/箭头向上.png b/src/assets/traffic/箭头向上.png new file mode 100644 index 0000000..27c9b16 Binary files /dev/null and b/src/assets/traffic/箭头向上.png differ diff --git a/src/assets/traffic/箭头向下.png b/src/assets/traffic/箭头向下.png new file mode 100644 index 0000000..d87ed12 Binary files /dev/null and b/src/assets/traffic/箭头向下.png differ diff --git a/src/assets/traffic/解除限速20.png b/src/assets/traffic/解除限速20.png new file mode 100644 index 0000000..6b94f32 Binary files /dev/null and b/src/assets/traffic/解除限速20.png differ diff --git a/src/assets/traffic/解除限速40.png b/src/assets/traffic/解除限速40.png new file mode 100644 index 0000000..b0876bd Binary files /dev/null and b/src/assets/traffic/解除限速40.png differ diff --git a/src/assets/traffic/解除限速60.png b/src/assets/traffic/解除限速60.png new file mode 100644 index 0000000..eb00274 Binary files /dev/null and b/src/assets/traffic/解除限速60.png differ diff --git a/src/assets/traffic/限速100.png b/src/assets/traffic/限速100.png new file mode 100644 index 0000000..d3e9787 Binary files /dev/null and b/src/assets/traffic/限速100.png differ diff --git a/src/assets/traffic/限速110.png b/src/assets/traffic/限速110.png new file mode 100644 index 0000000..c3804a5 Binary files /dev/null and b/src/assets/traffic/限速110.png differ diff --git a/src/assets/traffic/限速120.png b/src/assets/traffic/限速120.png new file mode 100644 index 0000000..d9a7d8f Binary files /dev/null and b/src/assets/traffic/限速120.png differ diff --git a/src/assets/traffic/限速15.png b/src/assets/traffic/限速15.png new file mode 100644 index 0000000..e8a81bb Binary files /dev/null and b/src/assets/traffic/限速15.png differ diff --git a/src/assets/traffic/限速20.png b/src/assets/traffic/限速20.png new file mode 100644 index 0000000..c2bcb79 Binary files /dev/null and b/src/assets/traffic/限速20.png differ diff --git a/src/assets/traffic/限速30.png b/src/assets/traffic/限速30.png new file mode 100644 index 0000000..b93355b Binary files /dev/null and b/src/assets/traffic/限速30.png differ diff --git a/src/assets/traffic/限速40.png b/src/assets/traffic/限速40.png new file mode 100644 index 0000000..8449174 Binary files /dev/null and b/src/assets/traffic/限速40.png differ diff --git a/src/assets/traffic/限速50.png b/src/assets/traffic/限速50.png new file mode 100644 index 0000000..606684e Binary files /dev/null and b/src/assets/traffic/限速50.png differ diff --git a/src/assets/traffic/限速60.png b/src/assets/traffic/限速60.png new file mode 100644 index 0000000..3faa5e0 Binary files /dev/null and b/src/assets/traffic/限速60.png differ diff --git a/src/assets/traffic/限速70.png b/src/assets/traffic/限速70.png new file mode 100644 index 0000000..2392c2a Binary files /dev/null and b/src/assets/traffic/限速70.png differ diff --git a/src/assets/traffic/限速80.png b/src/assets/traffic/限速80.png new file mode 100644 index 0000000..d171fcb Binary files /dev/null and b/src/assets/traffic/限速80.png differ diff --git a/src/assets/traffic/限速90.png b/src/assets/traffic/限速90.png new file mode 100644 index 0000000..ddb7415 Binary files /dev/null and b/src/assets/traffic/限速90.png differ diff --git a/src/assets/traffic/靠右行驶.png b/src/assets/traffic/靠右行驶.png new file mode 100644 index 0000000..befb5ed Binary files /dev/null and b/src/assets/traffic/靠右行驶.png differ diff --git a/src/assets/traffic/靠左行驶.png b/src/assets/traffic/靠左行驶.png new file mode 100644 index 0000000..2713f51 Binary files /dev/null and b/src/assets/traffic/靠左行驶.png differ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 256ccb0..60ad450 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -53,7 +53,7 @@ export default { if (data.logoName) { this.title = data.logoName.length > 8 ? data.logoName.slice(0, 8) : data.logoName; } else { - this.title = '芯程物联'; + this.title = '信安智能'; } if (data.deptLogo) { this.logo = this.baseUrl + data.deptLogo; diff --git a/src/views/iot/device/device-edit.vue b/src/views/iot/device/device-edit.vue index 0fc2048..c433cbf 100644 --- a/src/views/iot/device/device-edit.vue +++ b/src/views/iot/device/device-edit.vue @@ -195,6 +195,8 @@ ref="voicecard" :device="form" @statusEvent="getDeviceStatusData($event)" /> + @@ -462,6 +464,7 @@ import gatewaypre from './gatewaypre.vue' import acousto_optic from'./acousto_optic.vue' import voicecard from './voicecard.vue'; import display from './display.vue' +import gateway from './gateway.vue' export default { name: 'DeviceEdit', dicts: ['iot_device_status', 'iot_location_way'], @@ -498,7 +501,8 @@ export default { gatewaypre, acousto_optic, voicecard, - display + display, + gateway }, watch: { activeName(val) { diff --git a/src/views/iot/device/display.vue b/src/views/iot/device/display.vue index 92d16b4..b067b2d 100644 --- a/src/views/iot/device/display.vue +++ b/src/views/iot/device/display.vue @@ -266,17 +266,17 @@ $t('device.running-status.866086-12') }} {{ firmware.firmwareName - }} + }} {{ firmware.productName - }} + }} Version {{ firmware.version - }} + }} {{ getDownloadUrl(firmware.filePath) }} {{ firmware.remark - }} + }}
- - + + + + + + + + + + + + + + + + + + + + + @@ -843,6 +865,8 @@ export default { fontBold: 0, fontStretch: 0, image: '', + imageSize: 1, // 32x32 + imageColor: 0, // Red effect: 0, speed: 4, stayTime: 5, @@ -884,15 +908,19 @@ export default { addProgramStayTimes: ['不停顿', '100毫秒', '500毫秒', '1秒', '2秒', '3秒', '4秒', '5秒', '6秒', '8秒', '10秒'], addProgramHorizontalAlign: ['居左对齐', '居中对齐', '居右对齐'], addProgramVerticalAlign: ['顶部对齐', '居中对齐', '底部对齐'], + addProgramImageSizes: ['16x16', '32x32', '48x48', '64x64'], + addProgramImageColors: ['红色', '绿色', '黄色'], // 自动分页相关 addProgramPreviewPage: [0], // 每个分区当前页 addProgramPreviewTimer: [], // 每个分区定时器 addProgramPreviewAssets: [], // 每个分区的分行分页缓存 addProgramPreviewAnimState: [], // 每个分区动画状态 addProgramPreviewAnimFrame: null, // 动画主循环ID + addProgramTrafficImages: [], }; }, mounted() { + this.loadTrafficImages(); if (this.device && this.device.deviceId) { this.handleDeviceChange(this.device); this.initDataStatus(); @@ -905,6 +933,22 @@ export default { }, methods: { + loadTrafficImages() { + try { + // 使用webpack的require.context动态加载图片 + const files = require.context('@/assets/traffic', false, /\.(png|jpe?g|svg|bmp)$/); + this.addProgramTrafficImages = files.keys().map(key => { + const label = key.replace('./', ''); + return { + label: label, // 例如: '1.png' + value: files(key) // Webpack处理后的路径 + }; + }); + } catch (e) { + console.error("加载交通标志图片失败, 请确认 'src/assets/traffic' 目录下有图片文件。", e); + this.addProgramTrafficImages = []; + } + }, //发送指令 async mqttPublish(device, model) { const command = {}; @@ -2245,6 +2289,8 @@ export default { fontBold: 0, fontStretch: 0, image: '', + imageSize: 1, + imageColor: 0, effect: 0, speed: 4, stayTime: 5, @@ -2277,6 +2323,8 @@ export default { fontBold: 0, fontStretch: 0, image: '', + imageSize: 1, + imageColor: 0, effect: 0, speed: 4, stayTime: 5, @@ -2486,16 +2534,80 @@ export default { ctx.fillText(line, startX + animOffsetX, startY + lineIdx * lineHeight + animOffsetY); }); - } else if (zone.playType === 1) { + } else if (zone.playType === 1 && asset.isImage) { // 图片类型分区 - ctx.fillStyle = '#222'; - ctx.fillRect(zoneX + 4, zoneY + 4, zoneWidth - 8, zoneHeight - 8); + if (asset.loaded && asset.img.complete) { + const img = asset.img; - ctx.fillStyle = '#fff'; - ctx.font = `${Math.round(12 * scale)}px Arial`; - ctx.textAlign = 'center'; - ctx.textBaseline = 'middle'; - ctx.fillText('图片', zoneX + zoneWidth / 2, zoneY + zoneHeight / 2); + // 获取用户选择的目标尺寸 + const sizeValues = [16, 32, 48, 64]; + const targetSize = sizeValues[zone.imageSize] || 32; + + // 根据原始宽高比计算缩放后的尺寸 + let newWidth, newHeight; + if (img.width > img.height) { + newWidth = targetSize; + newHeight = (img.height / img.width) * targetSize; + } else { + newWidth = (img.width / img.height) * targetSize; + newHeight = targetSize; + } + + // 创建临时画布用于调整尺寸和颜色 + const tempCanvas = document.createElement('canvas'); + tempCanvas.width = newWidth; + tempCanvas.height = newHeight; + const tempCtx = tempCanvas.getContext('2d', { willReadFrequently: true }); + + // 绘制图片到临时画布（实现缩放） + tempCtx.drawImage(img, 0, 0, newWidth, newHeight); + + // 获取像素数据并应用颜色 + const imageData = tempCtx.getImageData(0, 0, newWidth, newHeight); + const data = imageData.data; + const colors = [[255, 0, 0], [0, 255, 0], [255, 255, 0]]; // Red, Green, Yellow + const selectedColor = colors[zone.imageColor]; + if (selectedColor) { + for (let i = 0; i < data.length; i += 4) { + // 优化线条识别：通过计算灰度并使用更宽松的阈值来捕捉完整的笔画 + const grayscale = (data[i] + data[i + 1] + data[i + 2]) / 3; + const isLine = grayscale < 128 && data[i + 3] > 50; + + if (isLine) { + // 将线条着色 + data[i] = selectedColor[0]; // R + data[i + 1] = selectedColor[1]; // G + data[i + 2] = selectedColor[2]; // B + data[i + 3] = 255; // 确保线条完全不透明 + } else { + // 将背景设为透明 + data[i + 3] = 0; + } + } + } + // 将处理后的图像数据放回临时画布 + tempCtx.putImageData(imageData, 0, 0); + + // 计算在主画布上绘制的最终尺寸和位置 + const finalWidth = newWidth * scale; + const finalHeight = newHeight * scale; + const dX = zoneX + (zoneWidth - finalWidth) / 2; + const dY = zoneY + (zoneHeight - finalHeight) / 2; + + // 将着色和缩放后的临时画布内容绘制到主画布 + ctx.drawImage(tempCanvas, dX, dY, finalWidth, finalHeight); + + } else { + // Image not loaded yet, draw placeholder + ctx.fillStyle = '#222'; + ctx.fillRect(zoneX + 4, zoneY + 4, zoneWidth - 8, zoneHeight - 8); + + ctx.fillStyle = '#fff'; + ctx.font = `${Math.round(12 * scale)}px Arial`; + ctx.textAlign = 'center'; + ctx.textBaseline = 'middle'; + ctx.fillText('加载中...', zoneX + zoneWidth / 2, zoneY + zoneHeight / 2); + } } // 恢复裁剪区域 @@ -2510,6 +2622,21 @@ export default { const scale = Math.min(renderWidth / 32, 120 / 64); this.addProgramPreviewAssets = this.addProgramForm.zones.map(zone => { + if (zone.playType === 1 && zone.image) { + // 图片类型，异步加载图片 + const img = new window.Image(); + img.crossOrigin = 'Anonymous'; + const asset = { img, isImage: true, loaded: false }; + img.onload = () => { + asset.loaded = true; + this.drawAddProgramPreview(); + }; + img.onerror = (e) => { + console.error("Preview image failed to load:", e); + }; + img.src = zone.image; + return asset; + } if (zone.playType !== 0 || !zone.displayText) { return { pages: [[]], isText: false }; } diff --git a/src/views/iot/device/gateway.vue b/src/views/iot/device/gateway.vue new file mode 100644 index 0000000..7d25115 --- /dev/null +++ b/src/views/iot/device/gateway.vue @@ -0,0 +1,962 @@ + + + + + \ No newline at end of file diff --git a/src/views/iot/device/voicecard.vue b/src/views/iot/device/voicecard.vue index 109fd13..311e279 100644 --- a/src/views/iot/device/voicecard.vue +++ b/src/views/iot/device/voicecard.vue @@ -254,17 +254,17 @@ $t('device.running-status.866086-12') }} {{ firmware.firmwareName - }} + }} {{ firmware.productName - }} + }} Version {{ firmware.version - }} + }} {{ getDownloadUrl(firmware.filePath) }} {{ firmware.remark - }} + }}