diff --git a/pages.json b/pages.json index dae1d6a..9ed881d 100644 --- a/pages.json +++ b/pages.json @@ -72,6 +72,22 @@ } }, { + "path" : "pages/checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/checkTable/checkTable", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/reportList/reportList", "style" : { @@ -80,6 +96,14 @@ } }, { + "path" : "pages/reportInfo/reportInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages.json b/pages.json index dae1d6a..9ed881d 100644 --- a/pages.json +++ b/pages.json @@ -72,6 +72,22 @@ } }, { + "path" : "pages/checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/checkTable/checkTable", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/reportList/reportList", "style" : { @@ -80,6 +96,14 @@ } }, { + "path" : "pages/reportInfo/reportInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue index ba36840..538c21d 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -6,21 +6,26 @@ prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" > - - 图标1 + + - - - {{item.name}} - ({{item.numberNo}}) - - - {{item.status}} - - - 图标 - 图标 + + + + {{item.name}} + ({{item.numberNo}}) + + + + + {{item.status}} + + + + 图标 + 图标 + @@ -32,19 +37,29 @@ data() { return { list:[ - {name:'井盖1',status: '正常',numberNo:'112022010260'}, - {name:'井盖2',status: '异常',numberNo:'112022010260'}, - {name:'井盖1',status: '正常',numberNo:'112022010260'}, + {name:'井盖1',status: '在线',numberNo:'112022010260'}, + {name:'井盖2',status: '离线',numberNo:'112022010260'}, + {name:'井盖1',status: '告警',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, ], } }, methods:{ - navigateCheck(){ - wx.navigateTo({ - url: '/pages/reportList/reportList', - }); + navigateCheck(index){ + if(index === '1') { + wx.navigateTo({ + url: '/pages/reportList/reportList', + }); + }else if (index === '2') { + wx.navigateTo({ + url: '/pages/checkInfo/checkInfo', + }); + }else if (index === '3') { + wx.navigateTo({ + url: '/pages/checkTable/checkTable', + }); + } }, } } @@ -58,11 +73,18 @@ align-items: center; justify-content: space-between; margin-bottom: 20rpx; + background-color: #fff; + border-radius: 20rpx; .check-top-icon{ cursor:pointer; - margin-left: 35rpx; + margin: 0 20rpx; } } + .check-center-bg { + padding: 20rpx 10rpx; + background-color: #fff; + border-radius: 20rpx; + } .check-center-info{ margin-top: 20rpx; padding: 20rpx; @@ -70,13 +92,19 @@ align-items: center; justify-content: space-between; border-bottom: 2rpx #ccc solid; + } .list-left{ text-align: center; } + .list-center { + display: flex; + align-items: center; + } .list-right{ width: 160rpx; display: flex; + align-items: center; justify-content: space-between; } } diff --git a/pages.json b/pages.json index dae1d6a..9ed881d 100644 --- a/pages.json +++ b/pages.json @@ -72,6 +72,22 @@ } }, { + "path" : "pages/checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/checkTable/checkTable", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/reportList/reportList", "style" : { @@ -80,6 +96,14 @@ } }, { + "path" : "pages/reportInfo/reportInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue index ba36840..538c21d 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -6,21 +6,26 @@ prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" > - - 图标1 + + - - - {{item.name}} - ({{item.numberNo}}) - - - {{item.status}} - - - 图标 - 图标 + + + + {{item.name}} + ({{item.numberNo}}) + + + + + {{item.status}} + + + + 图标 + 图标 + @@ -32,19 +37,29 @@ data() { return { list:[ - {name:'井盖1',status: '正常',numberNo:'112022010260'}, - {name:'井盖2',status: '异常',numberNo:'112022010260'}, - {name:'井盖1',status: '正常',numberNo:'112022010260'}, + {name:'井盖1',status: '在线',numberNo:'112022010260'}, + {name:'井盖2',status: '离线',numberNo:'112022010260'}, + {name:'井盖1',status: '告警',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, ], } }, methods:{ - navigateCheck(){ - wx.navigateTo({ - url: '/pages/reportList/reportList', - }); + navigateCheck(index){ + if(index === '1') { + wx.navigateTo({ + url: '/pages/reportList/reportList', + }); + }else if (index === '2') { + wx.navigateTo({ + url: '/pages/checkInfo/checkInfo', + }); + }else if (index === '3') { + wx.navigateTo({ + url: '/pages/checkTable/checkTable', + }); + } }, } } @@ -58,11 +73,18 @@ align-items: center; justify-content: space-between; margin-bottom: 20rpx; + background-color: #fff; + border-radius: 20rpx; .check-top-icon{ cursor:pointer; - margin-left: 35rpx; + margin: 0 20rpx; } } + .check-center-bg { + padding: 20rpx 10rpx; + background-color: #fff; + border-radius: 20rpx; + } .check-center-info{ margin-top: 20rpx; padding: 20rpx; @@ -70,13 +92,19 @@ align-items: center; justify-content: space-between; border-bottom: 2rpx #ccc solid; + } .list-left{ text-align: center; } + .list-center { + display: flex; + align-items: center; + } .list-right{ width: 160rpx; display: flex; + align-items: center; justify-content: space-between; } } diff --git a/pages/checkInfo/checkInfo.vue b/pages/checkInfo/checkInfo.vue new file mode 100644 index 0000000..6b6acd7 --- /dev/null +++ b/pages/checkInfo/checkInfo.vue @@ -0,0 +1,113 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index dae1d6a..9ed881d 100644 --- a/pages.json +++ b/pages.json @@ -72,6 +72,22 @@ } }, { + "path" : "pages/checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/checkTable/checkTable", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/reportList/reportList", "style" : { @@ -80,6 +96,14 @@ } }, { + "path" : "pages/reportInfo/reportInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue index ba36840..538c21d 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -6,21 +6,26 @@ prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" > - - 图标1 + + - - - {{item.name}} - ({{item.numberNo}}) - - - {{item.status}} - - - 图标 - 图标 + + + + {{item.name}} + ({{item.numberNo}}) + + + + + {{item.status}} + + + + 图标 + 图标 + @@ -32,19 +37,29 @@ data() { return { list:[ - {name:'井盖1',status: '正常',numberNo:'112022010260'}, - {name:'井盖2',status: '异常',numberNo:'112022010260'}, - {name:'井盖1',status: '正常',numberNo:'112022010260'}, + {name:'井盖1',status: '在线',numberNo:'112022010260'}, + {name:'井盖2',status: '离线',numberNo:'112022010260'}, + {name:'井盖1',status: '告警',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, ], } }, methods:{ - navigateCheck(){ - wx.navigateTo({ - url: '/pages/reportList/reportList', - }); + navigateCheck(index){ + if(index === '1') { + wx.navigateTo({ + url: '/pages/reportList/reportList', + }); + }else if (index === '2') { + wx.navigateTo({ + url: '/pages/checkInfo/checkInfo', + }); + }else if (index === '3') { + wx.navigateTo({ + url: '/pages/checkTable/checkTable', + }); + } }, } } @@ -58,11 +73,18 @@ align-items: center; justify-content: space-between; margin-bottom: 20rpx; + background-color: #fff; + border-radius: 20rpx; .check-top-icon{ cursor:pointer; - margin-left: 35rpx; + margin: 0 20rpx; } } + .check-center-bg { + padding: 20rpx 10rpx; + background-color: #fff; + border-radius: 20rpx; + } .check-center-info{ margin-top: 20rpx; padding: 20rpx; @@ -70,13 +92,19 @@ align-items: center; justify-content: space-between; border-bottom: 2rpx #ccc solid; + } .list-left{ text-align: center; } + .list-center { + display: flex; + align-items: center; + } .list-right{ width: 160rpx; display: flex; + align-items: center; justify-content: space-between; } } diff --git a/pages/checkInfo/checkInfo.vue b/pages/checkInfo/checkInfo.vue new file mode 100644 index 0000000..6b6acd7 --- /dev/null +++ b/pages/checkInfo/checkInfo.vue @@ -0,0 +1,113 @@ + + + + + \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue new file mode 100644 index 0000000..d3dad6d --- /dev/null +++ b/pages/checkTable/checkTable.vue @@ -0,0 +1,290 @@ + + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index dae1d6a..9ed881d 100644 --- a/pages.json +++ b/pages.json @@ -72,6 +72,22 @@ } }, { + "path" : "pages/checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/checkTable/checkTable", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/reportList/reportList", "style" : { @@ -80,6 +96,14 @@ } }, { + "path" : "pages/reportInfo/reportInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue index ba36840..538c21d 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -6,21 +6,26 @@ prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" > - - 图标1 + + - - - {{item.name}} - ({{item.numberNo}}) - - - {{item.status}} - - - 图标 - 图标 + + + + {{item.name}} + ({{item.numberNo}}) + + + + + {{item.status}} + + + + 图标 + 图标 + @@ -32,19 +37,29 @@ data() { return { list:[ - {name:'井盖1',status: '正常',numberNo:'112022010260'}, - {name:'井盖2',status: '异常',numberNo:'112022010260'}, - {name:'井盖1',status: '正常',numberNo:'112022010260'}, + {name:'井盖1',status: '在线',numberNo:'112022010260'}, + {name:'井盖2',status: '离线',numberNo:'112022010260'}, + {name:'井盖1',status: '告警',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, ], } }, methods:{ - navigateCheck(){ - wx.navigateTo({ - url: '/pages/reportList/reportList', - }); + navigateCheck(index){ + if(index === '1') { + wx.navigateTo({ + url: '/pages/reportList/reportList', + }); + }else if (index === '2') { + wx.navigateTo({ + url: '/pages/checkInfo/checkInfo', + }); + }else if (index === '3') { + wx.navigateTo({ + url: '/pages/checkTable/checkTable', + }); + } }, } } @@ -58,11 +73,18 @@ align-items: center; justify-content: space-between; margin-bottom: 20rpx; + background-color: #fff; + border-radius: 20rpx; .check-top-icon{ cursor:pointer; - margin-left: 35rpx; + margin: 0 20rpx; } } + .check-center-bg { + padding: 20rpx 10rpx; + background-color: #fff; + border-radius: 20rpx; + } .check-center-info{ margin-top: 20rpx; padding: 20rpx; @@ -70,13 +92,19 @@ align-items: center; justify-content: space-between; border-bottom: 2rpx #ccc solid; + } .list-left{ text-align: center; } + .list-center { + display: flex; + align-items: center; + } .list-right{ width: 160rpx; display: flex; + align-items: center; justify-content: space-between; } } diff --git a/pages/checkInfo/checkInfo.vue b/pages/checkInfo/checkInfo.vue new file mode 100644 index 0000000..6b6acd7 --- /dev/null +++ b/pages/checkInfo/checkInfo.vue @@ -0,0 +1,113 @@ + + + + + \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue new file mode 100644 index 0000000..d3dad6d --- /dev/null +++ b/pages/checkTable/checkTable.vue @@ -0,0 +1,290 @@ + + + + + + \ No newline at end of file diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue new file mode 100644 index 0000000..f2447ed --- /dev/null +++ b/pages/reportInfo/reportInfo.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/pages.json b/pages.json index dae1d6a..9ed881d 100644 --- a/pages.json +++ b/pages.json @@ -72,6 +72,22 @@ } }, { + "path" : "pages/checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/checkTable/checkTable", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/reportList/reportList", "style" : { @@ -80,6 +96,14 @@ } }, { + "path" : "pages/reportInfo/reportInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue index ba36840..538c21d 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -6,21 +6,26 @@ prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" > - - 图标1 + + - - - {{item.name}} - ({{item.numberNo}}) - - - {{item.status}} - - - 图标 - 图标 + + + + {{item.name}} + ({{item.numberNo}}) + + + + + {{item.status}} + + + + 图标 + 图标 + @@ -32,19 +37,29 @@ data() { return { list:[ - {name:'井盖1',status: '正常',numberNo:'112022010260'}, - {name:'井盖2',status: '异常',numberNo:'112022010260'}, - {name:'井盖1',status: '正常',numberNo:'112022010260'}, + {name:'井盖1',status: '在线',numberNo:'112022010260'}, + {name:'井盖2',status: '离线',numberNo:'112022010260'}, + {name:'井盖1',status: '告警',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, {name:'井盖1',status: '正常',numberNo:'112022010260'}, ], } }, methods:{ - navigateCheck(){ - wx.navigateTo({ - url: '/pages/reportList/reportList', - }); + navigateCheck(index){ + if(index === '1') { + wx.navigateTo({ + url: '/pages/reportList/reportList', + }); + }else if (index === '2') { + wx.navigateTo({ + url: '/pages/checkInfo/checkInfo', + }); + }else if (index === '3') { + wx.navigateTo({ + url: '/pages/checkTable/checkTable', + }); + } }, } } @@ -58,11 +73,18 @@ align-items: center; justify-content: space-between; margin-bottom: 20rpx; + background-color: #fff; + border-radius: 20rpx; .check-top-icon{ cursor:pointer; - margin-left: 35rpx; + margin: 0 20rpx; } } + .check-center-bg { + padding: 20rpx 10rpx; + background-color: #fff; + border-radius: 20rpx; + } .check-center-info{ margin-top: 20rpx; padding: 20rpx; @@ -70,13 +92,19 @@ align-items: center; justify-content: space-between; border-bottom: 2rpx #ccc solid; + } .list-left{ text-align: center; } + .list-center { + display: flex; + align-items: center; + } .list-right{ width: 160rpx; display: flex; + align-items: center; justify-content: space-between; } } diff --git a/pages/checkInfo/checkInfo.vue b/pages/checkInfo/checkInfo.vue new file mode 100644 index 0000000..6b6acd7 --- /dev/null +++ b/pages/checkInfo/checkInfo.vue @@ -0,0 +1,113 @@ + + + + + \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue new file mode 100644 index 0000000..d3dad6d --- /dev/null +++ b/pages/checkTable/checkTable.vue @@ -0,0 +1,290 @@ + + + + + + \ No newline at end of file diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue new file mode 100644 index 0000000..f2447ed --- /dev/null +++ b/pages/reportInfo/reportInfo.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index 853de97..b8d68f5 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -17,7 +17,7 @@ statusInfo }} - + @@ -42,22 +42,25 @@ - + {{item.name}} ({{item.numberNo}}) - + {{item.yy}} - + {{item.sz}} - + {{item.time}} - + 取消告警 + + 历史告警 + @@ -71,7 +74,7 @@ 提示 - 确认将{{ checkExport }}访客表单导出吗？ + 确认将所有的数据导出吗？ @@ -87,15 +90,55 @@ @close="close" > - 提示 - 确定要将{{ text }}的{{ leixin }}? + 取消告警 + + + + + + + + - + + { - // item.value = false - // if (item.visitorApplyStatus == "1") { - // item.status = "申请已提交"; - // item.color = "blue"; - // } else if (item.visitorApplyStatus == "2") { - // item.status = "申请已通过"; - // item.color = "green"; - // } else { - // item.status = "申请未通过"; - // item.color = "red"; - // } - // return item; - // }); }, //下拉刷新 onPullDownRefresh() { @@ -253,13 +305,16 @@ uni.stopPullDownRefresh(); }); this.checkboxList = []; - this.checkExport = "所有"; }, //上滑加载 onReachBottom() { this.getLoadingList(); }, methods: { + sexSelect(e) { + this.model1.userInfo.sex = e.name + this.$refs.form1.validateField('userInfo.sex') + }, //选中的数据 checkboxChange(item) { item.value = !item.value @@ -364,37 +419,18 @@ this.queryList.status = e.id; this.searchList(false); }, - //打开导出提示框 - pass(leixin) { - this.leixin = leixin; - this.text = this.checkboxList.length !== 0 ? "选中的" : "所有"; - this.ispassShow = true; - }, + // 点击取消告警弹窗中的确认按钮 async possQr() { - const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') - let ids = statusList.map((item) => item.id).join(); - if( ids === '') { - this.checkboxList = []; - this.ispassShow = false; - this.searchList(false); - return uni.showToast({ - title: `暂无需要改动状态人员`, - icon: 'none', - duration: 2000, - }) - } - let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); - this.searchList(false); - this.ispassShow = false; - this.checkboxList = []; + }, + // 确认导出 exportQr() { this.exportClick(); this.isExportShow = false; }, eyeLoock(messageId) { wx.navigateTo({ - url: `/pages/info/info?messageId=${messageId}`, + url: `/pages/reportInfo/reportInfo?messageId=${messageId}`, }); }, //取消选择时间 @@ -407,8 +443,8 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; }, //确定选择结束时间 @@ -587,12 +623,6 @@ background: url(@/static/listIcon/noNext.png) no-repeat; background-size: contain; } - .checkmark-circle { - width: 55rpx; - height: 55rpx; - background: url(@/static/listIcon/next.png) no-repeat; - background-size: contain; - } .share-square { width: 55rpx; height: 55rpx; @@ -601,96 +631,19 @@ } } } - .table { - font-size: 24rpx; - display: flex; - align-items: center; - font-size: 28rpx; - .table-checkbox { - width: 30rpx; - height: 100rpx; - padding: 50rpx 5rpx 3rpx 3rpx; - } - .table-item { - width: 360rpx; - margin-left: 20rpx; - margin-right: 40rpx; - .table-item-top { - display: flex; - justify-content: space-between; - .table-name { - font-size: 34rpx; - font-weight: 500; - } - .table-number { - font-size: 26rpx; - color: #ccc; - } - } - - .table-time { - margin-top: 10rpx; - font-size: 26rpx; - color: #ccc; - } - } - - .table-icon { - display: flex; - justify-content: center; - align-items: center; - margin-left: 25rpx; - padding-right: 10rpx; - height: 150rpx; - width: 50rpx; - .icon-info { - width: 55rpx; - height: 55rpx; - background: url(@/static/listIcon/overInfo.png) no-repeat; - background-size: 55rpx 55rpx; - } - } - } } /deep/.u-input__content { background-color: #f0f0f0; border-radius: 10rpx; height: 80rpx; } -.green { - width: 240rpx; - height: 48rpx; - background-color: #00aa88; - text-align: center; - line-height: 48rpx; - border-radius: 48rpx; - color: #fff; -} -.blue { - width: 240rpx; - height: 48rpx; - background-color: #85c2ff; - text-align: center; - line-height: 48rpx; - border-radius: 48rpx; - color: #fff; -} -.red { - width: 240rpx; - height: 48rpx; - background-color: #fa5a5a; - text-align: center; - line-height: 48rpx; - border-radius: 48rpx; - color: #fff; -} .list-content-top { height: 80rpx; display: flex; align-items: center; justify-content: space-between; .list-content-info { - + font-weight: 500; } } .list-content-center-info { @@ -700,6 +653,20 @@ height: 80rpx; margin-bottom: 20rpx; } + .error-report { + width: 150rpx; + height: 50rpx; + color: #fff; + line-height: 50rpx; + text-align: center; + border-radius: 20rpx; + } + .error-report-red { + background-color: red; + } + .error-report-orange { + background-color: orange; + }