Merge remote-tracking branch 'origin/dev-frontend'

frontend/src/views/Photography/components/LoadingDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-model="visible"
-    :show-close="progress == 100"
+    :show-close="requesting"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     width="400px"
@@ -44,14 +44,16 @@ interface Props {
   progress?: number
   message?: string
   disabledButton?: boolean
-  buttonText?: string
+  buttonText?: string,
+  requesting?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
   progress: 0,
-  message: '正在为您处理，请稍后',
+  message: '正在为您处理，请稍后...',
   disabledButton: true,
-  buttonText: '处理完毕，点击打开最终图片目录'
+  buttonText: '处理完毕，点击打开最终图片目录',
+  requesting: false
 })
 
 const emit = defineEmits<{

frontend/src/views/Photography/detail.vue

@@ -171,7 +171,7 @@
   </div>
 
 
-  <loading-dialog v-if="loadingDialogVisible" v-model="loadingDialogVisible" :progress="progress" :message="message"
+  <loading-dialog v-if="loadingDialogVisible" v-model="loadingDialogVisible" :requesting="requesting" :progress="progress" :message="message"
     :disabled-button="disabledButton" @button-click="handleComplete">
     <template v-if="partErrList && partErrList.length > 0" #errList>
       <div v-for="(item, idx) in partErrList" :key="idx">
@@ -239,6 +239,11 @@ let templates = ref([])
 let goods_art_nos = ref([])
 let partErrList = ref([])
 const excel_template_url = ref('')
+// 是否正在请求接口
+const requesting = ref(false)
+
+
+
 
 
 // 定义一个定时器变量
@@ -340,11 +345,13 @@ const generate = async function () {
   // 开启进度弹窗
   progress.value = 0
   openLoadingDialog(20)
+  requesting.value =  true
   console.log("params", "color:#3f7cff", params);
   clientStore.ipc.removeAllListeners(icpList.generate.generatePhotoDetail);
   clientStore.ipc.send(icpList.generate.generatePhotoDetail, params);
   clientStore.ipc.on(icpList.generate.generatePhotoDetail, (event, result) => {
     console.log('result', result)
+    requesting.value =  false
     partErrList.value = []
     clientStore.ipc.removeAllListeners(icpList.generate.generatePhotoDetail);
     clearInterval(INTERVAL.value)