rabin 7 years ago
parent
commit
08c884ccdf

+ 25 - 9
front/templates/pc/device/chart/ajax.html

@@ -3,9 +3,32 @@
 $("#chart .name").html('{{data['deviceInfo']['name']}}');
 var date = {% for key,value in enumerate(data['statList']) %}{% if key == 0 %}{% raw value['data']['time'] %}{% end %}{% end %};
 if (date == "") {
-    //$("#chart").hide();
+    $("#chart").hide();
     //$(".crumbs .statMenu").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 %}
+        ];
+
     myChart.setOption({
         xAxis: {
             data: date
@@ -16,14 +39,7 @@ if (date == "") {
                 formatter: '{value} {{data['type']['unit']}}'
             }
         },
-        series: [
-            {% for key,value in enumerate(data['statList']) %}
-            {% if key > 0 %},{% end %}
-            {
-                data:{% raw value['data']['value'] %}
-            }
-            {% end %}
-            ]
+        series: series
     });
     $("#chart").show();
     //$(".crumbs .statMenu").show();

+ 1 - 1
front/templates/pc/device/chart/page.html

@@ -4,7 +4,7 @@
 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 %};
 if (date == "") {
-    //$("#main").hide();
+    $("#main").hide();
 } else {
     var series = [
             {% for key,value in enumerate(data['statList']) %}

+ 1 - 1
front/templates/pc/device/chart/simple.html

@@ -5,7 +5,7 @@
 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 %};
 if (date == "") {
-    //$("#chart").hide();
+    $("#chart").hide();
     //$(".crumbs .statMenu").hide();
 } else {
     var series = [