Explorar o código

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

朱鑫波 %!s(int64=3) %!d(string=hai) anos
pai
achega
4437f40df6

+ 14 - 15
src/views/modules/Statistics/popularVideo.vue

@@ -277,11 +277,11 @@
 						<span slot="createImg" slot-scope="text, record">  
 							<a-popover placement="right">
 								<template slot="content">
-									<video :src="record.url" style="width:250px" controls  ></video>
+									<video :src="record.url" style="width:250px" controls></video>
 								</template>
 								<template slot="title">
 								</template>                       
-								<img :src="record.coverUrl || noImg" alt="" style="width:80px">
+								<img :src="record.coverUrl || noImg" alt="" style="width: 80px;height: 142px;">
 							</a-popover>
 						</span> 
 						<span slot='companyName' slot-scope="text">{{ text || '未知' }}</span>
@@ -568,9 +568,9 @@ export default {
 			faceChangeList: {},
 			faceTypeStatus: false,
             exportloading: false,
-            planId: '',
-            shotId: '',
-            clipId: '',
+            planId: undefined,
+            shotId: undefined,
+            clipId: undefined,
             dateRange: [moment().subtract(1,'weeks'),moment()],
             noImg: require('@/assets/noImg.png'),
             ipagination: {
@@ -589,6 +589,7 @@ export default {
                     // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
                     this.ipagination.current = current;
                     this.ipagination.pageSize= pageSize;
+					this.getNewPlan();
                 }
             },
             value: 'valid',
@@ -680,8 +681,6 @@ export default {
             })
         },
         dataTypeChange(e){
-            console.log(e.target.value)
-            
             this.getNewPlan()
         },
         filterOption(input, option){
@@ -692,12 +691,13 @@ export default {
         },
         // 快手头条的切换
         tabChange(key){
-            console.log(key);
             this.treeValue=[];
             this.ipagination.current=1
            this.columns=this.tabKey==1?[...TTcolumns]:[...KScolumns]
+            this.$nextTick(() => {
+				this.getNewPlan();
+			});
             
-            this.getNewPlan()
         },
         operateChange(value){
         console.log(value);
@@ -740,6 +740,7 @@ export default {
         },
         // 获取展示数据
         getNewPlan() {
+			this.dataTable = [];
             let url = '';
             if(this.tabKey == 1) {
                 // 头条
@@ -749,7 +750,7 @@ export default {
                 // 快手
                 url = '/ctop/kuaishouVideoEtlInfo/list';
             }
-            this.dataTable = [];
+			this.ipagination.total = 0;
             this.loading = true;
             getAction(url, {
                 type: this.value,
@@ -764,10 +765,8 @@ export default {
                 this.loading = false;
                 if(res.success) {
                     if(res.result) {
-						this.$nextTick(() => {
-							this.dataTable = [...res.result.records];
-                        	this.ipagination.total = res.result.total;
-						});
+						this.dataTable = [...res.result.records];
+                        this.ipagination.total = res.result.total;
                     }
                 }
             })
@@ -801,7 +800,7 @@ export default {
         }
     },
     mounted() {
-        this.getNewPlan()
+        this.getNewPlan();
         this.getAllOperator()
     },
     filters: {

+ 9 - 1
src/views/modules/Statistics/refuseDataCreat.vue

@@ -38,7 +38,7 @@
           </div>
           <!-- /MaterialRefuse/syncCreative -->
           <a-table :columns="columns" :dataSource="dataList" bordered :loading="loading" size="middle"
-            :pagination="ipagination" :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+            :pagination="ipagination" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps: handleCheckboxProps}">
             <!-- <div slot="videoUrl" slot-scope="videoUrl">
               <video class="video" :src="videoUrl" controls="controls" style="height:200px;width:112.5px">
                 您的浏览器不支持 video 标签。
@@ -372,6 +372,14 @@
       }
     },
     methods: {
+      handleCheckboxProps(record) {
+			return {
+				props: {
+					disabled: record.resubmit && record.resubmit === 1,
+					name: record.id
+				}
+			}
+		},
       changeSlide() {
         this.addUser()
       },

+ 25 - 4
src/views/modules/Statistics/refuseDataCreatNew.vue

@@ -38,14 +38,13 @@
           </div>
           <!-- /MaterialRefuse/syncCreative -->
           <a-table :columns="columns" :dataSource="dataList" bordered :loading="loading" size="middle"
-            :pagination="ipagination" :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+            :pagination="ipagination" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps: handleCheckboxProps}">
             <!-- <div slot="videoUrl" slot-scope="videoUrl">
               <video class="video" :src="videoUrl" controls="controls" style="height:200px;width:112.5px">
                 您的浏览器不支持 video 标签。
               </video>
             </div> -->
 
-
             <div slot="coverUrl" slot-scope="coverUrl">
               <img :src="coverUrl" controls="controls" style="height:200px;width:112.5px" />
             </div>
@@ -268,8 +267,7 @@
       EditableCell,
       Treeselect
     },
-
-    data: function () {
+    data() {
       return {
         putStatus: '0',
         title: '被拒创意列表',
@@ -322,6 +320,21 @@
         updateDescription: '', //广告语的字符
       }
     },
+	computed: {
+        rowSelectionAllDirect() {
+            return {
+                onChange: this.onSelectChange(),
+                selectedRowKeys: this.selectedRowKeys,
+                getCheckboxProps: record => ({
+                    props: {
+                        disabled: record.resubmit && record.resubmit === 1,
+                        name: record.id,
+                        // defaultChecked: this.tableSelectDirectIds.includes(record.key)
+                    }
+                })
+            };
+        }
+	},
     filters: {
       typeStatus(type) {
         // 2 - 提升应用安装;
@@ -373,6 +386,14 @@
       }
     },
     methods: {
+		handleCheckboxProps(record) {
+			return {
+				props: {
+					disabled: record.resubmit && record.resubmit === 1,
+					name: record.id
+				}
+			}
+		},
       changeSlide() {
           this.addUser()
       },

+ 1 - 1
src/views/modules/account-config/components/configuration-modal.vue

@@ -669,6 +669,7 @@
                                 class="common-input"
                                 v-model="configForm.adBudget"
                                 :min="adBudgetNum"
+                                :max="9999999.00"
                                 :step="0.01"
                                 @blur="handleAdBudgetBlur"
                             />
@@ -1097,7 +1098,6 @@
                             @change="handleEnterChang"
                         >
                         </a-select>
-                        <!-- <span class="especial-label">*</span> -->
                     </a-form-model-item>
                     <div class="adver-position-radio">
                         <div class="creative-label-content">

+ 1 - 1
src/views/modules/copy-library/copy-library-server.js

@@ -7,4 +7,4 @@ export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
 // export const urlAcount = 'http://192.168.1.43:8080'; // 子安
 // export const urlAcount = 'http://139.186.165.84:8808'; // 测试
-// export const urlAcount = 'http://192.168.1.8:8080'; // 学超
+// export const urlAcount = 'http://192.168.1.8:8808'; // 学超

+ 1 - 1
src/views/modules/copy-library/copy-library.vue

@@ -817,7 +817,7 @@ export default {
             );
         },
         handleGetProjectList() {
-            getAction('/ctop/projectMember/bytedanceProjectParticipateInList').then(result => {
+            getAction('/ctop/projectMember/bytedanceProjectParticipateInList', {userId: this.userInfo().id}).then(result => {
                 if (result.code === 0) {
                     this.optimizationOption = result.result;
                 }

+ 3 - 3
vue.config.js

@@ -105,17 +105,17 @@ module.exports = {
         // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8806', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://192.168.1.219:7701', //请求本地 需要jeecg-boot后台项目  赵西安
+        // target: 'http://192.168.1.219:7701', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要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后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
         // target: 'http://192.168.1.43:9999', // 子安
-        // target: 'http://192.168.1.8:8806', // 学超
+        // target: 'http://192.168.1.8:9999', // 学超
         // target:'http://gateway.tjyourong.com.cn', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
         // target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇