From ce8aa43d07c3c6ce3a78c1bf726462ed447462cc Mon Sep 17 00:00:00 2001
From: think <1787994136@qq.com>
Date: Tue, 14 Jan 2025 11:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E5=85=B7=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E4=BA=8C=E6=AC=A1=E6=8A=A5=E5=B7=A5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=BF=9B=E5=BA=A6=E8=BF=98=E6=98=AF=E4=B8=8A?=
 =?UTF-8?q?=E6=AC=A1=E8=BE=93=E5=85=A5=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/moJuSheJiReport/components/dataItem.vue       | 5 +++--
 .../mini-app/src/pages/moJuSheJiReport/components/popup.vue | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

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 () => {
       </view>
     </scroll-view>
 	<!-- <popup  :show="showPopup" :progress="0.0" :imageLink="''" @close="onPopupClose" /> -->
-	 <popup :showPopup="showPopup" :progress="0.0" :imageLink="''" @close="onPopupClose" /> 
+	 <popup :showPopup="showPopup" :progress="progress" :imageLink="''" @close="onPopupClose" /> 
   </view>
 </template>
 
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 @@
         <view class="popup-content">
             <input type="number" class="progress-info" v-model="progress" placeholder="请输入进度">
             <input type="text" class="image-info" v-model="imageLink" placeholder="请输入图片链接">
-            <button @click="onClose">关闭弹窗</button>
+            <button @click="onClose">确认上报</button>
         </view>
     </view>   
 </template>
@@ -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;
 };   
 </script>