1

application/admin/controller/CompanyGoods.php

@@ -409,7 +409,7 @@ class CompanyGoods extends Auth
         $start = input('start', date('Y-m-d', strtotime('' . $cur . ' -1 month')));
         $end = input('end', date('Y-m-d'));
         $start1 = $start . ' 00:00:00';
-        $end1 = $end . ' 00:00:00';
+        $end1 = $end . ' 23:59:59';
         $list = $this->xhtjData($start1, $end1);
         $this->assign('list', $list['list']);
         $this->assign('zj', $list['zj']);

application/admin/controller/DeviceTask.php

@@ -284,7 +284,7 @@ class DeviceTask extends Auth
                     $this->success('操作成功',url('calendar'));
                 }
             }else{
-                $this->error('删除失败');
+                $this->error(model('DeviceTask')->getError());
             }
 
         }else{

application/admin/controller/Index.php

@@ -1222,7 +1222,11 @@ class Index extends Auth
         $map[] = ['del','=',0];
         $map[] = ['enable','=',1];
         $map[] = ['pid','=',500];
+
         $list = Db::name('menu')->where($map)->select();
+        foreach ($list as $k=>$v){
+            $list[$k]['url'] = url('index/indexsub1',['curmenu'=>500,'menuId'=>$v['id'],'ct'=>1]);
+        }
 
         $this->success('','',$list);
     }

application/admin/controller/OrderStatistics.php

@@ -126,51 +126,144 @@ class OrderStatistics extends Auth
     public function repairCate(){
         $start = input('start',date('Y-m-d',strtotime('-7 day')));
         $end = input('end',date('Y-m-d'));
-        if(request()->isAjax()){
-            $sTime = $start.' 00:00:00';
-            $eTime = $end.' 23:59:59';
-            $list = Db::name('order_type')
-                ->field('id,title,parent_id')
+
+        $sTime = $start.' 00:00:00';
+        $eTime = $end.' 23:59:59';
+        $list = Db::name('order_type')
+            ->field('id,title,parent_id')
+            ->where('enable',1)
+            ->where('del',0)
+            ->where('org_id',$this->orgId)
+            ->where('parent_id','=',0)
+            ->select();
+        foreach ($list as $k=>$v){
+            $type = Db::name('order_type')
+                ->field('id')
                 ->where('enable',1)
                 ->where('del',0)
                 ->where('org_id',$this->orgId)
-                ->where('parent_id','=',0)
+                ->where('parent_id',$v['id'])
                 ->select();
-            foreach ($list as $k=>$v){
-                $type = Db::name('order_type')
-                    ->field('id')
-                    ->where('enable',1)
-                    ->where('del',0)
-                    ->where('org_id',$this->orgId)
-                    ->where('parent_id',$v['id'])
-                    ->select();
-                $ids = [];
-                foreach ($type as $kk=>$vv){
-                    $ids[$kk] = $vv['id'];
-                }
-                $list[$k]['ids'] = $ids;
+            $ids = [];
+            foreach ($type as $kk=>$vv){
+                $ids[$kk] = $vv['id'];
             }
+            $list[$k]['ids'] = $ids;
+        }
 
-            foreach ($list as $k=>$v){
-                $list[$k]['nums'] =  Db::name('orders')
-                    ->alias('o')
-                    ->join('order_repair or','or.order_id=o.id')
-                    ->whereIn('or.type_id',$v['ids'])
-                    ->where('o.del',0)
-                    ->where('o.org_id',$this->orgId)
-                    ->where('o.create_time','>=',$sTime)
-                    ->where('o.create_time','<=',$eTime)
-                    ->count();
+        foreach ($list as $k=>$v){
+            $list[$k]['nums'] =  Db::name('orders')
+                ->alias('o')
+                ->join('order_repair or','or.order_id=o.id')
+                ->whereIn('or.type_id',$v['ids'])
+                ->where('o.del',0)
+                ->where('o.org_id',$this->orgId)
+                ->where('o.create_time','>=',$sTime)
+                ->where('o.create_time','<=',$eTime)
+                ->count();
+        }
+        $data = list_sort_by($list,'nums','desc');
+
+        $this->assign('data',$data);
+        $this->assign('start',$start);
+        $this->assign('end',$end);
+        return $this->fetch();
+    }
+
+
+    public function repairCateExport(){
+        $start = input('start',date('Y-m-d',strtotime('-7 day')));
+        $end = input('end',date('Y-m-d'));
+
+        $sTime = $start.' 00:00:00';
+        $eTime = $end.' 23:59:59';
+        $list = Db::name('order_type')
+            ->field('id,title,parent_id')
+            ->where('enable',1)
+            ->where('del',0)
+            ->where('org_id',$this->orgId)
+            ->where('parent_id','=',0)
+            ->select();
+        foreach ($list as $k=>$v){
+            $type = Db::name('order_type')
+                ->field('id')
+                ->where('enable',1)
+                ->where('del',0)
+                ->where('org_id',$this->orgId)
+                ->where('parent_id',$v['id'])
+                ->select();
+            $ids = [];
+            foreach ($type as $kk=>$vv){
+                $ids[$kk] = $vv['id'];
             }
-            $data = list_sort_by($list,'nums','desc');
-            $result['rows'] = $data;
+            $list[$k]['ids'] = $ids;
+        }
+
+        foreach ($list as $k=>$v){
+            $list[$k]['nums'] =  Db::name('orders')
+                ->alias('o')
+                ->join('order_repair or','or.order_id=o.id')
+                ->whereIn('or.type_id',$v['ids'])
+                ->where('o.del',0)
+                ->where('o.org_id',$this->orgId)
+                ->where('o.create_time','>=',$sTime)
+                ->where('o.create_time','<=',$eTime)
+                ->count();
+        }
+        $data = list_sort_by($list,'nums','desc');
+
+        include_once env('root_path').'/extend/phpexcel/Classes/PHPExcel.php';
+        //实例化PHPExcel类
+        $objPHPExcel =new \PHPExcel();
+        //激活当前的sheet表
+        $objPHPExcel->setActiveSheetIndex(0);
+        //设置表格头（即excel表格的第一行）
+        $objPHPExcel->setActiveSheetIndex(0)
+            ->setCellValue('A1', '报修类型')
+            ->setCellValue('B1', '订单数');
+        // 设置表格头水平居中
+        $objPHPExcel->setActiveSheetIndex(0)->getStyle('A1')->getAlignment()
+            ->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+        $objPHPExcel->setActiveSheetIndex(0)->getStyle('B1')->getAlignment()
+            ->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+        $objPHPExcel->setActiveSheetIndex(0)->getStyle('C1')->getAlignment()
+            ->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+
+
+        //设置列水平居中
+        $objPHPExcel->setActiveSheetIndex(0)->getStyle('A')->getAlignment()
+            ->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+        $objPHPExcel->setActiveSheetIndex(0)->getStyle('B')->getAlignment()
+            ->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+        $objPHPExcel->setActiveSheetIndex(0)->getStyle('C')->getAlignment()
+            ->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+
+        //设置单元格宽度
+        $objPHPExcel->setActiveSheetIndex(0)->getColumnDimension('A')->setWidth(30);
+        $objPHPExcel->setActiveSheetIndex(0)->getColumnDimension('B')->setWidth(30);
+        $objPHPExcel->setActiveSheetIndex(0)->getColumnDimension('C')->setWidth(30);
+
+
+        //循环刚取出来的数组，将数据逐一添加到excel表格。
+        for ($i = 0; $i < count($data); $i++) {
+            $objPHPExcel->getActiveSheet()->setCellValue('A' . ($i + 2), $data[$i]['title']);
+            $objPHPExcel->getActiveSheet()->setCellValue('B' . ($i + 2), $data[$i]['nums']);
 
-            return json($result);
-        }else{
-            $this->assign('start',$start);
-            $this->assign('end',$end);
-            return $this->fetch();
         }
+        //设置保存的Excel表格名称
+        $filename = '报修类型统计报表_' . date('YmdHis', time()) . '.xls';
+        //设置当前激活的sheet表格名称
+        $objPHPExcel->getActiveSheet()->setTitle('报修类型统计报表');
+        //设置浏览器窗口下载表格
+        ob_end_clean();
+        header("Content-Type: application/force-download");
+        header("Content-Type: application/octet-stream");
+        header("Content-Type: application/download");
+        header('Content-Disposition:inline;filename="' . $filename);
+        //生成excel文件
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
+        //下载文件在浏览器窗口
+        return $objWriter->save('php://output');
     }
 
     public function repairWorkload($mode){
@@ -268,7 +361,7 @@ class OrderStatistics extends Auth
             }elseif ($mode == 3){
                 $title = '运送工作量统计报表';
             }elseif ($mode == 4){
-                $title = '应急工作量统计报表';
+                $title = '安保工作量统计报表';
             }elseif ($mode == 0){
                 $title = '一键呼叫工作量统计报表';
             }
@@ -294,7 +387,7 @@ class OrderStatistics extends Auth
         }elseif ($mode == 3){
             $title = '运送工作量统计报表';
         }elseif ($mode == 4){
-            $title = '应急工作量统计报表';
+            $title = '安保工作量统计报表';
         }elseif ($mode == 0){
             $title = '一键呼叫工作量统计报表';
         }

application/admin/controller/Orders.php

@@ -60,9 +60,6 @@ class Orders extends Auth {
         }
         else {
             $mode_name = $this->getTableField('work_type_mode', ['id' => $mode], 'name');
-            if($mode==4){
-                $mode_name = '应急';
-            }
             $this->assign('m_name', $mode_name);
             $this->assign('mode', $mode);
             $order_mode = Db::name('order_mode')->select();
@@ -431,9 +428,7 @@ class Orders extends Auth {
             }else{
                 $mode_name = '';
             }
-            if($mode==4){
-                $mode_name = '应急';
-            }
+
             $auths = [1,2,3,4,15,0];
             if(!is_admin($this->userId)){
                 $auth = get_dispatch_auth($this->userId);
@@ -1044,7 +1039,7 @@ class Orders extends Auth {
             ['id' => 1, 'title' => '报修'],
             ['id' => 2, 'title' => '保洁'],
             ['id' => 3, 'title' => '运送'],
-            ['id' => 4, 'title' => '应急'],
+            ['id' => 4, 'title' => '安保'],
         ];
         $info = Db::name('phone_monitor_record')->where('id',$id)->find();
         if(!$info){
@@ -1062,7 +1057,7 @@ class Orders extends Auth {
             ['id' => 1, 'title' => '报修'],
             ['id' => 2, 'title' => '保洁'],
             ['id' => 3, 'title' => '运送'],
-            ['id' => 4, 'title' => '应急'],
+            ['id' => 4, 'title' => '安保'],
         ];
         $info = Db::name('phone_monitor')
             ->where('id', $id)->find();
@@ -1487,7 +1482,7 @@ class Orders extends Auth {
             $meta_title = '运送' . $meta_title;
         }
         elseif ($mode == 4) {
-            $meta_title = '应急' . $meta_title;
+            $meta_title = '安保' . $meta_title;
         }
         elseif ($mode == 15) {
             $meta_title = '品质整改' . $meta_title;
@@ -1898,7 +1893,7 @@ class Orders extends Auth {
                 '1'=>'报修',
                 '2'=>'保洁',
                 '3'=>'运送',
-                '4'=>'应急',
+                '4'=>'安保',
             ];
             foreach ($lists as $k=>$v){
                 $lists[$k]['to_user_name'] = Db::name('user')->where('id',$v['to_user_id'])->value('real_name');

application/admin/controller/Org.php

@@ -1,6 +1,7 @@
 <?php
 namespace app\admin\controller;
 
+use app\api\controller\screen\Weather;
 use think\Db;
 use think\Exception;
 
@@ -31,6 +32,11 @@ class Org extends Auth
             foreach ($flist as $k=>$v){
                 $flist[$k]['title'] = $v['name'];
             }
+            $infotype = Db::name('org')->where('id',$pid)->value('type');
+            $this->assign('infotype',$infotype);
+            $city = Db::name('city')->select();
+
+            $this->assign('city',$city);
 
             $this->assign('flist',$flist);
             $this->assign('fpid',$fpid);
@@ -69,6 +75,14 @@ class Org extends Auth
                 $flist[$k]['title'] = $v['name'];
             }
 
+            $city = Db::name('city')->select();
+            $this->assign('city',$city);
+            $pid = $info['id'];
+            $this->assign('pid',$pid);
+
+
+            $infotype = Db::name('org')->where('id',$pid)->value('type');
+            $this->assign('infotype',$infotype);
 
             $this->assign('flist',$flist);
 

application/admin/controller/PatrolTask.php

@@ -926,120 +926,87 @@ class PatrolTask extends Auth
     }
 
     public function addrWork($mode){
-        $day = input('day',date('Y-m-d'),'trim');
-
-
-        if(request()->isAjax()){
-            //分页参数
-            $length = input('rows',10,'intval');   //每页条数
-            $page = input('page',1,'intval');      //第几页
-            $start = ($page - 1) * $length;     //分页开始位置
-            //排序
-            $sortRow = input('sidx','sort','trim');      //排序列
-            $sort = input('sord','asc','trim');        //排序方式
-            $order = $sortRow.' '.$sort.' ,id desc';
-
-            $first = 1;
-            $w = date('w',strtotime($day));
-            $wst = date('Ymd',strtotime("$day -" . ($w ? $w - $first : 6) . ' days'));
-            $wet = date('Ymd',strtotime("$day +6 days"));
-
 
-            $zuo = date('Ymd',strtotime($day)-86400);
-            $you = date('Ymd',strtotime($day)+86400);
-
-            $st = $day.' 00:00:00';
-            $et = $day.' 23:59:59';
-            $map[] = ['pt.org_id','=',$this->orgId];
-            $map[] =['pt.patrol_mode','=',$mode];
-            $map[] =['pt.start_time','>=',$st];
-            $map[] =['pt.start_time','<=',$et];
-            $map= empty($map) ? true: $map;
-
-            $lists = Db::name('patrol_task_addr')
-                ->alias('pta')
-                ->join('patrol_task pt','pt.id=pta.patrol_task_id')
-                ->where($map)
-                ->field('pta.*,pt.patrol_mode')
-                ->limit($start,$length)
-                ->order('pta.id desc')
-                ->group('pta.address_id')
-                ->select();
+        $day = input('day',date('Y-m-d'),'trim');
+        $first = 1;
+        $w = date('w',strtotime($day));
+        $wst = date('Ymd',strtotime("$day -" . ($w ? $w - $first : 6) . ' days'));
+        $wet = date('Ymd',strtotime("$day +6 days"));
 
-            foreach ($lists as $k=>$v){
-                $lists[$k]['addr'] = Db::name('address')->where('id',$v['address_id'])->value('title');
-                $taskIds = Db::name('patrol_task_addr')->where('address_id',$v['address_id'])->column('patrol_task_id');
-                $lists[$k]['count'] = Db::name('patrol_task')
-                    ->whereIn('id',$taskIds)
-                    ->where('patrol_mode',$v['patrol_mode'])
-                    ->count();
-                $lists[$k]['num'] = Db::name('patrol_task')
-                    ->whereIn('id',$taskIds)
-                    ->where('patrol_mode',$v['patrol_mode'])
-                    ->where('create_yyyymm',date('Ym',strtotime($day)))
-                    ->count();
-                $lists[$k]['num1'] = Db::name('patrol_task')
-                    ->whereIn('id',$taskIds)
-                    ->where('patrol_mode',$v['patrol_mode'])
-                    ->where('create_yyyymmdd','>=',$wst)
-                    ->where('create_yyyymmdd','<=',$wet)
-                    ->count();
 
-                $lists[$k]['num2'] = Db::name('patrol_task')
-                    ->whereIn('id',$taskIds)
-                    ->where('patrol_mode',$v['patrol_mode'])
-                    ->where('create_yyyymmdd','=',date('Ymd',strtotime($day)))
-                    ->count();
+        $zuo = date('Ymd',strtotime($day)-86400);
+        $you = date('Ymd',strtotime($day)+86400);
 
-                $lists[$k]['num3'] = Db::name('patrol_task')
-                    ->whereIn('id',$taskIds)
-                    ->where('patrol_mode',$v['patrol_mode'])
-                    ->where('create_yyyymmdd','=',$zuo)
-                    ->where('status','in',[0,1,3,5,6])
-                    ->count();
+        $st = $day.' 00:00:00';
+        $et = $day.' 23:59:59';
+        $map[] = ['pt.org_id','=',$this->orgId];
+        $map[] =['pt.patrol_mode','=',$mode];
+        $map[] =['pt.start_time','>=',$st];
+        $map[] =['pt.start_time','<=',$et];
+        $map= empty($map) ? true: $map;
 
-                $lists[$k]['num4'] = Db::name('patrol_task')
-                    ->whereIn('id',$taskIds)
-                    ->where('patrol_mode',$v['patrol_mode'])
-                    ->where('create_yyyymmdd','=',date('Ymd',strtotime($day)))
-                    ->where('status','in',[0,1,3,5,6])
-                    ->count();
-            }
+        $lists = Db::name('patrol_task_addr')
+            ->alias('pta')
+            ->join('patrol_task pt','pt.id=pta.patrol_task_id')
+            ->where($map)
+            ->field('pta.*,pt.patrol_mode')
+            ->order('pta.id desc')
+            ->group('pta.address_id')
+            ->select();
 
-            $totalCount = Db::name('patrol_task_addr')
-                ->alias('pta')
-                ->join('patrol_task pt','pt.id=pta.patrol_task_id')
-                ->where($map)
-                ->field('pta.*,pt.patrol_mode')
-                ->order('pta.id desc')
-                ->group('pta.address_id')
+        foreach ($lists as $k=>$v){
+            $lists[$k]['addr'] = Db::name('address')->where('id',$v['address_id'])->value('title');
+            $taskIds = Db::name('patrol_task_addr')->where('address_id',$v['address_id'])->column('patrol_task_id');
+            $lists[$k]['count'] = Db::name('patrol_task')
+                ->whereIn('id',$taskIds)
+                ->where('patrol_mode',$v['patrol_mode'])
+                ->count();
+            $lists[$k]['num'] = Db::name('patrol_task')
+                ->whereIn('id',$taskIds)
+                ->where('patrol_mode',$v['patrol_mode'])
+                ->where('create_yyyymm',date('Ym',strtotime($day)))
+                ->count();
+            $lists[$k]['num1'] = Db::name('patrol_task')
+                ->whereIn('id',$taskIds)
+                ->where('patrol_mode',$v['patrol_mode'])
+                ->where('create_yyyymmdd','>=',$wst)
+                ->where('create_yyyymmdd','<=',$wet)
                 ->count();
 
-            $totalPage = ceil($totalCount/$length);
-            $result['page'] = $page;
-            $result['total'] = $totalPage;
-            $result['records'] = $totalCount;
-            $result['rows'] = $lists;
-            return json($result);
-        }else{
+            $lists[$k]['num2'] = Db::name('patrol_task')
+                ->whereIn('id',$taskIds)
+                ->where('patrol_mode',$v['patrol_mode'])
+                ->where('create_yyyymmdd','=',date('Ymd',strtotime($day)))
+                ->count();
 
-            $modeName = (new \app\common\model\PatrolAddrForm())->getModeTitle($mode);
+            $lists[$k]['num3'] = Db::name('patrol_task')
+                ->whereIn('id',$taskIds)
+                ->where('patrol_mode',$v['patrol_mode'])
+                ->where('create_yyyymmdd','=',$zuo)
+                ->where('status','in',[0,1,3,5,6])
+                ->count();
 
-            $this->assign('mode',$mode);
-            $this->assign('day',$day);
-            $this->assign('meta_title',$modeName.'地点工作量统计');
-            return $this->fetch();
+            $lists[$k]['num4'] = Db::name('patrol_task')
+                ->whereIn('id',$taskIds)
+                ->where('patrol_mode',$v['patrol_mode'])
+                ->where('create_yyyymmdd','=',date('Ymd',strtotime($day)))
+                ->where('status','in',[0,1,3,5,6])
+                ->count();
         }
 
+        $modeName = (new \app\common\model\PatrolAddrForm())->getModeTitle($mode);
 
+        $this->assign('data',$lists);
+        $this->assign('mode',$mode);
+        $this->assign('day',$day);
+        $this->assign('meta_title',$modeName.'地点工作量统计');
+        return $this->fetch();
     }
 
 
     public function addrWorkExport(){
-
-        $day = input('day',date('Y-m-d'),'trim');
         $mode = input('mode');
-
+        $day = input('day',date('Y-m-d'),'trim');
         $first = 1;
         $w = date('w',strtotime($day));
         $wst = date('Ymd',strtotime("$day -" . ($w ? $w - $first : 6) . ' days'));
@@ -1068,43 +1035,45 @@ class PatrolTask extends Auth
 
         foreach ($lists as $k=>$v){
             $lists[$k]['addr'] = Db::name('address')->where('id',$v['address_id'])->value('title');
+            $taskIds = Db::name('patrol_task_addr')->where('address_id',$v['address_id'])->column('patrol_task_id');
             $lists[$k]['count'] = Db::name('patrol_task')
-                ->where('id',$v['patrol_task_id'])
+                ->whereIn('id',$taskIds)
                 ->where('patrol_mode',$v['patrol_mode'])
                 ->count();
             $lists[$k]['num'] = Db::name('patrol_task')
-                ->where('id',$v['patrol_task_id'])
+                ->whereIn('id',$taskIds)
                 ->where('patrol_mode',$v['patrol_mode'])
                 ->where('create_yyyymm',date('Ym',strtotime($day)))
                 ->count();
             $lists[$k]['num1'] = Db::name('patrol_task')
-                ->where('id',$v['patrol_task_id'])
+                ->whereIn('id',$taskIds)
                 ->where('patrol_mode',$v['patrol_mode'])
                 ->where('create_yyyymmdd','>=',$wst)
                 ->where('create_yyyymmdd','<=',$wet)
                 ->count();
 
             $lists[$k]['num2'] = Db::name('patrol_task')
-                ->where('id',$v['patrol_task_id'])
+                ->whereIn('id',$taskIds)
                 ->where('patrol_mode',$v['patrol_mode'])
                 ->where('create_yyyymmdd','=',date('Ymd',strtotime($day)))
                 ->count();
 
             $lists[$k]['num3'] = Db::name('patrol_task')
-                ->where('id',$v['patrol_task_id'])
+                ->whereIn('id',$taskIds)
                 ->where('patrol_mode',$v['patrol_mode'])
                 ->where('create_yyyymmdd','=',$zuo)
                 ->where('status','in',[0,1,3,5,6])
                 ->count();
 
             $lists[$k]['num4'] = Db::name('patrol_task')
-                ->where('id',$v['patrol_task_id'])
+                ->whereIn('id',$taskIds)
                 ->where('patrol_mode',$v['patrol_mode'])
                 ->where('create_yyyymmdd','=',date('Ymd',strtotime($day)))
                 ->where('status','in',[0,1,3,5,6])
                 ->count();
         }
 
+
         $modeName = (new \app\common\model\PatrolAddrForm())->getModeTitle($mode);
 
 

application/admin/controller/Screen.php

@@ -44,7 +44,9 @@ class Screen extends Auth
             $nlist = [];
             foreach ($lists as $k=>$v){
                 if($v['type'] == 2){
-                    $lists[$k]['surl'] = $v['url'];
+//                    $lists[$k]['surl'] = $v['url'];
+                    $lists[$k]['surl'] = strstr($v['url'],'?') === false?$v['url'].'?token=':$v['url'].'&token=';
+                    $lists[$k]['surl'] .= think_encrypt($v['id'].'|'.$this->orgId);
                 }else if($v['type'] == 1){
                     if($v['org_id'] == 0){
                         $lists[$k]['surl'] = config('app.screen_url').'/home?token='.think_encrypt($v['id'].'|'.$this->orgId);
@@ -114,4 +116,4 @@ class Screen extends Auth
     }
 
 
-}
+}

application/admin/controller/Todo.php

@@ -306,7 +306,7 @@ class Todo extends Auth
             $meta_title = '运送' . $meta_title;
         }
         elseif ($mode == 4) {
-            $meta_title = '应急' . $meta_title;
+            $meta_title = '安保' . $meta_title;
         }
         elseif ($mode == 15) {
             $meta_title = '品质整改' . $meta_title;

application/admin/controller/UserStatistics.php

@@ -106,7 +106,7 @@ class UserStatistics extends Auth {
             ->setCellValue('C1', '报修')
             ->setCellValue('D1', '保洁')
             ->setCellValue('E1', '运送')
-            ->setCellValue('F1', '应急');
+            ->setCellValue('F1', '安保');
         // 设置表格头水平居中
         $objPHPExcel->setActiveSheetIndex(0)->getStyle('A1')->getAlignment()
             ->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);

application/admin/view/app_icon/add.html

@@ -60,13 +60,6 @@
                     </div>
 
                     <div class="form-group">
-                        <label class="col-sm-2 control-label">图标<span class="text-danger">*</span></label>
-                        <div class="col-sm-6">
-                            {:widget_view('common/upimg',['name'=>'path','multi'=>0,'val'=>isset($info)?$info['path']:''])}
-                        </div>
-                    </div>
-
-                    <div class="form-group">
                         <label class="col-sm-2 control-label">状态</label>
                         <div class="col-sm-6">
                             <label class="cr-inline">
@@ -78,6 +71,14 @@
                         </div>
                     </div>
                     {/if}
+
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">图标<span class="text-danger">*</span></label>
+                        <div class="col-sm-6">
+                            {:widget_view('common/upimg',['name'=>'path','multi'=>0,'val'=>isset($info)?$info['path']:''])}
+                        </div>
+                    </div>
+
                     <div class="hr-line-dashed"></div>
                     <div class="form-group">
                         <div class="col-sm-6 col-sm-offset-2">

application/admin/view/cockpit_statistics/index.html

@@ -145,7 +145,7 @@
                             <option value="1">维修</option>
                             <option value="2">保洁</option>
                             <option value="3">运送</option>
-                            <option value="4">应急</option>
+                            <option value="4">安保</option>
                         </select>
                     </div>
                     <div class="main2-left-top-body" id="workMode1">
@@ -174,7 +174,7 @@
                                 <option value="1">维修</option>
                                 <option value="2">保洁</option>
                                 <option value="3">运送</option>
-                                <option value="4">应急</option>
+                                <option value="4">安保</option>
                             </select>
                         </div>
                     </div>

application/admin/view/common/laydate.html

@@ -17,7 +17,7 @@
             type: "{$type|default='date'}", // year=年选择器 month=年月选择器 date=日期选择器 time=时间选择器 datetime=日期时间选择器
             format: "{$format|default='yyyy-MM-dd'}", // yyyy-MM-dd HH:mm:ss
             trigger: 'click',
-            theme: '#387AFF',
+            theme: '#284a94',
         });
     });
 </script>

application/admin/view/common/laydatetime.html

@@ -1,9 +1,9 @@
 <style>
     .layui-laydate-footer span:hover {
-        color: #387AFF;
+        color: #284a94;
     }
     .layui-laydate-footer span[lay-type=date] {
-        color: #387AFF;
+        color: #284a94;
     }
 </style>
 {notempty name="title"}

application/admin/view/company_goods/qrcode.html

@@ -59,7 +59,7 @@
                             }
                         </style>
                         <div class="pbox">
-                            <img src="/admin/img/goods_card.jpg" width="300"  alt="">
+                            <img src="/admin/img/goods_card.png" width="300"  alt="">
                             <img class="qrimg" src="{:url('Qrcode/qrcode',[],'')}?code={$code}" alt="">
                             <h5 class="ptitle">{$info.title}</h5>
                             <h5 class="pbrand">{$info.brand}</h5>

application/admin/view/device_record/export.html

@@ -22,14 +22,14 @@
                     <div class="form-group">
                         <label class="col-sm-1 control-label">开始日期</label>
                         <div class="col-sm-6">
-                            <input id="Ymd" readonly class="form-control" name="start" value="">
+                            {:widget_view('common/laydate',['name'=>'start'])}
                         </div>
                     </div>
 
                     <div class="form-group">
                         <label class="col-sm-1 control-label">结束日期</label>
                         <div class="col-sm-6">
-                            <input id="Ymd1" readonly class="form-control" name="end" value="">
+                            {:widget_view('common/laydate',['name'=>'end'])}
                         </div>
                     </div>
 
@@ -59,14 +59,14 @@
         showBottom: false,
         trigger: 'click' ,
         format:'yyyyMMdd',
-        value:dateFormat()
+        // value:dateFormat()
     });
     laydate.render({
         elem: '#Ymd1',
         showBottom: false,
         trigger: 'click' ,
         format:'yyyyMMdd',
-        value:dateFormatH()
+        // value:dateFormatH()
     });
     //当前日期格式化
     function dateFormat() {

application/admin/view/index/def_copy.html

@@ -165,7 +165,7 @@
                         <span class="tab-list {if($mode==1)}cur{/if}" data-mode="1" onclick="modeTodoClick(this)">报修工单列表</span>
                         <span class="tab-list {if($mode==2)}cur{/if}" data-mode="2" onclick="modeTodoClick(this)">保洁工单列表</span>
                         <span class="tab-list {if($mode==3)}cur{/if}" data-mode="3" onclick="modeTodoClick(this)">运送工单列表</span>
-                        <span class="tab-list {if($mode==4)}cur{/if}" data-mode="4" onclick="modeTodoClick(this)">应急工单列表</span>
+                        <span class="tab-list {if($mode==4)}cur{/if}" data-mode="4" onclick="modeTodoClick(this)">安保工单列表</span>
                     </div>
                     <div class="main3-left-body">
                         <table id="table" style="border-collapse: collapse"></table>

application/admin/view/index/index.html

@@ -492,7 +492,7 @@
                                 </a>
                             </div>
                             <div class="col-xs-12" style="padding: 0 5px!important;">
-                                <a href="">
+                                <a href="http://gyjk.jya-tech.com/admin/camera/index.html" target="_blank">
                                     <div class="tj-info2">
                                         视频监控
                                     </div>

application/admin/view/index/indexsub.html

@@ -846,6 +846,9 @@
 
                         }
 
+                    }else{
+                        menuurl2 = submenus[0].url;
+                        firstmenuid = submenus[0].id;
                     }
                 }
 

application/admin/view/index/indexsub1.html

@@ -825,6 +825,9 @@
                                 }
                             }
 
+                        }else{
+                            menuurl2 = submenus[0].url;
+                            firstmenuid = submenus[0].id;
                         }
                     }
 
@@ -876,10 +879,11 @@
             var menusublist = [];
             var menuurl2 = '';
             var firstmenuid = '';
+            console.log(menuId);
+            console.log(submenus);
             for (let i in submenus){
                 if(menuId == submenus[i].id){
                     menusublist.push(submenus[i]);
-                    // menusublist = submenus[i].child;
                     let submenulistaa = submenus[i].child;
                     if(submenulistaa.length >0){
                         for (let a in submenulistaa){
@@ -893,7 +897,9 @@
                                 }
                             }
                         }
-
+                    }else{
+                        menuurl2 = submenus[0].url;
+                        firstmenuid = submenus[0].id;
                     }
                 }
 

application/admin/view/meeting_apply/calendar.html

@@ -42,7 +42,11 @@
         <div class="row">
 
             <div class="col-xs-8">
-                <a href="{:url('index')}" class="btn btn-sm btn-warning">表格显示</a>
+                {if $meetingId >0}
+                <a href="{:url('MeetingRoom/index')}" class="btn btn-sm btn-warning">表格显示</a>
+                {else /}
+                <a href="{:url('MeetingApply/index')}" class="btn btn-sm btn-warning">表格显示</a>
+                {/if}
             </div>
         </div>
     </div>

application/admin/view/order_statistics/repair_cate.html

@@ -17,7 +17,7 @@
             <div class="col-xs-3">
                 <div class="btn-group pull-left">
                     <a href="javascript:;" onclick="printer()" class="btn btn-sm btn btn-primary"><i class="glyphicon glyphicon-print"></i> 打印</a>
-                    <a href="{:url('repairItemsExport',['start'=>$start,'end'=>$end])}" class="btn btn-sm btn-danger"><i class="fa fa-cloud-download"> 导出</i></a>
+                    <a href="{:url('repairCateExport',['start'=>$start,'end'=>$end])}" class="btn btn-sm btn-danger"><i class="fa fa-cloud-download"> 导出</i></a>
                 </div>
             </div>
             <div class="col-xs-9" style="text-align: right;">
@@ -32,7 +32,7 @@
 
                     <div class="input-group">
                         <span class="input-group-btn">
-                        <button class="btn-sm btn-primary" type="button" id ="search-btn" ><i class="fa fa-search"></i></button>
+                       <button class="btn-sm btn-primary" type="submit" id ="search-btn" ><i class="fa fa-search"></i></button>
                     </span> &nbsp;
                         <span class="input-group-btn">
                         <button class="btn-sm btn-warning" type="button" id="search-clear"><i class="fa fa-undo"></i></button>
@@ -42,12 +42,30 @@
             </div>
         </div>
     </div>
-    <div class="ibox-content">
-        <div class="jqGrid_wrapper" id="printer">
-            <table id="table" style="border-collapse: collapse"></table>
-            <div id="pager"></div>
+    <div class="panel-group" id="printer" style="margin-top: 10px">
+        <div class="panel panel-default">
+            <div class="panel-body">
+                <table class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th>报修类型</th>
+                        <th>订单数</th>
+                    </tr>
+                    </thead>
+
+                    {foreach $data as $k=>$v}
+                    <tbody>
+                    <tr>
+                        <td>{$v.title}</td>
+                        <td>{$v.nums}</td>
+                    </tr>
+                    </tbody>
+                    {/foreach}
+                </table>
+            </div>
+
+
         </div>
-        <!--        <div class="combined">合计：</div>-->
     </div>
 </div>
 {/block}
@@ -74,37 +92,7 @@
         $('#printer').jqprint();
     }
 
-    $(function () {
-        $(window).bind("resize",function(){
-            var width=$(".jqGrid_wrapper").width();
-            $("#table").setGridWidth(width);
-        });
-
-        $.jgrid.defaults.styleUI="Bootstrap";
-        $("#table").jqGrid({
-            url:"{:url('repairCate')}",
-            datatype: "json",
-            colModel:[
-                {label:'报修类型',name:'title',index:'title', width:80,sortable: false},
-                {label:'订单数',name:'nums',index:'nums', width:80,sortable: false},
-            ],
 
-            sortname: 'id',
-            viewrecords: true,
-            autowidth:true,
-            mtype: 'post',
-            height: 'auto',
-            emptyrecords: "暂无数据",
-            sortorder: "asc",
-            caption:"报修类型统计报表",
-            loadComplete: function (xhr) {
-                if(xhr.code==0){
-                    layer.msg(xhr.msg);
-                    return false;
-                }
-            },
-        });
-    });
 
 
 </script>

application/admin/view/orders/index.html

@@ -65,7 +65,7 @@
                             <option value="4">报修</option>
                             <option value="5">保洁</option>
                             <option value="6">运送</option>
-                            <option value="7">应急</option>
+                            <option value="7">安保</option>
                             <option value="2">隐患</option>
                             <option value="3">投诉</option>
                         </select>
@@ -100,7 +100,7 @@
         <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/1" data-title="创建报修订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建报修订单</a>
         <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/2" data-title="创建保洁订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建保洁订单</a>
         <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/3" data-title="创建运送订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建运送订单</a>
-        <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/4" data-title="创建应急订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建应急订单</a>
+        <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/4" data-title="创建安保订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建安保订单</a>
 
     </div>
     {/if}

application/admin/view/orders/index0.html

@@ -52,7 +52,7 @@
                             <option value="4">报修</option>
                             <option value="5">保洁</option>
                             <option value="6">运送</option>
-                            <option value="7">应急</option>
+                            <option value="7">安保</option>
                             <option value="2">隐患</option>
                             <option value="3">投诉</option>
                         </select>
@@ -95,7 +95,7 @@
         <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/3" data-title="创建运送订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建运送订单</a>
         {/if}
         {if condition="in_array(4,$auths)"}
-        <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/4" data-title="创建应急订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建应急订单</a>
+        <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/4" data-title="创建安保订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建安保订单</a>
         {/if}
         {if condition="in_array(0,$auths)"}
         <a href="javascript:;" url="{:url('dispatchAdd',[],'')}/mode/0" data-title="创建一键呼叫订单" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">创建一键呼叫订单</a>

application/admin/view/orders/index1.html

@@ -59,7 +59,7 @@
                             <option value="4">报修</option>
                             <option value="5">保洁</option>
                             <option value="6">运送</option>
-                            <option value="7">应急</option>
+                            <option value="7">安保</option>
                             <option value="2">隐患</option>
                             <option value="3">投诉</option>
                         </select>

application/admin/view/orders/index3.html

@@ -48,7 +48,7 @@
                             <option value="4">报修</option>
                             <option value="5">保洁</option>
                             <option value="6">运送</option>
-                            <option value="7">应急</option>
+                            <option value="7">安保</option>
                             <option value="2">隐患</option>
                             <option value="3">投诉</option>
                         </select>

application/admin/view/orders/phone.html

@@ -48,7 +48,7 @@
         }else if(mode == 3){
             title = '添加运送';
         }else if(mode == 4){
-            title = '添加应急';
+            title = '添加安保';
         }else{
             title = '添加';
         }

application/admin/view/orders/phone_add.html

@@ -53,7 +53,7 @@
         }else if(mode == 3){
             title = '添加运送';
         }else if(mode == 4){
-            title = '添加应急';
+            title = '添加安保';
         }else{
             title = '添加';
         }

application/admin/view/org/add.html

@@ -48,6 +48,19 @@
                     </div>
                     {/if}
 
+                    {if isset($infotype) && $infotype == 1}
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">城市</label>
+                        <div class="col-sm-6">
+                            <select name="city_id" class="form-control">
+                                <option value="0">选择城市</option>
+                                {foreach $city as $k=>$v}
+                                <option value="{$v.id}">{$v.title}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                    {/if}
 
                     <div class="hr-line-dashed"></div>
                     <div class="form-group">
@@ -68,4 +81,4 @@
     });
 
 </script>
-{/block}
+{/block}

application/admin/view/org/edit.html

@@ -48,6 +48,7 @@
                         </div>
                     </div>
 
+
                     {if condition="$t == 2"}
                     <div class="form-group">
                         <label class="col-sm-2 control-label">地图标注</label>
@@ -56,6 +57,21 @@
                         </div>
                     </div>
                     {/if}
+
+                    {if isset($infotype) && $infotype == 2}
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">城市</label>
+                        <div class="col-sm-6">
+                            <select name="city_id" class="form-control">
+                                <option value="0">选择城市</option>
+                                {foreach $city as $k=>$v}
+                                <option value="{$v.id}">{$v.title}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                    {/if}
+
                     <div class="hr-line-dashed"></div>
                     <div class="form-group">
                         <div class="col-sm-6 col-sm-offset-2">
@@ -73,6 +89,8 @@
     $(document).ready(function(){
         formSetValue("enable", {$info.enable|default=1});
     });
-
+    $(document).ready(function(){
+        formSetValue("city_id", {$info.city_id|default=0});
+    });
 </script>
 {/block}

application/admin/view/patrol_statistics/patrol.html

@@ -28,7 +28,7 @@
         <div class="panel panel-default">
             <div class="panel-heading clearfix">
                 <div class="btn-group pull-left">
-                    {if $type==1}巡更{/if}{if $type==2}巡检{/if}{if $type==3}巡视{/if}{if $type==4}巡查{/if} 工作量统计分析
+                    {if $type==1}巡更{/if}{if $type==2}巡视{/if}{if $type==3}巡查{/if}{if $type==4}巡检{/if} 工作量统计分析
                 </div>
                 <div class="btn-group pull-right">
                     <a href="javascript:;" onclick="printer()" class="btn btn-sm btn btn-primary"><i class="glyphicon glyphicon-print"></i>打印</a>

application/admin/view/patrol_task/addr_work.html

@@ -22,12 +22,12 @@
                         <span class="input-group-btn">
                             <button class="btn-sm btn-warning" type="reset" id="search-clear" onclick="empty_search()"><i class="fa fa-undo"></i></button>
                         </span> &nbsp;
-<!--                        <span class="input-group-btn">-->
-<!--                            <button class="btn-sm btn-info" type="button" onclick="printer()"><i class="glyphicon glyphicon-print"></i>打印</button>-->
-<!--                        </span> &nbsp;-->
-                        <span class="input-group-btn">
-                            <button class="btn-sm btn-danger" type="button" onclick="exportExcel()"><i class="glyphicon glyphicon-download"></i>导出</button>
-                        </span>
+                        <!--                        <span class="input-group-btn">-->
+                        <!--                            <button class="btn-sm btn-info" type="button" onclick="printer()"><i class="glyphicon glyphicon-print"></i>打印</button>-->
+                        <!--                        </span> &nbsp;-->
+                        <!--                        <span class="input-group-btn">-->
+                        <!--                            <button class="btn-sm btn-danger" type="button" onclick="exportExcel()"><i class="glyphicon glyphicon-download"></i>导出</button>-->
+                        <!--                        </span>-->
                     </div>
                 </form>
             </div>
@@ -35,10 +35,45 @@
     </div>
 
 
-    <div class="ibox-content">
-        <div class="jqGrid_wrapper">
-            <table id="table" style="border-collapse: collapse"></table>
-            <div id="pager"></div>
+    <div class="panel-group">
+        <div class="panel panel-default">
+            <div class="panel-heading clearfix">
+                <div class="btn-group pull-left">
+                    {$meta_title}
+                </div>
+                <div class="btn-group pull-right">
+                    <a href="javascript:;" onclick="printer()" class="btn btn-sm btn btn-primary"><i class="glyphicon glyphicon-print"></i>打印</a>
+                    <a href="javascript:;" onclick="exportExcel()" class="btn btn-success btn-sm"><i class="glyphicon glyphicon-download"></i>导出</a>
+                </div>
+            </div>
+            <div class="panel-body" id="printer">
+                <table class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th>地点</th>
+                        <th>总数</th>
+                        <th>本月</th>
+                        <th>本周</th>
+                        <th>今天</th>
+                        <th>昨日未完成</th>
+                        <th>今日未完成</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {foreach $data as $k=>$v}
+                    <tr>
+                        <td>{$v['addr']}</td>
+                        <td>{$v['count']}</td>
+                        <td>{$v['num']}</td>
+                        <td>{$v['num1']}</td>
+                        <td>{$v['num2']}</td>
+                        <td>{$v['num3']}</td>
+                        <td>{$v['num4']}</td>
+                    </tr>
+                    {/foreach}
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
 
@@ -49,50 +84,6 @@
 <script src="/static/jquery.jqprint-0.3.js"></script>
 <script>
 
-    $(function () {
-
-        $(window).bind("resize",function(){
-            var width=$(".jqGrid_wrapper").width();
-            $("#table").setGridWidth(width);
-        });
-
-        $.jgrid.defaults.styleUI="Bootstrap";
-        $("#table").jqGrid({
-            url:"{:url('addrWork',['mode'=>$mode])}",
-            datatype: "json",
-            colModel:[
-                {label:'地点',name:'addr',index:'addr', width:100,sortable: false},
-                {label:'总数',name:'count',index:'count', width:60,sortable: false},
-                {label:'本月',name:'num',index:'num', width:60,sortable: false},
-                {label:'本周',name:'num1',index:'num1', width:60,sortable: false},
-                {label:'今天',name:'num2',index:'num2', width:60,sortable: false},
-                {label:'昨日未完成',name:'num3',index:'num3', width:60,sortable: false},
-                {label:'今日未完成',name:'num4',index:'num4', width:60,sortable: false},
-
-            ],
-            rowNum:10,
-            rowList:[10,20,30,50,100],
-            pager: '#pager',
-            sortname: 'id',
-            viewrecords: true,
-            autowidth:true,
-            mtype: 'post',
-            height: 'auto',
-            emptyrecords: "暂无数据",
-            sortorder: "desc",
-            caption:"{$meta_title}",
-            loadComplete: function (xhr) {
-                if(xhr.code==0){
-                    layer.msg(xhr.msg);
-                    return false;
-                }
-            },
-        });
-
-
-
-
-    });
 
     function empty_search(){
         window.location.href = "{:url('addrWork')}?mode={$mode}";

application/admin/view/phone_monitor/show_old.html

@@ -225,7 +225,7 @@
                 str += '<a  href="javascript:;" data-title="创建报修订单" onclick="layer_open(this,1)" url="{:url("Orders/dispatchAdd",[],"")}/mode/1?id='+slist[o].id+'">报修</a> &nbsp;&nbsp;';
                 str += '<a href="javascript:;" data-title="创建保洁订单" onclick="layer_open(this,1)" url="{:url("Orders/dispatchAdd",[],"")}/mode/2?id='+slist[o].id+'">保洁</a> &nbsp;&nbsp;';
                 str += '<a href="javascript:;" data-title="创建运送订单" onclick="layer_open(this,1)" url="{:url("Orders/dispatchAdd",[],"")}/mode/3?id='+slist[o].id+'">运送</a> &nbsp;&nbsp;';
-                str += '<a href="javascript:;" data-title="创建应急订单" onclick="layer_open(this,1)" url="{:url("Orders/dispatchAdd",[],"")}/mode/4?id='+slist[o].id+'">应急</a> &nbsp;&nbsp;';
+                str += '<a href="javascript:;" data-title="创建安保订单" onclick="layer_open(this,1)" url="{:url("Orders/dispatchAdd",[],"")}/mode/4?id='+slist[o].id+'">安保</a> &nbsp;&nbsp;';
                 str += '</td>';
                 str += '</tr>';
             }

application/admin/view/todo/index.html

@@ -57,7 +57,7 @@
                             <option value="4">报修</option>
                             <option value="5">保洁</option>
                             <option value="6">运送</option>
-                            <option value="7">应急</option>
+                            <option value="7">安保</option>
                             <option value="2">隐患</option>
                             <option value="3">投诉</option>
                         </select>

application/admin/view/todo/index0.html

@@ -30,7 +30,7 @@
                             {if condition="in_array(1,$auths)"}<option value="1">报修</option>{/if}
                             {if condition="in_array(2,$auths)"}<option value="2">保洁</option>{/if}
                             {if condition="in_array(3,$auths)"}<option value="3">运送</option>{/if}
-                            {if condition="in_array(4,$auths)"}<option value="4">应急</option>{/if}
+                            {if condition="in_array(4,$auths)"}<option value="4">安保</option>{/if}
                             {if condition="in_array(0,$auths)"}<option value="0">一键呼叫</option>{/if}
                         </select>
                     </div>
@@ -52,7 +52,7 @@
                             <option value="4">报修</option>
                             <option value="5">保洁</option>
                             <option value="6">运送</option>
-                            <option value="7">应急</option>
+                            <option value="7">安保</option>
                             <option value="2">隐患</option>
                             <option value="3">投诉</option>
                         </select>

application/admin/view/todo/index1.html

@@ -42,7 +42,7 @@
                             <option value="4">报修</option>
                             <option value="5">保洁</option>
                             <option value="6">运送</option>
-                            <option value="7">应急</option>
+                            <option value="7">安保</option>
                             <option value="2">隐患</option>
                             <option value="3">投诉</option>
                         </select>

application/admin/view/todo/index3.html

@@ -42,7 +42,7 @@
                             <option value="4">报修</option>
                             <option value="5">保洁</option>
                             <option value="6">运送</option>
-                            <option value="7">应急</option>
+                            <option value="7">安保</option>
                             <option value="2">隐患</option>
                             <option value="3">投诉</option>
                         </select>

application/admin/view/user_statistics/org_order.html

@@ -44,7 +44,7 @@
                         <th>报修</th>
                         <th>保洁</th>
                         <th>运送</th>
-                        <th>应急</th>
+                        <th>安保</th>
                     </tr>
                     </thead>
                     <tbody>

application/admin/view/wash_record/index.html

@@ -99,7 +99,7 @@
                             return '';
                         }
                     }},
-                {label:'签名',name:'sign',index:'sign',width:40,editable: false,sortable: false,formatter: function (a, b, c) {
+                {label:'确认签名',name:'sign',index:'sign',width:40,editable: false,sortable: false,formatter: function (a, b, c) {
                         if(a){
                             return '<img src="'+a+'" width="40" onclick="open_img(this)"></img>';
 

application/api/controller/screen/Order.php

@@ -16,7 +16,7 @@ class Order extends Index
             ['id' => 1, 'name' => '报修', 'finish' => 0, 'total' => 0, 'bl' => 0],
             ['id' => 2, 'name' => '保洁', 'finish' => 0, 'total' => 0, 'bl' => 0],
             ['id' => 3, 'name' => '运送', 'finish' => 0, 'total' => 0, 'bl' => 0],
-            ['id' => 4, 'name' => '应急', 'finish' => 0, 'total' => 0, 'bl' => 0]
+            ['id' => 4, 'name' => '安保', 'finish' => 0, 'total' => 0, 'bl' => 0]
         ];
         $curTime = date('Ymd');
         $total = 0;

application/api/controller/screen/Weather.php

@@ -13,18 +13,15 @@ class Weather extends Controller
 //根据ip 获取城市
     public function address() {
         $getIp = request()->ip();//获取真实IP
-        $url = "http://apis.juhe.cn/ip/ipNewV3";
-        $param = [
-            "key" => "40d20d107ede1653b5c3260d639362e3",
-            "ip" => $getIp
-        ];
-        $content = $this->juheHttpRequest($url,$param);
+        // $getIp = '120.46.129.222';//获取真实IP
+        $content = file_get_contents("http://apis.juhe.cn/ip/ipNewV3?key=dd24ed2a3ba02ca20d6eec1d6175cb7c&ip={$getIp}");
         $address = json_decode($content);
         $address = $address->result;
 
         $return['province'] = $address->Province;//省份
         $return['city'] = $address->City;//城市
-        $return['district'] = $address->District;//区
+        $return['district'] = $address->District;//城市
+
         return $return;
     }
     //根据城市获取当天天气
@@ -57,7 +54,7 @@ class Weather extends Controller
                 'city'=>$addr['city'],
                 'direct'=>$result['result']['realtime']['info'],
                 'temperature'=>$temperature,
-                'img'=>request()->domain().'/admin/weather/'.$wid.'.png',
+                'img'=>getSite().'/admin/weather/'.$wid.'.png',
             ];
 
         }

application/api/controller/v1/MateGoods.php

@@ -239,7 +239,7 @@ class MateGoods extends Base
             ->where('c.del',0)
             ->where('c.org_id',$this->orgId)
             ->where('b.id',$goods['id'])
-            ->field('a.*,b.title,b.unit,b.brand,b.spec')
+            ->field('a.*,b.title,b.unit,b.brand,b.spec,c.id as dispatch_id')
             ->select();
         foreach ($rk as $k=>$v){
             $dispatch =  Db::name('mate_apply')
@@ -262,7 +262,7 @@ class MateGoods extends Base
             ->where('c.del',0)
             ->where('c.org_id',$this->orgId)
             ->where('b.id',$goods['id'])
-            ->field('a.*,b.title,b.unit,b.brand,b.spec')
+            ->field('a.*,b.title,b.unit,b.brand,b.spec,c.id as dispatch_id')
             ->select();
         foreach ($ck as $k=>$v){
             $dispatch =  Db::name('mate_apply')

application/api/controller/v1/Orders.php

@@ -196,7 +196,7 @@ class Orders extends Base {
             1 => '报修工单',
             2 => '保洁工单',
             3 => '运送工单',
-            4 => '应急工单',
+            4 => '安保工单',
             15 => '品质整改',
             0 => '一键呼叫',
         ];

application/common.php

@@ -1567,3 +1567,56 @@ function get_week_txt($day){
     }
     return '';
 }
+
+/**
+ * 连接国天sp数据库
+ * @param string $name
+ * @return \think\db\Query
+ */
+function gtspdb($name = ''){
+    $config = config('database.db_config_gt_sp');
+    return \db($name,$config,false);
+}
+
+/**
+ * 连接霸洁云数据库
+ * @param string $name
+ * @return \think\db\Query
+ */
+function bjydb($name = ''){
+    $config = config('database.db_config_bjy');
+    return \db($name,$config,false);
+}
+/**
+ * 连接新城域数据库
+ * @param string $name
+ * @return \think\db\Query
+ */
+function xcydb($name = ''){
+    $config = config('database.db_config_xcy');
+    return \db($name,$config,false);
+}
+/**
+ * 秒数格式化
+ * @param $diff
+ * @return string
+ */
+function second_to_str($diff){
+    if($diff <= 0){
+        return '0秒';
+    }
+    $days = floor(($diff )/ (60*60*24));
+    $hours = floor(($diff - $days*60*60*24)  / (60*60));
+    $minutes = floor(($diff - $days*60*60*24  - $hours*60*60)/ 60);
+    $seconds = floor(($diff - $days*60*60*24  - $hours*60*60 - $minutes*60));
+    if ($diff < 60) {
+        $time_cost = $seconds."秒";
+    } else if ($diff >= 60 && $diff < 60*60) {
+        $time_cost = $minutes."分钟".$seconds."秒";
+    } else if ($diff >= 60*60 && $diff < 60*60*24) {
+        $time_cost = $hours."小时".$minutes."分钟".$seconds."秒";
+    } else {
+        $time_cost = $days."天".$hours."小时".$minutes."分钟".$seconds."秒";
+    }
+    return $time_cost;
+}

application/common/model/Comment.php

@@ -119,7 +119,7 @@ class Comment extends Base
             $ret['description']='运送工作评价';
         }
         if($ret['type']==4){
-            $ret['description']='应急工作评价';
+            $ret['description']='安保工作评价';
         }
         if($ret['type']==15){
             $ret['description']='品质整改工作评价';

application/common/model/DeviceTask.php

@@ -523,9 +523,11 @@ class DeviceTask extends Base {
         return true;
     }
     public function batchDel($orgId,$userId){
+
         $data = request()->post();
         $minmonth = date('Y-m');
-        if($minmonth >= $data['from']){
+
+        if($minmonth <= $data['from']){
             $this->error = '当月任务不能删除';
             return false;
         }
@@ -545,6 +547,7 @@ class DeviceTask extends Base {
             ->where('dt.del',0)
             ->where('dt.create_yyyymm',date('Ym',strtotime($data['from'].'-01')))
             ->column('dt.id');
+
         Db::startTrans();
         try{
             $default['del'] = 1;

application/common/model/Menu.php

@@ -170,6 +170,8 @@ class Menu extends Base
         $map[] = ['enable','=',1];
         $map[] = ['del','=',0];
         $map[] = ['is_btn','=',0];
+
+
         if($rolesId == 1){ // 超级管理员
 
         }else if($rolesId == 2){ //总公司管理员
@@ -222,4 +224,65 @@ class Menu extends Base
     }
 
 
+    // 根据角色和组织获取用户菜单项
+    public function getMenuTree2($rolesId,$orgId,$search,$pid=0){
+        $map[] = ['enable','=',1];
+        $map[] = ['del','=',0];
+        $map[] = ['is_btn','=',0];
+
+        if($pid == 500){
+            $map[] = ['pid','=',500];
+        }
+        if($rolesId == 1){ // 超级管理员
+
+        }else if($rolesId == 2){ //总公司管理员
+            $auths = model('Org')->getOrgAuths($orgId,1);
+            if($auths){
+                $map[] = ['id','in',$auths];
+            }else{
+                $map[] = ['id','=',0];
+            }
+        }else{ // 项目管理员
+            $auths = model('Roles')->getRolesAuths($rolesId,1);
+            if($auths){
+                $map[] = ['id','in',$auths];
+            }else{
+                $map[] = ['id','=',0];
+            }
+        }
+        if($rolesId!=1){
+            /*3.只有admin管理员可见
+            系统设置： 菜单管理、配置管理、安卓版本管理、苹果版本管理、
+            模块管理、这些项目，在权限分配里面就不要出现了，不需要分配*/
+            $map[] = ['id','not in',[37,38,39,47,48]];
+        }
+
+        if($search !=''){
+            $map[] = ['title','like','%'.$search.'%'];
+        }
+
+        $lists = Db::name('menu')
+            ->where($map)
+            ->field('id,title,url,icons,pid')
+            ->order('sort asc,id asc')
+            ->fetchSql()
+            ->select();
+        halt($lists);
+        $lists = $lists?$lists:[];
+//        $first = [
+//            'id' => -1,
+//            'title' => '系统首页',
+//            'url' => $this->getNavUrl('Index/def'),
+//            'icons' => 'fa fa-home',
+//            'pid' => 0,
+//        ];
+//        $arr[] = $first;
+        $arr = [];
+        foreach ($lists as $k=>$v){
+            $v['url'] = $this->getNavUrl($v['url']);
+            $arr[] = $v;
+        }
+//        $tree = list_to_tree($arr, 'pid', 'child');
+        return $arr;
+    }
 }

application/common/model/TodoConvey.php

@@ -46,7 +46,7 @@ class TodoConvey extends Base
             }
             if($data['isStart'] == 1 && $todo['work_type_mode'] == 3){
                 // 判断是不是病人运送
-                $convey = Db::name('order_convey')
+             /*   $convey = Db::name('order_convey')
                     ->alias('a')
                     ->join('convey_cate b','a.type = b.id')
                     ->where('a.order_id',$todo['order_id'])
@@ -59,7 +59,7 @@ class TodoConvey extends Base
                         $this->error = '存在途经点未扫码，请确认';
                         return false;
                     }
-                }
+                }*/
             }
         }else{
             if($data['code']){

application/h5/controller/Repair.php

@@ -161,7 +161,7 @@ class Repair extends Controller
         }elseif ($mode == 2){
             $title = '保洁';
         }elseif ($mode == 4){
-            $title = '应急';
+            $title = '安保';
         }elseif($mode == 0){
             $title = '投诉';
         }

application/h5/controller/Statistics.php

@@ -170,7 +170,7 @@ class Statistics extends Controller
             ['work_type_mode'=> 1,'name'=>'报修'],
             ['work_type_mode'=> 2,'name'=>'保洁'],
             ['work_type_mode'=> 3,'name'=>'运送'],
-            ['work_type_mode'=> 4,'name'=>'应急'],
+            ['work_type_mode'=> 4,'name'=>'安保'],
             ['work_type_mode'=> 15,'name'=>'品质整改']
         ];
         $list = [];

application/h5/view/repair/index.html

@@ -51,7 +51,7 @@
                 <div class="col-xs-4">
                     <div class="module-info" onclick="goAdd(4)">
                         <img src="/repair/img/yingji.png" alt="">
-                        <div class="name">应急</div>
+                        <div class="name">安保</div>
                     </div>
                 </div>
                 <div class="col-xs-4">

application/h5/view/statistics/comment_list.html

@@ -128,7 +128,7 @@
             {elseif($v['type'] == 3) }
             <div class="comment-info-title">运送</div>
             {elseif($v['type'] == 4 )}
-            <div class="comment-info-title">应急</div>
+            <div class="comment-info-title">安保</div>
             {elseif($v['type'] == 15) }
             <div class="comment-info-title">品质整改</div>
             {else}
@@ -218,7 +218,7 @@
                                         result +='<div class="comment-info-title">运送</div>';
                                     }
                                     if(data[i].type==4){
-                                        result +='<div class="comment-info-title">应急</div>';
+                                        result +='<div class="comment-info-title">安保</div>';
                                     }
                                     if(data[i].type==15){
                                         result +='<div class="comment-info-title">品质整改</div>';

application/h5/view/statistics/orders_list.html

@@ -148,7 +148,7 @@
                 {elseif($v['work_type_mode']) == 3}
                 <text class="order-title-left">{$v['dep_name']}运送订单</text>
                 {elseif($v['work_type_mode']) == 4}
-                <text class="order-title-left">{$v['dep_name']}应急订单</text>
+                <text class="order-title-left">{$v['dep_name']}安保订单</text>
                 {elseif($v['work_type_mode']) == 15}
                 <text class="order-title-left">{$v['dep_name']}品质整改订单</text>
                 {/if}
@@ -256,7 +256,7 @@
                                         result +='<text class="order-title-left">'+data[i].dep_name+'运送订单</text>';
                                     }
                                     if(data[i].work_type_mode ==4){
-                                        result +='<text class="order-title-left">'+data[i].dep_name+'应急订单</text>';
+                                        result +='<text class="order-title-left">'+data[i].dep_name+'安保订单</text>';
                                     }
                                     if(data[i].work_type_mode ==15){
                                         result +='<text class="order-title-left">'+data[i].dep_name+'品质整改订单</text>';

config/app.php

@@ -239,7 +239,7 @@ return [
         ],
     ],
 
-    'weather_key'=>'125cc579816bceb875b413794c2b13d4',//获取聚合天气接口的key
+    'weather_key'=>'485c6e3c7c493e27816f8532f86c7ca8',//获取聚合天气接口的key
 
     //-----登录限流配置--------
     'login_throttles' => [

config/database.php

@@ -69,4 +69,29 @@ return [
     'break_reconnect' => false,
     // 断线标识字符串
     'break_match_str' => [],
+
+    //国天sp厦门中山医院数据库配置
+    'db_config_gt_sp' => [
+        'type'        => 'mysql',
+        'hostname'    => '119.3.168.158',
+        'database'    => 'guotianyun_sp',
+        'username'    => 'guotianyun_sp',
+        'password'    => 'XC5SbdDAX5jnwaxh',
+        'hostport'    => 3306,
+        'charset'     => 'utf8mb4',
+        'prefix'      => '',
+    ],
+
+    //霸洁云数据库配置
+    'db_config_bjy' => [
+        'type'        => 'mysql',
+        'hostname'    => '119.3.219.106',
+        'database'    => 'bjy_jya_tech_com',
+        'username'    => 'bjy_jya_tech_com',
+        'password'    => '8fCWPs7BAr8pwzKT',
+        'hostport'    => 3306,
+        'charset'     => 'utf8mb4',
+        'prefix'      => '',
+    ],
+
 ];

public/admin/css/indexsub.css

@@ -62,7 +62,7 @@
 .qsidenav .qsidenav-list{
     width: 100%;
     height: auto;
-    padding: 0 14px;
+    padding: 0 10px;
     overflow: hidden;
 }
 .qsidenav .qsidenav-list .qsidenav-twomenu-name{
@@ -85,7 +85,7 @@
     width: 188px;
     height: 60px;
     line-height: 60px;
-    font-size: 17px;
+    font-size: 16px;
     font-family: Source Han Sans CN;
     font-weight: 400;
     color: #333333;