From 9d312277b9cd9d61ff5ceaf1cc5be25a17d26e74 Mon Sep 17 00:00:00 2001 From: yxq Date: Thu, 29 Aug 2024 17:17:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- monitorMobile/common/mixins.vue | 2 +- monitorMobile/components/selectRadio.vue | 9 +- monitorMobile/components/selectSearch.vue | 75 ++---- monitorMobile/components/selectTree.vue | 17 +- monitorMobile/pages.json | 25 +- monitorMobile/pages/my/index.vue | 255 +++++++++++++++++- .../pages/work/passengerFlow/add.vue | 98 ------- .../pages/work/passengerFlow/detail.vue | 16 +- .../pages/work/passengerFlow/index.vue | 11 +- .../pages/work/returnBed/comfirm.vue | 154 ----------- monitorMobile/pages/work/returnBed/detail.vue | 62 +++-- monitorMobile/pages/work/returnBed/index.vue | 71 ++--- monitorMobile/pages/work/rollCall/detail.vue | 107 +++++++- monitorMobile/static/image/close.png | Bin 0 -> 2790 bytes monitorMobile/static/image/home.png | Bin 0 -> 1023 bytes monitorMobile/static/image/mybg.png | Bin 0 -> 465686 bytes monitorMobile/static/image/peopleNum1.png | Bin 0 -> 1372 bytes monitorMobile/static/image/school.png | Bin 0 -> 793 bytes 18 files changed, 483 insertions(+), 419 deletions(-) delete mode 100644 monitorMobile/pages/work/passengerFlow/add.vue delete mode 100644 monitorMobile/pages/work/returnBed/comfirm.vue create mode 100644 monitorMobile/static/image/close.png create mode 100644 monitorMobile/static/image/home.png create mode 100644 monitorMobile/static/image/mybg.png create mode 100644 monitorMobile/static/image/peopleNum1.png create mode 100644 monitorMobile/static/image/school.png 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 @@ - - - - - \ 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 @@ @@ -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 @@ - - - - - \ 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 @@ @@ -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 } } }