소스 검색

Merge branch 'master' into feature/work-test

朱鑫波 3 년 전
부모
커밋
b094d7e3ba

+ 2 - 2
src/utils/request.js

@@ -21,9 +21,9 @@ else if (process.env.NODE_ENV === 'debug') {
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
-	// axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
+	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 测试环境
-	axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
+	// axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
 	// axios.defaults.baseURL = 'http://192.168.1.134:9999/jeecg-boot'; // 泽宇环境
 
 }

+ 7 - 0
src/views/modules/Statistics/kuaishouReport/accountReport.vue

@@ -1510,6 +1510,13 @@ export default {
                     element.fixed = false
                 })
             }
+            let arr = JSON.stringify(this.columns)
+            postAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
+                json: arr,
+                columnType: 2
+            }).then(res => {
+                // console.log(res)
+            })
         },
         tableHandle() {
             // this.listNum = [...this.columns]

+ 7 - 0
src/views/modules/Statistics/kuaishouReport/videoReport.vue

@@ -733,6 +733,13 @@ export default {
                     element.fixed = false
                 })
             }
+            let arr = JSON.stringify(this.columns)
+            postAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
+                json: arr,
+                columnType: 4
+            }).then(res => {
+                // console.log(res)
+            })
         },
         // 日期的开关
         //打开日期框

+ 21 - 18
src/views/modules/autoLaunchRevision/createLaunch.vue

@@ -1642,7 +1642,7 @@ li.chouzhen.first:before {
                         </a-form-item>
                     </a-col>
                 </a-row>
-                <a-row :gutter="16" v-if="channelData && channelData.channel.isHaveItem">
+                <a-row :gutter="16" v-if="channelData && channelData.channel.isHaveItem>-1">
                     <a-col :span="16">
                         <a-form-item>
                             <span slot="label">
@@ -2696,7 +2696,7 @@ li.chouzhen.first:before {
                 id="outTable"
                 ref="accountTable"
                 rowKey="id"
-                :scroll="{ x: 1500 }"
+                :scroll="{x:1400}"
             >
             </a-table>
         </a-modal>
@@ -2792,17 +2792,17 @@ let interestVideoOptions = []
 let TTcolumns = [
     {
         title: '渠道号',
-        dataIndex: 'channelCode',
-        scopedSlots: { customRender: 'channelCode' },
+        dataIndex: 'channel_code',
+        scopedSlots: { customRender: 'channel_code' },
         align: 'center',
-        key: 'channelCode'
+        key: 'channel_code'
     },
     {
         title: '渠道号名称',
-        dataIndex: 'channelName',
-        scopedSlots: { customRender: 'channelName' },
+        dataIndex: 'channel_name',
+        scopedSlots: { customRender: 'channel_name' },
         align: 'center',
-        key: 'channelName'
+        key: 'channel_name'
     },
     {
         title: '下载链接',
@@ -2814,26 +2814,26 @@ let TTcolumns = [
     },
     {
         title: '调起链接',
-        dataIndex: 'schemaUri',
-        scopedSlots: { customRender: 'schemaUri' },
+        dataIndex: 'schema_uri',
+        scopedSlots: { customRender: 'schema_uri' },
         align: 'center',
-        key: 'schemaUri',
+        key: 'schema_uri',
         width: 300
     },
     {
         title: '第三方点击监测链接',
-        dataIndex: 'clickTrackUrl',
-        scopedSlots: { customRender: 'clickTrackUrl' },
+        dataIndex: 'click_track_url',
+        scopedSlots: { customRender: 'click_track_url' },
         align: 'center',
-        key: 'clickTrackUrl',
+        key: 'click_track_url',
         width: 300
     },
     {
         title: '第三方actionBar监测链接',
-        dataIndex: 'actionbarClickUrl',
-        scopedSlots: { customRender: 'actionbarClickUrl' },
+        dataIndex: 'actionbar_click_url',
+        scopedSlots: { customRender: 'actionbar_click_url' },
         align: 'center',
-        key: 'actionbarClickUrl',
+        key: 'actionbar_click_url',
         width: 300
     }
 ]
@@ -3688,10 +3688,13 @@ export default {
                 if (res.success) {
                     Promise.all([formProjectData, formOptimizeData, formMaterialData])
                         .then(res => {
+                            console.log(res, this.formInformaData)
                             if (
                                 !this.showCreativeData ||
                                 this.showCheckPerson.length === 0 ||
-                                this.multipleBidData.length === 0
+                                this.multipleBidData.length === 0 ||
+                                !this.formInformaData.campaignName || 
+                                !this.formInformaData.groupName
                             ) {
                                 this.$message.error('请填写完整')
                                 return

+ 1 - 1
vue.config.js

@@ -119,7 +119,7 @@ module.exports = {
         // target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
         // target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇
-        target:'http://192.168.0.195:9999/',
+        // target:'http://192.168.0.195:9999/',
         // target:'http://gateway.tjyourong.com.cn/',//测试
 
         ws: false,