魏志佳 4 年之前
父节点
当前提交
72c8433e69

+ 2 - 2
src/utils/request.js

@@ -15,8 +15,8 @@ else if (process.env.NODE_ENV == 'debug') {
 else if (process.env.NODE_ENV == 'production') { 
 else if (process.env.NODE_ENV == 'production') { 
   
   
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
-  // axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';
-  axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
+  axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';
+  // axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
 }
 }
 const service = axios.create({
 const service = axios.create({
 //   baseURL: '/jeecg-boot', // api base_url
 //   baseURL: '/jeecg-boot', // api base_url

+ 27 - 5
src/views/modules/advertiser/modules/AdvertiserModal.vue

@@ -88,13 +88,22 @@
             rules: [{
             rules: [{
               required: true,
               required: true,
               message: '请输入联系人手机!'
               message: '请输入联系人手机!'
-            }]
+            },{
+              validator:this.mobileChecked
+            }
+            ]
           },
           },
           email: {
           email: {
-            rules: [{
-              required: true,
-              message: '请输入联系人邮箱!'
-            }]
+            rules: [
+              {
+                type: 'email',
+                message: '邮箱格式不正确,请重新输入',
+              },
+              {
+                required: true,
+                message: '请输入联系人邮箱!',
+              },
+              ]
           },
           },
           pid: {
           pid: {
             rules: [{
             rules: [{
@@ -199,6 +208,19 @@
       filterOption(input, option) {
       filterOption(input, option) {
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       },
       },
+      mobileChecked(rule, value, callback){
+        // console.log(rule, value, callback)
+            var strRegex = /^1[0-9]{10}$/
+            var re = new RegExp(strRegex)
+            // console.log(re.test(res))
+            if (re.test(value)) {
+                callback()
+            } else if(value && !re.test(value)){
+                callback('手机号码不正确,请正确输入')
+            }else{
+              callback()
+            }
+      }
     }
     }
   }
   }
 </script>
 </script>

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

@@ -204,7 +204,7 @@ export default {
   },
   },
   methods: {
   methods: {
     validateInputCode(rule, value, callback) {
     validateInputCode(rule, value, callback) {
-      if (!value || value > 0) {
+      if ( value > 0) {
         callback()
         callback()
       } else {
       } else {
         callback('请输入大于0的最高报价!')
         callback('请输入大于0的最高报价!')

+ 1 - 0
src/views/modules/autoLaunch/autoLaunchList.vue

@@ -19,6 +19,7 @@ export default {
             currentPlanId:'',
             currentPlanId:'',
             currentGroupId:'',
             currentGroupId:'',
             userId:'',
             userId:'',
+            currentStrateg:{},
         }
         }
     },
     },
     components:{   
     components:{   

+ 122 - 29
src/views/modules/autoLaunch/autoLaunchReport.vue

@@ -1,8 +1,14 @@
 <template>
 <template>
     <div class="autoLaunchReport">
     <div class="autoLaunchReport">
-        <div class="tabBody">
+        <!-- <div class="tabBody">
+            <a-tabs v-model='analysisDirection' @change="tabChange">
+                <a-tab-pane :key="1" tab="素材+定向"> </a-tab-pane>
+                <a-tab-pane :key="2" tab="素材+出价" > </a-tab-pane>
+            </a-tabs>
+        </div> -->
+        <div class="tabBody2" >
             <a-tabs v-model='tabKey' @change="tabChange">
             <a-tabs v-model='tabKey' @change="tabChange">
-                <a-tab-pane :key="1" tab="定向分析"> </a-tab-pane>
+                <a-tab-pane :key="1" tab="定向分析" > </a-tab-pane>
                 <a-tab-pane :key="2" tab="素材分析" > </a-tab-pane>
                 <a-tab-pane :key="2" tab="素材分析" > </a-tab-pane>
             </a-tabs>
             </a-tabs>
         </div>
         </div>
@@ -105,9 +111,15 @@
             <a-spin :spinning="spinning">
             <a-spin :spinning="spinning">
             <div class="chartBody">
             <div class="chartBody">
                 
                 
-                <div id="mapEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="mapEchart"></div>
-                <div id="sexEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="sexEchart"></div>
-                <div id="ageEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="ageEchart"></div>
+                <div id="mapEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="mapEchart">
+                    <a-empty style="position: relative; top: 50%; margin-top: -65px" />
+                </div>
+                <div id="sexEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="sexEchart">
+                    <a-empty style="position: relative; top: 50%; margin-top: -65px" />
+                </div>
+                <div id="ageEchart" style='width:30%;height:300px;border:1px solid #e0e0e0;padding:10px' ref="ageEchart">
+                    <a-empty style="position: relative; top: 50%; margin-top: -65px" />
+                </div>
                
                
             </div>
             </div>
             </a-spin>
             </a-spin>
@@ -775,6 +787,7 @@ const publicColumns = [
     export default {
     export default {
         data() {
         data() {
             return {
             return {
+                analysisDirection:1,
                 spinning:false,
                 spinning:false,
                 materialId:[],
                 materialId:[],
                 treeData: [],
                 treeData: [],
@@ -838,6 +851,7 @@ const publicColumns = [
                 age:[],
                 age:[],
                 gender:[],
                 gender:[],
                 region:[],
                 region:[],
+                currentStrategy:{},
             }
             }
         },
         },
         methods: {
         methods: {
@@ -1206,38 +1220,38 @@ const publicColumns = [
                         type: 'piecewise',
                         type: 'piecewise',
                         // text: ['头', '尾'],
                         // text: ['头', '尾'],
                         pieces: [{
                         pieces: [{
-                                min: 1002,
-                                color: '#73240D'
+                            min: 100000,
+                            color: '#73240D',
                             },
                             },
                             {
                             {
-                                min: 501,
-                                max: 1001,
-                                color: '#BB0000'
+                            min: 50000,
+                            max: 100000,
+                            color: '#BB0000',
                             },
                             },
                             {
                             {
-                                min: 251,
-                                max: 500,
-                                color: '#BD430A'
+                            min: 30000,
+                            max: 50000,
+                            color: '#BD430A',
                             },
                             },
                             {
                             {
-                                min: 101,
-                                max: 250,
-                                color: '#E08150'
+                            min: 10000,
+                            max: 30000,
+                            color: '#E08150',
                             },
                             },
                             {
                             {
-                                min: 11,
-                                max: 100,
-                                color: '#E9B090'
+                            min: 5000,
+                            max: 10000,
+                            color: '#E9B090',
                             },
                             },
                             {
                             {
-                                min: 1,
-                                max: 10,
-                                color: '#F2DDD2'
+                            min: 1000,
+                            max: 5000,
+                            color: '#F2DDD2',
                             },
                             },
                             {
                             {
-                                value: 0,
-                                color: '#F1eeee'
-                            }
+                            value: 0,
+                            color: '#F1eeee',
+                            },
                         ],
                         ],
                         orient: 'vertical',
                         orient: 'vertical',
                         itemSymbol: 'circle',
                         itemSymbol: 'circle',
@@ -1765,6 +1779,58 @@ const publicColumns = [
                 params.pageNo=this.ipagination.current;
                 params.pageNo=this.ipagination.current;
                 params.pageSize=this.ipagination.pageSize
                 params.pageSize=this.ipagination.pageSize
                 return params
                 return params
+            },
+            handlerInitData(currentStrategy){
+                if(currentStrategy){
+                    this.currentStrategy=JSON.parse(currentStrategy)
+                    this.accountIds=this.currentStrategy.accountId;
+                    
+                    if(this.tabKey==1){
+                        this.treeData=[];
+                        this.directionalId=[];
+                        getAction('/ai/analyze/getStrategyAndTarget', {
+                            accountId:this.accountIds
+                        }).then(res => {
+                            if(res.success){
+                                // console.log(res);
+                                if(res.result){
+                                    res.result.forEach((element,index) => {
+                                    if(element){                  
+                                        this.treeData.push({});                    
+                                        this.treeData[index].title=element.strategy_name +'_('+ element.id +')';
+                                        this.treeData[index].value='strategy'+element.id;
+                                        this.treeData[index].key=element.id;
+                                    
+                                        this.treeData[index].children=[];
+                                                            
+                                        if(element.targets.length&&element.targets[0]){
+                                            element.targets.forEach((ele,i)=>{
+                                                this.treeData[index].children.push({});
+                                                this.treeData[index].children[i].title=ele.target_type+'_'+ele.target_content
+                                                this.treeData[index].children[i].value=element.id+'_'+ele.id;
+                                                this.treeData[index].children[i].key=element.id+'_'+ele.id;
+                                            })
+                                            
+                                        }                           
+                                    }      
+                                    });
+                                    // console.log(this.treeData)
+                                    // this.directionalId=[this.treeData[0].children[0].value]
+                                    // this.treeData.map((item=>{
+                                    //     if(){
+
+                                    //     }
+                                    // }))
+                                    this.directionalId=[`strategy${this.currentStrategy.id}`]
+                                    this.treeChange(this.directionalId)
+
+                                }
+                            }
+                        })
+                    }else if(this.tabKey==2){
+                        this.accountMaterialHttp()
+                    }
+            }
             }
             }
         },
         },
 
 
@@ -1808,10 +1874,12 @@ const publicColumns = [
 
 
             // })
             // })
             let userInfo=localStorage.getItem('pro__Login_Userinfo');
             let userInfo=localStorage.getItem('pro__Login_Userinfo');
+            let currentStrategy=localStorage.getItem('currentStrategy');
             let userId=''
             let userId=''
             if(userInfo){
             if(userInfo){
                 this.userId=JSON.parse(userInfo).value.id
                 this.userId=JSON.parse(userInfo).value.id
             }
             }
+            this.handlerInitData(currentStrategy)
             getAction('/ctop/userAllocation/getAccountIdsByUserId',{
             getAction('/ctop/userAllocation/getAccountIdsByUserId',{
                 userId:this.userId,
                 userId:this.userId,
             }).then(res=>{
             }).then(res=>{
@@ -1916,11 +1984,30 @@ const publicColumns = [
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
+.autoLaunchReport{
+
+
      .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
      .ant-tooltip-inner,.ant-tooltip,.ant-tooltip-arrow::before{
         background-color: #fff;
         background-color: #fff;
         color: #333;
         color: #333;
     }
     }
-
+    .tabBody2{
+        .ant-tabs-nav .ant-tabs-tab {
+            position: relative;
+            display: inline-block;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            height: 100%;
+            margin: 0 ;
+            padding: 10px 20px ;
+            text-decoration: none;
+            cursor: pointer;
+            -webkit-transition: color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+            transition: color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+            font-size: 15px;
+        }
+    }
+}
 </style>
 </style>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .autoLaunchReport {
 .autoLaunchReport {
@@ -1940,17 +2027,21 @@ const publicColumns = [
         margin-right: 10px;
         margin-right: 10px;
     }
     }
     .topOptions{
     .topOptions{
-        padding: 15px 10px;
+       padding: 0px 10px 10px;
+        margin-top: -9px;
+        position: relative;
         .topOpt{
         .topOpt{
             width: 100%;
             width: 100%;
             margin-bottom: 10px;
             margin-bottom: 10px;
         }
         }
     }
     }
     .optionBtn{
     .optionBtn{
-        // display: inline-block;
-        float: right;
+        
         .searchBtn{
         .searchBtn{
             // margin-right: 10px;
             // margin-right: 10px;
+            position: absolute;
+            right: 10px;
+            bottom: 10px;
         }
         }
     }
     }
   .circul{
   .circul{
@@ -2057,6 +2148,8 @@ const publicColumns = [
         margin-bottom: 20px;
         margin-bottom: 20px;
     }
     }
   }
   }
+
+  
 }
 }
 
 
 </style>
 </style>

+ 108 - 0
src/views/modules/autoLaunch/autoReportIndex.vue

@@ -0,0 +1,108 @@
+<template>
+<div class="autoLaunch">
+    <div class="card-container">
+        <a-tabs type="card" v-model="analaysisDirection" @change="analaysisDirectionChange" :animated='true'>
+            <a-tab-pane key="1" tab="素材+定向">
+                
+            </a-tab-pane>
+            <a-tab-pane key="2" tab="素材+出价">
+                
+            </a-tab-pane>
+            <!-- <a-tab-pane key="3" tab="">
+            </a-tab-pane> -->
+        </a-tabs>
+        <component v-bind:is="currentTabComponent">
+        </component>
+     </div>
+</div>
+    
+        
+    
+    
+</template>
+
+<script>
+import moment from 'moment';
+import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
+export default {
+    name:'index',
+    data() {
+        return {
+            currentTabComponent:'materialAndOrient',
+            analaysisDirection:'1',
+        }
+    },
+    components:{   
+        materialAndOrient: () => import('./autoLaunchReport'), 
+        materialAndBid: () => import('./materialAndBid'), 
+        
+    },
+    methods: {
+        analaysisDirectionChange(key){
+            console.log(key)
+            if(key=='1'){
+                this.currentTabComponent='materialAndOrient' 
+            }else if(key=='2'){
+                this.currentTabComponent='materialAndBid' 
+            }
+        }
+    },
+    mounted(){
+       this.currentTabComponent='materialAndOrient' 
+    },
+    beforeDestroy() {
+        this.currentTabComponent='materialAndOrient' 
+    },
+   
+}
+
+</script>
+
+<style lang="less">
+.autoLaunch{
+    
+    .card-container {
+        background: #f5f5f5;
+        // overflow: hidden;
+        // padding: 24px;
+        .ant-tabs-nav .ant-tabs-tab {
+            position: relative;
+            display: inline-block;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            height: 100%;
+            margin: 0 ;
+            padding: 0px 16px 8px;
+            text-decoration: none;
+            cursor: pointer;
+            -webkit-transition: color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+            transition: color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+            font-size: 16px;
+        }
+    }
+    .card-container > .ant-tabs-card > .ant-tabs-content {
+    // height: 120px;
+    margin-top: -16px;
+    }
+
+    .card-container > .ant-tabs-card > .ant-tabs-content > .ant-tabs-tabpane {
+    background: #fff;
+    // padding: 16px;
+    }
+
+    .card-container > .ant-tabs-card > .ant-tabs-bar {
+    border-color: #fff;
+    }
+
+    .card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab {
+    border-color: transparent;
+    background: transparent;
+    }
+
+    .card-container > .ant-tabs-card > .ant-tabs-bar .ant-tabs-tab-active {
+    border-color: #fff;
+    background: #fff;
+    }
+}
+
+</style>

文件差异内容过多而无法显示
+ 1045 - 0
src/views/modules/autoLaunch/components/materialList.vue


+ 712 - 0
src/views/modules/autoLaunch/components/platForm.vue

@@ -0,0 +1,712 @@
+<template>
+    <div class="workBench">
+        <div class="topBody">
+            <p class="breadcrumb">工作台</p>
+            <div class="bottom">
+                <div class="touxiang">
+                    <img src="@/assets/touxiang.png"  alt="">
+                </div>  
+                <div class='tip'>
+                    <p class="greet">{{getTimeState()}},{{roleInfo.realname}},祝你开心每一天!</p>
+                    <p class="descPosition">
+                        <span>{{roleInfo.roleName}}</span>
+                        <a-divider type="vertical" />
+                        <span>{{roleInfo.area}}地区-{{roleInfo.departName}}</span>
+                    </p>
+                </div>
+                <a-button type='primary' class="mybtn" @click="sendOrder">
+                    <a-icon type="plus" />
+                    发起订单
+                </a-button>
+            </div>
+        </div>
+        <div class="section">
+            <div class="sectionBody">
+                <div class="sectionLeftBox">
+                    <div class="leftTop">
+                        <div class="sectionHead">
+                            我的工作内容
+                        </div>
+                        <div class="zhanshiBox">
+                           
+                            <div class="item" @click="goOrderList(1)">                               
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>我发起的订单</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">{{countInfo.newOrder || 0}} <span>个</span></p>
+                                </div>
+                            </div>
+                            <div class="item" @click="goMaterialList(1)">                                
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>待审核的物料</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">{{countInfo.toAuditMaterial || 0}}<span>个</span></p>
+                                </div>                              
+                            </div>
+                           
+                            <div class="item" @click="goOrderList(2)">                               
+                                <div class="title">                                   
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>已完成的订单</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">{{countInfo.finishOrder ||0}}<span>个</span></p>
+                                </div>
+                            </div>
+                            <div class="item" @click="goOrderList(3)">                                
+                                <div class="title">                                   
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>被驳回的订单</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">{{countInfo.rejectOrder || 0}} <span>个</span></p>
+                                </div>
+                            </div>
+                            <!-- <div class="item" @click="goOrderList(4)">                                
+                                <div class="title">
+                                    <img src="@/assets/work.png" alt="" class="iconImg">
+                                    <span>全部订单</span>
+                                </div>
+                                <div class="itemBody">
+                                    <p class="count">{{countInfo.allOrder}}<span>个</span></p>
+                                </div>                                
+                            </div> -->
+                        </div>  
+                    </div>
+                    <div class="leftBottom">
+                        <div class="sectionHead">
+                            订单进度
+                             <!-- <a-button type="link" class="allOrder" @click="goOrderList(1)">全部订单</a-button> -->
+                        </div>
+                        <a-spin :spinning="orderProgressSpinning">
+                        <div class="orderProgress">
+                            
+                            <ul class="orderProgress-list" v-if="orderProgressList.length>0">
+                                <li v-for="(item,index) in orderProgressList" :key="index"  >
+                                    <!-- <span  style="display:block;width:100%"> -->
+                                    <div style="display:flex;align-items: center;" class="orderProgress-list-item" @click="orderDetail(item)">
+                                        <div style="display:flex;width:80%; align-items: center;" >
+                                            <span class="item-icon"></span>
+                                            <div class="content">
+                                                <p class="name">{{item.orderTitle}}</p>
+                                                <p class="desc">{{item.orderRemark}}</p>
+                                            </div>
+                                        </div>
+                                        
+                                        <div class="progress" v-if="item.orderStatus==1||item.orderStatus==3">
+                                            <a-progress type="circle" :percent="(item.materialFinishAmount/item.materialAmount)*100" :width='30' :showInfo='false'  :strokeWidth='10' />
+                                            <span style="margin-left:15px">{{(item.materialFinishAmount/item.materialAmount)*100}}%</span>
+                                        </div>
+                                        <div class="progress" v-else>
+                                            {{item.orderStatus|handleOrderStatus}}
+                                        </div>
+                                    </div>
+                                    <!-- </span> -->
+                                </li>
+                            </ul>
+                            <div   v-else style="width:100%;height:585px;line-height:585px;text-align:center">
+                               
+                                <img src="@/assets/nodata.png" alt="" style="width:300px;text-align:center">
+                            </div>
+                            <!-- hideOnSinglePage -->
+                            <a-pagination size="small" :total="totalPage" :current='currentPage' :pageSize='8' class="fenye" @change='pageChange'  show-quick-jumper  />
+                            
+                        </div>
+                        </a-spin>
+                    </div>
+                </div>
+                <div class="sectionRightBox">
+                    <div class="rightTop">
+                        <div class="sectionHead">
+                            操作记录
+                        </div>
+                        <a-spin :spinning="spinning">
+                        <div class="optionRecordList">
+                            
+                            <a-timeline >
+                                <a-timeline-item color='#F0F2F5' style="height:46px" v-for="(item,index) in operateRecordList" :key="index">
+                                <p style="margin-bottom:0px">
+                                    <span class="content-item">{{item.userName}}{{item.operate}}{{item.materialName||item.orderTitle}}</span> 
+                                    <span class="time">{{item.time}}</span>
+                                </p>
+                                </a-timeline-item>
+                                
+                            </a-timeline>
+
+                           
+                            
+                        </div>
+                        </a-spin>
+                    </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>
+                
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import moment from 'moment';
+import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
+
+export default {
+    name:'operator-platform',
+    data() {
+        return {
+            moment,
+            roleInfo:{},
+            todayGreet:moment(),
+            orderProgressSpinning:false,
+            countInfo:{},
+
+            spinning:false,
+            touxiang:'@/assets/touxiang.png',
+            // 订单进度
+            orderProgressList:[
+                
+            ],
+
+            // 操作记录
+            optionRecord:[],
+
+            // 本周项目燃尽图
+            burnDownChart:[],
+
+            // 分页参数
+            totalPage:0,
+            currentPage:1,
+
+            userInfo:{},
+            roleCode:'',
+
+            operateRecordList:[],
+
+            TimerObj:null,
+        }
+    },
+    methods: {
+        goOrderList(val){
+            console.log(val);
+            // console.log(this.$parent)
+            this.$parent.currentTabComponent='orderList';
+            this.$parent.orderStatus=val
+            
+        },
+        goMaterialList(val){
+            this.$parent.currentTabComponent='materialList';
+            this.$parent.materialStatus=val
+        },
+        orderDetail(item){
+            console.log(item)
+            this.$parent.currentTabComponent='orderDetail';
+            this.$parent.orderId=item.id
+        },
+        // 分页页码改变
+        pageChange(page, pageSize){
+            this.currentPage=page;
+            // console.log(page,pageSize)
+            this.getOrderList()
+        },
+        
+        // 发起订单
+        sendOrder(){
+            this.$parent.currentTabComponent='placeOrder';
+            
+        },
+        // 获取订单列表
+        getOrderList(){
+          
+            let params={
+                createBy:this.userInfo.id,
+                pageNo:this.currentPage,
+                pageSize:8,
+            }
+            this.orderProgressSpinning=true;
+            getAction('/platform/order/listByCreatorOrDesignLeader',params).then(res=>{
+                console.log(res);
+                this.loading=false;
+                this.orderProgressSpinning=false;
+                if(res.success){
+
+                    this.orderProgressList=res.result.list;
+                    this.totalPage=res.result.total;
+
+                }
+            })
+        },
+
+        // 操作记录
+        getOperationRecord(){
+            this.spinning=true;
+            getAction('/platform/operateRecord/createDesc').then(res=>{
+                console.log(res)
+                this.spinning=false;
+                if(res.success){
+                    this.operateRecordList=res.result.list.map((item,index)=>{
+                       
+                            let time='';
+                            let startTime=moment(item.createTime)
+                            console.log(startTime) 
+                            if(moment().diff(startTime,'hours')>24){
+                                time=item.createTime.split(/[ ]+/)[0]
+                                return {
+                                    ...item,
+                                    time,
+                                }
+                            }
+                            else if(moment().diff(startTime,'minutes')>60){
+                                time=item.createTime.split(/[ ]+/)[1]
+                                return {
+                                    ...item,
+                                    time,
+                                }
+                            }else if(moment().diff(startTime,'minutes')>=1){
+                                time=moment().diff(startTime,'minutes')+'分钟前'
+                                return {
+                                    ...item,
+                                    time,
+                                }
+                            }else if(moment().diff(startTime,'minutes')==0){
+                                time=moment().diff(startTime,'seconds')+'秒前'
+                                return {
+                                    ...item,
+                                    time,
+                                }
+                            }
+                        
+                        
+                        
+                    });
+
+                    
+                }
+            })
+        },
+        
+        scrollRecord(){
+            console.log(this.$refs.scrollRecord);
+            this.TimerObj=setInterval(()=>{
+                this.getOperationRecord()
+
+            },60000)            
+        },
+
+
+        // 获取工作台内容
+        getPlantformInfo(){
+            getAction('/platform/query/jobContent').then(res=>{
+                console.log(res)
+                if(res.success){
+                    if(this.$parent.role=='operator'){
+                        this.countInfo=res.result.operatorJobContent
+                    }else if(this.$parent.role=='design'){
+                        this.countInfo=res.result.designJobContent
+                    }else if(this.$parent.role=='designLeader'){
+                        this.countInfo=res.result.designLeaderJobContent
+                    }
+                }
+            })
+        },
+
+
+        getTimeState () {
+            // 获取当前时间
+            let timeNow = new Date();
+            // 获取当前小时
+            let hours = timeNow.getHours();
+            // 设置默认文字
+            let text = ``;
+            // 判断当前时间段
+            if (hours >= 0 && hours <= 5) {
+                text = `凌晨好`;
+            }else if(hours >= 6 && hours <= 9){
+                text = `早上好`;
+            } else if(hours > 9 && hours <= 12){
+                text = `上午好`;
+            }else if (hours > 12 && hours <= 14) {
+                text = `中午好`;
+            } else if (hours > 14 && hours <= 18) {
+                text = `下午好`;
+            } else if (hours > 18 && hours <= 24) {
+                text = `晚上好`;
+            }
+            // 返回当前时间段对应的状态
+            return text
+        },
+
+        getidentity(){
+            getAction('/platform/query/identity',{}).then(res=>{
+                console.log(res);
+                if(res.success){
+                    this.roleInfo=res.result
+                }
+            })
+        }
+
+    },
+    mounted(){
+        let userInfo=localStorage.getItem('pro__Login_Userinfo');
+        if(userInfo){
+            this.userInfo=JSON.parse(userInfo).value
+        }
+        this.roleCode=localStorage.getItem('roleCode')
+        this.getOrderList()
+        this.getOperationRecord()
+        this.scrollRecord()
+        this.getPlantformInfo()
+        this.getidentity()
+        
+    },
+    activated(){
+        let userInfo=localStorage.getItem('pro__Login_Userinfo');
+        if(userInfo){
+            this.userInfo=JSON.parse(userInfo).value
+        }
+        this.roleCode=localStorage.getItem('roleCode')
+        this.getOrderList()
+        this.getOperationRecord()
+        
+        this.getPlantformInfo()
+        this.getidentity()
+    },
+    beforeDestroy(){
+        clearInterval(this.TimerObj)
+    },
+    filters:{
+        handleOrderStatus(val){
+            let text
+            switch (val) {
+                case 0:
+                    text='待接单'
+                    break;
+                case 1:
+                    text='制作中'
+                    break;
+                case 2:
+                    text='已驳回'
+                    break;
+                case 3:
+                    text='已完成'
+                    break;
+                case -1:
+                    text='已撤回'
+                    break;
+            
+                default:
+                    text='出错'
+                    break;
+            }
+            return text
+        }
+    },
+    
+}
+
+</script>
+
+<style lang="scss" scoped>
+.workBench{
+    ul,li{
+        margin: 0;
+        padding: 0;
+    }
+    width: 100%;
+    .topBody{
+        width: 100%;
+        height: 146px;
+        background: #FFFFFF;
+        margin-bottom: 12px;
+        padding: 20px;
+        box-sizing: border-box;
+        .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;
+                margin-right: 20px;
+                border-radius: 50%;
+                overflow: hidden;
+                img{
+                    width: 100%;
+                    height: 100%;
+                    border-radius: 50%;
+                }
+            }
+            .tip{
+                .greet{
+                    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;
+            }
+        }
+
+    }
+    .section{
+        .sectionBody{
+            display: flex;
+            .sectionHead{
+                padding: 15px 20px;
+                // height: 24px;
+                font-size: 16px;
+                font-family: PingFangSC-Medium, PingFang SC;
+                font-weight: 500;
+                color: rgba(0, 0, 0, 0.85);
+                line-height: 24px;
+                border-bottom: 1px solid  #E9E9E9;;
+                position: relative;
+                .allOrder{
+                    position: absolute;
+                    right: 5px;
+                }
+            }
+            .sectionLeftBox{
+                width: 70%;
+               
+                .leftTop{
+                    overflow: hidden;
+                    background: white;
+                }
+                .zhanshiBox{
+                    display: flex;
+                    flex-wrap: wrap;
+                    .item{
+                        width: 33.33%;
+                        // background: brown;
+                        padding: 20px ;
+                        border-right: 1px solid #E9E9E9;
+                        border-bottom: 1px solid #E9E9E9;
+                        .title{
+                            padding-bottom: 34px;
+                            color: #000000;
+                            .iconImg{
+                                width: 24px;
+                                margin-right: 8px;
+                            }
+                        }
+                        .itemBody{
+                            text-align: center;
+                            .count{
+                                
+                                font-size: 24px;
+                                font-family: PingFangSC-Medium, PingFang SC;
+                                font-weight: 500;
+                                color: #000000;
+                                line-height: 32px;
+                                cursor: pointer;
+                                span{
+                                    font-size: 16px;
+                                    cursor: pointer;
+                                }
+                            }
+                            .count:hover{                                
+                                color: #1890FF;
+                            }
+                        }
+                    }
+                    .item:nth-child(3n){
+                        border-right: 0;
+                    }
+                }
+                .leftBottom{
+                    margin-top: 12px;
+                    background: white;
+                    .orderProgress{
+                        padding: 0 20px;
+                        height: 585px;
+                        position: relative;
+                        .orderProgress-list-item{
+                            padding: 10px 0;
+                            display: flex;
+                            align-items: center;
+                            border-bottom: 1px solid  #E9E9E9;;
+                            justify-content:space-between;
+                            cursor: pointer;
+                            .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;
+                            position: absolute;
+                            right: 20px;
+                            bottom: 0px;
+                        }
+                    }
+                }
+            }
+            .sectionRightBox{
+                width: 29.5%;
+                background: white;
+                margin-left: 12px;
+                height: 1023px;
+                .rightTop{
+                  
+                     .optionRecordList{
+                         margin: 20px;
+                         padding: 10px 0;
+                         box-sizing: border-box;
+                          height: 928px;
+                        //  overflow: auto;
+                        overflow: hidden;
+                        position: relative;
+                         p{
+                             width: 100%;
+                         }
+                        .content-item{
+                            width: 70%;
+                            display: inline-block;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                        }
+                        .time{
+                            width: 30%;
+                            display: inline-block;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                            text-align: right;
+                        }
+                     }
+                }
+                .rightBottom{
+                    margin-top: 12px;
+                     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>

文件差异内容过多而无法显示
+ 2153 - 0
src/views/modules/autoLaunch/materialAndBid.vue


+ 8 - 8
src/views/modules/autoLaunch/setDirectional.vue

@@ -1359,14 +1359,14 @@ export default {
         // 验证网址
         // 验证网址
         IsURL(res) {
         IsURL(res) {
         //   var strRegex = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/|www\.)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/
         //   var strRegex = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/|www\.)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/
-        var strRegex = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+(.+[A-Za-z0-9-~\/])+$/
-        var re = new RegExp(strRegex)
-        // console.log(re.test(res))
-        if (re.test(res)) {
-            return true
-        } else {
-            return false
-        }
+            var strRegex = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+(.+[A-Za-z0-9-~\/])+$/
+            var re = new RegExp(strRegex)
+            // console.log(re.test(res))
+            if (re.test(res)) {
+                return true
+            } else {
+                return false
+            }
         },
         },
         validateURL(rule, value, callback) {
         validateURL(rule, value, callback) {
         // console.log(rule, value, callback);
         // console.log(rule, value, callback);

+ 9 - 3
src/views/modules/autoLaunch/strategyList.vue

@@ -162,6 +162,8 @@
                     </span>
                     </span>
                     <span slot="operator" slot-scope="text,record">
                     <span slot="operator" slot-scope="text,record">
                         <a href="javascript:;"  @click="goPlanList(record)">详情</a>
                         <a href="javascript:;"  @click="goPlanList(record)">详情</a>
+                        <a-divider type="vertical" />
+                        <a href="javascript:;"  @click="goAnalysis(record)">数据分析</a>
                     </span>
                     </span>
                     <span slot="scenes" slot-scope="text">
                     <span slot="scenes" slot-scope="text">
                         <span>{{text|scensFilter}}</span>
                         <span>{{text|scensFilter}}</span>
@@ -304,7 +306,7 @@ const strategyColumns = [
     key: 'id',
     key: 'id',
     align: 'center',
     align: 'center',
     scopedSlots: { customRender: 'id' },
     scopedSlots: { customRender: 'id' },
-    width:100,
+    width:110,
     fixed: 'left' ,
     fixed: 'left' ,
   },
   },
   
   
@@ -314,7 +316,7 @@ const strategyColumns = [
     key: 'operator',
     key: 'operator',
     align: 'center',
     align: 'center',
     scopedSlots: { customRender: 'operator' },
     scopedSlots: { customRender: 'operator' },
-    width:100,
+    width:150,
     fixed: 'left' ,
     fixed: 'left' ,
   },
   },
   {
   {
@@ -605,7 +607,11 @@ export default {
             this.$parent.currentStrategyId=record.id;
             this.$parent.currentStrategyId=record.id;
             this.$parent.currentTabComponent='planList'
             this.$parent.currentTabComponent='planList'
         },
         },
-
+        goAnalysis(record){
+            console.log(record)
+            localStorage.setItem('currentStrategy',JSON.stringify(record))
+            this.$router.push('/autoLaunch/autoLaunchReport')
+        },
         filterOption(input, option) {
         filterOption(input, option) {
             return (
             return (
                 option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
                 option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

+ 13 - 94
src/views/modules/earlyWarningRules/ruleModule.vue

@@ -72,6 +72,7 @@
                         v-model="value.threshold"
                         v-model="value.threshold"
                         style="width: 300px; margin-right: 5px"
                         style="width: 300px; margin-right: 5px"
                         v-else-if="value.modelType == 'text'"
                         v-else-if="value.modelType == 'text'"
+                        @change="inputChange(value)"
                       />
                       />
                       <selectGroup
                       <selectGroup
                         :disabled="!editShow"
                         :disabled="!editShow"
@@ -358,7 +359,7 @@
                                     }"
                                     }"
                                     v-else-if="value.modelType == 'text'"
                                     v-else-if="value.modelType == 'text'"
                                   >
                                   >
-                                    <a-input :disabled="!editShow" v-model="value.threshold" style="width: 95%" />
+                                    <a-input :disabled="!editShow" v-model="value.threshold" style="width: 95%"  @change='inputChange'/>
                                   </a-form-model-item>
                                   </a-form-model-item>
                                   <a-form-model-item
                                   <a-form-model-item
                                     :label-col="{ span: 6 }"
                                     :label-col="{ span: 6 }"
@@ -783,6 +784,12 @@ export default {
     },
     },
   },
   },
   methods: {
   methods: {
+    inputChange(value){
+      
+      
+      value.threshold=value.threshold.trim()
+      console.log(value);
+    },
     addData(valueElse, value, index) {
     addData(valueElse, value, index) {
       // alert(1)
       // alert(1)
       if (index == 0) {
       if (index == 0) {
@@ -801,17 +808,7 @@ export default {
     disabledDate(current) {
     disabledDate(current) {
       return current && current < moment().subtract(1, 'days')
       return current && current < moment().subtract(1, 'days')
     },
     },
-    // 应用方式改变
-    applyRangeChange(e) {
-      this.checkedList = []
-      this.checkAll = false
-      this.indeterminate = false
-      if (e.target.value == 'ACCORDINGTO_STATUS') {
-        this.form.appStatus = '1'
-      } else {
-        this.form.appStatus = null
-      }
-    },
+    
     // 获取计划列表
     // 获取计划列表
     getCampaignList() {
     getCampaignList() {
       getAction('/kuaishou/batch/getCampaignList', {
       getAction('/kuaishou/batch/getCampaignList', {
@@ -873,26 +870,7 @@ export default {
       }
       }
     },
     },
 
 
-    handleChange(value) {
-      let rulesList = {}
-      rulesList = this.rulesFieldList.filter((item) => {
-        return item.metricValueCode == value
-      })[0]
-      this.rulesList = []
-      rulesList.childs.forEach((ele, index) => {
-        this.rulesList.push({
-          metricValueName: ele.metricValueName,
-          metricValueCode: ele.metricValueCode,
-          dataRange: 'CURRENT_DAY_DATA',
-          judgeMethod: 'GT_EQ',
-          judgeType: 'MONEY',
-          threshold: undefined,
-          minThreshold: undefined,
-          campaignStatus: undefined,
-          unitStatus: undefined,
-        })
-      })
-    },
+    
 
 
     filterOption(input, option) {
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -912,72 +890,13 @@ export default {
     resetForm() {
     resetForm() {
       this.$refs.ruleForm.resetFields()
       this.$refs.ruleForm.resetFields()
     },
     },
-    addRule() {
-      this.rulesList.push({
-        metricValueName: ['0', 'COST'],
-        dataRange: 'CURRENT_DAY_DATA',
-        judgeMethod: 'GT_EQ',
-        judgeType: 'MONEY',
-        budgetMultiple: 0.5,
-        budgetMultipleMin: 0.5,
-        budgetMultipleMax: 0.8,
-        campaignStatus: undefined,
-        unitStatus: undefined,
-        threshold: 0,
-        maxNumber: 0,
-      })
-    },
-    deleteRulesListItem(item, index) {
-      console.log(item, index)
-      this.rulesList = this.rulesList.filter((ele, ind) => {
-        return ind != index
-      })
-    },
+   
     displayRender({ labels }) {
     displayRender({ labels }) {
       return labels[labels.length - 1]
       return labels[labels.length - 1]
     },
     },
-    conditionChange(item) {
-      console.log(item)
-      if (item.metricValueName[1] == 'COST') {
-        item.judgeType = 'MONEY'
-      } else {
-        item.judgeType = undefined
-      }
-      item.specificMoney = undefined
-      item.specificMoneyMin = undefined
-      item.specificMoneyMax = undefined
-      item.threshold = undefined
-      item.maxNumber = undefined
-      item.campaignStatus = undefined
-      item.unitStatus = undefined
-    },
-
-    applyObjChange(e) {
-      // console.log(e.target.value)
-      this.plainOptions = []
-      this.checkedList = []
-      this.checkAll = false
-      this.indeterminate = false
-      if (e.target.value == 'ACCOUNT') {
-        this.form.processMethod = 'SEND'
-        this.rulesFieldList = this.accountFieldList
-      } else if (e.target.value == 'CAMPAIGN') {
-        this.rulesFieldList = this.campaignFieldList
-      } else if (e.target.value == 'UNIT') {
-        this.rulesFieldList = this.unitFieldList
-      }
+    
 
 
-      if (this.form.applyAccount) {
-        if (e.target.value == 'CAMPAIGN') {
-          this.spinning = true
-          this.getCampaignList()
-        } else if (e.target.value == 'UNIT') {
-          this.spinning = true
-          this.getCampaignList()
-          this.getUnitList()
-        }
-      }
-    },
+    
 
 
     saveHandler() {
     saveHandler() {
       this.$refs.ruleForm.validate((valid) => {
       this.$refs.ruleForm.validate((valid) => {

+ 1 - 0
src/views/modules/earlyWarningRules/useRuleList.vue

@@ -314,6 +314,7 @@ export default {
                   localStorage.setItem('getRuleDetail', JSON.stringify(data))
                   localStorage.setItem('getRuleDetail', JSON.stringify(data))
                   this.$router.push('/earlyWarningRules/ruleModule')
                   this.$router.push('/earlyWarningRules/ruleModule')
                   this.confirmLoading = false
                   this.confirmLoading = false
+                  this.accountId=undefined
                 }else{
                 }else{
                   this.$message.error(r.message)
                   this.$message.error(r.message)
                 }
                 }

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

@@ -574,8 +574,9 @@
                             >
                             >
                                 <a-form :form="form" :label-col="labelCol" :wrapper-col="wrapperCol">
                                 <a-form :form="form" :label-col="labelCol" :wrapper-col="wrapperCol">
                                     <a-form-item label="视频上传">
                                     <a-form-item label="视频上传">
+                                        <!-- :checkFile="file" -->
                                         <uploadFile
                                         <uploadFile
-                                            :checkFile="file"
+                                            
                                             :value.sync="urlList.url"
                                             :value.sync="urlList.url"
                                             @overUpload="overUpload"
                                             @overUpload="overUpload"
                                             @removeUpload="removeUpload"
                                             @removeUpload="removeUpload"
@@ -785,8 +786,8 @@
                                         
                                         
                                         <span v-else>暂无封面</span>
                                         <span v-else>暂无封面</span>
                                     </div>
                                     </div>
-                                     
-                                    <img :src="defaultPic" alt=""  style="width:100px;margin:0 10px 8px 0" v-else>                              
+                                     <span v-else>暂无封面</span>
+                                    <!-- <img :src="defaultPic" alt=""  style="width:100px;margin:0 10px 8px 0" v-else>                               -->
                                 </div>
                                 </div>
                             </div>
                             </div>
                             
                             
@@ -966,6 +967,16 @@
                         <a-button key="back" @click="()=>{videoRejectVisiable=false}">取消</a-button>
                         <a-button key="back" @click="()=>{videoRejectVisiable=false}">取消</a-button>
                         <a-button type="primary"  @click="reject" :loading="loadingElse">确定驳回</a-button>
                         <a-button type="primary"  @click="reject" :loading="loadingElse">确定驳回</a-button>
                     </template>
                     </template>
+                    <!-- <div>
+                        <span>驳回类型:</span>
+                        <a-radio-group v-model="videoRejectType" >
+                            <a-radio-button value="video">视频不合格</a-radio-button>
+                            <a-radio-button value="image">封面不合格</a-radio-button>
+                            <a-radio-button value="tag">标签不合格</a-radio-button>
+                           
+                        </a-radio-group>
+                    </div> -->
+                    
                    <a-textarea
                    <a-textarea
                     v-model="videoAdvise"
                     v-model="videoAdvise"
                     placeholder="请填写驳回理由"
                     placeholder="请填写驳回理由"
@@ -973,7 +984,7 @@
                     />
                     />
                 </a-modal>
                 </a-modal>
                 <a-modal v-model="scriptRejectVisiable" title="脚本驳回"  width='600px'>
                 <a-modal v-model="scriptRejectVisiable" title="脚本驳回"  width='600px'>
-                     <template slot="footer">
+                    <template slot="footer">
                         <a-button key="back" @click="()=>{scriptRejectVisiable=false}">取消</a-button>
                         <a-button key="back" @click="()=>{scriptRejectVisiable=false}">取消</a-button>
                         <a-button type="primary"  @click="scriptReject" :loading="loadingElse">确定驳回</a-button>
                         <a-button type="primary"  @click="scriptReject" :loading="loadingElse">确定驳回</a-button>
                     </template>
                     </template>
@@ -1125,6 +1136,7 @@ export default {
     },
     },
     data() {
     data() {
         return {
         return {
+            videoRejectType:'1',
             assignVisibleLoading:false,
             assignVisibleLoading:false,
             visibleLoading:false,
             visibleLoading:false,
              rules: {
              rules: {
@@ -1507,8 +1519,10 @@ export default {
             console.log(record)
             console.log(record)
             this.currentMaterial=record
             this.currentMaterial=record
             this.currentScript={};
             this.currentScript={};
+            
             if(record.scriptId){
             if(record.scriptId){
-                this.visibleLoading=true;       
+                this.visibleLoading=true; 
+                this.scriptVisible = true;      
                 getAction(this.url.scriptDetail,{
                 getAction(this.url.scriptDetail,{
                     scriptId:record.scriptId
                     scriptId:record.scriptId
                 }).then(res=>{
                 }).then(res=>{
@@ -1516,7 +1530,7 @@ export default {
                     this.visibleLoading=false;       
                     this.visibleLoading=false;       
                     if(res.success){
                     if(res.success){
                         this.currentScript=res.result;
                         this.currentScript=res.result;
-                        this.scriptVisible = true;
+                        
                     }else{
                     }else{
                         this.currentScript={};
                         this.currentScript={};
                     }
                     }

+ 2 - 2
vue.config.js

@@ -78,13 +78,13 @@ module.exports = {
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193: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: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
         // target:'http://118.24.244.213:8804',
-        // target:'http://139.186.151.174:8804', //测试
+        target:'http://139.186.151.174:8804', //测试
 
 
 
 
         ws: false,
         ws: false,