update cho Cao Bang

This commit is contained in:
dongpd 2020-02-27 09:49:06 +07:00
parent 417e1ec3b7
commit 4c775c111f
6 changed files with 32 additions and 34 deletions

View File

@ -4,6 +4,7 @@ namespace app\controllers;
use Yii;
use app\models\Logs;
use app\models\LogsUnknow;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
@ -43,7 +44,7 @@ class DashboardController extends Controller {
$f = date_format(date_create_from_format('H:i d/m/Y', "00:00 " . date("d/m/Y")), 'U');
$t = date_format(date_create_from_format('H:i d/m/Y', "23:59 " . date("d/m/Y")), 'U');
$logs = Logs::find()->andWhere(["OR", ["BETWEEN", 'time_in', $f, $t], ["BETWEEN", 'time_out', $f, $t]])->orderBy(['time_in' => SORT_DESC, 'time_out' => SORT_DESC])->all();
$logs = LogsUnknow::find()->andWhere(["OR", ["BETWEEN", 'time_in', $f, $t], ["BETWEEN", 'time_out', $f, $t]])->orderBy(['time_in' => SORT_DESC, 'time_out' => SORT_DESC])->all();
$temp = [];
$in = 0;

View File

@ -24,9 +24,9 @@ use dmstr\widgets\Alert;
<footer class="main-footer" style="font-size: 22px;">
<div class="pull-right hidden-xs" style="margin-top: 10px;">
<b>Hotline</b> <a href="tel:0912461556">091.246.1556</a>
</div>
<strong>Copyright &copy; 2019 <a href="https://beetinnovators.com/"><img src="images/BI_Logo.png" width="120px"></a> & <a href="https://tctech.vn/"><img src="images/TCTech.jpg" width="120px"></a>.</strong> All rights reserved.
<strong>Copyright &copy; 2019 <a href="https://beetinnovators.com/"><img src="/images/BI_Logo.png" width="120px"></a>.</strong> All rights reserved.
</footer>
<!-- Control Sidebar -->

View File

@ -9,7 +9,7 @@ use yii\widgets\ActiveForm;
<header class="main-header">
<?= Html::a('<span class="logo-mini">BI</span><span class="logo-lg"><img src="images/logo.png" width="75%"></span>', Yii::$app->homeUrl, ['class' => 'logo']) ?>
<?= Html::a('<span class="logo-mini">BI</span><span class="logo-lg"><img src="/images/logo.png" width="75%"></span>', Yii::$app->homeUrl, ['class' => 'logo']) ?>
<nav class="navbar navbar-static-top" role="navigation">

View File

@ -34,8 +34,8 @@
'options' => ['class' => 'sidebar-menu tree', 'data-widget' => 'tree'],
'items' => [
['label' => 'Bảng điều khiển', 'url' => ['/dashboard'], 'icon' => 'dashboard'],
['label' => 'Thống kê', 'url' => ['/logs'], 'icon' => 'bar-chart'],
['label' => 'Danh sách xe', 'url' => ['/vehicle'], 'icon' => 'truck'],
['label' => 'Thống kê', 'url' => ['/logs-unknow'], 'icon' => 'bar-chart'],
// ['label' => 'Danh sách xe', 'url' => ['/vehicle'], 'icon' => 'truck'],
['label' => 'Người dùng', 'url' => ['/user'], 'icon' => 'users', 'visible' => Yii::$app->user->can("administrator")],
['label' => 'Login', 'url' => ['site/login'], 'visible' => Yii::$app->user->isGuest],
],

View File

@ -4,7 +4,7 @@
{use class="app\assets\DashboardAsset"}
{DashboardAsset::register($this)|void}
{block name='content'}
<input type="hidden" value="{Url::to(['/logs/save'])}" name="saveUrl">
<input type="hidden" value="{Url::to(['/logs-unknow/save'])}" name="saveUrl">
<input type="hidden" value="{date("d/m/Y")}" name="currentDay">
<h2 class="text-center" style="font-family: Time New Roman;color:#009;font-weight: bold;">{"XE RA/VÀO NGÀY "|cat:date("d/m/Y")|upper}</h2>
<div class="row">
@ -16,12 +16,9 @@
</div>
</div>
<div class="col-md-6 text-right">
<a href="{Url::to(['/logs'])}" class="btn btn-primary" target="_blank">
<a href="{Url::to(['/logs-unknow'])}" class="btn btn-primary" target="_blank">
<i class="fa fa-bar-chart"></i> Thống kê
</a>
<a href="{Url::to(['/logs-unknow'])}" class="btn btn-danger" target="_blank">
<i class="fa fa-truck"></i> Xe khác
</a>
</div>
</div>
<table class="table table-striped table-bordered" style="background:#fff;min-width:700px;">
@ -45,19 +42,19 @@
<tbody id="logs-lists">
{foreach from=$results item=arr}
<tr id="logs-{$arr->id}">
<td>{$arr->vehicle->type}</td>
<td>{$arr->vehicle->company}</td>
<td>{*$arr->vehicle->type*}</td>
<td>{*$arr->vehicle->company*}</td>
<td>
{$data=explode("/",$arr->vehicle->driver)}
{implode("<br>",$data)}
{*$data=explode("/",$arr->vehicle->driver)}
{implode("<br>",$data)*}
</td>
<td>
{$data=explode("/",$arr->vehicle->telephone)}
{implode("<br>",$data)}
{*$data=explode("/",$arr->vehicle->telephone)}
{implode("<br>",$data)*}
</td>
<td>
{$data=explode("/",$arr->vehicle->indentity_card)}
{implode("<br>",$data)}
{*$data=explode("/",$arr->vehicle->indentity_card)}
{implode("<br>",$data)*}
</td>
<td>
<div style='cursor:pointer;' onclick='openForm(this, "factory");' data-id='{$arr->id}' data-text='{$arr->factory}'>
@ -77,10 +74,10 @@
{/if}
</div>
</td>
<td>{$arr->vehicle->plate}</td>
<td>{$arr->plate}</td>
<td class="text-center">
{if $arr->time_in}
<img src="{Yii::$app->request->hostInfo}/AIParking_Intops_Server/web/data/uploads/{$arr->plate_image_in}" class="img-thumbnail" style="width:100%;">
<img src="/data/uploads/{$arr->plate_image_in}" class="img-thumbnail" style="width:100%;">
{/if}
</td>
<td class="text-center">
@ -90,7 +87,7 @@
</td>
<td class="text-center">
{if $arr->time_out}
<img src="{Yii::$app->request->hostInfo}/AIParking_Intops_Server/web/data/uploads/{$arr->plate_image_out}" class="img-thumbnail" style="width:100%;">
<img src="/data/uploads/{$arr->plate_image_out}" class="img-thumbnail" style="width:100%;">
{/if}
</td>
<td class="text-center">

View File

@ -58,31 +58,31 @@ function renderNewLogs(data) {
var imageOut = "";
var timeOut = "";
if (data.type == "in") {
imageIn = `<img src="/AIParking_Intops_Server/web/data/uploads/` + data.image + `" class="img-thumbnail" style="width:100%;">`;
imageIn = `<img src="/data/uploads/` + data.image + `" class="img-thumbnail" style="width:100%;">`;
timeIn = formatTime(data.time);
$("#totals-in").html(parseInt($("#totals-in").html()) + 1);
}
if (data.type == "out") {
if (data.logs) {
imageIn = `<img src="/AIParking_Intops_Server/web/data/uploads/` + data.logs.plate_image_in + `" class="img-thumbnail" style="width:100%;">`;
imageIn = `<img src="/data/uploads/` + data.logs.plate_image_in + `" class="img-thumbnail" style="width:100%;">`;
timeIn = formatTime(data.logs.time_in);
} else {
imageIn = "";
timeIn = "";
}
imageOut = `<img src="/AIParking_Intops_Server/web/data/uploads/` + data.image + `" class="img-thumbnail" style="width:100%;">`;
imageOut = `<img src="/data/uploads/` + data.image + `" class="img-thumbnail" style="width:100%;">`;
timeOut = formatTime(data.time);
$("#totals-out").html(parseInt($("#totals-out").html()) + 1);
}
var driver = data.vehicleInfo.driver.split("/");
var telephone = data.vehicleInfo.telephone.split("/");
var cmt = data.vehicleInfo.indentity_card.split("/");
// var driver = data.vehicleInfo.driver.split("/");
// var telephone = data.vehicleInfo.telephone.split("/");
// var cmt = data.vehicleInfo.indentity_card.split("/");
var html = `<tr id="logs-` + data.id + `">
<td>` + data.vehicleInfo.type + `</td>
<td>` + data.vehicleInfo.company + `</td>
<td>` + driver.join("<br>") + `</td>
<td>` + telephone.join("<br>") + `</td>
<td>` + cmt.join("<br>") + `</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>
<div style='cursor:pointer;' onclick='openForm(this, "factory");' data-id='` + data.id + `' data-text=''>
<i class='text-red'>không </i>
@ -93,7 +93,7 @@ function renderNewLogs(data) {
<i class='text-red'>không </i>
</div>
</td>
<td>` + data.vehicleInfo.plate + `</td>
<td>` + data.plate + `</td>
<td class="text-center">` + imageIn + `</td>
<td class="text-center">` + timeIn + `</td>
<td class="text-center">` + imageOut + `</td>