lmh188
/
upgrade
mirror of http://cd.holdtecs.net:8099/luoliangyi163/upgrade
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1.删除不需要的字段 

2.增加锁定字段
This commit is contained in:
appqy 2022-11-15 13:15:01 +08:00
parent b463666593
commit f35d165e53
10 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/lang/zh-cn/blacklog.php
View File

@ -4,7 +4,7 @@ return [
'Id' => 'ID', 'Id' => 'ID',
'Sn' => '设备序列号', 'Sn' => '设备序列号',
'Name' => '设备名称', 'Name' => '设备名称',
'Dev_type' => '设备型号', 'Lock' => '锁定',
'V' => '固件版本', 'V' => '固件版本',
'Localid' => 'localid', 'Localid' => 'localid',
'Mac' => 'MAC', 'Mac' => 'MAC',

2
application/admin/lang/zh-cn/blackollog.php
View File

@ -4,7 +4,7 @@ return [
'Id' => 'ID', 'Id' => 'ID',
'Sn' => '设备序列号', 'Sn' => '设备序列号',
'Name' => '设备名称', 'Name' => '设备名称',
'Dev_type' => '设备型号', 'Lock' => '锁定',
'V' => '固件版本', 'V' => '固件版本',
'Localid' => 'localid', 'Localid' => 'localid',
'Mac' => 'MAC', 'Mac' => 'MAC',

2
application/api/controller/Info.php
View File

@ -26,7 +26,7 @@ class Info extends Api
"v" => $body['v'] ?? "", "v" => $body['v'] ?? "",
"ip" => $this->request->ip(), "ip" => $this->request->ip(),
"sn" => $body['sn'] ?? "", "sn" => $body['sn'] ?? "",
"dev_type" => $body['dev_type'] ?? "", "lock" => intval($body['lock']),
"createtime" => time(), "createtime" => time(),
]; ];
$black_log = new \app\admin\model\Blacklog(); $black_log = new \app\admin\model\Blacklog();

8
application/api/controller/Recode.php
View File

@ -48,7 +48,7 @@ class Recode extends Api
"cpu" => $body['cpu'] ?? "", "cpu" => $body['cpu'] ?? "",
"oem" => $body['oem'] ?? "", "oem" => $body['oem'] ?? "",
"app" => $body['app'] ?? "", "app" => $body['app'] ?? "",
"dev_type" => $body['dev_type'] ?? "", // "dev_type" => $body['dev_type'] ?? "",
]; ];
$install_log = new \app\admin\model\install\Log; $install_log = new \app\admin\model\install\Log;
$install_log->save($post); $install_log->save($post);
@ -66,7 +66,7 @@ class Recode extends Api
"cpu" => $body['cpu'] ?? "", "cpu" => $body['cpu'] ?? "",
"oem" => $body['oem'] ?? "", "oem" => $body['oem'] ?? "",
"app" => $body['app'] ?? "", "app" => $body['app'] ?? "",
"dev_type" => $body['dev_type'] ?? "", // "dev_type" => $body['dev_type'] ?? "",
]; ];
$uninstalll_log = new \app\admin\model\uninstall\Log; $uninstalll_log = new \app\admin\model\uninstall\Log;
$uninstalll_log->save($post); $uninstalll_log->save($post);
@ -86,7 +86,7 @@ class Recode extends Api
"cpu" => $body['cpu'] ?? "", "cpu" => $body['cpu'] ?? "",
"oem" => $body['oem'] ?? "", "oem" => $body['oem'] ?? "",
"app" => $body['app'] ?? "", "app" => $body['app'] ?? "",
"dev_type" => $body['dev_type'] ?? "", // "dev_type" => $body['dev_type'] ?? "",
]; ];
$collapse_log = new \app\admin\model\collapse\Log; $collapse_log = new \app\admin\model\collapse\Log;
$collapse_log->save($post); $collapse_log->save($post);
@ -106,7 +106,7 @@ class Recode extends Api
"cpu" => $body['cpu'] ?? "", "cpu" => $body['cpu'] ?? "",
"oem" => $body['oem'] ?? "", "oem" => $body['oem'] ?? "",
"app" => $body['app'] ?? "", "app" => $body['app'] ?? "",
"dev_type" => $body['dev_type'] ?? "", // "dev_type" => $body['dev_type'] ?? "",
]; ];
$collapse_log = new \app\admin\model\feedback\Log; $collapse_log = new \app\admin\model\feedback\Log;
$collapse_log->save($post); $collapse_log->save($post);

11
public/assets/js/backend/blacklog.js
View File

@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'id', title: __('Id')}, {field: 'id', title: __('Id')},
{field: 'sn', title: __('Sn'), operate: 'LIKE'}, {field: 'sn', title: __('Sn'), operate: 'LIKE'},
{field: 'name', title: __('Name'), 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: 'v', title: __('V'), operate: 'LIKE'},
{field: 'localid', title: __('Localid'), operate: 'LIKE'}, {field: 'localid', title: __('Localid'), operate: 'LIKE'},
{field: 'mac', title: __('Mac'), operate: 'LIKE'}, {field: 'mac', title: __('Mac'), operate: 'LIKE'},
@ -51,6 +51,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
api: { api: {
bindevent: function () { bindevent: function () {
Form.api.bindevent($("form[role=form]")); Form.api.bindevent($("form[role=form]"));
},
formatter: {
lock: function (value, row, index) {
if(value == '1'){
return "<span class=\"text-success\"><i class=\"fa fa-circle\"></i> 锁定</span>";
}else{
return "<span class=\"text-grey\"><i class=\"fa fa-circle\"></i> 解锁</span>";
}
}
} }
} }
}; };

14
public/assets/js/backend/blackollog.js
View File

@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'id', title: __('Id')}, {field: 'id', title: __('Id')},
{field: 'sn', title: __('Sn'), operate: 'LIKE'}, {field: 'sn', title: __('Sn'), operate: 'LIKE'},
{field: 'name', title: __('Name'), 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: 'v', title: __('V'), operate: 'LIKE'},
{field: 'localid', title: __('Localid'), operate: 'LIKE'}, {field: 'localid', title: __('Localid'), operate: 'LIKE'},
{field: 'mac', title: __('Mac'), operate: 'LIKE'}, {field: 'mac', title: __('Mac'), operate: 'LIKE'},
@ -54,8 +54,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
api: { api: {
bindevent: function () { bindevent: function () {
Form.api.bindevent($("form[role=form]")); Form.api.bindevent($("form[role=form]"));
},
formatter: {
lock: function (value, row, index) {
if(value == '1'){
return "<span class=\"text-success\"><i class=\"fa fa-circle\"></i> 锁定</span>";
}else{
return "<span class=\"text-grey\"><i class=\"fa fa-circle\"></i> 解锁</span>";
}
}
} }
} },
}; };
return Controller; return Controller;
}); });

2
public/assets/js/backend/collapse/log.js
View File

@ -39,7 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'cpu', title: __('Cpu'), operate: 'LIKE'}, {field: 'cpu', title: __('Cpu'), operate: 'LIKE'},
{field: 'oem', title: __('Oem'), operate: 'LIKE'}, {field: 'oem', title: __('Oem'), operate: 'LIKE'},
{field: 'app', title: __('App'), 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: '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} {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}

2
public/assets/js/backend/feedback/log.js
View File

@ -39,7 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'cpu', title: __('Cpu'), operate: 'LIKE'}, {field: 'cpu', title: __('Cpu'), operate: 'LIKE'},
{field: 'oem', title: __('Oem'), operate: 'LIKE'}, {field: 'oem', title: __('Oem'), operate: 'LIKE'},
{field: 'app', title: __('App'), 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: '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} {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
] ]

2
public/assets/js/backend/install/log.js
View File

@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'cpu', title: __('Cpu'), operate: 'LIKE'}, {field: 'cpu', title: __('Cpu'), operate: 'LIKE'},
{field: 'oem', title: __('Oem'), operate: 'LIKE'}, {field: 'oem', title: __('Oem'), operate: 'LIKE'},
{field: 'app', title: __('App'), 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: '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} {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}

2
public/assets/js/backend/uninstall/log.js
View File

@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'cpu', title: __('Cpu'), operate: 'LIKE'}, {field: 'cpu', title: __('Cpu'), operate: 'LIKE'},
{field: 'oem', title: __('Oem'), operate: 'LIKE'}, {field: 'oem', title: __('Oem'), operate: 'LIKE'},
{field: 'app', title: __('App'), 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: '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} {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
] ]