修改

catch/wind/controller/Fan.php

@@ -37,8 +37,39 @@ class Fan extends CatchController
     public function save(Request $request) : \think\Response
     {
         $data = $request->post();
-      
-        return CatchResponse::success($this->fanModel->storeBy($data));
+        
+        $save_data=array(
+            'wind_id'=>$data['wind_id'],
+            'fan_model'=>$data['fan_model'],
+            'info'=>$data['info'],
+            'creator_id' => $data['creator_id'],
+            'created_at' => time(),
+        );
+        $add_fans=array();
+        if($data['mul_number']){
+            $numArr=explode(',',$data['mul_number']);
+            foreach($numArr as $value) {
+                $save_data['number']=$value;
+                array_push($add_fans, $save_data);
+            }
+        }
+        $rule_data=$data['rule_data'];
+        if($rule_data['number_length'] && $rule_data['start_number']){
+            $start=$rule_data['start_number'];
+            $length=$rule_data['start_number']+$rule_data['number_length'];
+            for($i=$start; $i<$length;$i++){
+                if($rule_data['zero_fill']){
+                    $number=str_pad($i,$rule_data['zero_length'],'0',STR_PAD_LEFT );
+                }else{
+                    $number=$i;
+                }
+                $save_data['number']=$rule_data['number_first'].$number.$rule_data['number_last'];
+                array_push($add_fans, $save_data);
+            }
+        }
+        $count1 = $this->fanModel->limit(100)->insertAll($add_fans);
+        return CatchResponse::success('添加成功,共' . $count1 . '条');
+        // return CatchResponse::success($this->fanModel->storeBy($data));
     }
     
     /**
@@ -71,11 +102,7 @@ class Fan extends CatchController
      */
     public function delete($id) : \think\Response
     {
-        return CatchResponse::success($this->fanModel->deleteBy($id));
+        return CatchResponse::success($this->fanModel->deleteBy($id,true));
     }
-    //获取机位号
-    // public function getNumber()
-    // {
-
-    // }
+    
 }

catch/wind/controller/Wind.php

@@ -110,4 +110,12 @@ class Wind extends CatchController
     {
         return CatchResponse::success($this->windModel->deleteBy($id,true));
     }
+        /**
+     * 获取风场下拉菜单
+     * @time 2022年04月28日 19:53
+     */
+    public function getWindOptions(){
+        $list=$this->windModel->field('id as value,name as text')->select();
+        return CatchResponse::success($list);
+    }
 }

catch/wind/model/Fan.php

@@ -40,7 +40,7 @@ class Fan extends Model
     {
         return $this->dataRange()
         ->catchSearch()
-        ->append(['wind_name'])
+        ->append(['wind_name','model_name'])
         ->field('*')
         ->catchOrder()
         ->creator()

catch/wind/model/get/FanGet.php

@@ -1,6 +1,6 @@
 <?php
 namespace catchAdmin\wind\model\get;
-
+use catchAdmin\system\model\SysDictData;
 use think\facade\Db;
 
 trait FanGet
@@ -13,5 +13,15 @@ trait FanGet
         return $wind_name;
     }    
 
+    public function getModelNameAttr()
+    {
+        $id = $this->fan_model;
+        $name =  Db::name('device_mold')->where('id',$id)->where('device_type',4)->value('name');
+        return $name;
+    }   
 
+    public function getFanModelAttr($value)
+    {
+        return (int)$value;
+    } 
 }

catch/wind/route.php

@@ -13,6 +13,7 @@
 $router->group(function () use ($router){
 	// wind路由
 	$router->get('wind/getWindList', '\catchAdmin\wind\controller\Wind@getWindList');
+	$router->get('wind/getWindOptions', '\catchAdmin\wind\controller\Wind@getWindOptions');
 	$router->resource('wind', '\catchAdmin\wind\controller\Wind');
 	$router->resource('fan', '\catchAdmin\wind\controller\Fan');
 })->middleware('auth');