Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-api

catch/hydraulic/controller/Wrench.php

@@ -25,7 +25,17 @@ class Wrench extends CatchController
     {
         return CatchResponse::paginate($this->wrenchModel->getList());
     }
-    
+   
+    /**
+     * 获取扳手列表
+     *
+     * @return void
+     */
+    public function getWrenchList(Request $request): \think\Response
+    {
+        $list = $this->wrenchModel->select();
+        return CatchResponse::success($list);
+    }
     /**
      * 保存信息
      * @time 2022年05月06日 14:11

catch/report/controller/Report.php

@@ -194,6 +194,7 @@ class Report extends CatchController
             ['name'=>'液压油偏低','value'=>120],
             ['name'=>'液压油偏高','value'=>30],
         );
+        
     
 
         $data=array(
@@ -210,21 +211,23 @@ class Report extends CatchController
     public function maintainCount(Request $request)
     {
         $list =array(
-            ['type'=>'液压泵','name'=>'电量告警','value'=>100],
-            ['type'=>'液压泵','name'=>'液压油偏低','value'=>120],
-            ['type'=>'液压泵','name'=>'液压油偏高','value'=>30],
-            ['type'=>'液压泵','name'=>'总数','value'=>250],
-
-          
+            ['type'=>'法兰','name'=>'总数','value'=>250],
+            ['type'=>'法兰','name'=>'及格','value'=>200],
+            ['type'=>'法兰','name'=>'不及格','value'=>50],
         );
         $pump_bar=array(
-            'xData'=>['总数','电量告警','液压油偏低','液压油偏高'],
-            'yData'=>[250,100,120,30],
+            'xData'=>['总数','紧固及格','紧固不及格'],
+            'yData'=>[250,200,50],
         );
-        $pump_pie=array(
-            ['name'=>'电量告警','value'=>100],
-            ['name'=>'液压油偏低','value'=>120],
-            ['name'=>'液压油偏高','value'=>30],
+        $pump_pie=[
+            ['name'=>'紧固及格','value'=>200],
+            ['name'=>'紧固不及格','value'=>50]
+        ];
+
+        $list_type = array(
+            'xData'=>['c1','c2','c3','c4'],
+            'yData'=>[250,200,50,40],
+
         );
     
 

catch/wind/controller/Fan.php

@@ -86,5 +86,9 @@ class Fan extends CatchController
     {
         return CatchResponse::success($this->fanModel->deleteBy($id));
     }
-    
+    //获取机位号
+    // public function getNumber()
+    // {
+
+    // }
 }