diff --git a/common/js/request.js b/common/js/request.js index 25eebd7..d9621f2 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -1,92 +1,92 @@ -import config from './config' -import Qs from 'qs' -let arr = [] -export default (options = {}) => { - if (options.data == undefined) { - options.data = {} - } - options.debounce = options.debounce === undefined ? true : options.debounce - // 防止接口重复点击 - if (options.debounce) { - if (arr.indexOf(options.url) === -1) { - arr.push(options.url) - } else { - return new Promise((resolve, reject) => { - reject({ - code: -1, - msg: '请勿重复提交', - data: options.url, - }) - }) - } - } - return new Promise((reslove, reject) => { - let url = options.url.indexOf('http') === -1 ? config.domain + options.url : options.url - if (options.params) { - url = url + '?' + Qs.stringify(options.params) - } - uni.request({ - url, - timeout: 1000 *10, - data: { - ...options.data, - }, - header: { - // 'Content-Type': 'application/json;charset=UTF-8', - 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', - Authorization: uni.getStorageSync('access_token'), - ...options.header, - }, - method: options.method || 'GET', - success: async (res) => { - console.log(res) - if (arr.indexOf(options.url) > -1) { - setTimeout(() => { - arr.splice(arr.indexOf(options.url), 1) - }, 500) - } - if (res.data.resultCode !== 10000 && res.data.code !== 'A0000') { - errHandler(res.data) - reject(res.data) - } else { - reslove(res.data) - } - }, - fail: (err) => { - if (arr.indexOf(options.url) > -1) { - setTimeout(() => { - arr.splice(arr.indexOf(options.url), 1) - }, 500) - } - reject(err) - uni.showToast({ - icon: 'none', - title: '网络异常，请稍后再试', - }) - }, - }) - }) -} - -/** - * 错误处理 - * @param {Number} code 错误码 - */ -function errHandler(res) { - console.log(res) - switch (res.code) { - case 'A0024': - uni.reLaunch({ url: '/pages/user/login' }) - break - case 'A0202': - uni.reLaunch({ url: '/pages/user/login' }) - break - default: - uni.showToast({ - title: res.message || res.msg || '网络异常，请稍后再试', - duration: 2000, - icon: 'none', - }) - break - } -} +import config from './config' +import Qs from 'qs' +let arr = [] +export default (options = {}) => { + if (options.data == undefined) { + options.data = {} + } + options.debounce = options.debounce === undefined ? true : options.debounce + // 防止接口重复点击 + if (options.debounce) { + if (arr.indexOf(options.url) === -1) { + arr.push(options.url) + } else { + return new Promise((resolve, reject) => { + reject({ + code: -1, + msg: '请勿重复提交', + data: options.url, + }) + }) + } + } + return new Promise((reslove, reject) => { + let url = options.url.indexOf('http') === -1 ? config.domain + options.url : options.url + if (options.params) { + url = url + '?' + Qs.stringify(options.params) + } + uni.request({ + url, + timeout: 1000 *30, + data: { + ...options.data, + }, + header: { + // 'Content-Type': 'application/json;charset=UTF-8', + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', + Authorization: uni.getStorageSync('access_token'), + ...options.header, + }, + method: options.method || 'GET', + success: async (res) => { + console.log(res) + if (arr.indexOf(options.url) > -1) { + setTimeout(() => { + arr.splice(arr.indexOf(options.url), 1) + }, 500) + } + if (res.data.resultCode !== 10000 && res.data.code !== 'A0000') { + errHandler(res.data) + reject(res.data) + } else { + reslove(res.data) + } + }, + fail: (err) => { + if (arr.indexOf(options.url) > -1) { + setTimeout(() => { + arr.splice(arr.indexOf(options.url), 1) + }, 500) + } + reject(err) + uni.showToast({ + icon: 'none', + title: '网络异常，请稍后再试', + }) + }, + }) + }) +} + +/** + * 错误处理 + * @param {Number} code 错误码 + */ +function errHandler(res) { + console.log(res) + switch (res.code) { + case 'A0024': + uni.reLaunch({ url: '/pages/user/login' }) + break + case 'A0202': + uni.reLaunch({ url: '/pages/user/login' }) + break + default: + uni.showToast({ + title: res.message || res.msg || '网络异常，请稍后再试', + duration: 2000, + icon: 'none', + }) + break + } +} diff --git a/common/js/util.js b/common/js/util.js index 6af8ab7..b65f9bf 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -113,6 +113,21 @@ function getToday() { const day = String(today.getDate()).padStart(2, '0'); return `${year}-${month}-${day}`; } +// 获取当天日期 往前推30天 +function getBeforeDays(days = 30) { + const today = new Date(); + // 计算往前推N天的时间戳（1天=86400000毫秒） + const beforeDate = new Date(today.getTime() - days * 24 * 60 * 60 * 1000); + return formatDate(beforeDate); +} +function formatDate(date) { + const year = date.getFullYear(); + // 月份从0开始，补零到2位 + const month = String(date.getMonth() + 1).padStart(2, '0'); + // 日期补零到2位 + const day = String(date.getDate()).padStart(2, '0'); + return `${year}-${month}-${day}`; +} // 获取3个月前的日期 function getThreeMonthsAgo() { @@ -317,5 +332,6 @@ export default { refreshPrePage, getDictData, getToday, + getBeforeDays, getThreeMonthsAgo } diff --git a/manifest.json b/manifest.json index f8cc463..2b4206b 100644 --- a/manifest.json +++ b/manifest.json @@ -139,7 +139,7 @@ "/api" : { "https" : true, "target" : "https://pqmcn.com:8092/api", - // "target" : "http://192.168.1.62:10215", + // "target" : "http://192.168.1.103:10215", "changOrigin" : true, "pathRewrite" : { "/api" : "" diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue index 89bfa24..ea14ec0 100644 --- a/pages/device/APF/detail.vue +++ b/pages/device/APF/detail.vue @@ -1,727 +1,727 @@ - - - - + + + + diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue index 6453b51..d3996de 100644 --- a/pages/device/APF/report.vue +++ b/pages/device/APF/report.vue @@ -112,7 +112,7 @@ export default { this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage') this.store.params.type = this.type this.store.params.deviceId = this.deviceId - this.store.params.startTime = this.$util.getThreeMonthsAgo() + this.store.params.startTime = this.$util.getBeforeDays() this.store.params.endTime = this.$util.getToday() this.store.loadedCallback = () => { this.store.data.forEach((item) => { diff --git a/pages/message/message.vue b/pages/message/message.vue index ce2a2e7..86749bc 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -115,7 +115,7 @@ export default { console.log(dictData) this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage') this.store.params.type = this.type - this.store.params.startTime = this.$util.getThreeMonthsAgo() + this.store.params.startTime = this.$util.getBeforeDays() this.store.params.endTime = this.$util.getToday() this.store.loadedCallback = () => { console.log(111, this.store.data)