同步

pages/NursingNew/component/doctorask/api/api.js

@@ -15,3 +15,32 @@ export const queryCareInfoList = (params) => {
 		data: params,
 	})
 }
+
+export const startOrder = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/startOrder`,
+		method: 'post',
+		data: params,
+	})
+}
+export const endOrder = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/endOrder`,
+		method: 'post',
+		data: params,
+	})
+}
+export const editSubMp4 = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubMp4`,
+		method: 'post',
+		data: params,
+	})
+}
+export const editSubPicPath = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubPicPath`,
+		method: 'post',
+		data: params,
+	})
+}

pages/NursingNew/component/doctorask/doctorask.vue

@@ -66,32 +66,141 @@
 										<text  style="white-space: nowrap;"> 结束时间: </text>
 										<view>{{v.endTime.slice(0,16)}}</view>
 									</view>
+									
 								</view>
 								<view class="fubtn" >
-									<view class="ld">开始服务</view> 
+									<view class="ld" @click="start(v)" v-if="v.izStart=='N'">开始服务</view> 
-									<view class="ld">结束服务</view>
+									<view class="ld"  v-if="v.izStart=='Y'&& v.izFinish=='N'" @click="end(v)">结束服务</view>
-									<view class="bd">录像</view>
+									<view class="bd"  v-if="(v.izStart=='Y'&& v.izFinish=='N')||v.manuallyMp4Path!=null" @click="ysptp(v,i,2)">录像</view>
-									<view class="bd">拍照</view>
+									<view class="bd" v-if="(v.izStart=='Y'&& v.izFinish=='N')|| v.manuallyPicPath!=null"  @click="ysptp(v,i,1)" >拍照</view>
 								</view>
 							</view>
+							
 						</view>
 					</view>
 				</scroll-view>
 			</view>
 		</view>
+		
+		
+		
+		<!-- 照片墙 -->
+		<view class="mengban" v-if="topbuttontarget>0" @click="topbuttontarget=0"></view>
+		<view class="photowall" v-show="topbuttontarget>0" :style="donghuaopo?{opacity:1}:{opacity:0}">
+			<view class="photowall-title">
+				<view class="photowall-name">
+					{{ topbuttontarget==1?`照片`:`录像` }}
+				</view>
+			</view>
+			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation enable-flex v-if="topbuttontarget>0">
+				<view class="photowall-other" >
+				<view class="photowall-other-one" v-for="(item,index) in ilanarr" :key="index"
+					@click="previewImage(item,index,ilanarr)">
+					<view  v-if="topbuttontarget==1"  style="width: 100%;height: 70%;border-radius: 30rpx;position: relative;">
+						<image style="width: 100%;height: 100%;border-radius: 30rpx;"
+							:src="item?serverUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill"
+							:lazy-load="true"/>
+						<view @click.stop="open=1;del(item,index)"
+						style="width: 1.6vw;
+						height: 1.6vw;
+						z-index: 20;
+						position: absolute;
+						right: -1vw;
+						top: -0.7vw;
+						background: red;
+						display: flex;
+						justify-content: center;
+						border-radius: 50%;
+						align-items: center;"
+						 v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+							<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" 
+							style="width: 1.4vw;
+						height: 1.4vw;"></image>
+						</view>
+					</view>
+					<view  v-if="topbuttontarget==2" style="width: 100%;height: 70%;border-radius: 30rpx ;position: relative;" @click="clik(serverUrl + item)">
+						<video style="width: 100%;height: 100%;border-radius: 30rpx;"  :id="'myVideo'+index" 
+						:src="servervideoUrl+item"
+						  mode="aspectFill"  ></video>
+						<view @click.stop="ilanarr.splice(index,1)"
+						 v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')"
+						style="width: 1.6vw;
+						height: 1.6vw;
+						z-index: 20;
+						position: absolute;
+						right: -1vw;
+						top: -0.7vw;
+						background: red;
+						display: flex;
+						justify-content: center;
+						border-radius: 50%;
+						align-items: center;">
+							<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" 
+							style="width: 1.4vw;
+						height: 1.4vw;"></image>
+						</view>
+					</view>
+					<!-- <view style="margin-top: 20rpx;">
+						<text style="color: #888888;">
+							上传时间:
+						</text>
+						<text style="margin-left: 15rpx;">
+							{{item.createTime.replace(/-/g, '.')}}
+						</text>
+					</view>
+					<view style="margin-top: 10rpx;">
+						<text style="color: #888888;letter-spacing: 8.9rpx;">
+							上传人:
+						</text>
+						<text>
+							{{item.createBy}}
+						</text>
+					</view> -->
+				</view>
+				<view class="photowall-other-one" v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+					<view style="width: 100%;height: 71%;display: flex;flex-direction: column;
+						justify-content: center;align-items: center;position: absolute;top:0vw;left: 0;
+						background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;" @click="uplod(1)">
+						<image style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
+							src="/static/index/warehouse/procurement/picking/addphoto.png" />
+						<view style="color: #78B1EB;">
+							点击上传{{topbuttontarget==1?'图片':'录像'}}
+						</view>
+					</view>
+				</view>
+				<!-- <view class="noarray" v-if="!ilanarr.length">
+					<image class="noarray-img" src="/static/index/warehouse/procurement/picking/noarray.png"
+						mode="aspectFill" />
+					<view class="noarray-font">
+						暂无照片
+					</view>
+				</view> -->
+			</view>
+			</scroll-view>
+			<view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;" v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+				<button type="primary" style="width: 9vw; position: absolute;right: 0vw;bottom: 0.vw;" @click="submit" >确定</button>
+			</view>
+		</view>
+		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
 	</view>
 </template>
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
-	import {queryCareList,queryCareInfoList} from './api/api.js'
+	import {queryCareList,queryCareInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from './api/api.js'
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
+	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
+	
 	const form = reactive({
 		pageNo: 1,
 		pageSize: 10,
 		employeeId:uni.getStorageSync('userInfo').employessId, 
 		nuId:uni.getStorageSync('nuId')
 	})
+	const open = ref(0)
+	const clik = (e)=>{
+		console.log(e)
+	}
 	const plsbuy = ref([])
 	onMounted(() => {
 		form.pageNo=1;
@@ -107,7 +216,7 @@
 	}
 	const firstgetqueryCgdList = () => {
 		queryCareList(form).then(res => {
-			console.log(res)
+			console.log(res,serverUrl.value)
 			plsbuy.value.push(...res.result.records);
 			status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
 			if(form.pageNo==1){
@@ -134,28 +243,262 @@
 			console.log(res)
 			cardarr.value = res.result
 		})
-		if (item.izRead == 'N') {
-				transReads(item, index)
-			}
 		}
 	const sctop = ref(0)
 	const scroll = (e)=>{
 		sctop.value = e.detail.scrollTop
 	}
-	const addMaterial = ref([])
+	const start = (v) =>{
-	const transReads = (v, i) => {
+		startOrder({id:v.id}).then(res=>{
-		transRead({ id: v.id })
+			console.log(res)
-		v.izRead = 'Y'
+			if(res.success){
+				v.izStart = "Y"
+				clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+			}else{
+				
+				
 			}
-	const tharrlist = ref([])
-	const thlist = () => {
-		thdList(form).then(res => {
-			tharrlist.value=res.result.records;
 		})
 	}
+	const end = (v)=>{
+		endOrder({id:v.id}).then(res=>{
+			if(res.success){
+				v.izStart = "N";
+				v.izFinish = "Y";
+				clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+			}else{
+				
+			}
+		})
+	}
+	const donghuaopo = ref(false);
+	const topbuttontarget = ref(0);
+	const ilanarr = ref([]);
+	const listobj = ref({})
+	const ysptp = (v,i,r) =>{
+		// v.manuallyPicPath
+		if(r == 1&&v.manuallyPicPath){
+			ilanarr.value = v.manuallyPicPath.split(",");
+			ilanarr.value = ilanarr.value.filter(item => item !== '');
+		}else if(r == 2&&v.manuallyMp4Path){
+			ilanarr.value = v.manuallyMp4Path.split(",");
+			ilanarr.value = ilanarr.value.filter(item => item !== '');
+		}else{
+			ilanarr.value = [];
+		}
+		
+		listobj.value = v;
+		topbuttontarget.value = r;
+		donghuaopo.value = true;
+	}
+	const uplod = (v) => {
+		if(topbuttontarget.value==1){
+			uni.chooseImage({
+				count: 1, //默认9
+				sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['camera'], //从相册选择
+				success: (e) => {
+					let ar = JSON.stringify(e.tempFilePaths)
+					uni.compressImage({
+						src: JSON.parse(ar)[0],
+						quality: 60,
+						success: res => {
+							sxdupld(res.tempFilePath)
+							// v.picPatharr.push(res.tempFilePath);
+							// console.log(v.picPatharr)
+						}
+					})
+				}
+			});
+		}else{
+			uni.chooseVideo({
+				sourceType: ['camera' ],
+				success: (e)=> {
+					uni.compressVideo({
+						src: e.tempFilePath,
+						quality: 60,
+						success: res => {
+							sxdupld(res.tempFilePath)
+							// v.picPatharr.push(res.tempFilePath);
+							// console.log(v.picPatharr)
+						}
+					})
+					// sxdupld(res.tempFilePath )
+				}
+			});
+		}
+		
+	}
+	const sxdupld = (e) => {
+		let now = new Date();
+		let year = now.getFullYear();
+		let month = now.getMonth() + 1;
+		uni.uploadFile({
+			url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+			filePath: e,
+			name: 'file',
+			fileType:topbuttontarget.value==2?'video':'image',
+			formData: {
+				biz: year + '/' + month + (topbuttontarget.value==1?'/fwxm/manuallyPicPath':'/fwxm/manuallyMp4Path')
+			},
+			header: {
+				'X-Access-Token': uni.getStorageSync('token')
+			},
+			success: res => {
+				const data = JSON.parse(res.data);
+				console.log(data)
+				ilanarr.value.push(data.message)
+			},
+			fail: () => {
+				uni.showToast({ title: '上传失败', icon: 'none' })
+			}
+		})
+	}
+	const submit = ()=>{
+		let sub = "";
+		ilanarr.value.forEach(item=>{
+			sub+=item+','
+		})
+		if(topbuttontarget.value == 1){
+			editSubPicPath({id:listobj.value.id,manuallyPicPath:sub}).then(res=>{
+				if(res.success){
+					topbuttontarget.value = 0;
+					donghuaopo.value = false;
+					clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+				}
+			})
+		}else{
+			editSubMp4({id:listobj.value.id,manuallyMp4Path:sub}).then(res=>{
+				if(res.success){
+					topbuttontarget.value = 0;
+					donghuaopo.value = false;
+					clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+				}
+			})
+		}
+	}
+	const previewImage = (v, i, arr) => {
+		if(topbuttontarget.value == 1){
+			let u = []
+			arr.forEach(e => {
+				u.push(serverUrl.value + e)
+				console.log(serverUrl.value + e)
+			})
+			uni.previewImage({
+				current: i,
+				urls: u,
+				showmenu: false,
+				longPressActions: {
+					itemList: [],
+				}
+			})
+		}
+	}
+	const videoContext = ref(null)
+	const play = (e,i)=>{
+		 videoContext.value = uni.createVideoContext('myVideo'+i);
+		 videoContext.value.play()
+	}
+	const pici = ref(0);
+	const del = (v,i) =>{
+		pici.value = i;
+	}
+	const del1=()=>{
+		ilanarr.value.splice(pici.value,1);
+		open.value = 0
+	}
 </script>
 
 <style scoped lang="less">
+	
+	.noarray {
+		width: 90%;
+		height: 100%;
+		// background-color: red;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	
+		.noarray-img {
+			margin-top: -200rpx;
+			width: 350rpx;
+			height: 350rpx;
+		}
+	
+	}
+	
+	.noarray-font {
+		margin-top: -60rpx;
+		color: #888888;
+		font-size: 25rpx;
+	}
+	.mengban {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+		background: RGBA(239, 240, 244, 0.55);
+	}
+	.photowall {
+		position: fixed;
+		top: 54%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 80vw;
+		height: 83%;
+		border-radius: 30rpx;
+		background-color: #fff;
+		transition: all 0.3s;
+		z-index: 999;
+		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
+		padding: 0 90rpx;
+		.photowall-title {
+			margin-top: 50rpx;
+			display: flex;
+			justify-content: space-between;
+			width: 100%;
+			margin-bottom: 50rpx;
+	
+			.photowall-name {
+				font-size: 38rpx;
+				// font-weight: 600;
+			}
+	
+			.photowall-left {
+				color: #888888;
+			}
+	
+			.photowall-right {
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+		}
+	
+		.photowall-other {
+			width: 76vw;
+			height: 62vh;
+			display: flex;
+			margin-top: 20rpx;
+			flex-wrap: wrap;
+			.photowall-other-one {
+				width: 22vw;
+				height: 430rpx;
+				margin-right: 3vw;
+				margin-bottom: 0%;
+				border-radius: 30rpx;
+				display:flex;
+				position: relative;
+				video{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+	
 	.left-menu-father {
 		width: 33vw;
 		height: 90vh;
@@ -409,13 +752,13 @@
 			flex-wrap: wrap;
 		}
 		.fler{
-			width: 44vw;
+			width: 46vw;
-			height: 13vw;
+			min-height: 13vw;
 			margin-bottom: 0.9vw;
 			margin-left: 0.5vw;
 			.carditem{
 				width: 46vw;
-				height: 16vw;
+				height: 15vw;
 				background: rgba(245, 246, 248, 1);
 				border-radius: 1.1vw;
 				position: relative;

pages/Warehouse/Warehouse.vue

@@ -53,7 +53,7 @@
 			<donghua width="40vw" height="40vw" :interval="150" :links="jianhuoarray" :playing="playall" :loop="true" />
 		</view>
 		<view class="pandan tp" @click="housactive(5)">
-			<image src="/static/index/warehouse/newhome/count.png" mode="widthFix"></image>
+			<image src="/static/index/warehouse/newtwo/count.png" mode="widthFix"></image>
 		</view>
 		<view class="pandantag tp" @click="housactive(5)">
 			<view class="gray-bgc">
@@ -63,7 +63,7 @@
 			</view>
 		</view>
 		<view class="return tp" @click="housactive(8)">
-			<image src="/static/index/warehouse/newhome/return.png" mode="widthFix"></image>
+			<image src="/static/index/warehouse/newtwo/return.png" mode="widthFix"></image>
 		</view>
 		<view class="leadtag tp" @click="housactive(8)">
 			<view class="gray-bgc">
@@ -73,7 +73,7 @@
 			</view>
 		</view>
 		<view class="lead tp" @click="housactive(7)">
-			<image src="/static/index/warehouse/newhome/lead.png" mode="widthFix"></image>
+			<image src="/static/index/warehouse/newtwo/lead.png" mode="widthFix"></image>
 		</view>
 		<view class="returntag tp" @click="housactive(7)">
 			<view class="gray-bgc">
@@ -84,7 +84,7 @@
 		</view>
 
 		<view class="picking tp" @click="housactive(2)">
-			<image src="/static/index/warehouse/newhome/picking.png" mode="widthFix"></image>
+			<image src="/static/index/warehouse/newtwo/picking.png" mode="widthFix"></image>
 		</view>
 		<view class="pickingtag tp" @click="housactive(2)">
 			<view class="blue-bgc">
@@ -105,7 +105,7 @@
 
 	const cararray =
 		genPaths(
-			'/static/index/warehouse/newhome/',
+			'/static/index/warehouse/newtwo/',
 			'train',
 			10,    // 张数
 			'png',
@@ -115,7 +115,7 @@
 	const cartarget = ref(0)
 	const paiziarray =
 		genPaths(
-			'/static/index/warehouse/newhome/',
+			'/static/index/warehouse/newtwo/',
 			'logo',
 			3,    // 张数
 			'png',
@@ -124,7 +124,7 @@
 		)
 	const jiankongarray =
 		genPaths(
-			'/static/index/warehouse/newhome/',
+			'/static/index/warehouse/newtwo/',
 			'monitor',
 			8,    // 张数
 			'png',
@@ -133,7 +133,7 @@
 		)
 	const wanjiearray =
 		genPaths(
-			'/static/index/warehouse/newhome/',
+			'/static/index/warehouse/newtwo/',
 			'end',
 			6,    // 张数
 			'png',
@@ -141,7 +141,7 @@
 			false  // 不补零
 		)
 	const caigouarray = genPaths(
-		'/static/index/warehouse/newhome/',
+		'/static/index/warehouse/newtwo/',
 		'purchase',
 		8,    // 张数
 		'png',
@@ -149,7 +149,7 @@
 		false  // 不补零
 	)
 	const rukuarray = genPaths(
-		'/static/index/warehouse/newhome/',
+		'/static/index/warehouse/newtwo/',
 		'unit1-',
 		5,    // 张数
 		'png',
@@ -157,7 +157,7 @@
 		false  // 不补零
 	)
 	const jianhuoarray = genPaths(
-		'/static/index/warehouse/newhome/',
+		'/static/index/warehouse/newtwo/',
 		'Warehouse',
 		8,    // 张数
 		'png',

pages/watch/index.vue

@@ -714,12 +714,12 @@
 				url: '/pages/NursingNew/index'
 			})
 		} else if (typeNow.value === 2) {
-			// uni.navigateTo({
-			// 	url: '/pages/Warehouse/Warehouse'
-			// })
 			uni.navigateTo({
-				url: '/pages/Warehouse/warehome',
+				url: '/pages/Warehouse/Warehouse'
 			})
+			// uni.navigateTo({
+			// 	url: '/pages/Warehouse/warehome',
+			// })
 		}
 	}