From eeb737674f5da51711f569dd56bbfe4e8dd23c5e Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 18 Apr 2019 18:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projects/Demo/Demo/wwwroot/index.html         |  53 ++++++++++++++----
 projects/Demo/Demo/wwwroot/js/app.js          | Bin 26328 -> 27464 bytes
 .../IoTCenter/Controllers/AppController.cs    |   2 +-
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/projects/Demo/Demo/wwwroot/index.html b/projects/Demo/Demo/wwwroot/index.html
index f85866af..272a9ffc 100644
--- a/projects/Demo/Demo/wwwroot/index.html
+++ b/projects/Demo/Demo/wwwroot/index.html
@@ -605,19 +605,48 @@
                     </template>
                 </ul>
             </div>
-            <div class="block-title">操作{{Device.Apis.length}}</div>
-            <div class="list">
-                <ul v-if="Device.Apis.length">
-                    <li v-for="api in Device.Apis">
-                        <div class="item-content">
-                            <div class="item-media"><i class="f7-icons">info</i></div>
-                            <div class="item-inner">
-                                <div class="item-title">{{api.Name}}</div>
-                                <div class="item-after"></div>
+            <div class="block-title" v-if="Device.Apis.length">操作</div>
+            <div class="row">
+                <template v-if="Device.Apis.length">
+                    <div class="col" v-for="api in  _.orderBy(Device.Apis,['Command'])">
+                        <form method="get" action="/Command/Exec" v-on:submit.prevent="call">
+                            <input type="hidden" name="cmd" :value="api.Command" />
+                            <input type="hidden" name="id" :value="Device.Id" />
+                            <div class="row">
+                                <template v-for="parameter in api.Parameters">
+                                    <template v-if="parameter.Name!='hidden'">
+                                        <template v-if="isSelect(Device,parameter.Name)">
+                                            <div class="col">
+                                                <select :name="parameter.Name" style="height:29px;" data-val="true" data-val-required="请选择">
+                                                    <option value="">请选择</option>
+                                                    <option v-for="option in getSelect(Device,parameter.Name)" :value="option.value">{{option.text}}</option>
+                                                </select>
+                                                <span class="field-validation-valid text-danger" :data-valmsg-for="parameter.Name" data-valmsg-replace="true"> </span>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="col">
+                                                <template v-if="parameter.Minimum||parameter.Maximnu">
+                                                    <input :name="parameter.Name" :value="getParameter(parameter.Name)" data-val="true" data-val-required="请输入"
+                                                           data-val-number="必须输入数字" :data-val-range="'范围:'+parameter.Minimum+'~'+parameter.Maximnu" :data-val-range-min="parameter.Minimum" :data-val-range-max="parameter.Maximnu"
+                                                           style="height:29px;" type="text" :placeholder="'请输入'+parameter.Description" />
+                                                </template>
+                                                <template v-else>
+                                                    <input :name="parameter.Name" :value="getParameter(parameter.Name)" data-val="true" data-val-required="请输入"
+                                                           style="height:29px;" type="text" :placeholder="'请输入'+parameter.Description" />
+                                                </template>
+                                                <span class="field-validation-valid text-danger" :data-valmsg-for="parameter.Name" data-valmsg-replace="true"> </span>
+                                            </div>
+                                        </template>
+                                    </template>
+                                </template>
+                                <div class="col">
+                                    <button class="button button-fill button-outline" type="submit">{{api.Name}}</button>
+                                </div>
                             </div>
-                        </div>
-                    </li>
-                </ul>
+                        </form>
+                    </div>
+                </template>
             </div>
         </f7-page>
     </template>
diff --git a/projects/Demo/Demo/wwwroot/js/app.js b/projects/Demo/Demo/wwwroot/js/app.js
index a859c79b949df7c7c5f1d080d79f218a2e8070fb..dc7e3c817e7a9b625075c17b729d6475dbebb41f 100644
GIT binary patch
delta 365
zcmca{mhr?j#tj$bCkse%Z1z$(CIM!2Stc+|{-dP9o5@hj5X_LukORcYljrkFPc~5&
zV9f^dDkmH2C{I41Ej0O^a)i1!NQ6Ow!4?P=7{KyCS{sPf8KN0tfusUMEraG{#u(wr
zdb(1R_vuQArvvqrFa$6pG86%EE|{0fP&9cVujJ$vI((C7DauSv(2!uvoBT0KeDVi9
zhsnEmRVEAQxlLYY#4*VrMH*s&A45Jv3Q)5jLn+XZBp|DZL1S{Eg|s+C+!H9P33Q4&
zgBsWw+LQ0|`A@!}=b(;9KSLhWRG@CCN988piBy_AMMs1&A1Goeo6n%f05TimX^^*3
Z^ysQiwuzFP{7yk-a)X@Q=2zD5v;g&8UOxZ;

delta 232
zcmX?cjq%1=#tj$bWAz#I8FCo%84?*%7!(-tfUFdTR3NLIA(NqmAp^)N2J-V5lEI>h
zKo&?HNKF|~1xQo}Np(I$DNvUJ(6j=eZ1LoW@v@V-0!22zk>4aiAFC$6kvG`<%0h-|
JbCkn7Edbu?HSGWZ

diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs
index f3fe4110..c959751a 100644
--- a/projects/IoTCenter/Controllers/AppController.cs
+++ b/projects/IoTCenter/Controllers/AppController.cs
@@ -33,7 +33,7 @@ namespace IoTCenter.Controllers
         {
             var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString();
             var model = this._nodeRepo.ReadOnlyTable()
-                .Select(o => new { o.Number, o.Name, o.DisplayOrder, Count = o.Devices.Count })
+                .Select(o => new { o.Id, o.Number, o.Name, o.DisplayOrder, Count = o.Devices.Count })
                 .ToList();
             return Json(model);
         }