瀏覽代碼

提交测试

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

+ 1 - 3
package.json

@@ -12,13 +12,11 @@
   "dependencies": {
     "@antv/data-set": "^0.10.2",
     "@femessage/upload-to-ali": "^1.8.1",
-    "@jeecg/antd-online-beta220": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
     "@tinymce/tinymce-vue": "^2.0.0",
     "ali-oss": "^6.1.1",
     "ant-design-vue": "^1.3.9",
     "apexcharts": "^3.6.5",
-    "area-data": "^5.0.6",
     "axios": "^0.18.0",
     "babel-loader": "^8.0.6",
     "blueimp-md5": "^2.11.0",
@@ -133,4 +131,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}

+ 3 - 2
src/views/modules/workBench/materialList.vue

@@ -756,7 +756,7 @@
                                 <a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
                                 </a-select>
                             </a-form-model-item>
-                            <a-form-model-item  label="拍摄"  ref="shot"  prop="shot">
+                            <a-form-model-item  label="拍摄"  ref="shot"  prop="shot" :rules='[{ required: currentMaterial.materialType==1, message: "拍摄人员必须指派" ,trigger: "change" }]'>
                                 <a-select
                                     
                                     v-model="formPerson.shot"
@@ -1426,7 +1426,8 @@ export default {
         beforeUpload(file) {
 
             // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
             const fileName = file.name

+ 111 - 61
src/views/modules/workBench/operator/materialList.vue

@@ -499,7 +499,7 @@
                             </div>
                                                        
                             <div class="scriptbottom-btn">
-                                <a-button type='primary' @click="scriptApproved" v-if="currentMaterial.materialStatus==2" style="margin-right:20px" >通过审核</a-button>
+                                <a-button type='primary' @click="scriptApproved" v-if="currentMaterial.materialStatus==2" :loading='acceptLoading' style="margin-right:20px" >通过审核</a-button>
                                
                                 <a-button type='default' v-if="currentMaterial.materialStatus==2" @click="()=>{scriptRejectVisiable=true}"  style="margin-right:20px">驳回</a-button>
                                 
@@ -809,95 +809,145 @@ export default {
 
         // 脚本通过审核
         scriptApproved(){
-            postAction(this.url.scriptAccept,{
-                id:this.currentMaterial.materialId,
-                orderCode:this.currentMaterial.orderCode,
-                materialCode:this.currentMaterial.materialCode
+            this.acceptLoading=true;
+            getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
             }).then(res=>{
-                console.log(res);
-
-                this.scriptVisible=false;
                 if(res.success){
-                    this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    postAction(this.url.scriptAccept,{
+                        id:this.currentMaterial.materialId,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false;
+                        this.scriptVisible=false;
+                        if(res.success){
+                            
+                            this.$message.success(res.message);
+                            this.tableHttp(this.$parent.materialStatus)
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
+                    this.acceptLoading=false;
+                    this.scriptVisible=false;
+                    this.tableHttp(this.$parent.materialStatus)
                     this.$message.error(res.message)
                 }
             })
+            
         },
         // 脚本驳回
         scriptReject(){
             this.loadingElse=true
-            if(this.scriptAdvise){
-                postAction(this.url.scriptReject,{
-                    id:this.currentMaterial.materialId,
-                    scriptAdvise:this.scriptAdvise,
-                    materialCode:this.currentMaterial.materialCode
-                }).then(res=>{
-                    console.log(res);
-                    this.scriptAdvise=''
-                    this.scriptVisible=false;
-                    this.loadingElse=false;
-                    this.scriptRejectVisiable=false
-                    if(res.success){
-                        this.$message.success(res.message);
-                        this.tableHttp(this.$parent.materialStatus)
+             getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
+            }).then(res=>{
+                if(res.success){
+                    if(this.scriptAdvise){
+                        postAction(this.url.scriptReject,{
+                            id:this.currentMaterial.materialId,
+                            scriptAdvise:this.scriptAdvise,
+                            materialCode:this.currentMaterial.materialCode
+                        }).then(res=>{
+                            console.log(res);
+                            this.scriptAdvise=''
+                            this.scriptVisible=false;
+                            this.loadingElse=false;
+                            this.scriptRejectVisiable=false
+                            if(res.success){
+                                this.$message.success(res.message);
+                                this.tableHttp(this.$parent.materialStatus)
+                            }else{
+                                this.$message.error(res.message)
+                            }
+                        })
                     }else{
-                        this.$message.error(res.message)
+                        this.loadingElse=false;
+                        this.$messgae.error('请填写驳回理由')
                     }
-                })
-            }else{
-                this.loadingElse=false;
-                this.$messgae.error('请填写驳回理由')
-            }
-            
+                }else{
+                    this.loadingElse=false;
+                    this.scriptVisible=false;
+                    this.tableHttp(this.$parent.materialStatus)
+                    this.$message.error(res.message)
+                }
+            })
         },
         // 视频通过审核
         approved(){
             this.acceptLoading=true;
-            postAction(this.url.videoAccept,{
-                id:this.currentMaterial.materialId,
-                orderCode:this.currentMaterial.orderCode,
+            getAction('/platform/material/verifyVideo',{
                 materialCode:this.currentMaterial.materialCode,
-                videoId:this.currentVideo.videoId
+                videoId:this.currentMaterial.videoId,
             }).then(res=>{
-                console.log(res);
-                this.acceptLoading=false;
-                this.visible=false;
                 if(res.success){
-                    this.$message.success(res.message);
-                    this.tableHttp(this.$parent.materialStatus)
+                    postAction(this.url.videoAccept,{
+                        id:this.currentMaterial.materialId,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode,
+                        videoId:this.currentVideo.videoId
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false;
+                        this.visible=false;
+                        if(res.success){
+                            this.$message.success(res.message);
+                            this.tableHttp(this.$parent.materialStatus)
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
                     this.$message.error(res.message)
+                    this.acceptLoading=false
+                    this.visible=false;
+                    this.tableHttp(this.$parent.materialStatus)
                 }
             })
+            
         },
         // 视频驳回
         reject(){
             this.loadingElse=true
-            if(this.videoAdvise){
-                postAction(this.url.videoReject,{
-                    id:this.currentMaterial.materialId,
-                    videoAdvise:this.videoAdvise,
-                    materialCode:this.currentMaterial.materialCode
-                }).then(res=>{
-                    console.log(res);
-                    this.videoAdvise='';
-                    this.visible=false;
-                    this.loadingElse=false;
-                    this.videoRejectVisiable=false
-                    if(res.success){
-                        this.$message.success(res.message);
-                        this.tableHttp(this.$parent.materialStatus)
+            getAction('/platform/material/verifyVideo',{
+                materialCode:this.currentMaterial.materialCode,
+                videoId:this.currentMaterial.videoId,
+            }).then(res=>{
+                if(res.success){
+                    if(this.videoAdvise){
+                        postAction(this.url.videoReject,{
+                            id:this.currentMaterial.materialId,
+                            videoAdvise:this.videoAdvise,
+                            materialCode:this.currentMaterial.materialCode
+                        }).then(res=>{
+                            console.log(res);
+                            this.videoAdvise='';
+                            this.visible=false;
+                            this.loadingElse=false;
+                            this.videoRejectVisiable=false
+                            if(res.success){
+                                this.$message.success(res.message);
+                                this.tableHttp(this.$parent.materialStatus)
+                            }else{
+                                this.$message.error(res.message)
+                            }
+                        })
                     }else{
-                        this.$message.error(res.message)
+                        this.loadingElse=false;
+                        this.$message.error('请填写驳回理由')
                     }
-                })
-            }else{
-                this.loadingElse=false;
-                this.$message.error('请填写驳回理由')
-            }
-            
+                }else{
+                    this.$message.error(res.message)
+                    this.loadingElse=false
+                    this.visible=false;
+                    this.tableHttp(this.$parent.materialStatus)
+                }
+            })
         },
         
         search(){

+ 1 - 1
src/views/modules/workBench/operator/platForm.vue

@@ -269,7 +269,7 @@ export default {
                        
                             let time='';
                             let startTime=moment(item.createTime)
-                            console.log(startTime) 
+                            // console.log(startTime) 
                             if(moment().diff(startTime,'hours')>24){
                                 time=item.createTime.split(/[ ]+/)[0]
                                 return {

+ 122 - 72
src/views/modules/workBench/orderDetail.vue

@@ -401,7 +401,7 @@
                             <p class="big">{{ currentOrderInfo.orderStatus | handlerOrderStatus}}</p>
                         </div>
                         <div>
-                            <p class="markName">订单度</p>
+                            <p class="markName">订单完成度</p>
                             <p class="big">{{Math.round((currentOrderInfo.materialFinishAmount/currentOrderInfo.materialAmount)*100)|| 0 }}%</p>
                         </div>
                     </div>
@@ -906,7 +906,7 @@
                             </div>
                                                        
                             <div class="scriptbottom-btn">
-                                <a-button type='primary' @click="scriptApproved" style="margin-right:20px" v-if="role=='operator'&&currentMaterial.materialStatus==2">通过审核</a-button>
+                                <a-button type='primary' @click="scriptApproved" style="margin-right:20px" :loading='acceptLoading' v-if="role=='operator'&&currentMaterial.materialStatus==2">通过审核</a-button>
                                 
                                 <a-button type='default' v-if="role=='operator'&&currentMaterial.materialStatus==2" @click="()=>{scriptRejectVisiable=true}"  style="margin-right:20px">驳回</a-button>
                                 <!-- <a-button type='primary' @click="dowmLoadScript" style="margin-right:20px">下载脚本</a-button> -->
@@ -939,13 +939,14 @@
                                 <a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
                                 </a-select>
                             </a-form-model-item>
-                            <a-form-model-item  label="拍摄"  ref="shot"  prop="shot">
-                                <a-select
-                                    
+                            <!-- {{currentMaterial.materialType==1?true:false}} -->
+                            <a-form-model-item  label="拍摄"  ref="shot"  prop="shot" :rules='[{ required: currentMaterial.materialType==1, message: "拍摄人员必须指派" ,trigger: "change" }]'>
+                                <a-select                                   
                                     v-model="formPerson.shot"
                                     showSearch
                                     optionFilterProp="children"
                                     :filterOption="filterOption"
+                                    
                                 >
                                 <a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
                                 </a-select>
@@ -1130,15 +1131,16 @@ export default {
     },
     data() {
         return {
+            acceptLoading:false,
             videoEchoInfo:{},
             videoUploadLoading:false,
             videoRejectType:'1',
             assignVisibleLoading:false,
             visibleLoading:false,
-             rules: {
+            rules: {
                 
                 clip: [{ required: true, message: '剪辑人员必须指派', trigger: 'change' }],
-                // shot: [{ required: true, message: '拍摄人员必须指派', trigger: 'change' }],
+                // shot: [],
                 plan: [{ required: true, message: '编导人员必须指派', trigger: 'change' }],
                 
             },
@@ -1631,68 +1633,104 @@ export default {
 
         // shipin通过审核
         approved(){
-            postAction(this.url.videoAccept,{
-                id:this.currentMaterial.id,
-                orderCode:this.currentMaterial.orderCode,
+            this.acceptLoading=true;
+            getAction('/platform/material/verifyVideo',{
                 materialCode:this.currentMaterial.materialCode,
-                videoId:this.currentVideo.videoId
+                videoId:this.currentMaterial.videoId,
             }).then(res=>{
-                console.log(res);
-
-                this.visible=false;
-                this.videoAdvise=''
                 if(res.success){
-                    this.$message.success(res.message);
-                    // this.tableHttp(this.$parent.materialStatus)
-                    this.materialHttp()
+                    postAction(this.url.videoAccept,{
+                        id:this.currentMaterial.id,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode,
+                        videoId:this.currentVideo.videoId
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false
+                        this.visible=false;
+                        this.videoAdvise=''
+                        if(res.success){
+                            this.$message.success(res.message);
+                            
+                            this.materialHttp()
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
                     this.$message.error(res.message)
+                    this.acceptLoading=false
+                    this.materialHttp()
                 }
             })
         },
         // 视频驳回
         reject(){   
             this.loadingElse=true;
-            if(this.videoAdvise){
-                postAction(this.url.videoReject,{
-                    id:this.currentMaterial.id,
-                    videoAdvise:this.videoAdvise,
-                    materialCode:this.currentMaterial.materialCode
-                    
-                }).then(res=>{
-                    console.log(res);
-                    this.videoAdvise=''
-                    this.visible=false;
-                    this.videoRejectVisiable=false;
-                    if(res.success){
-                        this.$message.success(res.message);
-                        this.materialHttp()
+            getAction('/platform/material/verifyVideo',{
+                materialCode:this.currentMaterial.materialCode,
+                videoId:this.currentMaterial.videoId,
+            }).then(res=>{
+                if(res.success){
+                    if(this.videoAdvise){
+                        postAction(this.url.videoReject,{
+                            id:this.currentMaterial.id,
+                            videoAdvise:this.videoAdvise,
+                            materialCode:this.currentMaterial.materialCode
+                            
+                        }).then(res=>{
+                            console.log(res);
+                            this.loadingElse=false
+                            this.videoAdvise=''
+                            this.visible=false;
+                            this.videoRejectVisiable=false;
+                            if(res.success){
+                                this.$message.success(res.message);
+                                this.materialHttp()
+                            }else{
+                                this.$message.error(res.message)
+                            }
+                        })
                     }else{
-                        this.$message.error(res.message)
-                    }
-                })
-            }else{
-                this.loadingElse=false;
-                this.$message.error('请填写驳回理由')
-            }        
-            
+                        this.loadingElse=false;
+                        this.$message.error('请填写驳回理由')
+                    }        
+                }else{
+                    this.$message.error(res.message)
+                    this.loadingElse=false
+                    this.materialHttp()
+                }
+            })
 
         },
         // 脚本通过审核
         scriptApproved(){
-            console.log(this.currentMaterial)
-            postAction(this.url.scriptAccept,{
-                id:this.currentMaterial.id,
-                 orderCode:this.currentMaterial.orderCode,
-                 materialCode:this.currentMaterial.materialCode
+            // console.log(this.currentMaterial)
+            this.acceptLoading=true;
+            getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
             }).then(res=>{
-                console.log(res);
-
-                this.scriptVisible=false;
                 if(res.success){
-                    this.$message.success(res.message);
-                    this.materialHttp()
+                    postAction(this.url.scriptAccept,{
+                        id:this.currentMaterial.id,
+                        orderCode:this.currentMaterial.orderCode,
+                        materialCode:this.currentMaterial.materialCode
+                    }).then(res=>{
+                        console.log(res);
+                        this.acceptLoading=false
+                        this.scriptVisible=false;
+                        if(res.success){
+                            this.$message.success(res.message);
+                            this.materialHttp()
+                        }else{
+                            this.$message.error(res.message)
+                        }
+                    })
                 }else{
+                    this.acceptLoading=false;
+                    this.scriptVisible=false;
+                    this.materialHttp()
                     this.$message.error(res.message)
                 }
             })
@@ -1700,30 +1738,41 @@ export default {
         // 脚本驳回
         scriptReject(){
             this.loadingElse=true;
-            if(this.scriptAdvise){
-                postAction(this.url.scriptReject,{
-                    id:this.currentMaterial.id,
-                    scriptAdvise:this.scriptAdvise,
-                    materialCode:this.currentMaterial.materialCode
-                }).then(res=>{
-                    console.log(res);
+            getAction('/platform/material/verifyScript',{
+                materialCode:this.currentMaterial.materialCode,
+                scriptId:this.currentMaterial.scriptId,
+            }).then(res=>{
+                if(res.success){
+                    if(this.scriptAdvise){
+                        postAction(this.url.scriptReject,{
+                            id:this.currentMaterial.id,
+                            scriptAdvise:this.scriptAdvise,
+                            materialCode:this.currentMaterial.materialCode
+                        }).then(res=>{
+                            console.log(res);
 
-                    this.scriptVisible=false;
-                    this.scriptAdvise=''
-                    this.scriptRejectVisiable=false;
-                    this.loadingElse=false;
-                    if(res.success){
-                        this.$message.success(res.message);
-                        this.materialHttp()
+                            this.scriptVisible=false;
+                            this.scriptAdvise=''
+                            this.scriptRejectVisiable=false;
+                            this.loadingElse=false;
+                            if(res.success){
+                                this.$message.success(res.message);
+                                this.materialHttp()
+                            }else{
+                                this.$message.error(res.message)
+                            }
+                        })
                     }else{
-                        this.$message.error(res.message)
+                        this.loadingElse=false;
+                        this.$messgae.error('请填写驳回理由')
                     }
-                })
-            }else{
-                this.loadingElse=false;
-                this.$messgae.error('请填写驳回理由')
-            }
-            
+                }else{
+                    this.loadingElse=false;
+                    this.scriptVisible=false;
+                    this.materialHttp()
+                    this.$message.error(res.message)
+                }
+            })
         },
         // 生成水印
         getWater() {
@@ -1805,7 +1854,8 @@ export default {
 
         beforeUpload(file) {
             // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
 
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)

+ 8 - 4
vue.config.js

@@ -63,7 +63,7 @@ module.exports = {
 
   devServer: {
     hot:true,
-    // inline: true,
+    // inline: true,
     port: 3000,
     open : true,
     proxy: {
@@ -77,10 +77,14 @@ module.exports = {
         // target: 'http://192.168.1.43:8087', //请求本地 需要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.193:8088', //请求本地 需要jeecg-boot后台项目  李煜一
-        target: 'http://api.tjyourong.com.cn',
+        // target: 'http://192.168.1.193:8080', //请求本地 需要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://139.186.151.174:8804', //测试
+        //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
+        // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
+        // target:'http://118.24.244.213:8804',
+        target:'http://139.186.151.174:8804', //测试
 
 
         ws: false,