likang

catch/synscheme/controller/Synscheme.php

@@ -93,4 +93,5 @@ class Synscheme extends CatchController
      $list =  $this->synschemeModel->field('id as value,name as text')->select();
      return CatchResponse::success($list);
    }
+   
 }

catch/wind/controller/Fan.php

@@ -38,6 +38,7 @@ class Fan extends CatchController
      */
     public function getList(Request $request)
     {
+       
         return CatchResponse::success($this->fanModel->getFanList());
     }
     

catch/wind/model/Fan.php

@@ -50,9 +50,8 @@ class Fan extends Model
     {
         return $this->dataRange()
         ->catchSearch()
-        ->field('id,number')
+        ->field('id as value,number as name')
         ->catchOrder()
-        ->creator()
         ->select();
     }
 }

catch/wind/route.php

@@ -16,5 +16,5 @@ $router->group(function () use ($router){
 	$router->get('wind/getWindOptions', '\catchAdmin\wind\controller\Wind@getWindOptions');
 	$router->resource('wind', '\catchAdmin\wind\controller\Wind');
 	$router->resource('fan', '\catchAdmin\wind\controller\Fan');
-	$router->get('fan/getFanListById','\catchAdmin\wind\controller\Fan@getList');
+	$router->get('getFanListById','\catchAdmin\wind\controller\Fan@getList');
 })->middleware('auth');

catch/worklocation/controller/WorkLocation.php

@@ -5,7 +5,7 @@ namespace catchAdmin\worklocation\controller;
 use catcher\base\CatchRequest as Request;
 use catcher\CatchResponse;
 use catcher\base\CatchController;
-use catchAdmin\worklocation\model\WorkLocation as workLocationModel;
+use catchAdmin\worklocation\model\Worklocation as workLocationModel;
 
 class WorkLocation extends CatchController
 {

catch/worklocation/database/migrations/20220520054827_work_local_add_field.php

@@ -0,0 +1,51 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class WorkLocalAddField extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('worklocation')) {
+            $table = $this->table('worklocation');
+
+            $table ->addColumn('torque', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '扭矩',])
+                    ->addColumn('pressure', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '压力',])
+                    ->addColumn('external_diameter', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '外径',])
+                    ->update();
+        }
+
+
+    }
+}

catch/worklocation/model/WorkLocation.php

@@ -3,9 +3,13 @@
 namespace catchAdmin\worklocation\model;
 
 use catcher\base\CatchModel as Model;
+use catchAdmin\permissions\model\DataRangScopeTrait;
+use think\facade\Db;
 
-class WorkLocation extends Model
+class Worklocation extends Model
 {
+
+    use DataRangScopeTrait;
     // 表名
     public $name = 'worklocation';
     // 数据库字段映射
@@ -35,5 +39,61 @@ class WorkLocation extends Model
         'updated_at',
         // 软删除
         'deleted_at',
+        // 扭矩
+        'torque',
+        // 压力
+        'pressure',
+        // 外径
+        'external_diameter',
     );
-}
+     public function getList()
+    {
+            return $this->dataRange()
+            ->catchSearch()
+            ->append(['wind_name','fan_number','parts_name','bolt_style_name','boit_type_name'])
+            ->field('*')
+            ->catchOrder()
+            ->creator()
+            ->paginate();
+    }
+    /**
+     * 获取风场名称
+     *
+     * @return void
+     */
+    public function getWindNameAttr()
+    {
+        $wind_id = $this->wind_id;
+        $wind_name =  Db::name('wind')->where('id',$wind_id)->value('name');
+        return $wind_name;
+
+    }
+   
+    /**
+     * 获取风机机位号
+     * @return void
+     */
+    public function getFanNumberAttr()
+    {
+        $fan_id = $this->fan_id;
+        $fan_number =  Db::name('fan')->where('id',$fan_id)->value('number');
+        return $fan_number;
+    }
+    /**
+     * 获取部件名称
+     *
+     * @return void
+     */
+    public function getPartsName()
+    {
+        $parts = $this->parts;
+        
+
+    }
+
+
+    
+
+        
+}
+