测试数据

app/Service/EmployeeService.php

@@ -142,11 +142,11 @@ class EmployeeService extends Service
             }else{
                 $role[$value->employee_id] = $value->title;
             }
-            $role2[] = $value->id;
+            $role2[$value->employee_id][] = $value->id;
         }
 
         foreach ($data['data'] as $key => $value){
-            $data['data'][$key]['role'] = $role2;
+            $data['data'][$key]['role'] = $role2[$value['id']] ?? [];
             $data['data'][$key]['role_name'] = $role[$value['id']] ?? '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d',$value['crt_time']) : '';
         }

app/Service/ScreenService.php

@@ -302,6 +302,9 @@ class ScreenService extends Service
             ->groupBy('t.device_no')
             ->limit(20)
             ->get()->toArray();
+        foreach ($posts_a as $key => $value){
+            $posts_a[$key]['value'] = $value['value'] ? '开启' : '关闭';
+        }
         $posts_b = SystemL::whereIn('t.device_no', $nodeTwo)
             ->select('value',DB::raw("CONCAT(device_name,'-',data_point_name) AS data_point_name"))
             ->from(DB::raw("(SELECT MAX(id) AS max_id, device_no FROM system_l GROUP BY device_no) AS subquery"))
@@ -312,6 +315,13 @@ class ScreenService extends Service
             ->groupBy('t.device_no')
             ->limit(20)
             ->get()->toArray();
+        foreach ($posts_b as $key => $value){
+            if(strstr($value['data_point_name'],'温度')){
+                $posts_b[$key]['value'] = $value['value'] . '℃';
+            }elseif (strstr($value['data_point_name'],'湿度')){
+                $posts_b[$key]['value'] = $value['value'] . '％rh';
+            }
+        }
         $posts_c = SystemL::whereIn('t.device_no', $nodeThree)
             ->select('value',DB::raw("CONCAT(device_name,'-',data_point_name) AS data_point_name"))
             ->from(DB::raw("(SELECT MAX(id) AS max_id, device_no FROM system_l GROUP BY device_no) AS subquery"))
@@ -322,7 +332,6 @@ class ScreenService extends Service
             ->groupBy('t.device_no')
             ->limit(20)
             ->get()->toArray();
-
         return [true,['node_one' => $posts_a,'node_two'=>$posts_b,'node_three'=>$posts_c]];
     }