diff --git a/projects/IoTCenter/wwwroot/images/device.png b/projects/IoTCenter/wwwroot/images/device.png new file mode 100644 index 00000000..e7dbf0f9 Binary files /dev/null and b/projects/IoTCenter/wwwroot/images/device.png differ diff --git a/projects/IoTCenter/wwwroot/images/light.png b/projects/IoTCenter/wwwroot/images/light.png index 6bdb5379..f7767dc9 100644 Binary files a/projects/IoTCenter/wwwroot/images/light.png and b/projects/IoTCenter/wwwroot/images/light.png differ diff --git a/projects/IoTCenter/wwwroot/images/node.png b/projects/IoTCenter/wwwroot/images/node.png new file mode 100644 index 00000000..5305b9ff Binary files /dev/null and b/projects/IoTCenter/wwwroot/images/node.png differ diff --git a/projects/WebApp/wwwroot/css/app.css b/projects/WebApp/wwwroot/css/app.css index b2572f08..5e74fcbf 100644 --- a/projects/WebApp/wwwroot/css/app.css +++ b/projects/WebApp/wwwroot/css/app.css @@ -767,16 +767,21 @@ img { .ir table,.ir .table { border-collapse: separate; - margin: 15px auto; - padding: 15px; + margin: 5px auto; + padding: 5px; border: 2px solid #ddd; border-radius: 15px; } .ir table td { - padding: 5px; + padding: 2px; text-align: center; } .ir .table button{ - margin:5px; - } \ No newline at end of file + margin:2px; + } +.weui-grid__icon { + width: 48px; + height: 48px; + margin: 0 auto; +} \ No newline at end of file diff --git a/projects/WebApp/wwwroot/js/iot.js b/projects/WebApp/wwwroot/js/iot.js index e9eb896e..72608416 100644 --- a/projects/WebApp/wwwroot/js/iot.js +++ b/projects/WebApp/wwwroot/js/iot.js @@ -22,7 +22,7 @@ function getDeviceDataUnit(device, name) { function getDeviceData(device, name) { var data = Enumerable.from(device.data).where(o => o.name === name).firstOrDefault(); if (data) { - return data['value'] + data['unit']; + return data['value'] + data['unit'] ? ' ' + data['unit']:''; } return null; } diff --git a/projects/WebApp/wwwroot/pages/home.html b/projects/WebApp/wwwroot/pages/home.html index 959c5f49..cbd187b6 100644 --- a/projects/WebApp/wwwroot/pages/home.html +++ b/projects/WebApp/wwwroot/pages/home.html @@ -4,22 +4,20 @@

消息

-
物联网
-
-
- -
- -
-

设备

-
- -
- -
-

智慧教室

-
-
+
物联网
+
+ +
+ +
+

设备

+
+ +
+ +
+

智慧教室

+
diff --git a/projects/WebApp/wwwroot/pages/iot/device/humiture.html b/projects/WebApp/wwwroot/pages/iot/device/humiture.html index a15204c7..a91ffbd7 100644 --- a/projects/WebApp/wwwroot/pages/iot/device/humiture.html +++ b/projects/WebApp/wwwroot/pages/iot/device/humiture.html @@ -1,38 +1,38 @@