Merge branch 'master' of https://github.com/IoTSharp/IoTSharp

IoTSharp/ClientApp/src/api/device.js

@@ -16,6 +16,14 @@ export function getDevice(id) {
   })
 }
 
+// Get a device's credentials
+export function GetIdentity(id) {
+  return request({
+    url: '/Devices/' + id,
+    method: 'get'
+  })
+}
+
 // Create a new device
 export function creatDevice(data) {
   return request({

IoTSharp/ClientApp/src/components/GithubCorner/index.vue

 <template>
-  <a href="https://github.com/PanJiaChen/vue-element-admin" target="_blank" class="github-corner" aria-label="View source on Github">
+  <a href="https://github.com/IoTSharp/IoTSharp" target="_blank" class="github-corner" aria-label="View source on Github">
     <svg
       width="80"
       height="80"

IoTSharp/ClientApp/src/views/dashboard/admin/components/PanelGroup.vue

@@ -2,12 +2,12 @@
   <el-row :gutter="40" class="panel-group">
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
-        <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
+        <div class="card-panel-icon-wrapper icon-device">
+          <svg-icon icon-class="example" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            New Visits
+            设备总数
           </div>
           <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
         </div>
@@ -15,12 +15,12 @@
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('messages')">
-        <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
+        <div class="card-panel-icon-wrapper icon-people">
+          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            Messages
+            MQTT客户端
           </div>
           <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
         </div>
@@ -28,12 +28,12 @@
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('purchases')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
+        <div class="card-panel-icon-wrapper icon-guide">
+          <svg-icon icon-class="guide" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            Purchases
+            MQTT主题
           </div>
           <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
         </div>
@@ -41,12 +41,12 @@
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('shoppings')">
-        <div class="card-panel-icon-wrapper icon-shopping">
-          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+        <div class="card-panel-icon-wrapper icon-message">
+          <svg-icon icon-class="message" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            Shoppings
+            MQTT消息
           </div>
           <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
         </div>
@@ -94,36 +94,36 @@ export default {
         color: #fff;
       }
 
-      .icon-people {
+      .icon-device {
         background: #40c9c6;
       }
 
-      .icon-message {
+      .icon-people {
         background: #36a3f7;
       }
 
-      .icon-money {
-        background: #f4516c;
+      .icon-guide {
+        background: #51f47a;
       }
 
-      .icon-shopping {
+      .icon-message {
         background: #34bfa3
       }
     }
 
-    .icon-people {
+    .icon-device {
       color: #40c9c6;
     }
 
-    .icon-message {
+    .icon-people {
       color: #36a3f7;
     }
 
-    .icon-money {
+    .icon-guide {
       color: #f4516c;
     }
 
-    .icon-shopping {
+    .icon-message {
       color: #34bfa3
     }
 

IoTSharp/ClientApp/src/views/device/device-board.vue

@@ -41,9 +41,16 @@
         </el-card>
       </el-col>
       <el-col :span="18" style="padding-left:20px;margin-bottom:30px;margin-top:8px">
-        <div>
-          <svg-icon icon-class="list" />
-          <span style="margin-left:10px;">设备属性:</span>
+        <div style="display:inline">
+          <div style="float:left">
+            <svg-icon icon-class="list" />
+            <span style="margin-left:10px;">设备属性:</span>
+          </div>
+          <div style="float:right;margin-right:10px;">
+            <span style="margin-left:5px;"> Access Token:</span>
+            <span style="margin-left:10px; color:#F00">{{ curSelectedDeviceToken }}</span>
+            <el-button @click="getDevicToken"><svg-icon icon-class="password" /></el-button>
+          </div>
         </div>
         <el-table
           :key="tableKey"
@@ -136,7 +143,7 @@
           </el-table-column>
         </el-table>
       </el-col>
-      <el-col :span="18" style="padding-left:20px;margin-bottom:30px;margin-top:8px">
+      <el-col :span="18" :offset="6" style="padding-left:20px;margin-bottom:30px;margin-top:8px">
         <div>
           <svg-icon icon-class="list" />
           <span style="margin-left:10px;">设备数据:</span>
@@ -425,16 +432,23 @@ export default {
       })
     },
 
-    getDevicToken(id) {
+    getDevicToken() {
+      if (this.curSelectedDevIdAndName.id === '') {
+        this.$message({
+          message: '请选择一个设备！',
+          type: 'error'
+        })
+        return
+      }
       return new Promise((resolve, reject) => {
-        getDeviceAccessToken(id).then(response => {
+        getDeviceAccessToken(this.curSelectedDevIdAndName.id).then(response => {
           console.log('dev access token response:')
           console.log(response)
           this.curSelectedDeviceToken = response.id
         }).catch(() => {
           this.$message({
-            message: '获取DeviceId失败',
-            type: 'success'
+            message: '获取 DeviceId 失败',
+            type: 'error'
           })
         }).catch(err => {
           console.log(err)
@@ -444,7 +458,6 @@ export default {
     },
     openDeviceDetails(row) {
       console.log('Start get token:')
-      // this.getDevicToken(row.id)
       console.log(row.id)
       console.log('start get attr, passed value :')
       console.log(row.id)
@@ -457,7 +470,7 @@ export default {
       }).catch(() => {
         this.$message({
           message: '获取Device Attr失败',
-          type: 'success'
+          type: 'error'
         })
       })
       getDeviceTelemetryLatest(row.id).then(response => {
@@ -466,8 +479,8 @@ export default {
         this.devMeterList = response
       }).catch(() => {
         this.$message({
-          message: '获取Device Attr失败',
-          type: 'success'
+          message: '获取Device Telemeter失败',
+          type: 'error'
         })
       })
     },