lilei 4 лет назад
Родитель
Сommit
e3b14eaf8e

+ 3 - 3
hybrid/html/ddvideo.html

@@ -22,7 +22,7 @@
 	<body>
 		<div class="storeCheck" id="app">
 			<!-- 播放器 -->
-			<div class="videoPlay" v-if="xdType=='video'">
+			<div class="videoPlay" v-if="xdType=='video'&&videoList.length">
 				<!-- 云台控制 -->
 				<div class="control-yt" v-show="showYt&&!showYtbtns" @click="openYt"></div>
 				<div class="control-yt-close" v-show="showYtbtns" @click="openYt"></div>
@@ -37,7 +37,7 @@
 			<div class="checkWork">
 				<!-- 统计及摄像头切换 -->
 				<div class="checkWork-head">
-					<div class="checkWork-head-row" v-if="xdType=='video'">
+					<div class="checkWork-head-row" v-if="xdType=='video'&&videoList.length">
 						<!-- 机位 -->
 						<div>
 							<div>机位:</div>
@@ -117,7 +117,7 @@
 				</div>
 				<!-- 提交按钮 -->
 				<div class="checkWork-button">
-					<div v-if="xdType=='video'" @click="submitTask">提交</div>
+					<div @click="submitTask">提交</div>
 				</div>
 			</div>
 			<!-- 拍照弹框 -->

+ 34 - 4
pages/spotCheck/spotCheck.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import { clzConfirm,saveBase64ToAliOss } from '@/libs/tools'
+	import { clzConfirm,saveBase64ToAliOss,saveImgToAliOss } from '@/libs/tools'
 	import {getTaskDetail,savePointTask} from '@/api/task'
 	import {getTaskTargetById} from '@/api/taskTarget'
 	import { photoPaiZhao, getVideoUrl } from '@/api/store';
@@ -43,8 +43,16 @@
 					this.getStoreVideoUrl(JSON.parse(data.msg))
 				}
 				// 抓拍图片
-				if(data.action == 'takePhotos'){
-					this.takePhotos(JSON.parse(data.msg))
+				if (data.action == 'takePhotos') {
+					console.log('takePhotos');
+					// 截图
+					if (this.types == 'video') {
+						this.takePhotos(JSON.parse(data.msg));
+					}
+					// 拍照
+					if (this.types == 'scene') {
+						this.camerPhotos();
+					}
 				}
 				// 保存编辑后的图片
 				if(data.action == 'saveEditImg'){
@@ -108,6 +116,26 @@
 					})
 				}
 			},
+			// 摄像机拍照
+			camerPhotos() {
+				const _this = this;
+				uni.chooseImage({
+					count: 1, //最多可以选择的图片张数,默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
+					sourceType: ['camera'], //album 从相册选图,camera 使用相机,默认二者都有
+					success: function(res) {
+						// tempFilePaths 图片的本地文件路径列表,tempFiles 图片的本地文件列表,每一项是一个 File 对象
+						uni.showLoading({
+							title:'正在保存图片...',
+							mask: true
+						})
+						saveImgToAliOss(res.tempFilePaths[0], function(ret) {
+							_this.wv.evalJS("vm.takePhotoSuccess('" + ret.data + "')");
+							uni.hideLoading()
+						});
+					}
+				});
+			},
 			// 上传编辑后的图片到阿里云
 			uploadImg(formData) {
 				const _this = this;
@@ -129,7 +157,9 @@
 			// 获取视频列表
 			getVideoList(){
 				let list = this.$store.state.vuex_storeVideoList
-				this.wv.evalJS("vm.setVideoList('"+JSON.stringify(list)+"')")
+				if(list.length){
+					this.wv.evalJS("vm.setVideoList('"+JSON.stringify(list)+"')")
+				}
 			},
 			// 获取视频地址
 			getStoreVideoUrl(item){

+ 9 - 9
pages/spotCheckCenter/spotChecking.vue

@@ -182,19 +182,19 @@ export default {
 		//  开始点检
 		toSpotCheck(item){
 			console.log(item)
-			console.log('/pages/spotCheck/spotCheck?taskId=' + item.id + '&types=video&storeId='+item.storeId+'&storeName='+item.storeName)
 			// 判断当前门店是否已绑定设备
 			findStoreVsDevice({storeCode:item.storeCode}).then(res=>{
-				if(res.data.length){
-					// 门店下的设备
-					this.$u.vuex('vuex_storeVideoList',res.data)
-					uni.navigateTo({
-						url: '/pages/spotCheck/spotCheck?taskId=' + item.id + '&types=video&storeId='+item.storeId+'&storeName='+item.storeName
-					}); 
-				}else{
+				// 门店下的设备
+				this.$u.vuex('vuex_storeVideoList',res.data.length?res.data:[])
+				const types = res.data.length?"video":"scene"
+				uni.navigateTo({
+					url: '/pages/spotCheck/spotCheck?taskId=' + item.id + '&types='+types+'&storeId='+item.storeId+'&storeName='+item.storeName
+				}); 
+				if(res.data.length==0){
 					uni.showToast({
 						icon: 'none',
-						title: '未绑定摄像设备,请核实实际情况后再操作点检任务!'
+						title: '未绑定摄像设备,请核实实际情况后再操作点检任务!',
+						duration: 5000
 					})
 				}
 			})

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 6 - 22
unpackage/dist/dev/app-plus/app-view.js


Некоторые файлы не были показаны из-за большого количества измененных файлов