diff --git a/monitorMobile/common/mixins.vue b/monitorMobile/common/mixins.vue
index 3fa06d2..6947778 100644
--- a/monitorMobile/common/mixins.vue
+++ b/monitorMobile/common/mixins.vue
@@ -92,7 +92,7 @@
cancelText: "取消",
confirmText: "确认",
confirmColor: '#165DFF',
- cancelColor: '#9E9E9E',
+ cancelColor: '#165DFF',
success: function (res) {
if (res.confirm) {
resolve(true)
diff --git a/monitorMobile/components/selectRadio.vue b/monitorMobile/components/selectRadio.vue
index 956254c..9e2ba11 100644
--- a/monitorMobile/components/selectRadio.vue
+++ b/monitorMobile/components/selectRadio.vue
@@ -3,9 +3,11 @@
-
-
-
+
+
+
+
+
@@ -79,7 +81,6 @@
+ &:not(&:last-child)::after {
+ content: '';
+ display: block;
+ position: absolute;
+ height: 1rpx;
+ background-color: rgba(0, 0, 0, 0.1);
+ width: calc(100% - 60rpx);
+ left: 30rpx;
+ bottom: 0rpx;
+ }
+
+ .valueBox {
+ color: #333;
+ font-size: 30rpx;
+ font-weight: 700;
+
+ &.disabled {
+ font-weight: unset;
+ }
+ }
+ }
+
+ .btn {
+ height: 98rpx;
+ background-color: #fff;
+ line-height: 98rpx;
+ border-radius: 20rpx;
+ text-align: center;
+ color: #333;
+ margin-top: 30rpx;
+ font-size: 32rpx;
+ }
+
+ .popupInfo {
+ padding: 30rpx 30rpx 0rpx;
+ width: 540rpx;
+ box-sizing: border-box;
+
+ .title {
+ font-size: 34rpx;
+ font-weight: 700;
+ text-align: center;
+ margin-bottom: 30rpx;
+ margin-top: 16rpx;
+ }
+
+ .bottom {
+ margin-top: 30rpx;
+ display: flex;
+ line-height: 88rpx;
+ border-top: 1rpx solid rgba(0, 0, 0, 0.1);
+ margin-left: -30rpx;
+ margin-right: -30rpx;
+ position: relative;
+
+ &::after {
+ content: '';
+ background-color: rgba(0, 0, 0, 0.1);
+ display: block;
+ position: absolute;
+ width: 1rpx;
+ height: 100%;
+ left: 50%;
+ top: 0;
+ }
+
+ &>* {
+ width: 50%;
+ text-align: center;
+ color: #165DFF;
+ font-weight: 32rpx;
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/monitorMobile/pages/work/passengerFlow/add.vue b/monitorMobile/pages/work/passengerFlow/add.vue
deleted file mode 100644
index ea7d1a1..0000000
--- a/monitorMobile/pages/work/passengerFlow/add.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{form.tick.length?form.tick.join('-'):'请选择'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/monitorMobile/pages/work/passengerFlow/detail.vue b/monitorMobile/pages/work/passengerFlow/detail.vue
index 3cbe2b0..987c977 100644
--- a/monitorMobile/pages/work/passengerFlow/detail.vue
+++ b/monitorMobile/pages/work/passengerFlow/detail.vue
@@ -21,7 +21,7 @@
export default {
data() {
return {
- list: [{},{},{}],
+ list: [{},{},{},{},{},{},{},{},{}],
}
},
methods: {}
@@ -31,5 +31,19 @@
\ No newline at end of file
diff --git a/monitorMobile/pages/work/passengerFlow/index.vue b/monitorMobile/pages/work/passengerFlow/index.vue
index 6d9996c..8638b67 100644
--- a/monitorMobile/pages/work/passengerFlow/index.vue
+++ b/monitorMobile/pages/work/passengerFlow/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
分片详情
@@ -35,7 +35,6 @@
-
@@ -98,12 +97,14 @@
.whiteCard {
background-color: #fff;
border-radius: 18rpx;
- margin: 12rpx 28rpx;
+ margin: 14rpx 28rpx;
padding: 30rpx;
+ padding-bottom: 24rpx;
color: #333333;
.row1 {
font-size: 32rpx;
+ font-weight: 700;
}
.row2 {
@@ -145,7 +146,7 @@
display: flex;
border-top: 1rpx solid rgba(0, 0, 0, 0.1);
margin-top: 24rpx;
- padding-top: 22rpx;
+ padding-top: 24rpx;
position: relative;
.btn {
diff --git a/monitorMobile/pages/work/returnBed/comfirm.vue b/monitorMobile/pages/work/returnBed/comfirm.vue
deleted file mode 100644
index b12835c..0000000
--- a/monitorMobile/pages/work/returnBed/comfirm.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
- 寝室104
-
-
- 2024年8月24日 18:00:00 ~ 18:59:00
-
-
-
-
-
-
-
-
-
- 杨云
-
-
- 系部:安环部
-
-
- 专业:环艺
- 班级:第二班
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/monitorMobile/pages/work/returnBed/detail.vue b/monitorMobile/pages/work/returnBed/detail.vue
index 78ee72c..1a2d418 100644
--- a/monitorMobile/pages/work/returnBed/detail.vue
+++ b/monitorMobile/pages/work/returnBed/detail.vue
@@ -1,7 +1,8 @@
-
+
寝室104
@@ -10,8 +11,9 @@
-
-
+
+
+
@@ -30,6 +32,9 @@
+
+ 归寝时间:2024-08-15 11:59:12
+
@@ -37,8 +42,9 @@
-
-
+
+
+
@@ -57,6 +63,9 @@
+
+ 归寝时间:2024-08-15 11:59:12
+
@@ -74,11 +83,10 @@
}, {
name: 3
}],
- checkboxValue:[],
+ checkboxValue: [],
}
},
- methods: {
- }
+ methods: {}
}
@@ -91,29 +99,33 @@
border-top: 1rpx solid rgba(0, 0, 0, 0.03);
font-size: 30rpx;
}
- .listTitlte{
+
+ .listTitlte {
color: #777777;
- font-size:28rpx;
- padding:18rpx 30rpx;
+ font-size: 28rpx;
+ padding: 18rpx 30rpx;
+ font-weight: 700;
}
+
.list {
padding: 0 26rpx;
margin-bottom: 16rpx;
- &:last-child{
+
+ &:last-child {
padding-bottom: 60rpx;
}
+
.item {
- display: flex;
margin-bottom: 28rpx;
+ background-color: #fff;
+ padding: 30rpx;
&:last-child {
margin-bottom: 0;
}
- .right {
- padding: 30rpx;
+ .topBox {
flex: 1;
- background-color: #fff;
border-radius: 18rpx;
display: flex;
@@ -126,8 +138,9 @@
.top {
color: #333;
font-size: 32rpx;
- display:flex;
- .status{
+ display: flex;
+
+ .status {
display: inline-block;
font-size: 24rpx;
line-height: 1.8;
@@ -137,9 +150,13 @@
border-radius: 8rpx;
margin-right: 12rpx;
}
- .status.error{
+
+ .status.error {
background-color: #EF2D2D;
}
+ .name{
+ font-weight: 700;
+ }
}
.depart {
@@ -160,5 +177,12 @@
}
}
}
+
+ .returnTime {
+ margin-top: 30rpx;
+ border-top: 1rpx solid rgba(0, 0, 0, 0.1);
+ font-size: 26rpx;
+ padding-top: 26rpx;
+ }
}
\ No newline at end of file
diff --git a/monitorMobile/pages/work/returnBed/index.vue b/monitorMobile/pages/work/returnBed/index.vue
index 91be339..690cf6b 100644
--- a/monitorMobile/pages/work/returnBed/index.vue
+++ b/monitorMobile/pages/work/returnBed/index.vue
@@ -3,8 +3,8 @@
-
+
@@ -12,23 +12,18 @@
寝室302
-
-
- 寝室人数:6
-
归寝人数:4
未归寝人数:2
-
-
- 查看
+
+
+ 寝室人数:6
-
-
- 归寝确认
+
+ 查看
@@ -124,21 +119,6 @@
font-size: 32rpx;
font-weight: 700;
}
-
- .peopleNum {
- uni-image {
- width: 30rpx;
- height: 30rpx;
- position: relative;
- top: 8rpx;
- margin-right: 6rpx;
- }
-
- uni-text {
- color: #2388FF;
- font-size: 26rpx;
- }
- }
}
.row2 {
@@ -154,26 +134,33 @@
.bottom {
display: flex;
+ justify-content: space-between;
border-top: 1rpx solid rgba(0, 0, 0, 0.1);
margin-top: 24rpx;
- padding-top: 22rpx;
+ padding-top: 30rpx;
position: relative;
- ::after{
- content: "";
- display: block;
- position: absolute;
- top: 26rpx;bottom: 0;
- left: 0;right: 0;
- margin: 0 auto;
- width: 1rpx;
- height: 32rpx;
- background-color: rgba(0, 0, 0, 0.01);
+ .peopleNum {
+ padding-top: 4rpx;
+ uni-image {
+ width: 34rpx;
+ height: 34rpx;
+ position: relative;
+ top: 8rpx;
+ margin-right: 6rpx;
+ }
+
+ uni-text {
+ font-size: 26rpx;
+ }
}
.btn {
- width: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
+ text-align: center;
+ line-height: 60rpx;
+ background-color: #2388FF;
+ padding: 0 34rpx;
+ color: #fff;
+ border-radius: 30rpx;
+ font-size: 26rpx;
uni-image {
width: 34rpx;
height: 34rpx;
diff --git a/monitorMobile/pages/work/rollCall/detail.vue b/monitorMobile/pages/work/rollCall/detail.vue
index a0e6a70..b270e5e 100644
--- a/monitorMobile/pages/work/rollCall/detail.vue
+++ b/monitorMobile/pages/work/rollCall/detail.vue
@@ -6,7 +6,8 @@
-
+
{{item.label}}({{item.value}})
@@ -14,12 +15,14 @@
-
+
-
+
-
+
{{cateList.find(e=>e.value == cate).label}}
@@ -38,7 +41,29 @@
-
+
+
+
@@ -76,17 +101,81 @@
],
cate: 1,
checkboxValue: [],
+
+ show: false,
+ popupInfo: {},
}
},
methods: {
- cateItemClick(item){
+ cateItemClick(item) {
this.cate = item.value
+ },
+ popupShow(item) {
+ this.popupInfo = item
+ this.show = true
}
}
}