no message

api/application/controllers/Home.php

@@ -503,8 +503,8 @@ class Home extends Base_Controller {
         $history_info_log = array(
             array('name'=>'运行天数','field'=>'L.rundays','fields1'=>'rundays','enname'=>'Running duration'),
             array('name'=>'蓄电池总充满次数','field'=>'L.fulltimes','fields1'=>'fulltimes','enname'=>'Full charge times'),
-            array('name'=>'蓄电池总充电安时数(ah)','field'=>'L.totalchargeah','fields1'=>'totalchargeah','enname'=>'Total charge AH(ah)'),
-            array('name'=>'蓄电池总放电安时数(ah)','field'=>'L.totaldischarah','fields1'=>'totaldischarah','enname'=>'Total discharge AH(ah)'),
+            // array('name'=>'蓄电池总充电安时数(ah)','field'=>'L.totalchargeah','fields1'=>'totalchargeah','enname'=>'Total charge AH(ah)'),
+            // array('name'=>'蓄电池总放电安时数(ah)','field'=>'L.totaldischarah','fields1'=>'totaldischarah','enname'=>'Total discharge AH(ah)'),
             array('name'=>'版本号','field'=>'L.softwareVersion','fields1'=>'softwareVersion','enname'=>'Version information'),
         );
         $fields = array_merge($def,$lampinfo,$lamp_info_log,$solar_info_log,$battery_info_log,$electric_info_log,$system_info_log,$history_info_log);

api/application/controllers/Map.php

@@ -705,12 +705,12 @@ class Map extends Base_Controller{
             $data['lighting_count'] = intval($lighting_arr['num']);
             $data['failure_rate'] = round($failure/$arr['num']*100, 2);
             $data['failure_count'] = intval($failure);
-            $data['totalgeneration'] = round($arr['power'], 2);
+            $data['totalgeneration'] = round($arr['power']/1000, 2);
             $data['total_lamp'] = intval($arr['num']);
-            $data['co2_emission'] = round($arr['power']*0.977, 3);
+            $data['co2_emission'] = round($arr['power']*0.977/1000, 3);
             $data['so2_emission'] = round($arr['power']*0.977/2620*8.5, 3);
             $data['coal_saving'] = round($arr['power']*0.977/2620, 3);
-            $data['totalconsumption'] = round($arr['totalconsumption'],2);
+            $data['totalconsumption'] = round($arr['totalconsumption']/1000,2);
         } else {
             $data['online_rate'] = 0;
             $data['failure_rate'] = 0;

api/application/models/Lamp_model.php

@@ -417,11 +417,11 @@ class Lamp_model extends Base_model {
 		// L.totalgeneration AS epower 
 		// FROM lampinfo AS L 
 		// WHERE {$condition} GROUP BY L.id) Temp";
-		if (empty($type)) {
-			$sql = "SELECT SUM(lampcount) AS num, SUM(totalinstall) AS install, SUM(totalgeneration) AS power,SUM(totalconsumption) as totalconsumption,avg(online) as online,avg(light) as light
-			FROM project  
-			WHERE {$condition} ";
-		}else{
+		// if (empty($type)) {
+		// 	$sql = "SELECT SUM(lampcount) AS num, SUM(totalinstall) AS install, SUM(totalgeneration) AS power,SUM(totalconsumption) as totalconsumption,avg(online) as online,avg(light) as light
+		// 	FROM project  
+		// 	WHERE {$condition} ";
+		// }else{
 			if ($projectid > 0) {
 				$condition = "projectid = {$projectid}";
 			} elseif ($role == SYSTEM_ADMIN) {
@@ -434,10 +434,12 @@ class Lamp_model extends Base_model {
 					$condition = "projectid in ({$projectIds})";
 				}
 			}
+			// var_dump($condition);
 			$sql = "SELECT COUNT(*) AS num, SUM(boardpower) AS install, SUM(totalgeneration) AS power,SUM(totalconsumption) as totalconsumption FROM lampinfo WHERE {$condition}";
-		}
+		// }
 		$query = $this->db->query($sql);
 		$arrRet = $query->row_array();
+		// var_dump($arrRet);die;
 		return $arrRet;
 	}