From f35d165e53ec3c721ceac75ae4c69e0e663c1919 Mon Sep 17 00:00:00 2001
From: appqy <8822812@gmail.com>
Date: Tue, 15 Nov 2022 13:15:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81?=
=?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=202.=E5=A2=9E=E5=8A=A0=E9=94=81?=
=?UTF-8?q?=E5=AE=9A=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/lang/zh-cn/blacklog.php | 2 +-
application/admin/lang/zh-cn/blackollog.php | 2 +-
application/api/controller/Info.php | 2 +-
application/api/controller/Recode.php | 8 ++++----
public/assets/js/backend/blacklog.js | 11 ++++++++++-
public/assets/js/backend/blackollog.js | 14 ++++++++++++--
public/assets/js/backend/collapse/log.js | 2 +-
public/assets/js/backend/feedback/log.js | 2 +-
public/assets/js/backend/install/log.js | 2 +-
public/assets/js/backend/uninstall/log.js | 2 +-
10 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/application/admin/lang/zh-cn/blacklog.php b/application/admin/lang/zh-cn/blacklog.php
index 1a23f50..afbd388 100644
--- a/application/admin/lang/zh-cn/blacklog.php
+++ b/application/admin/lang/zh-cn/blacklog.php
@@ -4,7 +4,7 @@ return [
'Id' => 'ID',
'Sn' => '设备序列号',
'Name' => '设备名称',
- 'Dev_type' => '设备型号',
+ 'Lock' => '锁定',
'V' => '固件版本',
'Localid' => 'localid',
'Mac' => 'MAC',
diff --git a/application/admin/lang/zh-cn/blackollog.php b/application/admin/lang/zh-cn/blackollog.php
index c9774b6..f544734 100644
--- a/application/admin/lang/zh-cn/blackollog.php
+++ b/application/admin/lang/zh-cn/blackollog.php
@@ -4,7 +4,7 @@ return [
'Id' => 'ID',
'Sn' => '设备序列号',
'Name' => '设备名称',
- 'Dev_type' => '设备型号',
+ 'Lock' => '锁定',
'V' => '固件版本',
'Localid' => 'localid',
'Mac' => 'MAC',
diff --git a/application/api/controller/Info.php b/application/api/controller/Info.php
index 82db438..e8cb311 100644
--- a/application/api/controller/Info.php
+++ b/application/api/controller/Info.php
@@ -26,7 +26,7 @@ class Info extends Api
"v" => $body['v'] ?? "",
"ip" => $this->request->ip(),
"sn" => $body['sn'] ?? "",
- "dev_type" => $body['dev_type'] ?? "",
+ "lock" => intval($body['lock']),
"createtime" => time(),
];
$black_log = new \app\admin\model\Blacklog();
diff --git a/application/api/controller/Recode.php b/application/api/controller/Recode.php
index a23071b..99b3f4c 100644
--- a/application/api/controller/Recode.php
+++ b/application/api/controller/Recode.php
@@ -48,7 +48,7 @@ class Recode extends Api
"cpu" => $body['cpu'] ?? "",
"oem" => $body['oem'] ?? "",
"app" => $body['app'] ?? "",
- "dev_type" => $body['dev_type'] ?? "",
+ // "dev_type" => $body['dev_type'] ?? "",
];
$install_log = new \app\admin\model\install\Log;
$install_log->save($post);
@@ -66,7 +66,7 @@ class Recode extends Api
"cpu" => $body['cpu'] ?? "",
"oem" => $body['oem'] ?? "",
"app" => $body['app'] ?? "",
- "dev_type" => $body['dev_type'] ?? "",
+ // "dev_type" => $body['dev_type'] ?? "",
];
$uninstalll_log = new \app\admin\model\uninstall\Log;
$uninstalll_log->save($post);
@@ -86,7 +86,7 @@ class Recode extends Api
"cpu" => $body['cpu'] ?? "",
"oem" => $body['oem'] ?? "",
"app" => $body['app'] ?? "",
- "dev_type" => $body['dev_type'] ?? "",
+ // "dev_type" => $body['dev_type'] ?? "",
];
$collapse_log = new \app\admin\model\collapse\Log;
$collapse_log->save($post);
@@ -106,7 +106,7 @@ class Recode extends Api
"cpu" => $body['cpu'] ?? "",
"oem" => $body['oem'] ?? "",
"app" => $body['app'] ?? "",
- "dev_type" => $body['dev_type'] ?? "",
+ // "dev_type" => $body['dev_type'] ?? "",
];
$collapse_log = new \app\admin\model\feedback\Log;
$collapse_log->save($post);
diff --git a/public/assets/js/backend/blacklog.js b/public/assets/js/backend/blacklog.js
index e2e879e..79ed5d3 100644
--- a/public/assets/js/backend/blacklog.js
+++ b/public/assets/js/backend/blacklog.js
@@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'id', title: __('Id')},
{field: 'sn', title: __('Sn'), operate: 'LIKE'},
{field: 'name', title: __('Name'), operate: 'LIKE'},
- {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
+ {field: 'lock', title: __('Lock'), operate: 'LIKE', formatter: Controller.api.formatter.lock},
{field: 'v', title: __('V'), operate: 'LIKE'},
{field: 'localid', title: __('Localid'), operate: 'LIKE'},
{field: 'mac', title: __('Mac'), operate: 'LIKE'},
@@ -51,6 +51,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
api: {
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
+ },
+ formatter: {
+ lock: function (value, row, index) {
+ if(value == '1'){
+ return " 锁定";
+ }else{
+ return " 解锁";
+ }
+ }
}
}
};
diff --git a/public/assets/js/backend/blackollog.js b/public/assets/js/backend/blackollog.js
index 8109bcd..e8e896c 100644
--- a/public/assets/js/backend/blackollog.js
+++ b/public/assets/js/backend/blackollog.js
@@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'id', title: __('Id')},
{field: 'sn', title: __('Sn'), operate: 'LIKE'},
{field: 'name', title: __('Name'), operate: 'LIKE'},
- {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
+ {field: 'lock', title: __('Lock'), operate: 'LIKE', formatter: Controller.api.formatter.lock},
{field: 'v', title: __('V'), operate: 'LIKE'},
{field: 'localid', title: __('Localid'), operate: 'LIKE'},
{field: 'mac', title: __('Mac'), operate: 'LIKE'},
@@ -54,8 +54,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
api: {
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
+ },
+ formatter: {
+ lock: function (value, row, index) {
+ if(value == '1'){
+ return " 锁定";
+ }else{
+ return " 解锁";
+ }
+ }
}
- }
+ },
+
};
return Controller;
});
diff --git a/public/assets/js/backend/collapse/log.js b/public/assets/js/backend/collapse/log.js
index c391366..25ef654 100644
--- a/public/assets/js/backend/collapse/log.js
+++ b/public/assets/js/backend/collapse/log.js
@@ -39,7 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'cpu', title: __('Cpu'), operate: 'LIKE'},
{field: 'oem', title: __('Oem'), operate: 'LIKE'},
{field: 'app', title: __('App'), operate: 'LIKE'},
- {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
+ // {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
diff --git a/public/assets/js/backend/feedback/log.js b/public/assets/js/backend/feedback/log.js
index 218b283..79366a7 100644
--- a/public/assets/js/backend/feedback/log.js
+++ b/public/assets/js/backend/feedback/log.js
@@ -39,7 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'cpu', title: __('Cpu'), operate: 'LIKE'},
{field: 'oem', title: __('Oem'), operate: 'LIKE'},
{field: 'app', title: __('App'), operate: 'LIKE'},
- {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
+ // {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
diff --git a/public/assets/js/backend/install/log.js b/public/assets/js/backend/install/log.js
index b91bbb6..465e317 100644
--- a/public/assets/js/backend/install/log.js
+++ b/public/assets/js/backend/install/log.js
@@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'cpu', title: __('Cpu'), operate: 'LIKE'},
{field: 'oem', title: __('Oem'), operate: 'LIKE'},
{field: 'app', title: __('App'), operate: 'LIKE'},
- {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
+ // {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
diff --git a/public/assets/js/backend/uninstall/log.js b/public/assets/js/backend/uninstall/log.js
index 9c304f7..2e1126f 100644
--- a/public/assets/js/backend/uninstall/log.js
+++ b/public/assets/js/backend/uninstall/log.js
@@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'cpu', title: __('Cpu'), operate: 'LIKE'},
{field: 'oem', title: __('Oem'), operate: 'LIKE'},
{field: 'app', title: __('App'), operate: 'LIKE'},
- {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
+ // {field: 'dev_type', title: __('Dev_type'), operate: 'LIKE'},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]