瀏覽代碼

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

朱鑫波 4 年之前
父節點
當前提交
e5b412c8ee

+ 14 - 3
src/views/modules/Statistics/videoStatics/KSvideoStatics.vue

@@ -45,7 +45,15 @@
                  {{item.companyName +'_'+item.userName  }}
               </a-select-option>
             </a-select>
-        </span>         
+        </span>     
+        <span style="margin-left:15px">素材分类:</span> 
+        <span  >
+            <!-- <a-input placeholder="请输入编导的名字" v-model="plan" style="width:140px"  /> -->
+            <a-select v-model="material" style="width: 140px" allowClear>
+              <a-select-option value="内部">内部</a-select-option>
+              <a-select-option value="塑造">塑造</a-select-option>
+            </a-select>
+        </span>     
       </div>
       <a-button type="primary" @click="searchRes" :loading='searchLoading'>查询</a-button>
     </div>
@@ -504,6 +512,7 @@ let detailColumn=[
 export default {
   data() {
     return {
+      material: '',
       searchLoading:false,
 
       designList:[],
@@ -744,7 +753,8 @@ export default {
         clipId:this.clip?this.clip:'',
         shotId:this.shot?this.shot:'',
         planId:this.plan?this.plan:'',
-        leaderId:this.leaderId?this.leaderId:''
+        leaderId:this.leaderId?this.leaderId:'',
+        channelName: this.material ? this.material : ''
       }).then(res => {
         let resArr = []
         this.data=[];
@@ -792,7 +802,8 @@ export default {
         clipId:this.clip?this.clip:'',
         shotId:this.shot?this.shot:'',
         planId:this.plan?this.plan:'',
-        leaderId:this.leaderId?this.leaderId:''
+        leaderId:this.leaderId?this.leaderId:'',
+        channelName: this.material ? this.material : ''
       }).then(res => {
         this.exportLoading=false;
         let blob = new Blob([res], {

+ 15 - 16
src/views/modules/crowd-control/components/tree-select/tree-select.vue

@@ -1,9 +1,7 @@
 <template>
     <div class="tree-select-class">
         <div class="select-class-left">
-            <div class="class-left-header">
-                选择分享的账户名称
-            </div>
+            <div class="class-left-header">选择分享的账户名称</div>
             <div class="class-left-content">
                 <a-input-search class="input-search" placeholder="Search" @change="onChange" />
                 <template>
@@ -77,7 +75,7 @@ export default {
         getAccountId() {
             postAction('/ctop/projectMember/participateListByMediaId', {
                 userId: this.userInfo().id,
-                type: 'kuaishou',
+                type: 'kuaishou'
             }).then(result => {
                 if (result.result.length) {
                     this.spinning = false;
@@ -90,16 +88,16 @@ export default {
                                 return {
                                     key: i.accountId,
                                     title:
-                                    (i.userName.length == 2
+                                    (i.userName.length === 2
                                         ? i.userName + '\xa0\xa0\xa0\xa0\xa0'
-                                        : i.userName.length == 3
+                                        : i.userName.length === 3
                                         ? i.userName + '\xa0\xa0\xa0\xa0'
-                                        : i.userName) +
-                                    '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' +
-                                    i.accountId +
-                                    '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' +
-                                    i.authName,
-                                }
+                                        : i.userName)
+                                        + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0'
+                                        + i.accountId
+                                        + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0'
+                                        + i.authName
+                                };
                             }) : []
                         };
                     });
@@ -139,7 +137,8 @@ export default {
                 if (text.indexOf(value) > -1) {
                     newTreeData.push(node);
                     continue;
-                } else {
+                }
+                else {
                     if (children) {
                         let newNodes = this.getNewTreeData(node.children, value);
                         if (newNodes.length > 0) {
@@ -173,7 +172,7 @@ export default {
                 if (item.children) {
                     this.nodes(item.children, checkedKeys);
                 }
-                else { 
+                else {
                     if (checkedKeys.indexOf(item.key) !== -1) {
                         this.selectRightData.add(item);
                     }
@@ -181,9 +180,9 @@ export default {
                         this.selectRightData.delete(item);
                     }
                 }
-            })
+            });
         }
-    },
+    }
 };
 </script>
 <style lang="less" scoped>

+ 1 - 1
src/views/modules/crowd-control/crowd-control.vue

@@ -434,7 +434,7 @@ export default {
         },
         handleCauseTableData() {
             const paramsData = {
-                orientationId: this.causeDetailData.orientationId,
+                signature: this.causeDetailData.signature,
                 pageNo: this.causePag.page,
                 pageSize: this.causePag.size
             };