后台设备模块开发

@@ -207,7 +207,7 @@ class AdminLightOrderController extends AdminBaseController
         $data = Db::name('light_order')
         $data = Db::name('light_order')
                 ->alias('lo')
                 ->alias('lo')
                 ->join('light l', 'lo.light_id=l.id')
                 ->join('light l', 'lo.light_id=l.id')
-                ->where(['l.area_id' => $id, 'lo.status' => 1, 'lo.end_time' => ['>', time()], 'l.id' => ['neq', $lightId]])->field('l.row,l.column')->select()->toArray();
+                ->where(['l.area_id' => $id, 'lo.status' => 1, 'lo.end_time' => ['>', time()], 'l.id' => ['neq', $lightId]])->field('l.row,l.column,l.id')->select()->toArray();
         return json_encode($data);
         return json_encode($data);
     }
     }
 }
 }

@@ -82,7 +82,7 @@
                             <select name="location" required id="lightLocation">
                             <select name="location" required id="lightLocation">
                                 <option value="">请选择设备位置</option>
                                 <option value="">请选择设备位置</option>
                                 <foreach name="location" item="vo">
                                 <foreach name="location" item="vo">
-                                    <option value="{:implode($vo,',')}" <eq name="list.location" value="$vo">selected</eq>>{$vo.0}行{$vo.1}列</option>
+                                    <option value="{$vo.id}" <eq name="list.light_id" value="$vo.id">selected</eq>>{$vo.row}行{$vo.light}列</option>
                                 </foreach>
                                 </foreach>
                             </select>
                             </select>
                         </td>
                         </td>
@@ -253,8 +253,8 @@
                     var two = JSON.parse(data);
                     var two = JSON.parse(data);
                     for(var i in two){
                     for(var i in two){
                         var option=$("<option></option>");
                         var option=$("<option></option>");
-                        $(option).val(two[i]);
-                        $(option).html(two[i]['0']+'行'+two[i]['1']+'列');
+                        $(option).val(two[i]['id']);
+                        $(option).html(two[i]['row']+'行'+two[i]['column']+'列');
                         $("#lightLocation").append(option);
                         $("#lightLocation").append(option);
                     }
                     }
                 }
                 }