Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}">
 		<view class="right-container-title-nav">
-			<view class="title-card">
+			<view class="title-card" @click="nusing">
 				<view class="card-top">
 					<view class="card-top-left">
 						50
@@ -25,7 +25,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="title-card">
+			<view class="title-card"  @click="nusing">
 				<view class="card-top">
 					<view class="card-top-left">
 						32
@@ -49,7 +49,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="title-card">
+			<view class="title-card"  @click="nusing">
 				<view class="card-top" >
 					<view class="card-top-left">
 						65
@@ -118,7 +118,7 @@
 				</view>
 			</view>
 			<image class="big-img"
-				:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" />
+				:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
 			<view style="display: flex;align-items: center;">
 				<view class="server-name" v-if="indexmessage?.startTime">
 					{{ indexmessage?.directiveName }}
@@ -126,24 +126,30 @@
 			</view>
 			<view style="display: flex;margin-top: 40rpx;">
 				<view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
-					<view class="start-button" v-show="indexmessage?.startTime">
+					<view :class="indexmessage.izStart=='N'?'start-button':'end-button'" v-show="indexmessage?.startTime"   @click="start(indexmessage)">
 						开始服务
 					</view>
 				</view>
 				<view style="width: 240rpx;height: 90rpx;">
-					<view class="end-button" v-show="indexmessage?.startTime">
+					<view :class="(indexmessage.izStart=='Y'&& indexmessage.izFinish=='N')?'start-button':'end-button'" v-show="indexmessage?.startTime"  @click="end(indexmessage)">
 						结束服务
 					</view>
 				</view>
 
 			</view>
 		</view>
-		<view class="left-menu" v-show="indexmessage?.startTime">
+		<view class="left-menu" >
-			<view v-for="(item,index) in leftArray" :key="index" style="margin: 30rpx 0;">
+			<view v-for="(item,index) in 3" :key="index" style="margin: 30rpx 0;">
-				<view class="left-ball">
+				<view class="left-ball" :style="indexmessage?.izStart=='Y'?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
-					<image class="left-menu-img" :src="item" />
+					<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+index+'.png'" />
+				</view>
+			</view>
+		</view>
+		<view class="left-menu" v-if="indexmessage?.izStart=='Y'" >
+			<view v-for="(item,index) in [3,4]" :key="index" style="margin: 30rpx 0;">
+				<view class="left-ball">
+					<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+item+'.png'" />
 				</view>
-
 			</view>
 		</view>
 		<view class="right-menu" v-show="indexmessage?.startTime">
@@ -299,6 +305,7 @@
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
 	import { queryWorkCareList } from './api.js'
+	import {startOrder,endOrder} from './doctorask/api/api.js'
 
 	const props = defineProps({
 		isShow: {
@@ -338,6 +345,29 @@
 		// e.detail.scrollTop 就是当前滚动距离
 		scrollTop.value = e.detail.scrollTop
 	}
+	const start = (v) =>{
+		if(v.izStart!='N'){return}
+		startOrder({id:v.directiveId}).then(res=>{
+			console.log(res)
+			if(res.success){
+				v.izStart = "Y";
+			}else{
+				
+				
+			}
+		})
+	}
+	const end = (v)=>{
+		if(v.izStart!='Y'&& v.izFinish!='N'){return}
+		endOrder({id:v.directiveId}).then(res=>{
+			if(res.success){
+				v.izStart = "N";
+				v.izFinish = "Y";
+			}else{
+				
+			}
+		})
+	}
 	// 通用的生成函数
 	function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
 		return Array.from({ length: count }, (_, i) => {
@@ -348,10 +378,10 @@
 		})
 	}
 	const rightMenu = ref([
-		{
+		// {
-			url: "/static/index/newindex/rightmenu/0.png",
+		// 	url: "/static/index/newindex/rightmenu/0.png",
-			name: '重点追踪'
+		// 	name: '重点追踪'
-		},
+		// },
 		{
 			url: "/static/index/newindex/rightmenu/1.png",
 			name: '转单执行'
@@ -365,7 +395,7 @@
 	const leftArray = ref(genPaths(
 		'/static/index/newindex/leftmenu',
 		'left', 
-		5,     // 张数
+		5, 
 		'png',
 		0,     // 起始索引
 		false  // 不补零
@@ -491,9 +521,9 @@
 			workType: 5
 		}
 		queryWorkCareList(data).then((res : any) => {
-			// console.log("看看图",res.result.records[0])
+			console.log("看看图",res.result.records[0])
 			indexmessage.value = res.result.records[0]; 
-			// console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
+			console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
 		})
 	}
 	const lanjie = ref(false);
@@ -502,6 +532,27 @@
 			url: "/pages/watch/full"
 		})
 	}
+	const minuteArr = ['00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55']
+	const timearr = ref(
+		Array.from({ length: 24 }, (_, hour) => ({
+			positioning: hour.toString(),
+			children: minuteArr.map(time => ({
+				tagName: time,           // 表示分钟，如 '00', '05' 等
+				directiveName: '' // 默认的 directiveName
+			}))
+		}))
+	)
+	const nusing = ()=>{
+		uni.setStorage({
+			key: 'myArray',
+			data: timearr.value,
+			success: function () {
+				uni.navigateTo({
+					url: `/pages/timeMatrix/indexnew`
+				})
+			},
+		});
+	}
 </script>
 
 <style scoped lang="less">
@@ -720,7 +771,7 @@
 
 	.big-img {
 		margin-top: 40rpx;
-		width: 450rpx;
+		// width: 450rpx;
 		height: 450rpx;
 		z-index: 10;
 	}
@@ -820,7 +871,6 @@
 	}
 
 	.left-ball {
-
 		width: 80rpx;
 		height: 80rpx;
 		border-radius: 50%;
@@ -828,7 +878,6 @@
 		justify-content: center;
 		align-items: center;
 		
-		background-color: #fff;
 
 		.left-menu-img {
 			width: 40rpx;
@@ -854,7 +903,7 @@
 
 		.right-scroll {
 			width: 100%;
-			height: 650rpx;
+			height: 450rpx;
 		}
 
 		.white-circle {

pages/NursingNew/component/leftcontent/leftcontent.vue

@@ -13,9 +13,12 @@
 					<!-- <view class="heng guodu" :style="i!=dexleft&&i!=list.length-1?'opacity: 1':'opacity: 0'"></view> -->
 				</view>
 			</view>
-			<view class="logo tp">
+			<view class="logo">
+				<view class="tp">
 					<image src="/static/shouye/xd.png" mode="aspectFill"></image>
 				</view>
+				<text>{{uni.getStorageSync('realname')}}</text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -44,12 +47,24 @@
 		flex-direction: column;
 		justify-content: space-between;
 		align-items: center;
-		padding: 3.8vw 0 0vw 0;
+		padding: 3.8vw 0 1vw 0;
 		margin-right: 3vw;
 		.logo{
+			width: 3.8vw;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			view{
 				width: 3.8vw;
 				height: 3.8vw;
 			}
+			text{
+				font-size: 1.2vw;
+				margin-top: 0.6vw;
+				color: #666666;
+			}
+		}
 		.logomain{
 			width: 6vw;
 			height: 6vw;