Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
6bfa6ceeb9 | |||
566c065303 | |||
513859fe50 | |||
d4e47bb29f | |||
28161b2e7a | |||
3139db953e | |||
6bb8771bfb |
|
@ -34,6 +34,7 @@ class ConfigController extends Controller {
|
|||
}
|
||||
|
||||
public $config_json = [
|
||||
"lang" => "vi",
|
||||
"camera" => [
|
||||
"auto_check" => 1,
|
||||
"num_cam" => 2,
|
||||
|
@ -206,6 +207,9 @@ class ConfigController extends Controller {
|
|||
$cfgData = $post['config'];
|
||||
$config_json = [];
|
||||
foreach ($cfgData as $key => $value) {
|
||||
$value['data'] = trim(strip_tags($value['data']));
|
||||
$value['data'] = str_replace(' ', '', $value['data']);
|
||||
$value['data'] = preg_replace('/\s+/', ' ', $value['data']);
|
||||
if (is_numeric($value['data'])) {
|
||||
$value['data'] = floatval($value['data']);
|
||||
}
|
||||
|
@ -252,7 +256,7 @@ class ConfigController extends Controller {
|
|||
'content' => json_encode([
|
||||
'path' => $engineConfig['data']['engines'][0]['path'],
|
||||
'config' => $engineConfig,
|
||||
'configEngine' => $config_json
|
||||
'configEngine' => json_encode($config_json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
|
||||
])
|
||||
]
|
||||
]));
|
||||
|
|
|
@ -20,7 +20,7 @@ use dmstr\widgets\Alert;
|
|||
</section>
|
||||
</div>
|
||||
|
||||
<footer class="main-footer hidden">
|
||||
<footer class="main-footer">
|
||||
<div class="pull-right hidden-xs" style="margin-top: 10px;">
|
||||
<!--<b>Hotline</b> <a href="tel:0912461556">091.246.1556</a>-->
|
||||
</div>
|
||||
|
|
|
@ -25,7 +25,7 @@ use yii\widgets\ActiveForm;
|
|||
<nav class="navbar navbar-static-top">
|
||||
<div class="container-fruit">
|
||||
<div class="navbar-header">
|
||||
<a href="<?php echo yii\helpers\Url::to(['/config']); ?>" class="navbar-brand hidden">
|
||||
<a href="<?php echo yii\helpers\Url::to(['/config']); ?>" class="navbar-brand">
|
||||
<img src="/images/logo.png" width="90%">
|
||||
</a>
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
|
||||
|
|
|
@ -25,7 +25,7 @@ $fieldOptions2 = [
|
|||
}
|
||||
</style>
|
||||
<div class="login-box">
|
||||
<div class="login-logo hidden">
|
||||
<div class="login-logo">
|
||||
<img src="/images/logo.png" width="100%">
|
||||
</div>
|
||||
<!-- /.login-logo -->
|
||||
|
|
|
@ -165,13 +165,11 @@
|
|||
</div>
|
||||
<br>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-6 col-md-push-1">
|
||||
{$config_json}
|
||||
<div class="text-center">
|
||||
<button class="btn btn-primary" onclick="saveStep2(this);" data-href="{Url::to(['/config/cau-hinh-nhan-dien'])}">
|
||||
<i class="fa fa-floppy-o"></i> Lưu lại
|
||||
</button>
|
||||
</div>
|
||||
<button style="position: fixed;left: 0;top: 170px;" class="btn btn-primary" onclick="saveStep2(this);" data-href="{Url::to(['/config/cau-hinh-nhan-dien'])}">
|
||||
<i class="fa fa-floppy-o"></i> Lưu lại
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<i class="fa fa-check"></i> Đổi mật khẩu thành công!
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<button class="btn btn-primary" onclick="user.password(this);" data-href="{Url::to(['/user/change-password','id'=>$model->id])}">
|
||||
<button class="btn btn-primary" onclick="user.changePassword(this);" data-href="{Url::to(['/user/change-password','id'=>$model->id])}">
|
||||
<i class="fa fa-lock"></i> Đổi mật khẩu
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
@ -17,8 +17,8 @@ class ConfigTree extends Widget {
|
|||
|
||||
public function run() {
|
||||
|
||||
$public_root = ['engine', 'recognition', 'open_door'];
|
||||
$public_cfg = ['engine|cam_id', 'engine|server_authen', 'recognition|server_recog', 'open_door|enable', 'open_door|port_name'];
|
||||
$public_root = ['engine', 'recognition', 'open_door', 'screen', 'lang'];
|
||||
$public_cfg = ['engine|cam_id', 'engine|server_authen', 'recognition|server_recog', 'open_door|enable', 'open_door|port_name', 'screen|banner', 'lang'];
|
||||
|
||||
return $this->render("config-tree", [
|
||||
"configLists" => $this->configLists,
|
||||
|
|
Loading…
Reference in New Issue
Block a user