From 6564273873d900ca7c68ee293bed015d89c2640d Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Wed, 21 Jan 2026 13:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/public/severcard.vue                |  9 +--
 pages/NursingNew/component/index.vue          | 25 ++++----
 .../pleasetake/component/takehomep.vue        |  1 -
 pages/Warehouse/index/component/index.vue     | 61 ++++---------------
 4 files changed, 31 insertions(+), 65 deletions(-)

diff --git a/component/public/severcard.vue b/component/public/severcard.vue
index b1e633a..3ea5f8c 100644
--- a/component/public/severcard.vue
+++ b/component/public/severcard.vue
@@ -2,8 +2,8 @@
 	<view>
 		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" v-if="qcobj.startTime">
 			<view class="fixed-card-left">
-				<image class="card-left-img" :style="!qcobj?.previewFile?'width: 450rpx':''"
-					:src="qcobj?.previewFile? 'https://www.focusnu.com/media/upFiles/' + qcobj?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
+				<image class="card-left-img" 
+					:src="qcobj?.previewFile? serverUrl + qcobj?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
 				<view class="">
 					{{qcobj.directiveName}}
 				</view>
@@ -50,7 +50,7 @@
 	 const openleft = ref(true)
 	 const open = ref(0);
 	 const zdcont = ref('');
-	 const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
+	 const serverUrl = ref(uni.getStorageSync('imagebase'))
 	 const emit = defineEmits([ 'start' ,'end'])
 	 const form = reactive({
 	 	pageNo: 1,
@@ -210,13 +210,14 @@
 			.button-left {
 				width: 8vw;
 				height: 3.3vw;
-				background-color: #fff;
+				background: linear-gradient(to bottom, #FFFFFF, #C8D0D9);
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				border-radius: 1.2vw;
 				border: 1rpx solid #C7D2E4;
 				color: #333333;
+				
 			}
 	
 			.button-right {
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index ce10eed..c3b5c8f 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -153,7 +153,7 @@
 			</view>
 			<tanchuang :show="open==3" font="是否结束服务指令？" @back="open = 0" @right="ends()"> </tanchuang>
 			<image class="big-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
-				:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
+				:src="indexmessage?.previewFile? serverUrl + 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 }} 
@@ -494,7 +494,7 @@
 					@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"
+							:src="item?serverpicUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill"
 							:lazy-load="true"/>
 						<view @click.stop="open=1;del(item,index)"
 						style="width: 1.6vw;
@@ -606,8 +606,9 @@
 	// import {startOrder,endOrder} from './doctorask/api/api.js'
 	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder,generateInstant} from '../component/doctorask/api/api.js'
 	import { getNclist } from "./nurse/api.js";
-	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
+	const serverUrl = ref(uni.getStorageSync('imagebase') )
 	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
+	const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const form = reactive({
 		pageNo: 1,
 		pageSize: 10,
@@ -716,7 +717,7 @@
 			}
 			assistOrder(obj).then(res=>{
 				if(res.success){
-					queryOrderList(form.nuId)
+					firstgetqueryCgdList(form.nuId)
 					// clickLeftMenu(0,{id:indexmessage.value.mainId})
 					flag.value = false;
 					zxzd.value = 0;
@@ -729,7 +730,6 @@
 	const firstgetqueryCgdList = (nuId) => {
 		form.nuId = nuId;
 		queryOrderList(form).then(res => {
-			console.log(res)
 			if(res.result.records.length>0){
 				indexmessage.value = res.result.records[0]
 				// clickLeftMenu(0,res.result.records[0])
@@ -740,7 +740,6 @@
 	}
 	const clickLeftMenu = (index : any, item : object) => {
 		queryOrderInfoList({ mainId: item.id }).then(res => {
-			console.log(res)
 			if(res.result.length>0){
 				indexmessage.value = res.result[0]  
 			}else{
@@ -847,16 +846,17 @@
 				if(res.success){
 					topbuttontarget.value = 0;
 					donghuaopo.value = false;
-					queryOrderList(form.nuId)
+					firstgetqueryCgdList(form.nuId)
 					// clickLeftMenu(0,{id:indexmessage.value.mainId})
 				}
 			})
 		}else{
 			editSubMp4({id:listobj.value.id,manuallyMp4Path:sub}).then(res=>{
+				console.log({id:listobj.value.id,manuallyMp4Path:sub},res)
 				if(res.success){
 					topbuttontarget.value = 0;
 					donghuaopo.value = false;
-					queryOrderList(form.nuId)
+					firstgetqueryCgdList(form.nuId)
 					// clickLeftMenu(0,{id:indexmessage.value.mainId})
 				}
 			})
@@ -866,7 +866,7 @@
 		if(topbuttontarget.value == 1){
 			let u = []
 			arr.forEach(e => {
-				u.push(serverUrl.value + e)
+				u.push(serverpicUrl.value + e)
 			})
 			uni.previewImage({
 				current: i,
@@ -954,6 +954,7 @@
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
+		severcards.value.firstgetqueryCgdList()
 		firstgetqueryCgdList(data.nuId);
 		hlylhq(data.nuId,data.elderInfo?.id)
 		zlfunc(data.nuId,data.elderInfo?.id)
@@ -966,7 +967,6 @@
 			elderId:elderId
 		}
 		queryCountByType(data).then(res=>{
-			console.log(res)
 			hldyobj.value = res.result
 		})
 	}
@@ -1063,6 +1063,7 @@
 			endOrder({id:indexmessage.value.id}).then(res=>{
 			if(res.success){
 				open.value=0;
+				severcards.value.firstgetqueryCgdList()
 				firstgetqueryCgdList(uni.getStorageSync('nuId'))
 			}else{
 				
@@ -1644,7 +1645,7 @@
 		align-items: center;
 		border-radius: 40rpx;
 		color: #fff;
-		font-size: 30rpx;
+		font-size: 1.5vw;
 
 	}
 
@@ -1656,7 +1657,7 @@
 		justify-content: center;
 		align-items: center;
 		border-radius: 40rpx;
-		font-size: 30rpx;
+		font-size: 1.5vw;
 	}
 
 	.pao-father {
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index a0cba51..4f32471 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -56,7 +56,6 @@
 		<submits :show="subshow" :list="addMaterial" @fill="subshow = false" @config="tijiao"></submits>
 		<tanchuang @back="thshow = false" :show="thshow" font="是否发起退货流程？" @right="thclk"></tanchuang>
 		<errorshow :show="openerror" :font="errmsg" @close="openerror=false" />
-		<severcard></severcard>
 	</view>
 </template>
 
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 54622ca..6eb9c2b 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -101,7 +101,7 @@
 			</view>
 			<tanchuang :show="open==3" font="是否结束服务指令？" @back="open = 0" @right="ends()"> </tanchuang>
 			<image class="big-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
-				:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
+				:src="indexmessage?.previewFile? serverUrl + 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 }}
@@ -333,45 +333,6 @@
 			</view> -->
 		</view>
 	</view>
-	<!-- <view class="fixed-card" :style="openleft?{}:{right:`-33vw`}"  v-show="indexmessage?.startTime">
-		<view class="fixed-card-left">
-			<image class="card-left-img"  :style="!indexmessage?.previewFile?'width: 450rpx':''"
-				:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
-			<view class="">
-				{{ indexmessage?.directiveName }}
-			</view>
-		</view>
-		<view>
-			<view class="big-time" v-if="indexmessage?.startTime">
-				{{ indexmessage?.startTime.slice(11, 16)  }}
-				-
-				{{ indexmessage?.endTime.slice(11, 16) }}
-			</view>
-			<view class="icon-people">
-				<image class="people-img" src="/static/index/newindex/leftmenu/iconleft.png" />
-				<text v-if="indexmessage.optType == 1" style="white-space: nowrap;">单人执行</text>
-				<text v-if="indexmessage.optType == 2" style="white-space: nowrap;">协助执行</text>
-				<image style="margin-left: 1vw;" class="people-img"
-					src="/static/index/newindex/leftmenu/iconright.png" />
-				
-				<text v-if="indexmessage.optType == 1">{{indexmessage.employeeName}}</text>
-				<text v-if="indexmessage.optType == 2">{{indexmessage.optNames}}</text>
-			</view>
-			<view class="icon-button">
-				<view  :class="indexmessage?.izStart=='N'?'button-right':'button-left'"  @click="start(indexmessage)">
-					开始服务
-				</view>
-				<view  :class="(indexmessage?.izStart=='Y'&& indexmessage?.izFinish=='N')?'button-right':'button-left'" @click="end(indexmessage)">
-					结束服务
-				</view>
-			</view>
-		</view>
-		<view class="left-open" @click="openleft = !openleft">
-			<image :style="openleft?{}:{transform: `rotate(180deg)`}" class="open-img"
-				src="/static/index/newindex/leftmenu/openleft.png" />
-		</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">
@@ -385,7 +346,7 @@
 					@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"
+							:src="item?serverpicUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill"
 							:lazy-load="true"/>
 						<view @click.stop="open=1;del(item,index)"
 						style="width: 1.6vw;
@@ -596,7 +557,7 @@
 			}
 			assistOrder(obj).then(res=>{
 				if(res.success){
-					clickLeftMenu(0,{id:indexmessage.value.mainId})
+					firstgetqueryCgdList(form.nuId)
 					flag.value = false;
 					zxzd.value = 0;
 					zdxzdex.value = 0;
@@ -606,8 +567,9 @@
 	}
 	
 	const indexmessage = ref({});
-	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
+	const serverUrl = ref(uni.getStorageSync('imagebase') )
 	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
+	const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const form = reactive({
 		pageNo: 1,
 		pageSize: 10,
@@ -621,7 +583,8 @@
 		queryOrderList(form).then(res => {
 			console.log(res)
 			if(res.result.records.length>0){
-				clickLeftMenu(0,res.result.records[0])
+				indexmessage.value = res.result.records[0];
+				// clickLeftMenu(0,res.result.records[0])
 			}else{
 				indexmessage.value = {};
 			}
@@ -731,7 +694,7 @@
 				if(res.success){
 					topbuttontarget.value = 0;
 					donghuaopo.value = false;
-					clickLeftMenu(0,{id:indexmessage.value.mainId})
+					firstgetqueryCgdList(form.nuId)
 				}
 			})
 		}else{
@@ -739,7 +702,7 @@
 				if(res.success){
 					topbuttontarget.value = 0;
 					donghuaopo.value = false;
-					clickLeftMenu(0,{id:indexmessage.value.mainId})
+					firstgetqueryCgdList(form.nuId)
 				}
 			})
 		}
@@ -842,6 +805,7 @@
 			endOrder({id:indexmessage.value.id}).then(res=>{
 			if(res.success){
 				open.value=0;
+				severcards.value.firstgetqueryCgdList()
 				firstgetqueryCgdList(uni.getStorageSync('nuId'))
 			}else{
 				
@@ -855,13 +819,14 @@
 
 	const menutarget = ref(0)
 	const emit = defineEmits(['swip'])
-	const clickmenu = (index : number) => {
+	const clickmenu = (index : number) => { 
 		menutarget.value = index
 		let data = filteredMenu(2)[index]
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data?.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
+		severcards.value.firstgetqueryCgdList()
 		firstgetqueryCgdList(data.nuId);
 		emit('swip');
 		hlylhq(data.nuId )
@@ -873,7 +838,7 @@
 			nuId:nuId 
 		}
 		queryCountByType(data).then(res=>{
-			// console.log(res)
+			console.log(res)
 			hldyobj.value = res.result
 		})
 	}