vali 6 年 前
コミット
7b33814da8

+ 7 - 9
application/admin/controller/Kfonitoring.php

@@ -14,30 +14,28 @@ class Kfonitoring extends Base
     {
 
         $kfgroup = tools::getKfGroup();
-        $return = [] ;
+        $return = [];
 
         if (request()->isAjax()) {
-            list($groupid,$onlinestatus,$type3) = explode(',',input('get.searchText'));
+            list($groupid, $onlinestatus, $type3) = explode(',', input('get.searchText'));
 
             $logic = new KfjkLogic();
-            $kdidsArray = $logic->getValiKF($groupid,$onlinestatus);
+            $kdidsArray = $logic->getValiKF($groupid, $onlinestatus);
             $return = $logic->getAllData($kdidsArray);
 
-            if (empty($kdidsArray)){
-                $lastreturn['total'] = 0 ;  //总数据
+            if (empty($kdidsArray)) {
+                $lastreturn['total'] = 0;  //总数据
                 $lastreturn['rows'] = [];
-            }else{
+            } else {
                 $lastreturn['total'] = count($return);  //总数据
                 $lastreturn['rows'] = $return;
             }
 
             return json($lastreturn);
         }
-        $this->assign('kfgroup',$kfgroup);
+        $this->assign('kfgroup', $kfgroup);
         return $this->fetch('kfonitoring/kfjiankong');
     }
 
 
-
-
 }

+ 21 - 6
application/common/KfjkLogic.php

@@ -33,16 +33,31 @@ class KfjkLogic
         if (empty($kfuidarray)) {
             return false;
         }
-        $todayall = $this->getTodayServiceData($kfuidarray);
+        $kfuidarray_index = kftoKey($kfuidarray, 1);
+        $uidsname = $this->uidName($kfuidarray);
+        $kfip = $this->getKfinline();
 
-        if (!$todayall) {
-            return false;
+        foreach ($kfuidarray as $uid => $val) {
+            $kfuidarray_index[$uid]['ip'] = $kfip['KF' . $uid]['ip'];
+            $kfuidarray_index[$uid]['status'] = $this->getStatusName($kfip['KF' . $uid]['status']);
+            $kfuidarray_index[$uid]['uid'] = $uid;
+            $kfuidarray_index[$uid]['uidname'] = $uidsname[$uid];
+            $kfuidarray_index[$uid]['hhl'] = 0;
+            $kfuidarray_index[$uid]['jdl'] = 0;
+            $kfuidarray_index[$uid]['pjhysc'] = 0;
+            $kfuidarray_index[$uid]['cpl'] = 0;
+            $kfuidarray_index[$uid]['mydl'] = 0;
+            $kfuidarray_index[$uid]['pjxysc'] = 0;
+            $kfuidarray_index[$uid]['jrxxsc'] = 0;
+            $kfuidarray_index[$uid]['fxx'] = $this->makeBtn($uid);;
         }
 
-        $kfuidarray_index = kftoKey($kfuidarray, 1);
+        $todayall = $this->getTodayServiceData($kfuidarray);
+        if (!$todayall) {
+            GOTO DOLAST;
+        }
 
         $uids = $kfuidarray;
-        $uidsname = $this->uidName($kfuidarray);
         $hyl = $this->hyl($kfuidarray, $todayall);
         $jdl = $this->jdl($kfuidarray, $todayall);
         $pjhysc = $this->pjhusc($kfuidarray, $todayall);
@@ -50,7 +65,6 @@ class KfjkLogic
         $mydl = $this->mydl($kfuidarray, $todayall);
         $pjxysc = $this->pjxysc($kfuidarray, $todayall);
         $jrxxsc = $this->jrxxsc($kfuidarray, $todayall);
-        $kfip = $this->getKfinline();
 
         foreach ($kfuidarray_index as $uid => $val) {
             $kfuidarray_index[$uid]['ip'] = $kfip['KF' . $uid]['ip'];
@@ -67,6 +81,7 @@ class KfjkLogic
             $kfuidarray_index[$uid]['fxx'] = $this->makeBtn($uid);
         }
 
+        DOLAST:
         $last = [];
         foreach ($kfuidarray_index as $val) {
             $last[] = $val;