diff --git a/SafeCampus.WEB/src/views/attendance/roolcall/detail.vue b/SafeCampus.WEB/src/views/attendance/roolcall/detail.vue index f3c2be2..abbf889 100644 --- a/SafeCampus.WEB/src/views/attendance/roolcall/detail.vue +++ b/SafeCampus.WEB/src/views/attendance/roolcall/detail.vue @@ -13,15 +13,12 @@ 趴桌子：{{ LieOnTable.length }}人 - - 未识别：{{ UnrecognizedD.length }} -
@@ -49,24 +46,6 @@ > - -
-
未识别人员
-
    -
  • - - 指派 -
    • -
-
- diff --git a/monitorMobile/.gitignore b/monitorMobile/.gitignore new file mode 100644 index 0000000..baba63b --- /dev/null +++ b/monitorMobile/.gitignore @@ -0,0 +1,27 @@ +.DS_Store +node_modules/ +dist/ +unpackage/ +.hbuilderx/ + +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local +.env.development + +package-lock.json +yarn.lock diff --git a/monitorMobile/pages.json b/monitorMobile/pages.json index 886cdf6..1f6592e 100644 --- a/monitorMobile/pages.json +++ b/monitorMobile/pages.json @@ -72,7 +72,7 @@ { "path": "pages/earlyWarning/index", "style": { - "navigationBarTitleText": "预警巡警" + "navigationStyle": "custom" } }, // 我的 diff --git a/monitorMobile/pages/earlyWarning/index.vue b/monitorMobile/pages/earlyWarning/index.vue index 3579489..61f5d3d 100644 --- a/monitorMobile/pages/earlyWarning/index.vue +++ b/monitorMobile/pages/earlyWarning/index.vue @@ -1,6 +1,110 @@ @@ -8,15 +112,278 @@ export default { data() { return { - + showSelectModel: false, + modelObj: { + name: '预警信息', + backgroundImg: require(`@/static/image/earlyWarning/warnBack.png`) + }, + isActive: '1', + modelList: [{ + id: '1', + name: '预警信息', + imgUrl: require(`@/static/image/earlyWarning/warnBack.png`) + }, + { + id: '2', + name: '巡检中心', + imgUrl: require(`@/static/image/earlyWarning/majorBack.png`) + } + ], + isShowSearch: false, + list: [{}, {}, {}, {}, {}, {}, {}, {}, {}, ], + isLoading: false, + status: 'loadmore', //loading正在加载 loadmore加载更多 nomore没有更多了 } }, + onLoad() { + // 隐藏导航栏 + this.loadmore() + }, methods: { - + + open() { + // console.log('open'); + }, + close() { + this.showSelectModel = false; + // console.log('close'); + }, + // 切换模块 + modelChange(item) { + console.log(item) + this.modelObj.name = item.name; + this.modelObj.backgroundImg = item.imgUrl; + this.isActive = item.id; + this.showSelectModel = false; + // switch (item.id) { + // case '1': + + // break; + // case '2': + // break; + // default: + // break; + // } + }, + // 打开筛选框 + openSearch() { + this.isShowSearch = !this.isShowSearch; + + }, + isSelect() { + + }, + scrolltolower() { + this.loadmore() + }, + loadmore() { + if (this.status != 'loadmore') return + this.status = 'loading' + setTimeout(() => { + for (let i = 0; i < 1; i++) { + this.list.push({}, {}) + } + // 获取到的总条数>=接口总条数 + if (this.list.length >= 14) { + this.status = 'nomore' + } else { + this.status = 'loadmore' + } + }, 2000) + } } } - + .leftSearchBox { + display: flex; + align-items: center; + width: calc(100% - 40px); + + .searchLabel { + flex-shrink: 1; + color: #333333; + width: 80px; + } + + .searchValue { + width: calc(100% - 60px); + margin-left: 10px; + color: #2388FF; + overflow: hidden; + word-wrap: break-word; + white-space: pre-wrap; + // font-size: 14px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + } + } + } + + .searchDialog { + // height: calc(100% - 360rpx); + position: absolute; + z-index: 999; + top: 89rpx; + width: 100%; + height: calc(100vh - 600rpx); + font-size: 26rpx; + background: rgba(0, 0, 0, 0.2); + + .content { + background: #FFFFFF; + padding: 15px; + box-sizing: border-box; + + .demo-layout { + height: 80rpx; + border-radius: 8rpx; + background: #F5F5F5; + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 10px; + box-sizing: border-box; + + .left-layout { + color: #777777; + } + + .right-layout {} + + .startBox { + color: #777777; + } + + text { + color: #777777; + } + + .endBox { + color: #777777; + } + + .timeIcon {} + } + } + + .btnBox { + display: flex; + align-items: center; + margin-top: 15px; + + .leftBtn { + width: 50%; + height: 74rpx; + line-height: 74rpx; + border: 1px solid #BABABA; + border-radius: 12rpx; + color: #333333; + text-align: center; + + } + + .rightBtn { + width: 50%; + height: 74rpx; + line-height: 74rpx; + border: 1px solid #2388FF; + border-radius: 12rpx; + color: #fff; + text-align: center; + background: #2388FF; + margin-left: 15rpx; + } + } + } + } + + .tableBox { + height: 100%; + padding: 10px; + box-sizing: border-box; + // height: 600px; + padding-bottom: 50px; + + + .liBox { + background: #fff; + padding: 10px; + box-sizing: border-box; + border-radius: 20px; + margin-bottom: 10px; + } + + } + } + } + \ No newline at end of file diff --git a/monitorMobile/static/image/earlyWarning/arrowRight.png b/monitorMobile/static/image/earlyWarning/arrowRight.png new file mode 100644 index 0000000..01aed36 Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/arrowRight.png differ diff --git a/monitorMobile/static/image/earlyWarning/calendar.png b/monitorMobile/static/image/earlyWarning/calendar.png new file mode 100644 index 0000000..8a61224 Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/calendar.png differ diff --git a/monitorMobile/static/image/earlyWarning/down.png b/monitorMobile/static/image/earlyWarning/down.png new file mode 100644 index 0000000..eb1d6ae Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/down.png differ diff --git a/monitorMobile/static/image/earlyWarning/majorBack.png b/monitorMobile/static/image/earlyWarning/majorBack.png new file mode 100644 index 0000000..d7cd47b Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/majorBack.png differ diff --git a/monitorMobile/static/image/earlyWarning/screen.png b/monitorMobile/static/image/earlyWarning/screen.png new file mode 100644 index 0000000..76bb7d7 Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/screen.png differ diff --git a/monitorMobile/static/image/earlyWarning/screenActive.png b/monitorMobile/static/image/earlyWarning/screenActive.png new file mode 100644 index 0000000..da27b77 Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/screenActive.png differ diff --git a/monitorMobile/static/image/earlyWarning/warnBack.png b/monitorMobile/static/image/earlyWarning/warnBack.png new file mode 100644 index 0000000..f718de9 Binary files /dev/null and b/monitorMobile/static/image/earlyWarning/warnBack.png differ