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

---
 projects/Demo/Demo/wwwroot/index.html         |  83 ++++++++++++++----
 projects/Demo/Demo/wwwroot/js/app.js          | Bin 26748 -> 26328 bytes
 .../IoTCenter/Controllers/AppController.cs    |  10 +++
 3 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/projects/Demo/Demo/wwwroot/index.html b/projects/Demo/Demo/wwwroot/index.html
index e8b74d19..f85866af 100644
--- a/projects/Demo/Demo/wwwroot/index.html
+++ b/projects/Demo/Demo/wwwroot/index.html
@@ -23,7 +23,7 @@
         </f7-app>
     </div>
     <template id="page-home">
-        <f7-page :page-content="false" @page:beforein="vm.init">
+        <f7-page :page-content="false" @page:reinit="vm.init">
             <f7-navbar>
                 <f7-nav-title>{{vm.Title}}</f7-nav-title>
             </f7-navbar>
@@ -165,7 +165,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('检测器','监测器')">
                             <div class="row">
-                                <a class="button button-raised" :href="'/node/'+device.Number+'/name/'+device.Name||device.DisplayName">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <div class="row" v-if="device.Name==='温湿度检测器'">
                                 <div class="col">{{getData(device,"温度")}}</div>
@@ -193,7 +193,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('感应器')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <div class="row">
                                 <div class="col">{{getData(device,"状态")}}</div>
@@ -208,11 +208,16 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('主机')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <div class="row">
                                 <div class="col">{{getData(device,"计算机名")}}</div>
                             </div>
+                            <div class="row">
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'21boot')">开</a>
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'23shot')">截图</a>
+                                <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'22shutdown')">关</a>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -223,7 +228,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('AP')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <div class="row">
                                 <div class="row">IP {{getData(device,"IP")}}</div>
@@ -242,7 +247,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('一路可调窗帘')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <div class="row">
                                 <div class="col">{{getData(device,"状态")}}</div>
@@ -273,7 +278,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('计量开关')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <template v-if="device.Name==='计量开关'">
                                 <div class="row">
@@ -301,7 +306,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('一路照明开关')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <template v-if="device.Name==='一路照明开关'">
                                 <div class="row">
@@ -329,7 +334,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('二路灯开关')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <template v-else-if="device.Name==='二路灯开关'">
                                 <div class="row">
@@ -365,7 +370,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('三路照明开关')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <template v-if="device.Name==='三路照明开关'">
                                 <div class="row">
@@ -401,7 +406,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('墙面插座')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <template v-if="device.Name==='墙面插座'">
                                 <div class="row">
@@ -429,7 +434,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('一路插座')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <template v-if="device.Name==='一路插座'">
                                 <div class="row">
@@ -457,7 +462,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('二路插座')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <template v-if="device.Name==='二路插座'">
                                 <div class="row">
@@ -485,7 +490,7 @@
                     <div class="row">
                         <div class="col-33 tablet-20 desktop-10" v-for="device in getDevices('密码门锁')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <template v-if="device.Name==='密码门锁'">
                                 <div class="row">
@@ -511,7 +516,7 @@
                     <div class="row">
                         <div class="col" v-for="device in getDevices('红外转发器')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <div class="row">
                                 <template v-for="data in _.orderBy(device.Data,['DisplayOrder','Name'])">
@@ -530,7 +535,7 @@
                     <div class="row">
                         <div class="col" v-for="device in getDevices('串口控制器')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <div class="row">
                                 <template v-for="data in _.orderBy(device.Data,['DisplayOrder','Name'])">
@@ -556,7 +561,7 @@
                     <div class="row">
                         <div class="col" v-for="device in getDevices('摄像头')">
                             <div class="row">
-                                <a class="button button-raised">{{device.Name||device.DisplayName}}</a>
+                                <a class="button button-raised" :href="'/device/'+device.Number+'/name/'+device.Name">{{device.DisplayName||device.Name}}</a>
                             </div>
                             <div class="row">
                                 <a class="button button-raised button-fill" href="javascript: ;" v-on:click="call(device.Id,'20shot')">截图</a>
@@ -570,8 +575,50 @@
     <template id="page-device">
         <f7-page>
             <f7-navbar>
-                <f7-navbar title="Device.DisplayName||Device.Name" back-link="Back"></f7-navbar>
+                <f7-navbar :title="Device.DisplayName||Device.Name" back-link="Back"></f7-navbar>
             </f7-navbar>
+            <div class="block-title">属性{{Device.Data.length}}</div>
+            <div class="list">
+                <ul v-if="Device.Data.length">
+                    <template v-for="data in Device.Data">
+                        <li v-if="data.Name!=='hidden'">
+                            <div class="item-content">
+                                <div class="item-media"><i class="f7-icons">info</i></div>
+                                <div class="item-inner">
+                                    <div class="item-title">{{data.Name}}</div>
+                                    <div class="item-after">
+                                        <span class="badge color-blue">
+                                            {{data.Value}}
+                                        </span>
+                                        <span>&nbsp;</span>
+                                        <span class="badge color-blue" v-if="data.Unit">
+                                            {{data.Unit}}
+                                        </span>
+                                        <span>&nbsp;</span>
+                                        <span class="badge color-blue" v-if="data.Description">
+                                            {{data.Description}}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </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>
+                        </div>
+                    </li>
+                </ul>
+            </div>
         </f7-page>
     </template>
     <!-- Page Not Found Template -->
diff --git a/projects/Demo/Demo/wwwroot/js/app.js b/projects/Demo/Demo/wwwroot/js/app.js
index 7a9fc4c36d129d75ba0816d49a1f5c74f3f0bd1f..a859c79b949df7c7c5f1d080d79f218a2e8070fb 100644
GIT binary patch
delta 519
zcmZ`#!Ab&A6uqY97^CIFQG|3HBMmJ?Dk3YiLNay8f~b&e(1@VLKoJBLvkGceoNb@b
zqMFZ$#AOSK)~;H#iWa>Yg=`Uz$GP|1`_4V@em5+yFP4WVJDT=oeS>RRA-er2cm(*e
zgUH$hJ<XqaP?tFHN<Sp8fJCaL*QF^R{Ik5yr;-D>D+&1A_uEBMNF^1Sm6AiGbBdEl
z2`JVO)PN6~BtmsY;mXI+nBZ`cn}-(Tu#lIbSvlO~4^7l!{pc%Px4A-_O9*}FDYAan
zmo7?elwDAZcV^7X6CEyUq8b>%jl-p1$_d_*#MR~^wku5*-L5k;3a9VvmMtuOE|22D
z=F`8FStB*9e&l5HyZ6;(hfxE=c<<#5)4>|;(Fq+;m7z!@?1<FGVQgl|Jx6oh9JR+7
z*4f6OO$VG^FIe?)D`c8xRqHq{Ay^5AMW*pbnUch6Z1NFX@gZCEDKg%Op*U&qzpji-
Wp<{Oc(=e+j$q~G*#r4%%-1Y;+o{?|>

delta 497
zcmZXP-z!657{}k!4rbPNVoqm^nPEw@mV`!YQSx(EB;)MtY>uQjmS0ycxRDDN+P7S|
zSS}=`gmdR=xfCT=E+iMO<ia1Y<lW1S+`OOX`+T3L=lee0bA<=);;Ia9J%Y2JbP^Al
zB<p03GDa3@HBT0Zj?1#a;zVtXq-dw;_K{_>L^AZ%sn*FFS;clutKl`@m=G>0H6qrH
zYJ3h@jC_6AiGXTBL9-fCccUG;6hLmshn)%sgrpmJCy!098wGDOqQidVhbJMp%<zq9
zjE5t8$k=)0LMqfY3nDU))6wwno(-y9!2Y-c{^$X2qwTb|!7=8-mRm67v9J|-ycZ93
zJUodIqY@W!7Z=NyXnc*vU&OY*3SaTYilW+}U!Em%NClnfn(ks7=|mgNFW@{8WICg@
zz@_-`q1q5rT&%aEL>RA?pP6j6o9V|Ak+CBgV0_ntI7v!Ko1{N}miPSnUL4EfKflsM
y?@WuFhO<-yLRAu8W}ey9QIi>4n%Q`hWv&>>h$%Wp9S>fUyNvm%3FAE7!hZvotgLhZ

diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs
index e590f607..f3fe4110 100644
--- a/projects/IoTCenter/Controllers/AppController.cs
+++ b/projects/IoTCenter/Controllers/AppController.cs
@@ -47,5 +47,15 @@ namespace IoTCenter.Controllers
                 .FirstOrDefault(o => o.Number == number);
             return Json(model, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore });
         }
+
+        public IActionResult GetDevice(string token, string number)
+        {
+            var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString();
+            var model = this._deviceRepo.ReadOnlyTable()
+                .Include(o => o.Data)
+                .Include(o => o.Apis).ThenInclude(o => o.Parameters)
+                .FirstOrDefault(o => o.Number == number);
+            return Json(model, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore });
+        }
     }
 }
\ No newline at end of file