瀏覽代碼

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

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

+ 4 - 2
src/views/modules/Statistics/imageStatics/imageCostReport.vue

@@ -777,10 +777,12 @@ export default {
                         // console.log(this.treeData)
 
 
-                      if(this.tabKey==1){
+                      if(this.tabKeys==1){
                         this.treeData=this.TTaccountList
-                      }else{
+                      }else if(this.tabKeys==1){
                         this.treeData=this.KSaccountList
+                      }else{
+                        console.log('数据出错')
                       }
                     }
                 }

+ 2 - 2
src/views/modules/autoRules/newBlankRule.vue

@@ -1004,7 +1004,7 @@ export default {
                 }   
             }            
         })
-        getAction('/alarm/alarmMetricValue/queryParentChildList',{
+        getAction(`/alarm/alarmMetricValue/queryParentChildList?metricValueLevel=${2}`,{
             metricValueLevel:2
         }).then(res=>{
             console.log(res);
@@ -1015,7 +1015,7 @@ export default {
                 }   
             }            
         })
-        getAction('/alarm/alarmMetricValue/queryParentChildList',{
+        getAction(`/alarm/alarmMetricValue/queryParentChildList?metricValueLevel=${3}`,{
             metricValueLevel:3
         }).then(res=>{
             console.log(res);

+ 54 - 9
src/views/modules/workBench/index.vue

@@ -29,11 +29,33 @@
                         </div>
                         <div class="zhanshiBox">
                            
-                            <div class="item">
-                                <router-link to="/workBench/orderList">
+                            <div class="item" v-if="isOperator()">
+                                <router-link to="/workBench/orderList?status=1">
                                 <div class="title">
                                     <img src="@/assets/work.png" alt="" class="iconImg">
-                                    <span>我发起的</span>
+                                    <span>我发起的订单</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">60 <span>个</span></p>
+                                </div>
+                                </router-link>
+                            </div>
+                            <div class="item" v-if="isDesignLeader()">
+                                <router-link to="/workBench/orderList?status=2">
+                                <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>
+                                </router-link>
+                            </div>
+                            <div class="item" v-if="isDesignLeader()">
+                                <router-link to="/workBench/orderList?status=3">
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>待指派的订单</span>
                                 </div>
                                 <div class="itemBody">
                                     <p class="count">60 <span>个</span></p>
@@ -45,7 +67,7 @@
                                 <router-link to="/workBench/orderList">
                                 <div class="title">
                                     <img src="@/assets/work.png" alt="" class="iconImg">
-                                    <span>我发起的</span>
+                                    <span>我参与的订单</span>
                                 </div>
                                 <div class="itemBody">
                                     <p class="count">60 <span>个</span></p>
@@ -56,7 +78,7 @@
                                 <router-link to="/workBench/orderList">
                                 <div class="title">                                   
                                     <img src="@/assets/work.png" alt="" class="iconImg">
-                                    <span>我发起的</span>
+                                    <span>已完成的订单</span>
                                 </div>
                                 <div class="itemBody">
                                     <p class="count">60 <span>个</span></p>
@@ -67,14 +89,14 @@
                                 <router-link to="/workBench/orderList">
                                 <div class="title">
                                     <img src="@/assets/work.png" alt="" class="iconImg">
-                                    <span>我发起的</span>
+                                    <span>全部订单</span>
                                 </div>
                                 <div class="itemBody">
                                     <p class="count">60 <span>个</span></p>
                                 </div>
                                 </router-link>
                             </div>
-                            <div class="item">
+                            <!-- <div class="item">
                                 <router-link to="/workBench/orderList">
                                 <div class="title">
                                     <img src="@/assets/work.png" alt="" class="iconImg">
@@ -95,7 +117,7 @@
                                     <p class="count" >60 <span>个</span></p>
                                 </div>
                                 </router-link>
-                            </div>
+                            </div> -->
                         </div>  
                     </div>
                     <div class="leftBottom">
@@ -218,6 +240,28 @@ export default {
         }
     },
     methods: {
+        // 判断是否是运营
+        isOperator(){
+            if(this.roleCode.indexOf('operator')!=-1||this.roleCode.indexOf('Operation')!=-1||this.roleCode.indexOf('operation')!=-1||this.roleCode=='admin'){
+                return true
+            }else {
+                return false
+            }
+        },
+        isDesignLeader(){
+            if(this.roleCode=='designTeamLeader'||this.roleCode=='admin'){
+                return true
+            }else {
+                return false
+            }
+        },
+        isDesign(){
+            if(this.roleCode=='planeLeader'||this.roleCode=='production'||this.roleCode=='designTeamLeader'||this.roleCode=='plane'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='plan'||this.roleCode=='admin'){
+                return true
+            }else {
+                return false
+            }
+        },
         // 分页页码改变
         pageChange(page, pageSize){
 
@@ -237,7 +281,8 @@ export default {
             this.userInfo=JSON.parse(userInfo).value
         }
         this.roleCode=localStorage.getItem('roleCode')
-       
+        
+        
     }
 }
 

+ 36 - 20
src/views/modules/workBench/orderDetail.vue

@@ -695,6 +695,8 @@ export default {
 
             sizeType:[],
             size: "4",
+
+            currentOrderId:'',
         }
     },
     methods: {
@@ -766,31 +768,45 @@ export default {
         },
         // 生成水印
         getWater() {
-        var params = qs.stringify({
-          id: this.id,
-          watermarkTemplateId: this.size
-        })
-        postAction('/ctop/materialInfo/watermark', params).then(res => {
-          if (res.success) {
-            // getAction("/ctop/videoWatermarkTask/list").then(res=>{
-            //     console.log(res)
-            // })
-            this.$message.success('水印素材生成中,请一分钟后刷新')
-            this.visibleDetail = false
-            this.refuseFile = []
-            this.refuseReason = ''
-            closeAllVideoFun()
-            this.loadData()
-          }
-        })
-      },
+            var params = qs.stringify({
+            id: this.id,
+            watermarkTemplateId: this.size
+            })
+            postAction('/ctop/materialInfo/watermark', params).then(res => {
+            if (res.success) {
+                // getAction("/ctop/videoWatermarkTask/list").then(res=>{
+                //     console.log(res)
+                // })
+                this.$message.success('水印素材生成中,请一分钟后刷新')
+                this.visibleDetail = false
+                this.refuseFile = []
+                this.refuseReason = ''
+                closeAllVideoFun()
+                this.loadData()
+            }
+            })
+        },
+
+        // 请求order详情数据
+        orderDetailHttp(){
+            postAction('',{
+
+            }).then(res=>{
+                console.log(res)
+            })
+        },
     },
     created(){
         getAction('/ctop/videoWatermarkTemplate/list').then(res => {
             if (res.success) {
-            this.sizeType = res.result.records
+                this.sizeType = res.result.records
             }
-        })
+        });
+        console.log(this.$route.query.orderId)
+        this.currentOrderId=this.$route.query.orderId;
+        if(this.currentOrderId){
+
+        }
     }
 }
 </script>

+ 18 - 20
src/views/modules/workBench/orderList.vue

@@ -152,7 +152,9 @@
                 }
             }
             .section-box{
+                margin-top: 30px;
                 padding: 20px 20px;
+                border: 1px solid #E9E9E9;
                 .description{
                     margin-top: 10px;
                     .time{
@@ -298,7 +300,7 @@
             <div class="sectionBody">
                 <div class="tabBody">
                     <a-tabs v-model="activeKey" @change='tabChange'>
-                        <a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title" v-if="pane.role=='all'||pane.role==roleCode" >
+                        <a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title" v-if="pane.role=='all'||pane.role==roleCode||roleCode=='admin'" >
                             <!-- {{ pane.content }}{{pane.role+'-'+roleCode}} -->
                         </a-tab-pane>
                     </a-tabs>
@@ -376,8 +378,6 @@
                                 {{text}}
                             </div>
                             <span slot="options" slot-scope="text,record">
-                                <a href="javascript:;" @click="hurryUp(record)">催一下</a>
-                                <a-divider type="vertical" />
                                 <a href="javascript:;" @click="viewDetails(record)">详情</a>
 
                                 <!-- <a-divider type="vertical" />
@@ -538,9 +538,10 @@ let marterialData=[
 export default {
     data() {
         const panes = [
-            { title: '全部订单', content: '', key: '1' , role:'all' },
-            { title: '我发起的', content: '', key: '2' , role:'all' },
-            { title: '下给我的', content: '', key: '3' , role:'design' },
+            { title: '全部订单', content: '', key: '9' , role:'all' },
+            { title: '我发起的', content: '', key: '1' , role:'operate' },
+            { title: '待确定的', content: '', key: '2' , role:'designLeader' },
+            { title: '待指派的', content: '', key: '3' , role:'designLeader' },
             { title: '我参与的', content: '', key: '4' , role:'all' },
             { title: '待审核的', content: '', key: '5' , role:'all' },
             { title: '已完成的', content: '', key: '6' , role:'all' },
@@ -612,12 +613,10 @@ export default {
         // 查看详情
         viewDetails(record){
             console.log(record)
-            this.visible = true;
+            this.$route.push(`/workBench/orderDetail?orderId=${record.id}`)
         },
         
-        onClose() {
-            this.visible = false;
-        },
+        
         // 撤回订单
         withdrawOrder(){
 
@@ -657,15 +656,7 @@ export default {
 
         
 
-        // tabqiehuan
-        // tabChange(key){
-        //     console.log(key);
-        //     if(key==1){
-        //         this.columns=[...materialColumns]
-        //     }else{
-        //         this.columns=[...scriptColumns]
-        //     }
-        // },
+        
 
         // 素材通过审核
         approved(){
@@ -686,6 +677,10 @@ export default {
             this.orderParticipants="";
             this.orderSponsor='';
         },
+
+        tableHttp(){
+            
+        },
     },
     mounted(){
         let userInfo=localStorage.getItem('pro__Login_Userinfo');
@@ -693,7 +688,10 @@ export default {
             this.userInfo=JSON.parse(userInfo).value
         }
         this.roleCode=localStorage.getItem('roleCode')
-       
+        console.log(this.$route.query.status)
+        this.activeKey=this.$route.query.status
+
+
     }
 }
 </script>