zhuxinbo před 5 roky
rodič
revize
821a280151

+ 1 - 0
debug.log

@@ -2,3 +2,4 @@
 [0529/110148.397:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0529/112937.608:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
 [0619/110835.729:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0
+[0701/153438.192:ERROR:file_io.cc(89)] ReadExactly: expected 36, observed 0

+ 54 - 78
src/components/ctop/ActorModal.vue

@@ -1,27 +1,14 @@
 <template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
+  <a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" @ok="handleOk"
+    @cancel="handleCancel" cancelText="关闭">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
 
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="演员姓名">
-          <a-input placeholder="请输入演员姓名" v-decorator="['name', validatorRules.name ]"/>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="演员姓名">
+          <a-input placeholder="请输入演员姓名" v-decorator="['name', validatorRules.name ]" />
         </a-form-item>
-        <a-form-item
-          label="封面"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-        >
-          <upload-to-ali
+        <a-form-item label="封面" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <!-- <upload-to-ali
             v-model="coverUrl"
             :customDomain="customDomain"
             preview
@@ -32,53 +19,24 @@
             :size="1024000"
             :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+          ></upload-to-ali> -->
+
+          <uploadFile :fileListAll.sync="coverUrl" :checkFile="fileWater" @overUpload="overUploadImage"
+            @removeUpload="deleteImage" :fileCount="1" uploadType="image" :multiple="false" />
         </a-form-item>
-        <a-form-item
-          label="照片"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          v-if="!model.name"
-        >
-          <upload-to-ali
-            v-model="imageUrl"
-            :customDomain="customDomain"
-            multiple
-            preview
-            :region="region"
-            :bucket="bucket"
-            :accept="acceptImage"
-            :max="10"
-            :size="1024000"
-            :accessKeyId="accessKeyId"
-            :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+        <a-form-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!model.name">
+          <upload-to-ali v-model="imageUrl" :customDomain="customDomain" multiple preview :region="region"
+            :bucket="bucket" :accept="acceptImage" :max="10" :size="1024000" :accessKeyId="accessKeyId"
+            :accessKeySecret="accessKeySecret"></upload-to-ali>
         </a-form-item>
-        <a-form-item
-          label="视频作品"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          v-if="!model.name"
-        >
-          <upload-to-ali
-            v-model="videoUrl"
-            :customDomain="customDomain"
-            multiple
-            preview
-            :region="region"
-            :bucket="bucket"
-            :accept="acceptVideo"
-            :max="10"
-            :size="1024000"
-            :accessKeyId="accessKeyId"
-            :accessKeySecret="accessKeySecret"
-          ></upload-to-ali>
+        <a-form-item label="视频作品" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!model.name">
+          <upload-to-ali v-model="videoUrl" :customDomain="customDomain" multiple preview :region="region"
+            :bucket="bucket" :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId"
+            :accessKeySecret="accessKeySecret"></upload-to-ali>
         </a-form-item>
         <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-date-picker
-            style="width: 100%"
-            placeholder="请选择生日"
-            v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"/>
+          <a-date-picker style="width: 100%" placeholder="请选择生日"
+            v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]" />
         </a-form-item>
 
         <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -87,11 +45,8 @@
             <a-select-option :value="2">女</a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="特长">
-          <a-input placeholder="请输入特长" v-decorator="['speciality']"/>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="特长">
+          <a-input placeholder="请输入特长" v-decorator="['speciality']" />
         </a-form-item>
 
 
@@ -101,7 +56,10 @@
 </template>
 
 <script>
-  import {httpAction} from '@/api/manage'
+  import uploadFile from '@/components/uploadFile.vue'
+  import {
+    httpAction
+  } from '@/api/manage'
   import pick from 'lodash.pick'
   import JTreeSelect from '@/components/jeecg/JTreeSelect'
   import moment from 'moment'
@@ -110,7 +68,8 @@
     name: "ActorModal",
     components: {
       UploadToAli,
-      JTreeSelect
+      JTreeSelect,
+      uploadFile
     },
     data() {
       return {
@@ -119,7 +78,7 @@
         model: {},
         videoUrl: [],
         imageUrl: [],
-        coverUrl:"",
+        coverUrl: [],
         customDomain: '',
         region: 'oss-cn-beijing',
         bucket: 'ctop-media',
@@ -129,18 +88,31 @@
         accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
         dateFormat: "YYYY-MM-DD",
         labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 5
+          },
         },
         wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 16
+          },
         },
 
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules: {
-          name: {rules: [{required: true, message: '请输入演员姓名!'}]},
+          name: {
+            rules: [{
+              required: true,
+              message: '请输入演员姓名!'
+            }]
+          },
           // sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))},
         },
         url: {
@@ -149,9 +121,13 @@
         },
       }
     },
-    created() {
-    },
+    created() {},
     methods: {
+      fileWater() {
+        return new Promise(function (resolve, reject) {
+
+        })
+      },
       add() {
         this.edit({});
       },
@@ -209,7 +185,7 @@
                 that.$emit("updateList")
                 this.imageUrl = []
                 this.videoUrl = []
-                this.coverUrl = ""
+                this.coverUrl = []
               } else {
                 that.$message.warning(res.message);
               }

+ 11 - 1
src/components/uploadFile.vue

@@ -76,11 +76,17 @@
         default (file) {
           return Promise.resolve()
         }
+      },
+      fileListAll: {
+        type: Array,
+        default () {
+          return []
+        }
       }
     },
     data() {
       return {
-        fileList: [], //链接集合
+        fileList:[],
         loadingElse: false,
         imageUrl: '',
         percent: 0,
@@ -129,6 +135,8 @@
         this.checkFile(file).then(res => {
           this.cosUpload(file)
 
+        }).catch(() => {
+          this.loadingElse = false
         })
         return new Promise(function (resolve, reject) {
           reject()
@@ -178,6 +186,8 @@
               url: '//' + data.Location,
             })
             that.$emit('overUpload', that.fileList)
+            that.$emit('update:fileListAll', that.fileList)
+
           } else {
             that.$message.error('上传已达上限' + that.fileCount + '张')
           }

+ 14 - 9
src/views/modules/material/videoMaterial.vue

@@ -764,7 +764,7 @@ a {
           class="add-image-material"
           v-if="getData('projectId')&&add&&urlList.url!=''"
         >
-          <upload-to-ali
+          <!-- <upload-to-ali
             style="width:160%"
             v-model="urlListImage.url"
             :customDomain="customDomain"
@@ -781,7 +781,14 @@ a {
             :dir="dirImg"
             @delete='deleteImage'
             @loaded="overUploadImage"
-          ></upload-to-ali>
+          ></upload-to-ali> -->
+          <uploadFile 
+          :checkFile="fileWater" 
+          @overUpload="overUploadImage" 
+          @removeUpload="deleteImage"
+          :fileCount="15"
+          uploadType="image"
+          />
           <span
             v-if="material.filter(item => item == false).length > 0 && urlListImage.url.length > 0"
             style="color:red"
@@ -2203,13 +2210,13 @@ export default {
       that.imageArrList = []
       var img
       if(urlAll.length>0){
-        for (var i = 0; i < this.urlListImage.url.length; i++) {
+        for (var i = 0; i < urlAll.length; i++) {
             that.imageArrList.push({
                 // width: img.width,
                 // height: img.height,
                 // size: this.urlListImage.size[i],
                 code: this.urlListImage.md5[i],
-                url: this.urlListImage.url[i],
+                url: urlAll[i].url,
                 materialName: this.urlListImage.name[i]
             })
             img = new Image()
@@ -2318,8 +2325,7 @@ export default {
         size: []
       }
       return new Promise(function(resolve, reject) {
-        for (let i = 0; i < file.length; i++) {
-          bmf.md5(file[i], (err, md5) => {
+          bmf.md5(file, (err, md5) => {
             fileCheckImage({
               code: md5,
               projectId: that.getData('projectId'),
@@ -2329,15 +2335,14 @@ export default {
                 that.$message.error('此素材已经上传')
                 reject()
               } else {
-                that.urlListImage.name.push(file[i].name)
+                that.urlListImage.name.push(file.name)
                 that.urlListImage.md5.push(md5)
-                that.urlListImage.size.push(file[i].size)
+                that.urlListImage.size.push(file.size)
                 resolve()
                 //   reject()
               }
             })
           })
-        }
       })
     },
     getParticipateList() {