删除多余代码

src/App.vue

@@ -40,7 +40,6 @@ const ConfigIdStore = useScreenStore()
 const marketStore = useScreenStore()
 const isModelStore = useScreenStore()
 const TempIdStore = useScreenStore()
-const pageIndexStore = useScreenStore()
 const { databaseId } = storeToRefs(mainStore)
 const { screening, market, model, ConfigId } = storeToRefs(useScreenStore())
 const { userInfo } = storeToRefs(userStore())
@@ -54,15 +53,12 @@ const userLoginHandler = async ()=>{
   let ConfigId = 0 // 9117
   let model = 0
   let TempId = 1
-  let pageIndex = 0
   if(param.uid) userId=parseInt(param.uid)
   if(param.ConfigId) ConfigId=parseInt(param.ConfigId)
   if(param.model) model=parseInt(param.model)
   if(param.TempId) {
-    TempId=parseInt(param.TempId) 
-    pageIndex=parseInt(param.pageIndex) 
+    TempId=parseInt(param.TempId)
     TempIdStore.setTempId(TempId)
-    pageIndexStore.setPageIndex(pageIndex)
     marketStore.setMarket(!market)
   }
   ConfigIdStore.setConfigId(ConfigId)

src/hooks/useExport.ts

@@ -26,11 +26,8 @@ interface ExportImageConfig {
 
 export default () => {
   const slidesStore = useSlidesStore()
-  const coverImgStore = useScreenStore()
-  const isCoverImgStore = useScreenStore()
-  const FeatureImgStore = useScreenStore()
   const { slides, theme, viewportRatio, title } = storeToRefs(slidesStore)
-  const { isCoverImg, FeatureImg } = storeToRefs(useScreenStore())
+  const { isCoverImg } = storeToRefs(useScreenStore())
 
   const exporting = ref(false)
 
@@ -49,16 +46,7 @@ export default () => {
         if (ignoreWebfont) config.fontEmbedCSS = ''
         toImage(domRef, config).then(dataUrl => {
           if (isCoverImg.value) {
-            // coverImgStore.setCoverImg('')
             resolve(dataUrl)
-          }else{
-            const obj = {
-              index: i,
-              url: dataUrl
-            }
-            FeatureImg.value.push(obj)
-            FeatureImgStore.setFeatureImg(JSON.parse(JSON.stringify(FeatureImg.value)))
-            resolve(true)
           }
         }).catch(() => {
           // message.error('导出图片失败')

src/store/screen.ts

@@ -13,9 +13,7 @@ export interface ScreenState {
   CoverImg: any,
   isCoverImg: boolean,
   dataLoading: number,
-  FeatureImg: any,
   SourceLoading: boolean,
-  pageIndex: number,
   imgPoolVisible: boolean,
   imgReplaceVisible: boolean,
 }
@@ -33,9 +31,7 @@ export const useScreenStore = defineStore('screen', {
     CoverImg: null, // 封面图
     isCoverImg: false, // 封面
     dataLoading: 0, // 记录保存是否成功
-    FeatureImg: [], // 行程特色图
     SourceLoading: false, // 记录数据源是否更改
-    pageIndex: 0,//需要生成图的行程特色
     imgPoolVisible: false,//新增上传图片弹窗
     imgReplaceVisible: false,//替换图片弹窗
   }),
@@ -77,15 +73,9 @@ export const useScreenStore = defineStore('screen', {
     setDataLoading(dataLoading: number) {
       this.dataLoading = dataLoading
     },
-    setFeatureImg(FeatureImg: any) {
-      this.FeatureImg = FeatureImg
-    },
     setSourceLoading(SourceLoading: boolean) {
       this.SourceLoading = SourceLoading
     },
-    setPageIndex(pageIndex: number){
-      this.pageIndex = pageIndex
-    },
     setImgPoolVisible(imgPoolVisible: boolean) {
       this.imgPoolVisible = imgPoolVisible
     },

src/types/injectKey.ts

@@ -23,7 +23,6 @@ export type SlideDataSource = Ref<{
   ConfigId:number,
   DataSourceList?:Array<any>,
   DataSourceOverlay?:boolean,
-  FeatureImgList?:any[],
   TravelAatas?:TravelAatas,
   [key: string]: any;
 }>

src/views/Editor/Canvas/index.vue

@@ -162,12 +162,9 @@ const viewportRef = ref<HTMLElement>()
 const alignmentLines = ref<AlignmentLineProps[]>([])
 
 const datas = reactive({
-  FeatureImgList: [],
   loading: false
 })
-datas.FeatureImgList = inject(injectKeyDataSource).FeatureImgList
-const FeatureImgStore = useScreenStore()
-const { market, model, ConfigId, CoverImg, dataLoading, FeatureImg } = storeToRefs(useScreenStore())
+const { market, model, ConfigId, CoverImg, dataLoading } = storeToRefs(useScreenStore())
 const renderSlides = computed(() => {
   return slides.value
 })
@@ -177,12 +174,6 @@ watch(() => slides.value, (n,o) =>{
   
 })
 
-watch(() => FeatureImg.value, (n,o) =>{
-  FeatureImg.value.sort((a,b)=>{
-    return a.index-b.index
-  })
-})
-
 const linkDialogVisible = ref(false)
 const openLinkDialog = () => linkDialogVisible.value = true
 

src/views/Editor/EditorHeader/index.vue

 <template>
-  <!-- <div @click="testHandler">测试</div> -->
-  <!-- <div>
-    <template v-for="(x,i) in FeatureImg">
-      <img :src="x.url" alt="" style="width: 80px;">
-    </template>
-  </div> -->
-  <!-- <div>
-    <img :src="item" v-for="item in datas.FeatureImgList"  style="width: 80px;" />
-  </div> -->
   <div class="editor-header">
     <div class="left">
       <div class="menu-item" v-tooltip="'去首页'" @click="goBack()">首页</div>
@@ -104,21 +95,6 @@
     <FullscreenSpin :loading="exporting" tip="正在导入..." />
     <Psd-Upload :visible="psdVisibleStatus" @closed="psdVisibleStatus=false"></Psd-Upload>
   </div>
-  <!-- 
-  <div v-if="!model&&ConfigId" style="opacity: 0;position: absolute;left: 100px;top: 0;bottom: 0;overflow: auto;z-index: -1;">
-    <div class="export-img-dialog">
-      <div class="thumbnails-view">
-        <div class="thumbnails" v-for="slide in slides" ref="FeatureImgRef">
-          <ThumbnailSlide 
-            class="thumbnail" 
-            :key="slide.id" 
-            :slide="slide" 
-            :size="viewportRatio==0.7069?" 
-          />
-        </div>
-      </div>
-    </div>
-  </div> -->
   
 </template>
 
@@ -178,11 +154,9 @@ const { setNewDatasList } = useEditor()
 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)
@@ -192,10 +166,8 @@ const marketStore = useScreenStore()
 const CoverImgStore = useScreenStore()
 const dataLoadingStore = useScreenStore()
 const TempIdStore = useScreenStore()
-const FeatureImgStore = useScreenStore()
 const ConfigIdStore = useScreenStore()
 const FeatureImgRef = ref(null)
-const FeatureImgList = ref(null)
 
 const { exportFeatureImg } = useExport()
 
@@ -330,7 +302,6 @@ const SetTripTemplateConfig = async () => {
         ConfigId: ConfigId.value,
         TempId: queryObj.value.TempId,
         TempData: queryObj.value.TempData,
-        // FeatureImg: datas.FeatureImgList
       }
         let TemplateRes = await ConfigService.SetSetTripConfig(queryMsg);
         if (TemplateRes.data.resultCode == 1) {
@@ -352,7 +323,6 @@ const SetTripTemplateConfig = async () => {
           })
         }
     } catch (error) {}
-    FeatureImgStore.setFeatureImg([])
     datas.loading = false
  
 }
@@ -426,74 +396,6 @@ const setTemplate = async () =>{
   }
 }
 
-// 行程图生成bes64图
-const testHandler = async ()=>{
-  FeatureImgStore.setFeatureImg([])
-  if(FeatureImgRef.value&&FeatureImgRef.value.length>0){
-    for (let i = 0; i < FeatureImgRef.value.length; i++) {
-      let result = await exportFeatureImg(FeatureImgRef.value[i], 'jpeg', 1, false, i)
-      if(!result){
-        console.log('异常')
-        datas.loading = false
-        break
-      }
-    }
-    setFeatureImgList()
-  }
-}
-
-// 行程图上传
-const setFeatureImgList = async () => {
-  datas.FeatureImgList = []
-  FeatureImgList.value = []
-  if(FeatureImg.value&&FeatureImg.value.length>0){
-    for (let i = 0; i < FeatureImg.value.length; i++) {
-      let name = new Date().getTime()+".jpg"
-      const file = dataURLtoFile(FeatureImg.value[i].url, name)
-      let result = AliyunUpload.UploadAsync(file,`Feature/${ConfigId.value}_${i}`)
-      result.then(res=>{
-        if(res) {
-          let path = res.split('_')
-          FeatureImgList.value.push({
-            index: path[1],
-            url: res
-          })
-          if(i==FeatureImg.value.length-1) {
-            setTimeout(()=>{
-                let list = FeatureImgList.value.sort((a,b)=>{
-                  return a.index-b.index
-                })
-                datas.FeatureImgList = list.map(x=>{return x.url})
-                setTimeout(()=>{
-                  SetTripTemplateConfig()
-                },600)
-            },300)
-          }
-        }
-      })
-    }
-  }
-  // 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}`)
-  //       if(datas.FeatureImgList.length==slides.value.length){
-  //         await SetTripTemplateConfig()
-  //       }
-  //     }
-  // } catch (error) {
-  //   datas.loading = false
-  //   ElMessage({
-  //     showClose: true,
-  //     message: '上传行程文件出错',
-  //     type: 'warning',
-  //   })
-  // }
-}
 
 const startEditTitle = () => {
   titleValue.value = title.value

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -287,7 +287,6 @@
         queryObj.value.CoverImg = ''
         mainMenuVisible.value = false
         isCoverImgStore.setIsCoverImg(true)
-        console.log(FeatureImgRef.value)
         let datas = await exportFeatureImg(FeatureImgRef.value, 'jpeg', 1, false,0)
         if(datas){
             let name = new Date().getTime()+".jpg"

src/views/Editor/index.vue

@@ -87,7 +87,6 @@ else if(TempId.value) TempIds = TempId.value
 const datas = reactive({
     DataSource:{
         TravelAatas:{},
-        FeatureImgList: [],
         ConfigId: ConfigId.value?ConfigId.value:0,
         pageType: 1,//1基础 2酒店 3景 4餐
         DataSourceOverlay: false,