Commit 45dde8163eced77a4e930a3e3cd29ae732db461b

Authored by teemitop
1 parent 38a03300

设备列表改为在线设备列表

... ... @@ -496,7 +496,7 @@ class Seller extends Common
}
//商家设备列表
public function device_list(){
public function device_list(){
//获取类型
$facturer = Db::query("SELECT * FROM `xt-member-two-LINE`.xt_dc_dz_facturer");
if(Request::isAjax()){
... ... @@ -507,7 +507,7 @@ class Seller extends Common
$limit = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$data['key'].'&channel='.$channel.'&type='.$manufacturer;
//获取运营人员列表
$list= file_get_contents(ON_LINE.'App.Device.GetSellerDevice'.$limit);
$list= file_get_contents(ON_LINE.'App.Device.GetDeviceOnlineStatus'.$limit); //GetSellerDevice
$array = json_decode($list,TRUE);
foreach ($array['data']['list'] as $key => $value) {
switch ($value['type']) {
... ...
... ... @@ -51,7 +51,7 @@
toolbar: '#toolbarDemo',
cols: [[
{checkbox:true,fixed: true},
{field: 'id', title: '{:lang("id")}',width:100,fixed: true},
//{field: 'id', title: '{:lang("id")}',width:100,fixed: true},
{field: 'sid',title: '商家编号',width:100},
{field: 'sellername', title: '所属商家'},
{field: 'device', title: '设备编号'},
... ... @@ -98,10 +98,11 @@
switch(obj.event){
case 'getCheckData':
var data = checkStatus.data;
arr = new Array();
if (data.length > 0) {
for (var i = 0; i < data.length; i++) {
arr.push(data[i]['id']);
arr.push(data[i]['device']);
}
}
if(arr.length <= 0){
... ...