后台报警与信息模块开发

@@ -44,13 +44,15 @@ class AdminMessageController extends AdminBaseController
     public function index()
     {
         //数据提取
-        $data=Db::name('warning')
-            ->alias('w')
-            ->join('light l','w.light_id=l.id')
+        $data=Db::name('message')
+            ->alias('m')
+            ->join('message_category mc','m.category_id=mc.id')
+            ->join('light_order lo','m.order_id=lo.id')
+            ->join('light l','lo.light_id=l.id')
             ->join('temple t','l.temple_id=t.id')
             ->join('temple_area ta','l.area_id=ta.id')
-            ->field('w.*,l.row,l.column,l.address,l.temple_id,l.number,t.name as tname ,ta.name as taname,w.status as wstatus')
-            ->order('w.create_time','desc')
+            ->field('m.*,mc.*,l.row,l.column,l.address,l.temple_id,l.number,t.name as tname ,ta.name as taname')
+            ->order('m.create_time','desc')
             ->paginate(10);
         //向地址传参
         $this->assign('page',$data->render());
@@ -66,6 +68,38 @@ class AdminMessageController extends AdminBaseController
         return $this->fetch();
     }
 
+    /**
+     * 编辑消息
+     * @adminMenu(
+     *     'name'   => '编辑消息',
+     *     'parent' => 'index',
+     *     'display'=> false,
+     *     'hasView'=> true,
+     *     'order'  => 10000,
+     *     'icon'   => '',
+     *     'remark' => '编辑消息',
+     *     'param'  => ''
+     * )
+     */
+    public function edit(){
+
+    }
+    /**
+     * 编辑消息提交
+     * @adminMenu(
+     *     'name'   => '编辑消息提交',
+     *     'parent' => 'index',
+     *     'display'=> false,
+     *     'hasView'=> false,
+     *     'order'  => 10000,
+     *     'icon'   => '',
+     *     'remark' => '编辑消息提交',
+     *     'param'  => ''
+     * )
+     */
+    public function editPost(){
+
+    }
 
     /**
      * 删除系统消息

@@ -27,10 +27,16 @@
                         <input type="checkbox" class="js-check-all" data-direction="x" data-checklist="js-check-x">
                     </label>
                 </th>
-
                 <th width="50">ID</th>
-                <th>消息类型</th>
+                <th>时间</th>
                 <th>消息标题</th>
+                <th>接受用户姓名</th>
+                <th>手机号</th>
+                <th>设备ID</th>
+                <th>设备位置</th>
+                <th>所属地区</th>
+                <th>所属寺庙</th>
+                <th>设备到期时间</th>
                 <th>消息内容</th>
                 <th>操作</th>
             </tr>
@@ -43,11 +49,18 @@
                                value="{$vo.id}" title="ID:{$vo.id}">
                     </td>
                     <td>{$vo.id}</td>
-                    <td>{$vo.category}</td>
+                    <td>{:date('Y-m-d H:i:s',$vo.create_time);}</td>
                     <td>{$vo.title}</td>
+                    <td>{$vo.user_name}</td>
+                    <td>{$vo.mobile}</td>
+                    <td>{$vo.number}</td>
+                    <td>{$vo.row}行{$vo.column}列</td>
+                    <td>{$vo.address}</td>
+                    <td>{$vo.tname}</td>
+                    <td>{:date('Y-m-d H:i:s',$vo.end_time);}</td>
                     <td>{$vo.content}</td>
                     <td>
-                        <a href="{:url('AdminWarning/delete',array('id'=>$vo['id']))}">
+                        <a href="{:url('AdminMessage/delete',array('id'=>$vo['id']))}">
                             {:lang('DELETE')}
                         </a>
                     </td>
@@ -59,8 +72,15 @@
                 <th width="15"><label><input type="checkbox" class="js-check-all" data-direction="x"
                                              data-checklist="js-check-x"></label></th>
                 <th width="50">ID</th>
-                <th>消息类型</th>
+                <th>时间</th>
                 <th>消息标题</th>
+                <th>接受用户姓名</th>
+                <th>手机号</th>
+                <th>设备ID</th>
+                <th>设备位置</th>
+                <th>所属地区</th>
+                <th>所属寺庙</th>
+                <th>设备到期时间</th>
                 <th>消息内容</th>
                 <th>操作</th>
             </tr>
@@ -69,7 +89,7 @@
         <div class="table-actions">
             <!--<button type="submit" class="btn btn-primary btn-sm js-ajax-submit">{:lang('SORT')}</button>-->
             <button class="btn btn-danger btn-sm js-ajax-submit" type="submit"
-                    data-action="{:url('AdminWarning/delete')}" data-subcheck="true" data-msg="您确定删除吗？">
+                    data-action="{:url('AdminMessage/delete')}" data-subcheck="true" data-msg="您确定删除吗？">
                 {:lang('DELETE')}
             </button>
         </div>