diff --git a/.env b/.env index fe3f0dd..c4ae906 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ -VITE_BASE_WS1_URL=ws://192.168.8.10:19001/ -VITE_BASE_WS2_URL=ws://192.168.8.10:19002/ +# VITE_BASE_WS1_URL=ws://192.168.8.10:19001/ +# VITE_BASE_WS2_URL=ws://192.168.8.10:19002/ -# VITE_BASE_WS1_URL=ws://127.0.0.1:19001/ -# VITE_BASE_WS2_URL=ws://127.0.0.1:19002/ \ No newline at end of file +VITE_BASE_WS1_URL=ws://127.0.0.1:19001/ +VITE_BASE_WS2_URL=ws://127.0.0.1:19002/ \ No newline at end of file diff --git a/src/components/UpdatePreSetting.vue b/src/components/UpdatePreSetting.vue index d8624b0..ea8f599 100644 --- a/src/components/UpdatePreSetting.vue +++ b/src/components/UpdatePreSetting.vue @@ -1,19 +1,6 @@ @@ -277,13 +281,19 @@ const logVisible = ref(false) const logVal = ref(props.formulaInfo.loglevel) const formula_id = ref(props.formulaInfo.formula_id) -watch(formula_id, (newValue, oldValue) => { - if (newValue != '') { - // webSocketStore.sendCommandMsg( - // updateFormulaJSON('formula_id', newValue, props.formulaInfo.id), - // ) +// watch(formula_id, (newValue, oldValue) => { +// if (newValue != '') { +// // webSocketStore.sendCommandMsg( +// // updateFormulaJSON('formula_id', newValue, props.formulaInfo.id), +// // ) +// } +// }) + +const onKeyPress = button => { + if (button == '{bksp}') { + formula_id.value = formula_id.value.substr(0, formula_id.value.length - 1) } -}) +} const save = () => { if (formula_id.value == '') { diff --git a/src/pages/Home.vue b/src/pages/Home.vue index 756da1d..23c37ba 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -84,7 +84,7 @@ " @click="changeTab(7)" v-if=" - userStore.loginUserPermission != 3 && + userStore.loginUserPermission <= 1 && [0, 5].includes(operatorStore.disinfectStatus) " > @@ -142,7 +142,7 @@ activeTab == 5 ? 'tab_btn style-btn active_btn' : 'style-btn tab_btn' " v-if=" - userStore.loginUserPermission != 3 || + userStore.loginUserPermission <= 1 || [1, 2, 3, 4].includes(operatorStore.disinfectStatus) " @click="changeTab(5)" @@ -169,7 +169,7 @@