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

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

@@ -239,6 +239,8 @@
 }
 .marterialInfo{
     overflow: auto;   
+    height: 800px;
+    position: relative;
     p{margin-bottom: 0;}
     ul,li{
         margin: 0;
@@ -294,7 +296,7 @@
         line-height: 60px;   
         text-align: center;
         position: absolute;
-        bottom: 20px;
+        bottom: 0px;
         left: 0;
        
     }
@@ -410,7 +412,7 @@
                     @close="onClose"
                     >
                         
-                            
+                        <a-spin :spinning="visibleLoading">   
                             <a-drawer
                                 :title="add ? '上传视频' : '修改视频'"
                                 width="600"
@@ -577,7 +579,7 @@
                                 
                                 </div>
                             </a-drawer>
-                            
+                         
                         
                         <div class="marterialInfo videomarterialInfo">
                             <div class="info-item">
@@ -599,7 +601,10 @@
                                 <span>封面预览:</span>
                                 <div class="imgBox">
                                     <div v-if="currentVideo.videoStatus!=0">
-                                        <img  alt="" style="width:100px;margin:0 10px 8px 0" v-for="(item,index) in currentVideo.imgList" :key='index' :src="item"> 
+                                        <template v-if="currentVideo.imgList&&currentVideo.imgList.length">
+                                            <img  alt="" style="width:100px;margin:0 10px 8px 0" v-for="(item,index) in currentVideo.imgList"  :key='index' :src="item"> 
+                                        </template>
+                                        <span v-else>暂无封面</span>
                                     </div>
                                      
                                     <!-- <img :src="defaultPic" alt=""  style="width:100px;margin:0 10px 8px 0" v-else>                               -->
@@ -634,6 +639,7 @@
                             <!-- </div> -->
                             
                         </div>
+                        </a-spin>
                     </a-drawer>
                     
 
@@ -785,6 +791,7 @@ import uploadFile from '@/components/uploadFile.vue'
 import { closeAllVideoFun, stopOtherVideo } from '@/utils/videoControl'
 import UploadToAli from '@femessage/upload-to-ali'
 import { mapGetters } from 'vuex'
+import TrendVue from '../../../components/Trend/Trend.vue';
 const fileSuffix = [
   'xls',
   'xlt',
@@ -904,6 +911,8 @@ export default {
             
         ]
         return {
+            visibleLoading:false,
+
             loadingElse2:false,
              rules: {
                 
@@ -1212,16 +1221,21 @@ export default {
             console.log(record)
              this.currentMaterial=record
             if(record.materialStatus>=4){              
-                this.currentVideo={};                
+                this.currentVideo={};
+                this.visible = true;   
+                            
                 if(record.videoId){
+                    this.visibleLoading=true 
                     getAction(this.url.videoDetail,{
                         videoId:record.videoId
                     }).then(res=>{
                         console.log(res);
+                         this.visibleLoading=false
                         if(res.success){
                             if(res.result){
-                                let tagList=res.result.tag.split(',')
-                                let imgList=res.result.imageUrl.split(',')
+                                
+                                let tagList=res.result.tag?res.result.tag.split(','):[]
+                                let imgList=res.result.imageUrl?res.result.imageUrl.split(','):[]
                                 console.log(tagList)
                                 this.currentVideo={
                                     ...res.result,
@@ -1230,7 +1244,7 @@ export default {
                                 }
                             }
                             
-                            this.visible = true;
+                            
                         }else{
                             this.currentVideo={};
                         }

+ 26 - 12
src/views/modules/workBench/operator/materialList.vue

@@ -240,7 +240,8 @@
 }
 .marterialInfo{
     overflow: auto;
-    
+    height: 800px;
+    position: relative;
     p{margin-bottom: 0;}
     ul,li{
         margin: 0;
@@ -295,7 +296,7 @@
         line-height: 60px;   
         text-align: center;
         position: absolute;
-        bottom: 20px;
+        bottom: 0px;
         left: 0;
        
     }
@@ -405,8 +406,9 @@
                     :visible="visible"
                     @close="onClose"
                     >
-
+                        <a-spin :spinning="visibleLoading">
                         <div class="marterialInfo videomarterialInfo">
+                            
                             <div class="info-item">
                                 <span>视频状态:</span>
                                 <p>{{ currentVideo.videoStatus | handlerVideoStatus }}</p>
@@ -420,9 +422,12 @@
                             </div>
                             <div class="info-item">
                                 <span>封面预览:</span>
-                                <div class="imgBox">
+                                <div class="imgBox" v-if="currentVideo.imgList&&currentVideo.imgList.length">
                                     <img  alt="" style="width:100px;margin:0 10px 8px 0" v-for="(item,index) in currentVideo.imgList" :key='index' :src="item">                                   
                                 </div>
+                                <div v-else>
+                                    <span>暂无封面</span>
+                                </div>
                             </div>
                             <div class="info-item" v-if="currentVideo.videoStatus==1">
                                 <span>视频标签:</span>
@@ -451,8 +456,9 @@
                                 <a-button type='default' @click="onClose">关闭</a-button>
                             </div>
                             
-                            
+                        
                         </div>
+                        </a-spin>   
                     </a-drawer>
                     <a-drawer
                     title="脚本详情"
@@ -462,7 +468,7 @@
                     :visible="scriptVisible"
                     @close="scriptClose"
                     >
-                        
+                        <a-spin :spinning="visibleLoading">
                         <div class="marterialInfo">
                             <div class="info-item">
                                 <span>脚本状态:</span>
@@ -500,6 +506,7 @@
                                 <a-button type='default' @click="scriptClose">关闭</a-button>
                             </div>
                         </div>
+                        </a-spin>   
                     </a-drawer>
 
                     <!-- bohui -->
@@ -597,6 +604,7 @@ export default {
             { title: '视频列表', content: '', key: 2 , },           
         ];
         return {
+            visibleLoading:false,
             loadingElse:false,
             videoRejectVisiable:false,
             scriptRejectVisiable:false,
@@ -698,17 +706,20 @@ export default {
             console.log(record)
              this.currentMaterial=record
             if(record.materialStatus>=4){              
-                this.currentVideo={};                
+                this.currentVideo={};   
+                this.visible = true;     
+                this.visibleLoading=true        
                 if(record.videoId){
                     getAction(this.url.videoDetail,{
                         videoId:record.videoId
                     }).then(res=>{
                         console.log(res);
+                        this.visibleLoading=false
                         if(res.success){
                             if(res.result){
-                                let tagList=res.result.tag.split(',')
-                                let imgList=res.result.imageUrl.split(',')
-                                console.log(tagList)
+                                let tagList=res.result.tag?res.result.tag.split(','):[]
+                                let imgList=res.result.imageUrl?res.result.imageUrl.split(','):[]
+                                // console.log(tagList)
                                 this.currentVideo={
                                     ...res.result,
                                     tagList,
@@ -716,7 +727,7 @@ export default {
                                 }
                             }
                             
-                            this.visible = true;
+                            
                         }else{
                             this.currentVideo={};
                         }
@@ -735,14 +746,17 @@ export default {
             console.log(record)
             this.currentMaterial=record
             this.currentScript={};
+            this.scriptVisible = true;
             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;
+                        
                     }else{
                         this.currentScript={};
                     }

+ 23 - 9
src/views/modules/workBench/orderDetail.vue

@@ -242,6 +242,8 @@
 }
 .marterialInfo{
     overflow: auto;
+     height: 800px;
+    position: relative;
     p{margin-bottom: 0;}
     ul,li{
         margin: 0;
@@ -293,7 +295,7 @@
         line-height: 60px;   
         text-align: center;
         position: absolute;
-        bottom: 20px;
+        bottom: 0px;
         left: 0;
        
     }
@@ -562,7 +564,7 @@
                     @close="onClose"
                     >
                         
-                            
+                         <a-spin :spinning="visibleLoading">   
                             <a-drawer
                                 :title="add ? '上传视频' : '修改视频'"
                                 width="600"
@@ -777,7 +779,11 @@
                                 <span>封面预览:</span>
                                 <div class="imgBox">
                                     <div v-if="currentVideo.videoStatus!=0">
-                                        <img  alt="" style="width:100px;margin:0 10px 8px 0" v-for="(item,index) in currentVideo.imgList" :key='index' :src="item"> 
+                                        <template v-if="currentVideo.imgList&&currentVideo.imgList.length">
+                                            <img  alt="" style="width:100px;margin:0 10px 8px 0" v-for="(item,index) in currentVideo.imgList"  :key='index' :src="item"> 
+                                        </template>
+                                        
+                                        <span v-else>暂无封面</span>
                                     </div>
                                      
                                     <img :src="defaultPic" alt=""  style="width:100px;margin:0 10px 8px 0" v-else>                              
@@ -809,6 +815,7 @@
                                 <a-button type='default' @click="onClose">关闭</a-button>
                             </div>
                         </div>
+                         </a-spin>   
                     </a-drawer>
                     
 
@@ -820,7 +827,7 @@
                     :visible="scriptVisible"
                     @close="scriptClose"
                     >
-                        
+                        <a-spin :spinning="visibleLoading">
                         <div class="marterialInfo">
                             <div class="info-item">
                                 <span>脚本状态:</span>
@@ -897,6 +904,7 @@
                                 <a-button type='default' @click="scriptClose">关闭</a-button>
                             </div>
                         </div>
+                        </a-spin>   
                     </a-drawer>
                     
                 </div>
@@ -945,7 +953,7 @@
                             </a-form-model-item>
                         </a-form-model>
 
-                    </a-modal>
+                </a-modal>
                 <a-modal v-model="videoRejectVisiable" title="视频驳回"  width='600px'>
                      <template slot="footer">
                         <a-button key="back" @click="()=>{videoRejectVisiable=false}">取消</a-button>
@@ -1110,6 +1118,7 @@ export default {
     },
     data() {
         return {
+            visibleLoading:false,
              rules: {
                 
                 clip: [{ required: true, message: '剪辑人员必须指派', trigger: 'change' }],
@@ -1425,16 +1434,19 @@ export default {
             console.log(record)
              this.currentMaterial=record
             if(record.materialStatus>=4){              
-                this.currentVideo={};                
+                this.currentVideo={};   
+                this.visible = true;  
                 if(record.videoId){
+                    this.visibleLoading=true;          
                     getAction(this.url.videoDetail,{
                         videoId:record.videoId
                     }).then(res=>{
                         console.log(res);
+                        this.visibleLoading=false;          
                         if(res.success){
                             if(res.result){
-                                let tagList=res.result.tag.split(',')
-                                let imgList=res.result.imageUrl.split(',')
+                                let tagList=res.result.tag?res.result.tag.split(','):[]
+                                let imgList=res.result.imageUrl?res.result.imageUrl.split(','):[]
                                 console.log(tagList)
                                 this.currentVideo={
                                     ...res.result,
@@ -1443,7 +1455,7 @@ export default {
                                 }
                             }
                             
-                            this.visible = true;
+                            
                         }else{
                             this.currentVideo={};
                         }
@@ -1463,10 +1475,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;