feat: 圆形状态灯渲染完成

js/dashboard.js

@@ -976,7 +976,9 @@ function renderRequestLoopData(poolData, resData) {
     // 读写框
     rwtextbox: () => loopRenderDatatextblock(poolData, resData, 'rwtextbox'),
     // 矩形状态灯
-    commonlamp: () => loopRenderCommonlamp(poolData, resData),
+    commonlamp: () => loopRenderLamp(poolData, resData, 'commonlamp'),
+    // 圆形状态灯
+    ellipselamp: () => loopRenderLamp(poolData, resData, 'ellipselamp'),
   }
   ControlTypeMap[poolData.ControlType] && ControlTypeMap[poolData.ControlType]()
 }
@@ -1021,15 +1023,15 @@ function loopRenderDatatextblock(poolData, resData, label) {
   }
 }
 
-// 渲染矩形状态灯
-function loopRenderCommonlamp(poolData, resData) {
-  console.log('矩形灯', poolData, resData)
+// 渲染矩形、圆形状态灯 label: commonlamp矩形状态灯  ellipselamp圆形状态灯
+function loopRenderLamp(poolData, resData, label) {
+  console.log(`${label === 'ellipselamp' ? '圆形状态灯' : '矩形状态灯'}`, poolData, resData)
   // 给默认颜色、闪烁
-  $(`#commonlamp${poolData.dataPoolMapIndex}`).css('background-color', poolData.DefaultColor)
+  $(`#${label}${poolData.dataPoolMapIndex}`).css('background-color', poolData.DefaultColor)
   if (poolData.DefaultFlashing) { // 默认闪烁
-    $(`#commonlamp${poolData.dataPoolMapIndex}`).addClass('animated-flash')
+    $(`#${label}${poolData.dataPoolMapIndex}`).addClass('animated-flash')
   } else {
-    $(`#commonlamp${poolData.dataPoolMapIndex}`).removeClass('animated-flash')
+    $(`#${label}${poolData.dataPoolMapIndex}`).removeClass('animated-flash')
   }
 
   let flagItem = poolData.DataList.find((item, index) => {
@@ -1056,11 +1058,11 @@ function loopRenderCommonlamp(poolData, resData) {
     return
   }  
   // 只要有一个满足条件，则渲染该条件的颜色
-  $(`#commonlamp${poolData.dataPoolMapIndex}`).css('background-color', flagItem.backColor)
+  $(`#${label}${poolData.dataPoolMapIndex}`).css('background-color', flagItem.backColor)
   if(flagItem.flashing) {
-    $(`#commonlamp${poolData.dataPoolMapIndex}`).addClass('animated-flash')
+    $(`#${label}${poolData.dataPoolMapIndex}`).addClass('animated-flash')
   } else {
-    $(`#commonlamp${poolData.dataPoolMapIndex}`).removeClass('animated-flash')
+    $(`#${label}${poolData.dataPoolMapIndex}`).removeClass('animated-flash')
   }
 }