diff --git a/controllers/CaptureLogsController.php b/controllers/CaptureLogsController.php index 12cba3ae..1e3597c7 100644 --- a/controllers/CaptureLogsController.php +++ b/controllers/CaptureLogsController.php @@ -43,12 +43,23 @@ class CaptureLogsController extends Controller { $dataProvider->query->andWhere(["BETWEEN", "capture_logs.time", $f, $t]); $dataProvider->query->orderBy(["time" => SORT_DESC]); + $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ + 'http' => [ + 'header' => "Content-Type: application/json", + 'method' => "POST" + ] + ])), true); + $data = json_decode($tempConfig['data'], true); + $last = \app\models\ListManagement::find()->orderBy(['id' => SORT_DESC])->limit(1)->one(); + $idAuto = $data['data']['box_id'] . "_" . ($last->id + 1); + return $this->render('index', [ 'searchModel' => $searchModel, 'dataProvider' => $dataProvider, 'statusArray' => CaptureLogs::$statusArray, 'f' => $f, - 't' => $t + 't' => $t, + 'idAuto' => $idAuto ]); } diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index 366ea1b2..e93a18fa 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -49,13 +49,24 @@ class ListManagementController extends Controller { if ($gender !== "all") $dataProvider->query->andWhere(["gender" => $gender]); $dataProvider->query->orderBy(["time" => SORT_DESC]); + + $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ + 'http' => [ + 'header' => "Content-Type: application/json", + 'method' => "POST" + ] + ])), true); + $data = json_decode($tempConfig['data'], true); + $last = \app\models\ListManagement::find()->orderBy(['id' => SORT_DESC])->limit(1)->one(); + $idAuto = $data['data']['box_id'] . "_" . ($last->id + 1); return $this->render('index', [ 'searchModel' => $searchModel, 'dataProvider' => $dataProvider, 'f' => $f, 't' => $t, 'typeArray' => ListManagement::$typeArray, - 'genderArray' => ListManagement::$genderArray + 'genderArray' => ListManagement::$genderArray, + 'idAuto' => $idAuto ]); } diff --git a/views/capture-logs/index.tpl b/views/capture-logs/index.tpl index a2cdec3e..bd376099 100644 --- a/views/capture-logs/index.tpl +++ b/views/capture-logs/index.tpl @@ -99,7 +99,7 @@
ID
- +
diff --git a/views/list-management/index.tpl b/views/list-management/index.tpl index b429d085..22f2b08c 100644 --- a/views/list-management/index.tpl +++ b/views/list-management/index.tpl @@ -26,6 +26,7 @@ color: #fff; } + diff --git a/web/js/list-management.js b/web/js/list-management.js index 59332458..b424c040 100644 --- a/web/js/list-management.js +++ b/web/js/list-management.js @@ -204,6 +204,11 @@ function _form() { $("#FaceImage").attr("src", "/images/user2-160x160.jpg"); $("#save-btn").attr("onclick", "_create(this);"); $("#save-btn").attr("data-href", $("input[name='create_url']").val()); + $("input[name='Code']").val($("input[name='isAuto']").val()); + $("input[name='Name']").val(""); + $("input[name='Birthday']").val(""); + $("input[name='Telephone']").val(""); + $("input[name='Address']").val(""); } function btnImage() {