后台设备模块开发

@@ -127,9 +127,11 @@ class AdminLightController extends AdminBaseController
     }
     }
 
 
     //获取区域下所有位置
     //获取区域下所有位置
-    public function getLocation()
+    public function getLocation($id)
     {
     {
-        $id = $this->request->param('id');
+        if (empty($id)) {
+            $id = $this->request->param('id');
+        }
         $data = Db::name('temple_area')->where('id', $id)->find();
         $data = Db::name('temple_area')->where('id', $id)->find();
         $arr = [];
         $arr = [];
         for ($r = 1; $r <= $data['rows']; $r++) {
         for ($r = 1; $r <= $data['rows']; $r++) {
@@ -207,7 +209,7 @@ class AdminLightController extends AdminBaseController
         $this->assign('temple', $temple);
         $this->assign('temple', $temple);
         $area = Db::name('temple_area')->where('temple_id', $data['temple_id'])->select();
         $area = Db::name('temple_area')->where('temple_id', $data['temple_id'])->select();
         $this->assign('area', $area);
         $this->assign('area', $area);
-        $location=$this->getLocation(['id'=>$data['area_id']]);
+        $location=$this->getLocation($id=$data['area_id']);
         print_r($location);
         print_r($location);
         $this->assign('location', $location);
         $this->assign('location', $location);
         $this->assign('list', $data);
         $this->assign('list', $data);