|
@@ -189,26 +189,6 @@
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <!-- <a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="创建者">
|
|
|
- <a-input placeholder="请输入创建者名称" v-model="queryParam.advertiserId"></a-input>
|
|
|
- </a-form-item>
|
|
|
- </a-col> -->
|
|
|
- <!-- <a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="剪辑">
|
|
|
- <a-input placeholder="请输入剪辑者名称" v-model="queryParam.advertiserId"></a-input>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="编导">
|
|
|
- <a-input placeholder="请输入编导" v-model="queryParam.responsible"></a-input>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="拍摄">
|
|
|
- <a-input placeholder="请输入拍摄" v-model="queryParam.responsible"></a-input>
|
|
|
- </a-form-item>
|
|
|
- </a-col> -->
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="时间选择">
|
|
|
<a-date-picker v-model="queryParam.createTime" format="YYYY-MM-DD" style="width:100%" />
|
|
@@ -235,18 +215,20 @@
|
|
|
checkAll ? '取消 ( ' + checkArr.length + ' )' : '全选'
|
|
|
}}</a-button>
|
|
|
</div>
|
|
|
-
|
|
|
- <!-- <a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
|
|
|
- :before-upload="beforeUpload" @change="handleChange">
|
|
|
- <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
|
|
|
- <div v-else>
|
|
|
- <a-icon :type="loading ? 'loading' : 'plus'" />
|
|
|
+ <!-- :show-upload-list="false" -->
|
|
|
+ <!-- <a-upload name="file" :multiple="true" list-type="picture-card" class="avatar-uploader"
|
|
|
+ action="https://media-1301855440.cos.ap-chongqing.myqcloud.com/" :before-upload="beforeUpload"
|
|
|
+ @change="handleChange" accept='image/*' :file-list="fileList" :remove="removeFile" @preview="handlePreview">
|
|
|
+ <div>
|
|
|
+ <a-progress v-if='loadingElse' :percent="percent" :show-info="false" />
|
|
|
<div class="ant-upload-text">
|
|
|
Upload
|
|
|
</div>
|
|
|
</div>
|
|
|
</a-upload> -->
|
|
|
-
|
|
|
+ <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
|
|
|
+ <img alt="example" style="width: 100%" :src="previewImage" />
|
|
|
+ </a-modal>
|
|
|
<a-tabs @change="callbackTwo" v-model="active" type="card" id="material-card">
|
|
|
<a-tab-pane :tab="item.tab" v-for="item of examinelList" :key="item.value">
|
|
|
<div v-if="item.value != 'join' && item.value != 'job' && item.value != 'success'">
|
|
@@ -526,6 +508,16 @@
|
|
|
SecretId: 'AKIDE6IpMi8fJQRCg1iuWzFajjRs43kbbets',
|
|
|
SecretKey: 'tXzuwMfplTTK3c9GFUyETilasvQfePu9',
|
|
|
});
|
|
|
+ var i = 0
|
|
|
+
|
|
|
+ function getBase64(file) {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ const reader = new FileReader();
|
|
|
+ reader.readAsDataURL(file);
|
|
|
+ reader.onload = () => resolve(reader.result);
|
|
|
+ reader.onerror = error => reject(error);
|
|
|
+ });
|
|
|
+ }
|
|
|
export default {
|
|
|
name: 'YardList',
|
|
|
mixins: [JeecgListMixin],
|
|
@@ -538,6 +530,7 @@
|
|
|
|
|
|
data() {
|
|
|
return {
|
|
|
+ fileList: [],
|
|
|
dragging: null,
|
|
|
dataKey: 0,
|
|
|
columns: [{
|
|
@@ -709,8 +702,11 @@
|
|
|
content: [],
|
|
|
foot: ''
|
|
|
},
|
|
|
- loading: false,
|
|
|
+ loadingElse: false,
|
|
|
imageUrl: '',
|
|
|
+ percent: 0,
|
|
|
+ previewVisible: false,
|
|
|
+ previewImage: '',
|
|
|
}
|
|
|
},
|
|
|
filters: {
|
|
@@ -761,6 +757,9 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ handleCancel() {
|
|
|
+ this.previewVisible = false;
|
|
|
+ },
|
|
|
handleChange(info) {
|
|
|
if (info.file.status === 'uploading') {
|
|
|
this.loading = true;
|
|
@@ -774,23 +773,69 @@
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ removeFile(file) {
|
|
|
+ console.log(file)
|
|
|
+ var index = this.fileList.findIndex(v => v.uid === file.uid)
|
|
|
+ this.fileList.splice(index, 1)
|
|
|
+ },
|
|
|
+ async handlePreview(file) {
|
|
|
+ if (!file.url && !file.preview) {
|
|
|
+ file.preview = await getBase64(file.originFileObj);
|
|
|
+ }
|
|
|
+ this.previewImage = file.url || file.preview;
|
|
|
+ this.previewVisible = true;
|
|
|
+ },
|
|
|
beforeUpload(file) {
|
|
|
console.log(file)
|
|
|
- cos.putObject({
|
|
|
- Bucket: 'media-1301855440',
|
|
|
- /* 必须 */
|
|
|
- Region: 'ap-chongqing',
|
|
|
- /* 存储桶所在地域,必须字段 */
|
|
|
- Key: 'exampleobject',
|
|
|
- /* 必须 */
|
|
|
- StorageClass: 'STANDARD',
|
|
|
- Body: file, // 上传文件对象
|
|
|
- onProgress: function (progressData) {
|
|
|
- console.log(JSON.stringify(progressData));
|
|
|
- }
|
|
|
- }, function (err, data) {
|
|
|
- console.log(err || data);
|
|
|
- });
|
|
|
+ this.loadingElse = true
|
|
|
+ var that = this
|
|
|
+ let date = new Date()
|
|
|
+ let y = date.getFullYear()
|
|
|
+ let MM = date.getMonth() + 1
|
|
|
+ MM = MM < 10 ? '0' + MM : MM
|
|
|
+ let d = date.getDate()
|
|
|
+ d = d < 10 ? '0' + d : d
|
|
|
+
|
|
|
+ return new Promise(function (resolve, reject) {
|
|
|
+ cos.putObject({
|
|
|
+ Bucket: 'media-1301855440',
|
|
|
+ /* 必须 */
|
|
|
+ Region: 'ap-chongqing',
|
|
|
+ /* 存储桶所在地域,必须字段 */
|
|
|
+ Key: 'image/' + y + '-' + MM + '-' + d + '/' + file.name,
|
|
|
+ /* 必须 */
|
|
|
+ StorageClass: 'STANDARD',
|
|
|
+ Body: file, // 上传文件对象
|
|
|
+ onProgress: function (progressData) {
|
|
|
+
|
|
|
+ console.log(typeof JSON.stringify(progressData));
|
|
|
+ console.log(progressData.percent);
|
|
|
+ that.percent = (progressData.percent * 100)
|
|
|
+ },
|
|
|
+ onTaskReady: function (tid) {
|
|
|
+ console.log('onTaskReady', tid);
|
|
|
+ },
|
|
|
+ onTaskStart: function (info) {
|
|
|
+ console.log('onTaskStart', info);
|
|
|
+ },
|
|
|
+ }, function (err, data) {
|
|
|
+ if (err) {
|
|
|
+ console.log(err);
|
|
|
+
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ console.log('成功', data)
|
|
|
+ // alert('成功')
|
|
|
+ that.loadingElse = false
|
|
|
+ that.fileList.push({
|
|
|
+ uid: i++,
|
|
|
+ name: file.name,
|
|
|
+ status: 'done',
|
|
|
+ url: 'http://' + data.Location,
|
|
|
+ })
|
|
|
+ });
|
|
|
+ })
|
|
|
+ reject()
|
|
|
},
|
|
|
|
|
|
|