Merge branch 'master' of http://gogs.weclouds.xyz:3000/crazycat/IDCOL

api/application/controllers/Lampcontrol.php

@@ -604,6 +604,7 @@ class Lampcontrol extends Base_Controller {
         // $data['light_voltage']         = $this->input->post('light_voltage',true);
         $data['intell_power']    = $this->input->post('intell_power',true);
         $data['light_type']   = $this->input->post('light_type',true);
+        $data['load_current']   = $this->input->post('load_current',true);
         $data['first_light_time']    = $this->input->post('first_light_time',true);
         $data['first_light_human_power']   = $this->input->post('first_light_human_power',true);
         $data['first_light_unman_power']    = $this->input->post('first_light_unman_power',true);
@@ -650,6 +651,7 @@ class Lampcontrol extends Base_Controller {
 
         $data['intell_power']    = $this->input->post('intell_power',true);
         $data['light_type']   = $this->input->post('light_type',true);
+        $data['load_current']   = $this->input->post('load_current',true);
         $data['first_light_time']    = $this->input->post('first_light_time',true);
         $data['first_light_human_power']   = $this->input->post('first_light_human_power',true);
         $data['first_light_unman_power']    = $this->input->post('first_light_unman_power',true);
@@ -685,6 +687,8 @@ class Lampcontrol extends Base_Controller {
                 $m = $t[0]*60+$t[1];
                 $m = round($m/10);
                 $word = substr('00'.base_convert($m, 10, 16), -2);
+            }elseif ($key == 'load_current') {
+                $word = substr('0000'.base_convert(round($value/10), 10, 16), -4);
             }else{
                 $word = substr('00'.base_convert($value, 10, 16), -2);
             }
@@ -1016,6 +1020,7 @@ class Lampcontrol extends Base_Controller {
         if ($type == 1) { // 负载参数
             $update['intell_power']    = '2';
             $update['light_type']    = '1';
+            $update['load_current']    = '900';
             $update['first_light_time']    = '00:30';
             $update['first_light_human_power']   = '50';
             $update['first_light_unman_power']    = '20';
@@ -1088,30 +1093,33 @@ class Lampcontrol extends Base_Controller {
                 $data = array();
                 $data['intell_power'] = base_convert(substr($res['msg'], 18,1), 16, 10).''; // 智能功率
                 $data['light_type'] = base_convert(substr($res['msg'], 19,1), 16, 10).''; // 灯控模式
-                $data['first_light_time'] = base_convert(substr($res['msg'], 20,2), 16, 10).''; // 第一段亮灯时间
-                $data['first_light_human_power'] = base_convert(substr($res['msg'], 22,2), 16, 10).''; // 第一段有人功率
-                $data['first_light_unman_power'] = base_convert(substr($res['msg'], 24,2), 16, 10).''; // 第一段无人功率
-                $data['second_light_time'] = base_convert(substr($res['msg'], 26,2), 16, 10).''; // 第二段亮灯时间
-                $data['second_light_human_power'] = base_convert(substr($res['msg'], 28,2), 16, 10).''; // 第二段有人功率
-                $data['second_light_unman_power'] = base_convert(substr($res['msg'], 30,2), 16, 10).''; // 第二段无人功率
-                $data['third_light_time'] = base_convert(substr($res['msg'], 32,2), 16, 10).''; // 第三段亮灯时间
-                $data['third_light_human_power'] = base_convert(substr($res['msg'], 34,2), 16, 10).''; // 第三段有人功率
-                $data['third_light_unman_power'] = base_convert(substr($res['msg'], 36,2), 16, 10).''; // 第三段无人功率
-                $data['fourth_light_time'] = base_convert(substr($res['msg'], 38,2), 16, 10).''; // 第四段亮灯时间
-                $data['fourth_light_human_power'] = base_convert(substr($res['msg'], 40,2), 16, 10).''; // 第四段有人功率
-                $data['fourth_light_unman_power'] = base_convert(substr($res['msg'], 42,2), 16, 10).''; // 第四段无人功率
-                $data['fifth_light_time'] = base_convert(substr($res['msg'], 44,2), 16, 10).''; // 第五段亮灯时间
-                $data['fifth_light_human_power'] = base_convert(substr($res['msg'], 46,2), 16, 10).''; // 第五段有人功率
-                $data['fifth_light_unman_power'] = base_convert(substr($res['msg'], 48,2), 16, 10).''; // 第五段无人功率
-                $data['sixth_light_time'] = base_convert(substr($res['msg'], 50,2), 16, 10).''; // 第六段亮灯时间
-                $data['sixth_light_human_power'] = base_convert(substr($res['msg'], 52,2), 16, 10).''; // 第六段有人功率
-                $data['sixth_light_unman_power'] = base_convert(substr($res['msg'], 54,2), 16, 10).''; // 第六段无人功率
-                $data['seventh_light_time'] = base_convert(substr($res['msg'], 56,2), 16, 10).''; // 第七段亮灯时间
-                $data['seventh_light_human_power'] = base_convert(substr($res['msg'], 58,2), 16, 10).''; // 第七段有人功率
-                $data['seventh_light_unman_power'] = base_convert(substr($res['msg'], 60,2), 16, 10).''; // 第七段无人功率
-                $data['tenth_light_time'] = base_convert(substr($res['msg'], 62,2), 16, 10).''; // 晨亮时间
-                $data['tenth_light_human_power'] = base_convert(substr($res['msg'], 64,2), 16, 10).''; // 晨亮有人功率
-                $data['tenth_light_unman_power'] = base_convert(substr($res['msg'], 68,2), 16, 10).''; // 晨亮无人功率
+                $data['load_current'] = (base_convert(substr($res['msg'], 20,4), 16, 10)*10).''; // 负载电流
+                $data['first_light_time'] = base_convert(substr($res['msg'], 24,2), 16, 10).''; // 第一段亮灯时间
+                $data['first_light_human_power'] = base_convert(substr($res['msg'], 26,2), 16, 10).''; // 第一段有人功率
+                $data['first_light_unman_power'] = base_convert(substr($res['msg'], 28,2), 16, 10).''; // 第一段无人功率
+                $data['second_light_time'] = base_convert(substr($res['msg'], 30,2), 16, 10).''; // 第二段亮灯时间
+                $data['second_light_human_power'] = base_convert(substr($res['msg'], 32,2), 16, 10).''; // 第二段有人功率
+                $data['second_light_unman_power'] = base_convert(substr($res['msg'], 34,2), 16, 10).''; // 第二段无人功率
+                $data['third_light_time'] = base_convert(substr($res['msg'], 36,2), 16, 10).''; // 第三段亮灯时间
+                $data['third_light_human_power'] = base_convert(substr($res['msg'], 38,2), 16, 10).''; // 第三段有人功率
+                $data['third_light_unman_power'] = base_convert(substr($res['msg'], 40,2), 16, 10).''; // 第三段无人功率
+                $data['fourth_light_time'] = base_convert(substr($res['msg'], 42,2), 16, 10).''; // 第四段亮灯时间
+                $data['fourth_light_human_power'] = base_convert(substr($res['msg'], 44,2), 16, 10).''; // 第四段有人功率
+                $data['fourth_light_unman_power'] = base_convert(substr($res['msg'], 46,2), 16, 10).''; // 第四段无人功率
+                $data['fifth_light_time'] = base_convert(substr($res['msg'], 48,2), 16, 10).''; // 第五段亮灯时间
+                $data['fifth_light_human_power'] = base_convert(substr($res['msg'], 50,2), 16, 10).''; // 第五段有人功率
+                $data['fifth_light_unman_power'] = base_convert(substr($res['msg'], 52,2), 16, 10).''; // 第五段无人功率
+                $data['sixth_light_time'] = base_convert(substr($res['msg'], 54,2), 16, 10).''; // 第六段亮灯时间
+                $data['sixth_light_human_power'] = base_convert(substr($res['msg'], 56,2), 16, 10).''; // 第六段有人功率
+                $data['sixth_light_unman_power'] = base_convert(substr($res['msg'], 58,2), 16, 10).''; // 第六段无人功率
+                $data['seventh_light_time'] = base_convert(substr($res['msg'], 60,2), 16, 10).''; // 第七段亮灯时间
+                $data['seventh_light_human_power'] = base_convert(substr($res['msg'], 62,2), 16, 10).''; // 第七段有人功率
+                $data['seventh_light_unman_power'] = base_convert(substr($res['msg'], 64,2), 16, 10).''; // 第七段无人功率
+                $data['tenth_light_time'] = base_convert(substr($res['msg'], 66,2), 16, 10).''; // 晨亮时间
+                $data['tenth_light_human_power'] = base_convert(substr($res['msg'], 68,2), 16, 10).''; // 晨亮有人功率
+                $data['tenth_light_unman_power'] = base_convert(substr($res['msg'], 70,2), 16, 10).''; // 晨亮无人功率
+                // $data['tenth_light_human_power'] = base_convert(substr($res['msg'], 64,2), 16, 10).''; // 晨亮有人功率
+                // $data['tenth_light_unman_power'] = base_convert(substr($res['msg'], 68,2), 16, 10).''; // 晨亮无人功率
                 // $data['begin_voltage'] = round(base_convert(substr($res['msg'], 146,4), 16, 10)/10,1).''; // 智能功率USER1起始电压
                 // $data['end_voltage'] = round(base_convert(substr($res['msg'], 150,4), 16, 10)/10,1).''; // 智能功率USER1终止电压
                 // $data['end_current'] = round(base_convert(substr($res['msg'], 158,4), 16, 10)/100,2).''; // 智能功率USER1终止电流

webConfig/src/views/alarmMaintenance/alarmMaintenance.vue

@@ -355,13 +355,13 @@
                 /*表格*/
                 tableList:[],
                 multipleSelection:[],
-                alarmTableList:[
-                  {prop:'project',label:'项目名称'},
-                  {prop:'number',label:'报警路灯'},
-                  {prop:'stralarmtype',label:'报警事件'},
-                  {prop:'statusStr',label:'是否已处理'},
-                  {prop:'updatetime',label:'更新时间'}
-                ],
+                // alarmTableList:[
+                //   {prop:'project',label:'项目名称'},
+                //   {prop:'number',label:'报警路灯'},
+                //   {prop:'stralarmtype',label:'报警事件'},
+                //   {prop:'statusStr',label:'是否已处理'},
+                //   {prop:'updatetime',label:'更新时间'}
+                // ],
                 alarmTableListEN:[
                   {prop:'project',label:'Project name'},
                   {prop:'number',label:'Alarm lamp'},
@@ -436,16 +436,16 @@
         },
         mounted(){
             this.alarmTableListEN = [
-                {prop:'project',label:'Project name',width:8*this.remRatio},
-                {prop:'number',label:'Alarm lamp',width:8*this.remRatio},
+                {prop:'project',label:'Project name',width:9*this.remRatio},
+                {prop:'number',label:'Alarm lamp',width:9*this.remRatio},
                 {prop:'stralarmtype',label:'Alarm event',align:"left"},
                 {prop:'statusStr',label:'whether processed',width:12*this.remRatio},
                 {prop:'updatetime',label:'Update time',width:13*this.remRatio}
             ];
 
             this.patrolTableListEN = [
-                {prop:'project_name',label:'Project name'},
-                {prop:'number',label:'Lamp Number'},
+                {prop:'project_name',label:'Project name',width:9*this.remRatio},
+                {prop:'number',label:'Lamp Number',width:9*this.remRatio},
                 {prop:'patrolinterval',label:'Inspection interval time(min)'}
             ]
             this.alarmNav = 'Alarm';
@@ -826,7 +826,7 @@
                 this)
             },
             exportExcel(){
-                if(this.alarmNav != '巡检设置' && this.alarmNav != 'Inspection setup'){
+                if(this.alarmNav != 'Inspection setup'){
                     this.alarmGet(this.currentPage,data => {
                         // console.log(data)
                         this.loading.exportExcel = false;
@@ -1107,18 +1107,18 @@
             },
             alarmNavFun(type){
                 this.alarmNav = type;
-                if(type == '告警信息' || type == 'Alarm'){
+                if(type == 'Alarm'){
                     this.alarmGet(1,() => {
                         // console.log(data)
                     })
                 }
-                if(type == '历史告警' || type == 'Historical alarm'){
+                if(type == 'Historical alarm'){
                     this.alarmGet(1,() => {
                         // console.log(data)
                     })
                 }
                 // console.log(type)
-                if(type == '巡检设置' || type == 'Inspection setup'){
+                if(type == 'Inspection setup'){
                     this.patrol_list(1,() => {
                         // console.log(data)
                     })

webConfig/src/views/dashboard.vue

@@ -111,7 +111,7 @@
                             </div> -->
                             <div class="li">
                                 <p class="p1" :title="statisticInfo.electricity">{{statisticInfo.electricity?statisticInfo.electricity:0}}</p>
-                                <p class="p2">Electricity(Wh)</p>
+                                <p class="p2">Electricity(kWh)</p>
                             </div>
                             <div class="li">
                                 <p class="p1" :title="statisticInfo.CO2_reduction">{{statisticInfo.CO2_reduction?statisticInfo.CO2_reduction:0}}</p>
@@ -119,7 +119,7 @@
                             </div>
                             <div class="li">
                                 <p class="p1" :title="statisticInfo.SO2_reduction">{{statisticInfo.SO2_reduction?statisticInfo.SO2_reduction:0}}</p>
-                                <p class="p2">SO2 reduction(g)</p>
+                                <p class="p2">SO2 reduction(Kg)</p>
                             </div>
                             <div class="li">
                                 <p class="p1" :title="statisticInfo.TCE_reduction">{{statisticInfo.TCE_reduction?statisticInfo.TCE_reduction:0}}</p>

webConfig/src/views/historicalData/historicalData.vue

@@ -63,7 +63,7 @@
                         v-loading="loading.table"
                         ref="multipleTable"
                         @selection-change="handleSelectionChange"
-                        v-if="reportType == 'table' || (reportType == 'report'&&(reportNav=='列表'||reportNav=='Lists'))"
+                        v-if="reportType == 'table' || (reportType == 'report'&&(reportNav=='Lists'))"
                         :data="tableData"
                         border
                         style="width: 100%"
@@ -160,7 +160,7 @@
                     <div class="paging_box">
                         <el-button type="primary" :class="{'report_bottton':reportType == 'report'}" icon="el-icon-check" round @click="reportTypeFun()" v-if="reportType == 'table' || (reportType == 'report'&&reportNav=='Lists')" style="width: 230px;">{{reportTypeBt}}</el-button>
                         <el-pagination
-                          v-if="reportType == 'table' || (reportType == 'report'&&(reportNav=='列表'||reportNav=='Lists'))"
+                          v-if="reportType == 'table' || (reportType == 'report'&&(reportNav=='Lists'))"
                           @size-change="handleSizeChange"
                           @current-change="handleCurrentChange"
                           :current-page.sync="currentPage"
@@ -656,7 +656,7 @@
             reportNavFun(type){
                 if(!this.loading.table){
                     this.reportNav = type;
-                    if(type != '列表' && type != 'Lists'){
+                    if(type != 'Lists'){
                         if(this.reportNavFunIsTrue){
                             this.reportNavFunIsTrue = false;
 
@@ -717,7 +717,6 @@
                 }else{
                     this.reportType = 'table';
                     this.reportNav = 'Lists';
-                    this.reportTypeBt = '查看选中路灯';
                     this.reportTypeBt = 'See selected street lights';
                     this.currentPage = 1;
                     this.reportHome(this.currentPage,0,data => {
@@ -767,7 +766,7 @@
                     data =>{
                         if(type == 0){
                             if(callback){
-                                if(this.reportNav == '列表' || type == 'Lists'){
+                                if(this.reportNav == 'Lists'){
                                     this.tableData = data.data.list;
                                     this.currentPage = value;
                                     this.total = data.data.total*this.pageSize;