2021/03/08 北京固定翼飞机修改

王智
application/admin/lang/zh-cn/moban.php
application/admin/lang/zh-cn/sun.php
application/admin/model/Moban.php
application/admin/model/Sun.php
application/admin/view/planename/index.html
application/api/controller/Index.php
application/common/controller/Api.php
public/.htaccess
public/assets/js/backend/moban.js
public/assets/js/backend/planename.js
public/assets/js/backend/sun.js
--- a/application/admin/lang/zh-cn/moban.php
查看文件 @c265417
+++ b/application/admin/lang/zh-cn/moban.php
查看文件 @c265417
@@ -10,10 +10,12 @@ return [
     'Cloud_type 1' => '上午',
     'Cloud_type 2' => '下午',
     'Plane_type'   => '飞机类型',
-    'Plane_type 1' => '飞机一',
-    'Plane_type 2' => '飞机二',
-    'Plane_type 3' => '飞机三',
-    'Plane_type 4' => '飞机四',
+    'Plane_type 1'  => '飞机一',
+    'Plane_type 2'  => '飞机二',
+    'Plane_type 3'  => '飞机三',
+    'Plane_type 4'  => '飞机四',
+    'Plane_type 5'  => '飞机五',
+    'Plane_type 6'  => '飞机六',
     'Createtime'   => '创建时间',
     'Updatetime'   => '更改时间',
     'Time.title'   => '时间'
--- a/application/admin/lang/zh-cn/sun.php
查看文件 @c265417
+++ b/application/admin/lang/zh-cn/sun.php
查看文件 @c265417
@@ -15,6 +15,8 @@ return [
     'Plane_type 2'  => '飞机二',
     'Plane_type 3'  => '飞机三',
     'Plane_type 4'  => '飞机四',
+    'Plane_type 5'  => '飞机五',
+    'Plane_type 6'  => '飞机六',
     'Createtime'    => '创建时间',
     'Updatetime'    => '更改时间',
     'User_id'       => '预约人',
--- a/application/admin/model/Moban.php
查看文件 @c265417
+++ b/application/admin/model/Moban.php
查看文件 @c265417
@@ -8,13 +8,13 @@ use think\Model;
 class Moban extends Model
 {
-    
-    
+
+
     // 表名
     protected $name = 'moban';
-    
+
     // 自动写入时间戳字段
     protected $autoWriteTimestamp = 'int';
@@ -29,9 +29,9 @@ class Moban extends Model
         'cloud_type_text',
         'plane_type_text'
     ];
-    
-    
+
+
     public function getStatusList()
     {
         return ['1' => __('Status 1'), '2' => __('Status 2')];
@@ -44,7 +44,7 @@ class Moban extends Model
     public function getPlaneTypeList()
     {
-        return ['1' => __('Plane_type 1'), '2' => __('Plane_type 2'),'3' => __('Plane_type 3'),'4' => __('Plane_type 4')];
+        return ['1' => __('Plane_type 1'), '2' => __('Plane_type 2'),'3' => __('Plane_type 3'),'4' => __('Plane_type 4'),'5' => __('Plane_type 5'),'6' => __('Plane_type 6')];
     }
--- a/application/admin/model/Sun.php
查看文件 @c265417
+++ b/application/admin/model/Sun.php
查看文件 @c265417
@@ -44,7 +44,7 @@ class Sun extends Model
     public function getPlaneTypeList()
     {
-        return ['1' => __('Plane_type 1'), '2' => __('Plane_type 2'), '3' => __('Plane_type 3'), '4' => __('Plane_type 4')];
+        return ['1' => __('Plane_type 1'), '2' => __('Plane_type 2'), '3' => __('Plane_type 3'), '4' => __('Plane_type 4'),'5' => __('Plane_type 5'),'6' => __('Plane_type 6')];
     }
--- a/application/admin/view/planename/index.html
查看文件 @c265417
+++ b/application/admin/view/planename/index.html
查看文件 @c265417
@@ -7,18 +7,18 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('planename/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('planename/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('planename/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('planename/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('planename/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
-
-                        <div class="dropdown btn-group {:$auth->check('planename/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
-                            </ul>
-                        </div>
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('planename/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('planename/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
+<!---->
+<!--                        <div class="dropdown btn-group {:$auth->check('planename/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
+<!--                            </ul>-->
+<!--                        </div>-->
                     </div>
--- a/application/api/controller/Index.php
查看文件 @c265417
+++ b/application/api/controller/Index.php
查看文件 @c265417
@@ -315,7 +315,7 @@ class Index extends Api
     }
     })
      */
-     public function TableList()
+    public function TableList()
     {
         $date = input('date');
         $day = strtotime(date($date));
@@ -401,14 +401,72 @@ class Index extends Api
                 $shangwu4[$k]['bvip'] = null;
             }
         }
-        foreach ($shangwu1 as $key => $vo) {
-            $up1[] = array_merge($vo, $shangwu2[$key]);
+        //上午时间飞机五
+        $shangwu5 = Db::name('sun')
+            ->alias('s')
+            ->join('time t', 't.id=s.type_id')
+            ->where($map)
+            ->where(['s.cloud_type' => 1])
+            ->where(['s.plane_type' => 5])
+            ->join('planename p', 'p.id=s.plane_type')
+            ->field('s.id as cid,p.name as cname,s.plane_type as cplane_type,s.status as cstatus,s.user_id as cuser_id')
+            ->select();
+        foreach ($shangwu5 as $k => $v) {
+            if ($v['cuser_id'] != null) {
+                $user = Db::name('user')->where(['id' => $v['cuser_id']])->find();
+                $shangwu5[$k]['cnickname'] = $user['nickname'];
+                $shangwu5[$k]['cvip'] = $user['vip'];
+            } else {
+                $shangwu5[$k]['cnickname'] = null;
+                $shangwu5[$k]['cvip'] = null;
+            }
         }
-        foreach ($shangwu3 as $key => $vo) {
-            $up2[] = array_merge($vo, $shangwu4[$key]);
+        //上午时间飞机六
+        $shangwu6 = Db::name('sun')
+            ->alias('s')
+            ->join('time t', 't.id=s.type_id')
+            ->where($map)
+            ->where(['s.cloud_type' => 1])
+            ->where(['s.plane_type' => 6])
+            ->join('planename p', 'p.id=s.plane_type')
+            ->field('s.id as did,p.name as dname,s.plane_type as dplane_type,s.status as dstatus,s.user_id as duser_id')
+            ->select();
+        foreach ($shangwu6 as $k => $v) {
+            if ($v['duser_id'] != null) {
+                $user = Db::name('user')->where(['id' => $v['duser_id']])->find();
+                $shangwu6[$k]['dnickname'] = $user['nickname'];
+                $shangwu6[$k]['dvip'] = $user['vip'];
+            } else {
+                $shangwu6[$k]['dnickname'] = null;
+                $shangwu6[$k]['dvip'] = null;
+            }
         }
-        foreach ($up1 as $key => $vo) {
-            $up[] = array_merge($vo, $up2[$key]);
+        if (!empty($shangwu5) && !empty($shangwu6)) {
+            foreach ($shangwu1 as $key => $vo) {
+                $up1[] = array_merge($vo, $shangwu2[$key]);
+            }
+            foreach ($shangwu3 as $key => $vo) {
+                $up2[] = array_merge($vo, $shangwu4[$key]);
+            }
+            foreach ($shangwu5 as $key => $vo) {
+                $up3[] = array_merge($vo, $shangwu6[$key]);
+            }
+            foreach ($up1 as $key => $vo) {
+                $up4[] = array_merge($vo, $up2[$key]);
+            }
+            foreach ($up4 as $key => $vo) {
+                $up[] = array_merge($vo, $up3[$key]);
+            }
+        } else {
+            foreach ($shangwu1 as $key => $vo) {
+                $up1[] = array_merge($vo, $shangwu2[$key]);
+            }
+            foreach ($shangwu3 as $key => $vo) {
+                $up2[] = array_merge($vo, $shangwu4[$key]);
+            }
+            foreach ($up1 as $key => $vo) {
+                $up[] = array_merge($vo, $up2[$key]);
+            }
         }
         //$up 上午
         //$down 下午
@@ -492,14 +550,72 @@ class Index extends Api
                 $xiawu4[$k]['bvip'] = null;
             }
         }
-        foreach ($xiawu1 as $key => $vo) {
-            $down1[] = array_merge($vo, $xiawu2[$key]);
+        //下午时间飞机五
+        $xiawu5 = Db::name('sun')
+            ->alias('s')
+            ->join('time t', 't.id=s.type_id')
+            ->where($map)
+            ->where(['s.cloud_type' => 2])
+            ->where(['s.plane_type' => 5])
+            ->join('planename p', 'p.id=s.plane_type')
+            ->field('s.id as cid,p.name as cname,s.plane_type as cplane_type,s.status as cstatus,s.user_id as cuser_id')
+            ->select();
+        foreach ($xiawu5 as $k => $v) {
+            if ($v['cuser_id'] != null) {
+                $user = Db::name('user')->where(['id' => $v['cuser_id']])->find();
+                $xiawu5[$k]['cnickname'] = $user['nickname'];
+                $xiawu5[$k]['cvip'] = $user['vip'];
+            } else {
+                $xiawu5[$k]['cnickname'] = null;
+                $xiawu5[$k]['cvip'] = null;
+            }
         }
-        foreach ($xiawu3 as $key => $vo) {
-            $down2[] = array_merge($vo, $xiawu4[$key]);
+        //下午时间飞机六
+        $xiawu6 = Db::name('sun')
+            ->alias('s')
+            ->join('time t', 't.id=s.type_id')
+            ->where($map)
+            ->where(['s.cloud_type' => 2])
+            ->where(['s.plane_type' => 6])
+            ->join('planename p', 'p.id=s.plane_type')
+            ->field('s.id as did,p.name as dname,s.plane_type as dplane_type,s.status as dstatus,s.user_id as duser_id')
+            ->select();
+        foreach ($xiawu6 as $k => $v) {
+            if ($v['duser_id'] != null) {
+                $user = Db::name('user')->where(['id' => $v['duser_id']])->find();
+                $xiawu6[$k]['dnickname'] = $user['nickname'];
+                $xiawu6[$k]['dvip'] = $user['vip'];
+            } else {
+                $xiawu6[$k]['dnickname'] = null;
+                $xiawu6[$k]['dvip'] = null;
+            }
         }
-        foreach ($down1 as $key => $vo) {
-            $down[] = array_merge($vo, $down2[$key]);
+        if (!empty($xiawu5) && !empty($xiawu6)) {
+            foreach ($xiawu1 as $key => $vo) {
+                $down1[] = array_merge($vo, $xiawu2[$key]);
+            }
+            foreach ($xiawu3 as $key => $vo) {
+                $down2[] = array_merge($vo, $xiawu4[$key]);
+            }
+            foreach ($xiawu5 as $key => $vo) {
+                $down3[] = array_merge($vo, $xiawu6[$key]);
+            }
+            foreach ($down1 as $key => $vo) {
+                $down4[] = array_merge($vo, $down2[$key]);
+            }
+            foreach ($down4 as $key => $vo) {
+                $down[] = array_merge($vo, $down3[$key]);
+            }
+        } else {
+            foreach ($xiawu1 as $key => $vo) {
+                $down1[] = array_merge($vo, $xiawu2[$key]);
+            }
+            foreach ($xiawu3 as $key => $vo) {
+                $down2[] = array_merge($vo, $xiawu4[$key]);
+            }
+            foreach ($down1 as $key => $vo) {
+                $down[] = array_merge($vo, $down2[$key]);
+            }
         }
         $list = [
             'up' => $up,
--- a/application/common/controller/Api.php
查看文件 @c265417
+++ b/application/common/controller/Api.php
查看文件 @c265417
@@ -231,8 +231,8 @@ class Api
     /**
      * 前置操作
      * @access protected
-     * @param  string $method 前置操作方法名
-     * @param  array $options 调用参数 ['only'=>[...]] 或者 ['except'=>[...]]
+     * @param string $method 前置操作方法名
+     * @param array $options 调用参数 ['only'=>[...]] 或者 ['except'=>[...]]
      * @return void
      */
     protected function beforeAction($method, $options = [])
@@ -274,11 +274,11 @@ class Api
     /**
      * 验证数据
      * @access protected
-     * @param  array $data 数据
-     * @param  string|array $validate 验证器名或者验证规则数组
-     * @param  array $message 提示信息
-     * @param  bool $batch 是否批量验证
-     * @param  mixed $callback 回调方法（闭包）
+     * @param array $data 数据
+     * @param string|array $validate 验证器名或者验证规则数组
+     * @param array $message 提示信息
+     * @param bool $batch 是否批量验证
+     * @param mixed $callback 回调方法（闭包）
      * @return array|string|true
      * @throws ValidateException
      */
@@ -598,7 +598,7 @@ class Api
         if ($is_week == '周一') {
             $count = Db::name('yuyue')->where(['user_id' => $user_id])->where($map)->select();
             if (!empty($count)) {
-                if (count($count) == 2) {
+                if (count($count) > 1) {
                     $this->error('超过最大可预约次数', 0);
                     die;
                 }
@@ -607,7 +607,7 @@ class Api
         if ($is_week == '周二') {
             $count = Db::name('yuyue')->where(['user_id' => $user_id])->where($map)->select();
             if (!empty($count)) {
-                if (count($count) == 2) {
+                if (count($count) > 1) {
                     $this->error('超过最大可预约次数', 0);
                     die;
                 }
@@ -616,7 +616,7 @@ class Api
         if ($is_week == '周三') {
             $count = Db::name('yuyue')->where(['user_id' => $user_id])->where($map)->select();
             if (!empty($count)) {
-                if (count($count) == 2) {
+                if (count($count) > 1) {
                     $this->error('超过最大可预约次数', 0);
                     die;
                 }
@@ -625,7 +625,7 @@ class Api
         if ($is_week == '周四') {
             $count = Db::name('yuyue')->where(['user_id' => $user_id])->where($map)->select();
             if (!empty($count)) {
-                if (count($count) == 2) {
+                if (count($count) > 1) {
                     $this->error('超过最大可预约次数', 0);
                     die;
                 }
@@ -634,7 +634,7 @@ class Api
         if ($is_week == '周五') {
             $count = Db::name('yuyue')->where(['user_id' => $user_id])->where($map)->select();
             if (!empty($count)) {
-                if (count($count) == 2) {
+                if (count($count) > 1) {
                     $this->error('超过最大可预约次数', 0);
                     die;
                 }
@@ -643,7 +643,7 @@ class Api
         if ($is_week == '周六') {
             $count = Db::name('yuyue')->where(['user_id' => $user_id])->where($map)->select();
             if (!empty($count)) {
-                if (count($count) == 2) {
+                if (count($count) > 1) {
                     $this->error('超过最大可预约次数', 0);
                     die;
                 }
@@ -652,7 +652,7 @@ class Api
         if ($is_week == '周日') {
             $count = Db::name('yuyue')->where(['user_id' => $user_id])->where($map)->select();
             if (!empty($count)) {
-                if (count($count) == 2) {
+                if (count($count) > 1) {
                     $this->error('超过最大可预约次数', 0);
                     die;
                 }
--- a/public/.htaccess
查看文件 @c265417
+++ b/public/.htaccess
查看文件 @c265417
-<IfModule mod_rewrite.c>
-  Options +FollowSymlinks -Multiviews
-  RewriteEngine On
-
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteRule ^(.*)$ index.php [L,E=PATH_INFO:$1]
-</IfModule>
--- a/public/assets/js/backend/moban.js
查看文件 @c265417
+++ b/public/assets/js/backend/moban.js
查看文件 @c265417
@@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'time.title', title: __('Time.title')},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         {field: 'cloud_type', title: __('Cloud_type'), searchList: {"1":__('Cloud_type 1'),"2":__('Cloud_type 2')}, formatter: Table.api.formatter.normal},
-                        {field: 'plane_type', title: __('Plane_type'), searchList: {"1":__('Plane_type 1'),"2":__('Plane_type 2'),"3":__('Plane_type 3'),"4":__('Plane_type 4')}, formatter: Table.api.formatter.normal},
+                        {field: 'plane_type', title: __('Plane_type'), searchList: {"1":__('Plane_type 1'),"2":__('Plane_type 2'),"3":__('Plane_type 3'),"4":__('Plane_type 4'),"5":__('Plane_type 5'),"6":__('Plane_type 6')}, formatter: Table.api.formatter.normal},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
--- a/public/assets/js/backend/planename.js
查看文件 @c265417
+++ b/public/assets/js/backend/planename.js
查看文件 @c265417
@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'planename/index' + location.search,
                     add_url: 'planename/add',
                     edit_url: 'planename/edit',
-                    del_url: 'planename/del',
+                    // del_url: 'planename/del',
                     multi_url: 'planename/multi',
                     table: 'planename',
                 }
--- a/public/assets/js/backend/sun.js
查看文件 @c265417
+++ b/public/assets/js/backend/sun.js
查看文件 @c265417
@@ -31,7 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'type_id', title: __('Type_id')},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3')}, formatter: Table.api.formatter.status,operate:false},
                         {field: 'cloud_type', title: __('Cloud_type'), searchList: {"1":__('Cloud_type 1'),"2":__('Cloud_type 2')}, formatter: Table.api.formatter.normal,operate:false},
-                        {field: 'plane_type', title: __('Plane_type'), searchList: {"1":__('Plane_type 1'),"2":__('Plane_type 2'),"3":__('Plane_type 3'),"4":__('Plane_type 4')}, formatter: Table.api.formatter.normal,operate:false},
+                        {field: 'plane_type', title: __('Plane_type'), searchList: {"1":__('Plane_type 1'),"2":__('Plane_type 2'),"3":__('Plane_type 3'),"4":__('Plane_type 4'),"5":__('Plane_type 5'),"6":__('Plane_type 6')}, formatter: Table.api.formatter.normal,operate:false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,operate:false},
                         // {field: 'user_id', title: __('User_id')},