diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue index 89c6d0c..7c88004 100644 --- a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue @@ -14,7 +14,7 @@ const userId = userStore.userInfo.userId const isFinish = ref(false) // 是否触发下拉刷新 const isTriggered = ref(false) - +const progress = ref(0) const selectedId = ref(null); // 定义 selectedId 变量 // 定义 porps @@ -127,6 +127,7 @@ onShow(async () => { const handleDetail = (item) => { + progress.value = 0; showPopup.value = true; selectedId.value = item.id; // 为 selectedId 赋值 /* const url = `/pages/zjPgMaster/zjPgMaster-detail?id=${item.id}` @@ -215,7 +216,7 @@ const onRefresherrefresh = async () => { - + diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue index e0e2ffb..e8fe4e4 100644 --- a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue +++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ const props = defineProps({ } }); -const progress = ref(0.0); +const progress = ref(0); const imageLink = ref(''); const emit = defineEmits(['close']); @@ -29,7 +29,9 @@ const onMaskClick = () => { }; const onClose = () => { + emit('close', progress.value, imageLink.value); + progress.value = 0; };