浏览代码

Merge branch 'master' into feature/middle-jyf

jiayufei 4 年之前
父节点
当前提交
f8065b7c64

+ 33 - 33
src/views/modules/Statistics/components/selectPagination.vue

@@ -43,13 +43,13 @@
     v-clickoutside="handleClose"
     style="width: 100%"
     class="select-table"
-    :class="{'require-check':requireCheck} "
+    :class="{ 'require-check': requireCheck }"
   >
     <a-input
       placeholder="请选择项目名称"
       @focus="topMiddle = true"
       v-model="keyValue"
-      @change="getData"
+      @change="getData(productId)"
       :disabled="disabled"
     />
     <div
@@ -160,31 +160,32 @@ export default {
       default() {
         return false
       },
-    }
+    },
   },
 
   data() {
     return {
       taobaoSpecialOfferList: {
-        advertiserId: "fd41614705a047dd65ab0e34e9150cfe",
-        advertiserName: " 淘宝(中国)软件有限公司",
-        createTime: "2021-03-03 10:15:30",
-        designResponsibleName: "辛巴特",
+        advertiserId: 'fd41614705a047dd65ab0e34e9150cfe',
+        advertiserName: ' 淘宝(中国)软件有限公司',
+        createTime: '2021-03-03 10:15:30',
+        designResponsibleName: '辛巴特',
         id: 3660879,
         maxBid: 30000,
-        mediaId: "1",
+        mediaId: '1',
         productId: 1410280,
-        productName: "头条-淘宝特价版",
+        productName: '头条-淘宝特价版',
         projectId: 1530887,
-        projectName: "头条-淘宝特价版",
-        responsibleName: "董琪",
-        roleCode: "operator",
+        projectName: '头条-淘宝特价版',
+        responsibleName: '董琪',
+        roleCode: 'operator',
         saleId: null,
         saleName: null,
-        updateTime: "2021-03-03 21:23:04",
-        userId: "a0d58df3392c4583b55ce3b041792aa7",
-        userName: "王晓娟"
+        updateTime: '2021-03-03 21:23:04',
+        userId: 'a0d58df3392c4583b55ce3b041792aa7',
+        userName: '王晓娟',
       },
+      productId: '',
       loading: false,
       busy: false,
       wrapperCol: {
@@ -245,7 +246,8 @@ export default {
         return { orientationId: item.orientationId, orientationName: item.orientationName }
       })
     },
-    getData() {
+    getData(productId) {
+      this.productId = productId
       if (this.keyValue == '') {
         this.$emit('update:projectId', '')
       }
@@ -254,6 +256,7 @@ export default {
         userId: this.userInfo().id,
         pageNo: this.ipagination.current,
         projectName: this.keyValue,
+        productId: productId?productId:'',
       }).then((res) => {
         if (res.code == 0) {
           let defaultList = res.result.records.map((item, index) => {
@@ -261,13 +264,12 @@ export default {
               ...item,
               projectId: item.projectId + '',
               key: index,
-            };
+            }
           })
           if (this.type === 'taobao') {
-            this.data = defaultList.filter(item => item.productId === 1410280);
-          }
-          else {
-            this.data = defaultList;
+            this.data = defaultList.filter((item) => item.productId === 1410280)
+          } else {
+            this.data = defaultList
           }
           // this.dataElse = res.result.records.map((item, index) => {
           //   return {
@@ -319,23 +321,21 @@ export default {
         pageSize: this.ipagination.pageSize,
         pageNo: this.ipagination.current,
         projectName: this.keyValue,
+        productId: this.productId?this.productId:null,
       }).then((res) => {
         if (res.code == 0) {
           this.busy = true
           let defaultList = res.result.records.map((item, index) => {
-              return {
-                ...item,
-                projectId: item.projectId + '',
-              }
-            })
-          this.data = data.concat(
-            
-          )
+            return {
+              ...item,
+              projectId: item.projectId + '',
+            }
+          })
+          this.data = data.concat()
           if (this.type === 'taobao') {
-            this.data = defaultList.filter(item => item.productId === 1410280);
-          }
-          else {
-            this.data = data.concat(defaultList);
+            this.data = defaultList.filter((item) => item.productId === 1410280)
+          } else {
+            this.data = data.concat(defaultList)
           }
           // this.data = res.result.records.map((item, index) => {
           //   return {

+ 31 - 14
src/views/modules/autoLaunch/application/application.vue

@@ -44,9 +44,9 @@
                             <a-button type="primary" icon="search" @click="handleQueryList">查询</a-button>
                             <a-button type="primary" @click="handleResetForm" icon="reload" class="middle-button">重置</a-button>
                             <a-button type="primary" @click="addNewApp(null)">添加应用</a-button>
-                             <!-- <a-button type="primary" @click="handleUpdatePerson"  class="middle-button" v-if="realShow" :loading="realLoading">
+                             <a-button type="primary" @click="handleUpdatePerson"  class="middle-button" v-if="realShow" :loading="realLoading">
                                 更新应用
-                            </a-button> -->
+                            </a-button>
                         </span>
                         
                     </a-col>
@@ -654,14 +654,14 @@ export default {
         this.form = this.$form.createForm(this);
     },
     mounted() {
-        // this.realShow = this.userInfo().realname === '管理员' ? true : false
-        // if(!this.realShow) {
-        //     getAction('/kuaishou/batch/syncUserAppList',{ userId:this.userInfo().id, type:0}).then(res => {
-        //         if(res.success) {
-        //             // this.$message.success('更新成功');
-        //         }
-        //     })
-        // }
+        this.realShow = this.userInfo().realname === '管理员' ? true : false
+        if(!this.realShow) {
+            getAction('/kuaishou/batch/syncUserAppList',{ userId:this.userInfo().id, type:0}).then(res => {
+                if(res.success) {
+                    // this.$message.success('更新成功');
+                }
+            })
+        }
         this.handleGetTableList({});
     },
     methods: {
@@ -1051,11 +1051,28 @@ export default {
                     id: this.tableSelectList.id
                 };
                 postAction('/kuaishouAppPackage/pushAppPackage', paramsData).then(result => {
-                    this.pushConfirmLoading = false;
+                   
                     if (result.code === 200) {
-                        this.pushVisible = false;
-                        this.handleGetTableList({});
-                        this.$message.success('推送成功')
+                        
+                        if(!this.realShow) {
+                            getAction('/kuaishou/batch/syncUserPopulationList',{ userId:this.userInfo().id, type:1}).then(res => {
+                                if(res.success) {
+                                    this.pushConfirmLoading = false;
+                                    this.pushVisible = false;
+                                    this.handleGetTableList({});
+                                    this.$message.success('推送成功')
+                                }
+                                else {
+                                    this.$message.error(res.message)
+                                }
+                            })
+                        }
+                        else {
+                            this.pushConfirmLoading = false;
+                            this.pushVisible = false;
+                            this.handleGetTableList({});
+                            this.$message.success('推送成功')
+                        }
                     }
                     else {
                         this.$message.error(result.message);

+ 1 - 0
src/views/modules/autoLaunch/application/components/editApplication.vue

@@ -283,6 +283,7 @@ export default {
           let params = {}
           params.projectId = this.projectId
           params.appVersion = value
+          params.id = this.appId
           getAction('/kuaishouAppPackage/checkAppVersion', params).then((res) => {
             if (res.success) {
               callback()

+ 46 - 16
src/views/modules/crowd-control/crowd-control.vue

@@ -28,9 +28,9 @@
                              <a-button type="primary" @click="handleUploadPerson" class="middle-button">
                                 上传人群包
                             </a-button>
-                             <!-- <a-button type="primary" @click="handleUpdatePerson" v-if="realShow" :loading="realLoading">
+                             <a-button type="primary" @click="handleUpdatePerson" v-if="realShow" :loading="realLoading">
                                 更新人群
-                            </a-button> -->
+                            </a-button>
                            
                         </span>
                         
@@ -412,14 +412,14 @@ export default {
         this.form = this.$form.createForm(this);
     },
     mounted() {
-        // this.realShow = this.userInfo().realname === '管理员' ? true : false
-        // if(!this.realShow) {
-        //     getAction('/kuaishou/batch/syncUserPopulationList',{ userId:this.userInfo().id, type:1}).then(res => {
-        //         if(res.success) {
+        this.realShow = this.userInfo().realname === '管理员' ? true : false
+        if(!this.realShow) {
+            getAction('/kuaishou/batch/syncUserPopulationList',{ userId:this.userInfo().id, type:1}).then(res => {
+                if(res.success) {
 
-        //         }
-        //     })
-        // }
+                }
+            })
+        }
         this.handleGetTableList({});
     },
     methods: {
@@ -430,9 +430,24 @@ export default {
             params.accountIds = [val.accountId];
             postAction('/kuaishouPopulationPackage/push' ,params).then(res => {
                 if(res.success) {
-                    this.$message.success(res.message);
-                    this.historyVisible = false;
-                    this.handleGetTableList({});
+                   
+                    if(!this.realShow) {
+                        getAction('/kuaishou/batch/syncUserPopulationList',{ userId:this.userInfo().id, type:1}).then(res => {
+                            if(res.success) {
+                                this.$message.success(res.message);
+                                this.historyVisible = false;
+                                this.handleGetTableList({});
+                            }
+                            else {
+                                this.$message.error(res.message);
+                            }
+                        })
+                    }
+                    else {
+                        this.$message.success(res.message);
+                        this.historyVisible = false;
+                        this.handleGetTableList({});
+                    }
                 }
                 else {
                     this.$message.error(res.message);
@@ -610,13 +625,28 @@ export default {
                     id: this.tableSelectList.id
                 };
                 postAction('/kuaishouPopulationPackage/push', paramsData).then(result => {
-                    this.pushConfirmLoading = false;
+                    
                     if (result.code === 200) {
-                        this.pushVisible = false;
-                        this.handleGetTableList({});
-                        this.$message.success('推送成功')
+                        
+                        if(!this.realShow) {
+                            getAction('/kuaishou/batch/syncUserPopulationList',{ userId:this.userInfo().id, type:1}).then(res => {
+                                if(res.success) {
+                                    this.pushConfirmLoading = false;
+                                    this.pushVisible = false;
+                                    this.handleGetTableList({});
+                                    this.$message.success('推送成功')
+                                }
+                            })
+                        }
+                        else {
+                            this.pushConfirmLoading = false;
+                            this.pushVisible = false;
+                            this.handleGetTableList({});
+                            this.$message.success('推送成功')
+                        }
                     }
                     else {
+                        this.pushConfirmLoading = false;
                         this.$message.error(result.message);
                     }
                 }).catch(error => {

+ 50 - 5
src/views/modules/material/videoMaterial.vue

@@ -360,6 +360,9 @@ a {
           </a-col>
 
           <a-col :md="8" :sm="8">
+            <selectTableProject :projectId.sync="queryParam.projectId" :productId="queryParam.productId" ref="selectTableProject"></selectTableProject>
+          </a-col>
+          <a-col :md="8" :sm="8">
             <a-form-item label="素材名称">
               <a-input placeholder="请输入素材名称" v-model="queryParam.materialName"></a-input>
             </a-form-item>
@@ -390,6 +393,34 @@ a {
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="8">
+            <a-form-item label="剪辑">
+              <a-select v-model="queryParam.clipId" allowClear show-search :filter-option="filterOption">
+                <a-select-option v-for="item in designList" :key="item.userId" :value="item.userId">
+                  {{ item.companyName + '_' + item.userName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="8">
+            <a-form-item label="拍摄">
+              <a-select v-model="queryParam.shotId" allowClear show-search :filter-option="filterOption">
+                <a-select-option v-for="item in designList" :key="item.userId" :value="item.userId">
+                  {{ item.companyName + '_' + item.userName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="8">
+            <a-form-item label="编导">
+              <a-select v-model="queryParam.planId" allowClear show-search :filter-option="filterOption">
+                <a-select-option v-for="item in designList" :key="item.userId" :value="item.userId">
+                  {{ item.companyName + '_' + item.userName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="8" :sm="8">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchRe" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -1710,7 +1741,7 @@ import { mapGetters } from 'vuex'
 import moment from 'moment'
 
 import selectTable from './comment/selectTable.vue'
-
+import selectTableProject from '@/views/modules/Statistics/components/selectPagination.vue'
 import BMF from 'browser-md5-file'
 import uploadFile from '@/components/uploadFile.vue'
 import { closeAllVideoFun, stopOtherVideo } from '@/utils/videoControl'
@@ -1727,10 +1758,12 @@ export default {
     uploadFile,
     PermissionModal,
     accountCheckBytedance,
+    selectTableProject,
   },
 
   data() {
     return {
+      designList: [],
       // 标签的数据
       labelValue: [],
       options: [],
@@ -1971,7 +2004,7 @@ export default {
         }
       })
     }, 1000)
-
+    this.getDesignList()
     getAction('/ctop/tagInfo/treeList', {
       pageSize: 10000,
     }).then((res) => {
@@ -1996,6 +2029,8 @@ export default {
       if (n != '') {
         this.getList(n)
         this.checkArr = []
+        this.$refs.selectTableProject.keyValue = ''
+        this.$refs.selectTableProject.getData(n)
       }
     },
     visibleDetail: function (n, o) {
@@ -2019,6 +2054,14 @@ export default {
     },
   },
   methods: {
+    // 获取设计人员
+    getDesignList() {
+      postAction('/ctop/kuaishou/videoReport/getDesignList').then((res) => {
+        if (res.success) {
+          this.designList = res.result
+        }
+      })
+    },
     changeTag(visible) {
       if (this.videoVisibleChange != visible) {
         this.videoVisibleChange = visible
@@ -2344,10 +2387,13 @@ export default {
         type: 'VIDEO',
         userId: this.userInfo().id,
         status: this.active,
-        productId: ''
+        productId: '',
       }
-      this.$refs.selectTable.keyValue = "";
+      this.$refs.selectTable.keyValue = ''
       this.$refs.selectTable.getData()
+      this.$refs.selectTableProject.keyValue = ''
+      this.$refs.selectTableProject.getData()
+      
       this.labelValue = []
 
       this.loadData(1)
@@ -2854,7 +2900,6 @@ export default {
       this.checkAll = false
       this.checkArr = []
 
-
       if (key == '3') {
         this.url.list = '/ctop/materialInfo/effiMaterialInfo'
         this.queryParam = {}

+ 2 - 2
vue.config.js

@@ -80,7 +80,7 @@ module.exports = {
         // target: 'http://192.168.1.219:8081', //请求本地 需要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后台项目
@@ -88,7 +88,7 @@ module.exports = {
         // target:'http://118.24.244.213:8804',
         // target: 'http://192.168.1.43:8080', // 子安
         // target: 'http://192.168.1.8:8806', // 学超
-       target:'http://139.186.165.84:8806', //测试
+      //  target:'http://139.186.165.84:8806', //测试
         // target:'http://apipre.tjyourong.com.cn', //预生产
 
         ws: false,