zhuxinbo пре 5 година
родитељ
комит
4a26321388
2 измењених фајлова са 20 додато и 7 уклоњено
  1. 1 2
      src/components/uploadFile.vue
  2. 19 5
      src/views/modules/material/videoMaterial.vue

+ 1 - 2
src/components/uploadFile.vue

@@ -175,13 +175,12 @@
               uid: i++,
               name: file.name,
               status: 'done',
-              url: 'http://' + data.Location,
+              url: '//' + data.Location,
             })
             that.$emit('overUpload', that.fileList)
           } else {
             that.$message.error('上传已达上限' + that.fileCount + '张')
           }
-
         });
       }
     }

+ 19 - 5
src/views/modules/material/videoMaterial.vue

@@ -726,7 +726,15 @@ a {
           </a-select>
         </a-form-item>
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="视频素材上传" v-if="getData('projectId')">
-          <upload-to-ali
+          <uploadFile 
+          :checkFile="file" 
+          @overUpload="overUpload" 
+          @removeUpload="removeUpload"
+          :fileCount="10"
+          uploadType="video" 
+          :multiple="false"
+          />
+          <!-- <upload-to-ali
             v-model="urlList.url"
             :customDomain="customDomain"
             preview
@@ -741,7 +749,7 @@ a {
             :dir="dirVideo"
             @loaded="overUpload"
           >
-          </upload-to-ali>
+          </upload-to-ali> -->
           <span v-if="repeat" style="color:red">
             此素材重复,请重新选择上传
           </span>
@@ -1238,6 +1246,7 @@ import moment from 'moment'
 import selectTable from '@/views/modules/Statistics/components/selecTable.vue'
 
 import BMF from 'browser-md5-file'
+import uploadFile from '@/components/uploadFile.vue'
 import { stopOtherVideo, closeAllVideoFun } from '@/utils/videoControl'
 import accountCheck from './accountCheck'
 export default {
@@ -1247,7 +1256,8 @@ export default {
     JEllipsis,
     UploadToAli,
     accountCheck,
-    selectTable
+    selectTable,
+    uploadFile
   },
 
   data() {
@@ -2168,9 +2178,13 @@ export default {
     //   this.queryParam.status = key
       this.loadData(1)
     },
+    removeUpload(){
+
+    },
     overUpload(urlAll) {
       this.confirmLoading = true
       this.repeat = false
+      this.urlList.url = urlAll[0].url
       this.$message.success('上传成功')
     },
     deleteImage(url){
@@ -2272,8 +2286,8 @@ export default {
       var bmf = new BMF()
       var that = this
       return new Promise(function(resolve, reject) {
-        bmf.md5(file[0], (err, md5) => {
-          that.urlList.name = file[0].name
+        bmf.md5(file, (err, md5) => {
+          that.urlList.name = file.name
           that.urlList.md5 = md5
           fileCheck({
             code: md5,