diff --git a/App.vue b/App.vue index a539f55..365a3cf 100644 --- a/App.vue +++ b/App.vue @@ -1,5 +1,10 @@ - - - -
- - - diff --git a/pages.json b/pages.json index f63fde8..f5426c6 100644 --- a/pages.json +++ b/pages.json @@ -60,6 +60,11 @@ "style": { "navigationBarTitleText": "报警消息详情" } + },{ + "path": "pages/map/map", + "style": { + "navigationBarTitleText": "定位" + } }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/index/index.vue b/pages/index/index.vue index a956fbf..c03070a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -39,15 +39,18 @@ return { keepAlive: null, url: '', + employeeId: '' } }, - onLoad() { - let userInfo = uni.getStorageSync('mobileInfo'); - if(userInfo){ + onShow() { + let userInfo = uni.getStorageSync('mobileInfo') ? JSON.parse(uni.getStorageSync('mobileInfo')) : null; + if(userInfo && userInfo.employeeId != this.employeeId){ this.url = 'http://192.168.3.109:89?employeeId=' + userInfo.employeeId; }else{ this.url = 'http://192.168.3.109:89?employeeId='; } + }, + onLoad() { this.keepAlive = uni.requireNativePlugin('Ba-KeepAliveSuit') setTimeout(() => { this.onKeep(); @@ -77,11 +80,11 @@ }, (res) => { console.log(res); - uni.showToast({ - title: res.msg, - icon: "none", - duration: 3000 - }) + // uni.showToast({ + // title: res.msg, + // icon: "none", + // duration: 3000 + // }) }); }, onAutoStart() { //去设置自启动、后台运行 diff --git a/pages/map/map.vue b/pages/map/map.vue new file mode 100644 index 0000000..4f78b97 --- /dev/null +++ b/pages/map/map.vue @@ -0,0 +1,24 @@ + + + diff --git a/pages/patrolRecord/list.vue b/pages/patrolRecord/list.vue index 97891cc..160bdcb 100644 --- a/pages/patrolRecord/list.vue +++ b/pages/patrolRecord/list.vue @@ -8,20 +8,20 @@ - + - 2023-07-17 - 10:15:21 + {{dateFormatter(item.createTime,'yyyy-MM-dd')}} + {{dateFormatter(item.createTime,'hh:mm:ss')}} - 实时定位位置或选择的常用报警位 - 应急预案类型 + {{item.buildId?item.buildId+'号楼':''}}{{item.floorNo?item.floorNo+'层':''}} + 经度：{{item.longidute}} + 纬度：{{item.latidute}} + {{item.planTypeName}} - - @@ -33,14 +33,16 @@ diff --git a/pages/positionRecord/list.vue b/pages/positionRecord/list.vue index d5dcda9..a741e30 100644 --- a/pages/positionRecord/list.vue +++ b/pages/positionRecord/list.vue @@ -7,16 +7,18 @@ - + - 2023-07-17 - 10:15:21 + {{dateFormatter(item.createTime,'yyyy-MM-dd')}} + {{dateFormatter(item.createTime,'hh:mm:ss')}} - 实时定位位置或选择的常用报警位 - 应急预案类型 + {{item.buildId?item.buildId+'号楼':''}}{{item.floorNo?item.floorNo+'层':''}} + 经度：{{item.longidute}} + 纬度：{{item.latidute}} + {{item.planTypeName}} @@ -26,36 +28,55 @@ - - - -
- - - diff --git a/util/date.js b/util/date.js new file mode 100644 index 0000000..88b9e6a --- /dev/null +++ b/util/date.js @@ -0,0 +1,58 @@ +export const calcDate = (date1, date2) => { + let date3 = date2 - date1; + + let days = Math.floor(date3 / (24 * 3600 * 1000)) + + let leave1 = date3 % (24 * 3600 * 1000) //计算天数后剩余的毫秒数 + let hours = Math.floor(leave1 / (3600 * 1000)) + + let leave2 = leave1 % (3600 * 1000) //计算小时数后剩余的毫秒数 + let minutes = Math.floor(leave2 / (60 * 1000)) + + let leave3 = leave2 % (60 * 1000) //计算分钟数后剩余的毫秒数 + let seconds = Math.round(date3 / 1000) + return { + leave1, + leave2, + leave3, + days: days, + hours: hours, + minutes: minutes, + seconds: seconds, + } +} + +/** + * 日期格式化 + */ +export function dateFormat(date, format) { + format = format || 'yyyy-MM-dd hh:mm:ss'; + if (date !== 'Invalid Date') { + let o = { + "M+": date.getMonth() + 1, //month + "d+": date.getDate(), //day + "h+": date.getHours(), //hour + "m+": date.getMinutes(), //minute + "s+": date.getSeconds(), //second + "q+": Math.floor((date.getMonth() + 3) / 3), //quarter + "S": date.getMilliseconds() //millisecond + } + if (/(y+)/.test(format)) format = format.replace(RegExp.$1, + (date.getFullYear() + "").substr(4 - RegExp.$1.length)); + for (let k in o) + if (new RegExp("(" + k + ")").test(format)) + format = format.replace(RegExp.$1, + RegExp.$1.length === 1 ? o[k] : + ("00" + o[k]).substr(("" + o[k]).length)); + return format; + } + return ''; + +} + +/** + * 当前时间戳 + */ +export function dateNow() { + return dateFormat(new Date(), "yyyyMMddhhmmss"); +}