diff --git a/app/controller/Index.php b/app/controller/Index.php index 754f845..71fa09c 100644 --- a/app/controller/Index.php +++ b/app/controller/Index.php @@ -63,7 +63,8 @@ class Index extends BaseController $params['data_check'] = 'car_frame_check'; } if(isset($params['data_check']) && $params['data_check'] == 'car_frame_check'){ - $query = Db::table('repeat_data_t')->alias('car_info_t')->rightJoin('repeat_frame_t','repeat_frame_t.car_frame_no = car_info_t.car_frame_no')->field('car_info_t.*')->where($map)->order('repeat_frame_t.car_frame_no desc'); + $query = Db::table('repeat_data_t')->alias('car_info_t')->field('car_info_t.*') + ->order('repeat_data_t.car_frame_no desc'); if (isset($params['is_delete_frame']) && $params['is_delete_frame'] > 0) { $query = $query->where('repeat_data_t.repeat_id', '=', $params['is_delete_frame']); } diff --git a/app/view/index/index.html b/app/view/index/index.html index 3e12891..f250216 100644 --- a/app/view/index/index.html +++ b/app/view/index/index.html @@ -351,6 +351,7 @@ $('#search-btn').on('click', function(){ var param = $('.layui-card-header').find(':input').serializeObject(); param['data_filter[]'] = param['data_filter[]']?param['data_filter[]']:''; + param = Object.assign(param, getUrlParam()); //执行重载 tableIns.reload({ page: { @@ -381,5 +382,17 @@ }); }); } + + function getUrlParam(name) { + let query = window.location.search.substring(1); + let vars = query.split("&"); + let params = []; + for (let i=0, len = vars.length;i< len;i++) { + let pair = vars[i].split("="); + params[pair[0]] = pair[1]; + } + if (name) return params[name]; + return params; + } {/block}