diff --git a/projects/WebApp/WebApp.csproj b/projects/WebApp/WebApp.csproj index 406ace23..ddeb6156 100644 --- a/projects/WebApp/WebApp.csproj +++ b/projects/WebApp/WebApp.csproj @@ -1,13 +1,6 @@ - + netcoreapp3.1 - - - - true - PreserveNewest - - \ No newline at end of file diff --git a/projects/WebApp/wwwroot/css/app.css b/projects/WebApp/wwwroot/css/app.css index 8742602f..e7d526a2 100644 --- a/projects/WebApp/wwwroot/css/app.css +++ b/projects/WebApp/wwwroot/css/app.css @@ -60,16 +60,18 @@ ul { color: #07c160 } -.my_container { +#app { overflow: hidden } -.my_container, .page { +#app, .page { position: absolute; top: 0; right: 0; bottom: 0; - left: 0 + left: 0; + padding:0; + margin:0; } .page { @@ -716,4 +718,4 @@ ul { left: 0; right: 0; border-radius: unset; -} +} \ No newline at end of file diff --git a/projects/WebApp/wwwroot/index.html b/projects/WebApp/wwwroot/index.html index 12215bdb..7ccecdff 100644 --- a/projects/WebApp/wwwroot/index.html +++ b/projects/WebApp/wwwroot/index.html @@ -11,7 +11,7 @@ 首屏 -
+
diff --git a/projects/WebApp/wwwroot/js/app.js b/projects/WebApp/wwwroot/js/app.js index be7ef359..73176d22 100644 --- a/projects/WebApp/wwwroot/js/app.js +++ b/projects/WebApp/wwwroot/js/app.js @@ -32,12 +32,12 @@ axios.interceptors.response.use(function (response) { if (error.response.status === 401 && error.config.url.indexOf('refreshToken') === -1) { var url = '/UserCenter/api/v1/token/refreshToken'; var data = '"' + store.state.refreshToken + '"'; - axios.post(url, data, { headers: { 'Content-Type': 'application/json;charset=UTF-8' } }) + return axios.post(url, data, { headers: { 'Content-Type': 'application/json;charset=UTF-8' } }) .then(function (response) { store.commit('setToken', response.data); error.config.headers['Authorization'] = 'Bearer ' + store.state.accessToken; console.log('刷新token后重发api请求'); - axios.request(error.config); + return axios(error.config); }) .catch(function (error) { if (error.response.status === 401) { diff --git a/projects/WebApp/wwwroot/pages/home.html b/projects/WebApp/wwwroot/pages/home.html index cf7aafb1..6bc6b305 100644 --- a/projects/WebApp/wwwroot/pages/home.html +++ b/projects/WebApp/wwwroot/pages/home.html @@ -6,19 +6,21 @@
物联网
-
- -
- -
-

设备

- - -
- -
-

智慧教室

- +
+
+ +
+ +
+

设备

+ + +
+ +
+

智慧教室

+ +
@@ -34,7 +36,7 @@
- 退出 + 退出
diff --git a/projects/WebApp/wwwroot/pages/iot/nodes.html b/projects/WebApp/wwwroot/pages/iot/nodes.html index b14e2b96..29bfb740 100644 --- a/projects/WebApp/wwwroot/pages/iot/nodes.html +++ b/projects/WebApp/wwwroot/pages/iot/nodes.html @@ -4,9 +4,9 @@ back -
-
- +
+
+
diff --git a/projects/WebApp/wwwroot/pages/iot/product.html b/projects/WebApp/wwwroot/pages/iot/product.html index d66f62ee..902e4649 100644 --- a/projects/WebApp/wwwroot/pages/iot/product.html +++ b/projects/WebApp/wwwroot/pages/iot/product.html @@ -4,10 +4,10 @@ back -
-
+
+