From 523325cf0a763505413d673e67c58e232b294aff Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 28 Oct 2019 22:19:53 +0800
Subject: [PATCH] update

Former-commit-id: 2e0ed591309f3ebee9e20df6577a35b2d35c3774
---
 .../IoTCenter/Controllers/AppController.cs    |  6 ++-
 .../StreamingAssets/wwwroot/config.html       |  2 +-
 .../Assets/StreamingAssets/wwwroot/index.html |  1 -
 .../Assets/StreamingAssets/wwwroot/login.html |  1 +
 .../Assets/StreamingAssets/wwwroot/nodes.html | 37 +++++++++++--------
 .../Assets/StreamingAssets/wwwroot/user.html  | 28 +++++++-------
 6 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs
index 4c5473fa..73fa2b02 100644
--- a/projects/IoTCenter/Controllers/AppController.cs
+++ b/projects/IoTCenter/Controllers/AppController.cs
@@ -60,18 +60,20 @@ namespace IoTCenter.Controllers
             return View();
         }
 
-        public IActionResult GetNodeList(string token)
+        public IActionResult GetNodes(string token)
         {
             var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString();
             var model = this._nodeRepo.ReadOnlyTable()
                 .Include(o => o.Scenes)
+                .OrderBy(o=>o.DisplayOrder)
+                .ThenBy(o=>o.Name)
                 .Select(o => new
                 {
                     o.Id,
                     o.Number,
                     o.Name,
-                    o.DisplayOrder,
                     o.Image,
+                    o.DisplayOrder,
                     o.Scenes,
                     o.Devices.Count
                 })
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html
index 326a0ea5..7a520597 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html
@@ -75,11 +75,11 @@
                     if (!$(e.target).valid()) {
                         return;
                     }
+                    localStorage.setItem('server', vm.server);
                     var url = e.target.action;
                     axios.post(url)
                         .then(function (response) {
                             console.log(response);
-                            localStorage.setItem('server', vm.server);
                             window.location.href = "login.html";
                         })
                         .catch(function (error) {
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
index 95a105a7..c0ee3fb9 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
@@ -67,7 +67,6 @@
                 }
                 this.$f7ready((f7) => {
                     app = this.$f7;
-                    $.validator.unobtrusive.parse('form');
                 });
             },
             methods: {
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/login.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/login.html
index da6536bd..ead8b62d 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/login.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/login.html
@@ -91,6 +91,7 @@
                     if (!$(e.target).valid()) {
                         return;
                     }
+                    localStorage.setItem("username",vm.username);
                     var url = e.target.action;
                     var data = $(e.target).serialize();
                     axios.post(url, data)
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html
index 2dd0cc91..27cd4164 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html
@@ -14,8 +14,20 @@
             <f7-view main>
                 <f7-page>
                     <f7-navbar title="节点">
-                        <a href="config.html" slot="nav-right" class="link external"><i class="icon f7-icons if-not-md">menu</i></a>
+                        <f7-nav-right>
+                            <f7-link class="searchbar-enable" data-searchbar=".searchbar" icon-ios="f7:search"></f7-link>
+                        </f7-nav-right>
+                        <f7-searchbar class="searchbar-demo"
+                                      expandable
+                                      search-container=".search-list"
+                                      search-in=".item-title"></f7-searchbar>
                     </f7-navbar>
+                    <f7-list class="searchbar-not-found">
+                        <f7-list-item title="没有匹配的结果"></f7-list-item>
+                    </f7-list>
+                    <f7-list class="search-list searchbar-found">
+                        <f7-list-item  v-if="nodes" v-for="n in nodes" :title="n.Name" ></f7-list-item>
+                    </f7-list>
                     <f7-toolbar tabbar labels position="bottom">
                         <a href="index.html" class="tab-link external">
                             <i class="icon icon f7-icons">house</i>
@@ -55,7 +67,8 @@
                         theme: 'ios',
                     },
                     server: localStorage.getItem('server'),
-                    token: localStorage.getItem('token')
+                    token: localStorage.getItem('token'),
+                    nodes: null
                 };
             },
             mounted() {
@@ -67,27 +80,19 @@
                 }
                 this.$f7ready((f7) => {
                     app = this.$f7;
-                    $.validator.unobtrusive.parse('form');
                 });
+                this.load();
             },
             methods: {
-                submit: function (e) {
-                    if (!$(e.target).valid()) {
-                        return;
-                    }
-                    var url = e.target.action;
-                    var data = $(e.target).serialize();
+                load: function () {
+                    var url = this.server + '/IoTCenter/App/GetNodes';
+                    var data = new FormData();
+                    data.append('token', this.token);
                     axios.post(url, data)
                         .then(function (response) {
                             console.log(response);
                             var data = response.data;
-                            if (data.Code === 0) {
-                                localStorage.setItem("token", data.Token);
-                                window.location.href = "index.html";
-                            }
-                            else {
-                                app.dialog.alert(data.Message, '警告', function () { });
-                            }
+                            vm.nodes = data;
                         })
                         .catch(function (error) {
                             app.dialog.alert(error, '警告', function () { })
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html
index 2a26c35e..b74b1488 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html
@@ -88,22 +88,24 @@
                 }
                 this.$f7ready((f7) => {
                     app = this.$f7;
-                    $.validator.unobtrusive.parse('form');
                 });
-                var url = this.server + '/UserCenter/Account/GetUserInfo';
-                var data = new FormData();
-                data.append('token', this.token);
-                axios.post(url, data)
-                    .then(function (response) {
-                        console.log(response);
-                        var data = response.data;
-                        vm.user = data;
-                    })
-                    .catch(function (error) {
-                        app.dialog.alert(error, '警告', function () { })
-                    });
+                this.load();
             },
             methods: {
+                load: function () {
+                    var url = this.server + '/UserCenter/Account/GetUserInfo';
+                    var data = new FormData();
+                    data.append('token', this.token);
+                    axios.post(url, data)
+                        .then(function (response) {
+                            console.log(response);
+                            var data = response.data;
+                            vm.user = data;
+                        })
+                        .catch(function (error) {
+                            app.dialog.alert(error, '警告', function () { })
+                        });
+                },
                 logout: function () {
                     localStorage.removeItem("token");
                     window.location.href = "login.html";