Jelajahi Sumber

'暂存修改'

魏志佳 4 tahun lalu
induk
melakukan
a2987b872b

+ 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], {

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

@@ -0,0 +1,89 @@
+<template>
+    <div class="workBench">
+        <div class="topBody">
+            <p class="breadcrumb">工作台</p>
+            <div class="bottom">
+                <div class="touxiang">
+                    <img src="" alt="">
+                </div>  
+                <div class='tip'>
+                    <p class="greet">早安,吴永前,祝你开心每一天!</p>
+                    <p class="descPosition">
+                        <span>运营经理</span>
+                        <a-divider type="vertical" />
+                        <span>华北地区-头条事业部</span>
+                    </p>
+                </div>
+                <a-button type='primary' class="mybtn">
+                    <a-icon type="plus" />
+                    发起订单+
+                </a-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import moment from 'moment';
+import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
+
+export default {
+    
+}
+</script>
+
+<style lang="scss" scoped>
+.workBench{
+    width: 100%;
+    .topBody{
+        width: 100%;
+        height: 146px;
+        background: #FFFFFF;
+        .breadcrumb{
+            width: 42px;
+            height: 22px;
+            font-size: 12px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #000000;
+            line-height: 22px;
+        }
+        .bottom{
+            display: flex;
+            position: relative;
+            padding: 20px;
+            .touxiang{
+                width: 72px;
+                height: 72px;
+            }
+            .tip{
+                .greet{
+                    width: 300px;
+                    height: 28px;
+                    font-size: 20px;
+                    font-family: PingFangSC-Medium, PingFang SC;
+                    font-weight: 500;
+                    color: rgba(0, 0, 0, 0.85);
+                    line-height: 28px;
+                }
+                .descPosition{
+                    height: 22px;
+                    font-size: 14px;
+                    font-family: PingFangSC-Regular, PingFang SC;
+                    font-weight: 400;
+                    color: rgba(0, 0, 0, 0.45);
+                    line-height: 22px;
+                }
+
+            }
+            .mybtn{
+                position: absolute;
+                top: 50%;
+                margin-left: -18px;
+                right: 0;
+            }
+        }
+
+    }
+}
+</style>

+ 2 - 2
vue.config.js

@@ -68,7 +68,7 @@ module.exports = {
     open : true,
     proxy: {
       '/jeecg-boot': {
-        //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+         target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.72:8080', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -80,7 +80,7 @@ module.exports = {
         // target: 'http://192.168.1.94:8080', //请求本地 需要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后台项目