朱鑫波 преди 4 години
родител
ревизия
9a8a514d04

+ 0 - 25
debug.log

@@ -1,25 +0,0 @@
-[0525/133323.308:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-[0529/110148.397:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-[0529/112937.608:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-[0619/110835.729:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-[0701/153438.192:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-[0708/055752.148:ERROR:process_info.cc(375)] NtQuerySystemInformation SystemExtendedHandleInformation: {没锟斤拷锟姐够锟斤拷锟絵 没锟斤拷锟姐够锟斤拷锟斤拷锟斤拷锟节达拷锟斤拷页锟侥硷拷锟斤拷锟斤拷锟斤拷锟斤拷指锟斤拷锟侥诧拷锟斤拷锟斤拷 (0xc0000017)
-[0708/055807.088:ERROR:process_info.cc(359)] UncheckedAllocate
-[0713/163350.208:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-[0716/000711.554:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
-[0716/000711.558:ERROR:exception_snapshot_win.cc(98)] thread ID 12948 not found in process
-[0716/000711.559:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
-[0716/000711.560:ERROR:exception_snapshot_win.cc(98)] thread ID 15736 not found in process
-[0716/000711.577:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
-[0716/000711.577:ERROR:exception_snapshot_win.cc(98)] thread ID 2072 not found in process
-[0716/000711.592:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
-[0716/000711.593:ERROR:exception_snapshot_win.cc(98)] thread ID 12744 not found in process
-[0716/000711.593:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
-[0716/000711.593:ERROR:exception_snapshot_win.cc(98)] thread ID 17220 not found in process
-[0716/000711.615:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
-[0716/000711.615:ERROR:exception_snapshot_win.cc(98)] thread ID 18896 not found in process
-[0716/000711.616:ERROR:process_reader_win.cc(123)] NtOpenThread: {无法访问} 过程已请求访问一对象,但未给访问权限。 (0xc0000022)
-[0716/000711.617:ERROR:exception_snapshot_win.cc(98)] thread ID 15368 not found in process
-[0727/154120.269:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-[0727/173939.302:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
-[0729/144506.169:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0

+ 1 - 2
src/components/uploadFile.vue

@@ -96,7 +96,6 @@ export default {
       },
     },
     value: {
-      type: [String, Array],
       required: true,
     },
     size: {
@@ -142,7 +141,7 @@ export default {
     value: {
       immediate: true,
       handler(n, o) {
-        if (this.fileList.length == 0) {
+        if (this.fileList&&this.fileList.length == 0) {
           if (typeof n == 'object') {
             this.fileList = n.map((item, index) => {
               return {

+ 25 - 2
src/views/modules/earlyWarningRules/configRules.vue

@@ -23,9 +23,9 @@
                              <a-form-model-item ref="eventRuleLevel"  prop="eventRuleLevel">
                                 <a-radio-group v-model="form.mediaType" :disabled="form.templateId!=null">
                                     <a-radio-button :value="1" >头条</a-radio-button>
-                                    <!-- <a-radio-button :value="2">快手</a-radio-button> -->
+                                    <a-radio-button :value="2">快手</a-radio-button>
                                     <a-radio-button :value="3">头条内广</a-radio-button>
-                                    <!-- <a-radio-button :value="4">快手内广</a-radio-button> -->
+                                    <a-radio-button :value="4">快手内广</a-radio-button>
                                    
                                 </a-radio-group>
                             </a-form-model-item>
@@ -304,6 +304,7 @@ import moment from 'moment';
 import { getAction, postAction, downFile, downFilePost,deleteAction,putAction } from '@/api/manage';
 import { Switch } from 'ant-design-vue';
 import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
+// import func from '../../../../vue-temp/vue-editor-bridge';
 
 export default {
     components:{
@@ -391,6 +392,28 @@ export default {
             }else{
                 this.templateNameTrue = false
             }
+        },
+        'form.mediaType':function(n,o){
+
+            getAction(this.url.fieldList,{   
+                mediaType:n,
+                pageNo:1,
+                pageSize:500,
+            }).then(res=>{
+                console.log(res);
+                this.rulesFieldList = []
+                if(res.success){ 
+                    this.rulesFieldList=res.result.map(item=>{
+                        return {
+                            name:item.dimensionName,
+                            code:item.dimension,
+                            children:item.dimensionList
+                        }
+                    }) 
+                    this.getTempletDetail()   
+                }            
+            })
+            
         }
     },
     methods: {

+ 2 - 2
src/views/modules/kuaishouapp/account/stepForm/stepModule/checkMatemal.vue

@@ -117,13 +117,13 @@ export default {
     stopOtherVideo()
   },
   methods: {
-    showCheck(typeName, url, item, typeString, key) {
+    showCheck(typeName, url, item, typeString, key,accountId) {
       this.dataSource = []
       this.visibleMatemal = true
       this.joinVideo.key = key
       this.ipagination.current = 1
       var params = {}
-      params.accountId = localStorage.getItem('accountId')
+      params.accountId = accountId?accountId:localStorage.getItem('accountId')
       params.materialType = typeName
       params.pageSize = this.ipagination.pageSize
       params.pageNo = this.ipagination.current

+ 2 - 2
src/views/modules/kuaishouapp/crossAccount/createCampaign.vue

@@ -380,9 +380,9 @@ export default {
             console.log(res)
             if (res.success) {
               this.$message.success('创建成功')
-              localStorage.setItem('campaignId', res.result)
+              localStorage.setItem('crossAccountCampaign', JSON.stringify(res.result))
               this.loading = false
-              this.nextStep(res.result)
+              this.$router.replace({ path: '/crossAccount/createUnit' })
             } else {
               this.$message.error(res.message)
               this.loading = false

Файловите разлики са ограничени, защото са твърде много
+ 1861 - 54
src/views/modules/kuaishouapp/crossAccount/createCreative.vue


+ 150 - 122
src/views/modules/kuaishouapp/crossAccount/createUnit.vue

@@ -104,7 +104,11 @@
                         @change="handleChange"
                         :filterOption="filterOption"
                       >
-                        <a-select-option v-for="appModel in appList" :key="appModel.appId" :value="appModel.appId">
+                        <a-select-option
+                          v-for="appModel in appList"
+                          :key="appModel.appId + 'campaignList'"
+                          :value="appModel.appId"
+                        >
                           {{ appModel.appName }}&#12288;&nbsp;&#12288;
                           {{ appModel.appVersion }}&#12288;&#12288;&#12288;{{ appModel.platform | platform }}
                         </a-select-option>
@@ -452,7 +456,11 @@
                       @change="handleChange"
                       :filterOption="filterOption"
                     >
-                      <a-select-option v-for="appModel in appList" :key="appModel.appId" :value="appModel.appId">
+                      <a-select-option
+                        v-for="appModel in appList"
+                        :key="appModel.appId + 'unitIdentical'"
+                        :value="appModel.appId"
+                      >
                         {{ appModel.appName }}&#12288;&nbsp;&#12288; {{ appModel.appVersion }}&#12288;&#12288;&#12288;{{
                           appModel.platform | platform
                         }}
@@ -791,7 +799,11 @@
                   @change="handleChange"
                   :filterOption="filterOption"
                 >
-                  <a-select-option v-for="appModel in appList" :key="appModel.appId" :value="appModel.appId">
+                  <a-select-option
+                    v-for="appModel in appList"
+                    :key="appModel.appId + 'campaignOne'"
+                    :value="appModel.appId"
+                  >
                     {{ appModel.appName }}&#12288;&nbsp;&#12288; {{ appModel.appVersion }}&#12288;&#12288;&#12288;{{
                       appModel.platform | platform
                     }}
@@ -1143,18 +1155,18 @@
       <a-modal v-model="showCreate" title="创建失败条数">
         <template slot="footer">
           <a-button key="back" @click="showCreate = false">取消</a-button>
-          <a-button key="submit" type="primary" @click="showCreate = false"> 确定 </a-button>
+          <a-button key="submit" type="primary" @click="tiaozhuan"> 确定 </a-button>
         </template>
         <ul v-if="createUnitList.length > 0">
           <li v-for="(item, index) in createUnitList">
             <p v-if="item.code == -1">
-              组名称:{{ item.unitName }},创建失败 <br><span  style="margin-left:10px">失败原因:{{ item.message }}</span>
+              组名称:{{ item.unitName }},创建失败 <br /><span style="margin-left: 10px"
+                >失败原因:{{ item.message }}</span
+              >
             </p>
           </li>
         </ul>
-        <div v-else style="width:100%;height:200px;text-align:center;line-height:200px">
-          无创建失败条数
-        </div>
+        <div v-else style="width: 100%; height: 200px; text-align: center; line-height: 200px">无创建失败条数</div>
       </a-modal>
     </a-card>
   </div>
@@ -1178,6 +1190,7 @@ export default {
     return {
       groupTypeData: {},
       appList: [],
+      allAppList: [],
       templateList: [],
       labelCol: { span: 7 },
       wrapperCol: { span: 17 },
@@ -1192,112 +1205,7 @@ export default {
         },
       },
       form: {
-        accountArr: [
-          {
-            accountId: 23212,
-            accountName: '环球黑卡',
-            campaignAgreement: 0, //判断是否计划相同   0为相同取值campaignOne   1不同取值campaignList
-            unitCount: 1,
-            allianceAccount: true,
-            campaignType: 2,
-            //多个计划分开创建
-            campaignList: [
-              {
-                campaignId: 26702554,
-                campaignName: '测试',
-                check: '1', //判断计划下组是否相同  1为相同取值 unitIdentical      2为不同  取值unit
-                unit: [
-                  {
-                    useAppMarket: false,
-                    appStore: ['huawei', 'oppo', 'vivo', 'xiaomi', 'meizu', 'smartisan'],
-                    convertId: '',
-                    name: '',
-                    allianceAccount: '1',
-                    appId: '',
-                    urlType: '1',
-                    url: '',
-                    templateId: '',
-                    dayBudget: null,
-                    dayBudgetType: '0',
-                    speed: '1',
-                    time: '1',
-                    timeRange: [],
-                    scheduleTimeData: '1',
-                    scheduleTime:
-                      '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-                    showMode: '2',
-                    sceneId: [1],
-                    ocpxActionType: 2,
-                    bidType: 10,
-                    deepConversionType: null,
-                    bid: null,
-                    cpaBid: null,
-                    deepConversionBid: null,
-                    unitType: '4',
-                  },
-                ],
-                unitIdentical: {
-                  useAppMarket: false,
-                  appStore: ['huawei', 'oppo', 'vivo', 'xiaomi', 'meizu', 'smartisan'],
-                  convertId: '',
-                  unitName: [{ name: '' }],
-                  allianceAccount: '1',
-                  appId: '',
-                  urlType: '1',
-                  url: '',
-                  templateId: '',
-                  dayBudget: null,
-                  dayBudgetType: '0',
-                  speed: '1',
-                  time: '1',
-                  timeRange: [],
-                  scheduleTimeData: '1',
-                  scheduleTime:
-                    '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-                  showMode: '2',
-                  sceneId: [1],
-                  ocpxActionType: 2,
-                  bidType: 10,
-                  deepConversionType: null,
-                  bid: null,
-                  cpaBid: null,
-                  deepConversionBid: null,
-                  unitType: '4',
-                },
-              },
-            ],
-            //所有计划创建一样
-            campaignOne: {
-              useAppMarket: false,
-              appStore: ['huawei', 'oppo', 'vivo', 'xiaomi', 'meizu', 'smartisan'],
-              convertId: '',
-              campaignIds: [26702554],
-              unitNames: [{ value: '' }],
-              allianceAccount: '1',
-              appId: '',
-              urlType: '1',
-              url: '',
-              templateId: '',
-              dayBudget: null,
-              dayBudgetType: '0',
-              speed: '1',
-              time: '1',
-              timeRange: [],
-              scheduleTimeData: '1',
-              scheduleTime:
-                '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-              showMode: '2',
-              sceneId: [1],
-              ocpxActionType: 2,
-              bidType: 10,
-              deepConversionType: null,
-              bid: null,
-              cpaBid: null,
-              deepConversionBid: null,
-              unitType: '4',
-            },
-          },
-        ],
+        accountArr: [],
       },
       tabList: [
         {
@@ -1338,7 +1246,6 @@ export default {
       campaignName: '',
       campaignBudget: 'UNLIMITED',
       dayBudget: 0,
-      appId: '0', //应用目标
       showApp: true,
       redirectUrl: '', // 链接地址
       showRedirect: false,
@@ -1361,14 +1268,21 @@ export default {
       submitFormLoading: false,
       showCreate: false,
       createUnitList: [],
+      createUnitSuccess: [],
     }
   },
   methods: {
+    tiaozhuan() {
+      this.showCreate = false
+      localStorage.setItem('crossAccountUnit', JSON.stringify(this.createUnitSuccess))
+      this.$router.replace({ path: '/crossAccount/createCreative' })
+    },
     getPlatForm(appId) {
       if (appId) {
-        var data = this.appList.filter((item) => {
+        var data = this.allAppList.filter((item) => {
           return item.appId == appId
         })
+
         return data[0].platform
       }
     },
@@ -1495,6 +1409,7 @@ export default {
               key: index,
             }
           })
+          this.allAppList.push(...this.appList)
         }
       })
     },
@@ -1681,9 +1596,12 @@ export default {
           postAction('/kuaishou/crossAccount/crossAccountUnitCreate', { accountArr: params }).then((res) => {
             console.log(res)
             if (res.success) {
-              this.createUnitList = res.result.filter(item=>{
+              this.createUnitList = res.result.filter((item) => {
                 return item.code != 0
               })
+              this.createUnitSuccess = res.result.filter((item) => {
+                return item.code == 0
+              })
               this.submitFormLoading = false
               this.showCreate = true
             } else {
@@ -2041,12 +1959,122 @@ export default {
   mounted: function () {
     this.$nextTick(() => {
       // this.changeCreateTotal()
-      this.activeIndex = this.tabList.findIndex((item) => this.key == item.key)
+      if (localStorage.getItem('crossAccountCampaign')) {
+        var data = JSON.parse(localStorage.getItem('crossAccountCampaign'))
+        this.form.accountArr = data.map((item) => {
+          return {
+            accountId: item.accountId,
+            accountName: item.accountId,
+            campaignAgreement: 0, //判断是否计划相同   0为相同取值campaignOne   1不同取值campaignList
+            unitCount: 1,
+            allianceAccount: true,
+            campaignType: item.createDetail[0].type,
+            //多个计划分开创建
+            campaignList: item.createDetail.map((c) => {
+              return {
+                campaignId: c.campaignId,
+                campaignName: c.campaignName,
+                check: '1', //判断计划下组是否相同  1为相同取值 unitIdentical      2为不同  取值unit
+                unit: [
+                  {
+                    useAppMarket: false,
+                    appStore: ['huawei', 'oppo', 'vivo', 'xiaomi', 'meizu', 'smartisan'],
+                    convertId: '',
+                    name: '',
+                    allianceAccount: '1',
+                    appId: '',
+                    urlType: '1',
+                    url: '',
+                    templateId: '',
+                    dayBudget: null,
+                    dayBudgetType: '0',
+                    speed: '1',
+                    time: '1',
+                    timeRange: [],
+                    scheduleTimeData: '1',
+                    scheduleTime:
+                      '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+                    showMode: '2',
+                    sceneId: [1],
+                    ocpxActionType: 2,
+                    bidType: 10,
+                    deepConversionType: null,
+                    bid: null,
+                    cpaBid: null,
+                    deepConversionBid: null,
+                    unitType: '4',
+                  },
+                ],
+                unitIdentical: {
+                  useAppMarket: false,
+                  appStore: ['huawei', 'oppo', 'vivo', 'xiaomi', 'meizu', 'smartisan'],
+                  convertId: '',
+                  unitName: [{ name: '' }],
+                  allianceAccount: '1',
+                  appId: '',
+                  urlType: '1',
+                  url: '',
+                  templateId: '',
+                  dayBudget: null,
+                  dayBudgetType: '0',
+                  speed: '1',
+                  time: '1',
+                  timeRange: [],
+                  scheduleTimeData: '1',
+                  scheduleTime:
+                    '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+                  showMode: '2',
+                  sceneId: [1],
+                  ocpxActionType: 2,
+                  bidType: 10,
+                  deepConversionType: null,
+                  bid: null,
+                  cpaBid: null,
+                  deepConversionBid: null,
+                  unitType: '4',
+                },
+              }
+            }),
+            //所有计划创建一样
+            campaignOne: {
+              useAppMarket: false,
+              appStore: ['huawei', 'oppo', 'vivo', 'xiaomi', 'meizu', 'smartisan'],
+              convertId: '',
+              campaignIds: item.createDetail.map((c) => {
+                return c.campaignId
+              }),
+              unitNames: [{ value: '' }],
+              allianceAccount: '1',
+              appId: '',
+              urlType: '1',
+              url: '',
+              templateId: '',
+              dayBudget: null,
+              dayBudgetType: '0',
+              speed: '1',
+              time: '1',
+              timeRange: [],
+              scheduleTimeData: '1',
+              scheduleTime:
+                '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+              showMode: '2',
+              sceneId: [1],
+              ocpxActionType: 2,
+              bidType: 10,
+              deepConversionType: null,
+              bid: null,
+              cpaBid: null,
+              deepConversionBid: null,
+              unitType: '4',
+            },
+          }
+        })
 
-      this.getAppList(this.form.accountArr[0].accountId)
-      this.getIsActivate(this.form.accountArr[0].accountId)
-      this.getTemplate(this.form.accountArr[0].accountId)
-      this.getTemplateList(this.form.accountArr[0].accountId)
+        this.getAppList(this.form.accountArr[0].accountId)
+        this.getIsActivate(this.form.accountArr[0].accountId)
+        this.getTemplate(this.form.accountArr[0].accountId)
+        this.getTemplateList(this.form.accountArr[0].accountId)
+      }
     })
   },
 }

+ 2 - 2
vue.config.js

@@ -68,7 +68,7 @@ module.exports = {
     open : true,
     proxy: {
       '/jeecg-boot': {
-        //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+         target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -77,7 +77,7 @@ module.exports = {
         // target: 'http://192.168.1.43:8888', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
-         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+        //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目