瀏覽代碼

回评的预加载未展示的bug修复

刘洋 1 年之前
父節點
當前提交
b3c531c8a6
共有 3 個文件被更改,包括 21 次插入8 次删除
  1. 1 1
      src/modules/marking/mark/index.vue
  2. 15 2
      src/modules/marking/mark/remark-box.vue
  3. 5 5
      src/utils/usePreloadImageToTask.ts

+ 1 - 1
src/modules/marking/mark/index.vue

@@ -84,6 +84,7 @@
       <remark-box
         v-if="remarkModalVisible"
         ref="remarkBoxRef"
+        :img-option="imgOption"
         @task-change="historyTaskChange"
         @back="historyBack"
         @close="historyClose"
@@ -597,7 +598,6 @@ const imgOption = computed<SetImgBgOption>(() => {
     scale: scale.value,
   }
 })
-
 const { drawing, dataUrl, imgLoading } = useSetImgBg(imgOption, frontColor, setFrontColor)
 
 const getEnableRemark = () => {

+ 15 - 2
src/modules/marking/mark/remark-box.vue

@@ -44,18 +44,32 @@
   </div>
 </template>
 <script name="RemarkBox" setup lang="ts">
-import { reactive, ref, watch, nextTick, onMounted, onBeforeUnmount } from 'vue'
+import { reactive, ref, watch, nextTick, onMounted, onBeforeUnmount, computed } from 'vue'
 import { ElRadioGroup, ElRadio, ElButton, ElMessage } from 'element-plus'
 import ConfirmButton from '../../../components/common/ConfirmButton.vue'
 import useFetch from '@/hooks/useFetch'
 import useVModel from '@/hooks/useVModel'
 import BaseTable from '@/components/element/BaseTable.vue'
 import { throttle } from 'lodash-es'
+import { usePreloadImageToTask } from '@/utils/usePreloadImageToTask'
+import useMarkHeader from '@/hooks/useMarkHeader'
+const props = defineProps<{ imgOption: any }>()
+
+const { frontColor, setFrontColor } = useMarkHeader()
+const imgOptionCom = computed(() => {
+  return props.imgOption
+})
+console.log('props.imgOption:', props.imgOption)
 const markHistoryList = ref<any>([])
 const historyTable = ref()
 const getMarkHistory = async () => {
   let res = await useFetch('getMarkHistory').fetch()
   markHistoryList.value = res.markHistoryList
+  markHistoryList.value.forEach((task: any) => {
+    if (!task.dataUrl) {
+      usePreloadImageToTask(imgOptionCom, frontColor, setFrontColor, task)
+    }
+  })
   nextTick(() => {
     if (!markHistoryList.value.length) {
       ElMessage.info('暂无回评数据')
@@ -64,7 +78,6 @@ const getMarkHistory = async () => {
     }
   })
 }
-// const props = defineProps<{ modelValue: boolean }>()
 const emits = defineEmits<{
   (e: 'task-change', data: any): void
   (e: 'update:modeValue', visible: boolean): void

+ 5 - 5
src/utils/usePreloadImageToTask.ts

@@ -132,11 +132,11 @@ export const usePreloadImageToTask = (
 
   nextTick(() => {
     const opt = unref(option)
-    if (!opt.image) {
-      drawing.value = false
-      dataUrl.value = ''
-      return
-    }
+    // if (!opt.image) {
+    //   drawing.value = false
+    //   dataUrl.value = ''
+    //   return
+    // }
     initImage({ task, frontColor, setFrontColor })
       .then((image) => {
         if (!image) return