no message

api/application/controllers/Home.php

@@ -528,7 +528,7 @@ class Home extends Base_Controller {
             // array('name'=>'套餐剩余','field'=>'N.packageSurplus','fields1'=>'packageSurplus','enname'=>'Package surplus'),
             array('name'=>'路灯类型','field'=>'L.lamptype','fields1'=>'lamptype','enname'=>'Lamp type'),
             array('name'=>'太阳能板类型','field'=>'L.boardtype','fields1'=>'boardtype','enname'=>'Solar panel type'),
-            // array('name'=>'太阳能板功率(W)','field'=>'L.boardpower','fields1'=>'boardpower','enname'=>'Solar panel power(W)'),
+            // array('name'=>'太阳能板功率(配置)(W)','field'=>'L.boardpower','fields1'=>'boardpower','enname'=>'Solar panel power(config)(W)'),
             // array('name'=>'蓄电池类型','field'=>'L.batterytype','fields1'=>'batterytype','enname'=>'Battery type'),
             array('name'=>'蓄电池AH数(ah)','field'=>'L.batteryah','fields1'=>'batteryah','enname'=>'Battery capacity(ah)'),
             array('name'=>'额定功率(W)','field'=>'L.loadpower','fields1'=>'loadpower','enname'=>'Load power(W)'),

api/application/controllers/Lampcontrol.php

@@ -966,12 +966,13 @@ class Lampcontrol extends Base_Controller {
         $data["lamptype"] = $this->input->post('lamptype',true);
         $data["boardtype"] = $this->input->post('boardtype',true);
         $data["batterytype"] = $this->input->post('batterytype',true);
-        $data["boardpower"] = $this->input->post('boardpower',true);
+        $solarpower = $this->input->post('boardpower',true);
         $data["batteryah"] = $this->input->post('batteryah',true);
         $loadpower = $this->input->post('loadpower',true);
         $batteryah = $this->input->post('batteryah',true);
 
         if(!empty($loadpower)) $data["loadpower"] = $loadpower;
+        if(!empty($solarpower)) $data["solarpower"] = $solarpower;
         if(!empty($batteryah)) $data["batteryah"] = $batteryah;
 
         $wattage = $this->input->post('wattage',true);
@@ -1377,7 +1378,7 @@ class Lampcontrol extends Base_Controller {
         }
         if ($datatype == 'lampinfo') {
 
-            $fields = "number,projectid,address,longitude,latitude,section,boardpower,lamptype,boardtype,batteryah,lamppower,loadpower,devstatus,loadtype,supplier,upazilla,po,manu,protocoltype,updatetime,netstatus as status,power,model,fascal_year,fascal_year_phase,iccid,softwareVersion,customer_ID,street_light_SN,customer_name,date,battvoltage,overtimes,solarpower,id";
+            $fields = "number,projectid,address,longitude,latitude,section,lamptype,boardtype,batteryah,lamppower,loadpower,devstatus,loadtype,supplier,upazilla,po,manu,protocoltype,updatetime,netstatus as status,power,model,fascal_year,fascal_year_phase,iccid,softwareVersion,customer_ID,street_light_SN,customer_name,date,battvoltage,overtimes,solarpower as boardpower,id,batterytype";
 
             $res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
             if (empty($res)) {
@@ -1459,19 +1460,19 @@ class Lampcontrol extends Base_Controller {
 
                 'battvoltage' => $res['battvoltage'],
                 'overtimes' => $res['overtimes'],
-                'solarpower' => $res['solarpower'],
+                'boardpower' => $res['boardpower'],
                 "isfaulted" => $res["devstatus"], 
                 "id" => $res["id"], 
                 "project_name" => $this->Project_model->getNameById($res["projectid"]), 
                 "longitude" => $res["longitude"], 
                 "latitude" => $res["latitude"], 
-                // "boardpower" => floatval($res["boardpower"]), 
+                // "solarpower" => floatval($res["solarpower"]), 
                 "lamptype" => $res['lamptype'],
                 'softwareVersion' => $res['softwareVersion'],
                 
                 "boardtype" => $res['boardtype'], 
                 "batteryah" => $res["batteryah"],
-                // 'batterytype' => $res['batterytype'],
+                'batterytype' => $res['batterytype'],
                 'protocoltype'=>intval($res['protocoltype']),
                 'supplier'=>intval($res['supplier']),
                 'upazilla'=>intval($res['upazilla']),