diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue index 97592c8..469b7c2 100644 --- a/pages/index/newindex.vue +++ b/pages/index/newindex.vue @@ -113,7 +113,15 @@ 预约记录 - + + + + + + {{ item.goodsTitle }} @@ -143,6 +151,7 @@ 自来客户 + @@ -222,7 +231,11 @@ export default { }, onHide() { clearInterval(this.timer); - clearInterval(this.timer2); + this.timer = null + }, + onUnload() { + clearInterval(this.timer); + this.timer = null; }, onLoad() { this.partnerId = uni.getStorageSync('partnerId') @@ -233,7 +246,10 @@ export default { this.getUserInfo() this.getWarnCount() this.getAppointAndPickNum() - this.getappointment() + setTimeout(() => { + this.getappointment() + }, 1000) + // this.getappointment() // 初始化时间 this.timeWeekFormat(); diff --git a/pages/manage/deviceManage.vue b/pages/manage/deviceManage.vue index 9525517..47fce99 100644 --- a/pages/manage/deviceManage.vue +++ b/pages/manage/deviceManage.vue @@ -43,12 +43,13 @@ - + + {{ item.fileName }} {{ item.warnTime }} {{ '1' }} - 文件数:{{ item.count }} + {{ '1' }} 预览 @@ -114,7 +115,8 @@ export default { fileName: null, isShow: false, drawerData: [], - isLoading: false + isLoading: false, + imageUrl: config.baseImageUrl + '/', } }, @@ -122,7 +124,6 @@ export default { console.log('传递进来的数据', data) if (data.folderId) { this.fileId = data.folderId - } this.getlist() }, @@ -165,7 +166,7 @@ export default { data.fileName = null } let res = await request({ - url: '/inspectionFile/inspectionFile/list', + url: '/inspectionFile/inspectionFile/listByPermission', method: 'get', data: data }) @@ -176,7 +177,7 @@ export default { } let total = res.total this.totalPages = Math.ceil(total / this.pageSize); - this.getCountByDirectory() + // this.getCountByDirectory() }, showHistory(id) { this.isShow = true diff --git a/pages/staff/staff-my.vue b/pages/staff/staff-my.vue index a8f7b28..f4c561c 100644 --- a/pages/staff/staff-my.vue +++ b/pages/staff/staff-my.vue @@ -59,6 +59,17 @@ + + + + + + 文档管理 + + + + + @@ -211,6 +222,11 @@ export default { url: "/pages/manage/workReport/reportList" }) }, + goFile() { + uni.navigateTo({ + url: "/pages/manage/deviceManage" + }) + }, goWord() { request({ url: '/system/info/exportWord',