master
lion 3 years ago
parent 661a9166a9
commit f0fe67768c

@ -1,117 +1,177 @@
/** /**
* Created by PanJiaChen on 16/11/18. * Created by PanJiaChen on 16/11/18.
*/ */
/** /**
* Parse the time to string * Parse the time to string
* @param {(Object|string|number)} time * @param {(Object|string|number)} time
* @param {string} cFormat * @param {string} cFormat
* @returns {string | null} * @returns {string | null}
*/ */
export function parseTime(time, cFormat) { export function parseTime(time, cFormat) {
if (arguments.length === 0 || !time) { if (arguments.length === 0 || !time) {
return null return null
} }
const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
let date let date
if (typeof time === 'object') { if (typeof time === 'object') {
date = time date = time
} else { } else {
if ((typeof time === 'string')) { if ((typeof time === 'string')) {
if ((/^[0-9]+$/.test(time))) { if ((/^[0-9]+$/.test(time))) {
// support "1548221490638" // support "1548221490638"
time = parseInt(time) time = parseInt(time)
} else { } else {
// support safari // support safari
// https://stackoverflow.com/questions/4310953/invalid-date-in-safari // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
time = time.replace(new RegExp(/-/gm), '/') time = time.replace(new RegExp(/-/gm), '/')
} }
} }
if ((typeof time === 'number') && (time.toString().length === 10)) { if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000 time = time * 1000
} }
date = new Date(time) date = new Date(time)
} }
const formatObj = { const formatObj = {
y: date.getFullYear(), y: date.getFullYear(),
m: date.getMonth() + 1, m: date.getMonth() + 1,
d: date.getDate(), d: date.getDate(),
h: date.getHours(), h: date.getHours(),
i: date.getMinutes(), i: date.getMinutes(),
s: date.getSeconds(), s: date.getSeconds(),
a: date.getDay() a: date.getDay()
} }
const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
const value = formatObj[key] const value = formatObj[key]
// Note: getDay() returns 0 on Sunday // Note: getDay() returns 0 on Sunday
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } if (key === 'a') {
return value.toString().padStart(2, '0') return ['日', '一', '二', '三', '四', '五', '六'][value]
}) }
return time_str return value.toString().padStart(2, '0')
} })
return time_str
/** }
* @param {number} time
* @param {string} option /**
* @returns {string} * @param {number} time
*/ * @param {string} option
export function formatTime(time, option) { * @returns {string}
if (('' + time).length === 10) { */
time = parseInt(time) * 1000 export function formatTime(time, option) {
} else { if (('' + time).length === 10) {
time = +time time = parseInt(time) * 1000
} } else {
const d = new Date(time) time = +time
const now = Date.now() }
const d = new Date(time)
const diff = (now - d) / 1000 const now = Date.now()
if (diff < 30) { const diff = (now - d) / 1000
return '刚刚'
} else if (diff < 3600) { if (diff < 30) {
// less 1 hour return '刚刚'
return Math.ceil(diff / 60) + '分钟前' } else if (diff < 3600) {
} else if (diff < 3600 * 24) { // less 1 hour
return Math.ceil(diff / 3600) + '小时前' return Math.ceil(diff / 60) + '分钟前'
} else if (diff < 3600 * 24 * 2) { } else if (diff < 3600 * 24) {
return '1天前' return Math.ceil(diff / 3600) + '小时前'
} } else if (diff < 3600 * 24 * 2) {
if (option) { return '1天前'
return parseTime(time, option) }
} else { if (option) {
return ( return parseTime(time, option)
d.getMonth() + } else {
1 + return (
'月' + d.getMonth() +
d.getDate() + 1 +
'日' + '月' +
d.getHours() + d.getDate() +
'时' + '日' +
d.getMinutes() + d.getHours() +
'分' '时' +
) d.getMinutes() +
} '分'
} )
}
/** }
* @param {string} url
* @returns {Object} // 获取当前月份的第一天
*/
export function param2Obj(url) { export function getCurrentMonthFirst() {
const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') const date = new Date();
if (!search) {
return {} date.setDate(1);
}
const obj = {} var month = parseInt(date.getMonth() + 1);
const searchArr = search.split('&')
searchArr.forEach(v => { var day = date.getDate();
const index = v.indexOf('=')
if (index !== -1) { if (month < 10) {
const name = v.substring(0, index) month = '0' + month
const val = v.substring(index + 1, v.length)
obj[name] = val }
}
}) if (day < 10) {
return obj day = '0' + day
}
return date.getFullYear() + '-' + month + '-' + day;
}
// 获取当前月份的最后一天
export function getCurrentMonthLast() {
const date = new Date();
var currentMonth = date.getMonth();
var nextMonth = ++currentMonth;
var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
var oneDay = 1000 * 60 * 60 * 24;
var lastTime = new Date(nextMonthFirstDay - oneDay);
var month = parseInt(lastTime.getMonth() + 1);
var day = lastTime.getDate();
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
return date.getFullYear() + '-' + month + '-' + day;
}
/**
* @param {string} url
* @returns {Object}
*/
export function param2Obj(url) {
const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
if (!search) {
return {}
}
const obj = {}
const searchArr = search.split('&')
searchArr.forEach(v => {
const index = v.indexOf('=')
if (index !== -1) {
const name = v.substring(0, index)
const val = v.substring(index + 1, v.length)
obj[name] = val
}
})
return obj
} }

@ -205,7 +205,7 @@ export default {
roadloading: false, roadloading: false,
mapdatesearch:"", mapdatesearch:"",
selects: { selects: {
}, },
}; };
@ -294,7 +294,6 @@ export default {
this.singleclick() this.singleclick()
// this.map.layer2.setVisible(false) // this.map.layer2.setVisible(false)
}, },

@ -50,7 +50,7 @@
<Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button> <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
<Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button> <Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
<Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button> <Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button>
<Button type="primary" @click="showMap()" style="margin-left: 10px">地图</Button> <Button type="primary" @click="showMap()" style="margin-left: 10px">当月点位</Button>
</div> </div>
</slot> </slot>
</LxHeader> </LxHeader>
@ -507,6 +507,8 @@
listall({ listall({
page: 1, page: 1,
page_size: 9999999, page_size: 9999999,
start_date:getCurrentMonthFirst(),
end_date:getCurrentMonthLast(),
...search ...search
}).then(response => { }).then(response => {
for (var m of response.data) { for (var m of response.data) {

@ -46,7 +46,7 @@
<Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button> <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
<Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button> <Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
<Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button> <Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button>
<Button type="primary" @click="showMap()" style="margin-left: 10px">地图</Button> <Button type="primary" @click="showMap()" style="margin-left: 10px">当月点位</Button>
</div> </div>
</slot> </slot>
</LxHeader> </LxHeader>
@ -221,7 +221,8 @@
import editCirculation from '@/views/rain/maintain/components/editCirculation' import editCirculation from '@/views/rain/maintain/components/editCirculation'
import editMire from '@/views/rain/maintain/components/editMire' import editMire from '@/views/rain/maintain/components/editMire'
import AvueMap from 'avue-plugin-map' import AvueMap from 'avue-plugin-map'
import maps from '@/views/rain/maintain/components/maps' import maps from '@/views/rain/maintain/components/maps'
import {getCurrentMonthFirst,getCurrentMonthLast} from "@/utils/index"
export default { export default {
components: { components: {
@ -539,12 +540,27 @@
listmain({ listmain({
page: 1, page: 1,
page_size: 9999999, page_size: 9999999,
start_date:getCurrentMonthFirst(),
end_date:getCurrentMonthLast(),
...search ...search
}).then(response => { }).then(response => {
for (var m of response.data) { for (var m of response.data) {
this.mapArr.push([ if(m.help_discharge_info){
m.longitude,m.latitude,m.address,m.id,m.old_type this.mapArr.push([
]) m.help_discharge_info.longitude,m.help_discharge_info.latitude,m.help_discharge_info.address,m.id,m.old_type
])
}
if(m.circulation_info){
this.mapArr.push([
m.circulation_info.longitude,m.circulation_info.latitude,m.circulation_info.address,m.id,m.old_type
])
}
if(m.mire_info){
this.mapArr.push([
m.mire_info.longitude,m.mire_info.latitude,m.mire_info.address,m.id,m.old_type
])
}
} }
this.$refs.maps.showSearch = false this.$refs.maps.showSearch = false
this.$refs.maps.pointArr = this.mapArr this.$refs.maps.pointArr = this.mapArr

Loading…
Cancel
Save