From b27b86929a37944ffb0b1c72837af76f88f8d870 Mon Sep 17 00:00:00 2001
From: zcstatham <578322713@qq.com>
Date: Tue, 30 Aug 2022 22:59:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8E=BB=E9=87=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E8=B0=83=E8=AF=952?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Index.php  |  3 ++-
 app/view/index/index.html | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

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;
+    }
 </script>
 {/block}