Commit 45dde8163eced77a4e930a3e3cd29ae732db461b

Authored by teemitop
1 parent 38a03300

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

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