优化上传行程图

src/views/Editor/Canvas/index.vue

@@ -122,9 +122,7 @@ import { injectKeySlideScale } from '@/types/injectKey'
 import { removeAllRanges } from '@/utils/selection'
 import { KEYS } from '@/configs/hotkey'
 import useExport from '@/hooks/useExport'
-import UploadService from '@/services/UploadService'
 import { injectKeyDataSource } from '@/types/injectKey'
-import { domainManager } from '../../../utils/domainManager'
 
 import useViewportSize from './hooks/useViewportSize'
 import useMouseSelection from './hooks/useMouseSelection'
@@ -209,13 +207,6 @@ watch(() => FeatureImg.value, (n,o) =>{
   FeatureImg.value.sort((a,b)=>{
     return a.index-b.index
   })
-  if(FeatureImg.value.length==slides.value.length){
-     FeatureImg.value.forEach(item=>{
-      setTimeout(()=>{
-        setFeatureImg(item.url)
-      },300)
-     })
-  }
 })
 
 const linkDialogVisible = ref(false)
@@ -260,23 +251,6 @@ onMounted(() => {
   }
 })
 
-// 上传文件
-const setFeatureImg = async (url) => {
-  // if(!ConfigId.value) return
-  try {
-      let queryObj = {
-        MyFile: url
-      }
-      let path = `?fileType=1&fileLimit=5&&filePath=Feature/${ConfigId.value}_`
-      let Res = await UploadService.UploadBase64Two(path,queryObj);
-      if (Res.data&&Res.data.FilePath) {
-        console.log(`${domainManager().ViittoFileUrl}${Res.data.FilePath}`,'====Res.data')
-        datas.FeatureImgList.push(`${domainManager().ViittoFileUrl}${Res.data.FilePath}`)
-      }
-  } catch (error) {
-
-  }
-}
 // 点击画布的空白区域：清空焦点元素、设置画布焦点、清除文字选区、清空格式刷状态
 const handleClickBlankArea = (e: MouseEvent) => {
   console.log(e.button)

src/views/Editor/EditorHeader/index.vue

 <template>
+  <div style="position: fixed;z-index: 9999999;top: 50px;">
+    <template v-for="item in datas.FeatureImgList">
+      <img :src="item" style="width: 150px;"/>
+    </template>
+  </div>
   <div class="editor-header">
     <div class="left">
       <div class="menu-item" v-tooltip="'去首页'" @click="goBack()">首页</div>
@@ -115,6 +120,8 @@ import ConfigService from '@/services/ConfigService'
 import { injectKeyDataSource, injectKeyTemplate } from '@/types/injectKey'
 import PsdUpload from '@/components/PSD/Index.vue'
 import { svg2Base64 } from '@/utils/svg2Base64'
+import UploadService from '@/services/UploadService'
+import { domainManager } from '@/utils/domainManager'
 
 
 
@@ -146,9 +153,11 @@ const titleValue = ref('')
 const { userInfo } = storeToRefs(userStore())
 
 const datas = reactive({
+  FeatureImgList:[],
   DataSource:{},
   loading: false
 })
+datas.FeatureImgList = inject(injectKeyDataSource).FeatureImgList
 const queryObj = ref({} as any)
 const searchData = ref({} as any)
 datas.DataSource = inject(injectKeyDataSource)
@@ -160,7 +169,7 @@ const dataLoadingStore = useScreenStore()
 const TempIdStore = useScreenStore()
 
 const psdVisibleStatus = ref(false)
-const { market, model, ConfigId, CoverImg, dataLoading, TempId } = storeToRefs(useScreenStore())
+const { market, model, ConfigId, CoverImg, dataLoading, TempId, FeatureImg } = storeToRefs(useScreenStore())
 
 // 返回到首页
 const goBack = () =>{
@@ -248,7 +257,7 @@ const SetTripTemplateConfig = async () => {
         ConfigId: ConfigId.value,
         TempId: queryObj.value.TempId,
         TempData: queryObj.value.TempData,
-        FeatureImg: datas.DataSource.FeatureImgList
+        FeatureImg: datas.FeatureImgList
       }
       let TemplateRes = await ConfigService.SetSetTripConfig(queryMsg);
       if (TemplateRes.data.resultCode == 1) {
@@ -278,7 +287,14 @@ const SetTripTemplateConfig = async () => {
 }
 // 保存
 const setTemplate = async () =>{
-  console.log(queryObj.value,'-------')
+  // console.log(ConfigId.value,'-------',FeatureImg.value)
+  if(ConfigId.value&&FeatureImg.value.length>0){
+    FeatureImg.value.forEach(item=>{
+      setTimeout(()=>{
+        setFeatureImgList(item.url)
+      },300)
+    })
+  }
   if(dataLoading.value){
     dataLoadingStore.setDataLoading(false)
   }
@@ -335,6 +351,23 @@ const setTemplate = async () =>{
   }
 }
 
+// 上传文件
+const setFeatureImgList = async (url) => {
+  // if(!ConfigId.value) return
+  try {
+      let queryObj = {
+        MyFile: url
+      }
+      let path = `?fileType=1&fileLimit=5&&filePath=Feature/${ConfigId.value}_`
+      let Res = await UploadService.UploadBase64Two(path,queryObj);
+      if (Res.data&&Res.data.FilePath) {
+        datas.FeatureImgList.push(`${domainManager().ViittoFileUrl}${Res.data.FilePath}`)
+      }
+  } catch (error) {
+
+  }
+}
+
 const startEditTitle = () => {
   titleValue.value = title.value
   editingTitle.value = true

src/views/Market/Index.vue

@@ -193,11 +193,7 @@
     const isModelStore = useScreenStore()
     const layoutsStore = useSlidesStore()
     const { screening, market, model, isModel, ConfigId, TempId} = storeToRefs(useScreenStore())
-    console.log(TempId,'----TempId')
-    watch(() => TempId.value, (n,o) =>{
-        console.log(TempId,'----TempId111')
-        searchData.value.TempId = TempId.value
-    })
+
     const addTemplate = () =>{
         marketStore.setMarket(!market)
     }