interface

@@ -52,6 +52,7 @@ class AdminEquipmentController extends AdminBaseController{
         if (!empty($param['start_time'])&&!empty($param['end_time'])){
         if (!empty($param['start_time'])&&!empty($param['end_time'])){
             $where['create_time']=['between',[strtotime($param['start_time']),strtotime($param['end_time'])]];
             $where['create_time']=['between',[strtotime($param['start_time']),strtotime($param['end_time'])]];
         }
         }
+        $where['is_delete']=0;
         $Equipment=new EquipmentModel();
         $Equipment=new EquipmentModel();
         $data=$Equipment->where($where)->order('create_time','desc')->paginate(10,false,['query'=>$param]);
         $data=$Equipment->where($where)->order('create_time','desc')->paginate(10,false,['query'=>$param]);
         $this->assign('data',$data);
         $this->assign('data',$data);
@@ -108,6 +109,12 @@ class AdminEquipmentController extends AdminBaseController{
         }
         }
     }
     }
 
 
+    //删除
+    public function delete(){
+
+    }
+
+
     //批量导入设备信息
     //批量导入设备信息
     public function batch_add(){
     public function batch_add(){