Merge branch 'Teng' of http://47.115.223.229:8888/yangjun/hldy_app into Teng

pages.json

@@ -98,18 +98,18 @@
 			"style": {
 				"navigationStyle": "custom",
 				"app-plus": {
-					"subNVues": [{
-						"id": "monitorSub",
-						"path": "pages/smallcarmera",
-						"style": {
-							"position": "absolute",
-							"left": "230px",
-							"top": "150px",
-							"width": "680px",
-							"height": "520px",
-							"background": "transparent"
-						}
-					}]
+					// "subNVues": [{
+					// 	"id": "monitorSub",
+					// 	"path": "pages/smallcarmera",
+					// 	"style": {
+					// 		"position": "absolute",
+					// 		"left": "230px",
+					// 		"top": "150px",
+					// 		"width": "680px",
+					// 		"height": "520px",
+					// 		"background": "transparent"
+					// 	}
+					// }]
 				}
 			}
 

pages/NursingNew/component/api.js

@@ -96,7 +96,16 @@ export const waterwaterRead = (cid,address) => {
 // 		method: 'get'
 // 	})
 // }
-
+// 摄像头报修
+// export const humidDevicebaoxiu = (id) => {
+// 	return request({
+// 		url: `${uni.getStorageSync('serverUrl')}/api/iot/humidDevice/baoxiu`,
+// 		method: 'post',
+// 		data: {
+// 			id:id
+// 		},
+// 	})
+// }
 // 温湿度计保修
 export const humidDevicebaoxiu = (id) => {
 	return request({

pages/NursingNew/component/index.vue

@@ -169,9 +169,9 @@
 
 			if (lanjie.value) {
 				lanjie.value = false
-				console.log("！！！！！！！", movetype.value,
-					zeroIndex.value,
-					typeNow.value)
+				// console.log("！！！！！！！", movetype.value,
+				// 	zeroIndex.value,
+				// 	typeNow.value)
 				return
 			}
 

pages/NursingNew/index.vue

@@ -456,7 +456,7 @@
 		return result;
 	}
 	// 生命周期钩子
-	onShow(() => {
+	onMounted(() => {
 		
 		//首次加载和跳转回来需要重新做个动画
 		setTimeout(() => {

pages/Warehouse/Warehouse.vue

@@ -6,7 +6,10 @@
 					@click.stop="housactive(index)">
 					<!-- <image :src="'/static/index/warehouse/active/w'+index+'.png'" mode="aspectFill"
 						v-if="housedex!=index"></image> -->
+
+
 					<donghua :width="item.width" :height="item.height" :links="item.url" :playing="index == housedex" />
+
 					<!-- <image :src="'/static/index/warehouse/active/i'+index+'.png'" mode="aspectFill" v-if="housedex==index"></image> -->
 				</view>
 
@@ -23,8 +26,8 @@
 					<!-- 采购增加层级高度方便点击 -->
 				</view>
 			</view>
-			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','结账','拣货','护理单元','中控室']"
-				:key='i'>
+			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','结账','拣货','护理单元','监控室']"
+				:key='i' @click="onlyjump(i)">
 				<view> </view>
 				<view class="tp">
 					<text>{{v}}</text>
@@ -34,14 +37,17 @@
 					<image src="/static/index/warehouse/y0.png" mode="aspectFill"></image>
 				</view>
 			</view>
+			<view @click="onlyjump(5)" class="zhanwei"></view>
 
 			<arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="45" />
 			<view class="operationbtn">
 				<view v-for="(v,i) in ['请领出库','退货入库','库存盘点','实时监控']" @tap="onTap(i)"
 					:class="beblue === i ? 'click-box-target' : 'click-box'">
-						<image :src="beblue === i?'/static/index/warehouse/ku/rq'+i+'.png':'/static/index/warehouse/ku/rs'+i+'.png'" mode="aspectFill"></image>
-						{{v}}
-					</view>
+					<image
+						:src="beblue === i?'/static/index/warehouse/ku/rq'+i+'.png':'/static/index/warehouse/ku/rs'+i+'.png'"
+						mode="aspectFill"></image>
+					{{v}}
+				</view>
 			</view>
 		</view>
 	</view>
@@ -62,6 +68,13 @@
 	const housactive = (index : number) => {
 		if (index > 5) { return }
 		housedex.value = index;
+		console.log("index", index)
+		// 只有中心的四个有动画.....所以点不到监控室，等有图吧
+		if (index === 5) {
+			uni.navigateTo({
+				url: "/pages/watch/full"
+			})
+		}
 	}
 	onMounted(()=>{
 		housedex.value = 1
@@ -108,6 +121,19 @@
 				break;
 		}
 	}
+	const onlyjump = (index : number) => {
+		console.log("点击了哪个图标", index)
+		if (index > 5) { return }
+		if(index<4){
+			housedex.value = index;
+		}
+		
+		if (index === 5) {
+			uni.navigateTo({
+				url: "/pages/watch/full"
+			})
+		}
+	}
 	const beblue = ref<number>(-1);
 	let clickResetTimer : ReturnType<typeof setTimeout> | null = null;
 	// 单击（或短按）
@@ -121,14 +147,15 @@
 		}, 500)
 		switch (dir) {
 			case 0:
-			
+
 				break
 			case 1:
-				
+
 				break
 			case 2:
+
 				uni.navigateTo({
-					url:"/pages/watch/full"
+					url: "/pages/watch/full"
 				})
 				break
 			case 3:
@@ -246,7 +273,8 @@
 				margin: 0 0.3vw;
 				transition: transform 0.18s ease, box-shadow 0.18s ease, background 0.25s ease;
 				-webkit-tap-highlight-color: transparent;
-				image{
+
+				image {
 					width: 1.6vw;
 					height: 1.6vw;
 					margin-right: .2vw;
@@ -260,7 +288,7 @@
 
 			.click-box-target {
 				background: #FFFFFF;
-				box-shadow: 0px 0px 3vw 0px rgba(12,102,209,0.33) inset; 
+				box-shadow: 0px 0px 3vw 0px rgba(12, 102, 209, 0.33) inset;
 				// box-shadow: 0rpx 0rpx 3vw 0rpx rgba(38,137,255,0.44) inset;
 				color: rgba(108, 132, 160, 1) !important;
 				animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
@@ -460,7 +488,7 @@
 
 			>view {
 				position: relative;
- 
+
 				&:nth-child(2) {
 					width: 6.5vw;
 					height: 3.2vw;
@@ -470,12 +498,14 @@
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					image{
+
+					image {
 						position: absolute;
 						top: 0;
 						left: 0;
 					}
-					text{
+
+					text {
 						position: relative;
 						font-weight: 400;
 						font-size: 1.1vw;
@@ -520,4 +550,12 @@
 		background-position: center center;
 		overflow: hidden;
 	}
+
+	.zhanwei {
+		position: absolute;
+		top: 40vh;
+		right: 3vw;
+		width: 13vw;
+		height: 13vw;
+	}
 </style>

pages/Warehouse/purchaseorder.vue

@@ -14,13 +14,13 @@
 					@scrolltolower="plsbuytolower" :lower-threshold="200">
 					<view class="margin-height"></view>
 					<view class="boxitem" v-for="(v,i) in plsbuy" :key='i'
-						:class="{'yujing':v.cgdType=='9','active':leftitem==i}" @click="getmiddle(v,i);saveleftgo = i;">
+						:class="{'yujing':v?.cgdType=='9','active':leftitem==i}" @click="getmiddle(v,i);saveleftgo = i;">
 
 						<view>{{ v.cgdNo }}</view>
 						<view>供应商:{{ v.gysId_dictText }}</view>
 						<view>采购人: {{ v.createBy_dictText }}</view>
 						<view>{{ v.qgDate }}</view>
-						<view v-if="v.cgdType=='9'" class="zuofei">
+						<view v-if="v?.cgdType=='9'" class="zuofei">
 							已作废
 						</view>
 
@@ -162,7 +162,7 @@
 								<donghua width="2vw" height="2vw" :links="v.url" :playing="i === anmidex"
 									class="donghua" />
 							</view>
-							<text>
+							<text :style="plsbuy[leftitem]?.cgdType == '9'?{color:`#c8c8c8`}:{}">
 								{{v.name}}
 							</text>
 						</view>
@@ -701,6 +701,14 @@
 	const anmidex = ref(-1)
 	const admiclick = (i : number) => {
 		anmidex.value = i;
+		if(plsbuy.value[leftitem.value]?.cgdType == '9'){
+			uni.showToast({
+				title: '该表单已经作废',
+				icon: 'none', // 'none' 表示不带图标
+				duration: 2000
+			})
+			return
+		}
 		switch (i) {
 			case 0:
 				bebad();

unpackage/dist/dev/.nvue/app.js

@@ -4,8 +4,5 @@ Promise.resolve("./pages/camera.js").then((res) => {
 Promise.resolve("./pages/fullcamera.js").then((res) => {
   res();
 });
-Promise.resolve("./pages/smallcarmera.js").then((res) => {
-  res();
-});
 Promise.resolve("./app.css.js").then(() => {
 });