likang

catch/wind/model/Fan.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-05-27 13:34:31
  * @LastEditors: likang
- * @LastEditTime: 2022-07-18 17:05:10
+ * @LastEditTime: 2022-07-23 18:21:02
  */
 
 namespace catchAdmin\wind\model;
@@ -89,7 +89,8 @@ class Fan extends Model
         $data = [
             'id' => intval($obj->id),
             'wnum' => Wind::where('id', $obj->wind_id)->value('number'),
-            'number' => intval($this->number),
+            'number' => strval($this->number),
+            'model' => ModelDeviceMold::where('device_type', 4)->where('id', $obj->fan_model)->value('name')
 
         ];
         $content['data'] = $data;
@@ -122,7 +123,7 @@ class Fan extends Model
         $model_name = ModelDeviceMold::where($wheres)->column('name');
         $where[] = ['ContentType', '=', 'FanModel'];
         $where[] = ['ContentId', 'like', '%' . $wind_num . '_%'];
-        $where[] = ['Type', '=', 'add'];
+
         //获取当前风场下发的风机模型
         $list = Db::name('publish')->where($where)->field('ContentId')->select();
         //截取ContentId 获取模型名称
@@ -143,8 +144,8 @@ class Fan extends Model
             $time = msectime();
             $json = json_encode([
                 'id' => $wind_num . '_' . $item,
-                'wunm' => $wind_num,
-                'model' => $item
+                'wnum' => strval($wind_num),
+                'model' => strval($item)
             ]);
             $content[] = [
                 'Type' => 'add',

catch/worklocation/model/Workplan.php

@@ -65,8 +65,7 @@ class Workplan extends Model
     {
         $data = null;
         $content = null;
-        $fan = Fan::where('id', $obj->wind_id)->find();
-
+        $fan = Fan::where('id', $obj->fan_id)->find();
         $fan_model = DeviceMold::where('id', $fan['fan_model'])->value('name');
         $data = [
             'id' => $obj->id,
@@ -74,14 +73,15 @@ class Workplan extends Model
             'wnum' => Wind::where('id', $obj->wind_id)->value('number'),
             'wname' => Wind::where('id', $obj->wind_id)->value('name'),
             'fnum' => $fan['number'],
-            'fmode' => $fan_model,
+            'fmodel' => $fan_model,
             'parts' => ModelMaintenancemapper::where('device_type', 1)->where('value', $this->parts_sign)->value('name'),
             'work' => ModelMaintenancemapper::where('device_type', 2)->where('value', $this->work_sign)->value('name'),
             'bm' => ModelMaintenancemapper::where('device_type', 4)->where('value', $this->boit_type_sign)->value('name'),
             'bn' => intval($obj->bolt_num),
             'tm' => $obj->tighten_mode,
             'bias' => intval($obj->bias),
-            'lt' => null,
+
+            'lt' => 110,
             'torque' => $obj->torque,
             'info' => $obj->info
         ];