order

@@ -29,7 +29,11 @@ use think\Db;
 class AdminFaultController extends AdminBaseController{
 class AdminFaultController extends AdminBaseController{
 
 
     public function index(){
     public function index(){
-        $data=Db::name('fault')->order('create_time','desc')->paginate(10);
+        $data=Db::name('fault')
+            ->alias('a')
+            ->join('equipment b','a.eq_name=b.name')
+            ->order('create_time','desc')
+            ->paginate(10);
         $this->assign('data',$data);
         $this->assign('data',$data);
         return $this->fetch();
         return $this->fetch();
     }
     }

@@ -55,11 +55,20 @@
                                value="{$vo.id}" title="ID:{$vo.id}">
                                value="{$vo.id}" title="ID:{$vo.id}">
                     </td>
                     </td>
                     <td><b>{$vo.id}</b></td>
                     <td><b>{$vo.id}</b></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
+                    <td>{$vo.eq_name}</td>
+                    <td>{$vo.serial_number}</td>
+                    <td>{$vo.hospital}</td>
+                    <td>
+                        <switch name="$vo.fault_type">
+                            <case value="1">计费</case>
+                            <case value="2">车轮</case>
+                            <case value="3">床体</case>
+                            <case value="4">床垫</case>
+                            <case value="5">车锁</case>
+                            <case value="6">其他</case>
+                        </switch>
+                    </td>
+                    <td>{$vo.fault_describe}</td>
                     <td>
                     <td>
                         <a href="{:url('AdminArticle/edit',array('id'=>$vo['id']))}">查看图片</a>
                         <a href="{:url('AdminArticle/edit',array('id'=>$vo['id']))}">查看图片</a>
                     </td>
                     </td>