Merge branch 'fix/DEFECT-1591' into 'main_dev'

fix: 修复告警列表改变大小后绑定设备无效

See merge request yunteng/thingskit-scada!127

@@ -5540,7 +5540,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
 
         const playIntervalPanel = createPanel()
         const playIntervalPanel = createPanel()
         $(playIntervalPanel).addClass('override__panel--default')
         $(playIntervalPanel).addClass('override__panel--default')
-        $(playIntervalPanel).append(`<div class="layui-form-item" style="margin-bottom: 0;"><label class="layui-form-label" style="width: 80px; padding: 9px 0; text-align: left;">停留时间(秒)</label><div class="layui-input-block" style="margin-left: 80px;"><input class="layui-input" name="${enumFields.INTERVAL}" placeholder="请输入报警停留时间" /></div></div>`)
+        $(playIntervalPanel).append(`<div class="layui-form-item" style="margin-bottom: 0;"><label class="layui-form-label" style="width: 80px; padding: 9px 0; text-align: left;">停留时间(秒)</label><div class="layui-input-block" style="margin-left: 80px;"><input class="layui-input" name="${enumFields.INTERVAL}" placeholder="请输入报警停留时间" lay-verify="number" type="number" min="2" /></div></div>`)
 
 
         function openBindDeviceLayer() {
         function openBindDeviceLayer() {
 
 
@@ -6665,7 +6665,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         }
         }
 
 
         function getAlarmListSubmitValue(filed = {}) {
         function getAlarmListSubmitValue(filed = {}) {
-            console.log(field?.devicesInfo)
+
             if (!field?.devicesInfo) {
             if (!field?.devicesInfo) {
                 UseLayUi.errorMsg('请先进行设备绑定!')
                 UseLayUi.errorMsg('请先进行设备绑定!')
                 return
                 return
@@ -14780,41 +14780,50 @@ class DispatchCenter {
         const allCell = Object.entries(this.graph?.getModel()?.cells || {}).map(([_, item]) => item) || []
         const allCell = Object.entries(this.graph?.getModel()?.cells || {}).map(([_, item]) => item) || []
         const { UUID } = AlarmListComponent.getAttributeKeys()
         const { UUID } = AlarmListComponent.getAttributeKeys()
         const { jquery: $ } = layui
         const { jquery: $ } = layui
+
+        const currentScale = this.graph.currentScale
         for (const item of alarmList || []) {
         for (const item of alarmList || []) {
             const { nodeId, sourceOption } = item || {}
             const { nodeId, sourceOption } = item || {}
-            const { devicesInfo, autoPlay, interval, startTime, endTime } = sourceOption || {}
+            const { devicesInfo, autoPlay, interval = 2, startTime, endTime } = sourceOption || {}
             const node = allCell.find(item => item.id === nodeId)
             const node = allCell.find(item => item.id === nodeId)
             const deviceIds = UseLayUi.parseStringToJSON(devicesInfo, []).map(item => item.deviceId)
             const deviceIds = UseLayUi.parseStringToJSON(devicesInfo, []).map(item => item.deviceId)
             if (!node) continue
             if (!node) continue
-            const id = node.getAttribute(UUID)
-            const element = document.getElementById(id)
-            if (element) {
-                const [err, data] = await to(ConfigurationNodeApi.getAlarmList({ page: 1, pageSize: 30, startTime: Number(startTime), endTime: Number(endTime), deviceIds }))
-                if (err) return
-                if (data?.items && data?.items?.length) {
-                    const template = AlarmListComponent.createAlarmItem(data.items)
-                    $(`#${id}`).find('.list-wrapper').html(template)
-                } else {
-                    $(`#${id}`).find('.list-wrapper').html(`<div>暂无数据</div>`)
-                }
-                if (autoPlay) {
-                    const wrapperHeight = $(`#${id}`).height()
-                    const listWrapper = $(`#${id}`).find('.list-wrapper')
-                    const allHeight = listWrapper.height()
-                    const itemHeight = allHeight / listWrapper.children().length
-                    let scrollDistance = 0
-                    const cancel = RAFSetInterval(() => {
-                        try {
-                            scrollDistance = itemHeight + scrollDistance
-                            if (scrollDistance + wrapperHeight > allHeight) scrollDistance = 0
-                            document.getElementById(id).scrollTo({ top: scrollDistance, behavior: 'smooth' })
-                        } catch (error) {
-                            cancel?.()
-                        }
+            // const id = node.getAttribute(UUID)
+            // const element = document.getElementById(id)
+            // if (element) {
+            const [err, data] = await to(ConfigurationNodeApi.getAlarmList({ page: 1, pageSize: 30, startTime: Number(startTime), endTime: Number(endTime), deviceIds }))
+            if (err) return
 
 
-                    }, Number(interval) * 1000)
-                }
+            const [rect, element] = this.graph.getNodesForCells([node])
+            if (data?.items && data?.items?.length) {
+                const template = AlarmListComponent.createAlarmItem(data.items)
+                $(element).find('.list-wrapper').html(template)
+            } else {
+                $(element).find('.list-wrapper').html(`<div>暂无数据</div>`)
+            }
+            if (typeof autoPlay === 'boolean' ? autoPlay : autoPlay == 'on') {
+                const wrapperHeight = $(element).find('.alarm-list').height() * currentScale
+                const listWrapper = $(element).find('.list-wrapper')
+                const allHeight = listWrapper.height() * currentScale
+                const itemHeight = allHeight / listWrapper.children().length
+                let scrollDistance = 0
+                const id = $(element).find('.alarm-list').attr('id')
+
+                let interval = Number(interval)
+                interval = isNaN(interval) ? 2 : interval
+
+                const cancel = RAFSetInterval(() => {
+                    try {
+                        scrollDistance = itemHeight + scrollDistance
+                        if (scrollDistance + wrapperHeight > allHeight) scrollDistance = 0
+                        document.getElementById(id).scrollTo({ top: scrollDistance, behavior: 'smooth' })
+                    } catch (error) {
+                        cancel?.()
+                    }
+
+                }, (interval <= 2 ? 2 : interval) * 1000)
             }
             }
+            // }
         }
         }
     }
     }
 
 
@@ -16292,7 +16301,7 @@ class HandleDataInteraction {
 
 
 
 
             const { flag, value } = validateSwitchCommand()
             const { flag, value } = validateSwitchCommand()
-            console.log({ flag, value })
+            
             if (!flag) return
             if (!flag) return
 
 
             layer.confirm('是否确认下发命令？', async function (index) {
             layer.confirm('是否确认下发命令？', async function (index) {