diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index a3e5dd6..9fa7cdb 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -1,49 +1,93 @@
-
- NUID:{{ uni.getStorageSync('nuId')}}
-
-
- {{ uni.getStorageSync('nuName')}}
-
-
+
+
+
+ 50
+
+
+
+
+
+
+
+
+ 80
+
+
+
+
+
+
+
+ 护理
+
+
+
+
+
+
+ 32
+
+
+
+
+
+
+
+
+ 60
+
+
+
+
+
+
+
+ 医疗
+
+
+
+
+
+
+ 65
+
+
+
+
+
+
+
+
+ 70
+
+
+
+
+
+
+
+ 行政
+
+
+
+
+
+ {{ currentTime }}
+
+
+ {{ fullDate }}
+
{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].temperature: '-' }}°C
{{ (uni.getStorageSync('NUall').humidDeviceList && uni.getStorageSync('NUall').humidDeviceList[0])? uni.getStorageSync('NUall').humidDeviceList[0].humidity: '-' }}%
-
-
- {{name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
开始服务
-
+
结束服务
@@ -96,9 +139,8 @@
\ No newline at end of file
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index 0fea1f1..27ee042 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -2120,7 +2120,7 @@
bodyTagListLook.value.push(res.netPic)
}
})
- console.log("res11111",res)
+ // console.log("res11111",res)
})
}
}
@@ -2164,7 +2164,7 @@
})
})
bigArray.value = res.result;
- console.log("右侧",bigArray.value)
+ // console.log("右侧",bigArray.value)
}
downList.value = bigArray.value[0].children
upmenuIndex.value = -1;
diff --git a/pages/login/animationpage.vue b/pages/login/animationpage.vue
index d6e9a50..98dbb7d 100644
--- a/pages/login/animationpage.vue
+++ b/pages/login/animationpage.vue
@@ -61,6 +61,10 @@
医疗矩阵
+
+
+ 库房矩阵
+
@@ -813,7 +817,7 @@
position: fixed;
top: 30vh;
left: 33.5vw;
- width: 22vw;
+ width: 27.7vw;
height: 22.5vh;
background-color: #fff;
z-index: 53;
@@ -847,10 +851,10 @@
// background-color: red;
.one-button{
display: flex;
- justify-content: center;
+ // justify-content: center;
align-items: center;
height: 1vw;
- width: 10vw;
+ width: 8vw;
font-size: 1.2vw;
.small-imge{
width: 1.5vw;
diff --git a/static/index/card/NU@2x.png b/static/index/card/NU@2x.png
new file mode 100644
index 0000000..c69403c
Binary files /dev/null and b/static/index/card/NU@2x.png differ
diff --git a/static/index/card/arrow.png b/static/index/card/arrow.png
new file mode 100644
index 0000000..8301487
Binary files /dev/null and b/static/index/card/arrow.png differ
diff --git a/static/index/card/doctor.png b/static/index/card/doctor.png
new file mode 100644
index 0000000..8a2fdd4
Binary files /dev/null and b/static/index/card/doctor.png differ
diff --git a/static/index/card/help.png b/static/index/card/help.png
new file mode 100644
index 0000000..6623b83
Binary files /dev/null and b/static/index/card/help.png differ
diff --git a/static/index/card/work.png b/static/index/card/work.png
new file mode 100644
index 0000000..1393e76
Binary files /dev/null and b/static/index/card/work.png differ
diff --git a/static/index/card/形状 1@2x.png b/static/index/card/形状 1@2x.png
new file mode 100644
index 0000000..08bcbc5
Binary files /dev/null and b/static/index/card/形状 1@2x.png differ
diff --git a/static/index/card/温度 (2)@2x.png b/static/index/card/温度 (2)@2x.png
new file mode 100644
index 0000000..a8ed198
Binary files /dev/null and b/static/index/card/温度 (2)@2x.png differ
diff --git a/static/index/newindex/leftmenu/carmera.png b/static/index/newindex/leftmenu/carmera.png
new file mode 100644
index 0000000..f1f9dad
Binary files /dev/null and b/static/index/newindex/leftmenu/carmera.png differ
diff --git a/static/index/newindex/leftmenu/0.png b/static/index/newindex/leftmenu/left0.png
similarity index 100%
rename from static/index/newindex/leftmenu/0.png
rename to static/index/newindex/leftmenu/left0.png
diff --git a/static/index/newindex/leftmenu/1.png b/static/index/newindex/leftmenu/left1.png
similarity index 100%
rename from static/index/newindex/leftmenu/1.png
rename to static/index/newindex/leftmenu/left1.png
diff --git a/static/index/newindex/leftmenu/left2.png b/static/index/newindex/leftmenu/left2.png
new file mode 100644
index 0000000..f1594dd
Binary files /dev/null and b/static/index/newindex/leftmenu/left2.png differ
diff --git a/static/index/newindex/leftmenu/left3.png b/static/index/newindex/leftmenu/left3.png
new file mode 100644
index 0000000..9cfe856
Binary files /dev/null and b/static/index/newindex/leftmenu/left3.png differ
diff --git a/static/index/newindex/leftmenu/2.png b/static/index/newindex/leftmenu/left4.png
similarity index 100%
rename from static/index/newindex/leftmenu/2.png
rename to static/index/newindex/leftmenu/left4.png
diff --git a/static/index/newindex/leftmenu/older.png b/static/index/newindex/leftmenu/older.png
new file mode 100644
index 0000000..7dca398
Binary files /dev/null and b/static/index/newindex/leftmenu/older.png differ
diff --git a/static/index/warehouse/t5.png b/static/index/warehouse/t5.png
new file mode 100644
index 0000000..4bad20b
Binary files /dev/null and b/static/index/warehouse/t5.png differ