diff --git a/pages.json b/pages.json index f2a5ec6..dae1d6a 100644 --- a/pages.json +++ b/pages.json @@ -64,6 +64,22 @@ } }, { + "path" : "pages/check/check", + "style" : + { + "navigationBarTitleText": "物联网安全监测", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/reportList/reportList", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages.json b/pages.json index f2a5ec6..dae1d6a 100644 --- a/pages.json +++ b/pages.json @@ -64,6 +64,22 @@ } }, { + "path" : "pages/check/check", + "style" : + { + "navigationBarTitleText": "物联网安全监测", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/reportList/reportList", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue new file mode 100644 index 0000000..ba36840 --- /dev/null +++ b/pages/check/check.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index f2a5ec6..dae1d6a 100644 --- a/pages.json +++ b/pages.json @@ -64,6 +64,22 @@ } }, { + "path" : "pages/check/check", + "style" : + { + "navigationBarTitleText": "物联网安全监测", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/reportList/reportList", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue new file mode 100644 index 0000000..ba36840 --- /dev/null +++ b/pages/check/check.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 15cf0ff..9fd2bfa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -38,7 +38,7 @@ }, { id: "check", - name: "物联设备状态查看", + name: "物联网安全监测", }, ], phone: "", @@ -75,9 +75,12 @@ this.popShow = true; } } else { - uni.showToast({ - title: '敬请期待', - icon: 'none' + // uni.showToast({ + // title: '敬请期待', + // icon: 'none' + // }); + wx.navigateTo({ + url: '/pages/check/check', }); } }, diff --git a/pages.json b/pages.json index f2a5ec6..dae1d6a 100644 --- a/pages.json +++ b/pages.json @@ -64,6 +64,22 @@ } }, { + "path" : "pages/check/check", + "style" : + { + "navigationBarTitleText": "物联网安全监测", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/reportList/reportList", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue new file mode 100644 index 0000000..ba36840 --- /dev/null +++ b/pages/check/check.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 15cf0ff..9fd2bfa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -38,7 +38,7 @@ }, { id: "check", - name: "物联设备状态查看", + name: "物联网安全监测", }, ], phone: "", @@ -75,9 +75,12 @@ this.popShow = true; } } else { - uni.showToast({ - title: '敬请期待', - icon: 'none' + // uni.showToast({ + // title: '敬请期待', + // icon: 'none' + // }); + wx.navigateTo({ + url: '/pages/check/check', }); } }, diff --git a/pages/info/info.vue b/pages/info/info.vue index f19ae45..33abaab 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -123,12 +123,12 @@ } } .green{ - color: #04ef0e; + color: #2ebf00; } .blue{ - color: #04a4ef; + color: #1076e3; } .red{ - color: #ff0019; + color: #f02a0a; } diff --git a/pages.json b/pages.json index f2a5ec6..dae1d6a 100644 --- a/pages.json +++ b/pages.json @@ -64,6 +64,22 @@ } }, { + "path" : "pages/check/check", + "style" : + { + "navigationBarTitleText": "物联网安全监测", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/reportList/reportList", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue new file mode 100644 index 0000000..ba36840 --- /dev/null +++ b/pages/check/check.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 15cf0ff..9fd2bfa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -38,7 +38,7 @@ }, { id: "check", - name: "物联设备状态查看", + name: "物联网安全监测", }, ], phone: "", @@ -75,9 +75,12 @@ this.popShow = true; } } else { - uni.showToast({ - title: '敬请期待', - icon: 'none' + // uni.showToast({ + // title: '敬请期待', + // icon: 'none' + // }); + wx.navigateTo({ + url: '/pages/check/check', }); } }, diff --git a/pages/info/info.vue b/pages/info/info.vue index f19ae45..33abaab 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -123,12 +123,12 @@ } } .green{ - color: #04ef0e; + color: #2ebf00; } .blue{ - color: #04a4ef; + color: #1076e3; } .red{ - color: #ff0019; + color: #f02a0a; } diff --git a/pages/information/information.vue b/pages/information/information.vue index d4c0e14..6ce8baa 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -29,10 +29,10 @@ - + - + @@ -132,12 +132,8 @@ isTimeShow: false, buildingShow: false, isinTimeShow: false, - columns: [ - // ['商务会议', '安装维修', '其他事宜'] - ], - buildingColumns: [ - // ['一期主楼', '二期主楼', '录制楼', '1600演播厅'] - ] + columns: [], + buildingColumns: [] } }, onLoad() { @@ -202,7 +198,6 @@ }, // 确定选择开始时间 async closeinTime(e) { - console.log(e) this.callerInfo.inTime = await this.shijianc(e.value) this.isinTimeShow = false this.isTimeShow = true diff --git a/pages.json b/pages.json index f2a5ec6..dae1d6a 100644 --- a/pages.json +++ b/pages.json @@ -64,6 +64,22 @@ } }, { + "path" : "pages/check/check", + "style" : + { + "navigationBarTitleText": "物联网安全监测", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/reportList/reportList", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue new file mode 100644 index 0000000..ba36840 --- /dev/null +++ b/pages/check/check.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 15cf0ff..9fd2bfa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -38,7 +38,7 @@ }, { id: "check", - name: "物联设备状态查看", + name: "物联网安全监测", }, ], phone: "", @@ -75,9 +75,12 @@ this.popShow = true; } } else { - uni.showToast({ - title: '敬请期待', - icon: 'none' + // uni.showToast({ + // title: '敬请期待', + // icon: 'none' + // }); + wx.navigateTo({ + url: '/pages/check/check', }); } }, diff --git a/pages/info/info.vue b/pages/info/info.vue index f19ae45..33abaab 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -123,12 +123,12 @@ } } .green{ - color: #04ef0e; + color: #2ebf00; } .blue{ - color: #04a4ef; + color: #1076e3; } .red{ - color: #ff0019; + color: #f02a0a; } diff --git a/pages/information/information.vue b/pages/information/information.vue index d4c0e14..6ce8baa 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -29,10 +29,10 @@ - + - + @@ -132,12 +132,8 @@ isTimeShow: false, buildingShow: false, isinTimeShow: false, - columns: [ - // ['商务会议', '安装维修', '其他事宜'] - ], - buildingColumns: [ - // ['一期主楼', '二期主楼', '录制楼', '1600演播厅'] - ] + columns: [], + buildingColumns: [] } }, onLoad() { @@ -202,7 +198,6 @@ }, // 确定选择开始时间 async closeinTime(e) { - console.log(e) this.callerInfo.inTime = await this.shijianc(e.value) this.isinTimeShow = false this.isTimeShow = true diff --git a/pages/list/list.vue b/pages/list/list.vue index 342ad9b..be1a1cf 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -145,8 +145,8 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }, list: [], isExportShow: false, @@ -170,14 +170,14 @@ isTimeZ: "", statusInfo: "筛选状态", popShow: false, //控制授权手机号弹出框 - offset: 1, //页数 - limit: 10, //一页几条数据 - nothingMore: false, //上拉加载-没有数据了 - loading: false, //是否显示上拉加载-加载中 + offset: 1, //页数 + limit: 10, //一页几条数据 + nothingMore: false, //上拉加载-没有数据了 + loading: false, //是否显示上拉加载-加载中 }; }, async onShow() { - this.offset = 1; + this.offset = 1; let pages = getCurrentPages(); const curPage = pages[pages.length - 1]; this.currentPagePath = curPage.route; @@ -192,8 +192,8 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; const param = { offset: 1, @@ -223,12 +223,12 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; - this.searchList().then(() => { + this.searchList(false).then(() => { uni.stopPullDownRefresh(); }); this.checkboxList = []; @@ -241,7 +241,6 @@ methods: { //选中的数据 checkboxChange(item) { - console.log(item) item.value = !item.value if (this.checkboxList.indexOf(item) == -1) { this.checkboxList.push(item); @@ -273,7 +272,7 @@ return item; })); } - debounce(this.searchList(), 10000); + debounce(this.searchList(false), 10000); }, //确定导出 async exportClick() { @@ -308,10 +307,13 @@ this.checkboxList = []; }, //根据条件搜索 - async searchList() { + async searchList(is) { if(!this.loading) { this.list = []; } + if(!is) { + this.offset = 1 + } this.queryList.offset = this.offset; const res = await getList(this.queryList); if(res.records && res.records.length) { @@ -339,7 +341,7 @@ this.offset = 1; this.statusInfo = e.name; this.queryList.status = e.id; - this.searchList(); + this.searchList(false); }, //打开导出提示框 pass(leixin) { @@ -349,13 +351,11 @@ }, async possQr() { const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') - console.log(statusList) let ids = statusList.map((item) => item.id).join(); - console.log(ids) if( ids === '') { this.checkboxList = []; this.ispassShow = false; - this.searchList(); + this.searchList(false); return uni.showToast({ title: `暂无需要改动状态人员`, icon: 'none', @@ -363,7 +363,7 @@ }) } let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); - this.searchList(); + this.searchList(false); this.ispassShow = false; this.checkboxList = []; }, @@ -397,7 +397,7 @@ this.isTimeZ = await this.yueFen(e.value); this.time = `${this.isTimeQ}${this.isTimeZ}`; this.endTimeShow = false; - this.searchList(); + this.searchList(false); }, //确定选择开始时间 async confirmTime(e) { @@ -474,7 +474,7 @@ if (this.nothingMore) return; this.offset = this.offset + 1; this.loading = true; - await this.searchList(); + await this.searchList(true); this.loading = false; } }, diff --git a/pages.json b/pages.json index f2a5ec6..dae1d6a 100644 --- a/pages.json +++ b/pages.json @@ -64,6 +64,22 @@ } }, { + "path" : "pages/check/check", + "style" : + { + "navigationBarTitleText": "物联网安全监测", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/reportList/reportList", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { "path" : "pages/info/info", "style" : { diff --git a/pages/check/check.vue b/pages/check/check.vue new file mode 100644 index 0000000..ba36840 --- /dev/null +++ b/pages/check/check.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 15cf0ff..9fd2bfa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -38,7 +38,7 @@ }, { id: "check", - name: "物联设备状态查看", + name: "物联网安全监测", }, ], phone: "", @@ -75,9 +75,12 @@ this.popShow = true; } } else { - uni.showToast({ - title: '敬请期待', - icon: 'none' + // uni.showToast({ + // title: '敬请期待', + // icon: 'none' + // }); + wx.navigateTo({ + url: '/pages/check/check', }); } }, diff --git a/pages/info/info.vue b/pages/info/info.vue index f19ae45..33abaab 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -123,12 +123,12 @@ } } .green{ - color: #04ef0e; + color: #2ebf00; } .blue{ - color: #04a4ef; + color: #1076e3; } .red{ - color: #ff0019; + color: #f02a0a; } diff --git a/pages/information/information.vue b/pages/information/information.vue index d4c0e14..6ce8baa 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -29,10 +29,10 @@ - + - + @@ -132,12 +132,8 @@ isTimeShow: false, buildingShow: false, isinTimeShow: false, - columns: [ - // ['商务会议', '安装维修', '其他事宜'] - ], - buildingColumns: [ - // ['一期主楼', '二期主楼', '录制楼', '1600演播厅'] - ] + columns: [], + buildingColumns: [] } }, onLoad() { @@ -202,7 +198,6 @@ }, // 确定选择开始时间 async closeinTime(e) { - console.log(e) this.callerInfo.inTime = await this.shijianc(e.value) this.isinTimeShow = false this.isTimeShow = true diff --git a/pages/list/list.vue b/pages/list/list.vue index 342ad9b..be1a1cf 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -145,8 +145,8 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }, list: [], isExportShow: false, @@ -170,14 +170,14 @@ isTimeZ: "", statusInfo: "筛选状态", popShow: false, //控制授权手机号弹出框 - offset: 1, //页数 - limit: 10, //一页几条数据 - nothingMore: false, //上拉加载-没有数据了 - loading: false, //是否显示上拉加载-加载中 + offset: 1, //页数 + limit: 10, //一页几条数据 + nothingMore: false, //上拉加载-没有数据了 + loading: false, //是否显示上拉加载-加载中 }; }, async onShow() { - this.offset = 1; + this.offset = 1; let pages = getCurrentPages(); const curPage = pages[pages.length - 1]; this.currentPagePath = curPage.route; @@ -192,8 +192,8 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; const param = { offset: 1, @@ -223,12 +223,12 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; - this.searchList().then(() => { + this.searchList(false).then(() => { uni.stopPullDownRefresh(); }); this.checkboxList = []; @@ -241,7 +241,6 @@ methods: { //选中的数据 checkboxChange(item) { - console.log(item) item.value = !item.value if (this.checkboxList.indexOf(item) == -1) { this.checkboxList.push(item); @@ -273,7 +272,7 @@ return item; })); } - debounce(this.searchList(), 10000); + debounce(this.searchList(false), 10000); }, //确定导出 async exportClick() { @@ -308,10 +307,13 @@ this.checkboxList = []; }, //根据条件搜索 - async searchList() { + async searchList(is) { if(!this.loading) { this.list = []; } + if(!is) { + this.offset = 1 + } this.queryList.offset = this.offset; const res = await getList(this.queryList); if(res.records && res.records.length) { @@ -339,7 +341,7 @@ this.offset = 1; this.statusInfo = e.name; this.queryList.status = e.id; - this.searchList(); + this.searchList(false); }, //打开导出提示框 pass(leixin) { @@ -349,13 +351,11 @@ }, async possQr() { const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') - console.log(statusList) let ids = statusList.map((item) => item.id).join(); - console.log(ids) if( ids === '') { this.checkboxList = []; this.ispassShow = false; - this.searchList(); + this.searchList(false); return uni.showToast({ title: `暂无需要改动状态人员`, icon: 'none', @@ -363,7 +363,7 @@ }) } let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); - this.searchList(); + this.searchList(false); this.ispassShow = false; this.checkboxList = []; }, @@ -397,7 +397,7 @@ this.isTimeZ = await this.yueFen(e.value); this.time = `${this.isTimeQ}${this.isTimeZ}`; this.endTimeShow = false; - this.searchList(); + this.searchList(false); }, //确定选择开始时间 async confirmTime(e) { @@ -474,7 +474,7 @@ if (this.nothingMore) return; this.offset = this.offset + 1; this.loading = true; - await this.searchList(); + await this.searchList(true); this.loading = false; } }, diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue new file mode 100644 index 0000000..853de97 --- /dev/null +++ b/pages/reportList/reportList.vue @@ -0,0 +1,712 @@ + + + + + + +