魏志佳 4 vuotta sitten
vanhempi
commit
a0a6aa9605

+ 31 - 6
src/views/modules/Statistics/videoStatics/KSvideoStatics.vue

@@ -9,7 +9,19 @@
         <span>时间范围:</span>
         <span  @click="opendate">
           <DatePicker :openOptions='openOptions'  :parentDate='dateValue' left='-100px'></DatePicker>
-        </span>                   
+        </span> 
+        <span style="margin-left:15px">剪辑:</span> 
+        <span  >
+            <a-input placeholder="请输入剪辑的名字" v-model="clip" style="width:140px"  />
+        </span>         
+        <span style="margin-left:15px">拍摄:</span> 
+        <span  >
+            <a-input placeholder="请输入拍摄的名字" v-model="shot" style="width:140px" />
+        </span>         
+        <span style="margin-left:15px">编导:</span> 
+        <span  >
+            <a-input placeholder="请输入编导的名字" v-model="plan" style="width:140px"  />
+        </span>         
       </div>
       <a-button type="primary" @click="searchRes">查询</a-button>
     </div>
@@ -84,7 +96,7 @@
           <div class="tableTop">
               
                <a-button type="primary" @click="customColumns">自定义列</a-button>
-                <a-button type="default" style="float:right" @click="exportExcel" id="mybtn" :loading='exportLoading'>导出报表</a-button>
+                <a-button type="default" style="float:right" @click="exportExcel('exportTable')" id="mybtn" :loading='exportLoading'>导出报表</a-button>
              
           </div>
             <a-table
@@ -210,7 +222,10 @@
                 >{{ gameAddictionRate | toPercentage }}</span>
                 <!-- <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span> -->
                 <span slot="relativePeople" slot-scope="text,record">
-                    <a href="javascript:;" @click.stop="showRelevantPeople(record)">查看相关人员</a>
+                    <!-- <a href="javascript:;" @click.stop="showRelevantPeople(record)">查看相关人员</a> -->
+                    <span>剪辑:{{record.clip | '暂无数据'}}</span>
+                    <span>拍摄:{{record.shot | '暂无数据'}}</span>
+                    <span>编导:{{record.plan | '暂无数据'}}</span>
                 </span>
 
                 
@@ -224,9 +239,9 @@
       <!-- 明细表 -->
 
       <a-modal v-model="visibleDetail" title="详细信息" width="60%" :footer="null" >
-        <a-button type="default" @click="exportExcel" id="mybtn" >导出报表</a-button>
+        <a-button type="default" @click="exportExcel('exportDetail')" id="mybtn" >导出报表</a-button>
         <a-table
-          :columns="detailConsum"
+          :columns="detailColumn"
           :data-source="detailData"
           bordered
           tableLayout="auto"
@@ -461,6 +476,9 @@ let detailColumn = [
 export default {
   data() {
     return {
+      clip:undefined,
+      shot:undefined,
+      plan:undefined,
       //明细数据
       visibleDetail:false,
       detailColumn,
@@ -660,6 +678,9 @@ export default {
         accountIds:this.appId,
         target:this.target,
         order:this.order,
+        clip:this.clip?this.clip:'',
+        shot:this.shot?this.shot:'',
+        plan:this.plan?this.plan:'',
       }).then(res => {
         let resArr = []
         this.data=[];
@@ -685,7 +706,7 @@ export default {
       })
     },
     //导出报表
-    exportExcel() {
+    exportExcel(exportType) {
       this.exportLoading=true;
        let column = this.columns.map((item, index) => {
         return item.dataIndex
@@ -700,6 +721,10 @@ export default {
         startDate: this.dateValue[0].format('YYYY-MM-DD'),
         endDate: this.dateValue[1].format('YYYY-MM-DD'),
         accountIds:this.appId,
+        exportType,
+        clip:this.clip?this.clip:'',
+        shot:this.shot?this.shot:'',
+        plan:this.plan?this.plan:'',
       }).then(res => {
         this.exportLoading=false;
         let blob = new Blob([res], {

+ 30 - 5
src/views/modules/Statistics/videoStatics/TTvideoStatics.vue

@@ -22,7 +22,18 @@
           v-model="dateRange"
         />
         <span v-show="daysFlag">共{{totalSelect}}天</span> -->
-           
+        <span style="margin-left:15px">剪辑:</span> 
+        <span  >
+            <a-input placeholder="请输入剪辑的名字" v-model="clip" style="width:140px"  />
+        </span>         
+        <span style="margin-left:15px">拍摄:</span> 
+        <span  >
+            <a-input placeholder="请输入拍摄的名字" v-model="shot" style="width:140px" />
+        </span>         
+        <span style="margin-left:15px">编导:</span> 
+        <span  >
+            <a-input placeholder="请输入编导的名字" v-model="plan" style="width:140px"  />
+        </span>          
       </div>
       <!-- <div>
         <span>消耗:</span>
@@ -37,7 +48,7 @@
 
     <div style="margin:15px 0" class="btndiv">
       <a-button type="primary" @click="customColumns">自定义列</a-button>
-      <a-button type="default" style="float:right" @click="exportExcel" id="mybtn"  :loading='exportLoading'>导出报表</a-button>
+      <a-button type="default" style="float:right" @click="exportExcel('exportTable')" id="mybtn"  :loading='exportLoading'>导出报表</a-button>
     </div>
 
     
@@ -150,7 +161,10 @@
                 
       
         <span slot="relativePeople" slot-scope="text,record">
-           <a href="javascript:;" @click.stop="showRelevantPeople(record)">查看相关人员</a>
+           <!-- <a href="javascript:;" @click.stop="showRelevantPeople(record)">查看相关人员</a> -->
+            <span>剪辑:{{record.clip | '暂无数据'}}</span>
+            <span>拍摄:{{record.shot | '暂无数据'}}</span>
+            <span>编导:{{record.plan | '暂无数据'}}</span>
        </span>
 
     </a-table>
@@ -174,7 +188,7 @@
     <!-- 明细表 -->
 
       <a-modal v-model="visibleDetail" title="详细信息" width="60%" :footer="null" >
-        <a-button type="default" @click="exportExcel" id="mybtn">导出报表</a-button>
+        <a-button type="default" @click="exportExcel('exportDetail')" id="mybtn">导出报表</a-button>
         <a-table
           :columns="detailColumn"
           :data-source="detailData"
@@ -312,6 +326,9 @@ let detailColumn=[]
 export default {
   data() {
     return {
+      clip:undefined,
+      shot:undefined,
+      plan:undefined,
        //明细数据
       visibleDetail:false,
       detailColumn,
@@ -509,6 +526,9 @@ export default {
         accountIds:this.appId,
         target:this.target,
         order:this.order,
+         clip:this.clip?this.clip:'',
+        shot:this.shot?this.shot:'',
+        plan:this.plan?this.plan:'',
       }).then(res => {
         let resArr = []
         this.data=[];
@@ -528,7 +548,7 @@ export default {
       })
     },
     //导出报表
-    exportExcel() {
+    exportExcel(exportType) {
       this.exportLoading=true;
       let column = this.columns.map((item, index) => {
         return item.dataIndex
@@ -542,6 +562,11 @@ export default {
         startDate: this.dateValue[0].format('YYYY-MM-DD'),
         endDate: this.dateValue[1].format('YYYY-MM-DD'),
         accountIds:this.appId,
+        
+        exportType,
+        clip:this.clip?this.clip:'',
+        shot:this.shot?this.shot:'',
+        plan:this.plan?this.plan:'',
       }).then(res => {
         this.exportLoading=false;
         let blob = new Blob([res], {

+ 1 - 1
src/views/modules/advertiser/modules/projectListModal.vue

@@ -72,7 +72,7 @@
             optionFilterProp="children"
             showSearch
             :filterOption="filterOption"
-            v-decorator="['productId', validatorRules.productId]"
+            v-decorator="['productId']"
             placeholder="请选择产品"
             disabled
           >

+ 11 - 10
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -436,7 +436,7 @@ li.chouzhen.first:before {
           <a-form-item label="创意分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-cascader
               :options="createOptions"
-              v-decorator="['creativeCategory', { rules: [{ required: true, message: '创意分类' }] }]"
+              v-decorator="['creativeCategory']"
               :fieldNames="fieldNames"
               placeholder="请选择创意分类"
             />
@@ -447,7 +447,7 @@ li.chouzhen.first:before {
               mode="tags"
               style="width: 100%"
               placeholder="按回车生成标签"
-              v-decorator="['creativeTag', { rules: [{ required: true, message: '创意标签必填' }] }]"
+              v-decorator="['creativeTag']"
               dropdownClassName="display-none-selset"
               :token-separators="[',',' ',',']"
             >
@@ -1529,14 +1529,15 @@ export default {
               stickerTitle: item.stickerTitle,
             }
           })
-          var params = {
-            dataJson: allJson.concat(dataAd),
-            ...values,
-            creativeCategory:values.creativeCategory.pop(),
-            unitId: this.pansKey,
-            accountId: localStorage.getItem('accountId'),
-            content: this.content,
-          }
+          var params = Object.assign({}, values)
+          // var params = {
+            params.dataJson= allJson.concat(dataAd)
+            // ...values,
+            params.creativeCategory = params.creativeCategory?params.creativeCategory.pop():null
+            params.unitId= this.pansKey
+            params.accountId= localStorage.getItem('accountId')
+            params.content= this.content
+          // }
           postAction('/kuaishou/batch/createCreative', params).then((res) => {
             if (res.success) {
               this.visible = true

+ 6 - 3
src/views/modules/kuaishouapp/account/stepForm/Step4.vue

@@ -60,6 +60,9 @@
 .sticker-styles .ant-checkbox-wrapper + .ant-checkbox-wrapper {
   margin-left: 0;
 }
+.display-none-selset{
+  display: none!important;
+}
 </style>
 <style scoped lang="scss">
 .actor-photo-list {
@@ -381,7 +384,7 @@ li.chouzhen.first:before {
           <a-form-item label="创意分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-cascader
               :options="createOptions"
-              v-decorator="['creativeCategory', { rules: [{ required: true, message: '创意分类' }] }]"
+              v-decorator="['creativeCategory']"
               :fieldNames="fieldNames"
               placeholder="请选择创意分类"
             />
@@ -392,7 +395,7 @@ li.chouzhen.first:before {
               mode="tags"
               style="width: 100%"
               placeholder="按回车生成标签"
-              v-decorator="['creativeTag', { rules: [{ required: true, message: '创意标签必填' }] }]"
+              v-decorator="['creativeTag']"
               dropdownClassName="display-none-selset"
               :token-separators="[',',' ',',']"
             >
@@ -1514,7 +1517,7 @@ export default {
           var params = {
             // dataJson: allJson,
             ...values,
-            creativeCategory:values.creativeCategory.pop(),
+            creativeCategory:values.creativeCategory?values.creativeCategory.pop():null,
             unitId: this.pansKey,
             accountId: localStorage.getItem('accountId'),
             content: this.content,

+ 39 - 0
src/views/modules/workBench/index.vue

@@ -20,6 +20,27 @@
                 </a-button>
             </div>
         </div>
+        <div class="section">
+            <div class="sectionBody">
+                <div class="sectionLeftBox">
+                    <div class="leftTop">
+
+                    </div>
+                    <div class="leftBottom">
+
+                    </div>
+                </div>
+                <div class="sectionRightBox">
+                    <div class="rightTop">
+
+                    </div>
+                    <div class="rightBottom">
+
+                    </div>
+                </div>
+                
+            </div>
+        </div>
     </div>
 </template>
 
@@ -39,6 +60,7 @@ export default {
         width: 100%;
         height: 146px;
         background: #FFFFFF;
+        margin-bottom: 24px;
         .breadcrumb{
             width: 42px;
             height: 22px;
@@ -85,5 +107,22 @@ export default {
         }
 
     }
+    .section{
+        .sectionBody{
+            display: flex;
+            .sectionLeftBox{
+                width: 60%;
+                .leftTop{
+                    height: 370px;
+                }
+            }
+            .sectionRightBox{
+                width: 40%;
+                .rightTop{
+                    height: 370px;
+                }
+            }
+        }
+    }
 }
 </style>

+ 1 - 1
vue.config.js

@@ -71,7 +71,7 @@ module.exports = {
         //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
          target: 'http://192.168.1.8:8805', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
-        // target: 'http://192.168.1.72:8080', //请求本地 需要jeecg-boot后台项目  英豪
+        // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
 
         // target: 'http://192.168.1.74:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉