|
@@ -155,7 +155,7 @@
|
|
|
<div class="remarks">
|
|
|
<a-textarea placeholder="请填写备注内容(选填)" v-model="curZbItem.comments" :rows="4" />
|
|
|
</div>
|
|
|
- <div class="icons">
|
|
|
+ <div class="icons" @click="takePhotos(2)">
|
|
|
<a-icon class="aicon" type="camera" />
|
|
|
</div>
|
|
|
</div>
|
|
@@ -273,7 +273,6 @@
|
|
|
},
|
|
|
// 获取视频地址成功
|
|
|
getVideoUrlSuccess(url){
|
|
|
- console.log(url)
|
|
|
// 重置播放器
|
|
|
this.showYt = false
|
|
|
this.showYtbtns = false
|
|
@@ -386,15 +385,19 @@
|
|
|
let obj = this.zbItem[this.activeZbIndex]
|
|
|
this.curZbItem = JSON.parse(JSON.stringify(obj))
|
|
|
// 抓拍
|
|
|
- this.takePhotos()
|
|
|
+ this.takePhotos(1)
|
|
|
},
|
|
|
// 抓拍
|
|
|
- takePhotos(){
|
|
|
- this.sendMsg('takePhotos',JSON.stringify({
|
|
|
- streamId: this.curVideo.streamId,
|
|
|
- videoPlayerStatus: this.videoPlayerStatus,
|
|
|
- type: 1
|
|
|
- }))
|
|
|
+ takePhotos(type){
|
|
|
+ if(!this.curZbItem.taskTargetPhotoVOList||this.curZbItem.taskTargetPhotoVOList.length<6){
|
|
|
+ this.sendMsg('takePhotos',JSON.stringify({
|
|
|
+ streamId: this.curVideo.streamId,
|
|
|
+ videoPlayerStatus: this.videoPlayerStatus,
|
|
|
+ type: type
|
|
|
+ }))
|
|
|
+ }else{
|
|
|
+ this.sendMsg('toast','最多抓拍6张图片')
|
|
|
+ }
|
|
|
},
|
|
|
// 拍照成功后,返回图片地址
|
|
|
takePhotoSuccess(url){
|
|
@@ -402,8 +405,8 @@
|
|
|
id: new Date().getTime(),
|
|
|
photoPath: url
|
|
|
}
|
|
|
- console.log(this.curZbItem.taskTargetPhotoVOList)
|
|
|
- if(this.curZbItem.taskTargetPhotoVOList){
|
|
|
+ console.log(JSON.stringify(this.curZbItem))
|
|
|
+ if(!this.curZbItem.hasOwnProperty('taskTargetPhotoVOList')){
|
|
|
this.curZbItem.taskTargetPhotoVOList = [obj]
|
|
|
}else{
|
|
|
this.curZbItem.taskTargetPhotoVOList.push(obj)
|