复用问题修复 - 小问题修复

src/components/businessMoudle/batchGdt/configArea/creativeMaterial/index.vue

@@ -646,104 +646,105 @@ const clearAllEvent = async () => {
 }
 
 //删除一些账号的数据
-const deleAcEvent = (arr:any,haveAssign:boolean) => {
-  //arr空 就清空数据
-  console.log(arr,pageInfo.creativeTeamList)
-  if(arr&&arr.length>0){
-    arr.forEach(obj=>{
-      if(pageInfo.creativeTeamList&&pageInfo.creativeTeamList.length>0){
-        pageInfo.creativeTeamList.forEach((dir,dirIdx)=>{
-          if(dir.resResult && Array.isArray(dir.resResult)) {
-            dir.resResult.forEach((sub,subIdx)=>{
-              if(sub.account_id == obj.id){}else{
-                dir.resResult.splice(subIdx,1)
+              const deleAcEvent = (arr: any, haveAssign: boolean) => {
+                //arr空 就清空数据
+                if (arr && arr.length > 0) {
+                  arr.forEach(obj => {
+                    if (pageInfo.creativeTeamList && pageInfo.creativeTeamList.length > 0) {
+                      pageInfo.creativeTeamList.forEach((dir, dirIdx) => {
+                        dir.list.forEach(sub=>{
+                          sub.resResult.forEach((sun,sunIdx)=>{
+                            if (sun.account_id == obj.id) {
+                            } else {
+                              sub.resResult.splice(sunIdx, 1)
+                            }
+                          })
+                        })
+                      })
+                    }
+                  })
+                  if (haveAssign) {
+                    emit('assignEvent', pageInfo.creativeTeamList)
+                  }
+                } else {
+                  clearAllEvent()
+                }
               }
-            })
-          }
-        })
-      }
-    })
-    if(haveAssign){
-      emit('assignEvent',pageInfo.creativeTeamList)
-    }
-  }else{
-    clearAllEvent()
-  }
-}
 
 //复用 - 将选中的素材重新上传一遍到新账号 - 得到返回值 - 抛给主页面
-const get_new_ac_ids = () => {
-  let arr:any = _.cloneDeep(inject_accountIds)
-  let new_ac_ids:any = []
-  let all_ac_ids:any = []
-  console.log(pageInfo.creativeTeamList);
-  pageInfo.creativeTeamList.forEach(pcItem=>{
-    pcItem.resResult.forEach(sub=>{
-      let ids_nn:number = all_ac_ids.findIndex(nn=>nn==sub.account_id)
-      if(ids_nn==-1){
-        all_ac_ids.push(sub.account_id)
-      }
-    })
-  })
-  arr._object[arr._key].forEach(a=>{
-    let idx:number = all_ac_ids.findIndex(n=>n == a.id)
-    if(idx==-1){
-      new_ac_ids.push(a)
-    }
-  })
-  console.log(new_ac_ids,'new_ac_ids');
-  console.log(arr,'arr');
-  return new_ac_ids
-}
-const get_new_target_ids = () => {
-  let new_target_ids:any = []
-  pageInfo.creativeTeamList.forEach(item=>{
-    let ids_nn:number = new_target_ids.findIndex(nn=>nn==item.itemId)
-    if(ids_nn==-1){
-      new_target_ids.push(item.itemId)
-    }
-  })
-  console.log(new_target_ids,'new_target_ids');
-  return new_target_ids
-}
+              const get_new_ac_ids = () => {
+                let arr: any = _.cloneDeep(inject_accountIds)
+                let new_ac_ids: any = []
+                let all_ac_ids: any = []
+                pageInfo.creativeTeamList[0].list[0].resResult.forEach(sub => {
+                  let ids_nn: number = all_ac_ids.findIndex(nn => nn == sub.account_id)
+                  if (ids_nn == -1) {
+                    all_ac_ids.push(sub.account_id)
+                  }
+                })
+                arr._object[arr._key].forEach(a => {
+                  let idx: number = all_ac_ids.findIndex(n => n == a.id)
+                  if (idx == -1) {
+                    new_ac_ids.push(a)
+                  }
+                })
+                return new_ac_ids
+              }
+              const get_new_target_ids = () => {
+                let new_target_ids: any = []
+                pageInfo.creativeTeamList.forEach(item => {
+                  item.list.forEach(sub => {
+                    let ids_nn: number = new_target_ids.findIndex(nn => nn == sub.itemId)
+                    if (ids_nn == -1) {
+                      new_target_ids.push(sub.itemId)
+                    }
+                  })
+                })
+                console.log(new_target_ids, 'new_target_ids');
+                return new_target_ids
+              }
 
 
-const creatice_reuseEvent = async () => {
-  requestObj.upload_flag = false
-  clearTimeout(requestObj.timer_get_upload_res)
-  let acArr:any = await get_new_ac_ids()
-  let targetArr:any = await get_new_target_ids()
-  if(targetArr&&targetArr.length==0){
-    emit('closeLoading')
-    return
-  }
-  if(acArr&&acArr.length==0){
-    emit('closeLoading')
-    return
-  }
-  await get_up_record_id(targetArr,acArr)
-  await get_upload_res()
-}
+
+              const creatice_reuseEvent = async () => {
+                requestObj.upload_flag = false
+                clearTimeout(requestObj.timer_get_upload_res)
+                let acArr: any = await get_new_ac_ids()
+                let targetArr: any = await get_new_target_ids()
+                if (targetArr && targetArr.length == 0) {
+                  emit('closeLoading')
+                  return
+                }
+                if (acArr && acArr.length == 0) {
+                  emit('closeLoading')
+                  return
+                }
+                await get_up_record_id(targetArr, acArr)
+                await get_upload_res()
+              }
 //上传素材成功后 走的代码
-const successEvent = (resResult:any) => {
-  pageInfo.resResult = _.cloneDeep(resResult)
-  pageInfo.creativeTeamList.forEach(item=>{
-    item.resResult = item.resResult.concat(resResult_to_creativeTeamList(item.itemId))
-  })
-  emit('assignEvent',pageInfo.creativeTeamList)
-}
+              const successEvent = (resResult: any) => {
+                pageInfo.resResult = _.cloneDeep(resResult)
+                pageInfo.creativeTeamList.forEach(item => {
+                  item.list.forEach(sub => {
+                    sub.resResult = sub.resResult.concat(resResult_to_creativeTeamList(sub.itemId))
+                  })
+                })
+                emit('assignEvent', pageInfo.creativeTeamList)
+              }
 
-const {get_up_record_id,get_upload_res,requestObj} =
-    uploadAddGetResTs(coverRadioList.radioVal == 'On' ? 1 : 0,successEvent)
+              const {get_up_record_id, get_upload_res, requestObj} =
+                  uploadAddGetResTs(coverRadioList.radioVal == 'On' ? 1 : 0, successEvent)
 
 
 // 父组件共享值
-defineExpose({
-  switchShow,
-  clearAllEvent,
-  creatice_reuseEvent,
-  deleAcEvent
-});
+              defineExpose({
+                             switchShow,
+                             clearAllEvent,
+                             creatice_reuseEvent,
+                             deleAcEvent
+                           });
+
 
 </script>
 <style lang="scss" scoped>

src/components/businessMoudle/batchGdt/configArea/creativeMaterial/ts/uploadAddGetRes.ts

@@ -91,14 +91,16 @@ export function uploadAddGetResTs(generateCoverParams?:number,successEvent?:any)
                         clearTimeout(requestObj.timer_get_upload_res)
                     }
                 }else{ //成功获取到数据
-                    fullLoading.value = false
-                    requestObj.upload_flag = false
                     if(resNew?.result?.length>0){
                         await successEvent(resNew.result)
                         dialogShow.value = false
+                        fullLoading.value = false
+                        requestObj.upload_flag = false
                     }else{
                         console.log(resNew?.err_msg,'err_msg');
                         ElMessage.error(resNew?.err_msg)
+                        fullLoading.value = false
+                        requestObj.upload_flag = false
                     }
                 }
             }

src/components/businessMoudle/gdtList/advert.vue

@@ -27,7 +27,7 @@
                   :disabledFlag="tableInfo.multipleSelection&&tableInfo.multipleSelection.length == 0"></Dropdown>
         <div>已选 : <span>{{tableInfo.multipleSelection&&tableInfo.multipleSelection.length}}</span></div>
         <div  class="lMarauto">
-          <Indicators type="campaign_base" @refresh="init"></Indicators>
+          <Indicators type="ad_base" @refresh="init"></Indicators>
         </div>
       </div>
 
@@ -105,12 +105,11 @@
                           <span class="c-theme pointer lMar10" @click="goDetial(scope.row)">详情</span>
                         </div>
                       </div>
-                      <div class="flex c-theme pointer" v-else-if="item.key_value == 'daily_budget'" @click="editPlanEvent(scope.row)">
+                      <div class="flex c-theme" v-else-if="item.key_value == 'daily_budget'">
                         {{scope.row[item.key_value] ? NumberHandle(scope.row[item.key_value]) : '不限'}}
                       </div>
                       <div class="flex c-theme pointer" v-else-if="item.key_value == 'site_set'">
                         {{scope.row[item.key_value]}}
-                        <!--                  {{siteIdtoText(scope.row[item.key_value])}}-->
                       </div>
 
 
@@ -142,8 +141,6 @@
       </template>
     </div>
 
-    <EditIpt ref="planEditIptRef" title="推广计划" @confirm="planEditConfirm"></EditIpt>
-    <TargetEdit ref="TargetEditRef" title="计划设置" @confirm="init"></TargetEdit>
     <Detial ref="detialRef" @confirm="init"></Detial>
 
     <EditPutTime ref="EditPutTimeRef" title="批量修改投放时间" @confirm = "batchEventApi"></EditPutTime>
@@ -161,7 +158,6 @@ import Select from '@/components/capsulationMoudle/_select.vue'
 import TimeScreen from '@/components/capsulationMoudle/timeScreen.vue'
 import Input from '@/components/capsulationMoudle/_input.vue'
 import EditIpt from '@/components/businessMoudle/gdtList/dialog/editIpt.vue'
-import TargetEdit from '@/components/businessMoudle/gdtList/dialog/target.vue'
 import EditPutTime from '@/components/businessMoudle/gdtList/advertBatch/editPutTime.vue'
 import OneClickMeasure from '@/components/businessMoudle/gdtList/advertBatch/oneClickMeasure.vue'
 import BatchEditDayBudget from '@/components/businessMoudle/gdtList/advertBatch/batchEditDayBudget.vue'
@@ -319,16 +315,6 @@ const goDetial = (row:any) => {
   detialRef.value!.switchShow(true,row)
 }
 
-const {siteIdtoText,get_siteSet_list} = commonlistTs()
-
-
-
-//修改计划
-const editPlanEvent = (row:any) => {
-  nextTick(()=>{
-    TargetEditRef.value!.switchShow(true,row)
-  })
-}
 //修改计划名称
 //推广计划 - 确定
 const planEditConfirm = () => {
@@ -459,8 +445,6 @@ const {
   InputRef_text,
   clearEvent,
   tableHeaderStyle,
-  planEditIptRef,
-  TargetEditRef,
   init_ad_statusList
 } = listTs()
 
@@ -468,7 +452,6 @@ const {
 const initAll = () => {
   nextTick(async ()=>{
     await init_acList()
-    // await get_siteSet_list()
     await init()
     init_ad_statusList()
   })

src/components/businessMoudle/gdtList/detial/basicInfo.vue

@@ -187,15 +187,15 @@ const init = async () => {
             }else{
               sub.value = '长期投放（开始日期：'  + pageInfo.infoRst.begin_date + ')'
             }
-          }else if(sub.key == 'site_set'){
-            // sub.value = siteIdtoText(val)
-            sub.value = ''
           }else{
             sub.value = val
           }
         })
       })
-
+    // else if(sub.key == 'site_set'){
+    //     // sub.value = siteIdtoText(val)
+    //     sub.value = ''
+    //   }
     })
   }else{
     ElMessage.error(res.errMsg)

src/components/businessMoudle/gdtList/detial/creativeInfo.vue

@@ -8,9 +8,12 @@
           <div class="flex">
             <span class="smallTitle">{{sub.title}}</span>
             <div v-if="item.title == '创意素材'">
-              <template v-if="sub.value.video_url || sub.value.image_url">
-                <video :src="sub.value.video_url" v-if="sub.value.video_url" style="width: 176px" class="rMar10"></video>
+              <template v-if="sub.value.video_url || sub.value.image_url || sub.value?.image_url_list?.length>0">
+                <video :src="sub.value.video_url" controls v-if="sub.value.video_url" style="width: 176px" class="rMar10"></video>
                 <img :src="sub.value.image_url" alt="" v-if="sub.value.image_url" style="width: 176px" class="rMar10"/>
+                <template v-if="sub.value?.image_url_list?.length>0">
+                  <img  v-for="im in sub.value.image_url_list" :src="im" alt="" style="width: 176px" class="rMar10"/>
+                </template>
               </template>
               <template v-else>-</template>
             </div>

src/components/businessMoudle/gdtList/detial/index.vue

@@ -102,7 +102,7 @@ const switchShow = (val:boolean,row:any)=>{
     typeAc.value = 'basicInfo'
     pageInfo.info = row
     nextTick(async ()=>{
-      await get_siteSet_list()
+      // await get_siteSet_list()
        get_behavior_list()
        get_user_os_list()
        get_location_list()

src/components/businessMoudle/gdtList/dialog/target.vue

@@ -28,7 +28,7 @@
                     :echoVal="putOn_way_List.radioVal"
                     :title="putOn_way_List.name"
                     @returnEvent="val=>{putOn_way_List.radioVal = val}"></RadioGroup>
-        <Input ref="nameRef" title="推广计划名称" spanTitleWidth="112px" :placeholderTxt="title" maxLength="40"/>
+        <Input ref="nameRef" title="推广计划名称" spanTitleWidth="120px" spanFS="14px" :placeholderTxt="title" maxLength="40"/>
       </div>
     </template>
   </Dialog>
@@ -136,5 +136,7 @@ defineExpose({
 
 </script>
 <style lang="scss" scoped>
-
+.spanTitle{
+  font-size: 14px!important;
+}
 </style>

src/components/capsulationMoudle/_input.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" :class="haverMar15 ? 'rMar15' : ''">
     <span class="spanTitle" v-if="showTitle"
-          :style="{width:spanTitleWidth?spanTitleWidth:'auto'}"><span v-if="haveTag" class="tag">*</span>{{title}}</span>
+          :style="{width:spanTitleWidth?spanTitleWidth:'auto',fontSize:spanFS ? spanFS : ''}"><span v-if="haveTag" class="tag">*</span>{{title}}</span>
     <el-input v-model="value"
               :style="{width:inputWidth}"
               :disabled="disabledFlag"
@@ -33,6 +33,7 @@ defineExpose({
 const props = withDefaults(defineProps<{
   showTitle?: boolean,
   haveTag?: boolean,
+  spanFS?: string,
   spanTitleWidth?: string,
   inputWidth?: string,
   title?: string,
@@ -44,6 +45,7 @@ const props = withDefaults(defineProps<{
   placeholderTxt?:string
   maxLength?:string
 }>(),{
+  spanFS: '',
   spanTitleWidth: '',
   inputWidth: '100%',
   title: '',