From 5c9045c9d0e7180f5cbc579a6bc8f1d5748b84ad Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Fri, 28 Jul 2023 15:31:01 +0800 Subject: [PATCH] 2 --- common/http.js | 27 ++++ pages.json | 8 ++ pages/customer/customer.vue | 116 ++++++++++++++++- pages/general/general.vue | 206 ++++++++++++++++++++++-------- pages/login/index.vue | 1 + pages/supervise/supervise.vue | 80 ++++++++---- pages/supervise/superviseList.vue | 142 ++++++++++++++++++++ 7 files changed, 496 insertions(+), 84 deletions(-) create mode 100644 pages/supervise/superviseList.vue diff --git a/common/http.js b/common/http.js index e1c9fa6..a43bbcc 100644 --- a/common/http.js +++ b/common/http.js @@ -77,6 +77,33 @@ export function post(url, data, header){ }) } +export function upload(url, data, header){ + header.Authorization = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}` + const token = uni.getStorageSync("token") + if (token) { + header['Blade-Auth'] = 'bearer ' + token + } + return new Promise((resolve, reject)=>{ + uni.uploadFile({ + url:API_URL + url, + header:header, + filePath:data, + name:'file', + formData:{ + filePath:'knFire', + dir:'image' + }, + success:(res)=>{ + resolve(res) + }, + fail: (e) => { + reject(e) + } + }) + }) +} + + function removeAll(){ uni.removeStorageSync("token") } diff --git a/pages.json b/pages.json index 21d8fd2..43e6d06 100644 --- a/pages.json +++ b/pages.json @@ -31,6 +31,14 @@ "enablePullDownRefresh": false } + }, { + "path": "pages/supervise/superviseList", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true, + "onReachBottomDistance": 50 + } + } ], "globalStyle": { diff --git a/pages/customer/customer.vue b/pages/customer/customer.vue index c26d138..9c74444 100644 --- a/pages/customer/customer.vue +++ b/pages/customer/customer.vue @@ -1,12 +1,25 @@ //单位管理员 @@ -15,19 +28,118 @@ data() { return { applet:this.$url.data.applet, + pageInfo:{ + page:1, + limit:20, + unitName:'', + unitId:'' + }, + //isSearth:uni.getStorageSync("role_name") == 'SUPERVISE_USER', + // isSearth:true, + list:[] } }, + onLoad() { + this.loadData() + this.pageInfo.unitId = uni.getStorageSync("dept_id") + }, methods: { + loadData(){ + this.$http.get("/fire-customer/sign/record/customer/page",this.pageInfo,{}).then(res =>{ + this.list = this.list.concat(res.data) + }) + }, + search(e){ + this.pageInfo.page = 1; + this.list = []; + this.loadData() + // console.log(e) + }, close(){ uni.removeStorageSync("token") uni.redirectTo({ url:'/pages/login/index' }) } + }, + onPullDownRefresh() { + this.pageInfo.page = 1; + this.list = []; + this.loadData(); + //下拉刷新 + uni.stopPullDownRefresh(); + }, + onReachBottom() { + this.pageInfo.page = this.pageInfo.page + 1; + this.loadData(); + //加载更多 } } - diff --git a/pages/general/general.vue b/pages/general/general.vue index 1e9bd4c..1516bd3 100644 --- a/pages/general/general.vue +++ b/pages/general/general.vue @@ -7,33 +7,29 @@ 值班打卡 - - 打卡时间范围:{{item.startTime}} ~ {{item.endTime}} + + 打卡时间范围{{item.startTime}} ~ {{item.endTime}} - + 打卡 {{time}} - 提示:打卡需要获取您的位置,还有您上传中控室的自拍照片 + 提示:打卡需要您上传中控室的自拍照片 - {{item}}已打卡 + {{item.time}}已打卡 打卡记录 - - - - - 姓名:{{val.name}} - 打卡时间:{{val.time}} - + + + 打卡时间:{{val.time}} @@ -44,20 +40,35 @@ + + +