update

Former-commit-id: 709ea8ad86cdbffbedd3d8218a65d42285d3bc53

projects/IoT/IoT.Shared/Application/Models/EditDataModel.cs

@@ -37,5 +37,9 @@ namespace Application.Models
         [HiddenInput(DisplayValue = false)]
         [ScaffoldColumn(true)]
         public string DeviceNumber { get; set; }
+
+        [HiddenInput(DisplayValue = false)]
+        [ScaffoldColumn(true)]
+        public string NodeNumber { get; set; }
     }
 }

projects/IoTCenter/Areas/Admin/Controllers/IoT/DataController.cs

@@ -30,7 +30,7 @@ namespace IoTCenter.Areas.Admin.Controllers
 
         public override IQueryable<Data> Include(IQueryable<Data> query)
         {
-            return query.Include(o => o.Device);
+            return query.Include(o => o.Device).ThenInclude(o => o.Node);
         }
 
         public override IQueryable<Data> Query(DataSearchModel model, IQueryable<Data> query)
@@ -45,13 +45,14 @@ namespace IoTCenter.Areas.Admin.Controllers
         public override void ToModel(Data entity, EditDataModel model)
         {
             model.DeviceNumber = entity.Device.Number;
+            model.NodeNumber = entity.Device.Node.Number;
         }
 
         public override IActionResult Edit(EditDataModel model)
         {
             if (ModelState.IsValid)
             {
-                this._pageHubContext.Clients.Group(model.DeviceNumber).SendAsync(Methods.ServerToClient, Methods.EditDataRequest, model.ToJson(), null);
+                this._pageHubContext.Clients.Group(model.NodeNumber).SendAsync(Methods.ServerToClient, Methods.EditDataRequest, model.ToJson(), null);
                 return RedirectTo();
             }
             ModelState.AddModelError("", "服务器出现异常，请稍后重试");

projects/IoTCenter/Views/Home/Node.cshtml

@@ -62,6 +62,23 @@
                 position: absolute;
                 right: 0;
             }
+
+        .ptz {
+            width: 100%;
+        }
+
+            .ptz td {
+                text-align: center;
+                padding: 11px 0;
+            }
+
+        .btns {
+            padding: 0 18px;
+        }
+
+            .btns .btn {
+                margin: 18px 0;
+            }
     </style>
     <title>@HtmlTitle | @cfg["name"]</title>
 </head>
@@ -152,6 +169,7 @@
     <script src="~/lib/kindeditor/kindeditor-all-min.js"></script>
     <script src="~/lib/Chart.js/Chart.bundle.min.js"></script>
     <script src="~/lib/linq.js/linq.min.js"></script>
+    <script src="~/lib/flv.js/flv.min.js"></script>
     <script>
         $(function () {
             var template = 'node.default.html';//get template name from server

projects/IoTCenter/wwwroot/node.default.html

@@ -126,10 +126,44 @@
 </div>
 <div class="row" v-if="ViewModel">
     <div class="col-md-6">
-        云台
+        <div class="box box-solid">
+            <table class="ptz" v-if="PTZControlSupport()">
+                <tr>
+                    <td><img src="/images/zoomin.png" /></td>
+                    <td></td>
+                    <td><img src="/images/up.png" /></td>
+                    <td></td>
+                    <td><img src="/images/zoomout.png" /></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td><img src="/images/left.png" /></td>
+                    <td><img src="/images/stop.png" /></td>
+                    <td><img src="/images/right.png" /></td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td></td>
+                    <td><img src="/images/down.png" /></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </table>
+        </div>
     </div>
     <div class="col-md-6">
-        场景
+        <div class="box box-solid btns">
+            <div class="row">
+                <div class="col-md-6"><button class="btn btn-block btn-primary">一键开</button></div>
+                <div class="col-md-6"><button class="btn btn-block btn-primary">一键关</button></div>
+            </div>
+            <div class="row">
+                <div class="col-md-3" v-for="scene in ViewModel.Scenes">
+                    <button class="btn btn-block btn-info">{{scene.Name}}</button>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
 <div class="row" v-if="ViewModel">
@@ -142,6 +176,7 @@
 </div>
 <script>
     var flvPlayer;
+    var decodedFrames;
     function UpdateChart(id, title, data, labels, colors, type) {
         var ctx = document.getElementById(id).getContext('2d');
         colors = colors || $.map(data, function (item) { return Color16(item); });
@@ -192,7 +227,7 @@
         UpdateCamera()
     });
     function UpdateCamera() {
-        var number = $('#camera').val(); alert(number);
+        var number = $('#camera').val();
         var device = Enumerable.from(vm.ViewModel.Devices).where(function (o) { return o.Number === number; }).firstOrDefault();
         var url = Enumerable.from(device.Data).where(o => o.Name === '主码流flv').firstOrDefault().Value;
         closePlayer(flvPlayer);
@@ -290,7 +325,14 @@
                     .toArray();
             },
             CameraSelected() {
-                alert(1);
+                UpdateCamera();
+            },
+            PTZControlSupport() {
+                return true;
+                var number = $('#camera').val();
+                var device = Enumerable.from(vm.ViewModel.Devices).where(function (o) { return o.Number === number; }).firstOrDefault();
+                var data = Enumerable.from(device.Data).where(o => o.Name === '缩放支持').firstOrDefault().Value;
+                return data === '是';
             }
         },
         destroy() {