浏览代码

'改工作天'

魏志佳 4 年之前
父节点
当前提交
401f4ba7b3
共有 3 个文件被更改,包括 340 次插入68 次删除
  1. 59 56
      src/views/modules/Statistics/KSAccountReport.vue
  2. 279 10
      src/views/modules/workBench/index.vue
  3. 2 2
      vue.config.js

+ 59 - 56
src/views/modules/Statistics/KSAccountReport.vue

@@ -447,48 +447,48 @@ const columnsFixd = [
         scopedSlots: { customRender: 'aClick' },
         sorter:() => {}
     },
-    {
-        title: '行为数',
-        dataIndex: 'bClick',
-        tip: '用户在视频播放页单击转化按钮的次数/展示数*100%',
-        align: 'center',
+    // {
+    //     title: '行为数',
+    //     dataIndex: 'bClick',
+    //     tip: '用户在视频播放页单击转化按钮的次数/展示数*100%',
+    //     align: 'center',
     
-        scopedSlots: { customRender: 'bClick' },
-        sorter:() => {}
-    },
+    //     scopedSlots: { customRender: 'bClick' },
+    //     sorter:() => {}
+    // },
     
-    {
-        title: '行为率',
-        dataIndex: 'bClickRate',
-        tip: '行为数占素材曝光数百分比',
-        align: 'center',    
-        scopedSlots: { customRender: 'bClickRate' },
-        sorter:() => {}
-    },
-    {
-        title: '平均千次封面曝光花费(元)',
-        dataIndex: 'cpm',
-        tip: '花费/封面曝光数*1000',
-        align: 'center',    
-        scopedSlots: { customRender: 'cpm' },
-        sorter:() => {}
-    },
-    {
-        title: '平均封面点击单价(元)',
-        dataIndex: 'cpc',
-        tip: '花费/封面点击数',
-        align: 'center',    
-        scopedSlots: { customRender: 'cpc' },
-        sorter:() => {}
-    },
-    {
-        title: '平均行为单价(元)',
-        dataIndex: 'cpb',
-        tip: '总花费/行为数',
-        align: 'center',    
-        scopedSlots: { customRender: 'cpb' },
-        sorter:() => {}
-    },
+    // {
+    //     title: '行为率',
+    //     dataIndex: 'bClickRate',
+    //     tip: '行为数占素材曝光数百分比',
+    //     align: 'center',    
+    //     scopedSlots: { customRender: 'bClickRate' },
+    //     sorter:() => {}
+    // },
+    // {
+    //     title: '平均千次封面曝光花费(元)',
+    //     dataIndex: 'cpm',
+    //     tip: '花费/封面曝光数*1000',
+    //     align: 'center',    
+    //     scopedSlots: { customRender: 'cpm' },
+    //     sorter:() => {}
+    // },
+    // {
+    //     title: '平均封面点击单价(元)',
+    //     dataIndex: 'cpc',
+    //     tip: '花费/封面点击数',
+    //     align: 'center',    
+    //     scopedSlots: { customRender: 'cpc' },
+    //     sorter:() => {}
+    // },
+    // {
+    //     title: '平均行为单价(元)',
+    //     dataIndex: 'cpb',
+    //     tip: '总花费/行为数',
+    //     align: 'center',    
+    //     scopedSlots: { customRender: 'cpb' },
+    //     sorter:() => {}
+    // },
 ]
 
 let initDay ={
@@ -565,7 +565,7 @@ export default {
         columns:JSON.parse(JSON.stringify(columnsFixd)) ,//table的表头
         columnsFixd,
         tableData:[],
-        scrollX:2000,       
+        scrollX:1000,       
         tableWidth: '',//设置表格的列宽
         loading:false,
         target:'cost',//默认消耗排序
@@ -1213,24 +1213,27 @@ export default {
     //table 排序
     sort(pagination, filters, sorter, { currentDataSource }){
           console.log(pagination, filters, sorter)
-          if(sorter.order == 'ascend'){            
-              this.order='asc'
-              this.target=sorter.columnKey;
-          }else if(sorter.order == 'descend'){
-              this.order='desc'    
-              this.target=sorter.columnKey;
-          }else{
-            if(this.accountId.length==1  &&  this.dateValue[0].format('YYYY.MM.DD')!=this.dateValue[1].format('YYYY.MM.DD')){
-                this.target='stat_Datetime',
-                this.order='asc'
-            }else{
-                this.target='cost',
-                this.order='desc'
-            } 
+          if(this.accountId.length){
+              if(sorter.order == 'ascend'){            
+                  this.order='asc'
+                  this.target=sorter.columnKey;
+              }else if(sorter.order == 'descend'){
+                  this.order='desc'    
+                  this.target=sorter.columnKey;
+              }else{
+                if(this.accountId.length==1  &&  this.dateValue[0].format('YYYY.MM.DD')!=this.dateValue[1].format('YYYY.MM.DD')){
+                    this.target='stat_Datetime',
+                    this.order='asc'
+                }else{
+                    this.target='cost',
+                    this.order='desc'
+                } 
+                  
+              }
               
+              this.tableHttp();
           }
           
-          this.tableHttp();
     },
   
     closeCustomColumn(){

+ 279 - 10
src/views/modules/workBench/index.vue

@@ -37,11 +37,77 @@
                                     <p class="count">60 <span>个</span></p>
                                 </div>
                             </div>
+                            <div class="item">
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>我发起的</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">60 <span>个</span></p>
+                                </div>
+                            </div>
+                            <div class="item">
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>我发起的</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">60 <span>个</span></p>
+                                </div>
+                            </div>
+                            <div class="item">
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>我发起的</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">60 <span>个</span></p>
+                                </div>
+                            </div>
+                            <div class="item">
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>我发起的</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">60 <span>个</span></p>
+                                </div>
+                            </div>
+                            <div class="item">
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>我发起的</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count" >60 <span>个</span></p>
+                                </div>
+                            </div>
                         </div>  
                     </div>
                     <div class="leftBottom">
                         <div class="sectionHead">
                             订单进度
+                             <a-button type="link" class="allOrder" @click="allOrder">全部订单</a-button>
+                        </div>
+                        <div class="orderProgress">
+                            <ul class="orderProgress-list">
+                                <li v-for="(item,index) in orderProgressList" :key="index" class="orderProgress-list-item">
+                                    <div style="display:flex;width:80%; align-items: center;">
+                                        <span class="item-icon"></span>
+                                        <div class="content">
+                                            <p class="name">我是一个任务名称嗷嗷嗷啊</p>
+                                            <p class="desc">这是对这个任务的简介,所以得好好寻…</p>
+                                        </div>
+                                    </div>
+                                    
+                                    <div class="progress">
+                                        <a-progress type="circle" :percent="75" :width='30' :showInfo='false'  :strokeWidth='10' />
+                                        <span style="margin-left:15px">75%</span>
+                                    </div>
+                                </li>
+                            </ul>
+                            <!-- hideOnSinglePage -->
+                            <a-pagination size="small" :total="totalPage" :current='currentPage' class="fenye" :change='pageChange'  show-size-changer show-quick-jumper hideOnSinglePage />
                         </div>
                     </div>
                 </div>
@@ -50,11 +116,53 @@
                         <div class="sectionHead">
                             操作记录
                         </div>
+                        <div class="optionRecordList">
+                            <a-timeline>
+                                <a-timeline-item color='#F0F2F5' style="height:30px">
+                                   <p style="margin-bottom:0px">
+                                       Create a services site 2015-09-01
+                                    <span style="float:right">1分钟前</span>
+                                   </p>
+                                </a-timeline-item>
+                                <a-timeline-item color='#F0F2F5' style="height:30px">
+                                   <p style="margin-bottom:0px">
+                                       Create a services site 2015-09-01
+                                    <span style="float:right">1分钟前</span>
+                                   </p>
+                                </a-timeline-item>
+                                <a-timeline-item color='#F0F2F5' style="height:30px">
+                                   <p style="margin-bottom:0px">
+                                       Create a services site 2015-09-01
+                                    <span style="float:right">1分钟前</span>
+                                   </p>
+                                </a-timeline-item>
+                                <a-timeline-item color='#F0F2F5' style="height:30px">
+                                   <p style="margin-bottom:0px">
+                                       Create a services site 2015-09-01
+                                    <span style="float:right">1分钟前</span>
+                                   </p>
+                                </a-timeline-item>
+                                
+                            </a-timeline>
+                        </div>
                     </div>
                     <div class="rightBottom">
                         <div class="sectionHead">
                             本周项目燃尽图
                         </div>
+                        <div class="burnDown">
+                             <a-progress type="circle" :percent="75"  :width='150' :strokeWidth='6' />
+                             <div class="tip">
+                                <p class="done">
+                                    <span class="item-icon"></span>
+                                    <span>已完成订单:{{}}个</span>
+                                </p>
+                                <p class="all">
+                                    <span class="item-icon"></span>
+                                    <span>未完成订单:{{}}个</span>
+                                </p>
+                             </div>
+                        </div>
                     </div>
                 </div>
                 
@@ -68,18 +176,54 @@ import moment from 'moment';
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 
 export default {
-    
+    data() {
+        return {
+            // 订单进度
+            orderProgressList:[
+                {},
+                {},
+                {}
+            ],
+
+            // 操作记录
+            optionRecord:[],
+
+            // 本周项目燃尽图
+            burnDownChart:[],
+
+            // 分页参数
+            totalPage:0,
+            currentPage:1,
+
+        }
+    },
+    methods: {
+        // 分页页码改变
+        pageChange(page, pageSize){
+
+        },
+        // 全部订单
+        allOrder() {
+            
+        }
+    },
 }
 </script>
 
 <style lang="scss" scoped>
 .workBench{
+    ul,li{
+        margin: 0;
+        padding: 0;
+    }
     width: 100%;
     .topBody{
         width: 100%;
         height: 146px;
         background: #FFFFFF;
         margin-bottom: 24px;
+        padding: 20px;
+        box-sizing: border-box;
         .breadcrumb{
             width: 42px;
             height: 22px;
@@ -92,7 +236,7 @@ export default {
         .bottom{
             display: flex;
             position: relative;
-            padding: 20px;
+            // padding: 20px;
             .touxiang{
                 width: 72px;
                 height: 72px;
@@ -119,8 +263,8 @@ export default {
             }
             .mybtn{
                 position: absolute;
-                top: 50%;
-                margin-left: -18px;
+                // top: 50%;
+                // margin-left: -18px;
                 right: 0;
             }
         }
@@ -138,21 +282,32 @@ export default {
                 color: rgba(0, 0, 0, 0.85);
                 line-height: 24px;
                 border-bottom: 1px solid  #E9E9E9;;
+                .allOrder{
+                    float: right;
+                }
             }
             .sectionLeftBox{
-                width: 60%;
+                width: 70%;
+               
                 .leftTop{
                     height: 370px;
+                    background: white;
                 }
                 .zhanshiBox{
                     display: flex;
                     flex-wrap: wrap;
                     .item{
-                        flex: 4;
-                        background: brown;
-                        padding: 20px;
+                        width: 33.33%;
+                        // background: brown;
+                        padding: 20px ;
+                        border-right: 1px solid #E9E9E9;
+                        border-bottom: 1px solid #E9E9E9;
                         .title{
-                            padding-bottom: 20px;
+                            padding-bottom: 34px;
+                            .iconImg{
+                                width: 24px;
+                                margin-right: 8px;
+                            }
                         }
                         .itemBody{
                             text-align: center;
@@ -163,8 +318,10 @@ export default {
                                 font-weight: 500;
                                 color: #000000;
                                 line-height: 32px;
+                                cursor: pointer;
                                 span{
                                     font-size: 16px;
+                                    cursor: pointer;
                                 }
                             }
                             .count:hover{                                
@@ -172,15 +329,127 @@ export default {
                             }
                         }
                     }
+                    .item:nth-child(3n){
+                        border-right: 0;
+                    }
+                }
+                .leftBottom{
+                    margin-top: 20px;
+                    background: white;
+                    .orderProgress{
+                        padding: 0 20px;
+                        .orderProgress-list-item{
+                            padding: 10px 0;
+                            display: flex;
+                            align-items: center;
+                            border-bottom: 1px solid  #E9E9E9;;
+                            justify-content:space-between;
+                            .item-icon{
+                                width: 8px;
+                                height: 8px;
+                                background: #3BA0FF;
+                                margin-right: 15px;
+                                display: inline-block;
+                                border-radius: 50%;
+                            }
+                            .content{
+                                width: 70%;
+                                overflow: hidden;
+                                font-size: 14px;
+                                font-family: PingFangSC-Regular, PingFang SC;
+                                font-weight: 400;
+                                .name{
+                                    height: 22px;                                    
+                                    color: rgba(0, 0, 0, 0.65);
+                                    line-height: 22px;
+                                    text-overflow: ellipsis;
+                                    white-space: nowrap;
+                                    overflow: hidden;
+                                    margin-bottom: 0px;
+                                }
+                                .desc{
+                                    height: 22px;
+                                    color: rgba(0, 0, 0, 0.25);
+                                    line-height: 22px;
+                                    text-overflow: ellipsis;
+                                    white-space: nowrap;
+                                    overflow: hidden;
+                                     margin-bottom: 0px;
+                                }
+                            }
+                            .progress{
+                                float: right;
+                            }
+                        }
+                        .fenye{
+                            padding: 20px 0;
+                            text-align: right;
+                        }
+                    }
                 }
             }
             .sectionRightBox{
-                width: 40%;
+                width: 29%;
+                // background: white;
+                margin-left: 20px;
                 .rightTop{
                     height: 370px;
+                     background: white;
+                     .optionRecordList{
+                         padding: 20px;
+                     }
+                }
+                .rightBottom{
+                    margin-top: 20px;
+                     background: white;
+                    .burnDown{
+                         padding: 30px 20px;
+                         text-align: center;
+                         .tip{
+                            margin-top: 40px;
+                            display: flex;
+                            justify-content: space-around;
+                             
+                            height: 22px;
+                            font-size: 14px;
+                            font-family: PingFangSC-Regular, PingFang SC;
+                            font-weight: 400;
+                            color: rgba(0, 0, 0, 0.65);
+                            line-height: 22px;
+                             .done{
+                                .item-icon{
+                                     width: 8px;
+                                    height: 8px;
+                                    background: #3BA0FF;
+                                    margin-right: 15px;
+                                    display: inline-block;
+                                    border-radius: 50%;
+                                }
+                             }
+                             .all{
+                                .item-icon{
+                                    width: 8px;
+                                    height: 8px;
+                                    background: #F0F2F5;
+                                    margin-right: 15px;
+                                    display: inline-block;
+                                    border-radius: 50%;
+                                } 
+                             }
+                         }
+                    }
+
                 }
             }
         }
     }
 }
+</style>
+
+<style lang="less">
+    .workBench{
+        .ant-timeline-item-head{
+            background: rgb(240,242,245);
+        }
+    }
 </style>

+ 2 - 2
vue.config.js

@@ -74,14 +74,14 @@ module.exports = {
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
 
         // target: 'http://192.168.1.74:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://192.168.1.74:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        // target: 'http://192.168.1.74:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.170:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
 
         // 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后台项目