提交

manifest.json

@@ -2,8 +2,8 @@
     "name" : "护理单元",
     "appid" : "__UNI__FB2D473",
     "description" : "护理单元",
-    "versionName" : "1.0.042",
-    "versionCode" : 10042,
+    "versionName" : "1.0.044",
+    "versionCode" : 10044,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/NursingNew/component/index.vue

@@ -640,6 +640,7 @@
 		queryPadPageList().then((res => {
 			if(props.kf=='0'){
 				leftMenuArray.value = res.result.records;
+				console.log(leftMenuArray.value)
 				filteredMenu('izHldy').forEach((element : any, index : number) => {
 					if (element.nuId === uni.getStorageSync('NUall').nuId) {
 						menutarget.value = index;

pages/NursingNew/component/nurse/index.css

@@ -2399,6 +2399,7 @@
 	display: flex;
 	width: 100%;
 	height: 100%;
+	justify-content: center;
 }
 
 .includestwo-father {

pages/NursingNew/component/nurse/newindex.vue

@@ -1,11 +1,12 @@
 <!-- 护嘱 -->
 <template>
 	<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}" @click="bottomisShaking=false;">
-		<severcard></severcard>
-		<view class="noelderId" v-if="!(uni.getStorageSync('nuId') && uni.getStorageSync('elderId'))">
+		<!-- <severcard></severcard> -->
+		<!-- <view class="noelderId" v-if="!(uni.getStorageSync('nuId') && uni.getStorageSync('elderId'))">
 			<image src="/static/index/nooldericon.png" mode="aspectFill"></image>
 			<view>该护理单元暂无老人入住</view>
-		</view>
+			{{(uni.getStorageSync('nuId')+','+uni.getStorageSync('elderId'))}}
+		</view> -->
 		<view class="doctorsay-container-view">
 			<view class="doctorsay-container-container">
 				<view class="super-card">
@@ -417,9 +418,8 @@
 							<view class="changerulertype" v-show="!ruleritem.directiveName && !servertype">
 								<scroll-view scroll-x class="typeitem">
 									<view class="typeitem-all">
-										<view class="typeitem-one-blue" :style="{left:`${ whitchtype * 20}%`}">
-
-										</view>
+										<view class="typeitem-one-blue" v-if="typearray.length==5" :style="{left:`${ whitchtype * 20}%`}"> </view>
+										<view class="typeitem-one-blue" v-if="typearray.length==3" :style="{left:`${ 20+(whitchtype * 20)}%`}"> </view>
 										<view class="typeitem-one" :style="whitchtype===index?{color:`#fff`}:{}"
 											v-for="(item,index) in typearray" :key="index" @click="clicktype(index)">
 											{{ item.instructionName }}
@@ -885,12 +885,21 @@
 	onMounted(() => {
 		uni.setStorageSync('rulerbase', "care")
 		getInstructionTag().then((res)=>{
-			typearray.value = res.result;
+			if(!uni.getStorageSync('elderId')){
+				res.result.forEach(item=>{
+					if(item.instructionType!=1&&item.instructionType!=2){
+						console.log(item)
+						typearray.value.push(item)
+					}
+				})
+			}else{
+				typearray.value = res.result;
+			}
 			init()
 		})
 	})
 
-	const typearray = ref(["护理", "医疗", "后勤", "占位", "占位", "占位"])
+	const typearray = ref([])
 
 
 	const whitchtype = ref(0)

pages/login/newanimationpage.vue

@@ -160,7 +160,7 @@
 			playall.value = true;
 		}, 500)
 
-		// zyupgrade.value?.check_update();
+		zyupgrade.value?.check_update();
 		queryPadPageList().then((res => {
 			leftMenuArray.value = res.result.records;
 		}))

pages/watch/index.vue

@@ -637,7 +637,7 @@
 		},
 
 		{
-			name: '仓库01',
+			name: '库房01',
 			NUID: "2508000001",
 			url: genPaths(
 				'/static/index/watch',