update

Former-commit-id: f586efcb9129c27a0cb5eacd79092c8c97dbc0c2
6 years ago · ace0c341b7
parent d1f515cc08
commit ace0c341b7
62 changed files with 80 additions and 7 deletions
--- a/projects/IoT.Shared/wwwroot/images/humidity.png
+++ b/projects/IoT.Shared/wwwroot/images/humidity.png
--- a/projects/IoT.Shared/wwwroot/images/humiture.png
+++ b/projects/IoT.Shared/wwwroot/images/humiture.png
--- a/projects/IoT.Shared/wwwroot/images/air.png
+++ b/projects/IoT.Shared/wwwroot/images/air.png
--- a/projects/IoT.Shared/wwwroot/images/alarm.png
+++ b/projects/IoT.Shared/wwwroot/images/alarm.png
--- a/projects/IoT.Shared/wwwroot/images/ap.png
+++ b/projects/IoT.Shared/wwwroot/images/ap.png
--- a/projects/IoT.Shared/wwwroot/images/back.png
+++ b/projects/IoT.Shared/wwwroot/images/back.png
--- a/projects/IoT.Shared/wwwroot/images/batch.png
+++ b/projects/IoT.Shared/wwwroot/images/batch.png
--- a/projects/IoT.Shared/wwwroot/images/button.png
+++ b/projects/IoT.Shared/wwwroot/images/button.png
--- a/projects/IoT.Shared/wwwroot/images/camera.png
+++ b/projects/IoT.Shared/wwwroot/images/camera.png
--- a/projects/IoT.Shared/wwwroot/images/classroom.png
+++ b/projects/IoT.Shared/wwwroot/images/classroom.png
--- a/projects/IoT.Shared/wwwroot/images/close.png
+++ b/projects/IoT.Shared/wwwroot/images/close.png
--- a/projects/IoT.Shared/wwwroot/images/co2.png
+++ b/projects/IoT.Shared/wwwroot/images/co2.png
--- a/projects/IoT.Shared/wwwroot/images/control.png
+++ b/projects/IoT.Shared/wwwroot/images/control.png
--- a/projects/IoT.Shared/wwwroot/images/curtain.png
+++ b/projects/IoT.Shared/wwwroot/images/curtain.png
--- a/projects/IoT.Shared/wwwroot/images/door.png
+++ b/projects/IoT.Shared/wwwroot/images/door.png
--- a/projects/IoT.Shared/wwwroot/images/down.png
+++ b/projects/IoT.Shared/wwwroot/images/down.png
--- a/projects/IoT.Shared/wwwroot/images/electric.png
+++ b/projects/IoT.Shared/wwwroot/images/electric.png
--- a/projects/IoT.Shared/wwwroot/images/empty.png
+++ b/projects/IoT.Shared/wwwroot/images/empty.png
--- a/projects/IoT.Shared/wwwroot/images/gateway.png
+++ b/projects/IoT.Shared/wwwroot/images/gateway.png
--- a/projects/IoTCenter/wwwroot/images/humidity.png
+++ b/projects/IoTCenter/wwwroot/images/humidity.png
--- a/projects/IoTCenter/wwwroot/images/humiture.png
+++ b/projects/IoTCenter/wwwroot/images/humiture.png
--- a/projects/IoT.Shared/wwwroot/images/infrared.png
+++ b/projects/IoT.Shared/wwwroot/images/infrared.png
--- a/projects/IoT.Shared/wwwroot/images/lamp.png
+++ b/projects/IoT.Shared/wwwroot/images/lamp.png
--- a/projects/IoT.Shared/wwwroot/images/left.png
+++ b/projects/IoT.Shared/wwwroot/images/left.png
--- a/projects/IoT.Shared/wwwroot/images/light.png
+++ b/projects/IoT.Shared/wwwroot/images/light.png
--- a/projects/IoT.Shared/wwwroot/images/light2.png
+++ b/projects/IoT.Shared/wwwroot/images/light2.png
--- a/projects/IoT.Shared/wwwroot/images/monitor.png
+++ b/projects/IoT.Shared/wwwroot/images/monitor.png
--- a/projects/IoT.Shared/wwwroot/images/mute.png
+++ b/projects/IoT.Shared/wwwroot/images/mute.png
--- a/projects/IoT.Shared/wwwroot/images/natural.png
+++ b/projects/IoT.Shared/wwwroot/images/natural.png
--- a/projects/IoT.Shared/wwwroot/images/off.png
+++ b/projects/IoT.Shared/wwwroot/images/off.png
--- a/projects/IoT.Shared/wwwroot/images/on.png
+++ b/projects/IoT.Shared/wwwroot/images/on.png
--- a/projects/IoT.Shared/wwwroot/images/open.png
+++ b/projects/IoT.Shared/wwwroot/images/open.png
--- a/projects/IoT.Shared/wwwroot/images/pc.png
+++ b/projects/IoT.Shared/wwwroot/images/pc.png
--- a/projects/IoT.Shared/wwwroot/images/person.png
+++ b/projects/IoT.Shared/wwwroot/images/person.png
--- a/projects/IoT.Shared/wwwroot/images/play.png
+++ b/projects/IoT.Shared/wwwroot/images/play.png
--- a/projects/IoT.Shared/wwwroot/images/pm25.png
+++ b/projects/IoT.Shared/wwwroot/images/pm25.png
--- a/projects/IoT.Shared/wwwroot/images/projector.png
+++ b/projects/IoT.Shared/wwwroot/images/projector.png
--- a/projects/IoT.Shared/wwwroot/images/ptz.png
+++ b/projects/IoT.Shared/wwwroot/images/ptz.png
--- a/projects/IoT.Shared/wwwroot/images/right.png
+++ b/projects/IoT.Shared/wwwroot/images/right.png
--- a/projects/IoT.Shared/wwwroot/images/safe.png
+++ b/projects/IoT.Shared/wwwroot/images/safe.png
--- a/projects/IoT.Shared/wwwroot/images/scene.png
+++ b/projects/IoT.Shared/wwwroot/images/scene.png
--- a/projects/IoT.Shared/wwwroot/images/serialport.png
+++ b/projects/IoT.Shared/wwwroot/images/serialport.png
--- a/projects/IoT.Shared/wwwroot/images/shot.png
+++ b/projects/IoT.Shared/wwwroot/images/shot.png
--- a/projects/IoT.Shared/wwwroot/images/smoke.png
+++ b/projects/IoT.Shared/wwwroot/images/smoke.png
--- a/projects/IoT.Shared/wwwroot/images/socket.png
+++ b/projects/IoT.Shared/wwwroot/images/socket.png
--- a/projects/IoT.Shared/wwwroot/images/stop.png
+++ b/projects/IoT.Shared/wwwroot/images/stop.png
--- a/projects/IoT.Shared/wwwroot/images/stop32.png
+++ b/projects/IoT.Shared/wwwroot/images/stop32.png
--- a/projects/IoT.Shared/wwwroot/images/switch.png
+++ b/projects/IoT.Shared/wwwroot/images/switch.png
--- a/projects/IoT.Shared/wwwroot/images/switch1.png
+++ b/projects/IoT.Shared/wwwroot/images/switch1.png
--- a/projects/IoT.Shared/wwwroot/images/switch2.png
+++ b/projects/IoT.Shared/wwwroot/images/switch2.png
--- a/projects/IoT.Shared/wwwroot/images/switch3.png
+++ b/projects/IoT.Shared/wwwroot/images/switch3.png
--- a/projects/IoT.Shared/wwwroot/images/temperature.png
+++ b/projects/IoT.Shared/wwwroot/images/temperature.png
--- a/projects/IoT.Shared/wwwroot/images/up.png
+++ b/projects/IoT.Shared/wwwroot/images/up.png
--- a/projects/IoT.Shared/wwwroot/images/volume.png
+++ b/projects/IoT.Shared/wwwroot/images/volume.png
--- a/projects/IoT.Shared/wwwroot/images/warn.png
+++ b/projects/IoT.Shared/wwwroot/images/warn.png
--- a/projects/IoT.Shared/wwwroot/images/warning.wav
+++ b/projects/IoT.Shared/wwwroot/images/warning.wav
--- a/projects/IoT.Shared/wwwroot/images/zoomin.png
+++ b/projects/IoT.Shared/wwwroot/images/zoomin.png
--- a/projects/IoT.Shared/wwwroot/images/zoomout.png
+++ b/projects/IoT.Shared/wwwroot/images/zoomout.png
--- a/projects/WebApp/wwwroot/css/app.css
+++ b/projects/WebApp/wwwroot/css/app.css
@ -718,4 +718,9 @@ ul {
    left: 0;
    right: 0;
    border-radius: unset;
-}
+}
+/*bootstrap4+mintuui*/
+label,h1{
+    margin-top:auto;
+    margin-bottom:auto;
+}
--- a/projects/WebApp/wwwroot/index.html
+++ b/projects/WebApp/wwwroot/index.html
@ -3,10 +3,11 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,viewport-fit=cover">
+    <link rel="stylesheet" href="lib/ionicons/css/ionicons.min.css">
+    <link rel="stylesheet" href="lib/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="lib/mint-ui/style.css">
    <link rel="stylesheet" href="lib/weui/weui.min.css">
-    <link rel="stylesheet" href="lib/ionicons/css/ionicons.min.css">
-    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap-grid.min.css">
    <link rel="stylesheet" href="css/app.css">
    <title>首屏</title>
 </head>
--- a/projects/WebApp/wwwroot/pages/iot/node.html
+++ b/projects/WebApp/wwwroot/pages/iot/node.html
@ -1,13 +1,66 @@
-<div class="page js_show">
-    <mt-header v-if="node" :title="node.name">
+<div class="page js_show" v-if="node">
+    <mt-header :title="node.name">
        <router-link to="/pages/iot/nodes" slot="left">
            <mt-button icon="back">back</mt-button>
        </router-link>
    </mt-header>
-    <div class="col-md-12">
+    <!--场景-->
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header">场景</div>
+                <div class="card-body">
+                    <button class="btn btn-success mr-1" v-for="scene in scenes" v-on:click="CallScene(scene.Id)">{{scene.name}}</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-12 py-2">环境</div>
+    <!--环境-->
+    <div class="row">
+        <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('温湿度传感器')">
+            <div class="card">
+                <div class="card-header">
+                    {{device.displayName}}
+                    <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
+                    <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
+                </div>
+                <div class="card-body">
+                    <div class="row" style="height:100px;">
+                        <div class="col-md-4 text-center">
+                            <img class="mh-100" src="/IoTCenter/images/humiture.png" />
+                        </div>
+                        <div class="col-md-8">
+                            <div class="row" style="height:50px;line-height:28px;">
+                                <span>温度：</span>
+                                <span class="text-success mx-2" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'温度','description')==='适中'">
+                                    {{getDeviceDataAttr(device.number,'温度','description')}}
+                                </span>
+                                <span v-else class="text-danger" style="font-size:28px;">
+                                    {{getDeviceDataAttr(device.number,'温度','description')}}
+                                </span>
+                                <span>{{getDeviceDataAttr(device.number,'温度','value')}}{{ getDeviceDataAttr(device.number,'温度','unit')}}</span>
+                            </div>
+                            <div class="row" style="height:50px;line-height:28px;">
+                                <span>湿度：</span>
+                                <span class="text-success" style="font-size:28px;" v-if="getDeviceDataAttr(device.number,'湿度','description')==='适中'">
+                                    {{getDeviceDataAttr(device.number,'湿度','description')}}
+                                </span>
+                                <span v-else class="text-danger mx-2" style="font-size:28px;">
+                                    {{getDeviceDataAttr(device.number,'湿度','description')}}
+                                </span>
+                                <span>{{getDeviceDataAttr(device.number,'湿度','value')}}{{ getDeviceDataAttr(device.number,'湿度','unit')}}</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-12" v-if="node">
        <div class="row">
            <template v-if="node">
-                <div v-for="device in node.devices" class="col-lg-3 col-md-4 col-sm-6" style="padding:15px;">
+                <div v-for="device in node.devices" class="col-lg-3 col-md-4 col-sm-6 p-1">
                    <div class="weui-grid__icon">
                        <img :src="'/IoTCenter'+device.product.image" />
                    </div>
--- a/projects/WebApp/wwwroot/pages/iot/node.js
+++ b/projects/WebApp/wwwroot/pages/iot/node.js
@ -23,10 +23,24 @@
                    store.commit('setNode', null);
                },
                methods: {
+                    getDevices: function (name) {
+                        return Enumerable.from(this.node.devices).where(function (o) { return o.name === name; }).toArray();
+                    },
+                    getDeviceDataAttr: function (number, name, attr) {
+                        var device = Enumerable.from(this.node.devices).where(function (o) { return o.number === number; }).firstOrDefault();
+                        var data = Enumerable.from(device.data).where(o => o.name === name).firstOrDefault();
+                        if (data != null) {
+                            return data[attr];
+                        }
+                        return null;
+                    },
                },
                computed: {
                    node: function () {
                        return store.state.node;
+                    },
+                    scenes: function () {
+                        return Enumerable.from(this.node.scenes).orderBy('o=>o.displayOrder');
                    }
                },