diff --git a/monitorMobile/common/mixins.vue b/monitorMobile/common/mixins.vue
index 7b11b00..e43a634 100644
--- a/monitorMobile/common/mixins.vue
+++ b/monitorMobile/common/mixins.vue
@@ -87,7 +87,7 @@
CONFIRM(content='是否确认执行此操作?'){
return new Promise((resolve)=>{
uni.showModal({
- title: '提示信息',
+ title: '提示',
content: content,
cancelText: "取消",
confirmText: "确认",
diff --git a/monitorMobile/components/selectRadio.vue b/monitorMobile/components/selectRadio.vue
index e5e1bcf..0f75c58 100644
--- a/monitorMobile/components/selectRadio.vue
+++ b/monitorMobile/components/selectRadio.vue
@@ -53,12 +53,14 @@
if (obj) this.title_ = obj.label
this.title_ = obj ? obj.label : this.title
this.value_ = this.value
+ this.show = true
},
change(e) {
this.$emit("update:value",e)
let obj = this.options.find(e1=>e1.value == e)
if(obj) this.title_ = obj.label
this.$emit("change")
+ this.close()
},
}
}
@@ -66,10 +68,10 @@
\ No newline at end of file
diff --git a/monitorMobile/components/selectSearch.vue b/monitorMobile/components/selectSearch.vue
index 10f06a8..accb487 100644
--- a/monitorMobile/components/selectSearch.vue
+++ b/monitorMobile/components/selectSearch.vue
@@ -112,6 +112,7 @@
}
this.value_ = this.value
this.searchText = ''
+ this.show = true
},
change(e) {
this.gruopValue = e
@@ -143,6 +144,7 @@
.u-radio-group {
width: 92%;
max-height: 680rpx;
+ min-height: 360rpx;
overflow-y: auto;
padding: 0 30rpx;
diff --git a/monitorMobile/components/selectTree.vue b/monitorMobile/components/selectTree.vue
index 347565f..cf4b65d 100644
--- a/monitorMobile/components/selectTree.vue
+++ b/monitorMobile/components/selectTree.vue
@@ -158,7 +158,6 @@
},
// 切换tab
tabsChange(item) {
- console.log(1)
if (this.tabIndex == item.value) return
this.tabIndex = item.value
setTimeout(() => {
diff --git a/monitorMobile/pages/attendanceCall/passengerFlow/add.vue b/monitorMobile/pages/attendanceCall/passengerFlow/add.vue
index cd0238c..9a19e57 100644
--- a/monitorMobile/pages/attendanceCall/passengerFlow/add.vue
+++ b/monitorMobile/pages/attendanceCall/passengerFlow/add.vue
@@ -36,6 +36,10 @@
+
+
+
@@ -56,7 +60,13 @@
rules: []
}
},
- methods: {}
+ methods: {
+ confirm(){
+ this.CONFIRM(`是否删除点名任务?`).then(()=>{
+
+ })
+ }
+ }
}
diff --git a/monitorMobile/pages/attendanceCall/passengerFlow/index.vue b/monitorMobile/pages/attendanceCall/passengerFlow/index.vue
index 5fd3bee..a6457f9 100644
--- a/monitorMobile/pages/attendanceCall/passengerFlow/index.vue
+++ b/monitorMobile/pages/attendanceCall/passengerFlow/index.vue
@@ -46,10 +46,6 @@
list: [{}, {}, {}, {}, {}, {}, {}, {}, {}, ],
isLoading: false,
status: 'loadmore', //loading正在加载 loadmore加载更多 nomore没有更多了
- search: {
- loudong: 1,
- qinshi: ''
- },
page: {
size: 8,
page: 8,
diff --git a/monitorMobile/pages/attendanceCall/returnBed/index.vue b/monitorMobile/pages/attendanceCall/returnBed/index.vue
index 4826d2e..59e6c90 100644
--- a/monitorMobile/pages/attendanceCall/returnBed/index.vue
+++ b/monitorMobile/pages/attendanceCall/returnBed/index.vue
@@ -1,9 +1,9 @@
-
-
@@ -121,13 +121,13 @@
justify-content: space-between;
.room {
- font-size: 34rpx;
+ font-size: 32rpx;
}
.peopleNum {
uni-image {
- width: 34rpx;
- height: 34rpx;
+ width: 30rpx;
+ height: 30rpx;
position: relative;
top: 8rpx;
margin-right: 6rpx;
@@ -135,7 +135,7 @@
uni-text {
color: #2388FF;
- font-size: 30rpx;
+ font-size: 26rpx;
}
}
}
@@ -144,7 +144,7 @@
margin-top: 18rpx;
display: flex;
justify-content: space-between;
- font-size: 30rpx;
+ font-size: 26rpx;
.returnNum {}
@@ -161,7 +161,7 @@
content: "";
display: block;
position: absolute;
- top: 30rpx;bottom: 0;
+ top: 26rpx;bottom: 0;
left: 0;right: 0;
margin: 0 auto;
width: 1rpx;
@@ -180,7 +180,7 @@
}
uni-text {
- font-size: 30rpx;
+ font-size: 28rpx;
}
}
}
diff --git a/monitorMobile/pages/attendanceCall/rollCall/index.vue b/monitorMobile/pages/attendanceCall/rollCall/index.vue
index 7184df5..e58ddb1 100644
--- a/monitorMobile/pages/attendanceCall/rollCall/index.vue
+++ b/monitorMobile/pages/attendanceCall/rollCall/index.vue
@@ -1,22 +1,232 @@
-
- 点名
+
+
+
+
+
+
+ {{isManage?'取消管理':'批量管理'}}
+
+
+
+
+
+
+
+
+
+ 教室(海康)
+
+
+
+ 持续时间:20
+
+
+ 相似度:0.5
+
+
+
+
+
+ 查看
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
-
+ .left {
+ flex: 1;
+ }
+
+ .right {
+ font-size: 28rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #333;
+ padding: 0 26rpx;
+ }
+ }
+
+ .u-list-item {
+ display: flex;
+ align-items: center;
+ flex-direction: unset;
+ margin: 12rpx 28rpx;
+ .whiteCard {
+ flex: 1;
+ &.active{
+ border: 1rpx solid #2388FF;
+ background-color: #F2F8FF;
+ }
+ }
+ .u-checkbox{
+ margin-right: 12rpx;
+ }
+ }
+
+ .whiteCard {
+ background-color: #fff;
+ border-radius: 18rpx;
+ padding: 30rpx;
+ color: #333333;
+
+ .row1 {
+ font-size: 32rpx;
+ }
+
+ .row2 {
+ font-size: 26rpx;
+ margin-top: 20rpx;
+ display: flex;
+ justify-content: space-between;
+ }
+
+ .bottom {
+ display: flex;
+ border-top: 1rpx solid rgba(0, 0, 0, 0.1);
+ margin-top: 36rpx;
+ padding-top: 22rpx;
+ 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);
+ }
+
+ .btn {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ uni-image {
+ width: 34rpx;
+ height: 34rpx;
+ margin-right: 6rpx;
+ }
+
+ uni-text {
+ font-size: 30rpx;
+ }
+ }
+ }
+ }
+
\ No newline at end of file