diff --git a/monitorMobile/App.vue b/monitorMobile/App.vue
index 3217bbf..690b121 100644
--- a/monitorMobile/App.vue
+++ b/monitorMobile/App.vue
@@ -19,6 +19,8 @@
}
uni-page-body{
height: 100%;
+ }
+ body{
background-color: #F6F8FA;
}
diff --git a/monitorMobile/common/mixins.vue b/monitorMobile/common/mixins.vue
index e43a634..3fa06d2 100644
--- a/monitorMobile/common/mixins.vue
+++ b/monitorMobile/common/mixins.vue
@@ -91,7 +91,7 @@
content: content,
cancelText: "取消",
confirmText: "确认",
- confirmColor: '#F2C827',
+ confirmColor: '#165DFF',
cancelColor: '#9E9E9E',
success: function (res) {
if (res.confirm) {
diff --git a/monitorMobile/components/cell.vue b/monitorMobile/components/cell.vue
index bb22926..7605f95 100644
--- a/monitorMobile/components/cell.vue
+++ b/monitorMobile/components/cell.vue
@@ -34,6 +34,7 @@
.u-cell {
background: #fff;
border-radius: 20rpx;
+ height: 90rpx;
}
.selectedBox{
display: flex;
diff --git a/monitorMobile/components/selectRadio.vue b/monitorMobile/components/selectRadio.vue
index 0f75c58..52d7894 100644
--- a/monitorMobile/components/selectRadio.vue
+++ b/monitorMobile/components/selectRadio.vue
@@ -1,5 +1,5 @@
-
+
@@ -69,7 +69,7 @@
diff --git a/monitorMobile/pages/home.vue b/monitorMobile/pages/home.vue
deleted file mode 100644
index a5f0d76..0000000
--- a/monitorMobile/pages/home.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- 首页
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/monitorMobile/pages/work/index.vue b/monitorMobile/pages/work/index.vue
new file mode 100644
index 0000000..1e1316b
--- /dev/null
+++ b/monitorMobile/pages/work/index.vue
@@ -0,0 +1,149 @@
+
+
+
+
+ 点名
+ 通过人脸识别,提升学生点名效率
+
+
+
+
+
+
+
+ 归寝
+ 查看归寝情况
+
+
+
+
+
+
+ 客流
+ 查看客流情况
+
+
+
+
+
+
+ 监控管理
+ 查看监控管理情况
+
+
+
+
+
+
+ 更多功能
+ 敬请期待
+
+
+
+
+
+
+
+
+
diff --git a/monitorMobile/pages/attendanceCall/passengerFlow/add.vue b/monitorMobile/pages/work/passengerFlow/add.vue
similarity index 94%
rename from monitorMobile/pages/attendanceCall/passengerFlow/add.vue
rename to monitorMobile/pages/work/passengerFlow/add.vue
index 9a19e57..ea7d1a1 100644
--- a/monitorMobile/pages/attendanceCall/passengerFlow/add.vue
+++ b/monitorMobile/pages/work/passengerFlow/add.vue
@@ -17,7 +17,7 @@
{{form.tick.length?form.tick.join('-'):'请选择'}}
+ src="@/static/image/earlyWarning/calendar.png" mode="aspectFill">
@@ -62,7 +62,7 @@
},
methods: {
confirm(){
- this.CONFIRM(`是否删除点名任务?`).then(()=>{
+ this.CONFIRM(`是否确认新增查询?`).then(()=>{
})
}
diff --git a/monitorMobile/pages/attendanceCall/passengerFlow/detail.vue b/monitorMobile/pages/work/passengerFlow/detail.vue
similarity index 100%
rename from monitorMobile/pages/attendanceCall/passengerFlow/detail.vue
rename to monitorMobile/pages/work/passengerFlow/detail.vue
diff --git a/monitorMobile/pages/attendanceCall/passengerFlow/index.vue b/monitorMobile/pages/work/passengerFlow/index.vue
similarity index 93%
rename from monitorMobile/pages/attendanceCall/passengerFlow/index.vue
rename to monitorMobile/pages/work/passengerFlow/index.vue
index a6457f9..6d9996c 100644
--- a/monitorMobile/pages/attendanceCall/passengerFlow/index.vue
+++ b/monitorMobile/pages/work/passengerFlow/index.vue
@@ -20,14 +20,14 @@
分片类型:小时
-
+
总人数:6
-
+
分片详情
@@ -35,7 +35,7 @@
-
+
@@ -161,7 +161,7 @@
}
uni-text {
- font-size: 30rpx;
+ font-size: 28rpx;
}
}
}
diff --git a/monitorMobile/pages/attendanceCall/returnBed/comfirm.vue b/monitorMobile/pages/work/returnBed/comfirm.vue
similarity index 51%
rename from monitorMobile/pages/attendanceCall/returnBed/comfirm.vue
rename to monitorMobile/pages/work/returnBed/comfirm.vue
index 23ff433..b12835c 100644
--- a/monitorMobile/pages/attendanceCall/returnBed/comfirm.vue
+++ b/monitorMobile/pages/work/returnBed/comfirm.vue
@@ -1,36 +1,42 @@
-
+
-
+
+
寝室104
2024年8月24日 18:00:00 ~ 18:59:00
-
-
-
-
-
-
-
- 杨云
-
-
- 系部:安环部
-
-
- 专业:环艺
- 班级:第二班
+
+
+
+
+
+
+
+
+ 杨云
+
+
+ 系部:安环部
+
+
+ 专业:环艺
+ 班级:第二班
+
-
-
+
+
-
-
+
+
+
+
@@ -47,20 +53,23 @@
}, {
name: 3
}],
- checkboxValue:[],
+ checkboxValue: [],
}
},
methods: {
- radioChange(e){
- if(e){
- let ids = this.list.map(e=>e.name)
+ radioChange(e) {
+ if (e) {
+ let ids = this.list.map(e => e.name)
this.checkboxValue = ids
- }else{
+ } else {
this.checkboxValue = []
}
},
returnConfirm() {
console.log(this.checkboxValue)
+ this.CONFIRM('是否确认归寝?').then(()=>{
+
+ })
}
}
}
@@ -133,5 +142,13 @@
.returnConfirm {
padding: 30rpx;
display: flex;
+ position: fixed;
+ bottom: 0rpx;
+ width: 100%;
+ box-sizing: border-box;
+
+ .right {
+ flex: 1;
+ }
}
\ No newline at end of file
diff --git a/monitorMobile/pages/attendanceCall/returnBed/detail.vue b/monitorMobile/pages/work/returnBed/detail.vue
similarity index 84%
rename from monitorMobile/pages/attendanceCall/returnBed/detail.vue
rename to monitorMobile/pages/work/returnBed/detail.vue
index 1462420..78ee72c 100644
--- a/monitorMobile/pages/attendanceCall/returnBed/detail.vue
+++ b/monitorMobile/pages/work/returnBed/detail.vue
@@ -1,7 +1,7 @@
-
+
寝室104
@@ -11,7 +11,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -99,6 +99,9 @@
.list {
padding: 0 26rpx;
margin-bottom: 16rpx;
+ &:last-child{
+ padding-bottom: 60rpx;
+ }
.item {
display: flex;
margin-bottom: 28rpx;
@@ -126,8 +129,8 @@
display:flex;
.status{
display: inline-block;
- font-size: 26rpx;
- line-height: 1.5;
+ font-size: 24rpx;
+ line-height: 1.8;
background-color: #0FAF76;
color: #fff;
padding: 0 12rpx;
@@ -141,9 +144,11 @@
.depart {
margin-top: 28rpx;
+ font-size: 26rpx;
}
.bottom {
+ font-size: 26rpx;
margin-top: 18rpx;
display: flex;
justify-content: space-between;
diff --git a/monitorMobile/pages/attendanceCall/returnBed/index.vue b/monitorMobile/pages/work/returnBed/index.vue
similarity index 89%
rename from monitorMobile/pages/attendanceCall/returnBed/index.vue
rename to monitorMobile/pages/work/returnBed/index.vue
index 59e6c90..9065d38 100644
--- a/monitorMobile/pages/attendanceCall/returnBed/index.vue
+++ b/monitorMobile/pages/work/returnBed/index.vue
@@ -3,7 +3,7 @@
-
@@ -13,7 +13,7 @@
寝室302
-
+
寝室人数:6
@@ -23,11 +23,11 @@
-
+
查看
-
+
归寝确认
@@ -122,6 +122,7 @@
.room {
font-size: 32rpx;
+ font-weight: 700;
}
.peopleNum {
diff --git a/monitorMobile/pages/work/rollCall/detail.vue b/monitorMobile/pages/work/rollCall/detail.vue
new file mode 100644
index 0000000..b3ba235
--- /dev/null
+++ b/monitorMobile/pages/work/rollCall/detail.vue
@@ -0,0 +1,183 @@
+
+
+
+ 应到:8人
+
+
+
+
+
+ {{item.label}}({{item.value}})
+
+
+
+
+
+
+
+
+
+
+
+
+ {{cateList.find(e=>e.value == cate).label}}
+
+
+ 杨云
+
+
+
+ 系部:安环部
+
+
+ 专业:环艺
+ 班级:第二班
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/monitorMobile/pages/attendanceCall/rollCall/index.vue b/monitorMobile/pages/work/rollCall/index.vue
similarity index 85%
rename from monitorMobile/pages/attendanceCall/rollCall/index.vue
rename to monitorMobile/pages/work/rollCall/index.vue
index e58ddb1..c7b98ec 100644
--- a/monitorMobile/pages/attendanceCall/rollCall/index.vue
+++ b/monitorMobile/pages/work/rollCall/index.vue
@@ -2,14 +2,14 @@
-
+
{{isManage?'取消管理':'批量管理'}}
-
+
@@ -26,26 +26,26 @@
-
-
+
+
查看
-
-
+
+
删除
-
+
-
+
@@ -108,6 +108,11 @@
this.checkboxValue = []
}
},
+ del(item){
+ this.CONFIRM(`是否删除[${item.name}]点名任务?`).then(()=>{
+
+ })
+ },
confirm(){
this.CONFIRM(`是否删除点名任务?`).then(()=>{
@@ -135,6 +140,11 @@
.bottomConfirm {
padding: 30rpx;
display: flex;
+ position: fixed;
+ bottom: 100rpx;
+ background-color: #fff;
+ width: 100%;
+ box-sizing: border-box;
}
.topBox {
@@ -155,6 +165,11 @@
padding: 0 26rpx;
}
}
+
+ .u-list.isManage{
+ padding-bottom: 120rpx;
+ box-sizing: border-box;
+ }
.u-list-item {
display: flex;
diff --git a/monitorMobile/static/image/tabbar/attendanceCall.png b/monitorMobile/static/image/tabbar/attendanceCall.png
index c377942..089d5f1 100644
Binary files a/monitorMobile/static/image/tabbar/attendanceCall.png and b/monitorMobile/static/image/tabbar/attendanceCall.png differ
diff --git a/monitorMobile/static/image/tabbar/attendanceCall_active.png b/monitorMobile/static/image/tabbar/attendanceCall_active.png
new file mode 100644
index 0000000..c377942
Binary files /dev/null and b/monitorMobile/static/image/tabbar/attendanceCall_active.png differ
diff --git a/monitorMobile/static/image/tabbar/earlyWarning.png b/monitorMobile/static/image/tabbar/earlyWarning.png
new file mode 100644
index 0000000..0f9e4fe
Binary files /dev/null and b/monitorMobile/static/image/tabbar/earlyWarning.png differ
diff --git a/monitorMobile/static/image/tabbar/earlyWarning_active.png b/monitorMobile/static/image/tabbar/earlyWarning_active.png
index 0f9e4fe..04722ae 100644
Binary files a/monitorMobile/static/image/tabbar/earlyWarning_active.png and b/monitorMobile/static/image/tabbar/earlyWarning_active.png differ
diff --git a/monitorMobile/static/image/tabbar/home_active.png b/monitorMobile/static/image/tabbar/home_active.png
new file mode 100644
index 0000000..8dd332f
Binary files /dev/null and b/monitorMobile/static/image/tabbar/home_active.png differ
diff --git a/monitorMobile/static/image/tabbar/my_active.png b/monitorMobile/static/image/tabbar/my_active.png
new file mode 100644
index 0000000..ea29d60
Binary files /dev/null and b/monitorMobile/static/image/tabbar/my_active.png differ
diff --git a/monitorMobile/static/image/tabbar/work.png b/monitorMobile/static/image/tabbar/work.png
new file mode 100644
index 0000000..c9bbc71
Binary files /dev/null and b/monitorMobile/static/image/tabbar/work.png differ
diff --git a/monitorMobile/static/image/tabbar/work_active.png b/monitorMobile/static/image/tabbar/work_active.png
new file mode 100644
index 0000000..4f741af
Binary files /dev/null and b/monitorMobile/static/image/tabbar/work_active.png differ
diff --git a/monitorMobile/static/image/test/image.png b/monitorMobile/static/image/test/image.png
new file mode 100644
index 0000000..b4755f1
Binary files /dev/null and b/monitorMobile/static/image/test/image.png differ
diff --git a/monitorMobile/static/image/test/image1.png b/monitorMobile/static/image/test/image1.png
new file mode 100644
index 0000000..82ee1de
Binary files /dev/null and b/monitorMobile/static/image/test/image1.png differ
diff --git a/monitorMobile/static/image/test/image2.png b/monitorMobile/static/image/test/image2.png
new file mode 100644
index 0000000..77ee83b
Binary files /dev/null and b/monitorMobile/static/image/test/image2.png differ
diff --git a/monitorMobile/static/image/work/bg.png b/monitorMobile/static/image/work/bg.png
new file mode 100644
index 0000000..df712a3
Binary files /dev/null and b/monitorMobile/static/image/work/bg.png differ
diff --git a/monitorMobile/static/image/work/monitorManage.png b/monitorMobile/static/image/work/monitorManage.png
new file mode 100644
index 0000000..7ab3217
Binary files /dev/null and b/monitorMobile/static/image/work/monitorManage.png differ
diff --git a/monitorMobile/static/image/work/more.png b/monitorMobile/static/image/work/more.png
new file mode 100644
index 0000000..bfd2af0
Binary files /dev/null and b/monitorMobile/static/image/work/more.png differ
diff --git a/monitorMobile/static/image/work/passengerFlow.png b/monitorMobile/static/image/work/passengerFlow.png
new file mode 100644
index 0000000..1b8cdec
Binary files /dev/null and b/monitorMobile/static/image/work/passengerFlow.png differ
diff --git a/monitorMobile/static/image/work/returnBed.png b/monitorMobile/static/image/work/returnBed.png
new file mode 100644
index 0000000..3a5be49
Binary files /dev/null and b/monitorMobile/static/image/work/returnBed.png differ
diff --git a/monitorMobile/static/image/work/rollCall.png b/monitorMobile/static/image/work/rollCall.png
new file mode 100644
index 0000000..0610631
Binary files /dev/null and b/monitorMobile/static/image/work/rollCall.png differ
diff --git a/monitorMobile/static/image/work/toRight.png b/monitorMobile/static/image/work/toRight.png
new file mode 100644
index 0000000..ddbdb8c
Binary files /dev/null and b/monitorMobile/static/image/work/toRight.png differ
diff --git a/monitorMobile/static/image/work/toRight1.png b/monitorMobile/static/image/work/toRight1.png
new file mode 100644
index 0000000..1620e47
Binary files /dev/null and b/monitorMobile/static/image/work/toRight1.png differ