edit

front/templates/pc/device/chart/ajax.html

@@ -1,24 +1,32 @@
 {% if 'deviceInfo' in data and data['deviceInfo'] %}
 <script>
 $("#chart .name").html('{{data['deviceInfo']['name']}}');
-myChart.setOption({
-    xAxis: {
-        data: {% for key,value in enumerate(data['statList']) %}{% if key == 0 %}{% raw value['data']['time'] %}{% end %}{% end %}
-    },
-    yAxis: {
-        type: 'value',
-        axisLabel: {
-            formatter: '{value} {{data['type']['unit']}}'
-        }
-    },
-    series: [
-        {% for key,value in enumerate(data['statList']) %}
-        {% if key > 0 %},{% end %}
-        {
-            data:{% raw value['data']['value'] %}
-        }
-        {% end %}
-        ]
-});
+var date = {% for key,value in enumerate(data['statList']) %}{% if key == 0 %}{% raw value['data']['time'] %}{% end %}{% end %};
+if (date == "") {
+    $("#chart").hide();
+    //$(".crumbs .statMenu").hide();
+} else {
+    myChart.setOption({
+        xAxis: {
+            data: date
+        },
+        yAxis: {
+            type: 'value',
+            axisLabel: {
+                formatter: '{value} {{data['type']['unit']}}'
+            }
+        },
+        series: [
+            {% for key,value in enumerate(data['statList']) %}
+            {% if key > 0 %},{% end %}
+            {
+                data:{% raw value['data']['value'] %}
+            }
+            {% end %}
+            ]
+    });
+    $("#chart").show();
+    //$(".crumbs .statMenu").show();
+}
 </script>
 {% end %}

front/templates/pc/device/chart/page.html

@@ -3,68 +3,73 @@
 // 基于准备好的dom，初始化echarts实例
 var myChart = echarts.init(document.getElementById('main'));
 var date = {% for key,value in enumerate(data['statList']) %}{% if key == 0 %}{% raw value['data']['time'] %}{% end %}{% end %};
-var series = [
-        {% for key,value in enumerate(data['statList']) %}
-        {% if key > 0 %},{% end %}
-        {
-            name:'{{value['name']}}',
-            type:'line',
-            data:{% raw value['data']['value'] %},
-            markPoint: {
-                data: [
-                    {type: 'max', name: '最大值'},
-                    {type: 'min', name: '最小值'}
-                ]
-            },
-            markLine: {
-                data: [
-                    {type: 'average', name: '平均值'}
-                ]
+if (date == "") {
+    $("#main").hide();
+} else {
+    var series = [
+            {% for key,value in enumerate(data['statList']) %}
+            {% if key > 0 %},{% end %}
+            {
+                name:'{{value['name']}}',
+                type:'line',
+                data:{% raw value['data']['value'] %},
+                markPoint: {
+                    data: [
+                        {type: 'max', name: '最大值'},
+                        {type: 'min', name: '最小值'}
+                    ]
+                },
+                markLine: {
+                    data: [
+                        {type: 'average', name: '平均值'}
+                    ]
+                }
             }
-        }
-        {% end %}
-        ];
+            {% end %}
+            ];
 
-// 指定图表的配置项和数据
-var option = {
-    title: {
-        text: '{{data['deviceInfo']['name']}}',
-        subtext: '数据来自{{data['setting']['farmInfo']['name']}}'
-    },
-    tooltip: {
-        trigger: 'axis'
-    },
-    legend: {
-        data:[{% for key,value in enumerate(data['statList']) %}{% if key > 0 %},{% end %}'{{value['name']}}'{% end %}]
-    },
+    // 指定图表的配置项和数据
+    var option = {
+        title: {
+            text: '{{data['deviceInfo']['name']}}',
+            subtext: '数据来自{{data['setting']['farmInfo']['name']}}'
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        legend: {
+            data:[{% for key,value in enumerate(data['statList']) %}{% if key > 0 %},{% end %}'{{value['name']}}'{% end %}]
+        },
 
-    toolbox: {
-        show: true,
-        feature: {
-            dataZoom: {
-                yAxisIndex: 'none'
-            },
-            dataView: {readOnly: false},
-            magicType: {type: ['line', 'bar']},
-            restore: {},
-            saveAsImage: {}
-        }
-    },
-    xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        data: date
-    },
-    yAxis: {
-        type: 'value',
-        axisLabel: {
-            formatter: '{value} {{data['type']['unit']}}'
-        }
-    },
-    series: series
-};
-//myChart.showLoading();
-// 使用刚指定的配置项和数据显示图表。
-//myChart.hideLoading();
-myChart.setOption(option, true);
+        toolbox: {
+            show: true,
+            feature: {
+                dataZoom: {
+                    yAxisIndex: 'none'
+                },
+                dataView: {readOnly: false},
+                magicType: {type: ['line', 'bar']},
+                restore: {},
+                saveAsImage: {}
+            }
+        },
+        xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: date
+        },
+        yAxis: {
+            type: 'value',
+            axisLabel: {
+                formatter: '{value} {{data['type']['unit']}}'
+            }
+        },
+        series: series
+    };
+    //myChart.showLoading();
+    // 使用刚指定的配置项和数据显示图表。
+    //myChart.hideLoading();
+    myChart.setOption(option, true);
+    $("#main").show();
+}
 </script>

front/templates/pc/device/chart/simple.html

@@ -4,7 +4,11 @@
 // 基于准备好的dom，初始化echarts实例
 var myChart = echarts.init(document.getElementById('main'));
 var date = {% for key,value in enumerate(data['statList']) %}{% if key == 0 %}{% raw value['data']['time'] %}{% end %}{% end %};
-var series = [
+if (date == "") {
+    $("#chart").hide();
+    //$(".crumbs .statMenu").hide();
+} else {
+    var series = [
         {% for key,value in enumerate(data['statList']) %}
         {% if key > 0 %},{% end %}
         {
@@ -26,8 +30,8 @@ var series = [
         {% end %}
         ];
 
-// 指定图表的配置项和数据
-var option = {
+    // 指定图表的配置项和数据
+    var option = {
     tooltip: {
         trigger: 'axis'
     },
@@ -42,7 +46,11 @@ var option = {
         }
     },
     series: series
-};
-myChart.setOption(option, true);
+    };
+    myChart.setOption(option, true);
+    $("#chart").show();
+    //$(".crumbs .statMenu").show();
+}
+
 </script>
 {% end %}

front/templates/pc/device/data.html

@@ -49,7 +49,7 @@
 
                 {% if 'stat' in data and data['stat'] %}
                 <div>
-                    <div class="pannel" name="chart" id="chart">
+                    <div class="pannel" name="chart" id="chart" style="display:none;">
                         <h2>今日（<span class="name">{{data['stat']['name']}}</span>）数据趋势</h2>
                         <div class="box" id="main" style="width: 100%;height:405px;"></div>
                     </div> 

front/templates/pc/device/inc/menu.html

@@ -8,8 +8,8 @@
         <li {% if data['device_cur'] == 'pic' %}class="cur"{% end %}><a href="{{data['url']['pic']}}">农作物图像采集</a></li>
         {% end %}
         <li><span>/</span></li>
-        <li {% if data['device_cur'] == 'stat' %}class="cur"{% end %}><a href="{{data['url']['stat']}}">数据统计</a></li>
-        <li><span>/</span></li>
+        <li class="statMenu" {% if data['device_cur'] == 'stat' %}class="cur"{% end %}><a href="{{data['url']['stat']}}">数据统计</a></li>
+        <li class="statMenu"><span>/</span></li>
         <li {% if data['device_cur'] == 'log' %}class="cur"{% end %}><a href="{{data['url']['log']}}">设备记录</a></li>
     </ul>
 </div>

front/templates/pc/device/stat.html

@@ -20,7 +20,7 @@
         <input type="text" name="end" id="end" readonly class="form_datetime" value="{% if 'end' in data['search'] %}{{data['search']['end']}}{% end %}" style="width:150px;">
         <input type="submit" value="查询">  
     </form>
-	<div class="box" id="main" style="width: 100%;height:400px;">
+	<div class="box" id="main" style="width: 100%;height:400px;display:none;">
     </div>
 </div>
 {% end %}