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

manifest.json

@@ -10,6 +10,7 @@
 		"usingComponents": true,
 		"nvueStyleCompiler": "uni-app",
 		"compilerVersion": 3,
+		
 		"screenOrientation": [
 			// "portrait-primary", // 竖屏
 			"landscape-primary", // 横屏（home 键在右侧）

pages.json

@@ -226,10 +226,11 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app x",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		// "navigationBarBackgroundColor": "red",
-		"backgroundColor": "#F8F8F8",
+		// "backgroundColor": "red",
 		"navigationStyle": "custom",
 		"bounce": "none" //关闭窗口回弹效果
 	},
 	"uniIdRouter": {}
+	
 }

pages/NursingNew/component/nurse/index.vue

@@ -1605,15 +1605,9 @@
 		})
 	}
 	const routerPush = () => {
-		uni.setStorage({
-			key: 'myArray',
-			data: timearr.value,
-			success: function () {
 		uni.navigateTo({
 			url: `/pages/timeMatrix/indexnew`
 		})
-			},
-		});
 	}
 	// 暂存器
 	const saveRulerTime = ref({

pages/NursingNew/component/pleasetake/component/returnorder.vue

@@ -431,7 +431,6 @@
 		}
 		
 		submitQld(obj).then(res=>{
-			console.log("?????",obj,res)
 			if(res.success){
 				uni.showToast({
 					icon:'success',

pages/Warehouse/index/component/index.vue

@@ -72,9 +72,9 @@
 					{{ filteredMenu(2)[menutarget]?.nuName }}
 				</view>
 			</view>
-			<view class="server-number">
+			<!-- <view class="server-number">
 				业务单号：{{ filteredMenu(2)[menutarget]?.id }}
-			</view>
+			</view> -->
 			<view style="display: flex;margin-top: 40rpx;">
 				<view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
 					<view class="start-button">

pages/login/newanimationpage.vue

@@ -1,6 +1,6 @@
 <!-- 动画页 -->
 <template>
-	<view @click="morerule=false">
+	<view>
 		<view class="home">
 			<image class="all-home" src="/static/index/warehouse/newindexhome/backdro.jpg" mode="aspectFit"></image>
 		</view>
@@ -68,7 +68,7 @@
 			<donghua width="14vw" height="13vw" :interval="250" :links="officerarray" :playing="playall" :loop="true" />
 		</view>
 		<view class="Print tp">
-			<donghua width="6vw" height="6vw" :interval="300" :links="Printarray" :playing="playall" :loop="true" />
+			<donghua width="5vw" height="5vw" :interval="300" :links="Printarray" :playing="playall" :loop="true" />
 		</view>
 		<view class="fontend tp">
 			<image class="all-home" src="/static/index/warehouse/newindexhome/reception.png" mode="aspectFit"></image>
@@ -77,11 +77,11 @@
 			<image class="all-home" src="/static/index/warehouse/newindexhome/reception2.png" mode="aspectFit"></image>
 		</view>
 		<view class="peopleleft tp">
-			<donghua width="7vw" height="8vw" :interval="500" :links="peopleleftarray" :playing="playall"
+			<donghua width="7vw" height="8vw" :interval="550" :links="peopleleftarray" :playing="playall"
 				:loop="true" />
 		</view>
 		<view class="peopleright tp">
-			<donghua width="7vw" height="8vw" :interval="500" :links="peoplerightarray" :playing="playall"
+			<donghua width="7vw" height="8vw" :interval="600" :links="peoplerightarray" :playing="playall"
 				:loop="true" />
 		</view>
 		<view class="door tp">
@@ -500,6 +500,7 @@
 			return `${base}/${prefix}${idx}.${ext}`
 		})
 	}
+	
 	// // 当前坐标（px）
 	// const x = ref(77)
 	// const y = ref(60)
@@ -621,16 +622,17 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.office-font {
-		width: 9vw;
+		width: 10vw;
 		height: 3vw;
 		position: fixed;
 		top: 22vw;
@@ -638,12 +640,13 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.fontroom-font {
@@ -655,29 +658,31 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.back-font {
 		width: 7vw;
 		height: 3vw;
 		position: fixed;
-		top: 2vw;
+		top: 1vw;
-		left: 87vw;
+		left: 81vw;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.store-font {
@@ -689,12 +694,13 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.font-ball {
@@ -815,22 +821,22 @@
 	}
 
 	.Print {
-		width: 6vw;
+		width: 5vw;
-		height: 6vw;
+		height: 5vw;
 		position: fixed;
-		bottom: 21vw;
+		bottom: 22vw;
-		right: 12vw;
+		right: 13vw;
 		z-index: 1;
 	}
 
 	.button-setting {
-		width: 4.5vw;
+		width: 5vw;
-		height: 4.5vw;
+		height: 5vw;
 		border-radius: 50%;
 		border: 1rpx solid #A3B2CF;
 		position: fixed;
 		bottom: 2vw;
-		right: 8.5vw;
+		right: 9vw;
 		display: flex;
 		justify-content: center;
 		align-items: center;
@@ -839,8 +845,8 @@
 	}
 
 	.button-back {
-		width: 4.5vw;
+		width: 5vw;
-		height: 4.5vw;
+		height: 5vw;
 		border-radius: 50%;
 		border: 1rpx solid #A3B2CF;
 		position: fixed;
@@ -868,8 +874,8 @@
 		width: 5vw;
 		height: 6vw;
 		position: fixed;
-		bottom: 1vw;
+		bottom: -0.5vw;
-		left: 4vw;
+		left: 9vw;
 	}
 	// .tp {
 	// 	image {

pages/procurement/outbound.vue

@@ -609,7 +609,7 @@
 			firstgetqueryCgdList();
 			console.log("!!!!!!", res)
 			setTimeout(() => {
-				if (res.result.status == "success") {
+				if (res.success) {
 					uni.showToast({
 						title: res.result.message,
 						icon: 'none', // 'none' 表示不带图标

pages/timeMatrix/indexnew.vue

@@ -110,7 +110,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, reactive, watch } from 'vue';
 	import { onLoad } from '@dcloudio/uni-app';
-	import { getNclist } from "@/component/rightItemssecond/api.js";
+	import { getNclist } from "@/pages/NursingNew/component/nurse/api.js";
 	import specialDrawerVue from './drawer/specialDrawer.vue';
 	import rightroll from './drawer/index.vue';
 	// import addball from "./addball.vue"
@@ -120,7 +120,7 @@
 	// import joystick from '@/component/public/newgame/joysticknew.vue';
 	// 暗黑模式
 	const darkFans = ref(false);
-	const timearr = ref([]);
+	
 	type darkFanstype = {
 		darkFans : boolean
 	}
@@ -246,27 +246,33 @@
 	const heightType = ref(180);
 	const cardFont = ref(0);
 	const bili = ref(0)
+	// 定义每小时中的分钟数组，表示每 5 分钟一个时间段，总共 12 个
+	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 geteverything = () => {
+		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
+			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
+				res.result.serviceList.forEach((res : any) => {
+					timearr.value[res.positioning].children[res.positioningLong] = res;
+				})
+			})
+		}
+		changetimearr.value = timearr.value;
+	}
 	// 生命周期钩子
-	onLoad((options) => {
+	onLoad(() => {
-		let arr = uni.getStorageSync('myArray');
+		// 获得数据
-		timearr.value = arr
+		geteverything()
-		if (timearr.value[0].children.length < 8) {
-			timearr.value.forEach((element : any) => {
-				// 循环直到长度达到 7
-				while (element.children.length < 8) {
-					element.children.push({ directiveName: "" });
-				}
-			});
-		}
-		changetimearr.value = JSON.parse(JSON.stringify(timearr.value));
-		// scrollLeft.value = 740
-
 		scalcType.value = 7
 		centerCell()
-		// widthType.value = 247;
-		// scrollLeft.value = 740;
-		// heightType.value = 140
-
 	});
 
 	const changeType = (number : number) => {

unpackage/dist/build/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__FB2D473",
   "name": "护理单元",
   "version": {
-    "name": "1.0.020",
+    "name": "1.0.021",
-    "code": 10020
+    "code": 10021
   },
   "description": "护理单元",
   "developer": {

unpackage/dist/dev/.nvue/pages/camera.js

@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };

unpackage/dist/dev/.nvue/pages/fullcamera.js

@@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };

unpackage/resources/__UNI__FB2D473/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.020","code":10020},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.021","code":10021},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}