修复细节

application/em/view/region/region_list.html

@@ -79,9 +79,9 @@
             var map = new BMap.Map("allmap", {enableMapClick: false, minZoom: 11, maxZoom: 14});
             var point = new BMap.Point(116.40387397, 39.91488908);
 
-            var iconR = new BMap.Icon("http://demojz.gonn.tech/static/admin/image/1.png", new BMap.Size(25, 25));
-            var iconY = new BMap.Icon("http://demojz.gonn.tech/static/admin/image/2.png", new BMap.Size(25, 25));
-            var iconB = new BMap.Icon("http://demojz.gonn.tech/static/admin/image/3.png", new BMap.Size(25, 25));
+            var iconR = new BMap.Icon("http://demojz.gonn.tech/static/admin/image/3.png", new BMap.Size(25, 25));
+            var iconY = new BMap.Icon("http://demojz.gonn.tech/static/admin/image/1.png", new BMap.Size(25, 25));
+            var iconB = new BMap.Icon("http://demojz.gonn.tech/static/admin/image/2.png", new BMap.Size(25, 25));
             var valueR=0,valueY=0,valueB=0;
 
             //初始化地图配置
@@ -212,11 +212,11 @@
                     if (data.status === 0) {
                         if(jz_state <= 3){
                             $('#valueB').text(valueB++);
-                            var marker = new BMap.Marker(data.points[0], {icon: iconY});
+                            var marker = new BMap.Marker(data.points[0], {icon: iconB});
                         }
                         else if(jz_state > 3 && jz_state <= 9){
                             $('#valueY').text(valueY++);
-                            var marker = new BMap.Marker(data.points[0], {icon: iconB});
+                            var marker = new BMap.Marker(data.points[0], {icon: iconY});
                         }
                         else if(jz_state > 9){
                             $('#valueR').text(valueR++);

application/jz/controller/Guest.php

@@ -30,18 +30,44 @@ class guest extends Controller
             ->where('VALUE','=',$data->jz_yys)->find();
 
         if($yys) $data->jz_yys = $yys['yys_name'];
-
-
         $construct = Dictionary::field('name as qy')
             ->where('type','LIKE','%JZ_QY%')
             ->where('VALUE','=',$data->jz_qy)->find();
 
         if($construct) $data->jz_construct = $construct['qy'];
 
-        $data->tag = 2;
+        $data->tag = 1;
         $devs = \app\jz\model\Index::getDevs($id);
         $this->assign('devs',$devs);
         $this->assign('data',$data);
-        return $this->fetch("index/detail");
+
+        $us = Db::connect('db_config1')
+            ->table('em_useage')->alias('eu')
+            ->field('eu.*,em.em_numb')
+            ->join(['em'],'em.id=eu.em_id')
+            ->join(['station_info'=>'s'],'em.station_id=s.station_id')
+            ->where('s.proj_number','=',$data->project_code)
+            ->order('eu.last_date desc')
+            ->select();
+        //计算功耗
+        if($us) {
+            $ues = [];
+            if (count($us) == count($us, 1)) {
+                $ues[] = $us;
+            } else {
+                $ues = $us;
+            }
+            foreach ($ues as $k => $v) {
+                $ues[$k]['last_date'] = date('Y-m-d',$v['last_date']);
+                $ues[$k]['current_date'] = date('Y-m-d',$v['current_date']);
+
+                $ues[$k]['repo'] = floor($v['current_sum_numb'] - $v['last_sum_numb']);
+                $days = floor(($v['current_date'] - $v['last_date']) / (3600 * 24));
+                $ues[$k]['power'] = round($ues[$k]['repo'] / $days, 2);
+            }
+        }
+
+        $this->assign('useage',isset($ues)?$ues:[]);
+        return $this->fetch();
     }
 }
\ No newline at end of file

application/jz/controller/Index.php

@@ -73,6 +73,7 @@ class Index extends Base
 
         $us = Db::connect('db_config1')
                     ->table('em_useage')->alias('eu')
+                    ->field('eu.*,em.em_numb')
                     ->join(['em'],'em.id=eu.em_id')
                     ->join(['station_info'=>'s'],'em.station_id=s.station_id')
                     ->where('s.proj_number','=',$data->project_code)

application/jz/view/index/detail.html

@@ -191,6 +191,7 @@
                                         <tbody>
                                         {volist name="useage" id="u"}
                                         <tr>
+                                            <td>{$u.em_numb}</td></td>
                                             <td>{$u.last_date}</td>
                                             <td>{$u.current_date}</td>
                                             <td>{$u.repo}</td>
@@ -272,7 +273,7 @@
                                                     <span class="qrtitle">
                                                         站点编号:
                                                     </span>
-            <span class="qrval">{$data.project_code}</span>
+            <span class="qrval">{$data.jz_code}</span>
         </div>
 
 

application/jz/view/index/index.html

@@ -33,11 +33,12 @@
                             <thead>
                             <tr>
                                 <th lay-data="{field:'jz_code',width:'8%'}">站号</th>
-                                <th lay-data="{field:'jz_name',width:'22%'}">名称</th>
-                                <th lay-data="{field:'project_code',width:'15%'}">项目编码</th>
+                                <th lay-data="{field:'jz_name',width:'19%'}">名称</th>
+                                <th lay-data="{field:'project_code',width:'13%'}">项目编码</th>
                                 <th lay-data="{field:'business_id',width:'20%'}">资产编码</th>
-                                <th lay-data="{field:'qy',width:'8%'} ">区域</th>
+                                <th lay-data="{field:'qy',width:'5%'} ">区域</th>
                                 <th lay-data="{field:'yys',width:'8%'} ">运营商</th>
+                                <th lay-data="{templet: '#status',sort: true,width:'7%'} ">基站状态</th>
                                 <th lay-data="{field:'create_date',width:'12%'}">创建时间</th>
                                 <th lay-data="{fixed: 'right', align:'center', toolbar: '#barDemo'}">操作</th>
                             </tr>
@@ -55,6 +56,20 @@
             class="layui-btn layui-btn-sm">查看
     </button>
 </script>
+<script type="text/html" id="status">
+    {{# if(d.jz_state <= 3){ }}
+    <span class="layui-bg-yellow">施工</span>
+    {{# } }}
+
+    {{# if(d.jz_state > 3 && d.jz_state <= 9){ }}
+    <span class="layui-bg-green" title="{{ d.info }}">开通</span>
+    {{# } }}
+
+    {{# if(d.jz_state > 9){ }}
+    <span class="layui-bg-red">开通</span>
+    {{# } }}
+
+</script>
 <script>
     layui.use(['laydate', 'form', 'table'], function () {
     });