|
@@ -1,4 +1,40 @@
|
|
|
+<style>
|
|
|
+ .chouzhen span {
|
|
|
+ display: inline-block;
|
|
|
+ }
|
|
|
+</style>
|
|
|
<style scoped lang="scss">
|
|
|
+ .chouzhen {
|
|
|
+ border-style: solid;
|
|
|
+ border-width: 1px;
|
|
|
+ border-color: #e4e4e4;
|
|
|
+ width: calc(20% - 10px);
|
|
|
+ padding: 10px;
|
|
|
+ margin-right: 10px;
|
|
|
+ margin-bottom: 10px;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ background: #fff;
|
|
|
+ position: relative;
|
|
|
+ z-index: 99;
|
|
|
+ float: left
|
|
|
+ }
|
|
|
+
|
|
|
+ li.chouzhen.first:before {
|
|
|
+ font-size: 12px;
|
|
|
+ content: "首帧";
|
|
|
+ position: absolute;
|
|
|
+ top: 7px;
|
|
|
+ left: 5px;
|
|
|
+ width: 36px;
|
|
|
+ height: 20px;
|
|
|
+ color: rgb(255, 255, 255);
|
|
|
+ line-height: 20px;
|
|
|
+ text-align: center;
|
|
|
+ background: rgba(255, 0, 0, 0.5);
|
|
|
+ border-radius: 2px;
|
|
|
+ }
|
|
|
+
|
|
|
.actor-photo-list {
|
|
|
display: flex;
|
|
|
padding-left: 0;
|
|
@@ -49,6 +85,7 @@
|
|
|
<div class="dynamically_add_form_item">
|
|
|
<a-form-item label="">
|
|
|
<a @click="getVideoList('video', index, item, bestIndex)">选择视频</a>
|
|
|
+ <a @click="uploadVideo(index,bestIndex)" style="margin-left:10px">上传视频</a>
|
|
|
<br />
|
|
|
<video :src="item.videoList.url" controls="controls" style="width:25%"
|
|
|
v-if="item.videoList"></video>
|
|
@@ -68,9 +105,17 @@
|
|
|
</div>
|
|
|
<a-form-item label="">
|
|
|
<a @click="getVideoList('image', index, item, bestIndex)">选择封面</a>
|
|
|
+ <a @click="uploadImages(index,bestIndex)" style="margin-left:10px">上传封面</a>
|
|
|
+ <a @click="showImages(index,bestIndex)" v-if="item.chouzhenShow"
|
|
|
+ style="margin-left:10px">推荐封面</a>
|
|
|
<br />
|
|
|
- <img :src="item.url" style="width:18%;margin:1%;" v-for="item of item.imageList"
|
|
|
- :key="item.url" />
|
|
|
+ <span v-for="(item,deleteIndex) of item.imageList" style="position:relative;">
|
|
|
+ <img :src="item.url" style="width:18%;margin:1%;" :key="item.url" />
|
|
|
+ <a-icon type="close-circle" @click="deleteData(index,bestIndex,deleteIndex)"
|
|
|
+ style="position: absolute;right: 0px;" />
|
|
|
+ </span>
|
|
|
+
|
|
|
+
|
|
|
</a-form-item>
|
|
|
<a-form-item label="广告语">
|
|
|
<a-textarea class="rending" placeholder="请输入广告语" v-model="item.description"
|
|
@@ -141,6 +186,66 @@
|
|
|
</a-button>
|
|
|
</template>
|
|
|
</a-modal>
|
|
|
+ <a-modal title="封面上传" @cancel="closeImage" @afterClose="closeImage" v-model="addImageVisible">
|
|
|
+ <template slot="footer">
|
|
|
+ <a-button key="back" @click="closeImage">取消</a-button>
|
|
|
+ <a-button key="submit" type="primary" @click="handleOkImage" :loading="loadingImage">
|
|
|
+ 确定
|
|
|
+ </a-button>
|
|
|
+ </template>
|
|
|
+ <a-form-item label="" class="add-image-material">
|
|
|
+ <upload-to-ali style="width:100%" v-model="urlListImage.url" :customDomain="customDomain" :multiple="true"
|
|
|
+ preview :region="region" :bucket="bucket" :accept="acceptImage" :max="10" :size="1024000"
|
|
|
+ :accessKeyId="accessKeyId" :accessKeySecret="accessKeySecret" :before-upload="fileWater" :dir="dirImg"
|
|
|
+ @delete='deleteImage' @loaded="overUploadImage"></upload-to-ali>
|
|
|
+ <span v-if="material.filter(item => item == false).length > 0 && urlListImage.url.length > 0"
|
|
|
+ style="color:red">上传素材的尺寸不符,请修改(<span v-for="(item, index) of material" :key="index"
|
|
|
+ v-show="!item">第{{ index + 1 }}张</span>出错)</span>
|
|
|
+ <span v-else-if="urlListImage.url.length > 0 && material.filter(item => item == false).length == 0"
|
|
|
+ style="color:green">上传成功</span>
|
|
|
+ </a-form-item>
|
|
|
+ </a-modal>
|
|
|
+
|
|
|
+ <a-modal title="视频上传" @cancel="closeVideo" @afterClose="closeVideo" v-model="addVideoVisible">
|
|
|
+ <template slot="footer">
|
|
|
+ <a-button key="back" @click="closeVideo">取消</a-button>
|
|
|
+ <a-button key="submit" type="primary" @click="handleOkVideo" :loading="loadingVideo">
|
|
|
+ 确定
|
|
|
+ </a-button>
|
|
|
+ </template>
|
|
|
+ <a-form-item label="" class="add-image-material">
|
|
|
+ <upload-to-ali v-model="urlList.url" :customDomain="customDomain" preview :region="region" :bucket="bucket"
|
|
|
+ :accept="acceptVideo" :max="10" :size="1024000" :accessKeyId="accessKeyId" :accessKeySecret="accessKeySecret"
|
|
|
+ :before-upload="file" :dir="dirVideo" @loaded="overUpload">
|
|
|
+ </upload-to-ali>
|
|
|
+ <span v-if="messageTip" style="color:red">{{messageTip}}</span>
|
|
|
+ </a-form-item>
|
|
|
+ </a-modal>
|
|
|
+ <a-modal title="抽帧展示" v-model="chouzhen" width="60%">
|
|
|
+ <template slot="footer">
|
|
|
+ <a-button key="back" @click="chouzhen=false">关闭</a-button>
|
|
|
+ <a-button key="submit" type="primary" @click="handleOkChouzhen">
|
|
|
+ 确定
|
|
|
+ </a-button>
|
|
|
+ </template>
|
|
|
+ <a-button type="primary" @click="onCheckAllChange">
|
|
|
+ 全选
|
|
|
+ </a-button>
|
|
|
+ <!-- </a-checkbox> -->
|
|
|
+ <ul v-if="chouzhenList.length>0" style="height:600px;overflow:auto;padding-left:0">
|
|
|
+
|
|
|
+ <a-checkbox-group v-model="checkList" @change="onChange">
|
|
|
+ <li v-for="(item,index) of chouzhenList" :key="index" class="chouzhen" :class="{'first':index == 0}">
|
|
|
+
|
|
|
+ <img :src="item.url" alt="" style="width:100%">
|
|
|
+ <a-checkbox :value="item.signature" style="position:absolute;z-index: 100;right:0;top:0;"></a-checkbox>
|
|
|
+
|
|
|
+ </li>
|
|
|
+ </a-checkbox-group>
|
|
|
+ </ul>
|
|
|
+
|
|
|
+ </a-modal>
|
|
|
+
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -161,6 +266,12 @@
|
|
|
closeAllVideoFun
|
|
|
} from '@/utils/videoControl' // 停止除当前外的其他视频播放,及停止所有视频播放的方法
|
|
|
import checkMatemal from './stepModule/checkMatemal'
|
|
|
+ import BMF from 'browser-md5-file'
|
|
|
+
|
|
|
+
|
|
|
+ let nowIndex = 0
|
|
|
+ let bestIndex = 0
|
|
|
+ let showRemove = false
|
|
|
export default {
|
|
|
name: 'BaseForm',
|
|
|
components: {
|
|
@@ -170,8 +281,17 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ chouzhen: false,
|
|
|
+ chouzhenList: [],
|
|
|
+ checkList: [],
|
|
|
+ indeterminate: true,
|
|
|
+ checkAll: false,
|
|
|
pans: [],
|
|
|
pansKey: '',
|
|
|
+ addImageVisible: false,
|
|
|
+ addVideoVisible: false,
|
|
|
+ loadingVideo: false,
|
|
|
+ loadingImage: false,
|
|
|
allForm: {
|
|
|
videoList: '',
|
|
|
imageList: [],
|
|
@@ -216,10 +336,51 @@
|
|
|
imageUrlList: [],
|
|
|
checkAllImage: false,
|
|
|
checkArrImage: [],
|
|
|
- content: 0
|
|
|
+ content: 0,
|
|
|
+ urlListImage: {
|
|
|
+ url: [],
|
|
|
+ md5: []
|
|
|
+ },
|
|
|
+ urlList: {
|
|
|
+ url: '',
|
|
|
+ md5: "",
|
|
|
+ photoId: ""
|
|
|
+ },
|
|
|
+ imageArrList: [],
|
|
|
+ material: [],
|
|
|
+ creativeCopywriter: '',
|
|
|
+ customDomain: '',
|
|
|
+ region: 'oss-cn-beijing',
|
|
|
+ bucket: 'ctop-media',
|
|
|
+ acceptVideo: 'video/mpeg,video/mp4',
|
|
|
+ acceptImage: 'image/jpeg,image/jpg,image/png',
|
|
|
+ accessKeyId: 'LTAIbNbqWzSOklQV',
|
|
|
+ accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
|
|
|
+ messageTip: null
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ onChange(checkedList) {
|
|
|
+ this.indeterminate = !!checkedList.length && checkedList.length < this.chouzhenList.length;
|
|
|
+ this.checkAll = checkedList.length === this.chouzhenList.length;
|
|
|
+ },
|
|
|
+ onCheckAllChange(e) {
|
|
|
+ if (this.checkAll) {
|
|
|
+ this.checkList = []
|
|
|
+ } else {
|
|
|
+ this.checkList = this.chouzhenList.map(item => {
|
|
|
+ return item.signature
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.checkAll = !this.checkAll
|
|
|
+ // Object.assign(this, {
|
|
|
+ // checkList: e.target.checked ? this.chouzhenList.map(item => {
|
|
|
+ // return item.signature
|
|
|
+ // }) : [],
|
|
|
+ // indeterminate: false,
|
|
|
+ // checkAll: e.target.checked,
|
|
|
+ // });
|
|
|
+ },
|
|
|
onCheckAllImageChange(index, item) {
|
|
|
|
|
|
if (this.pans[index].list[item.key].checkAllImage) {
|
|
@@ -268,6 +429,21 @@
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
+ var params = {
|
|
|
+ videoSignature: item.video.signature,
|
|
|
+ pageSize: 20,
|
|
|
+ pageNo: 1
|
|
|
+ }
|
|
|
+ getAction('/cutFrame/material/list', params).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ if (res.success) {
|
|
|
+ if (res.result.records.length > 0) {
|
|
|
+ this.pans[index].list[item.key].chouzhenShow = true
|
|
|
+ } else {
|
|
|
+ this.pans[index].list[item.key].chouzhenShow = false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
} else {
|
|
|
this.pans[index].list[item.key].imageList.push(...item.image)
|
|
|
}
|
|
@@ -423,7 +599,8 @@
|
|
|
actionBarText: '',
|
|
|
imageUrlList: [],
|
|
|
checkArrImage: [],
|
|
|
- checkAllImage: false
|
|
|
+ checkAllImage: false,
|
|
|
+ chouzhenShow: false
|
|
|
})
|
|
|
},
|
|
|
deleteCreative(bestIndex, index) {
|
|
@@ -431,6 +608,300 @@
|
|
|
},
|
|
|
filterOption(input, option) {
|
|
|
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
+ },
|
|
|
+ uploadVideo(index, bestIndex) {
|
|
|
+ console.log(index, bestIndex)
|
|
|
+ nowIndex = index
|
|
|
+ bestIndex = bestIndex
|
|
|
+ this.addVideoVisible = true
|
|
|
+ },
|
|
|
+ handleOkChouzhen(e) {
|
|
|
+
|
|
|
+ var arr = []
|
|
|
+ for (let i = 0; i < this.chouzhenList.length; i++) {
|
|
|
+ for (let j = 0; j < this.checkList.length; j++) {
|
|
|
+ if (this.chouzhenList[i].signature == this.checkList[j]) {
|
|
|
+ arr.push(this.chouzhenList[i])
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ this.pans[bestIndex].list[nowIndex].imageList = arr
|
|
|
+ this.chouzhen = false
|
|
|
+ this.chouzhenList = []
|
|
|
+ this.checkList = []
|
|
|
+ this.checkAll = false
|
|
|
+ },
|
|
|
+ showImages(index, bestIndex) {
|
|
|
+ this.chouzhen = true
|
|
|
+ this.chouzhenList = []
|
|
|
+ nowIndex = index
|
|
|
+ bestIndex = bestIndex
|
|
|
+ var params = {
|
|
|
+ videoSignature: this.pans[index].list[bestIndex].videoList.signature,
|
|
|
+ pageSize: 20,
|
|
|
+ pageNo: 1
|
|
|
+ }
|
|
|
+ getAction('/cutFrame/material/list', params).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ if (res.success) {
|
|
|
+ this.chouzhenList.push(...res.result.records)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ uploadImages(index, bestIndex) {
|
|
|
+ nowIndex = index
|
|
|
+ bestIndex = bestIndex
|
|
|
+ this.addImageVisible = true
|
|
|
+ },
|
|
|
+ closeImage() {
|
|
|
+ this.addImageVisible = false
|
|
|
+ this.urlListImage = {
|
|
|
+ url: [],
|
|
|
+ md5: [],
|
|
|
+ }
|
|
|
+ this.imageArrList = []
|
|
|
+ nowIndex = 0
|
|
|
+ bestIndex = 0
|
|
|
+
|
|
|
+ },
|
|
|
+ closeVideo() {
|
|
|
+ this.addVideoVisible = false
|
|
|
+ this.urlList = {
|
|
|
+ url: "",
|
|
|
+ md5: "",
|
|
|
+ photoId: ""
|
|
|
+ }
|
|
|
+ nowIndex = 0
|
|
|
+ bestIndex = 0
|
|
|
+ this.messageTip = null
|
|
|
+ },
|
|
|
+ handleOkImage(e) {
|
|
|
+ this.loadingImage = true
|
|
|
+ var params = {
|
|
|
+ accountId: localStorage.getItem('accountId'),
|
|
|
+ uploadImageArr: this.imageArrList
|
|
|
+ }
|
|
|
+ postAction("/kusiShouUpload/image", params).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ this.pans[bestIndex].list[nowIndex].imageList = res.result
|
|
|
+ this.closeImage()
|
|
|
+ this.loadingImage = false
|
|
|
+ } else {
|
|
|
+ this.$message.error('封面上传失败')
|
|
|
+ this.loadingImage = false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ deleteImage(url) {
|
|
|
+ console.log(url, this.urlListImage.url)
|
|
|
+ var index = this.imageArrList.findIndex(v => v.url === url)
|
|
|
+ this.imageArrList.splice(index, 1)
|
|
|
+ console.log(index)
|
|
|
+ },
|
|
|
+ overUploadImage(urlAll) {
|
|
|
+ // var index = this.urlList.url.findIndex(item => item === urlAll[0])
|
|
|
+ // var data = { url: urlAll[0], code: this.urlList.md5[index], name: this.urlList.name[index] }
|
|
|
+ // this.imageArr.push(data)
|
|
|
+ var that = this
|
|
|
+ that.material = []
|
|
|
+ that.imageArrList = []
|
|
|
+ var img
|
|
|
+ if (urlAll.length > 0) {
|
|
|
+ for (var i = 0; i < this.urlListImage.url.length; i++) {
|
|
|
+ that.imageArrList.push({
|
|
|
+ // width: img.width,
|
|
|
+ // height: img.height,
|
|
|
+ // size: this.urlListImage.size[i],
|
|
|
+ signature: this.urlListImage.md5[i],
|
|
|
+ url: this.urlListImage.url[i],
|
|
|
+ })
|
|
|
+
|
|
|
+ img = new Image()
|
|
|
+ img.src = this.urlListImage.url[i]
|
|
|
+ if (img.complete) {
|
|
|
+ // 打印
|
|
|
+ if (img.width == 720) {
|
|
|
+ if (img.height == 1280) {
|
|
|
+ that.material.push(true)
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else if (img.width == 1080) {
|
|
|
+ if (img.height == 1920) {
|
|
|
+ that.material.push(true)
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else if (img.width == 1280) {
|
|
|
+ if (img.height == 720) {
|
|
|
+ that.material.push(true)
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else if (img.width == 1920) {
|
|
|
+ if (img.height == 1080) {
|
|
|
+ that.material.push(true)
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+
|
|
|
+ img.onload = () => {
|
|
|
+ if (img.width == 720) {
|
|
|
+ if (img.height == 1280) {
|
|
|
+ that.material.push(true)
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else if (img.width == 1080) {
|
|
|
+ if (img.height == 1920) {
|
|
|
+ that.material.push(true)
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else if (img.width == 1280) {
|
|
|
+ if (img.height == 720) {
|
|
|
+ that.material.push(true)
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else if (img.width == 1920) {
|
|
|
+ if (img.height == 1080) {
|
|
|
+ that.material.push(true)
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ that.material.push(false)
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
+ fileWater(file) {
|
|
|
+ var bmf = new BMF()
|
|
|
+ var that = this
|
|
|
+ this.urlListImage = {
|
|
|
+ url: [],
|
|
|
+ md5: []
|
|
|
+ }
|
|
|
+ return new Promise(function (resolve, reject) {
|
|
|
+ for (let i = 0; i < file.length; i++) {
|
|
|
+ bmf.md5(file[i], (err, md5) => {
|
|
|
+ // that.urlListImage.name.push(file[i].name)
|
|
|
+ that.urlListImage.md5.push(md5)
|
|
|
+ resolve()
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ overUpload(urlAll) {
|
|
|
+ console.log(this.urlList)
|
|
|
+ },
|
|
|
+ file(file) {
|
|
|
+ var bmf = new BMF()
|
|
|
+ var that = this
|
|
|
+ return new Promise(function (resolve, reject) {
|
|
|
+ bmf.md5(file[0], (err, md5) => {
|
|
|
+
|
|
|
+
|
|
|
+ getAction('/kusiShouUpload/checkVideo', {
|
|
|
+ signature: md5,
|
|
|
+ accountId: localStorage.getItem('accountId')
|
|
|
+ }).then(res => {
|
|
|
+ if (res.code == 0) {
|
|
|
+ if (res.result.isExistence) {
|
|
|
+ showRemove = res.result.isExistence
|
|
|
+ that.urlList.md5 = res.result.signature
|
|
|
+ that.urlList.url = res.result.videoUrl
|
|
|
+ that.urlList.photoId = res.result.photoId
|
|
|
+ reject()
|
|
|
+ } else {
|
|
|
+ showRemove = res.result.isExistence
|
|
|
+ that.urlList.md5 = md5
|
|
|
+ resolve()
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ } else {
|
|
|
+
|
|
|
+ reject()
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ handleOkVideo(e) {
|
|
|
+ this.loadingVideo = true
|
|
|
+ if (showRemove) {
|
|
|
+ this.pans[bestIndex].list[nowIndex].videoList = {
|
|
|
+ photoId: this.urlList.photoId,
|
|
|
+ url: this.urlList.url
|
|
|
+ }
|
|
|
+ this.loadingVideo = false
|
|
|
+ var params = {
|
|
|
+ videoSignature: this.urlList.md5,
|
|
|
+ pageSize: 20,
|
|
|
+ pageNo: 1
|
|
|
+ }
|
|
|
+ getAction('/cutFrame/material/list', params).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ if (res.success) {
|
|
|
+ if (res.result.records.length > 0) {
|
|
|
+ this.pans[bestIndex].list[nowIndex].chouzhenShow = true
|
|
|
+ } else {
|
|
|
+ this.pans[bestIndex].list[nowIndex].chouzhenShow = false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.closeVideo()
|
|
|
+ } else {
|
|
|
+ var params = {
|
|
|
+ url: this.urlList.url,
|
|
|
+ type: this.getData('creativeMaterialType'),
|
|
|
+ signature: this.urlList.md5,
|
|
|
+ accountId: localStorage.getItem('accountId')
|
|
|
+ }
|
|
|
+ postAction("/kusiShouUpload/video", params).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ if (res.success) {
|
|
|
+ this.pans[bestIndex].list[nowIndex].videoList = {
|
|
|
+ photoId: res.result.photoId,
|
|
|
+ url: this.urlList.url
|
|
|
+ }
|
|
|
+ this.loadingVideo = false
|
|
|
+ this.closeVideo()
|
|
|
+ } else {
|
|
|
+ this.messageTip = res.message
|
|
|
+ this.loadingVideo = false
|
|
|
+ this.urlList = {
|
|
|
+ url: "",
|
|
|
+ md5: "",
|
|
|
+ photoId: ""
|
|
|
+ }
|
|
|
+ nowIndex = 0
|
|
|
+ bestIndex = 0
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
+ deleteData(index, bestIndex, deleteIndex) {
|
|
|
+ this.pans[index].list[bestIndex].imageList.splice(deleteIndex, 1)
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -442,7 +913,7 @@
|
|
|
let d = date.getDate()
|
|
|
d = d < 10 ? '0' + d : d
|
|
|
|
|
|
- return 'image/' + y + '-' + MM + '-' + d + '/'
|
|
|
+ return 'image/Operate/' + y + '-' + MM + '-' + d + '/'
|
|
|
},
|
|
|
dirVideo() {
|
|
|
let date = new Date()
|
|
@@ -452,14 +923,14 @@
|
|
|
let d = date.getDate()
|
|
|
d = d < 10 ? '0' + d : d
|
|
|
|
|
|
- return 'video/' + y + '-' + MM + '-' + d + '/'
|
|
|
+ return 'video/Operate/' + y + '-' + MM + '-' + d + '/'
|
|
|
},
|
|
|
contentAll() {
|
|
|
var count, arr = []
|
|
|
if (this.pans[0].list.length > 0) {
|
|
|
for (let i = 0; i < this.pans[0].list.length; i++) {
|
|
|
|
|
|
- arr.push(...this.pans[0].list[i].imageUrlList, ...this.pans[0].list[i].imageList)
|
|
|
+ arr.push(...this.pans[0].list[i].checkArrImage, ...this.pans[0].list[i].imageList)
|
|
|
}
|
|
|
return arr.length + this.content
|
|
|
} else {
|