diff --git a/src/main.js b/src/main.js index 6a92366..ab0429b 100644 --- a/src/main.js +++ b/src/main.js @@ -8,6 +8,7 @@ import { Picker, Loading, Field, + NumberKeyboard, Toast, Overlay, } from 'vant' @@ -20,6 +21,7 @@ createApp(App) .use(Picker) .use(DatePicker) .use(Loading) + .use(NumberKeyboard) .use(TimePicker) .use(Field) .use(Overlay) diff --git a/src/pages/Home.vue b/src/pages/Home.vue index b03f415..926888a 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -27,6 +27,7 @@
{ } const changeTab = index => { - if ([2, 3, 4, 5].includes(index) && operatorStore.disinfectStatus) { - return - } activeTab.value = index if (index == 5) { // getAllSetting @@ -278,7 +281,7 @@ onBeforeUnmount(() => { const handleLogout = () => { webSocketStore?.sendCommandMsg(logoutJSON) - router.push('/login') + window.location.href = 'http://127.0.0.1/#/login' } diff --git a/src/router/index.js b/src/router/index.js index fe0d155..446bfd1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,4 +1,4 @@ -import { createRouter, createWebHistory } from 'vue-router' +import { createRouter, createWebHashHistory } from 'vue-router' const Home = () => import('@/pages/Home') const Login = () => import('@/pages/Login') @@ -17,7 +17,7 @@ const routes = [ const router = createRouter({ routes, - history: createWebHistory(), + history: createWebHashHistory(), }) export default router diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 27c565d..17a0d81 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -49,7 +49,7 @@ export const useWebSocketStore = defineStore({ sensor_data, } = state || {} if (!isLogin) { - window.location.href = '/login' + window.location.href = 'http://127.0.0.1/#/login' return } const { @@ -198,21 +198,23 @@ export const useWebSocketStore = defineStore({ // 对数据进行处理 并存入到localstorage中 // console.log(moment(timeStamp).format('HH:mm:ss')) // console.log(localStorage) - saveEchartsDataToLocal( - moment(timeStamp).format('HH:mm'), - [temp_1, humid_1, h2o2_1], - [temp_2, humid_2, h2o2_2], - [temp_3, humid_3, h2o2_3], - ) - echartsStore.updateBinCharts( - JSON.parse(localStorage.getItem('bin')), - ) - echartsStore.updateEnvir1Charts( - JSON.parse(localStorage.getItem('envir1')), - ) - echartsStore.updateEnvir2Charts( - JSON.parse(localStorage.getItem('envir2')), - ) + if (operatorStore.disinfectStatus) { + saveEchartsDataToLocal( + moment(timeStamp).format('HH:mm'), + [temp_1, humid_1, h2o2_1], + [temp_2, humid_2, h2o2_2], + [temp_3, humid_3, h2o2_3], + ) + echartsStore.updateBinCharts( + JSON.parse(localStorage.getItem('bin')), + ) + echartsStore.updateEnvir1Charts( + JSON.parse(localStorage.getItem('envir1')), + ) + echartsStore.updateEnvir2Charts( + JSON.parse(localStorage.getItem('envir2')), + ) + } break default: break