فهرست منبع

'下单制改视频上传'

魏志佳 4 سال پیش
والد
کامیت
2ca65a2ab9

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

@@ -100,7 +100,7 @@
                                             <span class="item-icon"></span>
                                             <div class="content">
                                                 <p class="name">{{item.orderTitle}}</p>
-                                                <p class="desc">{{item.orderRemark}}</p>
+                                                <p class="desc">{{item.orderRemark || '-'}}</p>
                                             </div>
                                         </div>
                                         

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

@@ -80,7 +80,7 @@
                                             <span class="item-icon"></span>
                                             <div class="content">
                                                 <p class="name">{{item.orderTitle}}</p>
-                                                <p class="desc">{{item.orderRemark}}</p>
+                                                <p class="desc">{{item.orderRemark || '-'}}</p>
                                             </div>
                                         </div>
                                         

+ 48 - 8
src/views/modules/workBench/materialList.vue

@@ -235,11 +235,11 @@
 }
 .videomarterialInfo{
     position: relative;
-    height: 800px;
+    // height: 800px;
 }
 .marterialInfo{
     overflow: auto;   
-    height: 800px;
+    // height: 800px;
     position: relative;
     p{margin-bottom: 0;}
     ul,li{
@@ -430,11 +430,12 @@
                                             :value.sync="urlList.url"
                                             @overUpload="overUpload"
                                             @removeUpload="removeUpload"
-                                            :fileCount="10"
+                                            :fileCount="1"
                                             uploadType="video"
                                             :multiple="false"
                                         />
                                         <span v-if="repeat" style="color: red">此素材重复,请重新选择上传</span>
+                                        {{urlList.url }}
                                         <span v-if="confirmLoading && urlList.url != ''" style="color: green">上传成功</span>
                                     </a-form-item>
                                     
@@ -637,14 +638,30 @@
                                 <p>{{ currentVideo.videoAdvise }}</p>
                             </div>
                             <!-- <div class="info-item btnBody"> -->
-                                <div class="bottom-btn">
+                                <!-- <div class="bottom-btn">
                                     <a-button type='primary' v-if="currentVideo.videoStatus>=1" @click="modifyVideo"  :disabled="!(currentVideo.clip==userInfo.id)" style="margin-right:20px">修改视频信息</a-button>
                                     <a-button type='default' @click="onClose">关闭</a-button>
-                                </div>
+                                </div> -->
                             <!-- </div> -->
                             
                         </div>
                         </a-spin>
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='primary' v-if="currentVideo.videoStatus>=1" @click="modifyVideo"  :disabled="!(currentVideo.clip==userInfo.id)" style="margin-right:20px">修改视频信息</a-button>
+                            <a-button type='default' @click="onClose">关闭</a-button>
+                        </div>    
                     </a-drawer>
                     
 
@@ -656,7 +673,7 @@
                     :visible="scriptVisible"
                     @close="scriptClose"
                     >
-                        
+                        <a-spin :spinning="visibleLoading">
                         <div class="marterialInfo">
                             <div class="info-item">
                                 <span>脚本状态:</span>
@@ -728,11 +745,27 @@
                                 
                             </div>
                                                        
-                            <div class="scriptbottom-btn">
+                            <!-- <div class="scriptbottom-btn">
  
                                 <a-button type='default' @click="scriptClose">关闭</a-button>
-                            </div>
+                            </div> -->
                         </div>
+                        </a-spin>  
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='default' @click="scriptClose">关闭</a-button>
+                        </div>    
                     </a-drawer>
 
 
@@ -1339,10 +1372,12 @@ export default {
             this.currentMaterial=record
             this.currentScript={};
             if(record.scriptId){
+                this.visibleLoading=true 
                 getAction(this.url.scriptDetail,{
                     scriptId:record.scriptId
                 }).then(res=>{
                     console.log(res);
+                    this.visibleLoading=false
                     if(res.success){
                         this.currentScript=res.result;
                         this.scriptVisible = true;
@@ -1414,6 +1449,7 @@ export default {
            
         },
 
+
         handlerParamsRole(role){
             if(this.$parent.role=='operator'){
                 this.panes=this.operatorPanes
@@ -1579,6 +1615,10 @@ export default {
 
         // 上传视频相关方法
         removeUpload() {
+            this.urlList.url='';
+            this.urlList.md5='';
+            this.urlList.name='';
+           
             this.form.setFieldsValue({
                 contentTagList: null,
                 modalityTagList: null,

+ 46 - 9
src/views/modules/workBench/operator/materialList.vue

@@ -236,11 +236,11 @@
 }
 .videomarterialInfo{
     position: relative;
-    height: 800px;
+    // height: 800px;
 }
 .marterialInfo{
     overflow: auto;
-    height: 800px;
+    // height: 800px;
     position: relative;
     p{margin-bottom: 0;}
     ul,li{
@@ -449,16 +449,34 @@
                                 <p>{{ currentVideo.videoAdvise }}</p>
                             </div>
                             
-                            <div class="bottom-btn">
+                            <!-- <div class="bottom-btn">
                                 <a-button type='primary' @click="approved" v-if="currentMaterial.materialStatus==5" :loading='acceptLoading' style="margin-right:20px">通过审核</a-button>                               
                                 <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="currentMaterial.materialStatus==5"  style="margin-right:20px">驳回</a-button>
                                                             
                                 <a-button type='default' @click="onClose">关闭</a-button>
-                            </div>
+                            </div> -->
                             
                         
                         </div>
-                        </a-spin>   
+                        </a-spin>
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='primary' @click="approved" v-if="currentMaterial.materialStatus==5" :loading='acceptLoading' style="margin-right:20px">通过审核</a-button>                               
+                                <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="currentMaterial.materialStatus==5"  style="margin-right:20px">驳回</a-button>
+                                                            
+                                <a-button type='default' @click="onClose">关闭</a-button>
+                        </div>   
                     </a-drawer>
                     <a-drawer
                     title="脚本详情"
@@ -499,14 +517,33 @@
                             </div>
                                                        
                             <div class="scriptbottom-btn">
-                                <a-button type='primary' @click="scriptApproved" v-if="currentMaterial.materialStatus==2" :loading='acceptLoading' 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>
                                 
-                                <a-button type='default' @click="scriptClose">关闭</a-button>
+                                <a-button type='default' @click="scriptClose">关闭</a-button> -->
                             </div>
                         </div>
-                        </a-spin>   
+                        </a-spin>
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <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>
+                                
+                                <a-button type='default' @click="scriptClose">关闭</a-button>
+                        </div>    
                     </a-drawer>
 
                     <!-- bohui -->
@@ -876,7 +913,7 @@ export default {
                         })
                     }else{
                         this.loadingElse=false;
-                        this.$messgae.error('请填写驳回理由')
+                        this.$message.error('请填写驳回理由')
                     }
                 }else{
                     this.loadingElse=false;

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

@@ -93,7 +93,7 @@
                                             <span class="item-icon"></span>
                                             <div class="content">
                                                 <p class="name">{{item.orderTitle}}</p>
-                                                <p class="desc">{{item.orderRemark}}</p>
+                                                <p class="desc">{{item.orderRemark|| '-'}}</p>
                                             </div>
                                         </div>
                                         

+ 46 - 11
src/views/modules/workBench/orderDetail.vue

@@ -238,11 +238,11 @@
 }
 .videomarterialInfo{
     position: relative;
-    height: 800px;
+    // height: 800px;
 }
 .marterialInfo{
     overflow: auto;
-     height: 800px;
+    //  height: 800px;
     position: relative;
     p{margin-bottom: 0;}
     ul,li{
@@ -790,13 +790,32 @@
                                 <p>{{ currentVideo.videoAdvise }}</p>
                             </div>
                             <div class="bottom-btn">
-                                <a-button type='primary' @click="approved" v-if="role=='operator'&&currentMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
+                                <!-- <a-button type='primary' @click="approved" v-if="role=='operator'&&currentMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
                                 <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="role=='operator'&&currentMaterial.materialStatus==5"  style="margin-right:20px">驳回</a-button>            
                                  <a-button type='primary' v-if="role!='operator'&&currentVideo.videoStatus>=1" :disabled="currentVideo.clip!=userInfo.id" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>                                                   
-                                <a-button type='default' @click="onClose">关闭</a-button>
+                                <a-button type='default' @click="onClose">关闭</a-button> -->
                             </div>
                         </div>
+                        
                         </a-spin>   
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <a-button type='primary' @click="approved" v-if="role=='operator'&&currentMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
+                            <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="role=='operator'&&currentMaterial.materialStatus==5"  style="margin-right:20px">驳回</a-button>            
+                                <a-button type='primary' v-if="role!='operator'&&currentVideo.videoStatus>=1" :disabled="currentVideo.clip!=userInfo.id" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>                                                   
+                            <a-button type='default' @click="onClose">关闭</a-button>
+                        </div>
                     </a-drawer>
                     
 
@@ -879,16 +898,28 @@
                                 </div>
                                 
                             </div>
-                                                       
-                            <div class="scriptbottom-btn">
-                                <a-button type='primary' @click="scriptApproved" style="margin-right:20px" :loading='acceptLoading' v-if="role=='operator'&&currentMaterial.materialStatus==2">通过审核</a-button>
+                        </div>
+                        
+                        </a-spin>  
+                        <div
+                            :style="{
+                            position: 'absolute',
+                            right: 0,
+                            bottom: 0,
+                            width: '100%',
+                            borderTop: '1px solid #e9e9e9',
+                            padding: '10px 16px',
+                            background: '#fff',
+                            textAlign: 'right',
+                            zIndex: 1,
+                            }"
+                        >
+                            <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> -->
                                 <a-button type='default' @click="scriptClose">关闭</a-button>
-                            </div>
-                        </div>
-                        </a-spin>   
+                        </div> 
                     </a-drawer>
                     
                 </div>
@@ -1752,7 +1783,7 @@ export default {
                         })
                     }else{
                         this.loadingElse=false;
-                        this.$messgae.error('请填写驳回理由')
+                        this.$message.error('请填写驳回理由')
                     }
                 }else{
                     this.loadingElse=false;
@@ -2065,6 +2096,10 @@ export default {
 
         // 上传视频相关方法
         removeUpload() {
+            this.urlList.url='';
+            this.urlList.md5='';
+            this.urlList.name='';
+           
             this.form.setFieldsValue({
                 contentTagList: null,
                 modalityTagList: null,

+ 0 - 2
vue.config.js

@@ -85,8 +85,6 @@ module.exports = {
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
         target:'http://139.186.151.174:8804', //测试
-        
-
 
         ws: false,