update

Former-commit-id: ee4e0cf3066eabd616b141e861eb807d73a47cca

projects/IoTCenter/Api/DeviceController.cs

@@ -69,7 +69,7 @@ namespace UserCenter.Controllers
                 var hours = Convert.ToInt32(DateTime.Now.ToString("%z"));
                 using (var client = new InfluxClient(new Uri(url), usr, pwd))
                 {
-                    var query = $"select { model.Key} from {measurementName} where time>now() - {model.Key} and DeviceNumber = '{model.Number}' limit 10000";
+                    var query = $"select { model.Key} from {measurementName} where time>now() - {model.Time} and DeviceNumber = '{model.Number}' limit 10000";
                     var result = client.ReadAsync<DynamicInfluxRow>(dbName, query).Result;
                     var rows = result.Results.FirstOrDefault()?
                         .Series.FirstOrDefault()?
@@ -100,6 +100,7 @@ namespace UserCenter.Controllers
                 return Problem(ex.Message);
             }
         }
+
         private string GetColor(string key)
         {
             //var randomGen = new Random();

projects/WebApp/wwwroot/index.html

@@ -30,6 +30,7 @@
     <script src="lib/vue-router/vue-router.min.js"></script>
     <script src="lib/vuex/vuex.min.js"></script>
     <script src="lib/signalr/signalr.min.js"></script>
+    <script src="lib/Chart.js/Chart.bundle.min.js"></script>
     <script src="lib/flv.js/flv.min.js"></script>
     <script src="lib/WXInlinePlayer/index.js"></script>
     <script src="js/util.js"></script>

projects/WebApp/wwwroot/pages/iot/device.html

@@ -31,13 +31,13 @@
                     <div class="card-body">
                         <div class="weui-tab">
                             <div class="weui-navbar">
-                                <a href="javascript:;" class="weui-tabbar__item" v-on:click="changeTime(data.key,'1d')">
+                                <a href="javascript:;" class="weui-tabbar__item" v-on:click="changeTime(data.key,'1d',data.name)">
                                     <p class="weui-tabbar__label">近24小时</p>
                                 </a>
-                                <a href="javascript:;" class="weui-tabbar__item" v-on:click="changeTime(data.key,'7d')">
+                                <a href="javascript:;" class="weui-tabbar__item" v-on:click="changeTime(data.key,'7d',data.name)">
                                     <p class="weui-tabbar__label">近7日</p>
                                 </a>
-                                <a href="javascript:;" class="weui-tabbar__item" v-on:click="changeTime(data.key,'30d')">
+                                <a href="javascript:;" class="weui-tabbar__item" v-on:click="changeTime(data.key,'30d',data.name)">
                                     <p class="weui-tabbar__label">近30日</p>
                                 </a>
                             </div>

projects/WebApp/wwwroot/pages/iot/device.js

@@ -30,15 +30,15 @@
                 },
                 methods: {  
                     updateChart: function () {
-                        var keys = Enumerable.from(this.device.data).where(function (o) {
+                        var dataList = Enumerable.from(this.device.data).where(function (o) {
                             return o.type === 10 || o.type === 20;
                         }).toArray();
-                        for (var i = 0; i < keys.length; i++) {
+                        for (var i = 0; i < dataList.length; i++) {
-                            var key = keys[i];
+                            this.changeTime(dataList[i].key, '1d',dataList[i].name);
-                            this.changeTime(key, '1d');
                         }
                     },
-                    changeTime: function (key, time) {
+                    changeTime: function (key, time,title) {
+                        var vm = this;
                         var url = '/IoTCenter/api/v1/Device/GetChartData';
                         var data = {
                             number:this.device.number,
@@ -48,14 +48,14 @@
                         axios.post(url,data, { crossDomain: true })
                             .then(function (response) {
                                 var data = response.data;
-                                UpdateChartInternal(key, data);
+                                vm.UpdateChartInternal(key, data,title);
                                 console.log('折线图更新成功');
                             })
                             .catch(function (error) {
                                 console.log(error);
                             });
                     },
-                    UpdateChartInternal(key, data) {
+                    UpdateChartInternal(key, data,title) {
                         var canvas = document.getElementById(this.device.number + '-' + key);
                         var chart;
                         Chart.helpers.each(Chart.instances, function (instance) {

projects/WebApp/wwwroot/pages/iot/device/camera.html

@@ -140,7 +140,7 @@
                                 vm.flvPlayer.currentTime = vm.flvPlayer.buffered.end(0) - 0.001;
                             }
                             vm.decodedFrames = vm.flvPlayer.statisticsInfo.decodedFrames;
-                        }, 10 * 1000);
+                        }, 30 * 1000);
                     } catch (e) {
                         console.log('error:');
                         console.log(e);
@@ -258,11 +258,11 @@
         },
         computed: {
             url: function () {
-                return location.protocol + '//' + location.hostname + location.pathname + 'music.flv';
+                //return location.protocol + '//' + location.hostname + location.pathname + 'music.flv';
-                //return getDeviceDataValue(this.device, 'flv');
+                return getDeviceDataValue(this.device, 'flv');
             },
             isFlvSupported: function () {
-                return flvjs.isSupported() && false;
+                return flvjs.isSupported();
             },
             ptz: function () {
                 if (getDeviceDataValue(this.device, '云台地址')) {