diff --git a/components.d.ts b/components.d.ts index b11d5d3..5eb2c57 100644 --- a/components.d.ts +++ b/components.d.ts @@ -40,7 +40,5 @@ declare module '@vue/runtime-core' { VanIcon: typeof import('vant/es')['Icon'] VanOverlay: typeof import('vant/es')['Overlay'] VanSlider: typeof import('vant/es')['Slider'] - VanSwipe: typeof import('vant/es')['Swipe'] - VanSwipeItem: typeof import('vant/es')['SwipeItem'] } } diff --git a/src/components/frame/index.vue b/src/components/frame/index.vue index 8f64cc9..5872aaf 100644 --- a/src/components/frame/index.vue +++ b/src/components/frame/index.vue @@ -132,8 +132,11 @@ const routerBack = () => { loginStore.userInfo = [] loginStore.token = '' sessionStorage.removeItem("selectTrmina") + }else if(currentPath.value === '/cabinetManage/parameterInfo'){ + router.push('/home') }else { router.go(-1) + // router.push('/' + `${routerStore.backPath}`) } } @@ -206,9 +209,9 @@ const toWarningModal = () =>{ -->
-
+
diff --git a/src/pages/cabinetManage/components/labelTwo.vue b/src/pages/cabinetManage/components/labelTwo.vue index ba4b9d8..f975d1b 100644 --- a/src/pages/cabinetManage/components/labelTwo.vue +++ b/src/pages/cabinetManage/components/labelTwo.vue @@ -22,12 +22,12 @@ const changeLable = (index) => { } // changeLable() active.value =props.value -console.log(active.value,'照名数值',props.value) -// watch(() => props.value, (a, b) => { -// console.log(a,'照名新值:', b); -// active.value =b -// // 在这里执行你希望触发的操作 -// }); +// console.log(active.value,'照名数值',props.value) +watch(() => props.value, (a, b) => { + // console.log(a,'照名新值:', b); + active.value = a + // 在这里执行你希望触发的操作 +});